try to revert proxy handler

drp-tech · Feb 18, 2025 · 35a4a36 · 35a4a36
1 parent 8ffdcec
commit 35a4a36
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/object/src/index.ts b/packages/object/src/index.ts
@@ -134,17 +134,17 @@ export class DRPObject implements ObjectPb.DRPObjectBase {
 					const fullPropKey = String(propKey);
 					return new Proxy(target[propKey as keyof object], {
 						apply(applyTarget, thisArg, args) {
+							if ((propKey as string).startsWith("query_")) {
+								return Reflect.apply(applyTarget, thisArg, args);
+							}
 							const callerName = new Error().stack?.split("\n")[2]?.trim().split(" ")[1];
-							const startWithQuery = (propKey as string).startsWith("query_");
-							const startWithResolveConflicts = callerName?.startsWith(
-								"DRPObject.resolveConflicts"
-							);
-							const startWithProxy = callerName?.startsWith("Proxy.");
-							const needReflect = startWithQuery || startWithResolveConflicts || startWithProxy;
-							if (needReflect) {
+							if (callerName?.startsWith("DRPObject.resolveConflicts")) {
 								return Reflect.apply(applyTarget, thisArg, args);
 							}
-							return obj.callFn(fullPropKey, args, vertexType);
+							if (!callerName?.startsWith("Proxy.")) {
+								return obj.callFn(fullPropKey, args, vertexType);
+							}
+							return Reflect.apply(applyTarget, thisArg, args);
 						},
 					});
 				}