PWV Detection Changes

AttAditya · AttAditya · commit dc8fa25e80e4 · 2025-07-14T00:00:27.000+05:30
diff --git a/index.html b/index.html
@@ -22,6 +22,21 @@
     <meta name="twitter:description" content="GraphScript is a general-purpose visual scripting editor that lets you build logic by connecting visual nodes. No code, just flow.">
     <meta name="twitter:image" content="https://github.com/GraphScript-Labs/.github/blob/main/Banner.png?raw=true">
 
+    <script src="/pwv.js"></script>
+
+    <script defer>
+      if (!window.hasPWV) {
+        const element = document.querySelector(".pywebview-drag-region");
+        element.remove();
+      }
+    </script>
+    
+    <script>
+      document.addEventListener("contextmenu", (event) => {
+        event.preventDefault();
+      });
+    </script>
+
     <style>
       .pywebview-drag-region {
         position: fixed;
@@ -39,31 +54,6 @@
   <body>
     <span class="pywebview-drag-region"></span>
     <div id="root"></div>
-
-    <script defer>
-      let checkCount = 0;
-
-      const pwvCheckInterval = setInterval(() => {
-        if (window.pywebview !== undefined) {
-          const dragRegion = document.querySelector('.pywebview-drag-region');
-          if (dragRegion) dragRegion.style.display = 'block';
-        }
-
-        if (checkCount > 1000 || window.pywebview !== undefined) {
-          clearInterval(pwvCheckInterval);
-          return;
-        }
-
-        checkCount++;
-      }, 10);
-    </script>
-    
-    <script>
-      document.addEventListener("contextmenu", (event) => {
-        event.preventDefault();
-      });
-    </script>
-
-    <script type="module" src="/src/main.tsx" defer></script>
+    <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>
diff --git a/public/pwv.js b/public/pwv.js
diff --git a/src/utils/desktopTools.ts b/src/utils/desktopTools.ts
@@ -1,36 +1,40 @@
 import type { PyWebview } from "@defs/PyWebview";
 
 const setupDesktopTools = () => {
-  const pwv: PyWebview | undefined = window.pywebview;
+  const getApi = (): PyWebview["api"] | undefined => {
+    return window.pywebview?.api;
+  };
+
+  const checkApiState = (): boolean => {
+    return !!Object.keys(getApi() || {}).length;
+  };
 
   const isDesktop = (): boolean => {
-    return document.body.getAttribute("data-pywebview-id") !== null;
+    return !!window.hasPWV;
   }
 
   const waitForPWV = (): Promise<void> => {
     return (new Promise((resolve) => {
-      if (!isDesktop()) {
+      if (!isDesktop() || checkApiState()) {
         resolve();
         return;
       }
 
-      if (Object.keys(pwv?.api || {}).length) {
-        resolve();
-        return;
-      }
-
-      setTimeout(() => {
-        resolve();
-      }, 100);
+      const checkInterval = setInterval(() => {
+        if (checkApiState()) {
+          resolve();
+          clearInterval(checkInterval);
+        }
+      }, 10);
     }));
   }
 
   const closeWindow = async () => {
-    return pwv?.api.close();
+    return getApi()?.close();
   }
 
   const toggleWindowFullscreen = async () => {
-    return pwv?.api.toggle_fullscreen();
+    return getApi()?.toggle_fullscreen();
   }
 
   const saveFile = async (
@@ -39,7 +43,7 @@ const setupDesktopTools = () => {
     fileTypes?: string[],
   ) => {
     if (isDesktop())
-      return pwv!.api.save_file(content, saveName, fileTypes);
+      return getApi()!.save_file(content, saveName, fileTypes);
     
     const blob = new Blob([content], { type: "text/plain" });
     const url = URL.createObjectURL(blob);
@@ -57,7 +61,7 @@ const setupDesktopTools = () => {
 
   const loadFile = async (): Promise<string | null> => {
     if (isDesktop())
-      return pwv!.api.load_file() || null;
+      return getApi()!.load_file() || null;
     
     const promise = new Promise<string | null>((resolve) => {
       const input = document.createElement("input");
@@ -92,7 +96,7 @@ const setupDesktopTools = () => {
   const loadProjectId = async (): Promise<string | null> => {
     if (!isDesktop()) return null;
     await waitForPWV();
-    return (await pwv!.api.load_project_id()) || null;
+    return (await getApi()!.load_project_id()) || null;
   }
 
   return {
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -7,5 +7,6 @@ export {};
 declare global {
   interface Window {
     pywebview?: PyWebview;
+    hasPWV?: boolean;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ export {};`
`7`	`7`	`declare global {`
`8`	`8`	`interface Window {`
`9`	`9`	`pywebview?: PyWebview;`
	`10`	`+ hasPWV?: boolean;`
`10`	`11`	`}`
`11`	`12`	`}`