@etsoo/appscript 1.2.7 → 1.2.11

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

@@ -445,6 +445,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     private getDeviceId;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */

package/lib/cjs/app/CoreApp.js

@@ -126,42 +126,51 @@ class CoreApp {
     getDeviceId() {
         return this.deviceId.substring(0, 15);
     }
+    resetKeys() {
+        this.storage.clear([
+            CoreApp.devicePassphraseField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ], false);
+        this.passphrase = '';
+    }
     /**
      * Restore settings from persisted source
      */
     restore() {
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
-        if (this.deviceId) {
-            // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-            // Exists in the list?
-            const d = this.getDeviceId();
-            if (!devices.includes(d)) {
-                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
-                        devices.push(d);
-                        this.storage.setPersistedData(CoreApp.devicesField, devices);
-                        return false;
-                    }
-                }
-            }
-            else {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.storage.clear([
-                    CoreApp.devicePassphraseField,
-                    CoreApp.headerTokenField,
-                    CoreApp.serversideDeviceIdField
-                ], false);
-                this.passphrase = '';
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        if (this.deviceId === '') {
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            // Totally new, no data restored
+            if (this._deviceId === '')
+                return false;
+        }
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
+        }
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                // Add the device to the list
+                devices.push(d);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.passphrase = passphraseDecrypted;
+                return true;
             }
+            // Failed, reset keys
+            this.resetKeys();
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        return false;
     }
     /**
      * Persist settings to source when application exit
@@ -172,6 +181,7 @@ class CoreApp {
         if (devices != null) {
             const index = devices.indexOf(this.getDeviceId());
             if (index !== -1) {
+                // Remove current device from the list
                 devices.splice(index, 1);
                 this.storage.setPersistedData(CoreApp.devicesField, devices);
             }

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

@@ -37,6 +37,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +47,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

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

@@ -37,6 +37,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

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

@@ -37,6 +37,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

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

@@ -445,6 +445,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     private getDeviceId;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */

package/lib/mjs/app/CoreApp.js

@@ -123,42 +123,51 @@ export class CoreApp {
     getDeviceId() {
         return this.deviceId.substring(0, 15);
     }
+    resetKeys() {
+        this.storage.clear([
+            CoreApp.devicePassphraseField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ], false);
+        this.passphrase = '';
+    }
     /**
      * Restore settings from persisted source
      */
     restore() {
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
-        if (this.deviceId) {
-            // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-            // Exists in the list?
-            const d = this.getDeviceId();
-            if (!devices.includes(d)) {
-                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
-                        devices.push(d);
-                        this.storage.setPersistedData(CoreApp.devicesField, devices);
-                        return false;
-                    }
-                }
-            }
-            else {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.storage.clear([
-                    CoreApp.devicePassphraseField,
-                    CoreApp.headerTokenField,
-                    CoreApp.serversideDeviceIdField
-                ], false);
-                this.passphrase = '';
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        if (this.deviceId === '') {
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            // Totally new, no data restored
+            if (this._deviceId === '')
+                return false;
+        }
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
+        }
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                // Add the device to the list
+                devices.push(d);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.passphrase = passphraseDecrypted;
+                return true;
             }
