@etsoo/appscript 1.4.4 → 1.4.6

package/lib/cjs/app/CoreApp.d.ts

@@ -221,7 +221,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Update current region label
      */
@@ -246,7 +246,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Enhanced decrypt message
      * @param messageEncrypted Encrypted message
@@ -254,7 +254,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): Promise<string | undefined>;
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -268,7 +268,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enhanced encrypt message
      * @param message Message
@@ -276,7 +276,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encryptEnhanced(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
@@ -430,14 +430,14 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): Promise<string>;
+    hash(message: string, passphrase?: string): string;
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): Promise<string>;
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check

package/lib/cjs/app/CoreApp.js

@@ -34,6 +34,7 @@ const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
+let CJ;
 /**
  * Core application
  */
@@ -151,12 +152,16 @@ class CoreApp {
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
-        // Restore
-        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            Promise.resolve().then(() => __importStar(require('crypto-js'))),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
@@ -474,7 +479,7 @@ class CoreApp {
         // Overwrite the current value
         if (refreshToken !== '') {
             if (refreshToken != null)
-                this.encrypt(refreshToken).then((result) => this.storage.setData(this.fields.headerToken, result));
+                refreshToken = this.encrypt(refreshToken);
             this.storage.setData(this.fields.headerToken, refreshToken);
         }
         // Reset tryLogin state
@@ -525,12 +530,13 @@ class CoreApp {
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture, onReady) {
+    async changeCulture(culture) {
         // Name
         const { name } = culture;
         // Same?
-        if (this._culture === name)
-            return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
         // Save the cultrue to local storage
         this.storage.setPersistedData(shared_1.DomUtils.CultureField, name);
         // Change the API's Content-Language header
@@ -540,19 +546,13 @@ class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady)
-                    onReady(result);
-            });
-        }
-        else {
-            this.updateRegionLabel();
-            if (onReady)
-                onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+        return resources;
     }
     /**
      * Update current region label
@@ -595,12 +595,12 @@ class CoreApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    async decrypt(messageEncrypted, passphrase) {
+    decrypt(messageEncrypted, passphrase) {
         // Iterations
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations))
             return undefined;
-        const { PBKDF2, algo, enc, AES, pad, mode } = await Promise.resolve().then(() => __importStar(require('crypto-js')));
+        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
@@ -628,7 +628,7 @@ class CoreApp {
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    async decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
+    decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
         // Timestamp splitter
         const pos = messageEncrypted.indexOf('!');
         // Miliseconds chars are longer than 8
@@ -649,7 +649,7 @@ class CoreApp {
             }
             const message = messageEncrypted.substring(pos + 1);
             passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-            return await this.decrypt(message, passphrase);
+            return this.decrypt(message, passphrase);
         }
         catch (e) {
             console.log('decryptEnhanced', e);
@@ -696,10 +696,10 @@ class CoreApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encrypt(message, passphrase, iterations) {
+    encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
         iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = await Promise.resolve().then(() => __importStar(require('crypto-js')));
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
@@ -725,11 +725,11 @@ class CoreApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encryptEnhanced(message, passphrase, iterations) {
+    encryptEnhanced(message, passphrase, iterations) {
         // Timestamp
         const timestamp = shared_1.Utils.numberToChars(new Date().getTime());
         passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        const result = await this.encrypt(message, passphrase, iterations);
+        const result = this.encrypt(message, passphrase, iterations);
         return timestamp + '!' + result;
     }
     /**
@@ -1069,8 +1069,8 @@ class CoreApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hash(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = await Promise.resolve().then(() => __importStar(require('crypto-js')));
+    hash(message, passphrase) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else
@@ -1082,8 +1082,8 @@ class CoreApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hashHex(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = await Promise.resolve().then(() => __importStar(require('crypto-js')));
+    hashHex(message, passphrase) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else
@@ -1206,7 +1206,10 @@ class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL
@@ -1258,7 +1261,7 @@ class CoreApp {
             this.authorize(user.token, refreshToken);
         }
         else {
-            this.encrypt(refreshToken).then((result) => (this.cachedRefreshToken = result));
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }

package/lib/cjs/app/IApp.d.ts

@@ -159,9 +159,8 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Check the action result is about device invalid
      * @param result Action result
@@ -188,7 +187,7 @@ export interface IApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Enhanced decrypt message
      * @param messageEncrypted Encrypted message
@@ -196,7 +195,7 @@ export interface IApp {
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): Promise<string | undefined>;
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -209,7 +208,7 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enhanced encrypt message
      * @param message Message
@@ -217,7 +216,7 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encryptEnhanced(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Format date to string
      * @param input Input date
@@ -366,14 +365,14 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): Promise<string>;
+    hash(message: string, passphrase?: string): string;
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): Promise<string>;
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check

package/lib/mjs/app/CoreApp.d.ts

@@ -221,7 +221,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Update current region label
      */
@@ -246,7 +246,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Enhanced decrypt message
      * @param messageEncrypted Encrypted message
