@opra/core 1.0.0-alpha.9 → 1.0.0-beta.2

package/cjs/augmentation/18n.augmentation.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
 common_1.I18n.load = async function (options) {
     const opts = {
         ...options,
@@ -11,7 +11,7 @@ common_1.I18n.load = async function (options) {
     delete opts.resourceDirs;
     const instance = common_1.I18n.createInstance(opts);
     await instance.init();
-    await instance.loadResourceDir(path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
+    await instance.loadResourceDir(node_path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
     if (options?.resourceDirs)
         for (const dir of options.resourceDirs)
             await instance.loadResourceDir(dir);
@@ -23,7 +23,7 @@ common_1.I18n.prototype.loadResourceBundle = async function (lang, ns, filePath,
         obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
     }
     else {
-        const content = fs_1.default.readFileSync(filePath, 'utf8');
+        const content = node_fs_1.default.readFileSync(filePath, 'utf8');
         obj = JSON.parse(content);
     }
     this.addResourceBundle(lang, ns, obj, deep, overwrite);
@@ -31,18 +31,18 @@ common_1.I18n.prototype.loadResourceBundle = async function (lang, ns, filePath,
 common_1.I18n.prototype.loadResourceDir = async function (dirnames, deep, overwrite) {
     for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
         /* istanbul ignore next */
-        if (!fs_1.default.existsSync(dirname))
+        if (!node_fs_1.default.existsSync(dirname))
             continue;
-        const languageDirs = fs_1.default.readdirSync(dirname);
+        const languageDirs = node_fs_1.default.readdirSync(dirname);
         for (const lang of languageDirs) {
-            const langDir = path_1.default.join(dirname, lang);
-            if (fs_1.default.statSync(langDir).isDirectory()) {
-                const nsDirs = fs_1.default.readdirSync(langDir);
+            const langDir = node_path_1.default.join(dirname, lang);
+            if (node_fs_1.default.statSync(langDir).isDirectory()) {
+                const nsDirs = node_fs_1.default.readdirSync(langDir);
                 for (const nsfile of nsDirs) {
-                    const nsFilePath = path_1.default.join(langDir, nsfile);
-                    const ext = path_1.default.extname(nsfile);
-                    if (ext === '.json' && fs_1.default.statSync(nsFilePath).isFile()) {
-                        const ns = path_1.default.basename(nsfile, ext);
+                    const nsFilePath = node_path_1.default.join(langDir, nsfile);
+                    const ext = node_path_1.default.extname(nsfile);
+                    if (ext === '.json' && node_fs_1.default.statSync(nsFilePath).isFile()) {
+                        const ns = node_path_1.default.basename(nsfile, ext);
                         await this.loadResourceBundle(lang, ns, nsFilePath, deep, overwrite);
                     }
                 }

package/cjs/constants.js

@@ -1,5 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kAssetCache = exports.kHandler = void 0;
-exports.kHandler = Symbol.for('kHandler');
+exports.kAssetCache = void 0;
 exports.kAssetCache = Symbol.for('kAssetCache');

package/cjs/execution-context.js

@@ -8,6 +8,7 @@ const strict_typed_events_1 = require("strict-typed-events");
 class ExecutionContext extends strict_typed_events_1.AsyncEventEmitter {
     constructor(init) {
         super();
+        this.errors = [];
         this.document = init.document;
         this.protocol = init.protocol;
         this.platform = init.platform;

package/cjs/http/express-adapter.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressAdapter = void 0;
 const tslib_1 = require("tslib");
+const nodePath = tslib_1.__importStar(require("node:path"));
 const common_1 = require("@opra/common");
 const express_1 = require("express");
-const nodePath = tslib_1.__importStar(require("path"));
-const constants_js_1 = require("../constants.js");
 const http_adapter_js_1 = require("./http-adapter.js");
 const http_context_js_1 = require("./http-context.js");
 const http_incoming_interface_js_1 = require("./interfaces/http-incoming.interface.js");
 const http_outgoing_interface_js_1 = require("./interfaces/http-outgoing.interface.js");
+const wrap_exception_js_1 = require("./utils/wrap-exception.js");
 class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
     constructor(app, document, options) {
         super(document, options);
@@ -40,7 +40,8 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
                         await resource.onShutdown.call(instance, resource);
                     }
                     catch (e) {
-                        this.logger.error(e);
+                        if (this.listenerCount('error'))
+                            this.emit('error', (0, wrap_exception_js_1.wrapException)(e));
                     }
                 }
             }
@@ -63,10 +64,10 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         }
         else
             this.app.use(router);
-        const createContext = (_req, _res, args) => {
+        const createContext = async (_req, _res, args) => {
             const request = http_incoming_interface_js_1.HttpIncoming.from(_req);
             const response = http_outgoing_interface_js_1.HttpOutgoing.from(_res);
-            return new http_context_js_1.HttpContext({
+            const ctx = new http_context_js_1.HttpContext({
                 adapter: this,
                 platform: this.platform,
                 request,
@@ -76,11 +77,14 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
                 operation: args?.operation,
                 operationHandler: args?.operationHandler,
             });
+            await this.emitAsync('createContext', ctx);
+            return ctx;
         };
         /** Add an endpoint that returns document schema */
         router.get('/\\$schema', (_req, _res, next) => {
-            const context = createContext(_req, _res);
-            this[constants_js_1.kHandler].sendDocumentSchema(context).catch(next);
+            createContext(_req, _res)
+                .then(ctx => this.handler.sendDocumentSchema(ctx).catch(next))
+                .catch(next);
         });
         /** Add operation endpoints */
         if (this.api.controllers.size) {
@@ -94,19 +98,18 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
                         continue;
                     /** Define router callback */
                     router[operation.method.toLowerCase()](routePath, (_req, _res, _next) => {
-                        const context = createContext(_req, _res, {
+                        createContext(_req, _res, {
                             controller,
                             controllerInstance,
                             operation,
                             operationHandler,
-                        });
-                        this[constants_js_1.kHandler]
-                            .handleRequest(context)
+                        })
+                            .then(ctx => this.handler.handleRequest(ctx))
                             .then(() => {
                             if (!_res.headersSent)
                                 _next();
                         })
-                            .catch((e) => this.logger.fatal(e));
+                            .catch((e) => this.emit('error', e));
                     });
                 }
                 if (controller.controllers.size) {
@@ -119,18 +122,17 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         }
         /** Add an endpoint that returns 404 error at last */
         router.use('*', (_req, _res, next) => {
-            const res = http_outgoing_interface_js_1.HttpOutgoing.from(_res);
-            // const url = new URL(_req.originalUrl, '')
-            this[constants_js_1.kHandler]
-                .sendErrorResponse(res, [
-                new common_1.NotFoundError({
-                    message: `No endpoint found for [${_req.method}]${_req.baseUrl}`,
+            createContext(_req, _res)
+                .then(ctx => {
+                ctx.errors.push(new common_1.NotFoundError({
+                    message: `No endpoint found at [${_req.method}]${_req.baseUrl}`,
                     details: {
                         path: _req.baseUrl,
                         method: _req.method,
                     },
-                }),
-            ])
+                }));
+                this.handler.sendResponse(ctx).catch(next);
+            })
                 .catch(next);
         });
     }

package/cjs/http/http-adapter.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAdapter = void 0;
 const common_1 = require("@opra/common");
-const constants_js_1 = require("../constants.js");
 const platform_adapter_js_1 = require("../platform-adapter.js");
-const http_handler_js_1 = require("./impl/http-handler.js");
+const http_handler_js_1 = require("./http-handler.js");
 /**
  *
  * @class HttpAdapter
@@ -15,10 +14,8 @@ class HttpAdapter extends platform_adapter_js_1.PlatformAdapter {
         this.protocol = 'http';
         if (!(document.api instanceof common_1.HttpApi))
             throw new TypeError(`The document does not expose an HTTP Api`);
-        this[constants_js_1.kHandler] = new http_handler_js_1.HttpHandler(this);
+        this.handler = new http_handler_js_1.HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
-        if (options?.onRequest)
-            this.on('request', options.onRequest);
     }
     get api() {
         return this.document.api;

package/cjs/http/http-context.js

@@ -29,6 +29,10 @@ class HttpContext extends execution_context_js_1.ExecutionContext {
         this.pathParams = init.pathParams || {};
         this.queryParams = init.queryParams || {};
         this._body = init.body;
+        this.on('finish', () => {
+            if (this._multipartReader)
+                this._multipartReader.purge().catch(() => undefined);
+        });
     }
     get isMultipart() {
         return !!this.request.is('multipart');
@@ -38,21 +42,21 @@ class HttpContext extends execution_context_js_1.ExecutionContext {
             throw new common_1.InternalServerError('Request content is not a multipart content');
         if (this._multipartReader)
             return this._multipartReader;
-        const { request, mediaType } = this;
+        const { mediaType } = this;
         if (mediaType?.contentType) {
             const arr = Array.isArray(mediaType.contentType) ? mediaType.contentType : [mediaType.contentType];
             const contentType = arr.find(ct => type_is_1.default.is(ct, ['multipart']));
             if (!contentType)
                 throw new common_1.NotAcceptableError('This endpoint does not accept multipart requests');
         }
-        const reader = new multipart_reader_js_1.MultipartReader(request, {
-            maxFields: mediaType?.maxFields,
-            maxFieldsSize: mediaType?.maxFieldsSize,
-            maxFiles: mediaType?.maxFiles,
-            maxFileSize: mediaType?.maxFileSize,
-            maxTotalFileSize: mediaType?.maxTotalFileSize,
-            minFileSize: mediaType?.minFileSize,
-        });
+        const reader = new multipart_reader_js_1.MultipartReader(this, {
+            limits: {
+                fields: mediaType?.maxFields,
+                fieldSize: mediaType?.maxFieldsSize,
+                files: mediaType?.maxFiles,
+                fileSize: mediaType?.maxFileSize,
+            },
+        }, mediaType);
         this._multipartReader = reader;
         return reader;
     }
@@ -65,29 +69,10 @@ class HttpContext extends execution_context_js_1.ExecutionContext {
             /** Retrieve all fields */
             const parts = await reader.getAll();
             /** Filter fields according to configuration */
-            this._body = [];
-            const multipartFields = mediaType?.multipartFields;
-            if (mediaType && multipartFields?.length) {
-                const fieldsFound = new Map();
-                for (const item of parts) {
-                    const field = mediaType.findMultipartField(item.fieldName, item.type);
-                    if (field) {
-                        fieldsFound.set(field, true);
-                        this._body.push(item);
-                    }
-                }
-                /** Check required fields */
-                for (const field of multipartFields) {
-                    if (field.required && !fieldsFound.get(field)) {
-                        throw new common_1.BadRequestError({
-                            message: `Multipart field (${field.fieldName}) is required`,
-                        });
-                    }
-                }
-            }
+            this._body = [...parts];
             return this._body;
         }
-        this._body = await this.request.readBody({ limit: operation.requestBody?.maxContentSize });
+        this._body = await this.request.readBody({ limit: operation?.requestBody?.maxContentSize });
         if (this._body != null) {
             // Convert Buffer to string if media is text
             if (Buffer.isBuffer(this._body) && request.is(['json', 'xml', 'txt', 'text'])) {
@@ -104,7 +89,7 @@ class HttpContext extends execution_context_js_1.ExecutionContext {
                 if (!decode) {
                     decode =
                         mediaType.type?.generateCodec('decode', {
-                            partial: operation.requestBody?.partial,
+                            partial: operation?.requestBody?.partial,
                             projection: '*',
                             ignoreReadonlyFields: true,
                         }) || valgen_1.vg.isAny();