@opra/core 0.25.2 → 0.25.4

package/cjs/adapter/http/http-adapter-base.js

@@ -38,7 +38,20 @@ class HttpAdapterBase extends platform_adapter_host_js_1.PlatformAdapterHost {
                 outgoing.appendHeader(common_1.HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(common_1.HttpHeaderCodes)
                     .filter(k => k.toLowerCase().startsWith('x-opra-')));
             }
-            await this.processRequest(context);
+            let i = 0;
+            let requestProcessed = false;
+            const next = async () => {
+                while (i < this._interceptors.length) {
+                    const interceptor = this._interceptors[i++];
+                    if (interceptor)
+                        await interceptor(context, next);
+                }
+                if (!requestProcessed) {
+                    requestProcessed = true;
+                    await this.processRequest(context);
+                }
+            };
+            await next();
         }
         catch (error) {
             context.errors.push((0, common_1.wrapException)(error));

package/cjs/adapter/http/http-adapter.host.js

@@ -37,6 +37,11 @@ class HttpAdapterHost extends http_adapter_base_js_1.HttpAdapterBase {
         incomingMessage.originalUrl = originalUrl;
         incomingMessage.baseUrl = this.basePath.toString();
         incomingMessage.parsedUrl = parsedUrl;
+        Object.defineProperty(incomingMessage, 'searchParams', {
+            get() {
+                return incomingMessage.parsedUrl.searchParams;
+            }
+        });
         const req = http_server_request_js_1.HttpServerRequest.from(incomingMessage);
         const res = http_server_response_js_1.HttpServerResponse.from(serverResponse);
         this.handleIncoming(req, res)

package/cjs/adapter/http/http-server-request.js

@@ -24,6 +24,12 @@ var HttpServerRequest;
         const req = instance;
         req.baseUrl = req.baseUrl || '';
         req.parsedUrl = req.parsedUrl || new common_1.OpraURL(req.url);
+        if (!req.searchParams)
+            Object.defineProperty(req, 'searchParams', {
+                get() {
+                    return req.parsedUrl.searchParams;
+                }
+            });
         return req;
     }
     HttpServerRequest.from = from;

package/cjs/adapter/interfaces/interceptor.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/adapter/platform-adapter.host.js

@@ -17,6 +17,7 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
         this._controllers = new WeakMap();
         this._initialized = false;
         this._options = options || {};
+        this._interceptors = [...(options?.interceptors || [])];
         this._logger = options?.logger && options.logger instanceof logger_js_1.Logger
             ? options.logger
             : new logger_js_1.Logger({ instance: options?.logger });

package/cjs/index.js

@@ -18,7 +18,8 @@ tslib_1.__exportStar(require("./adapter/http/impl/http-incoming-message.host.js"
 tslib_1.__exportStar(require("./adapter/http/impl/http-outgoing-message.host.js"), exports);
 tslib_1.__exportStar(require("./adapter/http/http-server-request.js"), exports);
 tslib_1.__exportStar(require("./adapter/http/http-server-response.js"), exports);
+tslib_1.__exportStar(require("./adapter/http/helpers/multipart-helper.js"), exports);
+tslib_1.__exportStar(require("./adapter/interfaces/interceptor.interface.js"), exports);
 tslib_1.__exportStar(require("./adapter/interfaces/logger.interface.js"), exports);
 tslib_1.__exportStar(require("./adapter/interfaces/request-handler.interface.js"), exports);
 tslib_1.__exportStar(require("./adapter/services/logger.js"), exports);
-tslib_1.__exportStar(require("./adapter/http/helpers/multipart-helper.js"), exports);

package/esm/adapter/http/http-adapter-base.js

@@ -35,7 +35,20 @@ export class HttpAdapterBase extends PlatformAdapterHost {
                 outgoing.appendHeader(HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(HttpHeaderCodes)
                     .filter(k => k.toLowerCase().startsWith('x-opra-')));
             }
-            await this.processRequest(context);
+            let i = 0;
+            let requestProcessed = false;
+            const next = async () => {
+                while (i < this._interceptors.length) {
+                    const interceptor = this._interceptors[i++];
+                    if (interceptor)
+                        await interceptor(context, next);
+                }
+                if (!requestProcessed) {
+                    requestProcessed = true;
+                    await this.processRequest(context);
+                }
+            };
+            await next();
         }
         catch (error) {
             context.errors.push(wrapException(error));

package/esm/adapter/http/http-adapter.host.js

@@ -33,6 +33,11 @@ export class HttpAdapterHost extends HttpAdapterBase {
         incomingMessage.originalUrl = originalUrl;
         incomingMessage.baseUrl = this.basePath.toString();
         incomingMessage.parsedUrl = parsedUrl;
+        Object.defineProperty(incomingMessage, 'searchParams', {
+            get() {
+                return incomingMessage.parsedUrl.searchParams;
+            }
+        });
         const req = HttpServerRequest.from(incomingMessage);
         const res = HttpServerResponse.from(serverResponse);
         this.handleIncoming(req, res)

package/esm/adapter/http/http-server-request.js

@@ -20,6 +20,12 @@ export var HttpServerRequest;
         const req = instance;
         req.baseUrl = req.baseUrl || '';
         req.parsedUrl = req.parsedUrl || new OpraURL(req.url);
+        if (!req.searchParams)
+            Object.defineProperty(req, 'searchParams', {
+                get() {
+                    return req.parsedUrl.searchParams;
+                }
+            });
         return req;
     }
     HttpServerRequest.from = from;

package/esm/adapter/interfaces/interceptor.interface.js

@@ -0,0 +1 @@
+export {};

package/esm/adapter/platform-adapter.host.js

@@ -13,6 +13,7 @@ export class PlatformAdapterHost extends AsyncEventEmitter {
         this._controllers = new WeakMap();
         this._initialized = false;
         this._options = options || {};
+        this._interceptors = [...(options?.interceptors || [])];
         this._logger = options?.logger && options.logger instanceof Logger
             ? options.logger
             : new Logger({ instance: options?.logger });

package/esm/index.js

@@ -15,7 +15,8 @@ export * from './adapter/http/impl/http-incoming-message.host.js';
 export * from './adapter/http/impl/http-outgoing-message.host.js';
 export * from './adapter/http/http-server-request.js';
 export * from './adapter/http/http-server-response.js';
+export * from './adapter/http/helpers/multipart-helper.js';
+export * from './adapter/interfaces/interceptor.interface.js';
 export * from './adapter/interfaces/logger.interface.js';
 export * from './adapter/interfaces/request-handler.interface.js';
 export * from './adapter/services/logger.js';
-export * from './adapter/http/helpers/multipart-helper.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.25.2",
+  "version": "0.25.4",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.25.1",
+    "@opra/common": "^0.25.4",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
@@ -57,7 +57,7 @@
     "@types/cookie-signature": "^1.1.0",
     "@types/encodeurl": "^1.0.0",
     "@types/express": "^4.17.17",
-    "@types/formidable": "^3.4.1",
+    "@types/formidable": "^3.4.2",
     "@types/fresh": "^0.5.0",
     "@types/mime-types": "^2.1.1",
     "@types/range-parser": "^1.2.4",
@@ -94,4 +94,4 @@
     "swagger",
     "raml"
   ]
-}
+}

package/types/adapter/endpoint-context.d.ts

@@ -1,7 +1,7 @@
 import type { ExecutionContext } from './execution-context';
 import type { Request } from './request';
 import type { Response } from './response';
-export interface EndpointContext<TSpace extends object = Record<string | number | symbol, any>> extends ExecutionContext<TSpace> {
+export interface EndpointContext<TSession extends {} = {}> extends ExecutionContext<TSession> {
     request: Request;
     response: Response;
 }

package/types/adapter/http/http-server-request.d.ts

@@ -10,6 +10,7 @@ export interface HttpServerRequest extends HttpIncomingMessage {
     baseUrl: string;
     originalUrl: string;
     parsedUrl: OpraURL;
+    searchParams: URLSearchParams;
     body?: any;
     /**
      * Return the protocol string "http" or "https"

package/types/adapter/interfaces/interceptor.interface.d.ts

@@ -0,0 +1,2 @@
+import { ExecutionContext } from '../execution-context.js';
+export type Interceptor = (context: ExecutionContext, next: (() => Promise<void>)) => Promise<void>;

package/types/adapter/platform-adapter.d.ts

@@ -1,5 +1,6 @@
 import { ApiDocument, FallbackLng, I18n, LanguageResource } from '@opra/common';
 import { EndpointContext } from './endpoint-context.js';
+import { Interceptor } from './interfaces/interceptor.interface.js';
 import { ILogger } from './interfaces/logger.interface.js';
 import { RequestHandler } from './interfaces/request-handler.interface.js';
 export type Protocol = 'http' | 'ws' | 'rpc';
@@ -20,6 +21,7 @@ export declare namespace PlatformAdapter {
     interface Options {
         i18n?: I18n | I18nOptions | (() => Promise<I18n>);
         logger?: ILogger;
+        interceptors?: Interceptor[];
         on?: {
             request?: (ctx: EndpointContext) => void | Promise<void>;
         };

package/types/adapter/platform-adapter.host.d.ts

@@ -1,6 +1,7 @@
 import { AsyncEventEmitter } from 'strict-typed-events';
 import { ApiDocument, I18n, Resource } from '@opra/common';
 import { ExecutionContext } from './execution-context.js';
+import { Interceptor } from './interfaces/interceptor.interface.js';
 import type { PlatformAdapter, Protocol } from './platform-adapter';
 import { Logger } from './services/logger.js';
 /**
@@ -16,6 +17,7 @@ export declare abstract class PlatformAdapterHost extends AsyncEventEmitter impl
     _options: PlatformAdapter.Options;
     _i18n: I18n;
     _logger: Logger;
+    _interceptors: Interceptor[];
     protected constructor(api: ApiDocument, options?: PlatformAdapter.Options);
     get platform(): string;
     get protocol(): Protocol;

package/types/augmentation/collection.augmentation.d.ts

@@ -4,7 +4,7 @@ import type { Request as _Request } from '../adapter/request.js';
 declare module "@opra/common" {
     namespace Collection {
         namespace Action {
-            interface Context extends Resource.Context {
+            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
                 key?: any;
             }
         }
@@ -18,7 +18,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -27,7 +27,7 @@ declare module "@opra/common" {
                 endpoint: 'delete';
                 key: any;
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -38,7 +38,7 @@ declare module "@opra/common" {
                     filter?: any;
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -57,7 +57,7 @@ declare module "@opra/common" {
                     count?: boolean;
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -71,7 +71,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -86,7 +86,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -98,7 +98,7 @@ declare module "@opra/common" {
                     filter?: any;
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }

package/types/augmentation/resource.augmentation.d.ts

@@ -9,7 +9,7 @@ declare module "@opra/common" {
         OnShutdown(): any;
     }
     namespace Resource {
-        interface Context extends EndpointContext {
+        interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
             params: Record<string, any>;
         }
     }

package/types/augmentation/singleton.augmentation.d.ts

@@ -4,7 +4,7 @@ import type { Request as _Request } from '../adapter/request.js';
 declare module "@opra/common" {
     namespace Singleton {
         namespace Action {
-            interface Context extends Resource.Context {
+            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
             }
         }
         namespace Create {
@@ -17,7 +17,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -25,7 +25,7 @@ declare module "@opra/common" {
             interface Request extends _Request {
                 endpoint: 'delete';
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -38,7 +38,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -52,7 +52,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }

package/types/augmentation/storage.augmentation.d.ts

@@ -7,20 +7,20 @@ import type { Request as _Request } from '../adapter/request.js';
 declare module "@opra/common" {
     namespace Storage {
         namespace Action {
-            interface Context extends Resource.Context {
+            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
             }
         }
         namespace Delete {
             interface Request extends _Request {
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
         namespace Get {
             interface Request extends _Request {
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }
@@ -28,7 +28,7 @@ declare module "@opra/common" {
             interface Request extends _Request {
                 parts: MultipartIterator;
             }
-            interface Context extends EndpointContext {
+            interface Context<TSession extends {} = {}> extends EndpointContext<TSession> {
                 request: Request;
             }
         }

package/types/index.d.ts

@@ -15,7 +15,8 @@ export * from './adapter/http/impl/http-incoming-message.host.js';
 export * from './adapter/http/impl/http-outgoing-message.host.js';
 export * from './adapter/http/http-server-request.js';
 export * from './adapter/http/http-server-response.js';
+export * from './adapter/http/helpers/multipart-helper.js';
+export * from './adapter/interfaces/interceptor.interface.js';
 export * from './adapter/interfaces/logger.interface.js';
 export * from './adapter/interfaces/request-handler.interface.js';
 export * from './adapter/services/logger.js';
-export * from './adapter/http/helpers/multipart-helper.js';