@opra/http 1.0.0-beta.4 → 1.0.0-beta.6

package/cjs/express-adapter.js

@@ -9,7 +9,6 @@ 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);
@@ -19,7 +18,7 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
             throw new TypeError('document.api must be instance of HttpApi');
         for (const c of this.api.controllers.values())
             this._createControllers(c);
-        this._initRouter(options?.basePath);
+        this._initRouter();
     }
     get platform() {
         return 'express';
@@ -33,18 +32,6 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
                     await processInstance(subResource);
                 }
             }
-            if (controller.onShutdown) {
-                const instance = this._controllerInstances.get(controller) || controller.instance;
-                if (instance) {
-                    try {
-                        await controller.onShutdown.call(instance, controller);
-                    }
-                    catch (e) {
-                        if (this.listenerCount('error'))
-                            this.emit('error', (0, wrap_exception_js_1.wrapException)(e));
-                    }
-                }
-            }
         };
         for (const c of this.api.controllers.values())
             await processInstance(c);
@@ -54,16 +41,9 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         const controller = this.api.findController(controllerPath);
         return controller && this._controllerInstances.get(controller);
     }
-    _initRouter(basePath) {
+    _initRouter() {
         const router = (0, express_1.Router)();
-        if (basePath) {
-            if (!basePath.startsWith('/'))
-                basePath = '/' + basePath;
-            if (basePath)
-                this.app.use(basePath, router);
-        }
-        else
-            this.app.use(router);
+        this.app.use(this.basePath, router);
         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);
@@ -141,8 +121,6 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         if (!instance && controller.ctor)
             instance = new controller.ctor();
         if (instance) {
-            if (typeof controller.onInit === 'function')
-                controller.onInit.call(instance, controller);
             this._controllerInstances.set(controller, instance);
             // Initialize sub resources
             for (const r of controller.controllers.values()) {

package/cjs/http-adapter.js

@@ -16,6 +16,9 @@ class HttpAdapter extends core_1.PlatformAdapter {
             throw new TypeError(`The document does not expose an HTTP Api`);
         this.handler = new http_handler_js_1.HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
+        this.basePath = options?.basePath || '/';
+        if (!this.basePath.startsWith('/'))
+            this.basePath = '/' + this.basePath;
     }
     get api() {
         return this.document.httpApi;

package/cjs/impl/http-outgoing.host.js

@@ -10,7 +10,7 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
 const content_disposition_1 = tslib_1.__importDefault(require("content-disposition"));
 const content_type_1 = tslib_1.__importDefault(require("content-type"));
-const cookie_1 = tslib_1.__importDefault(require("cookie"));
+const cookie = tslib_1.__importStar(require("cookie"));
 const cookie_signature_1 = tslib_1.__importDefault(require("cookie-signature"));
 const encodeurl_1 = tslib_1.__importDefault(require("encodeurl"));
 const mime_types_1 = tslib_1.__importDefault(require("mime-types"));
@@ -79,7 +79,7 @@ class HttpOutgoingHost {
         }
         if (opts.path == null)
             opts.path = '/';
-        this.appendHeader('Set-Cookie', cookie_1.default.serialize(name, String(val), opts));
+        this.appendHeader('Set-Cookie', cookie.serialize(name, String(val), opts));
         return this;
     }
     status(code) {

package/esm/express-adapter.js

@@ -5,7 +5,6 @@ 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.js';
 export class ExpressAdapter extends HttpAdapter {
     constructor(app, document, options) {
         super(document, options);
@@ -15,7 +14,7 @@ export class ExpressAdapter extends HttpAdapter {
             throw new TypeError('document.api must be instance of HttpApi');
         for (const c of this.api.controllers.values())
             this._createControllers(c);
-        this._initRouter(options?.basePath);
+        this._initRouter();
     }
     get platform() {
         return 'express';
@@ -29,18 +28,6 @@ export class ExpressAdapter extends HttpAdapter {
                     await processInstance(subResource);
                 }
             }
-            if (controller.onShutdown) {
-                const instance = this._controllerInstances.get(controller) || controller.instance;
-                if (instance) {
-                    try {
-                        await controller.onShutdown.call(instance, controller);
-                    }
-                    catch (e) {
-                        if (this.listenerCount('error'))
-                            this.emit('error', wrapException(e));
-                    }
-                }
-            }
         };
         for (const c of this.api.controllers.values())
             await processInstance(c);
@@ -50,16 +37,9 @@ export class ExpressAdapter extends HttpAdapter {
         const controller = this.api.findController(controllerPath);
         return controller && this._controllerInstances.get(controller);
     }
-    _initRouter(basePath) {
+    _initRouter() {
         const router = Router();
-        if (basePath) {
-            if (!basePath.startsWith('/'))
-                basePath = '/' + basePath;
-            if (basePath)
-                this.app.use(basePath, router);
-        }
-        else
-            this.app.use(router);
+        this.app.use(this.basePath, router);
         const createContext = async (_req, _res, args) => {
             const request = HttpIncoming.from(_req);
             const response = HttpOutgoing.from(_res);
@@ -137,8 +117,6 @@ export class ExpressAdapter extends HttpAdapter {
         if (!instance && controller.ctor)
             instance = new controller.ctor();
         if (instance) {
-            if (typeof controller.onInit === 'function')
-                controller.onInit.call(instance, controller);
             this._controllerInstances.set(controller, instance);
             // Initialize sub resources
             for (const r of controller.controllers.values()) {

package/esm/http-adapter.js

@@ -13,6 +13,9 @@ export class HttpAdapter extends PlatformAdapter {
             throw new TypeError(`The document does not expose an HTTP Api`);
         this.handler = new HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
+        this.basePath = options?.basePath || '/';
+        if (!this.basePath.startsWith('/'))
+            this.basePath = '/' + this.basePath;
     }
     get api() {
         return this.document.httpApi;

package/esm/impl/http-outgoing.host.js

@@ -6,7 +6,7 @@ import path from 'node:path';
 import { HttpStatusCode } from '@opra/common';
 import contentDisposition from 'content-disposition';
 import contentType from 'content-type';
-import cookie from 'cookie';
+import * as cookie from 'cookie';
 import cookieSignature from 'cookie-signature';
 import encodeUrl from 'encodeurl';
 import mime from 'mime-types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/http",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "Opra Http Server Adapter",
   "author": "Panates",
   "license": "MIT",
@@ -8,15 +8,15 @@
     "@browsery/antlr4": "^4.13.3-r1",
     "@browsery/http-parser": "^0.5.9-r1",
     "@browsery/type-is": "^1.6.18-r5",
-    "@opra/common": "^1.0.0-beta.4",
-    "@opra/core": "^1.0.0-beta.4",
+    "@opra/common": "^1.0.0-beta.6",
+    "@opra/core": "^1.0.0-beta.6",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",
     "bytes": "^3.1.2",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
-    "cookie": "^0.6.0",
+    "cookie": "^1.0.0",
     "cookie-signature": "^1.2.1",
     "cppzst": "^2.0.12",
     "encodeurl": "^2.0.0",

package/types/express-adapter.d.ts

@@ -8,6 +8,6 @@ export declare class ExpressAdapter extends HttpAdapter {
     get platform(): string;
     close(): Promise<void>;
     getControllerInstance<T>(controllerPath: string): T | undefined;
-    protected _initRouter(basePath?: string): void;
+    protected _initRouter(): void;
     protected _createControllers(controller: HttpController): void;
 }

package/types/http-adapter.d.ts

@@ -26,6 +26,7 @@ export declare namespace HttpAdapter {
 export declare abstract class HttpAdapter extends PlatformAdapter {
     readonly handler: HttpHandler;
     readonly protocol: OpraSchema.Transport;
+    readonly basePath: string;
     interceptors: (HttpAdapter.InterceptorFunction | HttpAdapter.IHttpInterceptor)[];
     protected constructor(document: ApiDocument, options?: HttpAdapter.Options);
     get api(): HttpApi;