@etsoo/appscript 1.4.76 → 1.4.77

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

@@ -116,6 +116,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     get isReady(): boolean;
     private set isReady(value);
     private _isTryingLogin;
+    private CJ;
     /**
      * Last called with token refresh
      */

package/lib/cjs/app/CoreApp.js

@@ -34,7 +34,6 @@ 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
  */
@@ -133,6 +132,7 @@ class CoreApp {
         this._authorized = false;
         this._isReady = false;
         this._isTryingLogin = false;
+        this.CJ = null;
         /**
          * Last called with token refresh
          */
@@ -173,7 +173,7 @@ class CoreApp {
             Promise.resolve().then(() => __importStar(require('crypto-js'))),
             this.changeCulture(currentCulture)
         ]).then(([cj, _resources]) => {
-            (CJ = cj), this.changeRegion(currentRegion);
+            (this.CJ = cj), this.changeRegion(currentRegion);
             this.setup();
         });
     }
@@ -673,7 +673,7 @@ class CoreApp {
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations))
             return undefined;
-        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { PBKDF2, algo, enc, AES, pad, mode } = this.CJ;
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
@@ -801,7 +801,7 @@ class CoreApp {
     encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
         iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = this.CJ;
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
@@ -1189,7 +1189,7 @@ class CoreApp {
      * @param passphrase Secret passphrase
      */
     hash(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else
@@ -1202,7 +1202,7 @@ class CoreApp {
      * @param passphrase Secret passphrase
      */
     hashHex(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else

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

@@ -116,6 +116,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     get isReady(): boolean;
     private set isReady(value);
     private _isTryingLogin;
+    private CJ;
     /**
      * Last called with token refresh
      */

package/lib/mjs/app/CoreApp.js

@@ -8,7 +8,6 @@ import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
-let CJ;
 /**
  * Core application
  */
@@ -107,6 +106,7 @@ export class CoreApp {
         this._authorized = false;
         this._isReady = false;
         this._isTryingLogin = false;
+        this.CJ = null;
         /**
          * Last called with token refresh
          */
@@ -147,7 +147,7 @@ export class CoreApp {
             import('crypto-js'),
             this.changeCulture(currentCulture)
         ]).then(([cj, _resources]) => {
-            (CJ = cj), this.changeRegion(currentRegion);
+            (this.CJ = cj), this.changeRegion(currentRegion);
             this.setup();
         });
     }
@@ -647,7 +647,7 @@ export class CoreApp {
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations))
             return undefined;
-        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { PBKDF2, algo, enc, AES, pad, mode } = this.CJ;
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
@@ -775,7 +775,7 @@ export class CoreApp {
     encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
         iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = this.CJ;
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
@@ -1163,7 +1163,7 @@ export class CoreApp {
      * @param passphrase Secret passphrase
      */
     hash(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else
@@ -1176,7 +1176,7 @@ export class CoreApp {
      * @param passphrase Secret passphrase
      */
     hashHex(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else

package/package.json

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

package/src/app/CoreApp.ts

@@ -43,7 +43,6 @@ import type CryptoJS from 'crypto-js';
 import { Currency } from '../business/Currency';
 
 type CJType = typeof CryptoJS;
-let CJ: CJType;
 
 /**
  * Core application interface
@@ -215,6 +214,8 @@ export abstract class CoreApp<
 
     private _isTryingLogin = false;
 
+    private CJ: CJType | null = null;
+
     /**
      * Last called with token refresh
      */
@@ -298,7 +299,7 @@ export abstract class CoreApp<
             import('crypto-js'),
             this.changeCulture(currentCulture)
         ]).then(([cj, _resources]) => {
-            (CJ = cj), this.changeRegion(currentRegion);
+            (this.CJ = cj), this.changeRegion(currentRegion);
             this.setup();
         });
     }
@@ -918,7 +919,7 @@ export abstract class CoreApp<
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations)) return undefined;
 
-        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { PBKDF2, algo, enc, AES, pad, mode } = this.CJ!;
 
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
@@ -1086,7 +1087,7 @@ export abstract class CoreApp<
         // Default 1 * 1000
         iterations ??= 1;
 
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = this.CJ!;
 
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
@@ -1552,7 +1553,7 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      */
     hash(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ!;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else return HmacSHA512(message, passphrase).toString(enc.Base64);
@@ -1565,7 +1566,7 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      */
     hashHex(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = CJ;
+        const { SHA3, enc, HmacSHA512 } = this.CJ!;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else return HmacSHA512(message, passphrase).toString(enc.Hex);