@etsoo/appscript 1.2.51 → 1.2.55

package/lib/cjs/app/CoreApp.js

@@ -7,6 +7,7 @@ const shared_1 = require("@etsoo/shared");
 const crypto_js_1 = require("crypto-js");
 const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
+const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const BusinessUtils_1 = require("../business/BusinessUtils");
 const ActionResultError_1 = require("../result/ActionResultError");
 /**
@@ -383,6 +384,7 @@ class CoreApp {
      * @param refreshToken Refresh token
      */
     authorize(token, refreshToken) {
+        var _a;
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
@@ -402,6 +404,8 @@ class CoreApp {
             this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
         }
+        // Host notice
+        (_a = BridgeUtils_1.BridgeUtils.host) === null || _a === void 0 ? void 0 : _a.userAuthorization(this.authorized);
     }
     /**
      * Change country or region

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

@@ -1,3 +1,4 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 /**
  * Bridge utils
@@ -6,5 +7,5 @@ export declare namespace BridgeUtils {
     /**
      * Bridge host
      */
-    const host: IBridgeHost | undefined;
+    const host: IBridgeHost | FlutterHost | undefined;
 }

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,21 +1,33 @@
 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<{} | void>;
+    private host;
     /**
      * Start Url
      */
     private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
     /**
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler: (name: string, ...args: unknown[]) => PromiseLike<{} | void>);
+    constructor(host: {
+        callHandler?: CallHandlerType;
+    });
+    cacheCommand(name: string, ...args: unknown[]): void;
     changeCulture(locale: string): void;
+    closable(): boolean;
     exit(): void;
+    getLabels<T extends string>(...keys: T[]): Promise<any>;
     getStartUrl(): string | null | undefined;
     loadApp(name: string, startUrl?: string): void;
+    userAuthorization(authorized: boolean): 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,21 +11,80 @@ 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);
+    }
+    closable() {
+        return false;
     }
     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 = {};
+        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;
-        this.callHandler('loadApp', name, startUrl);
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
+    }
+    userAuthorization(authorized) {
+        if (this.host.callHandler)
+            this.host.callHandler('userAuthorization', authorized);
+        else
+            this.cacheCommand('userAuthorization', authorized);
     }
 }
 exports.FlutterHost = FlutterHost;

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

@@ -7,10 +7,21 @@ export interface IBridgeHost {
      * @param locale Locale
      */
     changeCulture(locale: string): void;
+    /**
+     * Closable from client
+     */
+    closable(): boolean;
     /**
      * 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
      */
@@ -21,4 +32,9 @@ export interface IBridgeHost {
      * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
+    /**
+     * User authorization notice
+     * @param authorized Authorized or not
+     */
+    userAuthorization(authorized: boolean): void;
 }

package/lib/mjs/app/CoreApp.js

@@ -4,6 +4,7 @@ import { DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
+import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
 import { ActionResultError } from '../result/ActionResultError';
 /**
@@ -380,6 +381,7 @@ export class CoreApp {
      * @param refreshToken Refresh token
      */
     authorize(token, refreshToken) {
+        var _a;
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
@@ -399,6 +401,8 @@ export class CoreApp {
             this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
         }
+        // Host notice
+        (_a = BridgeUtils.host) === null || _a === void 0 ? void 0 : _a.userAuthorization(this.authorized);
     }
     /**
      * Change country or region

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

@@ -1,3 +1,4 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 /**
  * Bridge utils
@@ -6,5 +7,5 @@ export declare namespace BridgeUtils {
     /**
      * Bridge host
      */
-    const host: IBridgeHost | undefined;
+    const host: IBridgeHost | FlutterHost | undefined;
 }

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,21 +1,33 @@
 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<{} | void>;
+    private host;
     /**
      * Start Url
      */
     private startUrl;
+    /**
+     * Cached commands
+     */
+    private cachedCommands;
     /**
      * Constructor
      * @param callHandler Call handler
      */
-    constructor(callHandler: (name: string, ...args: unknown[]) => PromiseLike<{} | void>);
+    constructor(host: {
+        callHandler?: CallHandlerType;
+    });
+    cacheCommand(name: string, ...args: unknown[]): void;
     changeCulture(locale: string): void;
+    closable(): boolean;
     exit(): void;
+    getLabels<T extends string>(...keys: T[]): Promise<any>;
     getStartUrl(): string | null | undefined;
     loadApp(name: string, startUrl?: string): void;
+    userAuthorization(authorized: boolean): 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,20 +8,79 @@ 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);
+    }
+    closable() {
+        return false;
     }
     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 = {};
+        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;
-        this.callHandler('loadApp', name, startUrl);
+        if (this.host.callHandler)
+            this.host.callHandler('loadApp', name, startUrl);
+        else
+            this.cacheCommand('loadApp', name, startUrl);
+    }
+    userAuthorization(authorized) {
+        if (this.host.callHandler)
+            this.host.callHandler('userAuthorization', authorized);
+        else
+            this.cacheCommand('userAuthorization', authorized);
     }
 }

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

@@ -7,10 +7,21 @@ export interface IBridgeHost {
      * @param locale Locale
      */
     changeCulture(locale: string): void;
+    /**
+     * Closable from client
+     */
+    closable(): boolean;
     /**
      * 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
      */
@@ -21,4 +32,9 @@ export interface IBridgeHost {
      * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
+    /**
+     * User authorization notice
+     * @param authorized Authorized or not
+     */
+    userAuthorization(authorized: boolean): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.51",
+    "version": "1.2.55",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,19 +55,19 @@
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/restclient": "^1.0.64",
         "@etsoo/shared": "^1.1.11",
-        "@types/crypto-js": "^4.1.0",
+        "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.17.0",
-        "@babel/core": "^7.17.2",
+        "@babel/cli": "^7.17.6",
+        "@babel/core": "^7.17.5",
         "@babel/plugin-transform-runtime": "^7.17.0",
         "@babel/preset-env": "^7.16.11",
         "@babel/runtime-corejs3": "^7.17.2",
         "@types/jest": "^27.4.0",
-        "@typescript-eslint/eslint-plugin": "^5.11.0",
-        "@typescript-eslint/parser": "^5.11.0",
-        "eslint": "^8.8.0",
+        "@typescript-eslint/eslint-plugin": "^5.12.1",
+        "@typescript-eslint/parser": "^5.12.1",
+        "eslint": "^8.9.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
         "jest": "^27.5.1",

package/src/app/CoreApp.ts

@@ -29,6 +29,7 @@ import {
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
+import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
 import { ProductUnit } from '../business/ProductUnit';
 import { IdLabelDto } from '../dto/IdLabelDto';
@@ -1041,6 +1042,9 @@ export abstract class CoreApp<
             this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
         }
+
+        // Host notice
+        BridgeUtils.host?.userAuthorization(this.authorized);
     }
 
     /**

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,23 +17,77 @@ 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<{} | 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);
+    }
+
+    closable(): boolean {
+        return false;
     }
 
     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 = {};
+
+        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 {
@@ -35,6 +96,14 @@ 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);
+    }
+
+    userAuthorization(authorized: boolean): void {
+        if (this.host.callHandler)
+            this.host.callHandler('userAuthorization', authorized);
+        else this.cacheCommand('userAuthorization', authorized);
     }
 }

package/src/bridges/IBridgeHost.ts

@@ -8,11 +8,24 @@ export interface IBridgeHost {
      */
     changeCulture(locale: string): void;
 
+    /**
+     * Closable from client
+     */
+    closable(): boolean;
+
     /**
      * 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
      */
@@ -24,4 +37,10 @@ export interface IBridgeHost {
      * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
+
+    /**
+     * User authorization notice
+     * @param authorized Authorized or not
+     */
+    userAuthorization(authorized: boolean): void;
 }