@novasamatech/host-container 0.5.4-1 → 0.5.4-3

package/dist/createWebviewProvider.d.ts

@@ -3,6 +3,7 @@ import type { WebviewTag } from 'electron';
 type Params = {
     webview: WebviewTag;
     logger?: Logger;
+    openDevTools?: boolean;
 };
-export declare function createWebviewProvider({ webview, logger }: Params): Provider;
+export declare function createWebviewProvider({ webview, logger, openDevTools }: Params): Provider;
 export {};

package/dist/createWebviewProvider.js

@@ -15,19 +15,17 @@ function isValidMessage(event, sourceEnv, currentEnv) {
         event.data &&
         event.data.constructor.name === 'Uint8Array');
 }
-export function createWebviewProvider({ webview, logger }) {
+export function createWebviewProvider({ webview, logger, openDevTools }) {
     let disposed = false;
-    let subscribed = false;
     let port = null;
     const subscribers = new Set();
     const webviewPromise = new Promise((resolve, reject) => {
         webview.addEventListener('did-fail-load', e => {
             reject(new Error(e.errorDescription));
         });
-        webview.addEventListener('did-start-loading', async () => {
+        webview.addEventListener('dom-ready', async () => {
             const { port1, port2 } = new MessageChannel();
-            const portInitMessage = `PORT_INIT_${nanoid(12)}`;
-            port = port1;
+            const portInitMessage = `HOST_API_PORT_INIT_${nanoid(12)}`;
             await webview
                 .executeJavaScript(`
             window.addEventListener('message', e => {
@@ -42,6 +40,10 @@ export function createWebviewProvider({ webview, logger }) {
                 .catch(reject);
             // @ts-expect-error contentWindow is undefined somehow
             webview.contentWindow.postMessage(portInitMessage, '*', [port2]);
+            if (openDevTools) {
+                webview.openDevTools();
+            }
+            port = port1;
             resolve(port);
         });
     });
@@ -64,6 +66,11 @@ export function createWebviewProvider({ webview, logger }) {
             }
         });
     };
+    waitForWebview(port => {
+        if (disposed)
+            return;
+        port.addEventListener('message', messageHandler);
+    });
     return {
         logger: logger ?? createDefaultLogger(),
         isCorrectEnvironment() {
@@ -79,10 +86,6 @@ export function createWebviewProvider({ webview, logger }) {
             });
         },
         subscribe(callback) {
-            if (!subscribed && port) {
-                subscribed = true;
-                port.addEventListener('message', messageHandler);
-            }
             subscribers.add(callback);
             return () => {
                 subscribers.delete(callback);
@@ -94,6 +97,7 @@ export function createWebviewProvider({ webview, logger }) {
             if (port) {
                 port.removeEventListener('message', messageHandler);
             }
+            port = null;
         },
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/host-container",
   "type": "module",
-  "version": "0.5.4-1",
+  "version": "0.5.4-3",
   "description": "Host container for hosting and managing products within the Polkadot ecosystem.",
   "license": "Apache-2.0",
   "repository": {
@@ -28,7 +28,7 @@
   "dependencies": {
     "@polkadot-api/utils": "^0.2.0",
     "@polkadot-api/json-rpc-provider": "^0.0.4",
-    "@novasamatech/host-api": "0.5.4-1",
+    "@novasamatech/host-api": "0.5.4-3",
     "nanoid": "5.1.6"
   },
   "devDependencies": {