oc 0.49.6 → 0.49.9

package/dist/registry/domain/nested-renderer.js

@@ -1,95 +1,59 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __importDefault(require("async"));
-const lodash_1 = __importDefault(require("lodash"));
-const settings_1 = __importDefault(require("../../resources/settings"));
-const resources_1 = __importDefault(require("../../resources"));
-const sanitise = {
-    componentParams(component, options, callback) {
-        return {
-            ...sanitise.options(options, callback),
-            componentName: component
-        };
-    },
-    componentsParams(components, options, callback) {
-        return {
-            ...sanitise.options(options, callback),
-            components: components
-        };
-    },
-    headers(h = {}) {
-        return {
-            ...h,
-            accept: settings_1.default.registry.acceptRenderedHeader
-        };
-    },
-    options(options, callback) {
-        const cb = !callback && typeof options === 'function' ? options : callback;
-        const opts = typeof options === 'function' ? {} : options;
-        return { callback: cb, options: opts };
-    }
-};
-const validate = {
-    callback(c) {
-        if (!c || typeof c !== 'function') {
-            throw new Error(resources_1.default.errors.registry.NESTED_RENDERER_CALLBACK_IS_NOT_VALID);
-        }
-    },
-    componentParams(params) {
-        if (!params.componentName) {
-            throw new Error(resources_1.default.errors.registry.NESTED_RENDERER_COMPONENT_NAME_IS_NOT_VALID);
-        }
-        validate.callback(params.callback);
-    },
-    componentsParams(params) {
-        if (lodash_1.default.isEmpty(params.components)) {
-            throw new Error(resources_1.default.errors.registry.NESTED_RENDERER_COMPONENTS_IS_NOT_VALID);
-        }
-        validate.callback(params.callback);
-    }
-};
-function nestedRenderer(renderer, conf) {
-    return {
-        renderComponent(componentName, renderOptions, callback) {
-            const p = sanitise.componentParams(componentName, renderOptions, callback);
-            validate.componentParams(p);
-            return renderer({
-                conf: conf,
-                headers: sanitise.headers(p.options.headers),
-                name: componentName,
-                parameters: p.options.parameters || {},
-                version: p.options.version || ''
-            }, (result) => {
-                if (result.response.error) {
-                    return p.callback(result.response.error, undefined);
-                }
-                else {
-                    return p.callback(null, result.response.html);
-                }
-            });
-        },
-        renderComponents(components, renderOptions, callback) {
-            const p = sanitise.componentsParams(components, renderOptions, callback);
-            validate.componentsParams(p);
-            async_1.default.map(p.components, (component, cb) => {
-                renderer({
-                    conf: conf,
-                    headers: sanitise.headers(p.options.headers),
-                    name: component.name,
-                    parameters: {
-                        ...p.options.parameters,
-                        ...component.parameters
-                    },
-                    version: component.version || ''
-                }, (result) => {
-                    const error = result.response.error;
-                    cb(null, error ? new Error(error) : result.response.html);
-                });
-            }, p.callback);
-        }
-    };
-}
-exports.default = nestedRenderer;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const settings_1 = __importDefault(require("../../resources/settings"));
+const resources_1 = __importDefault(require("../../resources"));
+function nestedRenderer(rendererWithCallback, conf) {
+    const renderer = (options) => new Promise((res, rej) => {
+        rendererWithCallback(options, result => {
+            if (result.response.error) {
+                rej(result.response.error);
+            }
+            else {
+                res(result.response.html);
+            }
+        });
+    });
+    return {
+        renderComponent(componentName, options = {}) {
+            if (!componentName) {
+                throw new Error(resources_1.default.errors.registry.NESTED_RENDERER_COMPONENT_NAME_IS_NOT_VALID);
+            }
+            return renderer({
+                conf: conf,
+                ip: options.ip || '',
+                headers: {
+                    ...options.headers,
+                    accept: settings_1.default.registry.acceptRenderedHeader
+                },
+                name: componentName,
+                parameters: options.parameters || {},
+                version: options.version || ''
+            });
+        },
+        renderComponents(components, options = {}) {
+            if (!components || !components.length) {
+                throw new Error(resources_1.default.errors.registry.NESTED_RENDERER_COMPONENTS_IS_NOT_VALID);
+            }
+            return Promise.all(components.map(component => {
+                return renderer({
+                    conf: conf,
+                    headers: {
+                        ...options.headers,
+                        accept: settings_1.default.registry.acceptRenderedHeader
+                    },
+                    ip: component.ip || '',
+                    name: component.name,
+                    parameters: {
+                        ...options.parameters,
+                        ...component.parameters
+                    },
+                    version: component.version || ''
+                }).catch(err => new Error(err));
+            }));
+        }
+    };
+}
+exports.default = nestedRenderer;

