@midwayjs/faas 3.3.6-beta.2 → 3.3.6-beta.5

package/dist/framework.d.ts

@@ -1,34 +1,43 @@
 /// <reference types="node" />
-import { FaaSContext, IFaaSConfigurationOptions, IMidwayFaaSApplication, InvokeOptions } from './interface';
-import { BaseFramework, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
+import { Context, IFaaSConfigurationOptions, Application, NextFunction } from './interface';
+import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
 import { LoggerOptions } from '@midwayjs/logger';
 import * as http from 'http';
-export declare class MidwayFaaSFramework extends BaseFramework<IMidwayFaaSApplication, FaaSContext, IFaaSConfigurationOptions> {
+export declare class MidwayFaaSFramework extends BaseFramework<Application, Context, IFaaSConfigurationOptions> {
     protected defaultHandlerMethod: string;
     protected funMappingStore: Map<string, RouterInfo>;
     protected logger: any;
     private lock;
-    app: IMidwayFaaSApplication;
+    app: Application;
     private isReplaceLogger;
     private developmentRun;
     private serverlessRoutes;
     private server;
     private respond;
     private applicationAdapter;
-    protected eventMiddlewareManager: ContextMiddlewareManager<FaaSContext, unknown, unknown>;
+    protected httpMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
+    protected eventMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     environmentService: MidwayEnvironmentService;
-    middlewareService: MidwayMiddlewareService<FaaSContext, any>;
+    middlewareService: MidwayMiddlewareService<Context, any>;
     configure(options: IFaaSConfigurationOptions): any;
     isEnable(): boolean;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     run(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;
-    handleInvokeWrapper(handlerMapping: string, options?: InvokeOptions): (...args: any[]) => Promise<any>;
+    handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<{
+        result: any;
+        error: Error;
+    } | {
+        isBase64Encoded: boolean;
+        statusCode: any;
+        headers: any;
+        body: any;
+    }>;
     /**
      * @deprecated
      * @param middlewareId
      */
-    generateMiddleware(middlewareId: string): Promise<FunctionMiddleware<FaaSContext, any>>;
+    generateMiddleware(middlewareId: string): Promise<FunctionMiddleware<Context, any>>;
     getContext(context?: any): any;
     private invokeHandler;
     protected getFunctionHandler(ctx: any, args: any, target: any, method: any): string;
@@ -36,6 +45,9 @@ export declare class MidwayFaaSFramework extends BaseFramework<IMidwayFaaSApplic
     getFrameworkName(): string;
     getServer(): http.Server;
     protected createHttpContext(req: any, res: any): Promise<unknown>;
+    useMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
+    useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
+    getEventMiddleware(): ContextMiddlewareManager<Context, NextFunction, undefined>;
 }
 export declare const createModuleServerlessFramework: (globalOption: Omit<IMidwayBootstrapOptions, 'applicationContext'> & IFaaSConfigurationOptions) => Promise<MidwayFaaSFramework>;
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createModuleServerlessFramework = exports.MidwayFaaSFramework = void 0;
-const interface_1 = require("./interface");
 const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const simple_lock_1 = require("@midwayjs/simple-lock");
@@ -27,6 +26,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         this.isReplaceLogger = process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] === 'true';
         this.developmentRun = false;
         this.serverlessRoutes = [];
+        this.httpMiddlewareManager = this.createMiddlewareManager();
         this.eventMiddlewareManager = this.createMiddlewareManager();
     }
     configure(options) {
@@ -44,13 +44,13 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return !this.developmentRun;
     }
     async applicationInitialize(options) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.logger) {
             this.logger = options.logger || logger_1.loggers.getLogger('appLogger');
         }
         this.applicationAdapter = this.configurationOptions.applicationAdapter;
         this.app =