@@ -254,7 +254,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): Promise<string | undefined>;
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -268,7 +268,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enhanced encrypt message
      * @param message Message
@@ -276,7 +276,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encryptEnhanced(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
@@ -430,14 +430,14 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): Promise<string>;
+    hash(message: string, passphrase?: string): string;
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): Promise<string>;
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check

package/lib/mjs/app/CoreApp.js

@@ -8,6 +8,7 @@ import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
+let CJ;
 /**
  * Core application
  */
@@ -125,12 +126,16 @@ export class CoreApp {
         this.fields = appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
-        // Restore
-        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            import('crypto-js'),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
@@ -448,7 +453,7 @@ export class CoreApp {
         // Overwrite the current value
         if (refreshToken !== '') {
             if (refreshToken != null)
-                this.encrypt(refreshToken).then((result) => this.storage.setData(this.fields.headerToken, result));
+                refreshToken = this.encrypt(refreshToken);
             this.storage.setData(this.fields.headerToken, refreshToken);
         }
         // Reset tryLogin state
@@ -499,12 +504,13 @@ export class CoreApp {
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture, onReady) {
+    async changeCulture(culture) {
         // Name
         const { name } = culture;
         // Same?
-        if (this._culture === name)
-            return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
         // Save the cultrue to local storage
         this.storage.setPersistedData(DomUtils.CultureField, name);
         // Change the API's Content-Language header
@@ -514,19 +520,13 @@ export class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady)
-                    onReady(result);
-            });
-        }
-        else {
-            this.updateRegionLabel();
-            if (onReady)
-                onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+        return resources;
     }
     /**
      * Update current region label
@@ -569,12 +569,12 @@ export class CoreApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    async decrypt(messageEncrypted, passphrase) {
+    decrypt(messageEncrypted, passphrase) {
         // 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');
+        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
@@ -602,7 +602,7 @@ export class CoreApp {
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    async decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
+    decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
         // Timestamp splitter
         const pos = messageEncrypted.indexOf('!');
         // Miliseconds chars are longer than 8
@@ -623,7 +623,7 @@ export class CoreApp {
             }
             const message = messageEncrypted.substring(pos + 1);
             passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-            return await this.decrypt(message, passphrase);
+            return this.decrypt(message, passphrase);
         }
         catch (e) {
             console.log('decryptEnhanced', e);
@@ -670,10 +670,10 @@ export class CoreApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encrypt(message, passphrase, iterations) {
+    encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
         iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = await import('crypto-js');
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
@@ -699,11 +699,11 @@ export class CoreApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encryptEnhanced(message, passphrase, iterations) {
+    encryptEnhanced(message, passphrase, iterations) {
         // Timestamp
         const timestamp = Utils.numberToChars(new Date().getTime());
         passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        const result = await this.encrypt(message, passphrase, iterations);
+        const result = this.encrypt(message, passphrase, iterations);
         return timestamp + '!' + result;
     }
     /**
@@ -1043,8 +1043,8 @@ export class CoreApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hash(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
+    hash(message, passphrase) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else
@@ -1056,8 +1056,8 @@ export class CoreApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hashHex(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
+    hashHex(message, passphrase) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else
@@ -1180,7 +1180,10 @@ export class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL
@@ -1232,7 +1235,7 @@ export class CoreApp {
             this.authorize(user.token, refreshToken);
         }
         else {
-            this.encrypt(refreshToken).then((result) => (this.cachedRefreshToken = result));
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }

package/lib/mjs/app/IApp.d.ts

@@ -159,9 +159,8 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Check the action result is about device invalid
      * @param result Action result
@@ -188,7 +187,7 @@ export interface IApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase?: string): Promise<string | undefined>;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
     /**
      * Enhanced decrypt message
      * @param messageEncrypted Encrypted message
@@ -196,7 +195,7 @@ export interface IApp {
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): Promise<string | undefined>;
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -209,7 +208,7 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enhanced encrypt message
      * @param message Message
@@ -217,7 +216,7 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encryptEnhanced(message: string, passphrase?: string, iterations?: number): Promise<string>;
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Format date to string
      * @param input Input date
@@ -366,14 +365,14 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): Promise<string>;
+    hash(message: string, passphrase?: string): string;
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): Promise<string>;
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check

package/package.json

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

package/src/app/CoreApp.ts

@@ -38,6 +38,10 @@ import {
     RefreshTokenResult
 } from './IApp';
 import { UserRole } from './UserRole';
+import type CryptoJS from 'crypto-js';
+
+type CJType = typeof CryptoJS;
+let CJ: CJType;
 
 /**
  * Core application interface
@@ -266,15 +270,18 @@ export abstract class CoreApp<
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
 
-        // Restore
-        this.restore();
-
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
 
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            import('crypto-js'),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
 
     private getDeviceId() {
@@ -681,10 +688,7 @@ export abstract class CoreApp<
 
         // Overwrite the current value
         if (refreshToken !== '') {
-            if (refreshToken != null)
-                this.encrypt(refreshToken).then((result) =>
-                    this.storage.setData(this.fields.headerToken, result)
-                );
+            if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
             this.storage.setData(this.fields.headerToken, refreshToken);
         }
 
@@ -742,15 +746,14 @@ export abstract class CoreApp<
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(
-        culture: DataTypes.CultureDefinition,
-        onReady?: (resources: DataTypes.StringRecord) => void
-    ) {
+    async changeCulture(culture: DataTypes.CultureDefinition) {
         // Name
         const { name } = culture;
 
         // Same?
-        if (this._culture === name) return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
 
         // Save the cultrue to local storage
         this.storage.setPersistedData(DomUtils.CultureField, name);
@@ -765,16 +768,15 @@ export abstract class CoreApp<
         // Hold the current resources
         this.settings.currentCulture = culture;
 
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady) onReady(result);
-            });
-        } else {
-            this.updateRegionLabel();
-            if (onReady) onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+
+        return resources;
     }
 
     /**
@@ -826,12 +828,12 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    async decrypt(messageEncrypted: string, passphrase?: string) {
+    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');
+        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
 
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
@@ -862,7 +864,7 @@ export abstract class CoreApp<
      * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    async decryptEnhanced(
+    decryptEnhanced(
         messageEncrypted: string,
         passphrase?: string,
         durationSeconds?: number
@@ -895,7 +897,7 @@ export abstract class CoreApp<
                 timestamp
             );
 
-            return await this.decrypt(message, passphrase);
+            return this.decrypt(message, passphrase);
         } catch (e) {
             console.log('decryptEnhanced', e);
             return undefined;
@@ -949,13 +951,11 @@ export abstract class CoreApp<
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encrypt(message: string, passphrase?: string, iterations?: number) {
+    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 { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
 
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
@@ -985,11 +985,7 @@ export abstract class CoreApp<
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    async encryptEnhanced(
-        message: string,
-        passphrase?: string,
-        iterations?: number
-    ) {
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number) {
         // Timestamp
         const timestamp = Utils.numberToChars(new Date().getTime());
 
@@ -998,7 +994,7 @@ export abstract class CoreApp<
             timestamp
         );
 
-        const result = await this.encrypt(message, passphrase, iterations);
+        const result = this.encrypt(message, passphrase, iterations);
 
         return timestamp + '!' + result;
     }
@@ -1399,8 +1395,8 @@ export abstract class CoreApp<
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hash(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
+    hash(message: string, passphrase?: string) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else return HmacSHA512(message, passphrase).toString(enc.Base64);
@@ -1412,8 +1408,8 @@ export abstract class CoreApp<
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    async hashHex(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = await import('crypto-js');
+    hashHex(message: string, passphrase?: string) {
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else return HmacSHA512(message, passphrase).toString(enc.Hex);
@@ -1548,7 +1544,10 @@ export abstract class CoreApp<
     /**
      * Setup callback
      */
