@etsoo/appscript 1.4.5 → 1.4.7

package/__tests__/app/CoreApp.ts

@@ -163,8 +163,8 @@ test('Tests for encrypt / decrypt', async () => {
     const passphrase = 'My password';
 
     // Act
-    const encrypted = await app.encrypt(input, passphrase);
-    const plain = await app.decrypt(encrypted, passphrase);
+    const encrypted = app.encrypt(input, passphrase);
+    const plain = app.decrypt(encrypted, passphrase);
     expect(plain).toEqual(input);
 });
 
@@ -174,8 +174,8 @@ test('Tests for encryptEnhanced / decryptEnhanced', async () => {
     const passphrase = 'My password';
 
     // Act
-    const encrypted = await app.encryptEnhanced(input, passphrase);
-    const plain = await app.decryptEnhanced(encrypted, passphrase);
+    const encrypted = app.encryptEnhanced(input, passphrase);
+    const plain = app.decryptEnhanced(encrypted, passphrase);
     expect(plain).toEqual(input);
 });
 

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
      */

package/lib/cjs/app/CoreApp.js

@@ -35,7 +35,6 @@ const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
 let CJ;
-Promise.resolve().then(() => __importStar(require('crypto-js'))).then((result) => (CJ = result));
 /**
  * Core application
  */
