@noatgnu/cupcake-vanilla 1.4.6 → 1.4.8

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -3066,10 +3066,11 @@ class DesktopService {
     backendStatusSubject = new Subject();
     windowStateSubject = new Subject();
     wailsRuntime = null;
+    wailsRuntimeReady = Promise.resolve(null);
     constructor() {
         if (this.hasWails()) {
             this._runtime = 'wails';
-            this.loadWailsRuntime();
+            this.wailsRuntimeReady = this.loadWailsRuntime();
         }
         else if (this.hasElectron()) {
             this._runtime = 'electron';
@@ -3080,7 +3081,7 @@ class DesktopService {
     }
     async loadWailsRuntime() {
         if (this.wailsRuntime)
-            return;
+            return this.wailsRuntime;
         try {
             const wails = await import('@wailsio/runtime');
             this.wailsRuntime = { Call: wails.Call, Events: wails.Events };
@@ -3089,14 +3090,24 @@ class DesktopService {
         catch {
             this.wailsRuntime = null;
         }
+        return this.wailsRuntime;
     }
     hasElectron() {
         return typeof window !== 'undefined' &&
             window.electronAPI !== undefined &&
             window.electronAPI.isElectron === true;
     }
+    /**
+     * Wails only injects `window._wails` once the page has finished loading, which is after
+     * this service is constructed, so the asset-server origin is checked as well: the `wails:`
+     * scheme on Linux/macOS and the `wails.localhost` host on Windows.
+     */
     hasWails() {
-        return typeof window !== 'undefined' && '_wails' in window;
+        if (typeof window === 'undefined')
+            return false;
+        return '_wails' in window ||
+            window.location.protocol === 'wails:' ||
+            window.location.hostname === 'wails.localhost';
     }
     get runtime() {
         return this._runtime;
@@ -3129,8 +3140,9 @@ class DesktopService {
         if (this._runtime === 'electron' && window.electronAPI) {
             return window.electronAPI.getAppVersion();
         }
-        if (this._runtime === 'wails' && this.wailsRuntime) {
-            return this.wailsRuntime.Call.ByName('main.App.GetAppVersion');
+        const wails = this._runtime === 'wails' ? await this.wailsRuntimeReady : null;
+        if (wails) {
+            return wails.Call.ByName('main.App.GetAppVersion');
         }
         return '0.0.0';
     }
@@ -3171,8 +3183,9 @@ class DesktopService {
         if (this._runtime === 'electron' && window.electronAPI) {
             return window.electronAPI.showOpenDialog(options);
         }
-        if (this._runtime === 'wails' && this.wailsRuntime) {
-            return this.wailsRuntime.Call.ByName('main.App.OpenFile', options?.title || 'Select File');
+        const wails = this._runtime === 'wails' ? await this.wailsRuntimeReady : null;
+        if (wails) {
+            return wails.Call.ByName('main.App.OpenFile', options?.title || 'Select File');
         }
         throw new Error('Not running in desktop environment');
     }
@@ -3198,8 +3211,9 @@ class DesktopService {
         if (this._runtime === 'electron' && window.electronAPI) {
             return window.electronAPI.getBackendPort();
         }
-        if (this._runtime === 'wails' && this.wailsRuntime) {
-            return this.wailsRuntime.Call.ByName('main.App.GetBackendPort');
+        const wails = this._runtime === 'wails' ? await this.wailsRuntimeReady : null;
+        if (wails) {
+            return wails.Call.ByName('main.App.GetBackendPort');
         }
         return 8000;
     }
@@ -3207,8 +3221,9 @@ class DesktopService {
         if (this._runtime === 'electron' && window.electronAPI) {
             return window.electronAPI.isBackendReady();
         }
-        if (this._runtime === 'wails' && this.wailsRuntime) {
-            return this.wailsRuntime.Call.ByName('main.App.IsBackendReady');
+        const wails = this._runtime === 'wails' ? await this.wailsRuntimeReady : null;
+        if (wails) {
+            return wails.Call.ByName('main.App.IsBackendReady');
         }
         return false;
     }
@@ -3238,8 +3253,9 @@ class DesktopService {
         return this.windowStateSubject.asObservable();
     }
     async logToFile(message) {
-        if (this._runtime === 'wails' && this.wailsRuntime) {
-            return this.wailsRuntime.Call.ByName('main.App.LogToFile', message);
+        const wails = this._runtime === 'wails' ? await this.wailsRuntimeReady : null;
+        if (wails) {
+            return wails.Call.ByName('main.App.LogToFile', message);
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.1", ngImport: i0, type: DesktopService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });