@etsoo/appscript 1.2.58 → 1.2.59

package/lib/cjs/app/CoreApp.js

@@ -488,19 +488,25 @@ class CoreApp {
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations))
             return undefined;
-        const salt = crypto_js_1.enc.Hex.parse(messageEncrypted.substring(2, 34));
-        const iv = crypto_js_1.enc.Hex.parse(messageEncrypted.substring(34, 66));
-        const encrypted = messageEncrypted.substring(66);
-        const key = (0, crypto_js_1.PBKDF2)(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-            keySize: 8,
-            hasher: crypto_js_1.algo.SHA256,
-            iterations: 1000 * iterations
-        });
-        return crypto_js_1.AES.decrypt(encrypted, key, {
-            iv,
-            padding: crypto_js_1.pad.Pkcs7,
-            mode: crypto_js_1.mode.CBC
-        }).toString(crypto_js_1.enc.Utf8);
+        try {
+            const salt = crypto_js_1.enc.Hex.parse(messageEncrypted.substring(2, 34));
+            const iv = crypto_js_1.enc.Hex.parse(messageEncrypted.substring(34, 66));
+            const encrypted = messageEncrypted.substring(66);
+            const key = (0, crypto_js_1.PBKDF2)(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
+                keySize: 8,
+                hasher: crypto_js_1.algo.SHA256,
+                iterations: 1000 * iterations
+            });
+            return crypto_js_1.AES.decrypt(encrypted, key, {
+                iv,
+                padding: crypto_js_1.pad.Pkcs7,
+                mode: crypto_js_1.mode.CBC
+            }).toString(crypto_js_1.enc.Utf8);
+        }
+        catch (e) {
+            console.log('decrypt', e);
+            return undefined;
+        }
     }
     /**
      * Enhanced decrypt message
@@ -516,20 +522,26 @@ class CoreApp {
         if (pos < 8 || messageEncrypted.length <= 66)
             return undefined;
         const timestamp = messageEncrypted.substring(0, pos);
-        if (durationSeconds != null && durationSeconds > 0) {
-            const milseconds = shared_1.Utils.charsToNumber(timestamp);
-            if (isNaN(milseconds) || milseconds < 1)
-                return undefined;
-            const timespan = new Date().substract(new Date(milseconds));
-            if ((durationSeconds <= 12 &&
-                timespan.totalMonths > durationSeconds) ||
-                (durationSeconds > 12 &&
-                    timespan.totalSeconds > durationSeconds))
-                return undefined;
+        try {
+            if (durationSeconds != null && durationSeconds > 0) {
+                const milseconds = shared_1.Utils.charsToNumber(timestamp);
+                if (isNaN(milseconds) || milseconds < 1)
+                    return undefined;
+                const timespan = new Date().substract(new Date(milseconds));
+                if ((durationSeconds <= 12 &&
+                    timespan.totalMonths > durationSeconds) ||
+                    (durationSeconds > 12 &&
+                        timespan.totalSeconds > durationSeconds))
+                    return undefined;
+            }
+            const message = messageEncrypted.substring(pos + 1);
+            passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+            return this.decrypt(message, passphrase);
+        }
+        catch (e) {
+            console.log('decryptEnhanced', e);
+            return undefined;
         }
-        const message = messageEncrypted.substring(pos + 1);
-        passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        return this.decrypt(message, passphrase);
     }
     /**
      * Detect IP data, call only one time

package/lib/cjs/i18n/en-US.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
     "done": "Done",
+    "download": "Download",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",

package/lib/cjs/i18n/zh-CN.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
     "done": "完成",
+    "download": "下载",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",

package/lib/cjs/i18n/zh-HK.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
     "done": "完成",
+    "download": "下載",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",

package/lib/mjs/app/CoreApp.js

@@ -485,19 +485,25 @@ export class CoreApp {
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations))
             return undefined;
-        const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
-        const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
-        const encrypted = messageEncrypted.substring(66);
-        const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-            keySize: 8,
-            hasher: algo.SHA256,
-            iterations: 1000 * iterations
-        });
-        return AES.decrypt(encrypted, key, {
-            iv,
-            padding: pad.Pkcs7,
-            mode: mode.CBC
-        }).toString(enc.Utf8);
+        try {
+            const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
+            const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
+            const encrypted = messageEncrypted.substring(66);
+            const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
+                keySize: 8,
+                hasher: algo.SHA256,
+                iterations: 1000 * iterations
+            });
+            return AES.decrypt(encrypted, key, {
+                iv,
+                padding: pad.Pkcs7,
+                mode: mode.CBC
+            }).toString(enc.Utf8);
+        }
+        catch (e) {
+            console.log('decrypt', e);
+            return undefined;
+        }
     }
     /**
      * Enhanced decrypt message
@@ -513,20 +519,26 @@ export class CoreApp {
         if (pos < 8 || messageEncrypted.length <= 66)
             return undefined;
         const timestamp = messageEncrypted.substring(0, pos);
-        if (durationSeconds != null && durationSeconds > 0) {
-            const milseconds = Utils.charsToNumber(timestamp);
-            if (isNaN(milseconds) || milseconds < 1)
-                return undefined;
-            const timespan = new Date().substract(new Date(milseconds));
-            if ((durationSeconds <= 12 &&
-                timespan.totalMonths > durationSeconds) ||
-                (durationSeconds > 12 &&
-                    timespan.totalSeconds > durationSeconds))
-                return undefined;
+        try {
+            if (durationSeconds != null && durationSeconds > 0) {
+                const milseconds = Utils.charsToNumber(timestamp);
+                if (isNaN(milseconds) || milseconds < 1)
+                    return undefined;
+                const timespan = new Date().substract(new Date(milseconds));
+                if ((durationSeconds <= 12 &&
+                    timespan.totalMonths > durationSeconds) ||
+                    (durationSeconds > 12 &&
+                        timespan.totalSeconds > durationSeconds))
+                    return undefined;
+            }
+            const message = messageEncrypted.substring(pos + 1);
+            passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+            return this.decrypt(message, passphrase);
+        }
+        catch (e) {
+            console.log('decryptEnhanced', e);
+            return undefined;
         }
-        const message = messageEncrypted.substring(pos + 1);
-        passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        return this.decrypt(message, passphrase);
     }
     /**
      * Detect IP data, call only one time

package/lib/mjs/i18n/en-US.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
     "done": "Done",
+    "download": "Download",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",

package/lib/mjs/i18n/zh-CN.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
     "done": "完成",
+    "download": "下载",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",

package/lib/mjs/i18n/zh-HK.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
     "done": "完成",
+    "download": "下載",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.58",
+    "version": "1.2.59",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.2",
         "@etsoo/restclient": "^1.0.65",
-        "@etsoo/shared": "^1.1.15",
+        "@etsoo/shared": "^1.1.16",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -1143,21 +1143,26 @@ export abstract class CoreApp<
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations)) return undefined;
 
-        const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
-        const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
-        const encrypted = messageEncrypted.substring(66);
-
-        const key = PBKDF2(passphrase ?? this.passphrase, salt, {
-            keySize: 8, // 256 / 32
-            hasher: algo.SHA256,
-            iterations: 1000 * iterations
-        });
-
-        return AES.decrypt(encrypted, key, {
-            iv,
-            padding: pad.Pkcs7,
-            mode: mode.CBC
-        }).toString(enc.Utf8);
+        try {
+            const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
+            const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
+            const encrypted = messageEncrypted.substring(66);
+
+            const key = PBKDF2(passphrase ?? this.passphrase, salt, {
+                keySize: 8, // 256 / 32
+                hasher: algo.SHA256,
+                iterations: 1000 * iterations
+            });
+
+            return AES.decrypt(encrypted, key, {
+                iv,
+                padding: pad.Pkcs7,
+                mode: mode.CBC
+            }).toString(enc.Utf8);
+        } catch (e) {
+            console.log('decrypt', e);
+            return undefined;
+        }
     }
 
     /**
@@ -1180,26 +1185,31 @@ export abstract class CoreApp<
 
         const timestamp = messageEncrypted.substring(0, pos);
 
-        if (durationSeconds != null && durationSeconds > 0) {
-            const milseconds = Utils.charsToNumber(timestamp);
-            if (isNaN(milseconds) || milseconds < 1) return undefined;
-            const timespan = new Date().substract(new Date(milseconds));
-            if (
-                (durationSeconds <= 12 &&
-                    timespan.totalMonths > durationSeconds) ||
-                (durationSeconds > 12 &&
-                    timespan.totalSeconds > durationSeconds)
-            )
-                return undefined;
-        }
+        try {
+            if (durationSeconds != null && durationSeconds > 0) {
+                const milseconds = Utils.charsToNumber(timestamp);
+                if (isNaN(milseconds) || milseconds < 1) return undefined;
+                const timespan = new Date().substract(new Date(milseconds));
+                if (
+                    (durationSeconds <= 12 &&
+                        timespan.totalMonths > durationSeconds) ||
+                    (durationSeconds > 12 &&
+                        timespan.totalSeconds > durationSeconds)
+                )
+                    return undefined;
+            }
 
-        const message = messageEncrypted.substring(pos + 1);
-        passphrase = this.encryptionEnhance(
-            passphrase ?? this.passphrase,
-            timestamp
-        );
+            const message = messageEncrypted.substring(pos + 1);
+            passphrase = this.encryptionEnhance(
+                passphrase ?? this.passphrase,
+                timestamp
+            );
 
-        return this.decrypt(message, passphrase);
+            return this.decrypt(message, passphrase);
+        } catch (e) {
+            console.log('decryptEnhanced', e);
+            return undefined;
+        }
     }
 
     /**

package/src/i18n/en-US.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
     "done": "Done",
+    "download": "Download",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",

package/src/i18n/zh-CN.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
     "done": "完成",
+    "download": "下载",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",

package/src/i18n/zh-HK.json

@@ -32,6 +32,7 @@
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
     "done": "完成",
+    "download": "下載",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",