monoidentity 0.17.0 → 0.17.2

package/dist/storage/backupcloud.js

@@ -2,9 +2,26 @@ import { AwsClient } from "aws4fetch";
 import { storageClient, STORAGE_EVENT } from "./storageclient.svelte.js";
 import { addToSync } from "../storage.js";
 import { shouldPersist, enqueueSync } from "./utils-storage.js";
-const CLOUD_CACHE_KEY = "monoidentity-x/cloud-cache";
+import { get, set } from "idb-keyval";
+import { store } from "./utils-idb.js";
+const CLOUD_CACHE_KEY = "cloud-cache";
 let unmount;
+let cache;
+const initCache = async () => {
+    cache = (await get(CLOUD_CACHE_KEY, store)) || {};
+};
+const getCache = () => {
+    if (!cache)
+        throw new Error("Cache not initialized");
+    return cache;
+};
+const saveCache = async () => {
+    if (!cache)
+        throw new Error("Cache not initialized");
+    await set(CLOUD_CACHE_KEY, cache, store);
+};
 const loadFromCloud = async (getSyncStrategy, base, client) => {
+    const cachePromise = initCache();
     const listResp = await client.fetch(base);
     if (!listResp.ok)
         throw new Error(`List bucket failed: ${listResp.status}`);
@@ -13,7 +30,8 @@ const loadFromCloud = async (getSyncStrategy, base, client) => {
         .map((m) => m.slice(1).map((s) => s.replaceAll(""", `"`).replaceAll("'", `'`)))
         .map(([key, etag]) => ({ key, etag: etag.replaceAll(`"`, "") }))
         .filter(({ key }) => getSyncStrategy(key).mode != "none");
-    const prevCache = JSON.parse(localStorage[CLOUD_CACHE_KEY] || "{}");
+    await cachePromise;
+    const prevCache = getCache();
     const nextCache = {};
     const model = {};
     await Promise.all(objects.map(async ({ key, etag }) => {
@@ -42,7 +60,8 @@ const loadFromCloud = async (getSyncStrategy, base, client) => {
         model[key] = content;
         nextCache[key] = { etag, content };
     }));
-    localStorage[CLOUD_CACHE_KEY] = JSON.stringify(nextCache);
+    cache = nextCache;
+    saveCache();
     return model;
 };
 const syncFromCloud = async (getSyncStrategy, bucket, client) => {
@@ -91,9 +110,8 @@ export const backupCloud = async (getSyncStrategy, bucket) => {
             // Update cache
             const etag = r.headers.get("etag")?.replaceAll('"', "");
             if (etag) {
-                const cache = JSON.parse(localStorage[CLOUD_CACHE_KEY] || "{}");
-                cache[key] = { etag, content: value };
-                localStorage[CLOUD_CACHE_KEY] = JSON.stringify(cache);
+                getCache()[key] = { etag, content: value };
+                saveCache();
             }
         }
         else {
@@ -101,9 +119,6 @@ export const backupCloud = async (getSyncStrategy, bucket) => {
             const r = await client.fetch(url, { method: "DELETE" });
             if (!r.ok && r.status != 404)
                 throw new Error(`DELETE ${key} failed: ${r.status}`);
-            const cache = JSON.parse(localStorage[CLOUD_CACHE_KEY] || "{}");
-            delete cache[key];
-            localStorage[CLOUD_CACHE_KEY] = JSON.stringify(cache);
         }
     };
     const writeWrapped = async (key, value) => write(key, value).catch((err) => {

package/dist/storage/backuplocally.js

@@ -1,7 +1,10 @@
-import { createStore, get, set } from "idb-keyval";
+import { get, set } from "idb-keyval";
 import { STORAGE_EVENT, storageClient } from "./storageclient.svelte.js";
 import { canBackup } from "../utils-localstorage.js";
 import { shouldPersist } from "./utils-storage.js";
+import { store } from "./utils-idb.js";
+const TOGGLE_KEY = "monoidentity-x/local-backup";
+const HANDLE_KEY = "backup-handle";
 let unmount;
 const saveToDir = (getSyncStrategy, dir) => {
     let dirCache = {};
@@ -55,22 +58,21 @@ const saveToDir = (getSyncStrategy, dir) => {
 export const backupLocally = async (getSyncStrategy, requestBackup) => {
     if (!canBackup)
         return;
-    if (localStorage["monoidentity-x/backup"] == "off")
+    if (localStorage[TOGGLE_KEY] == "off")
         return;
     unmount?.();
-    const handles = createStore("monoidentity-x", "handles");
-    if (localStorage["monoidentity-x/backup"] == "on") {
-        const dir = await get("backup", handles);
+    if (localStorage[TOGGLE_KEY] == "on") {
+        const dir = await get(HANDLE_KEY, store);
         if (!dir)
             throw new Error("No backup handle found");
         unmount = saveToDir(getSyncStrategy, dir);
     }
     else {
-        localStorage["monoidentity-x/backup"] = "off";
+        localStorage[TOGGLE_KEY] = "off";
         requestBackup(async () => {
             const dir = await showDirectoryPicker({ mode: "readwrite" });
-            await set("backup", dir, handles);
-            localStorage["monoidentity-x/backup"] = "on";
+            await set(HANDLE_KEY, dir, store);
+            localStorage[TOGGLE_KEY] = "on";
             // Restore from backup
             const backup = {};
             const traverse = async (d, path) => {

package/dist/storage/storageclient.svelte.js

@@ -65,8 +65,13 @@ export const storageClient = (prefix, unprefix, serialize, deserialize) => {
             key = prefix(key);
             if (serialize)
                 value = serialize(value);
-            localStorage[key] = value;
-            announce(key, value);
+            if (localStorage[key] != value) {
+                localStorage[key] = value;
+                announce(key, value);
+            }
+            else {
+                console.debug("[monoidentity storage] noop for", key);
+            }
             return true;
         },
         deleteProperty(_, key) {

package/dist/storage/utils-idb.d.ts

@@ -0,0 +1 @@
+export declare const store: import("idb-keyval").UseStore;

package/dist/storage/utils-idb.js

@@ -0,0 +1,2 @@
+import { createStore } from "idb-keyval";
+export const store = createStore("monoidentity-x", "keyval");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monoidentity",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "license": "ISC",
   "repository": "KTibow/monoidentity",
   "author": {