package/dist/registry/domain/options-sanitiser.d.ts

@@ -1,6 +1,6 @@
-import { Config } from '../../types';
-interface Input extends Partial<Omit<Config, 'beforePublish'>> {
-    baseUrl: string;
-}
-export default function optionsSanitiser(input: Input): Config;
-export {};
+import { Config } from '../../types';
+interface Input extends Partial<Omit<Config, 'beforePublish'>> {
+    baseUrl: string;
+}
+export default function optionsSanitiser(input: Input): Config;
+export {};

package/dist/registry/domain/options-sanitiser.js

@@ -1,104 +1,106 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
-const settings_1 = __importDefault(require("../../resources/settings"));
-const auth = __importStar(require("./authentication"));
-const DEFAULT_NODE_KEEPALIVE_MS = 5000;
-function optionsSanitiser(input) {
-    const options = lodash_1.default.clone(input);
-    if (!options.publishAuth) {
-        options.beforePublish = (_req, _res, next) => next();
-    }
-    else {
-        options.beforePublish = auth.middleware(options.publishAuth);
-    }
-    if (!options.publishValidation) {
-        options.publishValidation = () => ({
-            isValid: true
-        });
-    }
-    if (!options.prefix) {
-        options.prefix = '/';
-    }
-    const hasTrailingPrefix = new RegExp(options.prefix + '$');
-    if (!options.baseUrl.match(hasTrailingPrefix)) {
-        options.baseUrl = options.baseUrl.replace(/\/$/, '') + options.prefix;
-    }
-    if (!options.tempDir) {
-        options.tempDir = settings_1.default.registry.defaultTempPath;
-    }
-    if (typeof options.hotReloading !== 'boolean') {
-        options.hotReloading = !!options.local;
-    }
-    if (!options.verbosity) {
-        options.verbosity = 0;
-    }
-    if (typeof options.discovery === 'undefined') {
-        options.discovery = true;
-    }
-    if (typeof options.pollingInterval === 'undefined') {
-        options.pollingInterval = 5;
-    }
-    if (!options.templates) {
-        options.templates = [];
-    }
-    if (typeof options.fallbackRegistryUrl !== 'undefined' &&
-        lodash_1.default.last(options.fallbackRegistryUrl) !== '/') {
-        options.fallbackRegistryUrl += '/';
-    }
-    options.customHeadersToSkipOnWeakVersion = (options.customHeadersToSkipOnWeakVersion || []).map(s => s.toLowerCase());
-    options.port = options.port || process.env['PORT'] || 3000;
-    options.timeout = options.timeout || 1000 * 60 * 2;
-    options.keepAliveTimeout =
-        options.keepAliveTimeout || DEFAULT_NODE_KEEPALIVE_MS;
-    if (options.s3) {
-        options.storage = {
-            adapter: require('oc-s3-storage-adapter'),
-            options: options.s3
-        };
-    }
-    if (options.storage && !options.storage.adapter) {
-        options.storage.adapter = require('oc-s3-storage-adapter');
-    }
-    if (options.refreshInterval && options.storage) {
-        options.storage.options['refreshInterval'] = options.refreshInterval;
-    }
-    if (options.verbosity && options.storage) {
-        options.storage.options['verbosity'] = options.verbosity;
-    }
-    if (options.storage &&
-        options.storage.options &&
-        options.storage.options['path']) {
-        options.storage.options['path'] =
-            options.storage.options['path'].indexOf('http') === 0
-                ? options.storage.options['path']
-                : `https:${options.storage.options['path']}`;
-    }
-    if (!options.env) {
-        options.env = {};
-    }
-    return options;
-}
-exports.default = optionsSanitiser;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const settings_1 = __importDefault(require("../../resources/settings"));
+const auth = __importStar(require("./authentication"));
+const DEFAULT_NODE_KEEPALIVE_MS = 5000;
+function optionsSanitiser(input) {
+    const options = { ...input };
+    if (!options.publishAuth) {
+        options.beforePublish = (_req, _res, next) => next();
+    }
+    else {
+        options.beforePublish = auth.middleware(options.publishAuth);
+    }
+    if (!options.publishValidation) {
+        options.publishValidation = () => ({
+            isValid: true
+        });
+    }
+    if (!options.prefix) {
+        options.prefix = '/';
+    }
+    const hasTrailingPrefix = new RegExp(options.prefix + '$');
+    if (!options.baseUrl.match(hasTrailingPrefix)) {
+        options.baseUrl = options.baseUrl.replace(/\/$/, '') + options.prefix;
+    }
+    if (!options.tempDir) {
+        options.tempDir = settings_1.default.registry.defaultTempPath;
+    }
+    if (typeof options.hotReloading !== 'boolean') {
+        options.hotReloading = !!options.local;
+    }
+    if (!options.verbosity) {
+        options.verbosity = 0;
+    }
+    if (typeof options.discovery === 'undefined') {
+        options.discovery = true;
+    }
+    if (typeof options.pollingInterval === 'undefined') {
+        options.pollingInterval = 5;
+    }
+    if (!options.templates) {
+        options.templates = [];
+    }
+    if (!options.dependencies) {
+        options.dependencies = [];
+    }
+    if (typeof options.fallbackRegistryUrl !== 'undefined' &&
+        !options.fallbackRegistryUrl.endsWith('/')) {
+        options.fallbackRegistryUrl += '/';
+    }
+    options.customHeadersToSkipOnWeakVersion = (options.customHeadersToSkipOnWeakVersion || []).map(s => s.toLowerCase());
+    options.port = options.port || process.env['PORT'] || 3000;
+    options.timeout = options.timeout || 1000 * 60 * 2;
+    options.keepAliveTimeout =
+        options.keepAliveTimeout || DEFAULT_NODE_KEEPALIVE_MS;
+    if (options.s3) {
+        options.storage = {
+            adapter: require('oc-s3-storage-adapter'),
+            options: options.s3
+        };
+    }
+    if (options.storage && !options.storage.adapter) {
+        options.storage.adapter = require('oc-s3-storage-adapter');
+    }
+    if (options.refreshInterval && options.storage) {
+        options.storage.options['refreshInterval'] = options.refreshInterval;
+    }
+    if (options.verbosity && options.storage) {
+        options.storage.options['verbosity'] = options.verbosity;
+    }
+    if (options.storage &&
+        options.storage.options &&
+        options.storage.options['path']) {
+        options.storage.options['path'] =
+            options.storage.options['path'].indexOf('http') === 0
+                ? options.storage.options['path']
+                : `https:${options.storage.options['path']}`;
+    }
+    if (!options.env) {
+        options.env = {};
+    }
+    return options;
+}
+exports.default = optionsSanitiser;

