@opra/core 1.0.0-alpha.3 → 1.0.0-alpha.31

package/esm/http/express-adapter.js

@@ -1,11 +1,11 @@
+import { HttpApi, NotFoundError } from '@opra/common';
 import { Router } from 'express';
 import * as nodePath from 'path';
-import { HttpApi, NotFoundError } from '@opra/common';
-import { kHandler } from '../constants.js';
 import { HttpAdapter } from './http-adapter.js';
 import { HttpContext } from './http-context.js';
 import { HttpIncoming } from './interfaces/http-incoming.interface.js';
 import { HttpOutgoing } from './interfaces/http-outgoing.interface.js';
+import { wrapException } from './utils/wrap-exception';
 export class ExpressAdapter extends HttpAdapter {
     constructor(app, document, options) {
         super(document, options);
@@ -31,13 +31,15 @@ export class ExpressAdapter extends HttpAdapter {
             }
             if (resource.onShutdown) {
                 const instance = this._controllerInstances.get(resource) || resource.instance;
-                if (instance)
+                if (instance) {
                     try {
                         await resource.onShutdown.call(instance, resource);
                     }
                     catch (e) {
-                        this.logger.error(e);
+                        if (this.listenerCount('error'))
+                            this.emit('error', wrapException(e));
                     }
+                }
             }
         };
         for (const c of this.api.controllers.values())
@@ -58,17 +60,12 @@ export class ExpressAdapter extends HttpAdapter {
         }
         else
             this.app.use(router);
-        const createContext = (_req, _res, args) => {
+        const createContext = async (_req, _res, args) => {
             const request = HttpIncoming.from(_req);
             const response = HttpOutgoing.from(_res);
-            const platformArgs = {
-                request: _req,
-                response: _res,
-            };
-            return new HttpContext({
+            const ctx = new HttpContext({
                 adapter: this,
                 platform: this.platform,
-                platformArgs,
                 request,
                 response,
                 controller: args?.controller,
@@ -76,18 +73,14 @@ export class ExpressAdapter extends HttpAdapter {
                 operation: args?.operation,
                 operationHandler: args?.operationHandler,
             });
+            await this.emitAsync('createContext', ctx);
+            return ctx;
         };
         /** Add an endpoint that returns document schema */
-        router.get('*', (_req, _res, next) => {
-            if (_req.url.includes('/$schema')) {
-                const url = (_req.url.includes('?') ? _req.url.substring(0, _req.url.indexOf('?')) : _req.url).toLowerCase();
-                if (url === '/$schema') {
-                    const context = createContext(_req, _res);
-                    this[kHandler].sendDocumentSchema(context).catch(next);
-                    return;
-                }
-            }
-            next();
+        router.get('/\\$schema', (_req, _res, next) => {
+            createContext(_req, _res)
+                .then(ctx => this.handler.sendDocumentSchema(ctx).catch(next))
+                .catch(next);
         });
         /** Add operation endpoints */
         if (this.api.controllers.size) {
@@ -101,19 +94,18 @@ export class ExpressAdapter extends 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[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) {
@@ -126,18 +118,17 @@ export class ExpressAdapter extends HttpAdapter {
         }
         /** Add an endpoint that returns 404 error at last */
         router.use('*', (_req, _res, next) => {
-            const res = HttpOutgoing.from(_res);
-            // const url = new URL(_req.originalUrl, '')
-            this[kHandler]
-                .sendErrorResponse(res, [
-                new NotFoundError({
-                    message: `No endpoint found for [${_req.method}]${_req.baseUrl}`,
+            createContext(_req, _res)
+                .then(ctx => {
+                ctx.errors.push(new 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/esm/http/http-adapter.js

@@ -1,7 +1,6 @@
 import { HttpApi } from '@opra/common';
-import { kHandler } from '../constants.js';
 import { PlatformAdapter } from '../platform-adapter.js';
-import { HttpHandler } from './impl/http-handler.js';
+import { HttpHandler } from './http-handler.js';
 /**
  *
  * @class HttpAdapter
@@ -12,10 +11,8 @@ export class HttpAdapter extends PlatformAdapter {
         this.protocol = 'http';
         if (!(document.api instanceof HttpApi))
             throw new TypeError(`The document does not expose an HTTP Api`);
-        this[kHandler] = new HttpHandler(this);
+        this.handler = new HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
-        if (options?.onRequest)
-            this.on('request', options.onRequest);
     }
     get api() {
         return this.document.api;

package/esm/http/http-context.js

@@ -1,6 +1,6 @@
-import { vg } from 'valgen';
 import typeIs from '@browsery/type-is';
-import { BadRequestError, InternalServerError, NotAcceptableError, } from '@opra/common';
+import { InternalServerError, NotAcceptableError, } from '@opra/common';
+import { vg } from 'valgen';
 import { kAssetCache } from '../constants.js';
 import { ExecutionContext } from '../execution-context.js';
 import { MultipartReader } from './impl/multipart-reader.js';
@@ -25,6 +25,10 @@ export class HttpContext extends 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');
@@ -34,21 +38,21 @@ export class HttpContext extends ExecutionContext {
             throw new 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 => typeIs.is(ct, ['multipart']));
             if (!contentType)
                 throw new NotAcceptableError('This endpoint does not accept multipart requests');
         }
-        const reader = new MultipartReader(request, {
-            maxFields: mediaType?.maxFields,
-            maxFieldsSize: mediaType?.maxFieldsSize,
-            maxFiles: mediaType?.maxFiles,
-            maxFileSize: mediaType?.maxFileSize,
-            maxTotalFileSize: mediaType?.maxTotalFileSize,
-            minFileSize: mediaType?.minFileSize,
-        });
+        const reader = new MultipartReader(this, {
+            limits: {
+                fields: mediaType?.maxFields,
+                fieldSize: mediaType?.maxFieldsSize,
+                files: mediaType?.maxFiles,
+                fileSize: mediaType?.maxFileSize,
+            },
+        }, mediaType);
         this._multipartReader = reader;
         return reader;
     }
@@ -61,32 +65,15 @@ export class HttpContext extends 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 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']))
+            if (Buffer.isBuffer(this._body) && request.is(['json', 'xml', 'txt', 'text'])) {
                 this._body = this._body.toString('utf-8');
+            }
             // Transform text to Object if media is JSON
             if (typeof this._body === 'string' && request.is(['json']))
                 this._body = JSON.parse(this._body);
@@ -98,8 +85,9 @@ export class HttpContext extends ExecutionContext {
                 if (!decode) {
                     decode =
                         mediaType.type?.generateCodec('decode', {
-                            partial: operation.requestBody?.partial,
+                            partial: operation?.requestBody?.partial,
                             projection: '*',
+                            ignoreReadonlyFields: true,
                         }) || vg.isAny();
                     this.adapter[kAssetCache].set(mediaType, 'decode', decode);
                 }