@@ -153,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);
@@ -220,7 +223,7 @@ class CoreApp {
         const passphraseEncrypted = this.storage.getData(this.fields.devicePassphrase);
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(passphraseEncrypted, this.name);
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
@@ -398,7 +401,7 @@ class CoreApp {
             return false;
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(data.passphrase, timestamp.toString());
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null)
             return false;
         // Update device id and cache it
@@ -410,10 +413,10 @@ class CoreApp {
         this.storage.setPersistedData(this.fields.devices, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(this.fields.devicePassphrase, await this.encrypt(passphrase, this.name));
+        this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(data.previousPassphrase, timestamp.toString());
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
@@ -428,10 +431,10 @@ class CoreApp {
                 const enhanced = currentValue.indexOf('!') >= 8;
                 let newValueSource;
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(currentValue, prev, 12);
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
                 }
                 else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
                 if (newValueSource == null || newValueSource === '') {
                     // Reset the field
@@ -439,8 +442,8 @@ class CoreApp {
                     continue;
                 }
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 this.storage.setData(field, newValue);
             }
         }
@@ -527,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
@@ -542,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
@@ -1208,7 +1206,10 @@ class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL

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

package/lib/cjs/erp/AuthApi.js

@@ -26,15 +26,15 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    async loginId(id, payload) {
+    loginId(id, payload) {
         const { deviceId, region } = this.app;
-        id = await this.app.encrypt(id);
+        id = this.app.encrypt(id);
         const rq = {
             id,
             deviceId,
             region
         };
-        return await this.api.get('Auth/LoginId', rq, payload);
+        return this.api.get('Auth/LoginId', rq, payload);
     }
     /**
      * Reset password

package/lib/cjs/i18n/zhHans.js

@@ -30,7 +30,7 @@ const shared_1 = require("@etsoo/shared");
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHans = (resources) => shared_1.DomUtils.en(async () => {
+const zhHans = (resources) => shared_1.DomUtils.zhHans(async () => {
     const [r1, r2] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('./zh-Hans.json'))),
         new Promise((resolve) => {

package/lib/cjs/i18n/zhHant.js

@@ -30,7 +30,7 @@ const shared_1 = require("@etsoo/shared");
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHant = (resources) => shared_1.DomUtils.en(async () => {
+const zhHant = (resources) => shared_1.DomUtils.zhHant(async () => {
     const [r1, r2] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('./zh-Hant.json'))),
         new Promise((resolve) => {

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
      */

package/lib/mjs/app/CoreApp.js

@@ -9,7 +9,6 @@ import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
 let CJ;
-import('crypto-js').then((result) => (CJ = result));
 /**
  * Core application
  */
@@ -127,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);
@@ -194,7 +197,7 @@ export class CoreApp {
         const passphraseEncrypted = this.storage.getData(this.fields.devicePassphrase);
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(passphraseEncrypted, this.name);
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
@@ -372,7 +375,7 @@ export class CoreApp {
             return false;
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(data.passphrase, timestamp.toString());
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null)
             return false;
         // Update device id and cache it
@@ -384,10 +387,10 @@ export class CoreApp {
         this.storage.setPersistedData(this.fields.devices, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(this.fields.devicePassphrase, await this.encrypt(passphrase, this.name));
+        this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(data.previousPassphrase, timestamp.toString());
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
@@ -402,10 +405,10 @@ export class CoreApp {
                 const enhanced = currentValue.indexOf('!') >= 8;
                 let newValueSource;
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(currentValue, prev, 12);
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
                 }
                 else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
                 if (newValueSource == null || newValueSource === '') {
                     // Reset the field
@@ -413,8 +416,8 @@ export class CoreApp {
                     continue;
                 }
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 this.storage.setData(field, newValue);
             }
         }
@@ -501,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
@@ -516,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
@@ -1182,7 +1180,10 @@ export class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL

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

package/lib/mjs/erp/AuthApi.js

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

package/lib/mjs/i18n/zhHans.js

@@ -4,7 +4,7 @@ import { DomUtils } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (resources) => DomUtils.en(async () => {
+export const zhHans = (resources) => DomUtils.zhHans(async () => {
     const [r1, r2] = await Promise.all([
         import('./zh-Hans.json'),
         new Promise((resolve) => {

package/lib/mjs/i18n/zhHant.js

@@ -4,7 +4,7 @@ import { DomUtils } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (resources) => DomUtils.en(async () => {
+export const zhHant = (resources) => DomUtils.zhHant(async () => {
     const [r1, r2] = await Promise.all([
         import('./zh-Hant.json'),
         new Promise((resolve) => {

package/package.json

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

package/src/app/CoreApp.ts

@@ -42,7 +42,6 @@ import type CryptoJS from 'crypto-js';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
-import('crypto-js').then((result) => (CJ = result));
 
 /**
  * Core application interface
@@ -271,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() {
@@ -360,7 +362,7 @@ export abstract class CoreApp<
         );
         if (passphraseEncrypted) {
             // this.name to identifier different app's secret
-            const passphraseDecrypted = await this.decrypt(
+            const passphraseDecrypted = this.decrypt(
                 passphraseEncrypted,
                 this.name
             );
@@ -576,10 +578,7 @@ export abstract class CoreApp<
 
         // Decrypt
         // Should be done within 120 seconds after returning from the backend
-        const passphrase = await this.decrypt(
-            data.passphrase,
-            timestamp.toString()
-        );
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
         if (passphrase == null) return false;
 
         // Update device id and cache it
@@ -598,12 +597,12 @@ export abstract class CoreApp<
         this.passphrase = passphrase;
         this.storage.setData(
             this.fields.devicePassphrase,
-            await this.encrypt(passphrase, this.name)
+            this.encrypt(passphrase, this.name)
         );
 
         // Previous passphrase
         if (data.previousPassphrase) {
-            const prev = await this.decrypt(
+            const prev = this.decrypt(
                 data.previousPassphrase,
                 timestamp.toString()
             );
@@ -624,13 +623,13 @@ export abstract class CoreApp<
                 let newValueSource: string | undefined;
 
                 if (enhanced) {
-                    newValueSource = await this.decryptEnhanced(
+                    newValueSource = this.decryptEnhanced(
                         currentValue,
                         prev,
                         12
                     );
                 } else {
-                    newValueSource = await this.decrypt(currentValue, prev);
+                    newValueSource = this.decrypt(currentValue, prev);
                 }
 
                 if (newValueSource == null || newValueSource === '') {
@@ -640,8 +639,8 @@ export abstract class CoreApp<
                 }
 
                 const newValue = enhanced
-                    ? await this.encryptEnhanced(newValueSource)
-                    : await this.encrypt(newValueSource);
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
 
                 this.storage.setData(field, newValue);
             }
@@ -744,15 +743,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);
@@ -767,16 +765,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;
     }
 
     /**
@@ -1544,7 +1541,10 @@ export abstract class CoreApp<
     /**
      * Setup callback
      */
-    setup() {}
+    setup() {
+        // Restore
+        this.restore();
+    }
 
     /**
      * Signout

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

package/src/erp/AuthApi.ts

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

package/src/i18n/zhHans.ts

@@ -6,7 +6,7 @@ import { DataTypes, DomUtils } from '@etsoo/shared';
  * @returns Full culture
  */
 export const zhHans = (resources: object | (() => Promise<object>)) =>
-    DomUtils.en(async () => {
+    DomUtils.zhHans(async () => {
         const [r1, r2] = await Promise.all([
             import('./zh-Hans.json'),
             new Promise<object>((resolve) => {

package/src/i18n/zhHant.ts

@@ -6,7 +6,7 @@ import { DataTypes, DomUtils } from '@etsoo/shared';
  * @returns Full culture
  */
 export const zhHant = (resources: object | (() => Promise<object>)) =>
-    DomUtils.en(async () => {
+    DomUtils.zhHant(async () => {
         const [r1, r2] = await Promise.all([
             import('./zh-Hant.json'),
             new Promise<object>((resolve) => {