fix: 修复window被proxy,导致作用域错误

Tencent · Aug 30, 2022 · 25efbbe · 25efbbe
1 parent 24a8a4c
commit 25efbbe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/packages/wujie-core/src/proxy.ts b/packages/wujie-core/src/proxy.ts
@@ -3,7 +3,14 @@ import { renderElementToContainer } from "./shadow";
 import { pushUrlToWindow } from "./sync";
 import { documentProxyProperties, rawDocumentQuerySelector } from "./common";
 import { WUJIE_TIPS_RELOAD_DISABLED } from "./constant";
-import { getTargetValue, anchorElementGenerator, getDegradeIframe, isCallable, warn } from "./utils";
+import {
+  getTargetValue,
+  anchorElementGenerator,
+  getDegradeIframe,
+  isCallable,
+  checkProxyFunction,
+  warn,
+} from "./utils";
 
 /**
  * location href 的set劫持操作
@@ -58,6 +65,7 @@ export function proxyGenerator(
     },
 
     set: (target: Window, p: PropertyKey, value: any) => {
+      checkProxyFunction(value);
       target[p] = value;
       return true;
     },

diff --git a/packages/wujie-core/src/utils.ts b/packages/wujie-core/src/utils.ts
@@ -73,9 +73,18 @@ export function isConstructable(fn: () => any | FunctionConstructor) {
   return constructable;
 }
 
+const setFnCacheMap = new WeakMap<CallableFunction, boolean>();
+export function checkProxyFunction(value: any) {
+  if (isCallable(value) && !isBoundedFunction(value) && !isConstructable(value)) {
+    if (!setFnCacheMap.has(value)) {
+      setFnCacheMap.set(value, true);
+    }
+  }
+}
+
 export function getTargetValue(target: any, p: any): any {
   const value = target[p];
-  if (isCallable(value) && !isBoundedFunction(value) && !isConstructable(value)) {
+  if (isCallable(value) && !isBoundedFunction(value) && !isConstructable(value) && !setFnCacheMap.has(value)) {
     const boundValue = Function.prototype.bind.call(value, target);
 
     for (const key in value) {