-            ((_a = this.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getApplication()) ||
+            ((_b = (_a = this.applicationAdapter).getApplication) === null || _b === void 0 ? void 0 : _b.call(_a)) ||
                 new serverless_http_parser_1.Application();
         this.defineApplicationProperties({
             /**
@@ -79,7 +79,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         // hack use method
         this.app.originUse = this.app.use;
         this.app.use = this.app.useMiddleware;
-        if ((_b = this.configurationOptions.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runAppHook) {
+        if ((_c = this.configurationOptions.applicationAdapter) === null || _c === void 0 ? void 0 : _c.runAppHook) {
             this.configurationOptions.applicationAdapter.runAppHook(this.app);
         }
     }
@@ -122,7 +122,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
     getFrameworkType() {
         return core_1.MidwayFrameworkType.FAAS;
     }
-    handleInvokeWrapper(handlerMapping, options) {
+    handleInvokeWrapper(handlerMapping) {
         let funOptions = this.funMappingStore.get(handlerMapping);
         return async (...args) => {
             var _a, _b;
@@ -130,9 +130,8 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 throw new Error('first parameter must be function context');
             }
             const event = args[0];
-            const isLegacyMode = !options;
-            const isHttpFunction = (options === null || options === void 0 ? void 0 : options.triggerType) === interface_1.TRIGGER_TYPE_ENUM.HTTP ||
-                event.constructor.name === 'IncomingMessage' ||
+            const isLegacyMode = event.originContext && event.originEvent;
+            const isHttpFunction = event.constructor.name === 'IncomingMessage' ||
                 event.constructor.name === 'EventEmitter' ||
                 !!(event.headers && event.get);
             if (!funOptions && isHttpFunction) {
@@ -159,11 +158,11 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             else {
                 context = this.getContext(await ((_b = this.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runEventHook(...args)));
             }
-            const globalMiddlewareFn = await this.applyMiddleware();
-            const middlewareManager = new core_1.ContextMiddlewareManager();
-            middlewareManager.insertLast(globalMiddlewareFn);
-            middlewareManager.insertLast(async (ctx, next) => {
+            const result = await (await this.applyMiddleware(async (ctx, next) => {
                 const fn = await this.middlewareService.compose([
+                    ...(isHttpFunction
+                        ? this.httpMiddlewareManager
+                        : this.eventMiddlewareManager),
                     ...funOptions.controllerMiddleware,
                     ...funOptions.middleware,
                     async (ctx, next) => {
@@ -179,9 +178,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     },
                 ], this.app);
                 return await fn(ctx, next);
-            });
-            const composeMiddleware = await this.middlewareService.compose(middlewareManager, this.app);
-            const result = await composeMiddleware(context);
+            }))(context);
             if (isLegacyMode) {
                 return result;
             }
@@ -319,6 +316,15 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             this.respond(req, res, resolve);
         });
     }
+    useMiddleware(middleware) {
+        this.httpMiddlewareManager.insertLast(middleware);
+    }
+    useEventMiddleware(middleware) {
+        this.eventMiddlewareManager.insertLast(middleware);
+    }
+    getEventMiddleware() {
+        return this.eventMiddlewareManager;
+    }
 };
 __decorate([
     (0, decorator_1.Inject)(),

package/dist/interface.d.ts

@@ -1,4 +1,4 @@
-import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
+import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager } from '@midwayjs/core';
 import { FaaSHTTPContext } from '@midwayjs/faas-typings';
 import { ILogger } from '@midwayjs/logger';
 import { Application as ServerlessHttpApplication } from '@midwayjs/serverless-http-parser';
@@ -11,8 +11,8 @@ export interface FaaSContext extends IMidwayContext<FaaSHTTPContext> {
 /**
  * @deprecated
  */
-export declare type FaaSMiddleware = ((context: FaaSContext, next: () => Promise<any>) => any) | string;
-export declare type IMidwayFaaSApplication = IMidwayApplication<FaaSContext, {
+export declare type FaaSMiddleware = ((context: Context, next: () => Promise<any>) => any) | string;
+export declare type IMidwayFaaSApplication = IMidwayApplication<Context, {
     getInitializeContext(): any;
     use(middleware: FaaSMiddleware): any;
     /**
@@ -28,7 +28,8 @@ export declare type IMidwayFaaSApplication = IMidwayApplication<FaaSContext, {
      * Get function service name in serverless environment
      */
     getFunctionServiceName(): string;
-    useEventMiddleware(): void;
+    useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
+    getEventMiddleware: ContextMiddlewareManager<Context, NextFunction, undefined>;
 }> & ServerlessHttpApplication;
 export interface Application extends IMidwayFaaSApplication {
 }
@@ -39,10 +40,10 @@ export interface IFaaSConfigurationOptions extends IConfigurationOptions {
     config?: object;
     initializeContext?: object;
     applicationAdapter?: {
-        getApplication(): IMidwayFaaSApplication;
+        getApplication(): Application;
         getFunctionName(): string;
         getFunctionServiceName(): string;
-        runAppHook?(app: IMidwayFaaSApplication): void;
+        runAppHook?(app: Application): void;
         runEventHook?(...args: any[]): any | void;
         runRequestHook?(...args: any[]): any | void;
     };
@@ -53,11 +54,4 @@ export interface IFaaSConfigurationOptions extends IConfigurationOptions {
 export interface IWebMiddleware {
     resolve(): FaaSMiddleware;
 }
-export declare enum TRIGGER_TYPE_ENUM {
-    HTTP = "http",
-    Event = "event"
-}
-export interface InvokeOptions {
-    triggerType: TRIGGER_TYPE_ENUM;
-}
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,9 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRIGGER_TYPE_ENUM = void 0;
-var TRIGGER_TYPE_ENUM;
-(function (TRIGGER_TYPE_ENUM) {
-    TRIGGER_TYPE_ENUM["HTTP"] = "http";
-    TRIGGER_TYPE_ENUM["Event"] = "event";
-})(TRIGGER_TYPE_ENUM = exports.TRIGGER_TYPE_ENUM || (exports.TRIGGER_TYPE_ENUM = {}));
 //# sourceMappingURL=interface.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.3.6-beta.2",
+  "version": "3.3.6-beta.5",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {