oc 0.49.6 → 0.49.9

package/dist/registry/index.js

@@ -1,120 +1,107 @@
-"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 async_1 = __importDefault(require("async"));
-const safe_1 = __importDefault(require("colors/safe"));
-const express_1 = __importDefault(require("express"));
-const http_1 = __importDefault(require("http"));
-const lodash_1 = __importDefault(require("lodash"));
-const app_start_1 = __importDefault(require("./app-start"));
-const events_handler_1 = __importDefault(require("./domain/events-handler"));
-const middleware = __importStar(require("./middleware"));
-const pluginsInitialiser = __importStar(require("./domain/plugins-initialiser"));
-const repository_1 = __importDefault(require("./domain/repository"));
-const router = __importStar(require("./router"));
-const options_sanitiser_1 = __importDefault(require("./domain/options-sanitiser"));
-const validator = __importStar(require("./domain/validators"));
-function registry(inputOptions) {
-    const validationResult = validator.validateRegistryConfiguration(inputOptions);
-    if (!validationResult.isValid) {
-        throw validationResult.message;
-    }
-    const options = (0, options_sanitiser_1.default)(inputOptions);
-    const plugins = [];
-    const app = middleware.bind((0, express_1.default)(), options);
-    let server;
-    const repository = (0, repository_1.default)(options);
-    const close = (callback) => {
-        if (server && server.listening) {
-            return server.close(callback);
-        }
-        return callback('not opened');
-    };
-    const register = (plugin, callback) => {
-        plugins.push(Object.assign(plugin, { callback }));
-    };
-    const start = (callback) => {
-        // eslint-disable-next-line no-console
-        const ok = (msg) => console.log(safe_1.default.green(msg));
-        if (typeof callback !== 'function') {
-            callback = lodash_1.default.noop;
-        }
-        router.create(app, options, repository);
-        async_1.default.waterfall([
-            (cb) => pluginsInitialiser.init(plugins, cb),
-            (plugins, cb) => {
-                options.plugins = plugins;
-                repository.init(cb);
-            },
-            (componentsInfo, cb) => {
-                (0, app_start_1.default)(repository, options, (err) => cb(err ? err.msg : null, componentsInfo));
-            }
-        ], (err, componentsInfo) => {
-            if (err) {
-                return callback(err, undefined);
-            }
-            server = http_1.default.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) => {
-                if (err) {
-                    return callback(err, undefined);
-                }
-                events_handler_1.default.fire('start', {});
-                if (options.verbosity) {
-                    ok(`Registry started at port ${app.get('port')}`);
-                    if (lodash_1.default.isObject(componentsInfo)) {
-                        const componentsNumber = Object.keys(
-                        // @ts-ignore
-                        componentsInfo.components).length;
-                        const componentsReleases = lodash_1.default.reduce(
-                        // @ts-ignore
-                        componentsInfo.components, (memo, component) => parseInt(memo, 10) + component.length);
-                        ok(`Registry serving ${componentsNumber} components for a total of ${componentsReleases} releases.`);
-                    }
-                }
-                callback(null, { app, server });
-            });
-            server.on('error', error => {
-                var _a;
-                events_handler_1.default.fire('error', {
-                    code: 'EXPRESS_ERROR',
-                    message: (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : String(error)
-                });
-                callback(error, undefined);
-            });
-        });
-    };
-    return {
-        close,
-        on: events_handler_1.default.on,
-        register,
-        start,
-        app
-    };
-}
-exports.default = registry;
+"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 safe_1 = __importDefault(require("colors/safe"));
+const express_1 = __importDefault(require("express"));
+const http_1 = __importDefault(require("http"));
+const lodash_1 = __importDefault(require("lodash"));
+const app_start_1 = __importDefault(require("./app-start"));
+const events_handler_1 = __importDefault(require("./domain/events-handler"));
+const middleware = __importStar(require("./middleware"));
+const pluginsInitialiser = __importStar(require("./domain/plugins-initialiser"));
+const repository_1 = __importDefault(require("./domain/repository"));
+const router_1 = require("./router");
+const options_sanitiser_1 = __importDefault(require("./domain/options-sanitiser"));
+const validator = __importStar(require("./domain/validators"));
+function registry(inputOptions) {
+    const validationResult = validator.validateRegistryConfiguration(inputOptions);
+    if (!validationResult.isValid) {
+        throw validationResult.message;
+    }
+    const options = (0, options_sanitiser_1.default)(inputOptions);
+    const plugins = [];
+    const { app, router } = middleware.bind((0, express_1.default)(), options);
+    let server;
+    const repository = (0, repository_1.default)(options);
+    const close = (callback) => {
+        if (server && server.listening) {
+            return server.close(callback);
+        }
+        return callback('not opened');
+    };
+    const register = (plugin, callback) => {
+        plugins.push(Object.assign(plugin, { callback }));
+    };
+    const start = async (callback) => {
+        var _a;
+        // eslint-disable-next-line no-console
+        const ok = (msg) => console.log(safe_1.default.green(msg));
+        (0, router_1.create)(router, options, repository);
+        try {
+            options.plugins = await pluginsInitialiser.init(plugins);
+            const componentsInfo = await repository.init();
+            await (0, app_start_1.default)(repository, options);
+            server = http_1.default.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) => {
+                if (err) {
+                    return callback(err, undefined);
+                }
+                events_handler_1.default.fire('start', {});
+                if (options.verbosity) {
+                    ok(`Registry started at port ${app.get('port')}`);
+                    if (lodash_1.default.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 });
+            });
+            server.on('error', error => {
+                var _a;
+                events_handler_1.default.fire('error', {
+                    code: 'EXPRESS_ERROR',
+                    message: (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : String(error)
+                });
+                callback(error, undefined);
+            });
+        }
+        catch (err) {
+            callback(((_a = err) === null || _a === void 0 ? void 0 : _a.msg) || err, undefined);
+        }
+    };
+    return {
+        close,
+        on: events_handler_1.default.on,
+        register,
+        start,
+        app
+    };
+}
+exports.default = registry;

