oc 0.50.55 → 0.50.57-beta.0

package/dist/registry/domain/repository.js

@@ -41,11 +41,16 @@ const node_path_1 = __importDefault(require("node:path"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const oc_get_unix_utc_timestamp_1 = __importDefault(require("oc-get-unix-utc-timestamp"));
+const oc_metadata_adapters_utils_1 = require("oc-metadata-adapters-utils");
 const resources_1 = __importDefault(require("../../resources"));
 const settings_1 = __importDefault(require("../../resources/settings"));
 const error_to_string_1 = __importDefault(require("../../utils/error-to-string"));
 const components_cache_1 = __importDefault(require("./components-cache"));
 const components_details_1 = __importDefault(require("./components-details"));
+const events_handler_1 = __importDefault(require("./events-handler"));
+const metadata_adapter_options_1 = __importDefault(require("./metadata-adapter-options"));
+const metadata_index_1 = require("./metadata-index");
+const metadata_migration_1 = require("./metadata-migration");
 const register_templates_1 = __importDefault(require("./register-templates"));
 const storage_adapter_1 = __importDefault(require("./storage-adapter"));
 const validator = __importStar(require("./validators"));
@@ -58,10 +63,56 @@ function repository(conf) {
     const repositorySource = conf.local
         ? 'local repository'
         : cdn.adapterType + ' cdn';
-    const componentsCache = (0, components_cache_1.default)(conf, cdn);
-    const componentsDetails = (0, components_details_1.default)(conf, cdn);
+    const metadataStore = !conf.local && conf.metadata
+        ? conf.metadata.adapter((0, metadata_adapter_options_1.default)(conf))
+        : undefined;
+    const metadataIndex = metadataStore
+        ? (0, metadata_index_1.createMetadataIndex)(metadataStore)
+        : undefined;
+    const componentsCache = (0, components_cache_1.default)(conf, cdn, metadataIndex);
+    const componentsDetails = (0, components_details_1.default)(conf, cdn, metadataIndex);
+    let exportLegacyFilesLoop;
+    let closed = false;
     const getFilePath = (component, version, filePath) => `${options.componentsDir}/${component}/${version}/${filePath}`;
+    const exportLegacyFiles = () => {
+        if (!metadataStore || !conf.metadata?.exportLegacyFiles) {
+            return;
+        }
+        return (0, metadata_migration_1.exportLegacyMetadataFiles)({
+            metadataStore,
+            cdn,
+            componentsDir: options.componentsDir
+        }).catch((err) => events_handler_1.default.fire('error', {
+            code: 'metadata_legacy_files_export',
+            message: err?.message || String(err)
+        }));
+    };
+    // Run the DB→components.json export on a non-overlapping background timer
+    // instead of on the publish path, so a publish stays an O(1) append rather
+    // than triggering a full-registry scan + blob rewrite. The timer only runs
+    // when an interval is explicitly configured.
+    const scheduleLegacyFilesExport = () => {
+        const intervalSeconds = conf.metadata?.exportLegacyFilesInterval;
+        if (closed ||
+            !metadataStore ||
+            !conf.metadata?.exportLegacyFiles ||
+            !intervalSeconds) {
+            return;
+        }
+        exportLegacyFilesLoop = setTimeout(async () => {
+            await exportLegacyFiles();
+            if (!closed) {
+                scheduleLegacyFilesExport();
+            }
+        }, intervalSeconds * 1000);
+    };
     const { templatesHash, templatesInfo } = (0, register_templates_1.default)(conf.templates, conf.local);
+    const throwVersionAlreadyFound = (componentName, componentVersion) => {
+        throw {
+            code: resources_1.default.errors.registry.COMPONENT_VERSION_ALREADY_FOUND_CODE,
+            msg: resources_1.default.errors.registry.COMPONENT_VERSION_ALREADY_FOUND(componentName, componentVersion, repositorySource)
+        };
+    };
     const local = {
         components: undefined,
         getCompiledView(componentName) {
@@ -222,8 +273,21 @@ function repository(conf) {
                 // when in local this won't get called
                 return;
             }
+            if (metadataStore) {
+                await metadataStore.initialise();
+                if (conf.metadata?.reconcileFromStorage) {
+                    await (0, metadata_migration_1.reconcileMetadataFromStorage)({
+                        metadataStore,
+                        cdn,
+                        componentsDir: options.componentsDir
+                    });
+                }
+            }
             const componentsList = await componentsCache.load();
-            return componentsDetails.refresh(componentsList);
+            const details = await componentsDetails.refresh(componentsList);
+            void exportLegacyFiles();
+            scheduleLegacyFilesExport();
+            return details;
         },
         async publishComponent({ componentName, componentVersion, pkgDetails, user, dryRun = false }) {
             if (conf.local) {
@@ -257,21 +321,56 @@ function repository(conf) {
             }
             const componentVersions = await repository.getComponentVersions(componentName);
             if (!versionHandler.validateNewVersion(componentVersion, componentVersions)) {
-                throw {
-                    code: resources_1.default.errors.registry.COMPONENT_VERSION_ALREADY_FOUND_CODE,
-                    msg: resources_1.default.errors.registry.COMPONENT_VERSION_ALREADY_FOUND(componentName, componentVersion, repositorySource)
-                };
+                throwVersionAlreadyFound(componentName, componentVersion);
             }
             pkgDetails.packageJson.oc.date = (0, oc_get_unix_utc_timestamp_1.default)();
             pkgDetails.packageJson.oc.publisher = user;
             if (dryRun)
                 return;
             await fs_extra_1.default.writeJson(node_path_1.default.join(pkgDetails.outputFolder, 'package.json'), pkgDetails.packageJson);
+            if (metadataStore) {
+                const componentRow = (0, metadata_index_1.getComponentRow)(componentName, componentVersion, pkgDetails.packageJson);
+                const { token } = await metadataStore
+                    .reserveVersion(componentRow)
+                    .catch((err) => {
+                    if (err?.code === oc_metadata_adapters_utils_1.VERSION_ALREADY_EXISTS ||
+                        err?.code === oc_metadata_adapters_utils_1.VERSION_PUBLISH_IN_PROGRESS ||
+                        err?.code ===
+                            resources_1.default.errors.registry.COMPONENT_VERSION_ALREADY_FOUND_CODE) {
+                        throwVersionAlreadyFound(componentName, componentVersion);
+                    }
+                    throw err;
+                });
+                try {
+                    await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`);
+                    await metadataStore.commitVersion(componentName, componentVersion, token);
+                    metadataIndex.add(componentRow);
+                }
+                catch (err) {
+                    await metadataStore
+                        .abortVersion(componentName, componentVersion, token)
+                        .catch(() => undefined);
+                    throw err;
+                }
+                return;
+            }
             await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`);
             void componentsCache
                 .refresh()
                 .then((componentsList) => componentsDetails.refresh(componentsList))
                 .catch(() => undefined);
+        },
+        async close() {
+            closed = true;
+            componentsCache.close?.();
+            componentsDetails.close?.();
+            if (exportLegacyFilesLoop) {
+                clearTimeout(exportLegacyFilesLoop);
+                exportLegacyFilesLoop = undefined;
+            }
+            if (metadataStore?.close) {
+                await metadataStore.close();
+            }
         }
     };
     return repository;

package/dist/registry/domain/server-adapter.d.ts

@@ -0,0 +1,4 @@
+import type { HttpServerAdapter } from './http-server/types';
+type HttpServerAdapterFactory<T = unknown> = (options?: T) => HttpServerAdapter;
+export default function getHttpServerAdapter<T = unknown>(adapter: HttpServerAdapter | HttpServerAdapterFactory<T>, options?: T): HttpServerAdapter;
+export {};

package/dist/registry/domain/server-adapter.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getHttpServerAdapter;
+function isHttpServerAdapter(adapter) {
+    return (!!adapter &&
+        typeof adapter === 'object' &&
+        typeof adapter.native === 'function' &&
+        typeof adapter.listen === 'function' &&
+        typeof adapter.httpServer === 'function');
+}
+function getHttpServerAdapter(adapter, options) {
+    if (isHttpServerAdapter(adapter)) {
+        return adapter;
+    }
+    const instance = adapter(options);
+    if (!isHttpServerAdapter(instance)) {
+        throw new Error('Invalid HTTP server adapter');
+    }
+    return instance;
+}

package/dist/registry/domain/validators/registry-configuration.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = registryConfiguration;
 const resources_1 = __importDefault(require("../../../resources"));
 const auth = __importStar(require("../authentication"));
+const metadata_adapter_options_1 = __importDefault(require("../metadata-adapter-options"));
 function registryConfiguration(conf) {
     const returnError = (message) => {
         return {
@@ -111,6 +112,26 @@ function registryConfiguration(conf) {
             }
         }
     }
+    if (!conf.local && conf.metadata) {
+        if (!conf.metadata.adapter) {
+            return returnError(resources_1.default.errors.registry.CONFIGURATION_METADATA_NOT_VALID('metadata'));
+        }
+        if (typeof conf.metadata.exportLegacyFilesInterval !== 'undefined') {
+            if (!Number.isFinite(conf.metadata.exportLegacyFilesInterval) ||
+                conf.metadata.exportLegacyFilesInterval <= 0) {
+                return returnError(resources_1.default.errors.registry
+                    .CONFIGURATION_METADATA_EXPORT_INTERVAL_NOT_VALID);
+            }
+            if (conf.metadata.exportLegacyFiles !== true) {
+                return returnError(resources_1.default.errors.registry
+                    .CONFIGURATION_METADATA_EXPORT_INTERVAL_WITHOUT_EXPORT_NOT_VALID);
+            }
+        }
+        const metadataStore = conf.metadata.adapter((0, metadata_adapter_options_1.default)(conf));
+        if (!metadataStore.isValid()) {
+            return returnError(resources_1.default.errors.registry.CONFIGURATION_METADATA_NOT_VALID(metadataStore.adapterType));
+        }
+    }
     if (conf.customHeadersToSkipOnWeakVersion) {
         if (!Array.isArray(conf.customHeadersToSkipOnWeakVersion)) {
             return returnError(resources_1.default.errors.registry

package/dist/registry/domain/validators/uploaded-package.d.ts

@@ -1,13 +1,14 @@
+import type { UploadedFile } from '../http-server/types';
 type ValidationResponse = {
     isValid: true;
-    files: Express.Multer.File[] | {
-        [fieldname: string]: Express.Multer.File[];
+    files: UploadedFile[] | {
+        [fieldname: string]: UploadedFile[];
     };
 } | {
     isValid: false;
     message: string;
 };
-export default function uploadedPackage(input?: Express.Multer.File[] | {
-    [fieldname: string]: Express.Multer.File[];
+export default function uploadedPackage(input?: UploadedFile[] | {
+    [fieldname: string]: UploadedFile[];
 }): ValidationResponse;
 export {};

package/dist/registry/index.d.ts

@@ -1,10 +1,10 @@
-import http from 'node:http';
-import express from 'express';
+import type http from 'node:http';
+import type express from 'express';
 import type { Plugin } from '../types';
 import { RegistryOptions } from './domain/options-sanitiser';
 export { RegistryOptions };
 export default function registry<T = any>(inputOptions: RegistryOptions<T>): {
-    close: (callback: (err?: Error | undefined | string) => void) => void | http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    close: (callback: (err?: Error | undefined | string) => void) => void;
     on: <T_1 extends keyof {
         error: {
             code: string;

package/dist/registry/index.js

@@ -37,14 +37,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = registry;
-const node_http_1 = __importDefault(require("node:http"));
 const safe_1 = __importDefault(require("colors/safe"));
-const express_1 = __importDefault(require("express"));
 const app_start_1 = __importDefault(require("./app-start"));
 const events_handler_1 = __importDefault(require("./domain/events-handler"));
 const options_sanitiser_1 = __importDefault(require("./domain/options-sanitiser"));
 const pluginsInitialiser = __importStar(require("./domain/plugins-initialiser"));
 const repository_1 = __importDefault(require("./domain/repository"));
+const server_adapter_1 = __importDefault(require("./domain/server-adapter"));
 const validator = __importStar(require("./domain/validators"));
 const middleware = __importStar(require("./middleware"));
 const router_1 = require("./router");
@@ -55,14 +54,18 @@ function registry(inputOptions) {
     }
     const options = (0, options_sanitiser_1.default)(inputOptions);
     const plugins = [];
-    const app = middleware.bind((0, express_1.default)(), options);
-    let server;
+    const adapter = middleware.bind((0, server_adapter_1.default)(options.server.adapter, options.server.options), options);
+    const app = adapter.native();
     const repository = (0, repository_1.default)(options);
     const close = (callback) => {
-        if (server?.listening) {
-            return server.close(callback);
+        const closeMetadataStore = () => Promise.resolve(repository.close?.()).catch(() => undefined);
+        if (adapter.isListening()) {
+            adapter.close((err) => {
+                void closeMetadataStore().finally(() => callback(err));
+            });
+            return;
         }
-        return callback('not opened');
+        void closeMetadataStore().finally(() => callback('not opened'));
     };
     const register = (plugin, callback) => {
         plugins.push(Object.assign(plugin, { callback }));
@@ -71,30 +74,29 @@ function registry(inputOptions) {
         const ok = (msg) => console.log(safe_1.default.green(msg));
         try {
             options.plugins = await pluginsInitialiser.init(plugins);
-            (0, router_1.create)(app, options, repository);
+            (0, router_1.create)(adapter, options, repository);
             const componentsInfo = await repository.init();
             await (0, app_start_1.default)(repository, options);
-            server = node_http_1.default.createServer(app);
-            server.timeout = options.timeout;
-            if (options.keepAliveTimeout) {
-                server.keepAliveTimeout = options.keepAliveTimeout;
-            }
-            server.listen(options.port, (err) => {
+            adapter.listen({
+                port: options.port,
+                timeout: options.timeout,
+                keepAliveTimeout: options.keepAliveTimeout
+            }, (err) => {
                 if (err) {
                     return callback(err);
                 }
                 events_handler_1.default.fire('start', {});
                 if (options.verbosity) {
-                    ok(`Registry started at port http://localhost:${app.get('port')}${options.prefix}`);
+                    ok(`Registry started at port http://localhost:${options.port}${options.prefix}`);
                     if (componentsInfo) {
                         const componentsNumber = Object.keys(componentsInfo.components).length;
                         const componentsReleases = Object.values(componentsInfo.components).reduce((acc, component) => acc + Object.keys(component).length, 0);
                         ok(`Registry serving ${componentsNumber} components for a total of ${componentsReleases} releases.`);
                     }
                 }
-                callback(null, { app, server });
+                callback(null, { app, server: adapter.httpServer() });
             });
-            server.on('error', (error) => {
+            adapter.onServerError((error) => {
                 events_handler_1.default.fire('error', {
                     code: 'EXPRESS_ERROR',
                     message: error?.message ?? String(error)

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

@@ -1,2 +1,3 @@
-import type { NextFunction, Request, Response } from 'express';
-export default function baseUrlHandler(req: Request, res: Response, next: NextFunction): void;
+import type { OcHandler } from '../domain/http-server/types';
+declare const baseUrlHandler: OcHandler;
+export default baseUrlHandler;

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = baseUrlHandler;
-function baseUrlHandler(req, res, next) {
+const baseUrlHandler = (req, res) => {
     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/compression.d.ts

@@ -1,6 +1,6 @@
-import type { Request, Response } from 'express';
+import type { OcRequest, OcResponse } from '../domain/http-server/types';
 export default function compress(data: {
     uncompressed: string;
     brotli: Buffer;
     gzip: Buffer;
-}, req: Request, res: Response): void;
+}, req: OcRequest, res: OcResponse): void;

package/dist/registry/middleware/compression.js

@@ -9,7 +9,7 @@ function compress(data, req, res) {
         res.send(data.uncompressed);
         return;
     }
-    res.setHeader('Content-Encoding', encoding);
+    res.set('Content-Encoding', encoding);
     const compressed = encoding === 'br' ? data.brotli : data.gzip;
     res.send(compressed);
 }

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

@@ -1,2 +1,3 @@
-import type { NextFunction, Request, Response } from 'express';
-export default function cors(_req: Request, res: Response, next: NextFunction): void;
+import type { OcHandler } from '../domain/http-server/types';
+declare const cors: OcHandler;
+export default cors;

package/dist/registry/middleware/cors.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = cors;
-function cors(_req, res, next) {
+const cors = (_req, res) => {
     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, traceparent');
-    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, PUT, POST');
-    next();
-}
+    res.set('Access-Control-Allow-Credentials', 'true');
+    res.set('Access-Control-Allow-Origin', '*');
+    res.set('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, traceparent');
+    res.set('Access-Control-Allow-Methods', 'GET, OPTIONS, PUT, POST');
+};
+exports.default = cors;

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

@@ -1,2 +1,3 @@
-import type { NextFunction, Request, Response } from 'express';
-export default function discoveryHandler(req: Request, res: Response, next: NextFunction): void;
+import type { OcHandler } from '../domain/http-server/types';
+declare const discoveryHandler: OcHandler;
+export default discoveryHandler;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = discoveryHandler;
-function discoveryHandler(req, res, next) {
+const discoveryHandler = (req, res) => {
     res.conf.discoveryFunc =
         res.conf.discoveryFunc ||
             (typeof res.conf.discovery === 'function' ? res.conf.discovery : undefined);
@@ -11,5 +10,5 @@ function discoveryHandler(req, res, next) {
             secure: req.secure
         });
     }
-    next();
-}
+};
+exports.default = discoveryHandler;

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

@@ -1,3 +1,3 @@
-import { type Express } from 'express';
 import type { Config } from '../../types';
-export declare const bind: (app: Express, options: Config) => Express;
+import type { HttpServerAdapter } from '../domain/http-server/types';
+export declare const bind: (adapter: HttpServerAdapter, options: Config) => HttpServerAdapter;

package/dist/registry/middleware/index.js

@@ -4,54 +4,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bind = void 0;
-const cookie_parser_1 = __importDefault(require("cookie-parser"));
-const errorhandler_1 = __importDefault(require("errorhandler"));
-const express_1 = __importDefault(require("express"));
-const morgan_1 = __importDefault(require("morgan"));
+const events_handler_1 = __importDefault(require("../domain/events-handler"));
 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) => {
+const normaliseFileName = (x) => x.replace('.tar.gz', '').replace(/\W+/g, '-').toLowerCase();
+const bind = (adapter, options) => {
+    adapter.use((_req, res) => {
         res.conf = options;
-        next();
     });
-    app.use((0, request_handler_1.default)());
-    app.use((0, cookie_parser_1.default)());
-    if (options.postRequestPayloadSize) {
-        // Type is incorrect since limit can be a string like '50mb'
-        bodyParserJsonArgument.limit = options.postRequestPayloadSize;
-        bodyParserUrlEncodedArgument.limit =
-            options.postRequestPayloadSize;
+    adapter.enableRequestTiming((req, res, time) => {
+        const data = {
+            body: req.body,
+            duration: time,
+            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);
+    });
+    adapter.enableCookies();
+    adapter.enableBodyParser({ limit: options.postRequestPayloadSize });
+    adapter.use(cors_1.default);
+    if (!options.local) {
+        adapter.enableFileUploads({
+            tempDir: options.tempDir,
+            filename: (originalName) => `${normaliseFileName(originalName)}-${Date.now()}.tar.gz`
+        });
     }
-    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);
+    adapter.use(base_url_handler_1.default);
+    adapter.use(discovery_handler_1.default);
     if (options.verbosity) {
-        app.use((0, morgan_1.default)('dev', {
+        adapter.enableLogging({
             skip: (req, res) => {
                 // Hide logging development console calls
-                return req.url.startsWith(`${res.conf.prefix}~actions/$$__oc__server___console__$$`);
+                return req.url.startsWith(`${res.conf?.prefix ?? ''}~actions/$$__oc__server___console__$$`);
             }
-        }));
+        });
     }
     if (options.local) {
-        app.use((0, errorhandler_1.default)());
+        adapter.enableErrorHandler();
     }
-    return app;
+    return adapter;
 };
 exports.bind = bind;

package/dist/registry/router.d.ts

@@ -1,4 +1,4 @@
-import type { Express } from 'express';
 import type { Repository } from '../registry/domain/repository';
 import type { Config } from '../types';
-export declare function create(app: Express, conf: Config, repository: Repository): void;
+import type { HttpServerAdapter } from './domain/http-server/types';
+export declare function create(adapter: HttpServerAdapter, conf: Config, repository: Repository): void;

package/dist/registry/router.js

@@ -16,7 +16,8 @@ const plugins_1 = __importDefault(require("./routes/plugins"));
 const publish_1 = __importDefault(require("./routes/publish"));
 const static_redirector_1 = __importDefault(require("./routes/static-redirector"));
 const validate_1 = __importDefault(require("./routes/validate"));
-function create(app, conf, repository) {
+function create(adapter, conf, repository) {
+    const route = (method, path, id, ...handlers) => adapter.route(method, path, id, handlers);
     const routes = {
         component: (0, component_1.default)(conf, repository),
         components: (0, components_1.default)(conf, repository),
@@ -24,7 +25,12 @@ function create(app, conf, repository) {
         componentPreview: (0, component_preview_1.default)(conf, repository),
         index: (0, routes_1.default)(repository),
         publish: (0, publish_1.default)(repository),
-        staticRedirector: (0, static_redirector_1.default)(repository),
+        staticRedirector: {
+            client: (0, static_redirector_1.default)(repository, 'client'),
+            devClient: (0, static_redirector_1.default)(repository, 'dev-client'),
+            clientMap: (0, static_redirector_1.default)(repository, 'client-map'),
+            localStatic: (0, static_redirector_1.default)(repository, 'local-static')
+        },
         plugins: (0, plugins_1.default)(conf),
         dependencies: (0, dependencies_1.default)(conf),
         history: (0, history_1.default)(repository),
@@ -33,42 +39,42 @@ function create(app, conf, repository) {
     const prefix = conf.prefix;
     const definedBaseRoute = conf.routes?.find((route) => route.route === '/');
     if (prefix !== '/' && !definedBaseRoute) {
-        app.get('/', (_req, res) => res.redirect(prefix));
-        app.get(prefix.substring(0, prefix.length - 1), routes.index);
+        route('get', '/', 'root-redirect', (_req, res) => res.redirect(prefix));
+        route('get', prefix.substring(0, prefix.length - 1), 'prefix-index', routes.index);
     }
-    app.get(`${prefix}oc-client/client.js`, routes.staticRedirector);
-    app.get(`${prefix}oc-client/client.dev.js`, routes.staticRedirector);
-    app.get(`${prefix}oc-client/oc-client.min.map`, routes.staticRedirector);
-    app.get(`${prefix}~registry/plugins`, routes.plugins);
-    app.get(`${prefix}~registry/dependencies`, routes.dependencies);
-    app.get(`${prefix}~registry/history`, routes.history);
+    route('get', `${prefix}oc-client/client.js`, 'client', routes.staticRedirector.client);
+    route('get', `${prefix}oc-client/client.dev.js`, 'dev-client', routes.staticRedirector.devClient);
+    route('get', `${prefix}oc-client/oc-client.min.map`, 'client-map', routes.staticRedirector.clientMap);
+    route('get', `${prefix}~registry/plugins`, 'plugins', routes.plugins);
+    route('get', `${prefix}~registry/dependencies`, 'dependencies', routes.dependencies);
+    route('get', `${prefix}~registry/history`, 'history', routes.history);
     if (conf.discovery.validate) {
-        app.post(`${prefix}~registry/validate`, routes.validate);
+        route('post', `${prefix}~registry/validate`, 'validate', routes.validate);
     }
     if (conf.local) {
-        app.get(`${prefix}:componentName/:componentVersion/${settings_1.default.registry.localStaticRedirectorPath}*splat`, routes.staticRedirector);
+        route('get', `${prefix}:componentName/:componentVersion/${settings_1.default.registry.localStaticRedirectorPath}*splat`, 'local-static', routes.staticRedirector.localStatic);
     }
     else {
-        app.put(`${prefix}:componentName/:componentVersion`, conf.beforePublish, routes.publish);
+        route('put', `${prefix}:componentName/:componentVersion`, 'publish', adapter.fromConnect(conf.beforePublish), routes.publish);
     }
-    app.get(prefix, routes.index);
-    app.post(prefix, routes.components);
-    app.get(`${prefix}:componentName/:componentVersion${settings_1.default.registry.componentInfoPath}`, routes.componentInfo);
-    app.get(`${prefix}:componentName${settings_1.default.registry.componentInfoPath}`, routes.componentInfo);
-    app.get(`${prefix}:componentName/:componentVersion${settings_1.default.registry.componentPreviewPath}`, routes.componentPreview);
-    app.get(`${prefix}:componentName${settings_1.default.registry.componentPreviewPath}`, routes.componentPreview);
-    app.get(`${prefix}:componentName/:componentVersion`, routes.component);
-    app.get(`${prefix}:componentName`, routes.component);
-    app.post(`${prefix}~actions/:action/:componentName/:componentVersion`, routes.component);
-    app.post(`${prefix}~actions/:action/:componentName`, routes.component);
+    route('get', prefix, 'index', routes.index);
+    route('post', prefix, 'components', routes.components);
+    route('get', `${prefix}:componentName/:componentVersion${settings_1.default.registry.componentInfoPath}`, 'component-version-info', routes.componentInfo);
+    route('get', `${prefix}:componentName${settings_1.default.registry.componentInfoPath}`, 'component-info', routes.componentInfo);
+    route('get', `${prefix}:componentName/:componentVersion${settings_1.default.registry.componentPreviewPath}`, 'component-version-preview', routes.componentPreview);
+    route('get', `${prefix}:componentName${settings_1.default.registry.componentPreviewPath}`, 'component-preview', routes.componentPreview);
+    route('get', `${prefix}:componentName/:componentVersion`, 'component-version', routes.component);
+    route('get', `${prefix}:componentName`, 'component', routes.component);
+    route('post', `${prefix}~actions/:action/:componentName/:componentVersion`, 'component-version-action', routes.component);
+    route('post', `${prefix}~actions/:action/:componentName`, 'component-action', routes.component);
     if (conf.routes) {
-        for (const route of conf.routes) {
+        for (const routeConfig of conf.routes) {
             // Ensure handler is a function (should be converted by options-sanitiser)
-            if (typeof route.handler === 'function') {
-                app[route.method.toLowerCase()](route.route, route.handler);
+            if (typeof routeConfig.handler === 'function') {
+                route(routeConfig.method.toLowerCase(), routeConfig.route, routeConfig.route, adapter.fromConnect(routeConfig.handler));
             }
             else {
-                console.warn(`Warning: Route handler for "${route.route}" is not a function. Skipping route.`);
+                console.warn(`Warning: Route handler for "${routeConfig.route}" is not a function. Skipping route.`);
             }
         }
     }