Aggregates fetching of records from zone and redirections

tests/domain-service.test.js

@@ -1,20 +1,24 @@
 const R = require('ramda');
 const { getDomainService } = require('../utils/domain-service');
 
-const getCpanel = ({ onSet, onGet } = {}) => ({
-  addZoneRecord: (host) => onSet(host),
-  fetchZoneRecords: (_) => onGet(),
+const getCpanel = ({ zone, redir, setZone, setRedir } = {}) => ({
+  addZoneRecord: (host) => setZone(host),
+  addRedirection: (_) => setRedir(),
+  fetchZoneRecords: (_) => zone(),
+  fetchRedirections: (_) => redir(),
 });
 
 describe('Domain service', () => {
   describe('getHosts', () => {
     it('should resolve with a list of hosts', async () => {
-      const hosts = [
+      const zones = [
         { name: 'xx', type: 'CNAME', address: 'fck.com.' },
         { name: 'xx', type: 'A', address: '111.1.1212.1' },
       ];
-      const onGet = async () => hosts;
-      const mockDomainService = getDomainService({ cpanel: getCpanel({ onGet }) });
+      const redirections = [];
+      const zone = async () => zones;
+      const redir = async () => redirections;
+      const mockDomainService = getDomainService({ cpanel: getCpanel({ zone, redir }) });
       const list = await mockDomainService.getHosts();
 
       expect(list).toEqual([
@@ -22,23 +26,45 @@ describe('Domain service', () => {
         { name: 'xx', type: 'A', address: '111.1.1212.1' },
       ]);
     });
-  });
 
-  describe('setHosts', () => {
-    it('should resolve with a list of hosts', async () => {
-      const records = [ { x: 'y' }, { z: 'a' } ];
+    it('should resolve with a redirections', async () => {
+      const zones = [
+        { name: 'xx', type: 'CNAME', address: 'fck.com.' },
+        { name: 'xx', type: 'A', address: '111.1.1212.1' },
+      ];
+      const redirections = [
+        { domain: 'foo.booboo.xyz', destination: 'https://google.com' },
+        { domain: 'foo1.booboo.xyz', destination: 'https://duck.com' },
+      ];
+      const zone = async () => zones;
+      const redir = async () => redirections;
+      const mockDomainService = getDomainService({ cpanel: getCpanel({ zone, redir }) });
+      const list = await mockDomainService.getHosts();
 
-      const onSet = jest.fn(async () => {});
-
-      const mockDomainService = getDomainService({ cpanel: getCpanel({ onSet }) });
-      await mockDomainService.setHosts(records);
-
-      expect(onSet).toBeCalledTimes(2);
-      expect(onSet.mock.calls.map(R.head)).toEqual([ { x: 'y' }, { z: 'a' } ]);
+      expect(list).toEqual([
+        { name: 'xx', type: 'CNAME', address: 'fck.com' },
+        { name: 'xx', type: 'A', address: '111.1.1212.1' },
+        { name: 'foo', type: 'URL', address: 'https://google.com' },
+        { name: 'foo1', type: 'URL', address: 'https://duck.com' },
+      ]);
     });
   });
 
   return;
+  describe('setHosts', () => {
+    it('should resolve with a list of hosts', async () => {
+      const records = [ { x: 'y' }, { z: 'a' } ];
+
+      const setZone = jest.fn(async () => {});
+
+      const mockDomainService = getDomainService({ cpanel: getCpanel({ setZone }) });
+      await mockDomainService.setHosts(records);
+
+      expect(setZone).toBeCalledTimes(2);
+      expect(setZone.mock.calls.map(R.head)).toEqual([ { x: 'y' }, { z: 'a' } ]);
+    });
+  });
+
 
   describe('updateHosts', () => {
     it('should append new hosts with existing ones and set it', async () => {

utils/domain-service.js

@@ -1,19 +1,29 @@
 const R = require('ramda');
 const { cpanel } = require('./lib/cpanel');
+const {DOMAIN_DOMAIN} = require('./constants');
 
 const flattenPromise = xs => Promise.all(xs);
 
 const getDomainService = ({ cpanel }) => {
   let hostList = [];
 
+  const fetchZoneRecords = () => cpanel.fetchZoneRecords().then(R.map(host => ({
+    ...host,
+    name: `${host.name}`,
+    type: `${host.type}`,
+    address: `${host.cname || host.address}`.replace(/\.$/g, ''),
+  })));
+
+  const fetchRedirections = () => cpanel.fetchRedirections().then(R.map(host => ({
+    name: `${host.domain}`.replace('.' + DOMAIN_DOMAIN, ''),
+    type: 'URL',
+    address: `${host.destination}`,
+  })));
+
   const getHosts = async () => {
     if (hostList.length) return hostList;
 
-    const list = await cpanel.fetchZoneRecords()
-      .then(R.map(host => R.omit(['Name', 'Type'], {
-        ...host,
-        address: `${host.cname || host.address}`.replace(/\.$/g, ''),
-      })));
+    const list = await Promise.all([fetchZoneRecords(), fetchRedirections()]).then(R.flatten);
 
     hostList = list;
     return list;

utils/lib/cpanel.js

@@ -51,7 +51,10 @@ const CpanelClient = (options) => {
 
     // {}
     //     -> {  }
-    fetchRedirections: uapi('Mime', 'list_redirects'),
+    fetchRedirections: R.compose(
+      p => p.then(R.pathOr([], ['data'])),
+      uapi('Mime', 'list_redirects'),
+    ),
   };
 };