oc 0.50.57 → 0.50.58

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.`);
             }
         }
     }

package/dist/registry/routes/component-info.d.ts

@@ -1,4 +1,4 @@
-import type { Request, Response } from 'express';
 import type { Config } from '../../types';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function componentInfoRoute(conf: Config, repository: Repository): (req: Request, res: Response) => Promise<void>;
+export default function componentInfoRoute(conf: Config, repository: Repository): OcHandler;

package/dist/registry/routes/component-info.js

@@ -84,7 +84,7 @@ function componentInfo(err, req, res, component, componentDetail) {
                 href = `//${req.headers.host}${res.conf.prefix}`;
             }
             // Get theme from cookie or default to dark
-            const theme = req.cookies?.['oc-theme'] || 'dark';
+            const theme = req.cookies?.['oc-theme'] === 'light' ? 'light' : 'dark';
             res.send((0, info_1.default)({
                 component,
                 componentDetail,

package/dist/registry/routes/component-preview.d.ts

@@ -1,4 +1,4 @@
-import type { Request, Response } from 'express';
 import type { Config } from '../../types';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function componentPreviewRoute(conf: Config, repository: Repository): (req: Request, res: Response) => void;
+export default function componentPreviewRoute(conf: Config, repository: Repository): OcHandler;

package/dist/registry/routes/component.d.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from 'express';
 import type { Config } from '../../types';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function component(conf: Config, repository: Repository): RequestHandler;
+export default function component(conf: Config, repository: Repository): OcHandler;

package/dist/registry/routes/component.js

@@ -70,7 +70,7 @@ function component(conf, repository) {
                 res.errorDetails = result.response.error;
             }
             try {
-                if (Object.keys(result.headers ?? {}).length) {
+                if (result.headers && Object.keys(result.headers).length) {
                     res.set(result.headers);
                 }
                 if (Array.isArray(result.cookies) && result.cookies.length > 0) {
@@ -89,10 +89,8 @@ function component(conf, repository) {
                     nodeStream.on('error', (err) => {
                         res.status(500).end(String(err));
                     });
-                    res.setHeader('Content-Type', 'x-text/stream');
-                    nodeStream.pipe(res).on('finish', () => {
-                        res.end();
-                    });
+                    res.set('Content-Type', 'x-text/stream');
+                    res.stream(nodeStream);
                 }
                 else {
                     res.status(result.status).json(result.response);

package/dist/registry/routes/components.d.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from 'express';
 import type { Config } from '../../types';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function components(conf: Config, repository: Repository): RequestHandler;
+export default function components(conf: Config, repository: Repository): OcHandler;

package/dist/registry/routes/components.js

@@ -13,7 +13,9 @@ function components(conf, repository) {
         if (results?.length !== 1 || !results[0] || !res.set) {
             return;
         }
-        res.set(results[0].headers);
+        if (results[0].headers) {
+            res.set(results[0].headers);
+        }
     };
     const setCookies = (results, res) => {
         if (results?.length !== 1 || !results[0] || !res.cookie) {

package/dist/registry/routes/dependencies.d.ts

@@ -1,3 +1,3 @@
-import type { Request, Response } from 'express';
 import type { Config } from '../../types';
-export default function dependencies(conf: Config): (_req: Request, res: Response) => void;
+import type { OcHandler } from '../domain/http-server/types';
+export default function dependencies(conf: Config): OcHandler;

package/dist/registry/routes/helpers/get-component-fallback.d.ts

@@ -1,6 +1,6 @@
 import type { IncomingHttpHeaders } from 'node:http';
-import type { Request, Response } from 'express';
 import type { Component, Config } from '../../../types';
+import type { OcRequest, OcResponse } from '../../domain/http-server/types';
 import type { GetComponentResult } from './get-component';
 type ComponentCallback = (err: {
     registryError: any;
@@ -11,6 +11,6 @@ export declare function getComponent(fallbackRegistryUrl: string, headers: Incom
     version: string;
     parameters: IncomingHttpHeaders;
 }, callback: (result: GetComponentResult) => void): void;
-export declare function getComponentPreview(conf: Config, req: Request, res: Response, registryError: string | null, callback: ComponentCallback): void;
-export declare function getComponentInfo(conf: Config, req: Request, res: Response, registryError: string | null, callback: ComponentCallback): void;
+export declare function getComponentPreview(conf: Config, req: OcRequest, res: OcResponse, registryError: string | null, callback: ComponentCallback): void;
+export declare function getComponentInfo(conf: Config, req: OcRequest, res: OcResponse, registryError: string | null, callback: ComponentCallback): void;
 export {};

package/dist/registry/routes/helpers/get-component.d.ts

@@ -1,6 +1,6 @@
 import type { IncomingHttpHeaders } from 'node:http';
-import type { CookieOptions } from 'express';
 import type { Config } from '../../../types';
+import type { CookieOptions } from '../../domain/http-server/types';
 import type { Repository } from '../../domain/repository';
 export interface RendererOptions {
     action?: string;

package/dist/registry/routes/history.d.ts

@@ -1,3 +1,3 @@
-import type { Request, Response } from 'express';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function history(repository: Repository): (_req: Request, res: Response) => Promise<void>;
+export default function history(repository: Repository): OcHandler;

package/dist/registry/routes/history.js

@@ -11,7 +11,7 @@ function history(repository) {
             if (res.conf.discovery.ui && !res.conf.local) {
                 const details = await repository.getComponentsDetails();
                 const componentsHistory = (0, get_components_history_1.default)(details);
-                res.setHeader('Cache-Control', 'public, max-age=600');
+                res.set('Cache-Control', 'public, max-age=600');
                 res.status(200).json({ componentsHistory });
             }
             else {

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

@@ -1,3 +1,3 @@
-import type { Request, Response } from 'express';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function (repository: Repository): (req: Request, res: Response) => Promise<void>;
+export default function (repository: Repository): OcHandler;

package/dist/registry/routes/plugins.d.ts

@@ -1,3 +1,3 @@
-import type { Request, Response } from 'express';
 import type { Config } from '../../types';
-export default function plugins(conf: Config): (_req: Request, res: Response) => void;
+import type { OcHandler } from '../domain/http-server/types';
+export default function plugins(conf: Config): OcHandler;

package/dist/registry/routes/publish.d.ts

@@ -1,3 +1,3 @@
-import type { Request, Response } from 'express';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function publish(repository: Repository): (req: Request, res: Response) => Promise<void>;
+export default function publish(repository: Repository): OcHandler;

package/dist/registry/routes/static-redirector.d.ts

@@ -1,3 +1,4 @@
-import type { Request, Response } from 'express';
+import type { OcHandler } from '../domain/http-server/types';
 import type { Repository } from '../domain/repository';
-export default function staticRedirector(repository: Repository): (req: Request, res: Response) => void;
+export type StaticRedirectorRouteId = 'client' | 'dev-client' | 'client-map' | 'local-static';
+export default function staticRedirector(repository: Repository, routeId: StaticRedirectorRouteId): OcHandler;

package/dist/registry/routes/static-redirector.js

@@ -41,13 +41,10 @@ const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const storageUtils = __importStar(require("oc-storage-adapters-utils"));
 const compression_1 = __importDefault(require("../middleware/compression"));
-function staticRedirector(repository) {
+function staticRedirector(repository, routeId) {
     return (req, res) => {
         let filePath;
-        const clientPath = `${res.conf.prefix || '/'}oc-client/client.js`;
-        const devClientPath = `${res.conf.prefix || '/'}oc-client/client.dev.js`;
-        const clientMapPath = `${res.conf.prefix || '/'}oc-client/oc-client.min.map`;
-        if (req.route.path === clientPath || req.route.path === devClientPath) {
+        if (routeId === 'client' || routeId === 'dev-client') {
             if (res.conf.local) {
                 if (res.conf.compiledClient) {
                     res.type('application/javascript');
@@ -59,7 +56,7 @@ function staticRedirector(repository) {
             else {
                 if (res.conf.compiledClient) {
                     res.type('application/javascript');
-                    if (req.route.path === clientPath) {
+                    if (routeId === 'client') {
                         (0, compression_1.default)({
                             uncompressed: res.conf.compiledClient.code.minified,
                             brotli: res.conf.compiledClient.code.brotli,
@@ -71,11 +68,11 @@ function staticRedirector(repository) {
                     }
                     return;
                 }
-                res.redirect(repository.getStaticClientPath(req.route.path === devClientPath));
+                res.redirect(repository.getStaticClientPath(routeId === 'dev-client'));
                 return;
             }
         }
-        else if (req.route.path === clientMapPath) {
+        else if (routeId === 'client-map') {
             if (res.conf.local) {
                 filePath = node_path_1.default.join(__dirname, '../../components/oc-client/_package/src/oc-client.min.map');
             }
@@ -90,14 +87,13 @@ function staticRedirector(repository) {
             }
         }
         else if (req.params['componentName'] === 'oc-client') {
-            filePath = node_path_1.default.join(__dirname, '../../components/oc-client/_package/' +
-                req.params['splat'].join('/'));
+            filePath = node_path_1.default.join(__dirname, '../../components/oc-client/_package/' + req.params['splat']);
         }
         else {
             filePath =
                 node_path_1.default.join(res.conf.path, req.params['componentName']) +
                     '/_package/' +
-                    req.params['splat'].join('/');
+                    req.params['splat'];
         }
         if (!fs_extra_1.default.existsSync(filePath)) {
             res.errorDetails = `File ${filePath} not found`;
@@ -119,7 +115,7 @@ function staticRedirector(repository) {
             res.set('Content-Encoding', 'gzip');
         }
         fileStream.on('open', () => {
-            fileStream.pipe(res);
+            res.stream(fileStream);
         });
     };
 }

package/dist/registry/routes/validate.d.ts

@@ -1,2 +1,2 @@
-import type { Request, Response } from 'express';
-export default function validate(): (req: Request, res: Response) => Promise<void>;
+import type { OcHandler } from '../domain/http-server/types';
+export default function validate(): OcHandler;

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import type { NextFunction, Request, Response } from 'express';
 import type { MetadataStore as MetadataStoreType } from 'oc-metadata-adapters-utils';
 import type { StorageAdapter } from 'oc-storage-adapters-utils';
 import type { PackageJson } from 'type-fest';
+import type { HttpServerAdapterFactory, HttpServerAdapterOptions } from './registry/domain/http-server/types';
 export type { ComponentRow, MetadataStore } from 'oc-metadata-adapters-utils';
 type Middleware = (req: Request, res: Response, next: NextFunction) => void;
 export interface Author {
@@ -179,7 +180,7 @@ export type PublishAuthConfig = {
 } | ({
     type: string | Authentication;
 } & Record<string, any>);
-export interface Config<T = any> {
+export interface Config<T = any, TServerAdapter extends HttpServerAdapterFactory = HttpServerAdapterFactory> {
     /**
      * Public base URL where the registry is reachable by consumers.
      *
@@ -420,6 +421,13 @@ export interface Config<T = any> {
             componentsDir: string;
         };
     };
+    /**
+     * Low-level HTTP server adapter used by the registry.
+     */
+    server: {
+        adapter: TServerAdapter;
+        options?: HttpServerAdapterOptions<TServerAdapter>;
+    };
     /**
      * Directory used by the registry for temporary files.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oc",
-	"version": "0.50.57",
+	"version": "0.50.58",
 	"description": "A framework for developing and distributing html components",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -11,8 +11,8 @@
 		"preview": "bun run preview/uiPreview.ts",
 		"prebuild": "rimraf dist",
 		"build": "npm run lint && tsc && node tasks/build.js",
-		"test": "npm run build && node tasks/mochaTest.js",
-		"test-silent": "npm run build && node tasks/mochaTest.js --silent",
+		"test": "node tasks/mochaTest.js",
+		"test-silent": "node tasks/mochaTest.js --silent",
 		"bench": "node tasks/benchmarks/server-benchmark.js --repetitions=5",
 		"bench:quick": "node tasks/benchmarks/server-benchmark.js --repetitions=3",
 		"bench:update-baseline": "node tasks/benchmarks/server-benchmark.js --repetitions=5 --update-baseline=true",
@@ -95,12 +95,12 @@
 		"multer": "^2.0.2",
 		"nice-cache": "^0.0.5",
 		"oc-client": "^4.0.3",
-		"oc-client-browser": "2.1.11",
+		"oc-client-browser": "^2.1.11",
 		"oc-empty-response-handler": "^1.0.2",
 		"oc-get-unix-utc-timestamp": "^1.0.6",
 		"oc-metadata-adapters-utils": "^0.1.1",
-		"oc-s3-storage-adapter": "*",
-		"oc-storage-adapters-utils": "*",
+		"oc-s3-storage-adapter": "^2.2.3",
+		"oc-storage-adapters-utils": "^2.1.2",
 		"oc-template-es6": "^2.0.0",
 		"oc-template-es6-compiler": "^7.1.4",
 		"oc-template-handlebars": "^6.0.26",
@@ -118,7 +118,7 @@
 		"source-map": "^0.7.6",
 		"targz": "^1.0.1",
 		"try-require": "^1.2.1",
-		"undici": "^8.4.1",
+		"undici": "^8.5.0",
 		"universalify": "^2.0.1",
 		"yargs": "^17.7.2"
 	}

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

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

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

@@ -1,23 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = fileUpload;
-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);
-}

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

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

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

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = requestHandler;
-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: 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);
-    });
-}