@midwayjs/faas 3.7.2-beta.1 → 3.8.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/framework.d.ts

@@ -32,7 +32,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
      * @param handlerMapping
      */
     handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
-    getTriggerFunction(context: any, handlerMapping: string, options: HandlerOptions): Promise<any>;
+    invokeTriggerFunction(context: any, handlerMapping: string, options: HandlerOptions): Promise<any>;
     wrapHttpRequest(req: http.IncomingMessage | Record<string, any>, res?: http.ServerResponse): Promise<unknown>;
     /**
      * @deprecated

package/dist/framework.js

@@ -92,16 +92,35 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             getEventMiddleware: () => {
                 return this.getEventMiddleware();
             },
-            getServerlessInstance: (serviceClass) => {
-                var _a;
-                const context = this.app.createAnonymousContext();
-                if ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.runContextHook) {
-                    this.configurationOptions.applicationAdapter.runContextHook(context);
-                }
-                return context.requestContext.getAsync(serviceClass);
+            getServerlessInstance: async (serviceClass, customContext = {}) => {
+                const instance = new Proxy({}, {
+                    get: (target, prop) => {
+                        let funcInfo;
+                        if (typeof serviceClass === 'string') {
+                            funcInfo = this.funMappingStore.get(`${serviceClass}.${prop}`);
+                        }
+                        else {
+                            funcInfo = Array.from(this.funMappingStore.values()).find(item => {
+                                return (item.id === (0, core_1.getProviderUUId)(serviceClass) &&
+                                    item.method === prop);
+                            });
+                        }
+                        if (funcInfo) {
+                            return async (...args) => {
+                                const context = this.app.createAnonymousContext();
+                                return this.invokeTriggerFunction(context, funcInfo.funcHandlerName, {
+                                    isHttpFunction: false,
+                                    originContext: customContext,
+                                    originEvent: args[0],
+                                });
+                            };
+                        }
+                    },
+                });
+                return instance;
             },
-            getTriggerFunction: (context, handlerMapping, options) => {
-                return this.getTriggerFunction(context, handlerMapping, options);
+            invokeTriggerFunction: (context, handlerMapping, options) => {
+                return this.invokeTriggerFunction(context, handlerMapping, options);
             },
         });
         // hack use method
@@ -195,7 +214,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             return await composeMiddleware(context);
         };
     }
-    async getTriggerFunction(context, handlerMapping, options) {
+    async invokeTriggerFunction(context, handlerMapping, options) {
         var _a, _b;
         let funOptions = this.funMappingStore.get(handlerMapping);
         const isHttpFunction = options.isHttpFunction;

package/dist/interface.d.ts

@@ -1,4 +1,4 @@
-import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions } from '@midwayjs/core';
+import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions, ObjectIdentifier } from '@midwayjs/core';
 import { FaaSHTTPContext } from '@midwayjs/faas-typings';
 import { ILogger } from '@midwayjs/logger';
 import { Application as ServerlessHttpApplication } from '@midwayjs/serverless-http-parser';
@@ -35,10 +35,10 @@ export declare type IMidwayFaaSApplication = IMidwayApplication<Context, {
     getFunctionServiceName(): string;
     useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
     getEventMiddleware(): ContextMiddlewareManager<Context, NextFunction, undefined>;
-    getTriggerFunction(context: any, handler: string, options: HandlerOptions): Promise<any>;
-    getServerlessInstance<T>(serviceClass: {
+    invokeTriggerFunction(context: any, handler: string, options: HandlerOptions): Promise<any>;
+    getServerlessInstance<T>(serviceClass: ObjectIdentifier | {
         new (...args: any[]): T;
-    }): Promise<T>;
+    }, customContext?: any): Promise<T>;
 }> & ServerlessHttpApplication;
 export interface Application extends IMidwayFaaSApplication {
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.7.2-beta.1",
+  "version": "3.8.0",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.7.0",
+    "@midwayjs/core": "^3.8.0",
     "@midwayjs/faas-typings": "^3.6.0",
     "@midwayjs/logger": "^2.15.0",
     "@midwayjs/serverless-http-parser": "^3.6.0",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^3.7.1",
-    "@midwayjs/serverless-fc-starter": "^3.7.0",
+    "@midwayjs/mock": "^3.8.0",
+    "@midwayjs/serverless-fc-starter": "^3.8.0",
     "@midwayjs/serverless-scf-starter": "^3.7.0",
     "mm": "3.2.0"
   },
@@ -45,5 +45,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "5c640c7182923587139f9f9c0aecf50585798e1e"
 }