@etsoo/appscript 1.3.99 → 1.4.1

package/src/app/CoreApp.ts

@@ -18,17 +18,6 @@ import {
     NumberUtils,
     Utils
 } from '@etsoo/shared';
-import {
-    AES,
-    algo,
-    enc,
-    HmacSHA512,
-    lib,
-    mode,
-    pad,
-    PBKDF2,
-    SHA3
-} from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { DataPrivacy } from '../business/DataPrivacy';
@@ -283,12 +272,9 @@ export abstract class CoreApp<
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture);
+        this.changeCulture(currentCulture, () => this.setup());
 
         this.changeRegion(currentRegion);
-
-        // Setup callback
-        this.setup();
     }
 
     private getDeviceId() {
@@ -337,7 +323,7 @@ export abstract class CoreApp<
     /**
      * Restore settings from persisted source
      */
-    protected restore() {
+    protected async restore() {
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
             this.fields.devices,
@@ -369,7 +355,7 @@ export abstract class CoreApp<
         );
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = this.decrypt(
+            const passphraseDecrypted = await this.decrypt(
                 passphraseEncrypted,
                 this.name
             );
@@ -560,7 +546,10 @@ export abstract class CoreApp<
             return;
         }
 
-        const updateResult = this.initCallUpdate(result.data, data.timestamp);
+        const updateResult = await this.initCallUpdate(
+            result.data,
+            data.timestamp
+        );
         if (!updateResult) {
             this.notifier.alert(this.get<string>('noData')! + '(Update)');
         }
@@ -573,16 +562,19 @@ export abstract class CoreApp<
      * @param data Result data
      * @param timestamp Timestamp
      */
-    protected initCallUpdate(
+    protected async initCallUpdate(
         data: InitCallResultData,
         timestamp: number
-    ): boolean {
+    ): Promise<boolean> {
         // Data check
         if (data.deviceId == null || data.passphrase == null) return false;
 
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
+        const passphrase = await this.decrypt(
+            data.passphrase,
+            timestamp.toString()
+        );
         if (passphrase == null) return false;
 
         // Update device id and cache it
@@ -606,7 +598,7 @@ export abstract class CoreApp<
 
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = this.decrypt(
+            const prev = await this.decrypt(
                 data.previousPassphrase,
                 timestamp.toString()
             );
@@ -627,13 +619,13 @@ export abstract class CoreApp<
                 let newValueSource: string | undefined;
 
                 if (enhanced) {
-                    newValueSource = this.decryptEnhanced(
+                    newValueSource = await this.decryptEnhanced(
                         currentValue,
                         prev,
                         12
                     );
                 } else {
-                    newValueSource = this.decrypt(currentValue, prev);
+                    newValueSource = await this.decrypt(currentValue, prev);
                 }
 
                 if (newValueSource == null || newValueSource === '') {
@@ -643,8 +635,8 @@ export abstract class CoreApp<
                 }
 
                 const newValue = enhanced
-                    ? this.encryptEnhanced(newValueSource)
-                    : this.encrypt(newValueSource);
+                    ? await this.encryptEnhanced(newValueSource)
+                    : await this.encrypt(newValueSource);
 
                 this.storage.setData(field, newValue);
             }
@@ -687,9 +679,12 @@ export abstract class CoreApp<
         // Token
         this.api.authorize(this.settings.authScheme, token);
 
-        // Cover the current value
+        // Overwrite the current value
         if (refreshToken !== '') {
-            if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
+            if (refreshToken != null)
+                this.encrypt(refreshToken).then((result) =>
+                    this.storage.setData(this.fields.headerToken, result)
+                );
             this.storage.setData(this.fields.headerToken, refreshToken);
         }
 
@@ -745,8 +740,9 @@ export abstract class CoreApp<
     /**
      * Change culture
      * @param culture New culture definition
+     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition) {
+    changeCulture(culture: DataTypes.CultureDefinition, onReady?: () => void) {
         // Name
         const { name } = culture;
 
@@ -766,7 +762,16 @@ export abstract class CoreApp<
         // Hold the current resources
         this.settings.currentCulture = culture;
 
-        this.updateRegionLabel();
+        if (typeof culture.resources !== 'object') {
+            culture.resources().then((result) => {
+                culture.resources = result;
+                this.updateRegionLabel();
+                if (onReady) onReady();
+            });
+        } else {
+            this.updateRegionLabel();
+            if (onReady) onReady();
+        }
     }
 
     /**
@@ -818,11 +823,13 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string) {
+    async decrypt(messageEncrypted: string, passphrase?: string) {
         // Iterations
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations)) return undefined;
 
+        const { PBKDF2, algo, enc, AES, pad, mode } = await import('crypto-js');
+
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
@@ -852,7 +859,7 @@ export abstract class CoreApp<
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decryptEnhanced(
+    async decryptEnhanced(
         messageEncrypted: string,
         passphrase?: string,
         durationSeconds?: number
@@ -885,7 +892,7 @@ export abstract class CoreApp<
                 timestamp
             );
 
-            return this.decrypt(message, passphrase);
+            return await this.decrypt(message, passphrase);
         } catch (e) {
             console.log('decryptEnhanced', e);
             return undefined;
@@ -939,10 +946,14 @@ export abstract class CoreApp<
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number) {
+    async encrypt(message: string, passphrase?: string, iterations?: number) {
         // Default 1 * 1000
         iterations ??= 1;
 
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = await import(
+            'crypto-js'
+        );
+
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase ?? this.passphrase, salt, {
@@ -971,7 +982,11 @@ export abstract class CoreApp<
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encryptEnhanced(message: string, passphrase?: string, iterations?: number) {
+    async encryptEnhanced(
+        message: string,
+        passphrase?: string,
+        iterations?: number
+    ) {
         // Timestamp
         const timestamp = Utils.numberToChars(new Date().getTime());
 
@@ -980,7 +995,9 @@ export abstract class CoreApp<
             timestamp
         );
 
-        return timestamp + '!' + this.encrypt(message, passphrase, iterations);
+        const result = await this.encrypt(message, passphrase, iterations);
+
+        return timestamp + '!' + result;
     }
 
     /**
@@ -1176,7 +1193,10 @@ export abstract class CoreApp<
      * @returns Resource
      */
     get<T = string>(key: string): T | undefined {
-        const value = this.settings.currentCulture.resources[key];
+        // Make sure the resource files are loaded first
+        const resources = this.settings.currentCulture.resources;
+        const value =
+            typeof resources === 'object' ? resources[key] : undefined;
         if (value == null) return undefined;
 
         // No strict type convertion here
@@ -1376,7 +1396,8 @@ export abstract class CoreApp<
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string) {
+    async hash(message: string, passphrase?: string) {
+        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else return HmacSHA512(message, passphrase).toString(enc.Base64);
@@ -1388,7 +1409,8 @@ export abstract class CoreApp<
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string) {
+    async hashHex(message: string, passphrase?: string) {
+        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else return HmacSHA512(message, passphrase).toString(enc.Hex);
@@ -1585,7 +1607,9 @@ export abstract class CoreApp<
         if (keep) {
             this.authorize(user.token, refreshToken);
         } else {
-            this.cachedRefreshToken = this.encrypt(refreshToken);
+            this.encrypt(refreshToken).then(
+                (result) => (this.cachedRefreshToken = result)
+            );
             this.authorize(user.token, undefined);
         }
     }

package/src/app/IApp.ts

@@ -85,7 +85,7 @@ export const appFields = [
 /**
  * Basic type template
  */
-export type IAppFields = { [key in typeof appFields[number]]: string };
+export type IAppFields = { [key in (typeof appFields)[number]]: string };
 
 /**
  * Application interface, for generic version, see ICoreApp
@@ -214,8 +214,12 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
+     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition): void;
+    changeCulture(
+        culture: DataTypes.CultureDefinition,
+        onReady?: () => void
+    ): void;
 
     /**
      * Check the action result is about device invalid
@@ -247,7 +251,10 @@ export interface IApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
+    decrypt(
+        messageEncrypted: string,
+        passphrase?: string
+    ): Promise<string | undefined>;
 
     /**
      * Enhanced decrypt message
@@ -260,7 +267,7 @@ export interface IApp {
         messageEncrypted: string,
         passphrase?: string,
         durationSeconds?: number
-    ): string | undefined;
+    ): Promise<string | undefined>;
 
     /**
      * Detect IP data, call only one time
@@ -275,7 +282,11 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number): string;
+    encrypt(
+        message: string,
+        passphrase?: string,
+        iterations?: number
+    ): Promise<string>;
 
     /**
      * Enhanced encrypt message
@@ -288,7 +299,7 @@ export interface IApp {
         message: string,
         passphrase?: string,
         iterations?: number
-    ): string;
+    ): Promise<string>;
 
     /**
      * Format date to string
@@ -493,7 +504,7 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): string;
+    hash(message: string, passphrase?: string): Promise<string>;
 
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
@@ -501,7 +512,7 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): string;
+    hashHex(message: string, passphrase?: string): Promise<string>;
 
     /**
      * Check use has the specific role permission or not

package/src/erp/AuthApi.ts

@@ -35,15 +35,15 @@ export class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    loginId(id: string, payload?: ResultPayload) {
+    async loginId(id: string, payload?: ResultPayload) {
         const { deviceId, region } = this.app;
-        id = this.app.encrypt(id);
+        id = await this.app.encrypt(id);
         const rq: LoginIdRQ = {
             id,
             deviceId,
             region
         };
-        return this.api.get('Auth/LoginId', rq, payload);
+        return await this.api.get('Auth/LoginId', rq, payload);
     }
 
     /**

package/src/i18n/en.ts

@@ -1,14 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
-import enResources from './en.json';
+import { DomUtils } from '@etsoo/shared';
+import { i18nResource, i18nResourceCreator } from './i18nResources';
 
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export const en = (localResources: object): DataTypes.CultureDefinition => ({
-    name: 'en',
-    label: 'English',
-    resources: { ...enResources, ...localResources },
-    compatibleNames: []
-});
+export const en = (resources: i18nResource) =>
+    DomUtils.en(i18nResourceCreator('./en.json', resources));

package/src/i18n/i18nResources.ts

@@ -0,0 +1,19 @@
+import { DataTypes } from '@etsoo/shared';
+
+export type i18nResource = object | (() => Promise<object>);
+
+export function i18nResourceCreator(file: string, resources: i18nResource) {
+    return async () => {
+        const [r1, r2] = await Promise.all([
+            import(file),
+            new Promise<object>((resolve) => {
+                if (typeof resources === 'object') {
+                    resolve(resources);
+                } else {
+                    resources().then((result) => resolve(result));
+                }
+            })
+        ]);
+        return { ...r1, ...r2 } as DataTypes.StringRecord;
+    };
+}

package/src/i18n/zhHans.ts

@@ -1,14 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
-import zhHansResources from './zh-Hans.json';
+import { DomUtils } from '@etsoo/shared';
+import { i18nResource, i18nResourceCreator } from './i18nResources';
 
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (localResources: {}): DataTypes.CultureDefinition => ({
-    name: 'zh-Hans',
-    label: '简体中文',
-    resources: { ...zhHansResources, ...localResources },
-    compatibleNames: ['zh-CN', 'zh-SG']
-});
+export const zhHans = (resources: i18nResource) =>
+    DomUtils.en(i18nResourceCreator('./zh-Hans.json', resources));

package/src/i18n/zhHant.ts

@@ -1,16 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
-import zhHantResources from './zh-Hant.json';
+import { DomUtils } from '@etsoo/shared';
+import { i18nResource, i18nResourceCreator } from './i18nResources';
 
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (
-    localResources: object
-): DataTypes.CultureDefinition => ({
-    name: 'zh-Hant',
-    label: '繁體中文',
-    resources: { ...zhHantResources, ...localResources },
-    compatibleNames: ['zh-HK', 'zh-TW', 'zh-MO']
-});
+export const zhHant = (resources: i18nResource) =>
+    DomUtils.en(i18nResourceCreator('./zh-Hant.json', resources));

package/src/index.ts

@@ -86,7 +86,8 @@ export {
     ApiAuthorizationScheme,
     ApiMethod,
     ApiResponseType,
-    createClient
+    createClient,
+    createClientAsync
 } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';