@midwayjs/fc-starter 3.8.0 → 3.10.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AbstractBootstrapStarter, FC } from '@midwayjs/faas';
 export * from './mock';
 export declare class BootstrapStarter extends AbstractBootstrapStarter {
@@ -5,5 +6,31 @@ export declare class BootstrapStarter extends AbstractBootstrapStarter {
     onInit(context: FC.InitializeContext, exports: any): Promise<void>;
     onRequest(event: any, context: any, oldContext: any): Promise<any>;
     onClose(): Promise<void>;
+    protected createDefaultMockContext(): {
+        requestId: string;
+        credentials: {
+            accessKeyId: string;
+            accessKeySecret: string;
+            securityToken: string;
+        };
+        function: {
+            name: string;
+            handler: string;
+            memory: number;
+            timeout: number;
+            initializer: string;
+            initializationTimeout: number;
+        };
+        service: {
+            name: string;
+            logProject: string;
+            logStore: string;
+            qualifier: string;
+            versionId: string;
+        };
+        region: string;
+        accountId: string;
+        logger: Console;
+    };
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -49,7 +49,7 @@ class BootstrapStarter extends faas_1.AbstractBootstrapStarter {
         }
         return exports;
     }
-    async onInit(context = (0, mock_1.mockContext)(), exports) {
+    async onInit(context = this.createDefaultMockContext(), exports) {
         const applicationAdapter = {
             getFunctionName() {
                 return context.function.name;
@@ -90,6 +90,14 @@ class BootstrapStarter extends faas_1.AbstractBootstrapStarter {
                 context.logger = console;
             }
         }
+        let handlerName = (oldContext === null || oldContext === void 0 ? void 0 : oldContext.function.handler) || context.function.handler;
+        // 聚合部署的情况
+        if (this.options.aggregationHandlerName) {
+            if (this.options.handlerNameMapping) {
+                [handlerName, event, context, oldContext] =
+                    this.options.handlerNameMapping(handlerName, event, context, oldContext);
+            }
+        }
         let ctx;
         if (isHTTPMode) {
             event.getOriginContext = () => {
@@ -126,22 +134,9 @@ class BootstrapStarter extends faas_1.AbstractBootstrapStarter {
                 logger: context.logger,
             };
         }
-        let handlerName = (oldContext === null || oldContext === void 0 ? void 0 : oldContext.function.handler) || context.function.handler;
-        // 聚合部署的情况
-        if (this.options.aggregationHandlerName) {
-            if (this.options.handlerNameMapping) {
-                [handlerName, event, context, oldContext] =
-                    this.options.handlerNameMapping(handlerName, event, context, oldContext);
-            }
-            else if (isHTTPMode) {
-                handlerName = ctx.path;
-            }
-        }
         try {
             const result = await this.framework.invokeTriggerFunction(ctx, handlerName, {
                 isHttpFunction: isHTTPMode || isApiGateway,
-                originEvent: event,
-                originContext: context,
             });
             if (isHTTPMode || isApiGateway) {
                 const { isBase64Encoded, statusCode, headers, body } = result;
@@ -216,6 +211,9 @@ class BootstrapStarter extends faas_1.AbstractBootstrapStarter {
         }
     }
     async onClose() { }
+    createDefaultMockContext() {
+        return (0, mock_1.mockContext)();
+    }
 }
 exports.BootstrapStarter = BootstrapStarter;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@midwayjs/fc-starter",
-  "version": "3.8.0",
+  "version": "3.10.0",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.8.0",
-    "@midwayjs/faas": "^3.8.0",
+    "@midwayjs/async-hooks-context-manager": "^3.10.0",
+    "@midwayjs/faas": "^3.10.0",
     "raw-body": "2.5.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.8.0",
-    "@midwayjs/serverless-http-parser": "^3.6.0"
+    "@midwayjs/core": "^3.10.0",
+    "@midwayjs/serverless-http-parser": "^3.10.0"
   },
   "engines": {
     "node": ">=12"
@@ -29,5 +29,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "5c640c7182923587139f9f9c0aecf50585798e1e"
+  "gitHead": "33d28f1a020963404488e866432916fd15c0952c"
 }