@midwayjs/http-proxy 3.10.10 → 3.10.11

package/dist/middleware.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
-import { IMiddleware, IMidwayLogger } from '@midwayjs/core';
+import { IMiddleware, IMidwayLogger, IMidwayApplication } from '@midwayjs/core';
 import { HttpProxyConfig } from './interface';
 export declare class HttpProxyMiddleware implements IMiddleware<any, any> {
     httpProxy: HttpProxyConfig;
     logger: IMidwayLogger;
-    resolve(app: any): (req: any, res: any, next: any) => Promise<any>;
-    execProxy(ctx: any, req: any, res: any, next: any, isExpress: any): Promise<any>;
+    resolve(app: IMidwayApplication): (req: any, res: any, next: any) => Promise<any>;
+    execProxy(ctx: any, req: any, res: any, next: any, isServerless: any): Promise<any>;
     getProxyList(url: any): undefined | {
         proxy: HttpProxyConfig;
         url: URL;

package/dist/middleware.js

@@ -14,20 +14,21 @@ const core_1 = require("@midwayjs/core");
 const axios = require("axios");
 let HttpProxyMiddleware = class HttpProxyMiddleware {
     resolve(app) {
-        if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
+        if (app.getNamespace() === 'express') {
             return async (req, res, next) => {
-                return this.execProxy(req, req, res, next, true);
+                return this.execProxy(req, req, res, next, false);
             };
         }
         else {
+            const isServerless = app.getNamespace() === 'faas';
             return async (ctx, next) => {
                 var _a;
                 const req = ((_a = ctx.request) === null || _a === void 0 ? void 0 : _a.req) || ctx.request;
-                return this.execProxy(ctx, req, ctx, next, false);
+                return this.execProxy(ctx, req, ctx, next, isServerless);
             };
         }
     }
-    async execProxy(ctx, req, res, next, isExpress) {
+    async execProxy(ctx, req, res, next, isServerless) {
         var _a, _b, _c;
         const proxyInfo = this.getProxyList(ctx.url);
         if (!proxyInfo) {
@@ -50,12 +51,12 @@ let HttpProxyMiddleware = class HttpProxyMiddleware {
         delete reqHeaders['content-length'];
         const method = req.method.toUpperCase();
         const targetRes = res.res || res;
-        const isStream = targetRes.on && targetRes.writable;
+        const isSupportStream = !isServerless && targetRes.on && targetRes.writable;
         const reqOptions = {
             method,
             url: url.href,
             headers: reqHeaders,
-            responseType: isStream ? 'stream' : 'arrayBuffer',
+            responseType: isSupportStream ? 'stream' : 'arrayBuffer',
             timeout: this.httpProxy.proxyTimeout || 0,
         };
         if (method === 'POST' || method === 'PUT') {
@@ -77,7 +78,7 @@ let HttpProxyMiddleware = class HttpProxyMiddleware {
         const ignoreHeaders = {
             'transfer-encoding': true,
         };
-        if (isStream) {
+        if (isSupportStream) {
             // axios does not set this real data length in stream mode
             // but it decompresses the data, resulting in the wrong data length
             ignoreHeaders['content-length'] = true;
@@ -89,7 +90,7 @@ let HttpProxyMiddleware = class HttpProxyMiddleware {
             res.set(key, proxyResponse.headers[key]);
         });
         res.status = proxyResponse.status;
-        if (isStream) {
+        if (isSupportStream) {
             await new Promise(resolve => {
                 proxyResponse.data.on('finish', () => {
                     if (targetRes.end) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/http-proxy",
-  "version": "3.10.10",
+  "version": "3.10.11",
   "description": "Midway Component for http proxy",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -30,12 +30,12 @@
   },
   "devDependencies": {
     "@midwayjs/core": "^3.10.10",
-    "@midwayjs/express": "^3.10.10",
-    "@midwayjs/faas": "^3.10.10",
-    "@midwayjs/koa": "^3.10.10",
-    "@midwayjs/mock": "^3.10.10",
-    "@midwayjs/serverless-app": "^3.10.10",
-    "@midwayjs/web": "^3.10.10"
+    "@midwayjs/express": "^3.10.11",
+    "@midwayjs/faas": "^3.10.11",
+    "@midwayjs/koa": "^3.10.11",
+    "@midwayjs/mock": "^3.10.11",
+    "@midwayjs/serverless-app": "^3.10.11",
+    "@midwayjs/web": "^3.10.11"
   },
-  "gitHead": "93d333e82e75b6eb44ab83f74a378172508730d6"
+  "gitHead": "df0db0aaa0e3ff168204e3d5cf1c534dccc9b15e"
 }