+            // Failed, reset keys
+            this.resetKeys();
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        return false;
     }
     /**
      * Persist settings to source when application exit
@@ -169,6 +178,7 @@ export class CoreApp {
         if (devices != null) {
             const index = devices.indexOf(this.getDeviceId());
             if (index !== -1) {
+                // Remove current device from the list
                 devices.splice(index, 1);
                 this.storage.setPersistedData(CoreApp.devicesField, devices);
             }

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

@@ -37,6 +37,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +47,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

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

@@ -37,6 +37,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

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

@@ -37,6 +37,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.7",
+    "version": "1.2.11",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,8 +54,8 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.95",
         "@etsoo/restclient": "^1.0.63",
-        "@etsoo/shared": "^1.0.94",
-        "@types/crypto-js": "^4.0.2",
+        "@etsoo/shared": "^1.0.95",
+        "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
@@ -65,8 +65,8 @@
         "@babel/preset-env": "^7.16.5",
         "@babel/runtime-corejs3": "^7.16.5",
         "@types/jest": "^27.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.8.0",
-        "@typescript-eslint/parser": "^5.8.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.1",
+        "@typescript-eslint/parser": "^5.8.1",
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",

package/src/app/CoreApp.ts

@@ -654,60 +654,71 @@ export abstract class CoreApp<
         return this.deviceId.substring(0, 15);
     }
 
+    private resetKeys() {
+        this.storage.clear(
+            [
+                CoreApp.devicePassphraseField,
+                CoreApp.headerTokenField,
+                CoreApp.serversideDeviceIdField
+            ],
+            false
+        );
+        this.passphrase = '';
+    }
+
     /**
      * Restore settings from persisted source
      */
     protected restore() {
-        // Current device id, '' means new, or reload (not included) or duplicate (included)
-        if (this.deviceId) {
-            // Devices
-            const devices = this.storage.getPersistedData<string[]>(
-                CoreApp.devicesField,
-                []
-            );
+        // Devices
+        const devices = this.storage.getPersistedData<string[]>(
+            CoreApp.devicesField,
+            []
+        );
 
-            // Exists in the list?
-            const d = this.getDeviceId();
-            if (!devices.includes(d)) {
-                const passphraseEncrypted = this.storage.getData<string>(
-                    CoreApp.devicePassphraseField
-                );
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(
-                        passphraseEncrypted,
-                        this.name
-                    );
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
+        if (this.deviceId === '') {
+            // First vist, restore and keep the source
+            this.storage.copyFrom(this.persistedFields, false);
 
-                        devices.push(d);
-                        this.storage.setPersistedData(
-                            CoreApp.devicesField,
-                            devices
-                        );
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
 
-                        return false;
-                    }
-                }
-            } else {
-                // Duplicate tab, session data copied
-                // Remove the token, deviceId, and passphrase
-                this.storage.clear(
-                    [
-                        CoreApp.devicePassphraseField,
-                        CoreApp.headerTokenField,
-                        CoreApp.serversideDeviceIdField
-                    ],
-                    false
-                );
-                this.passphrase = '';
-            }
+            // Totally new, no data restored
+            if (this._deviceId === '') return false;
         }
 
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
+        // Device exists or not
+        const d = this.getDeviceId();
+        if (devices.includes(d)) {
+            // Duplicate tab, session data copied
+            // Remove the token, deviceId, and passphrase
+            this.resetKeys();
+            return false;
+        }
 
-        return true;
+        const passphraseEncrypted = this.storage.getData<string>(
+            CoreApp.devicePassphraseField
+        );
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(
+                passphraseEncrypted,
+                this.name
+            );
+            if (passphraseDecrypted != null) {
+                // Add the device to the list
+                devices.push(d);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+
+                this.passphrase = passphraseDecrypted;
+
+                return true;
+            }
+
+            // Failed, reset keys
+            this.resetKeys();
+        }
+
+        return false;
     }
 
     /**
@@ -721,6 +732,7 @@ export abstract class CoreApp<
         if (devices != null) {
             const index = devices.indexOf(this.getDeviceId());
             if (index !== -1) {
+                // Remove current device from the list
                 devices.splice(index, 1);
                 this.storage.setPersistedData(CoreApp.devicesField, devices);
             }

package/src/i18n/en-US.json

@@ -37,6 +37,7 @@
     "ok": "OK",
     "open": "Open",
     "openMenu": "Open menu",
+    "operationSucceeded": "Operation succeeded",
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
@@ -46,6 +47,7 @@
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",
+    "reports": "Reports",
     "resending": "Resending",
     "reset": "Reset",
     "rotateLeft": "Rotate left 90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "Scroll to top",
     "send": "Send",
     "setAsDefault": "Set as default",
+    "settings": "Settings",
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "status": "Status",

package/src/i18n/zh-CN.json

@@ -37,6 +37,7 @@
     "ok": "确定",
     "open": "打开",
     "openMenu": "打开菜单",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",
     "renew": "续费",
+    "reports": "统计报表",
     "resending": "重新发送",
     "reset": "重置",
     "rotateLeft": "左旋转90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到顶部",
     "send": "发送",
     "setAsDefault": "设为默认",
+    "settings": "系统设置",
     "signout": "退出",
     "smartERP": "司友云ERP",
     "status": "状态",

package/src/i18n/zh-HK.json

@@ -37,6 +37,7 @@
     "ok": "確定",
     "open": "打開",
     "openMenu": "打開菜單",
+    "operationSucceeded": "操作成功",
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
@@ -46,6 +47,7 @@
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",
     "renew": "續費",
+    "reports": "統計報表",
     "resending": "重新發送",
     "reset": "重置",
     "rotateLeft": "左旋轉90°",
@@ -54,6 +56,7 @@
     "scrollToTop": "回到頂部",
     "send": "發送",
     "setAsDefault": "設為默認",
+    "settings": "系統設置",
     "signout": "退出",
     "smartERP": "司友雲ERP",
     "status": "狀態",