fix: handle non-string values in SecureStorage changes gracefully

Author: atldays

src/providers/AbstractStorage.ts

@@ -221,7 +221,7 @@ export default abstract class AbstractStorage<T extends StorageState> implements
 
         return await callWithPromise<T[K] | undefined>(resolve => {
             this.storage.get(fullKey, result => {
-                resolve(result[fullKey]);
+                resolve(result[fullKey] as T[K] | undefined);
             });
         });
     }
@@ -278,12 +278,14 @@ export default abstract class AbstractStorage<T extends StorageState> implements
     protected async triggerChange<P extends T>(key: string, changes: StorageChange, options: StorageWatchOptions<P>) {
         const {newValue, oldValue} = changes;
 
-        const originalKey = this.getOriginalKey(key);
+        const originalKey = this.getOriginalKey(key) as keyof P;
+        const nextValue = newValue as P[keyof P] | undefined;
+        const prevValue = oldValue as P[keyof P] | undefined;
 
         if (typeof options === "function") {
-            options(newValue, oldValue, originalKey);
+            options(nextValue, prevValue, originalKey);
         } else if (options[originalKey]) {
-            options[originalKey]?.(newValue, oldValue);
+            options[originalKey]?.(nextValue, prevValue);
         }
     }
 

src/providers/SecureStorage.test.ts

@@ -207,6 +207,32 @@ describe("watch method", () => {
         expect(globalCallback).toHaveBeenCalledWith(80, 50, "volume");
         expect(globalCallback).toHaveBeenCalledWith("dark", "light", "theme");
     });
+
+    test("ignores non-string storage change values without logging watch errors", async () => {
+        const keyCallback = jest.fn();
+        const globalCallback = jest.fn();
+        const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation(() => {});
+
+        try {
+            securedStorage.watch({theme: keyCallback});
+            securedStorage.watch(globalCallback);
+
+            global.simulateStorageChange({
+                storage: securedStorage,
+                key: "theme",
+                oldValue: null,
+                newValue: {theme: "dark"},
+            });
+
+            await new Promise(resolve => setTimeout(resolve));
+
+            expect(keyCallback).toHaveBeenCalledWith(undefined, undefined);
+            expect(globalCallback).toHaveBeenCalledWith(undefined, undefined, "theme");
+            expect(consoleErrorSpy).not.toHaveBeenCalled();
+        } finally {
+            consoleErrorSpy.mockRestore();
+        }
+    });
 });
 
 // Static factory methods tests migrated from AbstractStorage.static.test.ts

src/providers/SecureStorage.ts

@@ -110,8 +110,8 @@ export default class SecureStorage<T extends StorageState> extends AbstractStora
         changes: StorageChange,
         options: StorageWatchOptions<P>
     ): Promise<void> {
-        const newValue = changes.newValue !== undefined ? await this.decrypt(changes.newValue) : undefined;
-        const oldValue = changes.oldValue !== undefined ? await this.decrypt(changes.oldValue) : undefined;
+        const newValue = typeof changes.newValue === "string" ? await this.decrypt(changes.newValue) : undefined;
+        const oldValue = typeof changes.oldValue === "string" ? await this.decrypt(changes.oldValue) : undefined;
 
         await this.triggerChange(key, {newValue, oldValue}, options);
     }

tests/jest.storage.setup.ts

@@ -131,10 +131,12 @@ const createStorageArea = (): chrome.storage.StorageArea => {
     return area;
 };
 
-chrome.storage.local = createStorageArea() as chrome.storage.LocalStorageArea;
-chrome.storage.sync = createStorageArea() as chrome.storage.SyncStorageArea;
-chrome.storage.managed = createStorageArea();
-chrome.storage.session = createStorageArea() as chrome.storage.SessionStorageArea;
+Object.defineProperties(chrome.storage, {
+    local: {value: createStorageArea() as chrome.storage.LocalStorageArea, writable: true, configurable: true},
+    sync: {value: createStorageArea() as chrome.storage.SyncStorageArea, writable: true, configurable: true},
+    managed: {value: createStorageArea(), writable: true, configurable: true},
+    session: {value: createStorageArea() as chrome.storage.SessionStorageArea, writable: true, configurable: true},
+});
 
 chrome.storage.onChanged.addListener = jest.fn(cb => listeners.add(cb));
 chrome.storage.onChanged.removeListener = jest.fn(cb => listeners.delete(cb));