@etsoo/appscript 1.2.52 → 1.2.53

package/lib/cjs/bridges/BridgeUtils.js

@@ -7,13 +7,12 @@ const FlutterHost_1 = require("./FlutterHost");
  */
 var BridgeUtils;
 (function (BridgeUtils) {
-    var _a;
     const g = globalThis;
     /**
      * Bridge host
      */
-    BridgeUtils.host = typeof ((_a = g.flutter_inappwebview) === null || _a === void 0 ? void 0 : _a.callHandler) === 'function'
-        ? new FlutterHost_1.FlutterHost(g.flutter_inappwebview.callHandler)
+    BridgeUtils.host = typeof g.flutter_inappwebview === 'object'
+        ? new FlutterHost_1.FlutterHost(g.flutter_inappwebview)
         : typeof g.electron === 'object'
             ? g.electron
             : undefined;

package/lib/cjs/bridges/FlutterHost.d.ts

@@ -1,22 +1,31 @@
 import { IBridgeHost } from './IBridgeHost';
+declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/
  */
 export declare class FlutterHost implements IBridgeHost {
-    callHandler: (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
+    private host;
     /**
      * Start Url
      */
     private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
     /**
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler: (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>);
+    constructor(host: {
+        callHandler?: CallHandlerType;
+    });
+    cacheCommand(name: string, ...args: unknown[]): void;
     changeCulture(locale: string): void;
     exit(): void;
     getLabels<T extends string>(...keys: T[]): Promise<any>;
     getStartUrl(): string | null | undefined;
     loadApp(name: string, startUrl?: string): void;
 }
+export {};

package/lib/cjs/bridges/FlutterHost.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlutterHost = void 0;
+const shared_1 = require("@etsoo/shared");
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/
@@ -10,19 +11,54 @@ class FlutterHost {
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler) {
-        this.callHandler = callHandler;
+    constructor(host) {
+        this.host = host;
+        /**
+         * Cached commands
+         */
+        this.cachedCommands = {};
+        window.addEventListener('flutterInAppWebViewPlatformReady', (_event) => {
+            if (this.host.callHandler == null)
+                return;
+            for (const key in this.cachedCommands) {
+                // Args
+                const args = this.cachedCommands[key];
+                // Execute
+                this.host.callHandler(key, ...args);
+                // Remove the key
+                delete this.cachedCommands[key];
+            }
+        });
+    }
+    cacheCommand(name, ...args) {
+        this.cachedCommands[name] = args;
     }
     changeCulture(locale) {
-        this.callHandler('changeCulture', locale);
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else
+            this.cacheCommand('changeCulture', locale);
     }
     exit() {
-        this.callHandler('exit');
+        if (this.host.callHandler)
+            this.host.callHandler('exit');
+        else
+            this.cacheCommand('exit');
     }
     async getLabels(...keys) {
         var _a;
+        // Try 500 miliseconds
+        let count = 5;
+        while (this.host.callHandler == null) {
+            count--;
+            await shared_1.ExtendUtils.sleep(100);
+            if (count === 0)
+                break;
+        }
         const init = {};
-        const result = (_a = (await this.callHandler('getLabels'))) !== null && _a !== void 0 ? _a : {};
+        if (this.host.callHandler == null)
+            return init;
+        const result = (_a = (await this.host.callHandler('getLabels'))) !== null && _a !== void 0 ? _a : {};
         return keys.reduce((a, v) => {
             var _a;
             return ({
@@ -36,7 +72,10 @@ class FlutterHost {
     }
     loadApp(name, startUrl) {
         this.startUrl = startUrl;
-        this.callHandler('loadApp', name, startUrl);
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
     }
 }
 exports.FlutterHost = FlutterHost;

package/lib/mjs/bridges/BridgeUtils.js

@@ -4,13 +4,12 @@ import { FlutterHost } from './FlutterHost';
  */
 export var BridgeUtils;
 (function (BridgeUtils) {
-    var _a;
     const g = globalThis;
     /**
      * Bridge host
      */
-    BridgeUtils.host = typeof ((_a = g.flutter_inappwebview) === null || _a === void 0 ? void 0 : _a.callHandler) === 'function'
-        ? new FlutterHost(g.flutter_inappwebview.callHandler)
+    BridgeUtils.host = typeof g.flutter_inappwebview === 'object'
+        ? new FlutterHost(g.flutter_inappwebview)
         : typeof g.electron === 'object'
             ? g.electron
             : undefined;

package/lib/mjs/bridges/FlutterHost.d.ts

@@ -1,22 +1,31 @@
 import { IBridgeHost } from './IBridgeHost';
+declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/
  */
 export declare class FlutterHost implements IBridgeHost {
-    callHandler: (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
+    private host;
     /**
      * Start Url
      */
     private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
     /**
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler: (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>);
+    constructor(host: {
+        callHandler?: CallHandlerType;
+    });
+    cacheCommand(name: string, ...args: unknown[]): void;
     changeCulture(locale: string): void;
     exit(): void;
     getLabels<T extends string>(...keys: T[]): Promise<any>;
     getStartUrl(): string | null | undefined;
     loadApp(name: string, startUrl?: string): void;
 }
+export {};

package/lib/mjs/bridges/FlutterHost.js

@@ -1,3 +1,4 @@
+import { ExtendUtils } from '@etsoo/shared';
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/
@@ -7,19 +8,54 @@ export class FlutterHost {
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler) {
-        this.callHandler = callHandler;
+    constructor(host) {
+        this.host = host;
+        /**
+         * Cached commands
+         */
+        this.cachedCommands = {};
+        window.addEventListener('flutterInAppWebViewPlatformReady', (_event) => {
+            if (this.host.callHandler == null)
+                return;
+            for (const key in this.cachedCommands) {
+                // Args
+                const args = this.cachedCommands[key];
+                // Execute
+                this.host.callHandler(key, ...args);
+                // Remove the key
+                delete this.cachedCommands[key];
+            }
+        });
+    }
+    cacheCommand(name, ...args) {
+        this.cachedCommands[name] = args;
     }
     changeCulture(locale) {
-        this.callHandler('changeCulture', locale);
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else
+            this.cacheCommand('changeCulture', locale);
     }
     exit() {
-        this.callHandler('exit');
+        if (this.host.callHandler)
+            this.host.callHandler('exit');
+        else
+            this.cacheCommand('exit');
     }
     async getLabels(...keys) {
         var _a;
+        // Try 500 miliseconds
+        let count = 5;
+        while (this.host.callHandler == null) {
+            count--;
+            await ExtendUtils.sleep(100);
+            if (count === 0)
+                break;
+        }
         const init = {};
-        const result = (_a = (await this.callHandler('getLabels'))) !== null && _a !== void 0 ? _a : {};
+        if (this.host.callHandler == null)
+            return init;
+        const result = (_a = (await this.host.callHandler('getLabels'))) !== null && _a !== void 0 ? _a : {};
         return keys.reduce((a, v) => {
             var _a;
             return ({
@@ -33,6 +69,9 @@ export class FlutterHost {
     }
     loadApp(name, startUrl) {
         this.startUrl = startUrl;
-        this.callHandler('loadApp', name, startUrl);
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.52",
+    "version": "1.2.53",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/bridges/BridgeUtils.ts

@@ -11,8 +11,8 @@ export namespace BridgeUtils {
      * Bridge host
      */
     export const host =
-        typeof g.flutter_inappwebview?.callHandler === 'function'
-            ? new FlutterHost(g.flutter_inappwebview.callHandler)
+        typeof g.flutter_inappwebview === 'object'
+            ? new FlutterHost(g.flutter_inappwebview)
             : typeof g.electron === 'object'
             ? (g.electron as IBridgeHost)
             : undefined;

package/src/bridges/FlutterHost.ts

@@ -1,5 +1,12 @@
+import { ExtendUtils } from '@etsoo/shared';
 import { IBridgeHost } from './IBridgeHost';
 
+// Call handler type
+type CallHandlerType = (
+    name: string,
+    ...args: unknown[]
+) => PromiseLike<Record<string, unknown> | void>;
+
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/
@@ -10,28 +17,66 @@ export class FlutterHost implements IBridgeHost {
      */
     private startUrl: string | null | undefined;
 
+    /**
+     * Cached commands
+     */
+    private cachedCommands: Record<string, unknown[]> = {};
+
     /**
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(
-        public callHandler: (
-            name: string,
-            ...args: unknown[]
-        ) => PromiseLike<Record<string, unknown> | void>
-    ) {}
+    constructor(private host: { callHandler?: CallHandlerType }) {
+        window.addEventListener(
+            'flutterInAppWebViewPlatformReady',
+            (_event) => {
+                if (this.host.callHandler == null) return;
+
+                for (const key in this.cachedCommands) {
+                    // Args
+                    const args = this.cachedCommands[key];
+
+                    // Execute
+                    this.host.callHandler(key, ...args);
+
+                    // Remove the key
+                    delete this.cachedCommands[key];
+                }
+            }
+        );
+    }
+
+    cacheCommand(name: string, ...args: unknown[]): void {
+        this.cachedCommands[name] = args;
+    }
 
     changeCulture(locale: string): void {
-        this.callHandler('changeCulture', locale);
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else this.cacheCommand('changeCulture', locale);
     }
 
     exit(): void {
-        this.callHandler('exit');
+        if (this.host.callHandler) this.host.callHandler('exit');
+        else this.cacheCommand('exit');
     }
 
     async getLabels<T extends string>(...keys: T[]) {
+        // Try 500 miliseconds
+        let count = 5;
+        while (this.host.callHandler == null) {
+            count--;
+            await ExtendUtils.sleep(100);
+
+            if (count === 0) break;
+        }
+
         const init: any = {};
-        const result = (await this.callHandler('getLabels')) ?? {};
+
+        if (this.host.callHandler == null) return init;
+
+        const result = (await this.host.callHandler('getLabels')) ?? {};
+
         return keys.reduce(
             (a, v) => ({
                 ...a,
@@ -47,6 +92,8 @@ export class FlutterHost implements IBridgeHost {
 
     loadApp(name: string, startUrl?: string): void {
         this.startUrl = startUrl;
-        this.callHandler('loadApp', name, startUrl);
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else this.cacheCommand('loadApp', name, startUrl);
     }
 }