@cloud-cli/dns 1.0.0 → 1.0.2

package/dist/index.d.ts

@@ -10,12 +10,12 @@ 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 const _default: {
     add: typeof add;
     remove: typeof remove;
-    show: typeof show;
+    list: typeof list;
     reload: typeof reload;
 };
 export default _default;

package/dist/index.js

@@ -10,18 +10,18 @@ export class DNS {
     }
 }
 function add(input) {
-    let list = show();
+    let current = list();
     if (!input.target) {
         input.target = '127.0.0.1';
     }
-    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;
 }
@@ -29,7 +29,10 @@ 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()
@@ -42,4 +45,4 @@ 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 };
+export default { add, remove, list, reload };

package/dist/index.spec.js

@@ -9,9 +9,13 @@ describe('dns', () => {
         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' },

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@cloud-cli/dns",
-  "version": "1.0.0",
+  "version": "1.0.2",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "type": "module",
   "scripts": {
     "build": "tsc",
     "test": "jest",

package/src/index.spec.ts

@@ -11,10 +11,15 @@ describe('dns', () => {
   });
 
   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 +57,4 @@ describe('dns', () => {
       await expect(dns.reload()).rejects.toEqual(new Error('Failed to reload'));
     });
   });
-});
+});

package/src/index.ts

@@ -11,28 +11,29 @@ export class DNS {
     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';
   }
 
-  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;
@@ -43,7 +44,9 @@ function save(list: DomainAndTarget[]) {
   fs.writeFileSync(filePath, txt.join('\n'));
 }
 
-function show(): DomainAndTarget[] {
+function list(): DomainAndTarget[] {
+  if (!fs.existsSync(filePath)) { return []; }
+
   const input = fs.readFileSync(filePath, 'utf8');
   const entries = input
     .trim()
@@ -59,4 +62,4 @@ async function reload() {
   return cmd.ok || Promise.reject(new Error('Failed to reload'));
 }
 
-export default { add, remove, show, reload }
+export default { add, remove, list, reload }