oc 0.49.6 → 0.49.9

package/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';
@@ -9,10 +8,10 @@ import eventsHandler from './domain/events-handler';
 import * as middleware from './middleware';
 import * as pluginsInitialiser from './domain/plugins-initialiser';
 import Repository from './domain/repository';
-import * as router from './router';
+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 { Config, Plugin } from '../types';
 
 interface Input extends Partial<Omit<Config, 'beforePublish'>> {
   baseUrl: string;
@@ -27,7 +26,7 @@ export default function registry(inputOptions: Input) {
   const options = sanitiseOptions(inputOptions);
 
   const plugins: Plugin[] = [];
-  const app = middleware.bind(express(), options);
+  const { app, router } = middleware.bind(express(), options);
   let server: http.Server;
   const repository = Repository(options);
 
@@ -45,94 +44,64 @@ export default function registry(inputOptions: Input) {
     plugins.push(Object.assign(plugin, { callback }));
   };
 
-  const start = (
+  const start = async (
     callback: (
-      err: Error | null,
+      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;
-    }
-    router.create(app, options, repository);
-    async.waterfall(
-      [
-        (
-          cb: (
-            err: unknown,
-            data: Record<string, (...args: unknown[]) => unknown>
-          ) => void
-        ) => pluginsInitialiser.init(plugins, cb),
-
-        (
-          plugins: Record<string, (...args: unknown[]) => void>,
-          cb: (err: Error | null, data: ComponentsList | string) => void
-        ) => {
-          options.plugins = plugins;
-          repository.init(cb);
-        },
-
-        (
-          componentsInfo: ComponentsList,
-          cb: (err: string | null, data: ComponentsList) => void
-        ) => {
-          appStart(repository, options, (err: any) =>
-            cb(err ? err.msg : null, componentsInfo)
-          );
-        }
-      ],
-      (err, componentsInfo) => {
+    createRouter(router, options, repository);
+
+    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 {

package/src/registry/middleware/index.ts

@@ -1,6 +1,7 @@
 import express, { Express } from 'express';
 import errorhandler from 'errorhandler';
 import morgan from 'morgan';
+import Router from 'express-promise-router';
 
 import baseUrlHandler from './base-url-handler';
 import cors from './cors';
@@ -16,9 +17,13 @@ const bodyParserUrlEncodedArgument: { extended: boolean; limit?: number } = {
   extended: true
 };
 
-export const bind = (app: Express, options: Config): Express => {
+export const bind = (
+  app: Express,
+  options: Config
+): { app: Express; router: express.Router } => {
   app.set('port', options.port);
   app.set('json spaces', 0);
+  app.set('etag', 'strong');
 
   app.use((_req, res, next) => {
     res.conf = options;
@@ -48,5 +53,8 @@ export const bind = (app: Express, options: Config): Express => {
     app.use(errorhandler());
   }
 
-  return app;
+  const router = Router();
+  app.use(router);
+
+  return { app, router };
 };

package/src/registry/router.ts

@@ -8,14 +8,10 @@ import StaticRedirectorRoute from './routes/static-redirector';
 import PluginsRoute from './routes/plugins';
 import DependenciesRoute from './routes/dependencies';
 import settings from '../resources/settings';
-import { Express } from 'express';
+import { Router } from 'express';
 import { Config, Repository } from '../types';
 
-export function create(
-  app: Express,
-  conf: Config,
-  repository: Repository
-): Express {
+export function create(app: Router, conf: Config, repository: Repository) {
   const routes = {
     component: ComponentRoute(conf, repository),
     components: ComponentsRoute(conf, repository),
@@ -85,8 +81,4 @@ export function create(
       ](route.route, route.handler)
     );
   }
-
-  app.set('etag', 'strong');
-
-  return app;
 }

package/src/registry/routes/component-info.ts

@@ -1,5 +1,6 @@
 import parseAuthor from 'parse-author';
 import _ from 'lodash';
+import { fromPromise } from 'universalify';
 
 import * as getComponentFallback from './helpers/get-component-fallback';
 import infoView from '../views/info';
@@ -64,7 +65,7 @@ function componentInfo(
       typeof component.repository === 'string' ? component.repository : null
     );
 
-    isUrlDiscoverable(href, (_err, result) => {
+    fromPromise(isUrlDiscoverable)(href, (_err, result) => {
       if (!result.isDiscoverable) {
         href = `//${req.headers.host}${res.conf.prefix}`;
       }
@@ -95,10 +96,10 @@ export default function componentInfoRoute(
   repository: Repository
 ) {
   return function (req: Request, res: Response): void {
-    repository.getComponent(
+    fromPromise(repository.getComponent)(
       req.params['componentName'],
       req.params['componentVersion'],
-      (registryError, component) => {
+      (registryError: any, component) => {
         if (registryError && conf.fallbackRegistryUrl) {
           return getComponentFallback.getComponentInfo(
             conf,

package/src/registry/routes/component-preview.ts

@@ -3,6 +3,7 @@ import previewView from '../views/preview';
 import * as urlBuilder from '../domain/url-builder';
 import { Request, Response } from 'express';
 import { Component, Config, TemplateInfo, Repository } from '../../types';
+import { fromPromise } from 'universalify';
 
 function componentPreview(
   err: any,
@@ -50,10 +51,10 @@ export default function componentPreviewRoute(
   repository: Repository
 ) {
   return (req: Request, res: Response): void => {
-    repository.getComponent(
+    fromPromise(repository.getComponent)(
       req.params['componentName'],
       req.params['componentVersion'],
-      (registryError, component) => {
+      (registryError: any, component) => {
         if (registryError && conf.fallbackRegistryUrl) {
           return getComponentFallback.getComponentPreview(
             conf,

package/src/registry/routes/components.ts

@@ -50,7 +50,7 @@ export default function components(
 
     if (!_.isEmpty(components)) {
       const errors = _.compact(
-        _.map(components, (component, index) => {
+        components.map((component, index) => {
           return !component.name
             ? registryErrors.BATCH_ROUTE_COMPONENT_NAME_MISSING(index)
             : '';

package/src/registry/routes/helpers/get-component-fallback.ts

@@ -4,6 +4,7 @@ import request from 'minimal-request';
 import url from 'url';
 import { Component, Config } from '../../../types';
 import * as urlBuilder from '../../domain/url-builder';
+import { GetComponentResult } from './get-component';
 
 type ComponentCallback = (
   err: { registryError: any; fallbackError: any } | null,
@@ -77,14 +78,7 @@ export function getComponent(
   fallbackRegistryUrl: string,
   headers: IncomingHttpHeaders,
   component: { name: string; version: string; parameters: IncomingHttpHeaders },
-  callback: (
-    result:
-      | {
-          status: number;
-          response: { code: string; error: Error };
-        }
-      | Component
-  ) => void
+  callback: (result: GetComponentResult) => void
 ): void {
   return request(
     {
@@ -94,7 +88,7 @@ export function getComponent(
       json: true,
       body: { components: [component] }
     },
-    (err, res: Component[]) => {
+    (err, res: GetComponentResult[]) => {
       if (err || !res || res.length === 0) {
         return callback({
           status: 404,

package/src/registry/routes/helpers/get-component.ts

@@ -20,8 +20,9 @@ import * as urlBuilder from '../../domain/url-builder';
 import * as validator from '../../domain/validators';
 import { Config, Repository } from '../../../types';
 import { IncomingHttpHeaders } from 'http';
+import { fromPromise } from 'universalify';
 
-interface Options {
+export interface RendererOptions {
   conf: Config;
   headers: IncomingHttpHeaders;
   ip: string;
@@ -31,7 +32,7 @@ interface Options {
   omitHref?: boolean;
 }
 
-export type GetComponentResult = {
+export interface GetComponentResult {
   status: number;
   headers?: Record<string, string>;
   response: {
@@ -39,6 +40,7 @@ export type GetComponentResult = {
     code?: string;
     error?: unknown;
     version?: string;
+    html?: string;
     requestVersion?: string;
     name?: string;
     details?: {
@@ -49,7 +51,7 @@ export type GetComponentResult = {
     missingPlugins?: string[];
     missingDependencies?: string[];
   };
-};
+}
 
 export default function getComponent(conf: Config, repository: Repository) {
   const client = Client({ templates: conf.templates });
@@ -59,7 +61,7 @@ export default function getComponent(conf: Config, repository: Repository) {
   });
 
   const renderer = function (
-    options: Options,
+    options: RendererOptions,
     cb: (result: GetComponentResult) => void
   ) {
     const nestedRenderer = NestedRenderer(renderer, options.conf);
@@ -97,7 +99,7 @@ export default function getComponent(conf: Config, repository: Repository) {
       parameters: options.parameters
     };
 
-    repository.getComponent(
+    fromPromise(repository.getComponent)(
       requestedComponent.name,
       requestedComponent.version,
       (err, component) => {
@@ -372,7 +374,7 @@ export default function getComponent(conf: Config, repository: Repository) {
             if (!!cached && !conf.hotReloading) {
               returnResult(cached);
             } else {
-              repository.getCompiledView(
+              fromPromise(repository.getCompiledView)(
                 component.name,
                 component.version,
                 (_err, templateText) => {
@@ -419,8 +421,8 @@ export default function getComponent(conf: Config, repository: Repository) {
             env: conf.env,
             params,
             plugins: conf.plugins,
-            renderComponent: nestedRenderer.renderComponent,
-            renderComponents: nestedRenderer.renderComponents,
+            renderComponent: fromPromise(nestedRenderer.renderComponent),
+            renderComponents: fromPromise(nestedRenderer.renderComponents),
             requestHeaders: options.headers,
             requestIp: options.ip,
             setEmptyResponse,
@@ -464,7 +466,7 @@ export default function getComponent(conf: Config, repository: Repository) {
               return returnComponent(e, undefined);
             }
           } else {
-            repository.getDataProvider(
+            fromPromise(repository.getDataProvider)(
               component.name,
               component.version,
               (err, dataProvider) => {

package/src/registry/routes/helpers/is-url-discoverable.ts

@@ -1,19 +1,18 @@
-import request from 'minimal-request';
+import got from 'got';
 
-export default function isUrlDiscoverable(
-  url: string,
-  callback: (err: null | null, data: { isDiscoverable: boolean }) => void
-): void {
-  request(
-    {
-      url,
+export default async function isUrlDiscoverable(
+  url: string
+): Promise<{ isDiscoverable: boolean }> {
+  try {
+    const res = await got(url, {
       headers: { accept: 'text/html' }
-    },
-    (err, _body, details) => {
-      const isHtml = () =>
-        details.response.headers['content-type'].indexOf('text/html') >= 0;
+    });
+    const isHtml = !!res.headers['content-type']?.includes('text/html');
 
-      callback(null, { isDiscoverable: !err && isHtml() });
-    }
-  );
+    return {
+      isDiscoverable: isHtml
+    };
+  } catch (err) {
+    return { isDiscoverable: false };
+  }
 }

package/src/registry/routes/index.ts

@@ -13,6 +13,7 @@ import { Author, Component, ParsedComponent, Repository } from '../../types';
 import { NextFunction, Request, Response } from 'express';
 import { IncomingHttpHeaders } from 'http';
 import { PackageJson } from 'type-fest';
+import { fromPromise } from 'universalify';
 
 const packageInfo: PackageJson = fs.readJsonSync(
   path.join(__dirname, '..', '..', '..', 'package.json')
@@ -31,7 +32,7 @@ const isHtmlRequest = (headers: IncomingHttpHeaders) =>
 
 export default function (repository: Repository) {
   return (req: Request, res: Response, next: NextFunction): void => {
-    repository.getComponents((err, components) => {
+    fromPromise(repository.getComponents)((err, components) => {
       if (err) {
         res.errorDetails = 'cdn not available';
         res.status(404).json({ error: res.errorDetails });
@@ -52,24 +53,28 @@ export default function (repository: Repository) {
         async.each(
           components,
           (component, callback) =>
-            repository.getComponent(component, (err, result) => {
-              if (err) return callback(err as any);
+            fromPromise(repository.getComponent)(
+              component,
+              undefined,
+              (err, result) => {
+                if (err) return callback(err as any);
 
-              if (result.oc && result.oc.date) {
-                result.oc.stringifiedDate = dateStringified(
-                  new Date(result.oc.date)
-                );
-              }
+                if (result.oc && result.oc.date) {
+                  result.oc.stringifiedDate = dateStringified(
+                    new Date(result.oc.date)
+                  );
+                }
 
-              componentsInfo.push(mapComponentDetails(result));
-              componentsReleases += result.allVersions.length;
-              callback();
-            }),
+                componentsInfo.push(mapComponentDetails(result));
+                componentsReleases += result.allVersions.length;
+                callback();
+              }
+            ),
           err => {
             if (err) return next(err);
 
             componentsInfo = _.sortBy(componentsInfo, 'name');
-            repository.getComponentsDetails((err, details) => {
+            fromPromise(repository.getComponentsDetails)((err, details) => {
               // eslint-disable-next-line no-console
               if (err) console.log(err);
               res.send(

package/src/registry/routes/publish.ts

@@ -5,7 +5,7 @@ import { Request, Response } from 'express';
 import { Repository } from '../../types';
 
 export default function publish(repository: Repository) {
-  return function (req: Request, res: Response): void {
+  return async function (req: Request, res: Response): Promise<void> {
     if (!req.params['componentName'] || !req.params['componentVersion']) {
       res.errorDetails = 'malformed request';
       res.status(409).json({ error: res.errorDetails });
@@ -53,40 +53,37 @@ export default function publish(repository: Repository) {
       return;
     }
 
-    extractPackage(files, (err, pkgDetails) => {
-      if (err) {
-        res.errorDetails = `Package is not valid: ${err}`;
-        res.status(500).json({ error: 'package is not valid', details: err });
-        return;
-      }
-
-      repository.publishComponent(
-        pkgDetails,
-        req.params['componentName'],
-        req.params['componentVersion'],
-        err => {
-          if (err) {
-            if (err.code === 'not_allowed') {
-              res.errorDetails = `Publish not allowed: ${err.msg}`;
-              return res.status(403).json({ error: err.msg });
-            } else if (err.code === 'already_exists') {
-              res.errorDetails = `Component already exists: ${err.msg}`;
-              return res.status(403).json({ error: err.msg });
-            } else if (err.code === 'name_not_valid') {
-              res.errorDetails = `Component name not valid: ${err.msg}`;
-              return res.status(409).json({ error: err.msg });
-            } else if (err.code === 'version_not_valid') {
-              res.errorDetails = `Component version not valid: ${err.msg}`;
-              return res.status(409).json({ error: err.msg });
-            } else {
-              res.errorDetails = `Publish failed: ${err.msg}`;
-              return res.status(500).json({ error: err.msg });
-            }
-          }
+    try {
+      const pkgDetails = await extractPackage(files);
 
-          return res.status(200).json({ ok: true });
+      try {
+        await repository.publishComponent(
+          pkgDetails,
+          req.params['componentName'],
+          req.params['componentVersion']
+        );
+        res.status(200).json({ ok: true });
+      } catch (err: any) {
+        if (err.code === 'not_allowed') {
+          res.errorDetails = `Publish not allowed: ${err.msg}`;
+          res.status(403).json({ error: err.msg });
+        } else if (err.code === 'already_exists') {
+          res.errorDetails = `Component already exists: ${err.msg}`;
+          res.status(403).json({ error: err.msg });
+        } else if (err.code === 'name_not_valid') {
+          res.errorDetails = `Component name not valid: ${err.msg}`;
+          res.status(409).json({ error: err.msg });
+        } else if (err.code === 'version_not_valid') {
+          res.errorDetails = `Component version not valid: ${err.msg}`;
+          res.status(409).json({ error: err.msg });
+        } else {
+          res.errorDetails = `Publish failed: ${err.msg}`;
+          res.status(500).json({ error: err.msg });
         }
-      );
-    });
+      }
+    } catch (err) {
+      res.errorDetails = `Package is not valid: ${err}`;
+      res.status(500).json({ error: 'package is not valid', details: err });
+    }
   };
 }

package/src/registry/views/info.ts

@@ -73,8 +73,11 @@ export default function info(vm: Vm): string {
     <div class="field"><p>Accept-Language header:</p></div>
     <input class="w-100" id="lang" type="text" value="*" />
     <h3>
-      Preview
-      <a class="refresh-preview" href="#refresh">(Refresh)</a>
+      Preview (
+      <a class="refresh-preview" href="#refresh">Refresh</a>
+      |
+      <a class="open-preview" href="#open">Open</a>
+      )
     </h3>
     <iframe class="preview" src="~preview/${sandBoxDefaultQs}"></iframe>`;
 

package/src/registry/views/static/info.ts

@@ -7,7 +7,7 @@ oc.cmd.push(function() {
     window.location = thisComponentHref + $(this).val() + '/~info';
   });
 
-  $('.refresh-preview').click(function() {
+  var refreshPreview = function() {
     var splitted = $('#href')
         .val()
         .split('?'),
@@ -27,6 +27,17 @@ oc.cmd.push(function() {
 
     $('.preview').attr('src', url);
 
+    return false;
+  };
+  $('.refresh-preview').click(refreshPreview);
+
+  $('.open-preview').click(function() {
+    refreshPreview();
+    var url = $('.preview').attr('src');
+
+    window.open(url, '_blank');
     return false;
   });
+
+
 });`;

package/src/resources/settings.ts

@@ -3,7 +3,7 @@ export default {
     src: './oc.json'
   },
   filesToIgnoreOnDevWatch:
-    /node_modules|package\.tar\.gz|_package|\.sw[op]|\.git\/|\.idea\/|\.DS_Store|oc\.json/,
+    /temp\/__oc|node_modules|package\.tar\.gz|_package|\.sw[op]|\.git\/|\.idea\/|\.DS_Store|oc\.json/,
   maxLoopIterations: 1e9,
   registry: {
     acceptRenderedHeader: 'application/vnd.oc.rendered+json',