oc 0.50.58 → 0.50.59

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+## 0.50.59
+
+### Patch Changes
+
+- adae2e2: remove final slash on oc.build
+- Updated dependencies [adae2e2]
+  - oc-client-browser@2.1.12
+
 ## 0.50.58
 
 ### Patch Changes

package/dist/components/oc-client/_package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.50.58",
+  "version": "0.50.59",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {
@@ -23,14 +23,14 @@
       ],
       "dataProvider": {
         "type": "node.js",
-        "hashKey": "6610c77b87178eeba18b0b4416b061df63aa0a6b",
+        "hashKey": "5ab7cad2df725598783ffb4c946d9db3fd1e65d4",
         "src": "server.js",
         "size": 644
       }
     },
-    "version": "0.50.58",
+    "version": "0.50.59",
     "packaged": true,
-    "date": 1784011980369
+    "date": 1784820712757
   },
   "devDependencies": {
     "oc-template-es6-compiler": "^8.0.0"

package/dist/components/oc-client/_package/server.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},r=(t,s)=>{o(t,(e,a,i={})=>{if(e)return s(e);if(a==null)return s(null,{__oc_emptyResponse:!0});const n=t.action?a:Object.assign({},a,{_staticPath:t.staticPath,_baseUrl:t.baseUrl,_componentName:"oc-client",_componentVersion:"0.50.58"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"c4abb6bf4dc6657fb718a45b64bd6b2cb92e874a",src:c+"template.js",props:n,esm:!1,development:void 0}}))})};exports.data=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},r=(t,s)=>{o(t,(e,a,i={})=>{if(e)return s(e);if(a==null)return s(null,{__oc_emptyResponse:!0});const n=t.action?a:Object.assign({},a,{_staticPath:t.staticPath,_baseUrl:t.baseUrl,_componentName:"oc-client",_componentVersion:"0.50.59"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"c4abb6bf4dc6657fb718a45b64bd6b2cb92e874a",src:c+"template.js",props:n,esm:!1,development:void 0}}))})};exports.data=r;

package/dist/components/oc-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.50.58",
+  "version": "0.50.59",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {

package/dist/registry/domain/events-handler.d.ts

@@ -47,6 +47,7 @@ type Events = {
 };
 type EventsHandler = {
     fire<T extends keyof Events>(eventName: T, data: Events[T]): void;
+    hasListeners<T extends keyof Events>(eventName: T): boolean;
     on<T extends keyof Events>(eventName: T, listener: Subscription<Events[T]>): void;
     off<T extends keyof Events>(eventName: T, listener: Subscription<Events[T]>): void;
     reset(): void;

package/dist/registry/domain/events-handler.js

@@ -13,6 +13,9 @@ const eventsHandler = {
             }
         }
     },
+    hasListeners(eventName) {
+        return Boolean(subscriptions[eventName]?.length);
+    },
     on(eventName, callback) {
         if (typeof callback !== 'function') {
             throw resources_1.default.errors.registry.CONFIGURATION_ONREQUEST_MUST_BE_FUNCTION;

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

@@ -65,7 +65,13 @@ class ExpressHttpServerAdapter {
                 filename: (_req, file, cb) => cb(null, opts.filename(file.originalname))
             })
         });
