@midwayjs/faas 3.0.0-beta.1 → 3.0.0-beta.13

package/CHANGELOG.md

@@ -3,6 +3,120 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+
+### Features
+
+* default add session  & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf))
+* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+
+### Bug Fixes
+
+* faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639))
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+* support global prefix url ([#1371](https://github.com/midwayjs/midway/issues/1371)) ([cc5fe44](https://github.com/midwayjs/midway/commit/cc5fe44e1d221590562dc71e1f33ae96093e0da7))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
 # [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
 
 

package/dist/configuration.js

@@ -27,12 +27,14 @@ let FaaSConfiguration = class FaaSConfiguration {
                 this.framework.getLogger());
         });
         this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
-            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData)(options.originArgs[0], options.originArgs[1]);
+            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
         });
     }
     async onReady(container) { }
     async onServerReady() {
-        await this.framework.run();
+        if (!this.framework.isEnable()) {
+            await this.framework.run();
+        }
     }
 };
 __decorate([

package/dist/framework.d.ts

@@ -8,9 +8,10 @@ export declare class MidwayFaaSFramework extends BaseFramework<IMidwayFaaSApplic
     private lock;
     app: IMidwayFaaSApplication;
     private isReplaceLogger;
+    private developmentRun;
     environmentService: MidwayEnvironmentService;
-    middlewareService: MidwayMiddlewareService<FaaSContext>;
-    configure(options: IFaaSConfigurationOptions): void;
+    middlewareService: MidwayMiddlewareService<FaaSContext, any>;
+    configure(options: IFaaSConfigurationOptions): any;
     isEnable(): boolean;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     run(): Promise<void>;
@@ -20,7 +21,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<IMidwayFaaSApplic
      * @deprecated
      * @param middlewareId
      */
-    generateMiddleware(middlewareId: string): Promise<FunctionMiddleware<FaaSContext>>;
+    generateMiddleware(middlewareId: string): Promise<FunctionMiddleware<FaaSContext, any>>;
     getContext(context: any): any;
     private invokeHandler;
     protected getFunctionHandler(ctx: any, args: any, target: any, method: any): string;

package/dist/framework.js

@@ -14,7 +14,6 @@ const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const simple_lock_1 = require("@midwayjs/simple-lock");
 const logger_1 = require("@midwayjs/logger");
-const middlewareManager_1 = require("@midwayjs/core/dist/util/middlewareManager");
 const LOCK_KEY = '_faas_starter_start_key';
 let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework {
     constructor() {
@@ -23,12 +22,19 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         this.funMappingStore = new Map();
         this.lock = new simple_lock_1.default();
         this.isReplaceLogger = process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] === 'true';
+        this.developmentRun = false;
     }
     configure(options) {
-        this.configurationOptions = options;
+        if (options) {
+            this.developmentRun = true;
+            this.configurationOptions = options;
+        }
+        else {
+            return this.configService.getConfiguration('faas');
+        }
     }
     isEnable() {
-        return false;
+        return !this.developmentRun;
     }
     async applicationInitialize(options) {
         var _a;
@@ -61,6 +67,9 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 return (_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionServiceName();
             },
         });
+        // hack use method
+        this.app.originUse = this.app.use;
+        this.app.use = this.app.useMiddleware;
     }
     async run() {
         return this.lock.sureOnce(async () => {
@@ -73,11 +82,6 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             for (const funcInfo of functionList) {
                 this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
             }
-            // bind func and controller module
-            const routerModules = await collector.getRouterModules();
-            for (const module of routerModules) {
-                this.getApplicationContext().bindClass(module);
-            }
         }, LOCK_KEY);
     }
     getFrameworkType() {
@@ -94,8 +98,8 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             }
             const context = this.getContext(args.shift());
             const isHttpFunction = !!(context.headers && context.get);
-            const globalMiddlewareFn = await this.getMiddleware();
-            const middlewareManager = new middlewareManager_1.ContextMiddlewareManager();
+            const globalMiddlewareFn = await this.applyMiddleware();
+            const middlewareManager = new core_1.ContextMiddlewareManager();
             middlewareManager.insertLast(globalMiddlewareFn);
             middlewareManager.insertLast(async (ctx, next) => {
                 const fn = await this.middlewareService.compose([
@@ -112,15 +116,11 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                         }
                         return result;
                     },
-                ]);
+                ], this.app);
                 return await fn(ctx, next);
             });
-            const composeMiddleware = await this.middlewareService.compose(middlewareManager);
-            const { error, result } = await composeMiddleware(context);
-            if (error) {
-                throw error;
-            }
-            return result;
+            const composeMiddleware = await this.middlewareService.compose(middlewareManager, this.app);
+            return await composeMiddleware(context);
         };
     }
     /**

package/dist/interface.d.ts

@@ -1,4 +1,4 @@
-import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext } from '@midwayjs/core';
+import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { FaaSHTTPContext } from '@midwayjs/faas-typings';
 import { ILogger } from '@midwayjs/logger';
 export interface FaaSContext extends IMidwayContext<FaaSHTTPContext> {
@@ -29,6 +29,7 @@ export interface Application extends IMidwayFaaSApplication {
 }
 export interface Context extends FaaSContext {
 }
+export declare type NextFunction = BaseNextFunction;
 export interface IFaaSConfigurationOptions extends IConfigurationOptions {
     config?: object;
     initializeContext?: object;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.13",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.1",
-    "@midwayjs/faas-typings": "^3.0.0-beta.1",
-    "@midwayjs/logger": "^3.0.0-beta.1",
+    "@midwayjs/core": "^3.0.0-beta.13",
+    "@midwayjs/faas-typings": "^3.0.0-beta.13",
+    "@midwayjs/logger": "^3.0.0-beta.13",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.1",
-    "@midwayjs/mock": "^3.0.0-beta.1",
-    "@midwayjs/serverless-fc-starter": "^3.0.0-beta.1",
-    "@midwayjs/serverless-scf-starter": "^3.0.0-beta.1",
+    "@midwayjs/decorator": "^3.0.0-beta.13",
+    "@midwayjs/mock": "^3.0.0-beta.13",
+    "@midwayjs/serverless-fc-starter": "^3.0.0-beta.13",
+    "@midwayjs/serverless-scf-starter": "^3.0.0-beta.13",
     "mm": "3"
   },
   "engines": {
@@ -45,5 +45,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "72e4d20c678e65a5440c4e9a6d3b70046daa497c"
+  "gitHead": "d3c47770fee9dce33a8d148882173fd7782864ad"
 }