@midwayjs/faas 3.19.0 → 4.0.0-alpha.1

package/dist/config.default.js

@@ -17,8 +17,9 @@ exports.default = (appInfo) => ({
                 },
             },
             format: (info) => {
-                var _a, _b, _c, _d, _e, _f;
-                const requestId = (_f = (_c = (_b = (_a = info.ctx) === null || _a === void 0 ? void 0 : _a['originContext']) === null || _b === void 0 ? void 0 : _b['requestId']) !== null && _c !== void 0 ? _c : (_e = (_d = info.ctx) === null || _d === void 0 ? void 0 : _d['originContext']) === null || _e === void 0 ? void 0 : _e['request_id']) !== null && _f !== void 0 ? _f : '';
+                const requestId = info.ctx?.['originContext']?.['requestId'] ??
+                    info.ctx?.['originContext']?.['request_id'] ??
+                    '';
                 return `${new Date().toISOString()} ${requestId} [${info.level}] ${info.message}`;
             },
         },

package/dist/configuration.js

@@ -16,13 +16,11 @@ const DefaultConfig = require("./config.default");
 let FaaSConfiguration = class FaaSConfiguration {
     async init() {
         this.decoratorService.registerPropertyHandler(core_1.PLUGIN_KEY, (key, meta, target) => {
-            var _a;
-            return (((_a = target === null || target === void 0 ? void 0 : target[core_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a[key]) ||
+            return (target?.[core_1.REQUEST_OBJ_CTX_KEY]?.[key] ||
                 this.framework.getApplication()[key]);
         });
         this.decoratorService.registerPropertyHandler(core_1.LOGGER_KEY, (key, meta, target) => {
-            var _a;
-            return (((_a = target === null || target === void 0 ? void 0 : target[core_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a['logger']) ||
+            return (target?.[core_1.REQUEST_OBJ_CTX_KEY]?.['logger'] ||
                 this.framework.getLogger());
         });
         this.decoratorService.registerParameterHandler(core_1.WEB_ROUTER_PARAM_KEY, options => {
@@ -38,6 +36,7 @@ let FaaSConfiguration = class FaaSConfiguration {
         await this.framework.loadFunction();
     }
 };
+exports.FaaSConfiguration = FaaSConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", framework_1.MidwayFaaSFramework)
@@ -56,7 +55,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], FaaSConfiguration.prototype, "init", null);
-FaaSConfiguration = __decorate([
+exports.FaaSConfiguration = FaaSConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'faas',
         importConfigs: [
@@ -66,5 +65,4 @@ FaaSConfiguration = __decorate([
         ],
     })
 ], FaaSConfiguration);
-exports.FaaSConfiguration = FaaSConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Context, IFaaSConfigurationOptions, Application, NextFunction, HandlerOptions, HttpResponseFormat, wrapHttpRequestOptions } from './interface';
-import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
+import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
 import { LoggerOptions } from '@midwayjs/logger';
 import * as http from 'http';
 export declare class MidwayFaaSFramework extends BaseFramework<Application, Context, IFaaSConfigurationOptions> {
@@ -26,7 +26,6 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     run(): Promise<void>;
     loadFunction(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     /**
      * @deprecated
      * @param handlerMapping

package/dist/framework.js

@@ -15,6 +15,7 @@ const simple_lock_1 = require("@midwayjs/simple-lock");
 const logger_1 = require("@midwayjs/logger");
 const serverless_http_parser_1 = require("@midwayjs/serverless-http-parser");
 const util_1 = require("util");
+const debug = (0, util_1.debuglog)('midway:debug');
 const { isAnyArrayBuffer, isUint8Array } = util_1.types;
 const LOCK_KEY = '_faas_starter_start_key';
 let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework {
@@ -31,8 +32,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         this.loadedFunction = false;
     }
     configure(options) {
-        var _a;
-        const faasConfig = (_a = this.configService.getConfiguration('faas')) !== null && _a !== void 0 ? _a : {};
+        const faasConfig = this.configService.getConfiguration('faas') ?? {};
         if (options || faasConfig['developmentRun']) {
             this.developmentRun = true;
             this.configurationOptions = options;
@@ -45,7 +45,6 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return !this.developmentRun;
     }
     async applicationInitialize(options) {
-        var _a, _b, _c;
         if (!this.logger) {
             this.logger = options.logger || logger_1.loggers.getLogger('appLogger');
         }
@@ -55,7 +54,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             this.legacyVersion = true;
         }
         this.app =
-            ((_b = (_a = this.applicationAdapter).getApplication) === null || _b === void 0 ? void 0 : _b.call(_a)) ||
+            this.applicationAdapter.getApplication?.() ||
                 new serverless_http_parser_1.Application();
         this.defineApplicationProperties({
             /**
@@ -72,18 +71,16 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 return this.generateMiddleware(middlewareId);
             },
             getFunctionName: () => {
-                var _a;
                 return (process.env.MIDWAY_SERVERLESS_FUNCTION_NAME ||
-                    ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionName()) ||
+                    this.configurationOptions.applicationAdapter?.getFunctionName() ||
                     '');
             },
             /**
              * get function service/group in runtime
              */
             getFunctionServiceName: () => {
-                var _a;
                 return (process.env.MIDWAY_SERVERLESS_SERVICE_NAME ||
-                    ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionServiceName()) ||
+                    this.configurationOptions.applicationAdapter?.getFunctionServiceName() ||
                     '');
             },
             useEventMiddleware: middleware => {
@@ -102,7 +99,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         // hack use method
         this.app.originUse = this.app.use;
         this.app.use = this.app.useMiddleware;
-        if ((_c = this.configurationOptions.applicationAdapter) === null || _c === void 0 ? void 0 : _c.runAppHook) {
+        if (this.configurationOptions.applicationAdapter?.runAppHook) {
             this.configurationOptions.applicationAdapter.runAppHook(this.app);
         }
     }
@@ -115,13 +112,14 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         if (!this.loadedFunction) {
             this.loadedFunction = true;
             return this.lock.sureOnce(async () => {
-                var _a;
                 // set app keys
-                this.app['keys'] = (_a = this.configService.getConfiguration('keys')) !== null && _a !== void 0 ? _a : '';
+                this.app['keys'] = this.configService.getConfiguration('keys') ?? '';
                 // store all http function entry
                 this.serverlessFunctionService = await this.applicationContext.getAsync(core_1.MidwayServerlessFunctionService);
                 const functionList = await this.serverlessFunctionService.getFunctionList();
+                debug(`[faas]: load ${functionList.length} function list`);
                 for (const funcInfo of functionList) {
+                    debug(`[faas]: load function ${funcInfo.funcHandlerName}, router = ${funcInfo.fullUrl}`);
                     // store handler
                     this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
                 }
@@ -129,9 +127,6 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             }, LOCK_KEY);
         }
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.FAAS;
-    }
     /**
      * @deprecated
      * @param handlerMapping
@@ -191,7 +186,6 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         };
     }
     async invokeTriggerFunction(context, handlerMapping, options) {
-        var _a, _b;
         let funOptions = this.funMappingStore.get(handlerMapping);
         const isHttpFunction = options.isHttpFunction;
         if (!funOptions && isHttpFunction) {
@@ -201,8 +195,8 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 context.req.pathParameters = matchRes['params'] || {};
             }
             else {
-                // options request pass throuth to middleware
-                if (((_a = context.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'options') {
+                // options request pass through to middleware
+                if (context.method?.toLowerCase() === 'options') {
                     funOptions = {
                         url: context.path,
                         method: 'options',
@@ -217,7 +211,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             throw new Error(`function handler = ${handlerMapping} not found`);
         }
         context = this.getContext(context);
-        if ((_b = this.configurationOptions.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runContextHook) {
+        if (this.configurationOptions.applicationAdapter?.runContextHook) {
             this.configurationOptions.applicationAdapter.runContextHook(context);
         }
         const result = await (await this.applyMiddleware(async (ctx, next) => {
@@ -267,8 +261,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         }
     }
     formatHttpResponse(context, options = {}) {
-        var _a;
-        if (!((_a = context.response) === null || _a === void 0 ? void 0 : _a._explicitStatus)) {
+        if (!context.response?._explicitStatus) {
             if (context.body === null || context.body === 'undefined') {
                 context.body = '';
                 context.type = 'text';
@@ -379,7 +372,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                                 context.status = routerRes.code;
                                 break;
                             case core_1.WEB_RESPONSE_HEADER:
-                                for (const key in (routerRes === null || routerRes === void 0 ? void 0 : routerRes.setHeaders) || {}) {
+                                for (const key in routerRes?.setHeaders || {}) {
                                     context.set(key, routerRes.setHeaders[key]);
                                 }
                                 break;
@@ -412,7 +405,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return (0, logger_1.createConsoleLogger)(name, option);
     }
     getFrameworkName() {
-        return 'midway:faas';
+        return 'faas';
     }
     getServer() {
         return this.server;
@@ -442,6 +435,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return Array.from(this.funMappingStore.keys());
     }
 };
+exports.MidwayFaaSFramework = MidwayFaaSFramework;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayEnvironmentService)
@@ -450,8 +444,7 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayMiddlewareService)
 ], MidwayFaaSFramework.prototype, "middlewareService", void 0);
-MidwayFaaSFramework = __decorate([
+exports.MidwayFaaSFramework = MidwayFaaSFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayFaaSFramework);
-exports.MidwayFaaSFramework = MidwayFaaSFramework;
 //# sourceMappingURL=framework.js.map

package/dist/interface.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions, ObjectIdentifier, ILogger } from '@midwayjs/core';
 import { Application as ServerlessHttpApplication, HttpResponseOptions } from '@midwayjs/serverless-http-parser';
-import { Cookies } from '@midwayjs/cookies';
+import type { Cookies } from '@midwayjs/cookies';
 import { Writable } from 'stream';
 interface ContextDelegatedRequest {
     /**

package/dist/starter.js

@@ -34,6 +34,10 @@ class AbstractBootstrapStarter {
             this.startedExports = this.onStart();
         }
         if (this.startedExports) {
+            if (options) {
+                // 单测时这里要再覆盖一次，不然外面的 options 传不进来
+                this.options = Object.assign(this.options, options);
+            }
             this.startedExports['getStarter'] = () => {
                 return this;
             };

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.19.0",
+  "version": "4.0.0-alpha.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/serverless-http-parser": "^3.14.0",
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/serverless-http-parser": "^4.0.0-alpha.1",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
+    "@midwayjs/cookies": "^1.0.2",
     "@midwayjs/logger": "^3.0.0",
-    "@midwayjs/mock": "^3.19.0",
-    "@midwayjs/serverless-fc-starter": "^3.19.0",
-    "@midwayjs/serverless-scf-starter": "^3.14.0",
+    "@midwayjs/mock": "^4.0.0-alpha.1",
     "mm": "3.4.0"
   },
   "engines": {
@@ -36,13 +35,13 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "437e92d9375b0e375f83aa363f3e6a60187c7109"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }