@cloud-cli/dns 2.0.1 → 2.0.3

package/dist/index.d.ts

@@ -1,7 +1,4 @@
 import { init } from '@cloud-cli/cli';
-interface DNSConfig {
-    defaultTarget?: string;
-}
 interface DomainAndTarget {
     domain: string;
     target?: string;
@@ -13,7 +10,7 @@ declare function get(options: {
     domain: string;
 }): DomainAndTarget | null;
 declare function reload(): Promise<true>;
-declare function addDnsConfig(options: DNSConfig): void;
+declare function addDnsConfig(): void;
 export declare function parseDNSLine(line: string): DomainAndTarget[];
 declare const _default: {
     add: typeof add;

package/dist/index.js

@@ -1,24 +1,24 @@
 import fs from 'node:fs';
 import { join } from 'node:path';
 import { exec } from '@cloud-cli/exec';
-import { init } from '@cloud-cli/cli';
+import { getConfig, init } from '@cloud-cli/cli';
 const filePath = join(process.cwd(), 'configuration', 'hosts.conf');
 const dnsConfig = {
-    defaultTarget: '127.0.0.1'
+    defaultTarget: '127.0.0.1',
 };
 function add(input) {
     let current = list();
     if (!input.target) {
         input.target = dnsConfig.defaultTarget;
     }
-    current = current.filter(item => item.domain !== input.domain);
+    current = current.filter((item) => item.domain !== input.domain);
     current.push(input);
     save(current);
     return true;
 }
 function remove(input) {
     const current = list();
-    const newList = current.filter(item => item.domain !== input.domain);
+    const newList = current.filter((item) => item.domain !== input.domain);
     save(newList);
     return true;
 }
@@ -27,38 +27,26 @@ function list() {
         return [];
     }
     const input = fs.readFileSync(filePath, 'utf8');
-    const entries = input
-        .trim()
-        .split('\n')
-        .filter(Boolean)
-        .flatMap(parseDNSLine);
+    const entries = input.trim().split('\n').filter(Boolean).flatMap(parseDNSLine);
     return entries;
 }
 function get(options) {
-    return list().filter(d => d.domain === options.domain)[0] || null;
+    return list().filter((d) => d.domain === options.domain)[0] || null;
 }
 async function reload() {
     const getPid = await exec('pidof', ['dnsmasq']);
     const cmd = await exec('kill', ['-s', 'HUP', getPid.stdout.trim()]);
     return cmd.ok || Promise.reject(new Error('Failed to reload'));
 }
-function addDnsConfig(options) {
-    if (options && options.defaultTarget) {
-        dnsConfig.defaultTarget = options.defaultTarget;
-    }
+function addDnsConfig() {
+    Object.assign(dnsConfig, getConfig('dns'));
 }
 function save(list) {
-    const targets = list.reduce((all, next) => {
-        var _a;
-        all[_a = next.target] || (all[_a] = []);
-        all[next.target].push(next.domain);
-        return all;
-    }, {});
-    const txt = Object.entries(targets).map(([ip, domains]) => `${ip} ${domains.join(' ')}`);
-    fs.writeFileSync(filePath, txt.join('\n').trim());
+    let lines = list.map(next => next.target + ' ' + next.domain);
+    fs.writeFileSync(filePath, lines.join('\n').trim());
 }
 export function parseDNSLine(line) {
     const [ip, ...domains] = line.split(/\s+/);
-    return domains.map(d => ({ domain: d, target: ip }));
+    return domains.map((d) => ({ domain: d, target: ip }));
 }
 export default { add, remove, list, reload, get, [init]: addDnsConfig };

package/dist/index.spec.js

@@ -4,9 +4,17 @@ import { init } from '@cloud-cli/cli';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 const execMocks = vi.hoisted(() => ({
     exec: vi.fn(),
+    getConfig: vi.fn(),
 }));
 vi.mock('get-port', () => ({ default: vi.fn().mockReturnValue(1234) }));
 vi.mock('@cloud-cli/exec', () => ({ exec: execMocks.exec }));
+vi.mock('@cloud-cli/cli', async (original) => {
+    const mod = await original();
+    return {
+        ...mod,
+        getConfig: execMocks.getConfig,
+    };
+});
 beforeEach(() => {
     vi.spyOn(fs, 'writeFileSync').mockImplementation(() => { });
     vi.spyOn(fs, 'readFileSync').mockImplementation(() => '');
@@ -51,12 +59,11 @@ describe('dns', () => {
         dns.add({ domain: 'foo', target: '2.3.4.5' });
         dns.add({ domain: 'bar', target: '2.3.4.5' });
         dns.add({ domain: 'baz' });
-        const lines = ['2.3.4.5 foo bar', '127.0.0.1 baz'];
         expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo');
-        expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo bar');
-        expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), lines.join('\n'));
+        expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo\n2.3.4.5 bar');
+        expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo\n2.3.4.5 bar\n127.0.0.1 baz');
         dns.remove({ domain: 'baz' });
-        expect(text).toBe(lines[0]);
+        expect(text).toBe('2.3.4.5 foo\n2.3.4.5 bar');
     });
     describe('reload', () => {
         it('should reload the DNS service', async () => {
@@ -74,7 +81,8 @@ describe('dns', () => {
     });
     describe('dns configuration', () => {
         it('should configure the default target', () => {
-            dns[init]({ defaultTarget: '1.1.2.2' });
+            execMocks.getConfig.mockReturnValue({ defaultTarget: '1.1.2.2' });
+            dns[init]();
             dns.add({ domain: 'bar' });
             expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '1.1.2.2 bar');
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dns",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",

package/src/index.spec.ts

@@ -5,10 +5,18 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 
 const execMocks = vi.hoisted(() => ({
   exec: vi.fn(),
+  getConfig: vi.fn(),
 }));
 
 vi.mock('get-port', () => ({ default: vi.fn().mockReturnValue(1234) }));
 vi.mock('@cloud-cli/exec', () => ({ exec: execMocks.exec }));
+vi.mock('@cloud-cli/cli', async (original) => {
+  const mod: any = await original();
+  return {
+    ...mod,
+    getConfig: execMocks.getConfig,
+  };
+});
 
 beforeEach(() => {
   vi.spyOn(fs, 'writeFileSync').mockImplementation(() => {});
@@ -65,14 +73,12 @@ describe('dns', () => {
     dns.add({ domain: 'bar', target: '2.3.4.5' });
     dns.add({ domain: 'baz' });
 
-    const lines = ['2.3.4.5 foo bar', '127.0.0.1 baz'];
-
     expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo');
-    expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo bar');
-    expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), lines.join('\n'));
+    expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo\n2.3.4.5 bar');
+    expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '2.3.4.5 foo\n2.3.4.5 bar\n127.0.0.1 baz');
 
     dns.remove({ domain: 'baz' });
-    expect(text).toBe(lines[0]);
+    expect(text).toBe('2.3.4.5 foo\n2.3.4.5 bar');
   });
 
   describe('reload', () => {
@@ -95,7 +101,8 @@ describe('dns', () => {
 
   describe('dns configuration', () => {
     it('should configure the default target', () => {
-      dns[init]({ defaultTarget: '1.1.2.2' });
+      execMocks.getConfig.mockReturnValue({ defaultTarget: '1.1.2.2' });
+      dns[init]();
       dns.add({ domain: 'bar' });
 
       expect(fs.writeFileSync).toHaveBeenCalledWith(expect.any(String), '1.1.2.2 bar');

package/src/index.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import { join } from 'node:path';
 import { exec } from '@cloud-cli/exec';
-import { init } from '@cloud-cli/cli';
+import { getConfig, init } from '@cloud-cli/cli';
 
 interface DNSConfig {
   defaultTarget?: string;
@@ -9,7 +9,7 @@ interface DNSConfig {
 
 const filePath = join(process.cwd(), 'configuration', 'hosts.conf');
 const dnsConfig: DNSConfig = {
-  defaultTarget: '127.0.0.1'
+  defaultTarget: '127.0.0.1',
 };
 
 interface DomainAndTarget {
@@ -24,7 +24,7 @@ function add(input: DomainAndTarget) {
     input.target = dnsConfig.defaultTarget;
   }
 
-  current = current.filter(item => item.domain !== input.domain);
+  current = current.filter((item) => item.domain !== input.domain);
   current.push(input);
   save(current);
 
@@ -33,7 +33,7 @@ function add(input: DomainAndTarget) {
 
 function remove(input: DomainAndTarget) {
   const current = list();
-  const newList = current.filter(item => item.domain !== input.domain);
+  const newList = current.filter((item) => item.domain !== input.domain);
   save(newList);
   return true;
 }
@@ -44,17 +44,13 @@ function list(): DomainAndTarget[] {
   }
 
   const input = fs.readFileSync(filePath, 'utf8');
-  const entries = input
-    .trim()
-    .split('\n')
-    .filter(Boolean)
-    .flatMap(parseDNSLine)
+  const entries = input.trim().split('\n').filter(Boolean).flatMap(parseDNSLine);
 
   return entries;
 }
 
-function get(options: { domain: string; }): DomainAndTarget | null {
-  return list().filter(d => d.domain === options.domain)[0] || null;
+function get(options: { domain: string }): DomainAndTarget | null {
+  return list().filter((d) => d.domain === options.domain)[0] || null;
 }
 
 async function reload() {
@@ -63,27 +59,18 @@ async function reload() {
   return cmd.ok || Promise.reject(new Error('Failed to reload'));
 }
 
-function addDnsConfig(options: DNSConfig) {
-  if (options && options.defaultTarget) {
-    dnsConfig.defaultTarget = options.defaultTarget;
-  }
+function addDnsConfig() {
+  Object.assign(dnsConfig, getConfig('dns'));
 }
 
 function save(list: DomainAndTarget[]) {
-  const targets: Record<string, string[]> = list.reduce((all, next) => {
-    all[next.target] ||= [];
-    all[next.target].push(next.domain);
-    return all;
-  }, {});
-
-  const txt = Object.entries(targets).map(([ip, domains]) => `${ip} ${domains.join(' ')}`);
-
-  fs.writeFileSync(filePath, txt.join('\n').trim());
+  let lines = list.map(next => next.target + ' ' + next.domain);
+  fs.writeFileSync(filePath, lines.join('\n').trim());
 }
 
 export function parseDNSLine(line: string): DomainAndTarget[] {
   const [ip, ...domains] = line.split(/\s+/);
-  return domains.map(d => ({ domain: d, target: ip }));
+  return domains.map((d) => ({ domain: d, target: ip }));
 }
 
-export default { add, remove, list, reload, get, [init]: addDnsConfig }
+export default { add, remove, list, reload, get, [init]: addDnsConfig };