tiennm99/is-a-dev
1
0
Fork 0
mirror of https://github.com/tiennm99/is-a-dev.git synced 2026-05-22 04:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/switch-to-bun' of github.com:is-a-dev/register into feat/support-aaaa-records

Browse Source
This commit is contained in:
Akshay Nair
2023-09-17 14:54:20 +05:30
parent ce7e0c4a5a d755689788
commit a6314d8007
11 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env → .env.example
View File
.github/workflows/checks.yml
+5 -12
View File
@@ -1,5 +1,5 @@
name: Checks
on: [pull_request]
on: [pull_request, workflow_dispatch]
jobs:
validation:
@@ -9,15 +9,8 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- name: Setup node v16
uses: actions/setup-node@v1
- uses: oven-sh/setup-bun@v1
with:
node-version: '16'
- name: Install dependencies
uses: borales/actions-yarn@v2.0.0
with:
cmd: install --ignore-engines --frozen-lockfile
- name: Run tests
uses: borales/actions-yarn@v2.0.0
with:
cmd: test
bun-version: 1.0.0
- run: bun install
- run: bun test
.github/workflows/publish-records.yml
+6 -9
View File
@@ -12,16 +12,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: borales/actions-yarn@v2.0.0
- uses: oven-sh/setup-bun@v1
with:
cmd: install --ignore-engines
- name: Running tests
uses: borales/actions-yarn@v2.0.0
with:
cmd: test
bun-version: 1.0.0
- run: bun install
- run: bun test
- name: Publishing records
env:
CI: 1
NODE_ENV: production
ENV: production
DOMAIN_USER: ${{ secrets.DOMAIN_USER }}
DOMAIN_API_KEY: ${{ secrets.DOMAIN_API_KEY }}
@@ -29,6 +28,4 @@ jobs:
DOMAIN_API_PORT: ${{ secrets.DOMAIN_API_PORT }}
DOMAIN_DOMAIN: ${{ secrets.DOMAIN_DOMAIN }}
DOMAIN_HOST_IP: ${{ secrets.DOMAIN_HOST_IP }}
uses: borales/actions-yarn@v2.0.0
with:
cmd: publish-records
run: bun run publish-records
.gitignore
+1 -1
View File
@@ -1,3 +1,3 @@
node_modules/
*.env.*
*.env.production
*.log
bun.lockb
Executable
BIN
View File
Binary file not shown.
default.nix
+1 -2
View File
@@ -3,11 +3,10 @@ let
inherit (nixpkgs) pkgs;
nixPackages = with pkgs; [
nodejs-18_x
yarn
docker-compose
dnsutils
#certbot
bun
];
in
pkgs.stdenv.mkDerivation {
package.json
+3 -11
View File
@@ -3,28 +3,20 @@
"version": "1.0.0",
"description": "Register *.is-a.dev domains for free",
"scripts": {
"test": "ENV=test jest",
"lint": "eslint utils scripts domains --ext .json,.js",
"publish-records": "node ./scripts/register-domains.js",
"publish-records": "bun run -b ./scripts/register-domains.js",
"dc": "docker-compose -p is-a-dev",
"dc:start": "yarn dc up",
"dc:shell": "yarn dc run dev /bin/bash"
"dc:start": "bun run dc up",
"dc:shell": "bun run dc run dev /bin/bash"
},
"repository": {
"type": "git",
"url": "https://github.com/is-a-dev/register"
},
"keywords": [
"subdomain"
],
"author": "Akshay Nair <phenax5@gmail.com>",
"license": "GPL-3.0",
"dependencies": {
"dotenv": "^8.2.0",
"is-ip": "^5.0.1",
"jest": "^26.4.2",
"node-fetch": "^2.6.1",
"qs": "^6.9.4",
"ramda": "^0.27.1"
},
"devDependencies": {
tests/domain-service.test.js
+14 -14
View File
@@ -204,18 +204,18 @@ describe('Domain service', () => {
{ name: 'c', type: 'MX', address: 'foobar.com', priority: 2 },
]);
expect(addZone).toBeCalledTimes(1);
expect(addZone).toHaveBeenCalledTimes(1);
expect(getRecordCalls(addZone)).toEqual([
{ name: 'c', type: 'A', address: '12.131321.213' },
]);
expect(addEmail).toBeCalledTimes(1);
expect(addEmail).toHaveBeenCalledTimes(1);
expect(getRecordCalls(addEmail)).toEqual([
{ domain: 'c.is-a.dev', exchanger: 'foobar.com', priority: 2 },
]);
expect(removeZone).toBeCalledTimes(0);
expect(removeEmail).toBeCalledTimes(0);
expect(removeZone).toHaveBeenCalledTimes(0);
expect(removeEmail).toHaveBeenCalledTimes(0);
});
it('should update matching host and set it', async () => {
@@ -231,11 +231,11 @@ describe('Domain service', () => {
{ name: 'b', type: 'CNAME', address: 'googoogaga' },
]);
expect(addZone).toBeCalledTimes(1);
expect(addZone).toHaveBeenCalledTimes(1);
expect(getRecordCalls(addZone)).toEqual([
{ name: 'b', type: 'CNAME', address: 'googoogaga' },
]);
expect(removeZone).toBeCalledTimes(1);
expect(removeZone).toHaveBeenCalledTimes(1);
expect(getRecordCalls(removeZone)).toEqual([
{ line: 2 },
]);
@@ -256,12 +256,12 @@ describe('Domain service', () => {
{ name: 'b', type: 'CNAME', address: 'farboo' },
]);
expect(addZone).toBeCalledTimes(2);
expect(addZone).toHaveBeenCalledTimes(2);
expect(getRecordCalls(addZone)).toEqual([
{ name: 'b', type: 'CNAME', address: 'googoogaga' },
{ name: 'b', type: 'CNAME', address: 'farboo' },
]);
expect(removeZone).toBeCalledTimes(2);
expect(removeZone).toHaveBeenCalledTimes(2);
expect(getRecordCalls(removeZone)).toEqual([
{ line: 2 },
{ line: 3 },
@@ -300,34 +300,34 @@ describe('Domain service', () => {
{ name: 'a', type: 'MX', address: 'example.com', priority: 20 },
]);
expect(addZone).toBeCalledTimes(3);
expect(addZone).toHaveBeenCalledTimes(3);
expect(getRecordCalls(addZone)).toEqual([
{ name: 'a', type: 'CNAME', address: 'boo' },
{ name: 'b', type: 'A', address: '3' },
{ name: 'd', type: 'CNAME', address: 'helo.com' },
]);
expect(removeZone).toBeCalledTimes(1);
expect(removeZone).toHaveBeenCalledTimes(1);
expect(getRecordCalls(removeZone)).toEqual([
{ line: 1 },
]);
expect(addEmail).toBeCalledTimes(1);
expect(addEmail).toHaveBeenCalledTimes(1);
expect(getRecordCalls(addEmail)).toEqual([
{ domain: 'a.is-a.dev', exchanger: 'example.com', priority: 20 },
]);
expect(removeEmail).toBeCalledTimes(2);
expect(removeEmail).toHaveBeenCalledTimes(2);
expect(getRecordCalls(removeEmail)).toEqual([
{ domain: 'c.is-a.dev', exchanger: 'mx1.hello.com', priority: 20 },
{ domain: 'b.is-a.dev', exchanger: 'foo.bar', priority: 20 },
]);
expect(addRedir).toBeCalledTimes(3);
expect(addRedir).toHaveBeenCalledTimes(3);
expect(getRecordCalls(addRedir)).toEqual([
{ domain: `b.${DOMAIN_DOMAIN}`, type: 'permanent', redirect: 'https://wowow.com' },
{ domain: `d.${DOMAIN_DOMAIN}`, type: 'permanent', redirect: 'https://hhh.com' },
{ domain: `x.${DOMAIN_DOMAIN}`, type: 'permanent', redirect: 'https://example69.com' },
]);
expect(removeRedir).toBeCalledTimes(2);
expect(removeRedir).toHaveBeenCalledTimes(2);
expect(getRecordCalls(removeRedir)).toEqual([
{ domain: `b.${DOMAIN_DOMAIN}` },
{ domain: `x.${DOMAIN_DOMAIN}` },
tests/register.test.js
+8 -8
View File
@@ -87,10 +87,10 @@ describe('registerDomains', () => {
const domainService = mockDS({ zones: remoteHosts, redirections: remoteRedirections });
await registerDomains({ getDomains: async () => localHosts, domainService });
expect(addZone).toBeCalledTimes(0);
expect(removeZone).toBeCalledTimes(1);
expect(addRedir).toBeCalledTimes(0);
expect(removeRedir).toBeCalledTimes(0);
expect(addZone).toHaveBeenCalledTimes(0);
expect(removeZone).toHaveBeenCalledTimes(1);
expect(addRedir).toHaveBeenCalledTimes(0);
expect(removeRedir).toHaveBeenCalledTimes(0);
});
it('should add the new set hosts', async () => {
@@ -111,10 +111,10 @@ describe('registerDomains', () => {
const domainService = mockDS({ zones: remoteHosts, redirections: remoteRedirections });
await registerDomains({ getDomains: async () => localHosts, domainService });
expect(addZone).toBeCalledTimes(1);
expect(removeZone).toBeCalledTimes(0);
expect(addRedir).toBeCalledTimes(2);
expect(removeRedir).toBeCalledTimes(1);
expect(addZone).toHaveBeenCalledTimes(1);
expect(removeZone).toHaveBeenCalledTimes(0);
expect(addRedir).toHaveBeenCalledTimes(2);
expect(removeRedir).toHaveBeenCalledTimes(1);
});
});
utils/constants.js
+1 -5
View File
@@ -1,10 +1,6 @@
const path = require('path');
const { ENV = 'test', CI } = process.env;
if (!CI) {
require('dotenv').config({ path: path.resolve(`.env.${ENV}`) });
}
const { NODE_ENV: ENV = 'test' } = process.env;
const {
DOMAIN_USER,
utils/lib/cpanel.js
+1 -2
View File
@@ -1,6 +1,5 @@
const R = require('ramda');
const fetch = require('node-fetch');
const qs = require('qs');
const qs = require('querystring');
const { DOMAIN_API_HOST, DOMAIN_API_PORT, DOMAIN_USER, DOMAIN_API_KEY, DOMAIN_DOMAIN } = require('../constants');
const CpanelClient = (options) => {