@etsoo/appscript 1.2.4 → 1.2.9

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

@@ -118,41 +118,59 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
     getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        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?
-            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
-                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
-                        return false;
-                    }
-                }
-            }
-            else {
-                // Remove passphrase
-                this.storage.setData(CoreApp.devicePassphraseField, undefined);
-                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
@@ -163,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/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

@@ -115,41 +115,59 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
     getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        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?
-            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
-                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
-                        return false;
-                    }
-                }
-            }
-            else {
-                // Remove passphrase
-                this.storage.setData(CoreApp.devicePassphraseField, undefined);
-                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
@@ -160,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/package.json

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

package/src/app/CoreApp.ts

@@ -606,6 +606,7 @@ export abstract class CoreApp<
     protected get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -650,46 +651,74 @@ export abstract class CoreApp<
     }
 
     private getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        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,
+            []
+        );
+
+        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<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);
 
-            // Exists in the list?
-            if (!devices?.includes(this.getDeviceId())) {
-                const passphraseEncrypted = this.storage.getData<string>(
-                    CoreApp.devicePassphraseField
-                );
-                if (passphraseEncrypted) {
-                    const passphraseDecrypted = this.decrypt(
-                        passphraseEncrypted,
-                        this.name
-                    );
-                    if (passphraseDecrypted != null) {
-                        this.passphrase = passphraseDecrypted;
-                        return false;
-                    }
-                }
-            } else {
-                // Remove passphrase
-                this.storage.setData(CoreApp.devicePassphraseField, undefined);
-                this.passphrase = '';
+                this.passphrase = passphraseDecrypted;
+
+                return true;
             }
-        }
 
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
+            // Failed, reset keys
+            this.resetKeys();
+        }
 
-        return true;
+        return false;
     }
 
     /**
@@ -703,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);
             }