@midwayjs/faas 3.10.10 → 3.10.12

package/dist/framework.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Context, IFaaSConfigurationOptions, Application, NextFunction, HandlerOptions, HttpResponseFormat } from './interface';
+import { Context, IFaaSConfigurationOptions, Application, NextFunction, HandlerOptions, HttpResponseFormat, wrapHttpRequestOptions } from './interface';
 import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
 import { LoggerOptions } from '@midwayjs/logger';
 import * as http from 'http';
@@ -36,7 +36,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     formatHttpResponse(context: any, options?: {
         supportBufferResponse?: boolean;
     }): HttpResponseFormat;
-    wrapHttpRequest(req: http.IncomingMessage | Record<string, any>, res?: http.ServerResponse | Record<string, any>): Promise<unknown>;
+    wrapHttpRequest(req: http.IncomingMessage | Record<string, any>, res?: http.ServerResponse | Record<string, any>, options?: wrapHttpRequestOptions): Promise<unknown>;
     /**
      * @deprecated
      * @param middlewareId

package/dist/framework.js

@@ -191,7 +191,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         };
     }
     async invokeTriggerFunction(context, handlerMapping, options) {
-        var _a;
+        var _a, _b;
         let funOptions = this.funMappingStore.get(handlerMapping);
         const isHttpFunction = options.isHttpFunction;
         if (!funOptions && isHttpFunction) {
@@ -200,12 +200,24 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 const matchRes = core_1.PathToRegexpUtil.match(funOptions.fullUrlFlattenString)(context.path);
                 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') {
+                    funOptions = {
+                        url: context.path,
+                        method: 'options',
+                        requestMethod: 'options',
+                        controllerMiddleware: [],
+                        middleware: [],
+                    };
+                }
+            }
         }
         if (!funOptions) {
             throw new Error(`function handler = ${handlerMapping} not found`);
         }
         context = this.getContext(context);
-        if ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.runContextHook) {
+        if ((_b = this.configurationOptions.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runContextHook) {
             this.configurationOptions.applicationAdapter.runContextHook(context);
         }
         const result = await (await this.applyMiddleware(async (ctx, next) => {
@@ -312,9 +324,9 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             body: context.body,
         };
     }
-    async wrapHttpRequest(req, res) {
+    async wrapHttpRequest(req, res, options) {
         const newReq = res ? new serverless_http_parser_1.HTTPRequest(req, res) : req;
-        const newRes = new serverless_http_parser_1.HTTPResponse();
+        const newRes = new serverless_http_parser_1.HTTPResponse(options);
         return this.createHttpContext(newReq, newRes);
     }
     /**

package/dist/interface.d.ts

@@ -1,7 +1,7 @@
 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';
+import { Application as ServerlessHttpApplication, HttpResponseOptions } from '@midwayjs/serverless-http-parser';
 export interface FaaSContext extends IMidwayContext<FaaSHTTPContext> {
     logger: ILogger;
     env: string;
@@ -90,4 +90,6 @@ export interface HttpResponseFormat<T = unknown> {
     headers: Record<string, string>;
     body: T;
 }
+export interface wrapHttpRequestOptions extends HttpResponseOptions {
+}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.10.10",
+  "version": "3.10.12",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
     "@midwayjs/core": "^3.10.10",
-    "@midwayjs/faas-typings": "^3.6.0",
+    "@midwayjs/faas-typings": "^3.10.11",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/serverless-http-parser": "^3.10.0",
+    "@midwayjs/serverless-http-parser": "^3.10.11",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^3.10.10",
-    "@midwayjs/serverless-fc-starter": "^3.10.10",
-    "@midwayjs/serverless-scf-starter": "^3.10.0",
+    "@midwayjs/mock": "^3.10.11",
+    "@midwayjs/serverless-fc-starter": "^3.10.11",
+    "@midwayjs/serverless-scf-starter": "^3.10.11",
     "mm": "3.2.1"
   },
   "engines": {
@@ -45,5 +45,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "93d333e82e75b6eb44ab83f74a378172508730d6"
+  "gitHead": "5fbc455a226942afc49bf414fcdbd2ef88d3db96"
 }