Merge branch 'callback-to-promises' into nested-renderer-to-promise

Author: ricardo-devis-agullo

src/registry/index.ts

@@ -1,4 +1,3 @@
-import async from 'async';
 import colors from 'colors/safe';
 import express from 'express';
 import http from 'http';
@@ -12,17 +11,15 @@ import Repository from './domain/repository';
 import { create as createRouter } from './router';
 import sanitiseOptions from './domain/options-sanitiser';
 import * as validator from './domain/validators';
-import { ComponentsList, Config, Plugin } from '../types';
-import { fromPromise } from 'universalify';
+import { Config, Plugin } from '../types';
 
 interface Input extends Partial<Omit<Config, 'beforePublish'>> {
   baseUrl: string;
 }
 
 export default function registry(inputOptions: Input) {
-  const validationResult = validator.validateRegistryConfiguration(
-    inputOptions
-  );
+  const validationResult =
+    validator.validateRegistryConfiguration(inputOptions);
   if (!validationResult.isValid) {
     throw validationResult.message;
   }
@@ -47,87 +44,64 @@ export default function registry(inputOptions: Input) {
     plugins.push(Object.assign(plugin, { callback }));
   };
 
-  const start = (
-    callback: Callback<{ app: express.Express; server: http.Server }>
+  const start = async (
+    callback: (
+      err: unknown,
+      data: { app: express.Express; server: http.Server }
+    ) => void
   ) => {
     // eslint-disable-next-line no-console
     const ok = (msg: string) => console.log(colors.green(msg));
-    if (typeof callback !== 'function') {
-      callback = _.noop;
-    }
     createRouter(router, options, repository);
-    async.waterfall(
-      [
-        (cb: Callback<Dictionary<(...args: unknown[]) => unknown>, unknown>) =>
-          fromPromise(pluginsInitialiser.init)(plugins, cb),
-
-        (
-          plugins: Dictionary<(...args: unknown[]) => void>,
-          cb: Callback<ComponentsList | string, unknown>
-        ) => {
-          options.plugins = plugins;
-          fromPromise(repository.init)(cb);
-        },
-
-        (
-          componentsInfo: ComponentsList,
-          cb: Callback<ComponentsList, string>
-        ) => {
-          fromPromise(appStart)(repository, options, (err: any) =>
-            cb(err ? err.msg : null, componentsInfo)
-          );
-        }
-      ],
-      (err, componentsInfo) => {
+
+    try {
+      options.plugins = await pluginsInitialiser.init(plugins);
+      const componentsInfo = await repository.init();
+      await appStart(repository, options);
+
+      server = http.createServer(app);
+      server.timeout = options.timeout;
+      if (options.keepAliveTimeout) {
+        server.keepAliveTimeout = options.keepAliveTimeout;
+      }
+
+      // @ts-ignore Type not taking error on callback (this can error, though)
+      server.listen(options.port, (err: any) => {
         if (err) {
           return callback(err, undefined as any);
         }
-
-        server = http.createServer(app);
-        server.timeout = options.timeout;
-        if (options.keepAliveTimeout) {
-          server.keepAliveTimeout = options.keepAliveTimeout;
-        }
-
-        // @ts-ignore Type not taking error on callback (this can error, though)
-        server.listen(options.port, (err: any) => {
-          if (err) {
-            return callback(err, undefined as any);
-          }
-          eventsHandler.fire('start', {});
-
-          if (options.verbosity) {
-            ok(`Registry started at port ${app.get('port')}`);
-
-            if (_.isObject(componentsInfo)) {
-              const componentsNumber = Object.keys(
-                // @ts-ignore
-                componentsInfo.components
-              ).length;
-              const componentsReleases = _.reduce(
-                // @ts-ignore
-                componentsInfo.components,
-                (memo, component) => parseInt(memo, 10) + component.length
-              );
-
-              ok(
-                `Registry serving ${componentsNumber} components for a total of ${componentsReleases} releases.`
-              );
-            }
+        eventsHandler.fire('start', {});
+
+        if (options.verbosity) {
+          ok(`Registry started at port ${app.get('port')}`);
+
+          if (_.isObject(componentsInfo)) {
+            const componentsNumber = Object.keys(
+              componentsInfo.components
+            ).length;
+            const componentsReleases = Object.values(
+              componentsInfo.components
+            ).reduce((acc, component) => acc + component.length, 0);
+
+            ok(
+              `Registry serving ${componentsNumber} components for a total of ${componentsReleases} releases.`
+            );
           }
+        }
 
-          callback(null, { app, server });
-        });
+        callback(null, { app, server });
+      });
 
-        server.on('error', error => {
-          eventsHandler.fire('error', {
-            code: 'EXPRESS_ERROR',
-            message: error?.message ?? String(error)
-          });
-          callback(error, undefined as any);
+      server.on('error', error => {
+        eventsHandler.fire('error', {
+          code: 'EXPRESS_ERROR',
+          message: error?.message ?? String(error)
         });
-      }
-    );
+        callback(error, undefined as any);
+      });
+    } catch (err) {
+      callback((err as any)?.msg || err, undefined as any);
+    }
   };
 
   return {