refactor window interfaces

QwikDev · Oct 3, 2021 · 87e80aa · 87e80aa · vercel · Oct 3, 2021
1 parent ecc1147
commit 87e80aa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 30 deletions.
diff --git a/src/lib/sandbox/init-sandbox.ts b/src/lib/sandbox/init-sandbox.ts
@@ -39,9 +39,6 @@ export const initSandbox = async (sandboxWindow: Window, winIds: number) => {
       }
 
       setInstanceId(winCtx, win, PlatformInstanceId.window);
-      setInstanceId(winCtx, win.history, PlatformInstanceId.history);
-      setInstanceId(winCtx, win.localStorage, PlatformInstanceId.localStorage);
-      setInstanceId(winCtx, win.sessionStorage, PlatformInstanceId.sessionStorage);
 
       createWebWorker(winCtx);
 

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -132,13 +132,11 @@ export const enum InterfaceType {
   Method = 15,
   NamedNodeMap = 16,
   Storage = 17,
+  Object = 18,
 }
 
 export const enum PlatformInstanceId {
   window,
-  history,
-  localStorage,
-  sessionStorage,
   document,
   documentElement,
   head,

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -123,12 +123,6 @@ const logTargetProp = (target: any, accessType: AccessType, memberPath: string[]
       n = 'document.head.';
     } else if (instanceId === PlatformInstanceId.body) {
       n = 'document.body.';
-    } else if (instanceId === PlatformInstanceId.history) {
-      n = 'history.';
-    } else if (instanceId === PlatformInstanceId.localStorage) {
-      n = 'localStorage.';
-    } else if (instanceId === PlatformInstanceId.sessionStorage) {
-      n = 'sessionStorage.';
     } else if (target.nodeType === 1) {
       n = toLower(target.nodeName) + '.';
     } else if (target[InterfaceTypeKey] === InterfaceType.Element && target[NodeNameKey]) {
@@ -190,14 +184,8 @@ const logValue = (memberPath: string[], v: any): string => {
       if (instanceId === PlatformInstanceId.head) {
         return `<head>`;
       }
-      if (instanceId === PlatformInstanceId.localStorage) {
-        return `[localStorage]`;
-      }
-      if (instanceId === PlatformInstanceId.sessionStorage) {
-        return `[sessionStorage]`;
-      }
       if (instanceId === PlatformInstanceId.window) {
-        return `[window]`;
+        return `window`;
       }
       if (v[InterfaceTypeKey] === InterfaceType.Element && v[NodeNameKey]) {
         return `<${toLower(v[NodeNameKey])}>`;

diff --git a/src/lib/web-worker/worker-global.ts b/src/lib/web-worker/worker-global.ts
@@ -1,4 +1,4 @@
-import { callMethod } from './worker-proxy';
+import { callMethod, proxy } from './worker-proxy';
 import {
   constructInstance,
   elementConstructors,
@@ -39,9 +39,9 @@ export const initWebWorkerGlobal = (
   });
 
   self.document = constructInstance(InterfaceType.Document, PlatformInstanceId.document);
-  self.history = constructInstance(InterfaceType.History, PlatformInstanceId.history);
-  self.localStorage = constructInstance(InterfaceType.Storage, PlatformInstanceId.localStorage);
-  self.sessionStorage = constructInstance(InterfaceType.Storage, PlatformInstanceId.sessionStorage);
+  self.history = proxy(InterfaceType.History, self, ['history']);
+  self.localStorage = proxy(InterfaceType.Storage, self, ['localStorage']);
+  self.sessionStorage = proxy(InterfaceType.Storage, self, ['sessionStorage']);
 
   navigator.sendBeacon = sendBeacon;
 

diff --git a/src/lib/web-worker/worker-serialization.ts b/src/lib/web-worker/worker-serialization.ts
@@ -129,13 +129,7 @@ export const constructSerializedInstance = ({
   $nodeName$,
   $items$,
 }: SerializedInstance): any => {
-  if ($instanceId$ === PlatformInstanceId.history) {
-    return history;
-  } else if ($instanceId$ === PlatformInstanceId.localStorage) {
-    return localStorage;
-  } else if ($instanceId$ === PlatformInstanceId.sessionStorage) {
-    return sessionStorage;
-  } else if ($instanceId$ === PlatformInstanceId.window) {
+  if ($instanceId$ === PlatformInstanceId.window) {
     return self;
   } else if ($interfaceType$ === InterfaceType.NodeList) {
     return new NodeList($items$!.map(constructSerializedInstance));