@etsoo/appscript 1.2.49 → 1.2.53

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

@@ -1,15 +1,11 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 /**
  * Bridge utils
  */
 export declare namespace BridgeUtils {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    function isElectronClient(): boolean;
     /**
      * Bridge host
      */
-    const host: IBridgeHost | undefined;
+    const host: IBridgeHost | FlutterHost | undefined;
 }

package/lib/cjs/bridges/BridgeUtils.js

@@ -1,41 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeUtils = void 0;
+const FlutterHost_1 = require("./FlutterHost");
 /**
  * Bridge utils
  */
 var BridgeUtils;
 (function (BridgeUtils) {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    function isElectronClient() {
-        // Renderer process
-        if (typeof window !== 'undefined' &&
-            typeof window.process === 'object' &&
-            window.process.type === 'renderer') {
-            return true;
-        }
-        // Main process
-        if (typeof process !== 'undefined' &&
-            typeof process.versions === 'object' &&
-            !!process.versions.electron) {
-            return true;
-        }
-        // Detect the user agent when the `nodeIntegration` option is set to true
-        if (typeof navigator === 'object' &&
-            typeof navigator.userAgent === 'string' &&
-            navigator.userAgent.indexOf('Electron') >= 0) {
-            return true;
-        }
-        return false;
-    }
-    BridgeUtils.isElectronClient = isElectronClient;
+    const g = globalThis;
     /**
      * Bridge host
      */
-    BridgeUtils.host = isElectronClient()
-        ? globalThis.electron
-        : undefined;
+    BridgeUtils.host = typeof g.flutter_inappwebview === 'object'
+        ? new FlutterHost_1.FlutterHost(g.flutter_inappwebview)
+        : typeof g.electron === 'object'
+            ? g.electron
+            : undefined;
 })(BridgeUtils = exports.BridgeUtils || (exports.BridgeUtils = {}));

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

@@ -0,0 +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 {
+    private host;
+    /**
+     * Start Url
+     */
+    private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    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

@@ -0,0 +1,81 @@
+"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/
+ */
+class FlutterHost {
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    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) {
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else
+            this.cacheCommand('changeCulture', locale);
+    }
+    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 = {};
+        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 ({
+                ...a,
+                [v]: (_a = result[v]) !== null && _a !== void 0 ? _a : ''
+            });
+        }, init);
+    }
+    getStartUrl() {
+        return this.startUrl;
+    }
+    loadApp(name, startUrl) {
+        this.startUrl = startUrl;
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
+    }
+}
+exports.FlutterHost = FlutterHost;

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

@@ -11,10 +11,21 @@ export interface IBridgeHost {
      * Exit the application
      */
     exit(): void;
+    /**
+     * Get multiple culture labels
+     * @param keys Keys
+     */
+    getLabels<T extends string>(...keys: T[]): PromiseLike<{
+        [K in T]: string;
+    }>;
+    /**
+     * Get app start Url / router Url
+     */
+    getStartUrl(): string | undefined | null;
     /**
      * Load application
      * @param name App name
-     * @param startUrl Start Url
+     * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
 }

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

@@ -1,15 +1,11 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 /**
  * Bridge utils
  */
 export declare namespace BridgeUtils {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    function isElectronClient(): boolean;
     /**
      * Bridge host
      */
-    const host: IBridgeHost | undefined;
+    const host: IBridgeHost | FlutterHost | undefined;
 }

package/lib/mjs/bridges/BridgeUtils.js

@@ -1,38 +1,16 @@
+import { FlutterHost } from './FlutterHost';
 /**
  * Bridge utils
  */
 export var BridgeUtils;
 (function (BridgeUtils) {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    function isElectronClient() {
-        // Renderer process
-        if (typeof window !== 'undefined' &&
-            typeof window.process === 'object' &&
-            window.process.type === 'renderer') {
-            return true;
-        }
-        // Main process
-        if (typeof process !== 'undefined' &&
-            typeof process.versions === 'object' &&
-            !!process.versions.electron) {
-            return true;
-        }
-        // Detect the user agent when the `nodeIntegration` option is set to true
-        if (typeof navigator === 'object' &&
-            typeof navigator.userAgent === 'string' &&
-            navigator.userAgent.indexOf('Electron') >= 0) {
-            return true;
-        }
-        return false;
-    }
-    BridgeUtils.isElectronClient = isElectronClient;
+    const g = globalThis;
     /**
      * Bridge host
      */
-    BridgeUtils.host = isElectronClient()
-        ? globalThis.electron
-        : undefined;
+    BridgeUtils.host = typeof g.flutter_inappwebview === 'object'
+        ? new FlutterHost(g.flutter_inappwebview)
+        : typeof g.electron === 'object'
+            ? g.electron
+            : undefined;
 })(BridgeUtils || (BridgeUtils = {}));

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

@@ -0,0 +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 {
+    private host;
+    /**
+     * Start Url
+     */
+    private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    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

@@ -0,0 +1,77 @@
+import { ExtendUtils } from '@etsoo/shared';
+/**
+ * Flutter JavaScript Host
+ * https://inappwebview.dev/docs/javascript/communication/
+ */
+export class FlutterHost {
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    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) {
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else
+            this.cacheCommand('changeCulture', locale);
+    }
+    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 = {};
+        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 ({
+                ...a,
+                [v]: (_a = result[v]) !== null && _a !== void 0 ? _a : ''
+            });
+        }, init);
+    }
+    getStartUrl() {
+        return this.startUrl;
+    }
+    loadApp(name, startUrl) {
+        this.startUrl = startUrl;
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
+    }
+}

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

