monoidentity 0.12.4 → 0.13.0

package/dist/+client.d.ts

@@ -1,5 +1,5 @@
 export * from "./+common.js";
-export { getLoginRecognized, getVerification, getStorage, getScopedFS } from "./storage.js";
+export { getLoginRecognized, getVerification, getStorage, getScopedFS, completeSync, } from "./storage.js";
 export { retrieveVerification } from "./verification-client.js";
 export { default as rawAttest } from "./verification/attest-remote.js";
 export { trackReady } from "./trackready.js";

package/dist/+client.js

@@ -1,5 +1,5 @@
 export * from "./+common.js";
-export { getLoginRecognized, getVerification, getStorage, getScopedFS } from "./storage.js";
+export { getLoginRecognized, getVerification, getStorage, getScopedFS, completeSync, } from "./storage.js";
 export { retrieveVerification } from "./verification-client.js";
 export { default as rawAttest } from "./verification/attest-remote.js";
 export { trackReady } from "./trackready.js";

package/dist/storage/backupcloud.js

@@ -1,8 +1,10 @@
 import { AwsClient } from "aws4fetch";
 import { storageClient, STORAGE_EVENT } from "./storageclient.svelte.js";
+import { addToSync } from "../../src/lib/storage.js";
 const CLOUD_CACHE_KEY = "monoidentity-x/cloud-cache";
 const isJunk = (key) => key.includes(".obsidian/") || key.includes(".cache/");
 const keepAnyway = (key) => key.includes(".cache/");
+let unmount;
 const loadFromCloud = async (base, client) => {
     const listResp = await client.fetch(base);
     if (!listResp.ok)
@@ -59,14 +61,44 @@ const syncFromCloud = async (bucket, client) => {
     }
 };
 export const backupCloud = async (bucket) => {
+    unmount?.();
     const client = new AwsClient({
         accessKeyId: bucket.accessKeyId,
         secretAccessKey: bucket.secretAccessKey,
     });
     await syncFromCloud(bucket, client);
-    setInterval(() => syncFromCloud(bucket, client), 15 * 60 * 1000);
+    const syncIntervalId = setInterval(() => syncFromCloud(bucket, client), 15 * 60 * 1000);
     // Continuous sync: mirror local changes to cloud
-    addEventListener(STORAGE_EVENT, async (event) => {
+    const write = async (key, value) => {
+        const url = `${bucket.base}/${key}`;
+        if (value != undefined) {
+            // PUT content (unconditional to start; you can add If-Match/If-None-Match for safety)
+            const r = await client.fetch(url, {
+                method: "PUT",
+                headers: { "content-type": "application/octet-stream" },
+                body: value,
+            });
+            if (!r.ok)
+                throw new Error(`PUT ${key} failed: ${r.status}`);
+            // 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);
+            }
+        }
+        else {
+            // DELETE key
+            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 listener = (event) => {
         let key = event.detail.key;
         if (!key.startsWith("monoidentity/"))
             return;
@@ -74,37 +106,19 @@ export const backupCloud = async (bucket) => {
         if (isJunk(key))
             return;
         console.debug("[monoidentity cloud] saving", key);
-        const url = `${bucket.base}/${key}`;
-        try {
-            if (event.detail.value != undefined) {
-                // PUT content (unconditional to start; you can add If-Match/If-None-Match for safety)
-                const r = await client.fetch(url, {
-                    method: "PUT",
-                    headers: { "content-type": "application/octet-stream" },
-                    body: event.detail.value,
-                });
-                if (!r.ok)
-                    throw new Error(`PUT ${key} failed: ${r.status}`);
-                // Update cache
-                const etag = r.headers.get("etag")?.replaceAll('"', "");
-                if (etag) {
-                    const cache = JSON.parse(localStorage[CLOUD_CACHE_KEY] || "{}");
-                    cache[key] = { etag, content: event.detail.value };
-                    localStorage[CLOUD_CACHE_KEY] = JSON.stringify(cache);
-                }
-            }
-            else {
-                // DELETE key
-                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);
-            }
-        }
-        catch (err) {
-            console.warn("[monoidentity cloud] sync failed", key, err);
-        }
-    });
+        const promise = write(key, event.detail.value).catch((err) => {
+            console.warn("[monoidentity cloud] save failed", key, err);
+        });
+        addToSync(promise);
+    };
+    addEventListener(STORAGE_EVENT, listener);
+    unmount = () => {
+        clearInterval(syncIntervalId);
+        removeEventListener(STORAGE_EVENT, listener);
+    };
 };
+if (import.meta.hot) {
+    import.meta.hot.dispose(() => {
+        unmount?.();
+    });
+}

package/dist/storage/backuplocally.js

@@ -1,6 +1,7 @@
 import { createStore, get, set } from "idb-keyval";
 import { STORAGE_EVENT, storageClient } from "./storageclient.svelte.js";
 import { canBackup } from "../utils-transport.js";
+let unmount;
 const saveToDir = (dir) => {
     let dirCache = {};
     const getDirCached = async (route) => {
@@ -16,7 +17,7 @@ const saveToDir = (dir) => {
         }
         return parent;
     };
-    addEventListener(STORAGE_EVENT, async (event) => {
+    const listener = async (event) => {
         let key = event.detail.key;
         if (!key.startsWith("monoidentity/"))
             return;
@@ -35,19 +36,24 @@ const saveToDir = (dir) => {
         else {
             await parent.removeEntry(name);
         }
-    });
+    };
+    addEventListener(STORAGE_EVENT, listener);
+    return () => {
+        removeEventListener(STORAGE_EVENT, listener);
+    };
 };
 export const backupLocally = async (requestBackup) => {
     if (!canBackup)
         return;
     if (localStorage["monoidentity-x/backup"] == "off")
         return;
+    unmount?.();
     const handles = createStore("monoidentity-x", "handles");
     if (localStorage["monoidentity-x/backup"] == "on") {
         const dir = await get("backup", handles);
         if (!dir)
             throw new Error("No backup handle found");
-        saveToDir(dir);
+        unmount = saveToDir(dir);
     }
     else {
         localStorage["monoidentity-x/backup"] = "off";
@@ -79,7 +85,12 @@ export const backupLocally = async (requestBackup) => {
                 location.reload();
                 return;
             }
-            saveToDir(dir);
+            unmount = saveToDir(dir);
         });
     }
 };
+if (import.meta.hot) {
+    import.meta.hot.dispose(() => {
+        unmount?.();
+    });
+}

package/dist/storage.d.ts

@@ -1,4 +1,6 @@
 export declare const conf: (a: string) => void;
+export declare const addToSync: (p: Promise<void>) => void;
+export declare const completeSync: () => Promise<void>;
 export declare const getLoginRecognized: () => {
     email: string;
     password: string;

package/dist/storage.js

@@ -6,9 +6,14 @@ import { verify } from "@tsndr/cloudflare-worker-jwt";
 import publicKey from "./verification/public-key.js";
 import { storageClient } from "./storage/storageclient.svelte.js";
 let app = "unknown";
+let syncPromise = Promise.resolve();
 export const conf = (a) => {
     app = a;
 };
+export const addToSync = (p) => {
+    syncPromise = syncPromise.then(() => p);
+};
+export const completeSync = () => syncPromise;
 const LOGIN_RECOGNIZED_PATH = ".core/login.encjson";
 export const getLoginRecognized = () => {
     const client = storageClient();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monoidentity",
-  "version": "0.12.4",
+  "version": "0.13.0",
   "repository": "KTibow/monoidentity",
   "author": {
     "name": "KTibow"