package/dist/registry/middleware/base-url-handler.d.ts

@@ -1,2 +1,2 @@
-import { NextFunction, Request, Response } from 'express';
-export default function baseUrlHandler(req: Request, res: Response, next: NextFunction): void;
+import { NextFunction, Request, Response } from 'express';
+export default function baseUrlHandler(req: Request, res: Response, next: NextFunction): void;

package/dist/registry/middleware/base-url-handler.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function baseUrlHandler(req, res, next) {
-    if (res.conf.baseUrlFunc) {
-        res.conf.baseUrl = res.conf.baseUrlFunc({
-            host: req.headers.host,
-            secure: req.secure
-        });
-    }
-    next();
-}
-exports.default = baseUrlHandler;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function baseUrlHandler(req, res, next) {
+    if (res.conf.baseUrlFunc) {
+        res.conf.baseUrl = res.conf.baseUrlFunc({
+            host: req.headers.host,
+            secure: req.secure
+        });
+    }
+    next();
+}
+exports.default = baseUrlHandler;

package/dist/registry/middleware/cors.d.ts

@@ -1,2 +1,2 @@
-import { NextFunction, Request, Response } from 'express';
-export default function cors(_req: Request, res: Response, next: NextFunction): void;
+import { NextFunction, Request, Response } from 'express';
+export default function cors(_req: Request, res: Response, next: NextFunction): void;

package/dist/registry/middleware/cors.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function cors(_req, res, next) {
-    res.removeHeader('X-Powered-By');
-    res.header('Access-Control-Allow-Credentials', 'true');
-    res.header('Access-Control-Allow-Origin', '*');
-    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
-    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, PUT, POST');
-    next();
-}
-exports.default = cors;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function cors(_req, res, next) {
+    res.removeHeader('X-Powered-By');
+    res.header('Access-Control-Allow-Credentials', 'true');
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
+    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, PUT, POST');
+    next();
+}
+exports.default = cors;

package/dist/registry/middleware/discovery-handler.d.ts

@@ -1,2 +1,2 @@
-import { NextFunction, Request, Response } from 'express';
-export default function discoveryHandler(req: Request, res: Response, next: NextFunction): void;
+import { NextFunction, Request, Response } from 'express';
+export default function discoveryHandler(req: Request, res: Response, next: NextFunction): void;

package/dist/registry/middleware/discovery-handler.js