-    setup() {}
+    setup() {
+        // Restore
+        this.restore();
+    }
 
     /**
      * Signout
@@ -1610,9 +1609,7 @@ export abstract class CoreApp<
         if (keep) {
             this.authorize(user.token, refreshToken);
         } else {
-            this.encrypt(refreshToken).then(
-                (result) => (this.cachedRefreshToken = result)
-            );
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }

package/src/app/IApp.ts

@@ -214,12 +214,10 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
     changeCulture(
-        culture: DataTypes.CultureDefinition,
-        onReady?: (resources: DataTypes.StringRecord) => void
-    ): void;
+        culture: DataTypes.CultureDefinition
+    ): Promise<DataTypes.StringRecord>;
 
     /**
      * Check the action result is about device invalid
@@ -251,10 +249,7 @@ export interface IApp {
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(
-        messageEncrypted: string,
-        passphrase?: string
-    ): Promise<string | undefined>;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
 
     /**
      * Enhanced decrypt message
@@ -267,7 +262,7 @@ export interface IApp {
         messageEncrypted: string,
         passphrase?: string,
         durationSeconds?: number
-    ): Promise<string | undefined>;
+    ): string | undefined;
 
     /**
      * Detect IP data, call only one time
@@ -282,11 +277,7 @@ export interface IApp {
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(
-        message: string,
-        passphrase?: string,
-        iterations?: number
-    ): Promise<string>;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
 
     /**
      * Enhanced encrypt message
@@ -299,7 +290,7 @@ export interface IApp {
         message: string,
         passphrase?: string,
         iterations?: number
-    ): Promise<string>;
+    ): string;
 
     /**
      * Format date to string
@@ -504,7 +495,7 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hash(message: string, passphrase?: string): Promise<string>;
+    hash(message: string, passphrase?: string): string;
 
     /**
      * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
@@ -512,7 +503,7 @@ export interface IApp {
      * @param message Message
      * @param passphrase Secret passphrase
      */
-    hashHex(message: string, passphrase?: string): Promise<string>;
+    hashHex(message: string, passphrase?: string): string;
 
     /**
      * Check use has the specific role permission or not