@esportsplus/web-storage 0.1.27 → 0.1.28

package/build/local.d.ts

@@ -14,8 +14,8 @@ declare class Local<T> {
     filter(fn: Filter<T>): Promise<T>;
     get(key: keyof T): Promise<T[keyof T] | undefined>;
     only(...keys: (keyof T)[]): Promise<T>;
-    replace(values: T): Promise<void>;
-    set(key: keyof T, value: T[keyof T]): Promise<void>;
+    replace(values: T): Promise<string[]>;
+    set(key: keyof T, value: T[keyof T]): Promise<boolean>;
 }
 declare const _default: <T>(options: Options, secret?: string) => Local<T>;
 export default _default;

package/build/local.js

@@ -29,12 +29,7 @@ class Local {
             value = await decrypt(value, this.secret);
         }
         if (typeof value === 'string') {
-            try {
-                value = JSON.parse(value);
-            }
-            catch {
-                return undefined;
-            }
+            value = JSON.parse(value);
         }
         return value;
     }
@@ -51,12 +46,14 @@ class Local {
     async all() {
         let stack = [], values = {};
         await this.instance.iterate((v, k) => {
-            stack.push(this.deserialize(v).then((value) => {
+            stack.push(this.deserialize(v)
+                .then((value) => {
                 if (value === undefined) {
                     return;
                 }
                 values[k] = value;
-            }));
+            })
+                .catch(() => { }));
         });
         await Promise.allSettled(stack);
         return values;
@@ -76,7 +73,7 @@ class Local {
             stopped = true;
         }, stopped = false, values = {};
         await this.instance.iterate(async (v, k, i) => {
-            let key = k, value = await this.deserialize(v);
+            let key = k, value = await this.deserialize(v).catch(() => undefined);
             if (value === undefined) {
                 return;
             }
@@ -90,20 +87,32 @@ class Local {
         return values;
     }
     async get(key) {
-        return await this.deserialize(await this.instance.getItem(key));
+        return await this.deserialize(await this.instance.getItem(key)).catch(() => undefined);
     }
     async only(...keys) {
         return await this.filter(({ key }) => keys.includes(key));
     }
     async replace(values) {
-        let stack = [];
+        let failed = [], stack = [];
         for (let key in values) {
-            stack.push(this.set(key, values[key]));
+            stack.push(this.set(key, values[key])
+                .then((ok) => {
+                if (ok) {
+                    return;
+                }
+                failed.push(key);
+            }));
         }
         await Promise.allSettled(stack);
+        return failed;
     }
     async set(key, value) {
-        await this.instance.setItem(key, await this.serialize(value));
+        let ok = true;
+        await this.instance.setItem(key, await this.serialize(value).catch(() => {
+            ok = false;
+            return undefined;
+        }));
+        return ok;
     }
 }
 export default (options, secret) => new Local(options, secret);

package/package.json

@@ -1,12 +1,12 @@
 {
     "author": "ICJR",
     "dependencies": {
-        "@esportsplus/crypto": "^0.0.2",
+        "@esportsplus/crypto": "^0.0.4",
         "localforage": "^1.10.0"
     },
     "description": "Web storage utility",
     "devDependencies": {
-        "@esportsplus/webpack": "^0.0.81"
+        "@esportsplus/webpack": "^0.0.97"
     },
     "main": "build/index.js",
     "name": "@esportsplus/web-storage",
@@ -18,5 +18,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "build/index.d.ts",
-    "version": "0.1.27"
+    "version": "0.1.28"
 }

package/src/local.ts

@@ -40,12 +40,7 @@ class Local<T> {
         }
 
         if (typeof value === 'string') {
-            try {
-                value = JSON.parse(value);
-            }
-            catch {
-                return undefined;
-            }
+            value = JSON.parse(value);
         }
 
         return value as T[keyof T];
@@ -72,13 +67,15 @@ class Local<T> {
 
         await this.instance.iterate((v: unknown, k: string) => {
             stack.push(
-                this.deserialize(v).then((value) => {
-                    if (value === undefined) {
-                        return;
-                    }
-
-                    values[k as keyof T] = value;
-                })
+                this.deserialize(v)
+                    .then((value) => {
+                        if (value === undefined) {
+                            return;
+                        }
+
+                        values[k as keyof T] = value;
+                    })
+                    .catch(() => {})
             )
         });
 
@@ -110,7 +107,7 @@ class Local<T> {
 
         await this.instance.iterate(async (v, k, i) => {
             let key = k as keyof T,
-                value = await this.deserialize(v);
+                value = await this.deserialize(v).catch(() => undefined);
 
             if (value === undefined) {
                 return;
@@ -131,7 +128,7 @@ class Local<T> {
     }
 
     async get(key: keyof T) {
-        return await this.deserialize( await this.instance.getItem(key as string) );
+        return await this.deserialize( await this.instance.getItem(key as string) ).catch(() => undefined);
     }
 
     async only(...keys: (keyof T)[]) {
@@ -139,17 +136,39 @@ class Local<T> {
     }
 
     async replace(values: T) {
-        let stack: Promise<void>[] = [];
+        let failed: string[] = [],
+            stack: Promise<void>[] = [];
 
         for (let key in values) {
-            stack.push( this.set(key, values[key]) );
+            stack.push(
+                this.set(key, values[key])
+                    .then((ok) => {
+                        if (ok) {
+                            return;
+                        }
+
+                        failed.push(key);
+                    })
+            );
         }
 
         await Promise.allSettled(stack);
+
+        return failed;
     }
 
     async set(key: keyof T, value: T[keyof T]) {
-        await this.instance.setItem(key as string, await this.serialize(value));
+        let ok = true;
+
+        await this.instance.setItem(
+            key as string,
+            await this.serialize(value).catch(() => {
+                ok = false;
+                return undefined;
+            })
+        );
+
+        return ok;
     }
 }