@@ -1,15 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function discoveryHandler(req, res, next) {
-    res.conf.discoveryFunc =
-        res.conf.discoveryFunc ||
-            (typeof res.conf.discovery === 'function' ? res.conf.discovery : undefined);
-    if (res.conf.discoveryFunc) {
-        res.conf.discovery = res.conf.discoveryFunc({
-            host: req.headers.host,
-            secure: req.secure
-        });
-    }
-    next();
-}
-exports.default = discoveryHandler;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function discoveryHandler(req, res, next) {
+    res.conf.discoveryFunc =
+        res.conf.discoveryFunc ||
+            (typeof res.conf.discovery === 'function' ? res.conf.discovery : undefined);
+    if (res.conf.discoveryFunc) {
+        res.conf.discovery = res.conf.discoveryFunc({
+            host: req.headers.host,
+            secure: req.secure
+        });
+    }
+    next();
+}
+exports.default = discoveryHandler;

package/dist/registry/middleware/file-uploads.d.ts

@@ -1,2 +1,2 @@
-import { NextFunction, Request, Response } from 'express';
-export default function fileUpload(req: Request, res: Response, next: NextFunction): void;
+import { NextFunction, Request, Response } from 'express';
+export default function fileUpload(req: Request, res: Response, next: NextFunction): void;

package/dist/registry/middleware/file-uploads.js

@@ -1,23 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const multer_1 = __importDefault(require("multer"));
-function fileUpload(req, res, next) {
-    if (res.conf.local) {
-        return next();
-    }
-    const normaliseFileName = (x) => x.replace('.tar.gz', '').replace(/\W+/g, '-').toLowerCase();
-    const upload = (0, multer_1.default)({
-        limits: {
-            fieldSize: 10
-        },
-        storage: multer_1.default.diskStorage({
-            destination: res.conf.tempDir,
-            filename: (_req, file, cb) => cb(null, `${normaliseFileName(file.originalname)}-${Date.now()}.tar.gz`)
-        })
-    });
-    return upload.any()(req, res, next);
-}
-exports.default = fileUpload;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const multer_1 = __importDefault(require("multer"));
+function fileUpload(req, res, next) {
+    if (res.conf.local) {
+        return next();
+    }
+    const normaliseFileName = (x) => x.replace('.tar.gz', '').replace(/\W+/g, '-').toLowerCase();
+    const upload = (0, multer_1.default)({
+        limits: {
+            fieldSize: 10
+        },
+        storage: multer_1.default.diskStorage({
+            destination: res.conf.tempDir,
+            filename: (_req, file, cb) => cb(null, `${normaliseFileName(file.originalname)}-${Date.now()}.tar.gz`)
+        })
+    });
+    return upload.any()(req, res, next);
+}
+exports.default = fileUpload;

package/dist/registry/middleware/index.d.ts

@@ -1,3 +1,7 @@
-import { Express } from 'express';
-import { Config } from '../../types';
-export declare const bind: (app: Express, options: Config) => Express;
+import express, { Express } from 'express';
+import Router from 'express-promise-router';
+import { Config } from '../../types';
+export declare const bind: (app: Express, options: Config) => {
+    app: Express;
+    router: express.Router;
+};

package/dist/registry/middleware/index.js

