Merge pull request HuolalaTech#89 from HuolalaTech/fix/header-circual…

…-reference fix: header value circual reference
hejunjieGitHub · May 29, 2024 · f6030fa · f6030fa
2 parents 0603063 + fe1654a
commit f6030fa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/packages/mp-base/src/plugins/network/proxy/request.ts b/packages/mp-base/src/plugins/network/proxy/request.ts
@@ -1,10 +1,4 @@
-import {
-  getRandomId,
-  isObjectLike,
-  isPlainObject,
-  psLog,
-  toStringTag,
-} from 'base/src/index';
+import { getRandomId, isPlainObject, psLog, toStringTag } from 'base/src/index';
 import {
   ReqReadyState,
   resolveUrlInfo,
@@ -65,7 +59,10 @@ export default class MPWeixinRequestProxy extends MPNetworkProxyBase {
 
           // 小程序不会有其他格式，不用兼容
           if (isPlainObject(params.header)) {
-            req.requestHeader = Object.entries(params.header);
+            req.requestHeader = Object.entries(params.header).map(([k, v]) => [
+              String(k),
+              String(v),
+            ]);
           }
 
           if (req.method !== 'GET') {

diff --git a/packages/page-spy-browser/src/plugins/network/proxy/fetch-proxy.ts b/packages/page-spy-browser/src/plugins/network/proxy/fetch-proxy.ts
@@ -77,12 +77,20 @@ export default class FetchProxy extends WebNetworkProxyBase {
           req.withCredentials = true;
         }
 
-        if (isHeaders(requestHeader)) {
-          req.requestHeader = [...requestHeader.entries()];
-        } else if (isObjectLike(requestHeader)) {
-          req.requestHeader = Object.entries(requestHeader);
-        } else {
-          req.requestHeader = requestHeader;
+        if (requestHeader) {
+          if (isHeaders(requestHeader)) {
+            req.requestHeader = [...requestHeader.entries()];
+          } else if (isObjectLike(requestHeader)) {
+            req.requestHeader = Object.entries(requestHeader).map(([k, v]) => [
+              String(k),
+              String(v),
+            ]);
+          } else {
+            req.requestHeader = requestHeader.map(([k, v]) => [
+              String(k),
+              String(v),
+            ]);
+          }
         }
 
         if (req.method !== 'GET') {

diff --git a/packages/page-spy-browser/src/plugins/network/proxy/xhr-proxy.ts b/packages/page-spy-browser/src/plugins/network/proxy/xhr-proxy.ts
@@ -128,7 +128,7 @@ class XhrProxy extends WebNetworkProxyBase {
         if (!req.requestHeader) {
           req.requestHeader = [];
         }
-        req.requestHeader.push([key, value]);
+        req.requestHeader.push([String(key), String(value)]);
       } /* c8 ignore start */ else {
         psLog.warn(
           "The request object is not found on XMLHttpRequest's setRequestHeader event",