package/dist/registry/domain/plugins-initialiser.d.ts

@@ -1 +1,3 @@
-export declare function init(pluginsToRegister: unknown[], callback: (err: unknown, data: Record<string, (...args: unknown[]) => void>) => void): void;
+declare type PluginFunctions = Record<string, (...args: unknown[]) => void>;
+export declare function init(pluginsToRegister: unknown[]): Promise<PluginFunctions>;
+export {};

package/dist/registry/domain/plugins-initialiser.js

@@ -1,99 +1,95 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
-const async_1 = __importDefault(require("async"));
-const lodash_1 = __importDefault(require("lodash"));
-const dependency_graph_1 = require("dependency-graph");
-const resources_1 = __importDefault(require("../../resources"));
-function validatePlugins(plugins) {
-    let c = 0;
-    plugins.forEach(plugin => {
-        c++;
-        if (!lodash_1.default.isObject(plugin.register) ||
-            typeof plugin.register.register !== 'function' ||
-            typeof plugin.register.execute !== 'function' ||
-            typeof plugin.name !== 'string') {
-            throw new Error(resources_1.default.errors.registry.PLUGIN_NOT_VALID(plugin.name || String(c)));
-        }
-    });
-}
-function checkDependencies(plugins) {
-    const graph = new dependency_graph_1.DepGraph();
-    plugins.forEach(p => graph.addNode(p.name));
-    plugins.forEach(p => {
-        if (!p.register.dependencies) {
-            return;
-        }
-        p.register.dependencies.forEach(d => {
-            try {
-                graph.addDependency(p.name, d);
-            }
-            catch (err) {
-                throw new Error(`unknown plugin dependency: ${d}`);
-            }
-        });
-    });
-    return graph.overallOrder();
-}
-let deferredLoads = [];
-const defer = function (plugin, cb) {
-    deferredLoads.push(plugin);
-    return cb();
-};
-function init(pluginsToRegister, callback) {
-    const registered = {};
-    try {
-        validatePlugins(pluginsToRegister);
-        checkDependencies(pluginsToRegister);
-    }
-    catch (err) {
-        return callback(err, undefined);
-    }
-    const dependenciesRegistered = (dependencies) => {
-        if (dependencies.length === 0) {
-            return true;
-        }
-        let present = true;
-        dependencies.forEach(d => {
-            if (!registered[d]) {
-                present = false;
-            }
-        });
-        return present;
-    };
-    const loadPlugin = (plugin, cb) => {
-        const done = lodash_1.default.once(cb);
-        if (registered[plugin.name]) {
-            return done();
-        }
-        if (!plugin.register.dependencies) {
-            plugin.register.dependencies = [];
-        }
-        if (!dependenciesRegistered(plugin.register.dependencies)) {
-            return defer(plugin, done);
-        }
-        const dependencies = lodash_1.default.pick(registered, plugin.register.dependencies);
-        plugin.register.register(plugin.options || {}, dependencies, (err) => {
-            const pluginCallback = plugin.callback || lodash_1.default.noop;
-            pluginCallback(err);
-            // Overriding toString so implementation details of plugins do not
-            // leak to OC consumers
-            plugin.register.execute.toString = () => plugin.description || '';
-            registered[plugin.name] = plugin.register.execute;
-            done(err);
-        });
-    };
-    const terminator = function (err) {
-        if (deferredLoads.length > 0) {
-            const deferredPlugins = lodash_1.default.clone(deferredLoads);
-            deferredLoads = [];
-            return async_1.default.mapSeries(deferredPlugins, loadPlugin, terminator);
-        }
-        callback(err, registered);
-    };
-    async_1.default.mapSeries(pluginsToRegister, loadPlugin, terminator);
-}
-exports.init = init;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = void 0;
+const p_limit_1 = __importDefault(require("p-limit"));
+const lodash_1 = __importDefault(require("lodash"));
+const dependency_graph_1 = require("dependency-graph");
+const util_1 = require("util");
+const resources_1 = __importDefault(require("../../resources"));
+function validatePlugins(plugins) {
+    for (let idx = 0; idx < plugins.length; idx++) {
+        const plugin = plugins[idx];
+        if (!lodash_1.default.isObject(plugin.register) ||
+            typeof plugin.register.register !== 'function' ||
+            typeof plugin.register.execute !== 'function' ||
+            typeof plugin.name !== 'string') {
+            throw new Error(resources_1.default.errors.registry.PLUGIN_NOT_VALID(plugin.name || String(idx + 1)));
+        }
+    }
+}
+function checkDependencies(plugins) {
+    const graph = new dependency_graph_1.DepGraph();
+    plugins.forEach(p => graph.addNode(p.name));
+    plugins.forEach(p => {
+        if (!p.register.dependencies) {
+            return;
+        }
+        p.register.dependencies.forEach(d => {
+            try {
+                graph.addDependency(p.name, d);
+            }
+            catch (err) {
+                throw new Error(`unknown plugin dependency: ${d}`);
+            }
+        });
+    });
+    return graph.overallOrder();
+}
+let deferredLoads = [];
+async function init(pluginsToRegister) {
+    const registered = {};
+    validatePlugins(pluginsToRegister);
+    checkDependencies(pluginsToRegister);
+    const dependenciesRegistered = (dependencies) => {
+        if (dependencies.length === 0) {
+            return true;
+        }
+        let present = true;
+        dependencies.forEach(d => {
+            if (!registered[d]) {
+                present = false;
+            }
+        });
+        return present;
+    };
+    const loadPlugin = async (plugin) => {
+        if (registered[plugin.name]) {
+            return;
+        }
+        if (!plugin.register.dependencies) {
+            plugin.register.dependencies = [];
+        }
+        if (!dependenciesRegistered(plugin.register.dependencies)) {
+            deferredLoads.push(plugin);
+            return;
+        }
+        const dependencies = lodash_1.default.pick(registered, plugin.register.dependencies);
+        const register = (0, util_1.promisify)(plugin.register.register);
+        const pluginCallback = plugin.callback || lodash_1.default.noop;
+        await register(plugin.options || {}, dependencies).catch(err => {
+            pluginCallback(err);
+            throw err;
+        });
+        // Overriding toString so implementation details of plugins do not
+        // leak to OC consumers
+        plugin.register.execute.toString = () => plugin.description || '';
+        registered[plugin.name] = plugin.register.execute;
+        pluginCallback();
+    };
+    const terminator = async () => {
+        if (deferredLoads.length > 0) {
+            const deferredPlugins = lodash_1.default.clone(deferredLoads);
+            deferredLoads = [];
+            await Promise.all(deferredPlugins.map(plugin => onSeries(() => loadPlugin(plugin))));
+            return terminator();
+        }
+        return registered;
+    };
+    const onSeries = (0, p_limit_1.default)(1);
+    await Promise.all(pluginsToRegister.map(plugin => onSeries(() => loadPlugin(plugin))));
+    return terminator();
+}
+exports.init = init;

package/dist/registry/domain/register-templates.d.ts

@@ -1,5 +1,5 @@
-import { Template, TemplateInfo } from '../../types';
-export default function registerTemplates(extraTemplates: Template[]): {
-    templatesHash: Record<string, Template>;
-    templatesInfo: TemplateInfo[];
-};
+import { Template, TemplateInfo } from '../../types';
+export default function registerTemplates(extraTemplates: Template[]): {
+    templatesHash: Record<string, Template>;
+    templatesInfo: TemplateInfo[];
+};