@midwayjs/faas 3.4.0-beta.6 → 3.4.0-beta.9

package/dist/framework.d.ts

@@ -33,7 +33,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
      */
     handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
     getTriggerFunction(handlerMapping: string): (context: any, options: HandlerOptions) => Promise<any>;
-    wrapHttpRequest(req: http.IncomingMessage, res?: http.ServerResponse): Promise<unknown>;
+    wrapHttpRequest(req: http.IncomingMessage | Record<string, any>, res?: http.ServerResponse): Promise<unknown>;
     /**
      * @deprecated
      * @param middlewareId
@@ -45,6 +45,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     createLogger(name: string, option?: LoggerOptions): import("@midwayjs/core").ILogger;
     getFrameworkName(): string;
     getServer(): http.Server;
+    beforeStop(): Promise<void>;
     protected createHttpContext(req: any, res: any): Promise<unknown>;
     useMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
     useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;

package/dist/framework.js

@@ -191,6 +191,10 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             const isHttpFunction = options.isHttpFunction;
             if (!funOptions && isHttpFunction) {
                 funOptions = await this.serverlessFunctionService.getMatchedRouterInfo(context.path, context.method);
+                if (funOptions) {
+                    const matchRes = core_1.PathToRegexpUtil.match(funOptions.fullUrlFlattenString)(context.path);
+                    context.req.pathParameters = matchRes['params'] || {};
+                }
             }
             if (!funOptions) {
                 throw new Error(`function handler = ${handlerMapping} not found`);
@@ -379,6 +383,13 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
     getServer() {
         return this.server;
     }
+    async beforeStop() {
+        if (this.server) {
+            new Promise(resolve => {
+                this.server.close(resolve);
+            });
+        }
+    }
     async createHttpContext(req, res) {
         return new Promise(resolve => {
             this.respond(req, res, resolve);

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './interface';
 export { MidwayFaaSFramework as Framework } from './framework';
 export { FaaSConfiguration as Configuration } from './configuration';
+export { AbstractBootstrapStarter } from './starter';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,10 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = exports.Framework = void 0;
+exports.AbstractBootstrapStarter = exports.Configuration = exports.Framework = void 0;
 __exportStar(require("./interface"), exports);
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayFaaSFramework; } });
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.FaaSConfiguration; } });
+var starter_1 = require("./starter");
+Object.defineProperty(exports, "AbstractBootstrapStarter", { enumerable: true, get: function () { return starter_1.AbstractBootstrapStarter; } });
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -65,6 +65,8 @@ export interface IWebMiddleware {
 export interface ServerlessStarterOptions extends IMidwayBootstrapOptions {
     initializeMethodName?: string;
     handlerName?: string;
+    aggregationHandlerName?: string;
+    handlerNameMapping?: (handlerName: string, ...args: unknown[]) => [string, ...unknown[]];
     createAdapter?: () => Promise<{
         close(): any;
         createAppHook(app?: any): any;
@@ -73,6 +75,5 @@ export interface ServerlessStarterOptions extends IMidwayBootstrapOptions {
         mark(label: string): any;
         end(): any;
     };
-    exportAllHandler?: boolean;
 }
 //# sourceMappingURL=interface.d.ts.map

package/dist/starter.d.ts

@@ -0,0 +1,17 @@
+import { ServerlessStarterOptions } from './interface';
+import { IMidwayBootstrapOptions } from '@midwayjs/core';
+export declare abstract class AbstractBootstrapStarter {
+    protected options: ServerlessStarterOptions;
+    protected applicationContext: any;
+    protected framework: any;
+    constructor(options?: ServerlessStarterOptions);
+    getApplicationContext(): any;
+    close(): Promise<void>;
+    start(options?: ServerlessStarterOptions): any;
+    initFramework(bootstrapOptions?: IMidwayBootstrapOptions): Promise<void>;
+    abstract onStart(): any;
+    abstract onInit(...args: unknown[]): any;
+    abstract onRequest(...args: unknown[]): any;
+    abstract onClose(): any;
+}
+//# sourceMappingURL=starter.d.ts.map

package/dist/starter.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractBootstrapStarter = void 0;
+const core_1 = require("@midwayjs/core");
+class AbstractBootstrapStarter {
+    constructor(options = {}) {
+        this.options = options;
+    }
+    getApplicationContext() {
+        return this.applicationContext;
+    }
+    async close() {
+        await this.onClose();
+    }
+    start(options) {
+        this.options = Object.assign(this.options, options);
+        return this.onStart();
+    }
+    async initFramework(bootstrapOptions = {}) {
+        // init midway
+        this.applicationContext = await (0, core_1.initializeGlobalApplicationContext)(bootstrapOptions);
+        const midwayFrameworkService = this.applicationContext.get(core_1.MidwayFrameworkService);
+        this.framework = midwayFrameworkService.getMainFramework();
+    }
+}
+exports.AbstractBootstrapStarter = AbstractBootstrapStarter;
+//# sourceMappingURL=starter.js.map

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.4.0-beta.6",
+  "version": "3.4.0-beta.9",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.4.0-beta.6",
+    "@midwayjs/core": "^3.4.0-beta.9",
     "@midwayjs/faas-typings": "^3.3.5",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/serverless-http-parser": "^3.4.0-beta.6",
+    "@midwayjs/serverless-http-parser": "^3.4.0-beta.9",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0-beta.6",
-    "@midwayjs/mock": "^3.4.0-beta.6",
-    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.6",
-    "@midwayjs/serverless-scf-starter": "^3.4.0-beta.6",
+    "@midwayjs/decorator": "^3.4.0-beta.9",
+    "@midwayjs/mock": "^3.4.0-beta.9",
+    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.9",
+    "@midwayjs/serverless-scf-starter": "^3.4.0-beta.9",
     "mm": "3.2.0"
   },
   "engines": {
@@ -46,5 +46,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "8e187c4593d4832de32b6745af3e195f6b90816c"
+  "gitHead": "41e82a0fba386c6ec42c2eefd1dff4795a81b389"
 }