@@ -1,47 +1,51 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bind = void 0;
-const express_1 = __importDefault(require("express"));
-const errorhandler_1 = __importDefault(require("errorhandler"));
-const morgan_1 = __importDefault(require("morgan"));
-const base_url_handler_1 = __importDefault(require("./base-url-handler"));
-const cors_1 = __importDefault(require("./cors"));
-const discovery_handler_1 = __importDefault(require("./discovery-handler"));
-const file_uploads_1 = __importDefault(require("./file-uploads"));
-const request_handler_1 = __importDefault(require("./request-handler"));
-const bodyParserJsonArgument = {
-    inflate: true
-};
-const bodyParserUrlEncodedArgument = {
-    extended: true
-};
-const bind = (app, options) => {
-    app.set('port', options.port);
-    app.set('json spaces', 0);
-    app.use((_req, res, next) => {
-        res.conf = options;
-        next();
-    });
-    app.use((0, request_handler_1.default)());
-    if (options.postRequestPayloadSize) {
-        bodyParserJsonArgument.limit = options.postRequestPayloadSize;
-        bodyParserUrlEncodedArgument.limit = options.postRequestPayloadSize;
-    }
-    app.use(express_1.default.json(bodyParserJsonArgument));
-    app.use(express_1.default.urlencoded(bodyParserUrlEncodedArgument));
-    app.use(cors_1.default);
-    app.use(file_uploads_1.default);
-    app.use(base_url_handler_1.default);
-    app.use(discovery_handler_1.default);
-    if (options.verbosity) {
-        app.use((0, morgan_1.default)('dev'));
-    }
-    if (options.local) {
-        app.use((0, errorhandler_1.default)());
-    }
-    return app;
-};
-exports.bind = bind;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bind = void 0;
+const express_1 = __importDefault(require("express"));
+const errorhandler_1 = __importDefault(require("errorhandler"));
+const morgan_1 = __importDefault(require("morgan"));
+const express_promise_router_1 = __importDefault(require("express-promise-router"));
+const base_url_handler_1 = __importDefault(require("./base-url-handler"));
+const cors_1 = __importDefault(require("./cors"));
+const discovery_handler_1 = __importDefault(require("./discovery-handler"));
+const file_uploads_1 = __importDefault(require("./file-uploads"));
+const request_handler_1 = __importDefault(require("./request-handler"));
+const bodyParserJsonArgument = {
+    inflate: true
+};
+const bodyParserUrlEncodedArgument = {
+    extended: true
+};
+const bind = (app, options) => {
+    app.set('port', options.port);
+    app.set('json spaces', 0);
+    app.set('etag', 'strong');
+    app.use((_req, res, next) => {
+        res.conf = options;
+        next();
+    });
+    app.use((0, request_handler_1.default)());
+    if (options.postRequestPayloadSize) {
+        bodyParserJsonArgument.limit = options.postRequestPayloadSize;
+        bodyParserUrlEncodedArgument.limit = options.postRequestPayloadSize;
+    }
+    app.use(express_1.default.json(bodyParserJsonArgument));
+    app.use(express_1.default.urlencoded(bodyParserUrlEncodedArgument));
+    app.use(cors_1.default);
+    app.use(file_uploads_1.default);
+    app.use(base_url_handler_1.default);
+    app.use(discovery_handler_1.default);
+    if (options.verbosity) {
+        app.use((0, morgan_1.default)('dev'));
+    }
+    if (options.local) {
+        app.use((0, errorhandler_1.default)());
+    }
+    const router = (0, express_promise_router_1.default)();
+    app.use(router);
+    return { app, router };
+};
+exports.bind = bind;

package/dist/registry/middleware/request-handler.d.ts

@@ -1,2 +1,2 @@
-import { RequestHandler } from 'express';
-export default function requestHandler(): RequestHandler;
+import { RequestHandler } from 'express';
+export default function requestHandler(): RequestHandler;

package/dist/registry/middleware/request-handler.js

@@ -1,30 +1,30 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const response_time_1 = __importDefault(require("response-time"));
-const events_handler_1 = __importDefault(require("../domain/events-handler"));
-function requestHandler() {
-    return (0, response_time_1.default)((req, res, time) => {
-        const data = {
-            body: req.body,
-            duration: parseInt(String(time * 1000)),
-            headers: req.headers,
-            method: req.method,
-            path: req.path,
-            relativeUrl: req.originalUrl,
-            query: req.query,
-            url: req.protocol + '://' + req.get('host') + req.originalUrl,
-            statusCode: res.statusCode
-        };
-        if (res.errorDetails) {
-            data.errorDetails = res.errorDetails;
-        }
-        if (res.errorCode) {
-            data.errorCode = res.errorCode;
-        }
-        events_handler_1.default.fire('request', data);
-    });
-}
-exports.default = requestHandler;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const response_time_1 = __importDefault(require("response-time"));
+const events_handler_1 = __importDefault(require("../domain/events-handler"));
+function requestHandler() {
+    return (0, response_time_1.default)((req, res, time) => {
+        const data = {
+            body: req.body,
+            duration: parseInt(String(time * 1000)),
+            headers: req.headers,
+            method: req.method,
+            path: req.path,
+            relativeUrl: req.originalUrl,
+            query: req.query,
+            url: req.protocol + '://' + req.get('host') + req.originalUrl,
+            statusCode: res.statusCode
+        };
+        if (res.errorDetails) {
+            data.errorDetails = res.errorDetails;
+        }
+        if (res.errorCode) {
+            data.errorCode = res.errorCode;
+        }
+        events_handler_1.default.fire('request', data);
+    });
+}
+exports.default = requestHandler;

package/dist/registry/router.d.ts

@@ -1,3 +1,3 @@
-import { Express } from 'express';
-import { Config, Repository } from '../types';
-export declare function create(app: Express, conf: Config, repository: Repository): Express;
+import { Router } from 'express';
+import { Config, Repository } from '../types';
+export declare function create(app: Router, conf: Config, repository: Repository): void;