@cloud-cli/dns 1.0.1 → 1.1.0

package/dist/index.d.ts

@@ -1,8 +1,6 @@
-export declare class DNS {
-    static parse(line: any): {
-        domain: any;
-        target: any;
-    };
+import { init } from '@cloud-cli/cli';
+interface DNSConfig {
+    defaultTarget?: string;
 }
 interface DomainAndTarget {
     domain: string;
@@ -10,12 +8,18 @@ interface DomainAndTarget {
 }
 declare function add(input: DomainAndTarget): boolean;
 declare function remove(input: DomainAndTarget): boolean;
-declare function show(): DomainAndTarget[];
+declare function list(): DomainAndTarget[];
 declare function reload(): Promise<true>;
+declare function addDnsConfig(options: DNSConfig): void;
+export declare function parseDNSLine(line: string): {
+    domain: string;
+    target: string;
+};
 declare const _default: {
     add: typeof add;
     remove: typeof remove;
-    show: typeof show;
+    list: typeof list;
     reload: typeof reload;
+    [init]: typeof addDnsConfig;
 };
 export default _default;

package/dist/index.js

@@ -1,45 +1,56 @@
 import fs from 'fs';
 import { join } from 'path';
 import { exec } from '@cloud-cli/exec';
+import { init } from '@cloud-cli/cli';
 const lineParse = /^address=\/(.+)\/(.+)$/;
-const filePath = join(process.cwd(), 'configuration/apps.conf');
-export class DNS {
-    static parse(line) {
-        const parts = line.match(lineParse);
-        return { domain: parts[1], target: parts[2] };
-    }
-}
+const filePath = join(process.cwd(), 'configuration', 'apps.conf');
+const dnsConfig = {
+    defaultTarget: '127.0.0.1'
+};
 function add(input) {
-    let list = show();
+    let current = list();
     if (!input.target) {
-        input.target = '127.0.0.1';
+        input.target = dnsConfig.defaultTarget;
     }
-    list = list.filter(item => item.domain !== input.domain);
-    list.push(input);
-    save(list);
+    current = current.filter(item => item.domain !== input.domain);
+    current.push(input);
+    save(current);
     return true;
 }
 function remove(input) {
-    const list = show();
-    const newList = list.filter(item => item.domain !== input.domain);
+    const current = list();
+    const newList = current.filter(item => item.domain !== input.domain);
     save(newList);
     return true;
 }
-function save(list) {
-    const txt = list.map(line => 'address=/' + line.domain + '/' + line.target);
-    fs.writeFileSync(filePath, txt.join('\n'));
-}
-function show() {
+function list() {
+    if (!fs.existsSync(filePath)) {
+        return [];
+    }
     const input = fs.readFileSync(filePath, 'utf8');
     const entries = input
         .trim()
         .split('\n')
         .filter(Boolean)
-        .map(line => DNS.parse(line));
+        .map(parseDNSLine);
     return entries;
 }
 async function reload() {
     const cmd = await exec('systemctl', ['restart', 'dnsmasq']);
     return cmd.ok || Promise.reject(new Error('Failed to reload'));
 }
-export default { add, remove, show, reload };
+function addDnsConfig(options) {
+    if (options && options.defaultTarget) {
+        dnsConfig.defaultTarget = options.defaultTarget;
+    }
+}
+function save(list) {
+    const txt = list.map(line => `address=/${line.domain}/${line.target}`);
+    console.log('save', filePath, txt);
+    fs.writeFileSync(filePath, txt.join('\n'));
+}
+export function parseDNSLine(line) {
+    const parts = line.match(lineParse);
+    return { domain: parts[1], target: parts[2] };
+}
+export default { add, remove, list, reload, [init]: addDnsConfig };

package/dist/index.spec.js

@@ -1,17 +1,25 @@
-import { DNS } from './index';
-import dns from './index';
+import dns, { parseDNSLine } from './index';
 import fs from 'fs';
 import * as exec from '@cloud-cli/exec';
+import { init } from '@cloud-cli/cli';
+beforeEach(() => {
+    jest.spyOn(fs, 'writeFileSync').mockImplementation();
+    jest.spyOn(fs, 'readFileSync').mockImplementation(() => '');
+});
 describe('dns', () => {
     it('should parse a DNS configuration line', () => {
         const line = 'address=/foo/1.2.3.4';
-        const output = DNS.parse(line);
+        const output = parseDNSLine(line);
         expect(output).toEqual({ target: '1.2.3.4', domain: 'foo' });
     });
     it('should load entries from file', () => {
+        let fileExists = false;
         const buffer = `address=/test/1.2.3.4\naddress=/foo/5.6.7.8`;
+        jest.spyOn(fs, 'existsSync').mockImplementation(() => fileExists);
         jest.spyOn(fs, 'readFileSync').mockImplementation(() => buffer);
-        const list = dns.show();
+        expect(dns.list()).toEqual([]);
+        fileExists = true;
+        const list = dns.list();
         expect(list).toEqual([
             { domain: 'test', target: '1.2.3.4' },
             { domain: 'foo', target: '5.6.7.8' },
@@ -40,4 +48,11 @@ describe('dns', () => {
             await expect(dns.reload()).rejects.toEqual(new Error('Failed to reload'));
         });
     });
+    describe('dns configuration', () => {
+        it('should configure the default target', () => {
+            dns[init]({ defaultTarget: '1.1.2.2' });
+            dns.add({ domain: 'bar' });
+            expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), 'address=/bar/1.1.2.2');
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dns",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -23,6 +23,7 @@
     "@cloud-cli/typescript-config": "^1.0.0"
   },
   "dependencies": {
+    "@cloud-cli/cli": "^1.6.0",
     "@cloud-cli/exec": "^1.0.4"
   }
 }

package/src/index.spec.ts

@@ -1,20 +1,31 @@
-import { DNS } from './index';
-import dns from './index';
+import dns, { parseDNSLine } from './index';
 import fs from 'fs';
 import * as exec from '@cloud-cli/exec';
+import { init } from '@cloud-cli/cli';
+
+beforeEach(() => {
+  jest.spyOn(fs, 'writeFileSync').mockImplementation();
+  jest.spyOn(fs, 'readFileSync').mockImplementation(() => '');
+});
 
 describe('dns', () => {
   it('should parse a DNS configuration line', () => {
     const line = 'address=/foo/1.2.3.4';
-    const output = DNS.parse(line);
+    const output = parseDNSLine(line);
+
     expect(output).toEqual({ target: '1.2.3.4', domain: 'foo' });
   });
 
   it('should load entries from file', () => {
+    let fileExists = false;
     const buffer = `address=/test/1.2.3.4\naddress=/foo/5.6.7.8`;
+    jest.spyOn(fs, 'existsSync').mockImplementation(() => fileExists);
     jest.spyOn(fs, 'readFileSync').mockImplementation(() => buffer);
 
-    const list = dns.show();
+    expect(dns.list()).toEqual([]);
+
+    fileExists = true;
+    const list = dns.list();
     expect(list).toEqual([
       { domain: 'test', target: '1.2.3.4' },
       { domain: 'foo', target: '5.6.7.8' },
@@ -52,4 +63,13 @@ describe('dns', () => {
       await expect(dns.reload()).rejects.toEqual(new Error('Failed to reload'));
     });
   });
-});
+
+  describe('dns configuration', () => {
+    it('should configure the default target', () => {
+      dns[init]({ defaultTarget: '1.1.2.2' });
+      dns.add({ domain: 'bar' });
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), 'address=/bar/1.1.2.2');
+    });
+  })
+});

package/src/index.ts

@@ -1,55 +1,55 @@
 import fs from 'fs';
 import { join } from 'path';
 import { exec } from '@cloud-cli/exec';
+import { init } from '@cloud-cli/cli';
+
+interface DNSConfig {
+  defaultTarget?: string;
+}
 
 const lineParse = /^address=\/(.+)\/(.+)$/;
-const filePath = join(process.cwd(), 'configuration/apps.conf');
+const filePath = join(process.cwd(), 'configuration', 'apps.conf');
+const dnsConfig: DNSConfig = {
+  defaultTarget: '127.0.0.1'
+};
 
-export class DNS {
-  static parse(line) {
-    const parts = line.match(lineParse);
-    return { domain: parts[1], target: parts[2] }
-  }
-}
 interface DomainAndTarget {
   domain: string;
   target?: string;
 }
 
 function add(input: DomainAndTarget) {
-  let list = show();
+  let current = list();
 
   if (!input.target) {
-    input.target = '127.0.0.1';
+    input.target = dnsConfig.defaultTarget;
   }
 
-  list = list.filter(item => item.domain !== input.domain);
-  list.push(input);
-  save(list);
+  current = current.filter(item => item.domain !== input.domain);
+  current.push(input);
+  save(current);
 
   return true;
 }
 
 function remove(input: DomainAndTarget) {
-  const list = show();
-  const newList = list.filter(item => item.domain !== input.domain)
+  const current = list();
+  const newList = current.filter(item => item.domain !== input.domain);
   save(newList);
-
   return true;
 }
 
-function save(list: DomainAndTarget[]) {
-  const txt = list.map(line => 'address=/' + line.domain + '/' + line.target);
-  fs.writeFileSync(filePath, txt.join('\n'));
-}
+function list(): DomainAndTarget[] {
+  if (!fs.existsSync(filePath)) {
+    return [];
+  }
 
-function show(): DomainAndTarget[] {
   const input = fs.readFileSync(filePath, 'utf8');
   const entries = input
     .trim()
     .split('\n')
     .filter(Boolean)
-    .map(line => DNS.parse(line))
+    .map(parseDNSLine)
 
   return entries;
 }
@@ -59,4 +59,21 @@ async function reload() {
   return cmd.ok || Promise.reject(new Error('Failed to reload'));
 }
 
-export default { add, remove, show, reload }
+function addDnsConfig(options: DNSConfig) {
+  if (options && options.defaultTarget) {
+    dnsConfig.defaultTarget = options.defaultTarget;
+  }
+}
+
+function save(list: DomainAndTarget[]) {
+  const txt = list.map(line => `address=/${line.domain}/${line.target}`);
+  console.log('save', filePath, txt);
+  fs.writeFileSync(filePath, txt.join('\n'));
+}
+
+export function parseDNSLine(line: string) {
+  const parts = line.match(lineParse);
+  return { domain: parts[1], target: parts[2] }
+}
+
+export default { add, remove, list, reload, [init]: addDnsConfig }