@@ -11,10 +11,21 @@ export interface IBridgeHost {
      * Exit the application
      */
     exit(): void;
+    /**
+     * Get multiple culture labels
+     * @param keys Keys
+     */
+    getLabels<T extends string>(...keys: T[]): PromiseLike<{
+        [K in T]: string;
+    }>;
+    /**
+     * Get app start Url / router Url
+     */
+    getStartUrl(): string | undefined | null;
     /**
      * Load application
      * @param name App name
-     * @param startUrl Start Url
+     * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
 }

package/package.json

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

package/src/bridges/BridgeUtils.ts

@@ -1,48 +1,19 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 
 /**
  * Bridge utils
  */
 export namespace BridgeUtils {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    export function isElectronClient() {
-        // Renderer process
-        if (
-            typeof window !== 'undefined' &&
-            typeof window.process === 'object' &&
-            (window.process as any).type === 'renderer'
-        ) {
-            return true;
-        }
-
-        // Main process
-        if (
-            typeof process !== 'undefined' &&
-            typeof process.versions === 'object' &&
-            !!process.versions.electron
-        ) {
-            return true;
-        }
-
-        // Detect the user agent when the `nodeIntegration` option is set to true
-        if (
-            typeof navigator === 'object' &&
-            typeof navigator.userAgent === 'string' &&
-            navigator.userAgent.indexOf('Electron') >= 0
-        ) {
-            return true;
-        }
-
-        return false;
-    }
+    const g: any = globalThis;
 
     /**
      * Bridge host
      */
-    export const host = isElectronClient()
-        ? ((globalThis as any).electron as IBridgeHost)
-        : undefined;
+    export const host =
+        typeof g.flutter_inappwebview === 'object'
+            ? new FlutterHost(g.flutter_inappwebview)
+            : typeof g.electron === 'object'
+            ? (g.electron as IBridgeHost)
+            : undefined;
 }

package/src/bridges/FlutterHost.ts

@@ -0,0 +1,99 @@
+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/
+ */
+export class FlutterHost implements IBridgeHost {
+    /**
+     * Start Url
+     */
+    private startUrl: string | null | undefined;
+
+    /**
+     * Cached commands
+     */
+    private cachedCommands: Record<string, unknown[]> = {};
+
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    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 {
+        if (this.host.callHandler)
+            this.host.callHandler('changeCulture', locale);
+        else this.cacheCommand('changeCulture', locale);
+    }
+
+    exit(): void {
+        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 = {};
+
+        if (this.host.callHandler == null) return init;
+
+        const result = (await this.host.callHandler('getLabels')) ?? {};
+
+        return keys.reduce(
+            (a, v) => ({
+                ...a,
+                [v]: result[v] ?? ''
+            }),
+            init
+        );
+    }
+
+    getStartUrl(): string | null | undefined {
+        return this.startUrl;
+    }
+
+    loadApp(name: string, startUrl?: string): void {
+        this.startUrl = startUrl;
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else this.cacheCommand('loadApp', name, startUrl);
+    }
+}

package/src/bridges/IBridgeHost.ts

@@ -13,10 +13,23 @@ export interface IBridgeHost {
      */
     exit(): void;
 
+    /**
+     * Get multiple culture labels
+     * @param keys Keys
+     */
+    getLabels<T extends string>(
+        ...keys: T[]
+    ): PromiseLike<{ [K in T]: string }>;
+
+    /**
+     * Get app start Url / router Url
+     */
+    getStartUrl(): string | undefined | null;
+
     /**
      * Load application
      * @param name App name
-     * @param startUrl Start Url
+     * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
 }