@midwayjs/faas 3.3.6-beta.3 → 3.3.6-beta.4

package/dist/framework.d.ts

@@ -1,34 +1,43 @@
 /// <reference types="node" />
-import { FaaSContext, IFaaSConfigurationOptions, IMidwayFaaSApplication } 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): (...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

@@ -26,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) {
@@ -157,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) => {
@@ -177,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;
             }
@@ -317,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;
     };

package/package.json

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