-        this.app.use(upload.any());
+        const parseUpload = upload.any();
+        this.app.use((req, res, next) => {
+            if (req.method !== 'PUT') {
+                return next();
+            }
+            parseUpload(req, res, next);
+        });
     }
     enableRequestTiming(onDone) {
         this.app.use((0, response_time_1.default)((req, res, time) => {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = nestedRenderer;
 const resources_1 = __importDefault(require("../../resources"));
 const settings_1 = __importDefault(require("../../resources/settings"));
+const pLimit_1 = __importDefault(require("../../utils/pLimit"));
 function nestedRenderer(rendererWithCallback, conf) {
     const renderer = (options) => new Promise((res, rej) => {
         rendererWithCallback(options, (result) => {
@@ -38,22 +39,21 @@ function nestedRenderer(rendererWithCallback, conf) {
             if (!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));
-            }));
+            const limit = (0, pLimit_1.default)(10);
+            return Promise.all(components.map((component) => limit(() => 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)))));
         }
     };
 }

package/dist/registry/domain/validators/plugins-requirements.d.ts

@@ -5,5 +5,5 @@ type ValidationResult = {
     isValid: false;
     missing: string[];
 };
-export default function pluginsRequirements(componentRequirements: Record<string, (...args: unknown[]) => unknown> | string[] | null | undefined, registryPlugins: Config['plugins']): ValidationResult;
+export default function pluginsRequirements(componentRequirements: Record<string, (...args: unknown[]) => unknown> | string[] | null | undefined, registryPlugins: Config['plugins'] | ReadonlySet<string>): ValidationResult;
 export {};

package/dist/registry/domain/validators/plugins-requirements.js

@@ -6,9 +6,11 @@ function pluginsRequirements(componentRequirements, registryPlugins) {
     const requiredPlugins = Array.isArray(componentRequirements)
         ? componentRequirements
         : Object.keys(componentRequirements || {});
+    const registryPluginNames = registryPlugins instanceof Set
+        ? registryPlugins
+        : new Set(Object.keys(registryPlugins || {}));
     for (const requiredPlugin of requiredPlugins) {
-        if (!registryPlugins ||
-            !Object.keys(registryPlugins).includes(requiredPlugin)) {
+        if (!registryPluginNames.has(requiredPlugin)) {
             missing.push(requiredPlugin);
         }
     }

package/dist/registry/domain/version-handler.js

@@ -8,13 +8,15 @@ exports.validateNewVersion = validateNewVersion;
 const semver_1 = __importDefault(require("semver"));
 const semver_extra_1 = __importDefault(require("semver-extra"));
 function getAvailableVersion(requestedVersion, availableVersions) {
-    if (typeof requestedVersion === 'undefined') {
-        requestedVersion = '';
+    if (!requestedVersion) {
+        return (semver_1.default.maxSatisfying(availableVersions, '') ||
+            semver_extra_1.default.max(availableVersions) ||
+            undefined);
     }
-    const version = semver_1.default.maxSatisfying(availableVersions, requestedVersion) || undefined;
-    const max = semver_extra_1.default.max(availableVersions);
-    const isLatest = requestedVersion === '';
-    return version || (isLatest && max) || undefined;
+    if (availableVersions.includes(requestedVersion)) {
+        return requestedVersion;
+    }
+    return semver_1.default.maxSatisfying(availableVersions, requestedVersion) || undefined;
 }
 function validateNewVersion(requestedVersion, availableVersions) {
     return !availableVersions.includes(requestedVersion);

package/dist/registry/middleware/index.js

@@ -14,6 +14,9 @@ const bind = (adapter, options) => {
         res.conf = options;
     });
     adapter.enableRequestTiming((req, res, time) => {
+        if (!events_handler_1.default.hasListeners('request')) {
+            return;
+        }
         const data = {
             body: req.body,
             duration: time,

package/dist/registry/routes/components.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = components;
-const async_1 = __importDefault(require("async"));
 const resources_1 = __importDefault(require("../../resources"));
+const pLimit_1 = __importDefault(require("../../utils/pLimit"));
 const get_component_1 = __importDefault(require("./helpers/get-component"));
 function components(conf, repository) {
     const getComponent = (0, get_component_1.default)(conf, repository);
@@ -57,7 +57,8 @@ function components(conf, repository) {
                 return returnError(errors.join(', '));
             }
         }
-        async_1.default.map(components, (component, callback) => {
+        const limit = (0, pLimit_1.default)(10);
+        Promise.all(components.map((component) => limit(() => new Promise((resolve) => {
             getComponent({
                 conf: res.conf,
                 action: component.action,
@@ -65,31 +66,29 @@ function components(conf, repository) {
                 headers: req.headers,
                 ip: req.ip,
                 omitHref: !!req.body.omitHref,
-                parameters: { ...req.body.parameters, ...component.parameters },
+                parameters: {
+                    ...req.body.parameters,
+                    ...component.parameters
+                },
                 version: component.version
-            }, (result) => callback(null, result));
-        }, 
-        // @ts-expect-error
-        (_err, results) => {
+            }, resolve);
+        })))).then((results) => {
             try {
                 setHeaders(results, res);
                 setCookies(results, res);
-                res.status(200).json(results);
+                res
+                    .status(200)
+                    .json(results.map((result) => result.response.renderMode && !result.headers
+                    ? { ...result, headers: {} }
+                    : result));
             }
             catch (e) {
-                // @ts-expect-error I think this will never reach (how can setHeaders throw?)
-                if (results.code && results.error) {
-                    // @ts-expect-error
-                    res.status(500).json({ code: results.code, error: results.error });
-                }
-                else {
-                    res.status(500).json({
-                        code: 'RENDER_ERROR',
-                        error: resources_1.default.errors.registry.RENDER_ERROR(results
-                            .map((x) => `${x.response.name}@${x.response.version}`)
-                            .join(', '), String(e))
-                    });
-                }
+                res.status(500).json({
+                    code: 'RENDER_ERROR',
+                    error: resources_1.default.errors.registry.RENDER_ERROR(results
+                        .map((x) => `${x.response.name}@${x.response.version}`)
+                        .join(', '), String(e))
+                });
             }
         });
     };

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

@@ -27,6 +27,7 @@ export interface GetComponentResult {
         error?: unknown;
         version?: string;
         html?: string;
+        renderMode?: string;
         requestVersion?: string;
         name?: string;
         details?: {

package/dist/registry/routes/helpers/get-component.js

@@ -123,21 +123,53 @@ function getComponent(conf, repository) {
         refreshInterval: conf.refreshInterval
     });
     const convertPlugins = pluginConverter(conf.plugins);
+    const customHeadersByConfig = new WeakMap();
+    const pluginNamesByConfig = new WeakMap();
+    const getCustomHeadersToSkip = (config) => {
+        if (!customHeadersByConfig.has(config)) {
+            customHeadersByConfig.set(config, config.customHeadersToSkipOnWeakVersion?.length
+                ? new Set(config.customHeadersToSkipOnWeakVersion)
+                : undefined);
+        }
+        return customHeadersByConfig.get(config);
+    };
+    const getRegistryPluginNames = (config) => {
+        let names = pluginNamesByConfig.get(config);
+        if (!names) {
+            names = new Set(Object.keys(config.plugins || {}));
+            pluginNamesByConfig.set(config, names);
+        }
+        return names;
+    };
+    const inFlight = new Map();
+    const singleFlight = (key, operation) => {
+        const pending = inFlight.get(key);
+        if (pending) {
+            return pending;
+        }
+        const promise = operation().finally(() => {
+            inFlight.delete(key);
+        });
+        inFlight.set(key, promise);
+        return promise;
+    };
     const getEnv = async (component) => {
         const cacheKey = `${component.name}/${component.version}/.env`;
         const cached = cache.get('file-contents', cacheKey);
         if (cached)
             return cached;
-        const env = component.oc.files.env
-            ? await repository.getEnv(component.name, component.version)
-            : {};
-        cache.set('file-contents', cacheKey, env);
-        return env;
+        return singleFlight(cacheKey, async () => {
+            const env = component.oc.files.env
+                ? await repository.getEnv(component.name, component.version)
+                : {};
+            cache.set('file-contents', cacheKey, env);
+            return env;
+        });
     };
     const renderer = async (options, cb) => {
         const nestedRenderer = (0, nested_renderer_1.default)(renderer, options.conf);
         const retrievingInfo = (0, get_component_retrieving_info_1.default)(options);
-        let responseHeaders = {};
+        let responseHeaders;
         const responseCookies = [];
         const getLanguage = () => {
             const paramOverride = !!options.parameters && options.parameters['__ocAcceptLanguage'];
@@ -159,11 +191,8 @@ function getComponent(conf, repository) {
             return cb(result);
         };
         let componentCallbackDone = false;
+        let callbackTimeout;
         const conf = options.conf;
-        const customHeadersToSkipSet = conf.customHeadersToSkipOnWeakVersion?.length
-            ? new Set(conf.customHeadersToSkipOnWeakVersion)
-            : undefined;
-        const acceptLanguage = getLanguage();
         const requestedComponent = {
             name: options.name,
             version: options.version || '',
@@ -196,7 +225,7 @@ function getComponent(conf, repository) {
                 });
             }
             // check component requirements are satisfied by registry
-            const pluginsCompatibility = validator.validatePluginsRequirements(component.oc.plugins, conf.plugins);
+            const pluginsCompatibility = validator.validatePluginsRequirements(component.oc.plugins, getRegistryPluginNames(conf));
             if (!pluginsCompatibility.isValid) {
                 return callback({
                     status: 501,
@@ -249,7 +278,10 @@ function getComponent(conf, repository) {
                 });
             }
             const filterCustomHeaders = (headers, requestedVersion, actualVersion) => {
-                if (!customHeadersToSkipSet || requestedVersion === actualVersion) {
+                const customHeadersToSkipSet = getCustomHeadersToSkip(conf);
+                if (!headers ||
+                    !customHeadersToSkipSet ||
+                    requestedVersion === actualVersion) {
                     return headers;
                 }
                 let filteredHeaders;
@@ -259,28 +291,32 @@ function getComponent(conf, repository) {
                         filteredHeaders[key] = headers[key];
                     }
                 }
-                return filteredHeaders || {};
+                return filteredHeaders;
             };
             const returnComponent = async (err, data) => {
                 if (componentCallbackDone) {
                     return;
                 }
                 componentCallbackDone = true;
+                if (callbackTimeout) {
+                    clearTimeout(callbackTimeout);
+                    callbackTimeout = undefined;
+                }
                 const componentHref = urlBuilder.component({
                     name: component.name,
                     version: requestedComponent.version,
                     parameters: params
                 }, conf.baseUrl);
                 const isUnrendered = options.headers.accept === settings_1.default.registry.acceptUnrenderedHeader;
-                const isValidClientRequest = options.headers['user-agent'] &&
-                    !!options.headers['user-agent'].match('oc-client-');
-                const supportedTemplates = options.headers['templates']
-                    ? parseTemplatesHeader(options.headers['templates'])
-                    : [];
-                const isTemplateSupportedByClient = Boolean(isValidClientRequest &&
-                    options.headers['templates'] &&
-                    (supportedTemplates.includes(component.oc.files.template.type) ||
-                        supportedTemplates.includes(templateType)));
+                const isValidClientRequest = String(options.headers['user-agent'] || '').includes('oc-client-');
+                const templatesHeader = options.headers['templates'];
+                let isTemplateSupportedByClient = false;
+                if (isUnrendered && isValidClientRequest && templatesHeader) {
+                    const supportedTemplates = parseTemplatesHeader(templatesHeader);
+                    isTemplateSupportedByClient =
+                        supportedTemplates.includes(component.oc.files.template.type) ||
+                            supportedTemplates.includes(templateType);
+                }
                 let renderMode = options.action ? 'unrendered' : 'rendered';
                 if (isUnrendered) {
                     renderMode = 'unrendered';
@@ -356,7 +392,7 @@ function getComponent(conf, repository) {
                 if (renderMode === 'unrendered') {
                     callback({
                         status: 200,
-                        headers: responseHeaders,
+                        ...(responseHeaders ? { headers: responseHeaders } : {}),
                         response: Object.assign(response, {
                             data: data,
                             template: {
@@ -396,7 +432,7 @@ function getComponent(conf, repository) {
                             }
                             callback({
                                 status: 200,
-                                headers: responseHeaders,
+                                ...(responseHeaders ? { headers: responseHeaders } : {}),
                                 response: Object.assign(response, { html })
                             });
                         });
@@ -405,11 +441,22 @@ function getComponent(conf, repository) {
                         returnResult(cached);
                     }
                     else {
-                        (0, universalify_1.fromPromise)(repository.getCompiledView)(component.name, component.version, (_err, templateText) => {
+                        const loadTemplate = async () => {
+                            const templateText = await repository.getCompiledView(component.name, component.version);
                             const template = ocTemplate.getCompiledTemplate(templateText, key);
                             cache.set('file-contents', cacheKey, template);
-                            returnResult(template);
-                        });
+                            return template;
+                        };
+                        const templatePromise = conf.hotReloading
+                            ? loadTemplate()
+                            : singleFlight(cacheKey, loadTemplate);
+                        templatePromise.then(returnResult).catch((error) => callback({
+                            status: 500,
+                            response: {
+                                code: 'INTERNAL_SERVER_ERROR',
+                                error
+                            }
+                        }));
                     }
                 }
             };
@@ -440,9 +487,13 @@ function getComponent(conf, repository) {
                     const cached = cache.get('file-contents', cacheKey);
                     const domain = node_domain_1.default.create();
                     const setEmptyResponse = oc_empty_response_handler_1.default.contextDecorator(returnComponent);
+                    let parsedAcceptLanguage;
                     const contextObj = {
                         action: options.action,
-                        acceptLanguage: accept_language_parser_1.default.parse(acceptLanguage),
+                        get acceptLanguage() {
+                            parsedAcceptLanguage ??= accept_language_parser_1.default.parse(getLanguage());
+                            return parsedAcceptLanguage;
+                        },
                         baseUrl: conf.baseUrl,
                         env: { ...conf.env, ...env },
                         params,
@@ -479,7 +530,7 @@ function getComponent(conf, repository) {
                     const setCallbackTimeout = () => {
                         const executionTimeout = conf.executionTimeout;
                         if (executionTimeout) {
-                            setTimeout(() => {
+                            callbackTimeout = setTimeout(() => {
                                 const message = `timeout (${executionTimeout * 1000}ms)`;
                                 returnComponent({ message }, undefined);
                                 domain.exit();
@@ -490,8 +541,8 @@ function getComponent(conf, repository) {
                         domain.on('error', returnComponent);
                         try {
                             domain.run(() => {
-                                cached(contextObj, returnComponent);
                                 setCallbackTimeout();
+                                cached(contextObj, returnComponent);
                             });
                         }
                         catch (e) {
@@ -499,17 +550,36 @@ function getComponent(conf, repository) {
                         }
                     }
                     else {
-                        (0, universalify_1.fromPromise)(repository.getDataProvider)(component.name, component.version, (err, dataProvider) => {
-                            if (err) {
+                        const handleError = (err) => {
+                            if (err.code === 'DATA_RESOLVING_ERROR') {
                                 componentCallbackDone = true;
                                 return callback({
                                     status: 502,
                                     response: {
-                                        code: 'DATA_RESOLVING_ERROR',
+                                        code: err.code,
                                         error: resources_1.default.errors.registry.RESOLVING_ERROR
                                     }
                                 });
                             }
+                            if (err.code === 'DEPENDENCY_MISSING_FROM_REGISTRY') {
+                                componentCallbackDone = true;
+                                return callback({
+                                    status: 501,
+                                    response: {
+                                        code: err.code,
+                                        error: resources_1.default.errors.registry.DEPENDENCY_NOT_FOUND(err.missing.join(', ')),
+                                        missingDependencies: err.missing
+                                    }
+                                });
+                            }
+                            returnComponent(err, undefined);
+                        };
+                        const loadDataProvider = async () => {
+                            const dataProvider = await repository
+                                .getDataProvider(component.name, component.version)
+                                .catch(() => {
+                                throw { code: 'DATA_RESOLVING_ERROR', missing: [] };
+                            });
                             const context = {
                                 require: (0, require_wrapper_1.default)(conf.dependencies),
                                 module: {
@@ -538,40 +608,29 @@ function getComponent(conf, repository) {
                                     }
                                 }
                             };
-                            const handleError = (err) => {
-                                if (err.code === 'DEPENDENCY_MISSING_FROM_REGISTRY') {
-                                    componentCallbackDone = true;
-                                    return callback({
-                                        status: 501,
-                                        response: {
-                                            code: err.code,
-                                            error: resources_1.default.errors.registry.DEPENDENCY_NOT_FOUND(err.missing.join(', ')),
-                                            missingDependencies: err.missing
-                                        }
-                                    });
-                                }
-                                returnComponent(err, undefined);
-                            };
-                            const options = conf.local
+                            const vmOptions = conf.local
                                 ? {
                                     displayErrors: true,
                                     filename: dataProvider.filePath
                                 }
                                 : {};
-                            try {
-                                node_vm_1.default.runInNewContext(dataProvider.content, context, options);
-                                const processData = context.module.exports['data'] || context.exports['data'];
-                                cache.set('file-contents', cacheKey, processData);
-                                domain.on('error', handleError);
-                                domain.run(() => {
-                                    processData(contextObj, returnComponent);
-                                    setCallbackTimeout();
-                                });
-                            }
-                            catch (err) {
-                                handleError(err);
-                            }
-                        });
+                            node_vm_1.default.runInNewContext(dataProvider.content, context, vmOptions);
+                            const processData = context.module.exports['data'] || context.exports['data'];
+                            cache.set('file-contents', cacheKey, processData);
+                            return processData;
+                        };
+                        const dataProviderPromise = conf.hotReloading
+                            ? loadDataProvider()
+                            : singleFlight(cacheKey, loadDataProvider);
+                        dataProviderPromise
+                            .then((processData) => {
+                            domain.on('error', handleError);
+                            domain.run(() => {
+                                setCallbackTimeout();
+                                processData(contextObj, returnComponent);
+                            });
+                        })
+                            .catch(handleError);
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oc",
-	"version": "0.50.58",
+	"version": "0.50.59",
 	"description": "A framework for developing and distributing html components",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -95,7 +95,7 @@
 		"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.12",
 		"oc-empty-response-handler": "^1.0.2",
 		"oc-get-unix-utc-timestamp": "^1.0.6",
 		"oc-metadata-adapters-utils": "^0.1.1",