monoidentity 0.21.1 → 0.22.0

package/dist/+client.d.ts

@@ -1,4 +1,4 @@
-export * from "./+common.js";
+export * from "./_common.js";
 export { getLoginRecognized, relog, getVerification, getStorage, getScopedFS } from "./storage.js";
 export type { SyncStrategy } from "./storage/utils-storage.js";
 export { waitForSync } from "./storage/utils-sync.js";

package/dist/+client.js

@@ -1,4 +1,4 @@
-export * from "./+common.js";
+export * from "./_common.js";
 export { getLoginRecognized, relog, getVerification, getStorage, getScopedFS } from "./storage.js";
 export { waitForSync } from "./storage/utils-sync.js";
 export { retrieveVerification } from "./verification-client.js";

package/dist/+server.d.ts

@@ -1,2 +1,2 @@
-export * from "./+common.js";
+export * from "./_common.js";
 export { useVerification } from "./verification-server.js";

package/dist/+server.js

@@ -1,2 +1,2 @@
-export * from "./+common.js";
+export * from "./_common.js";
 export { useVerification } from "./verification-server.js";

package/dist/Monoidentity.svelte

@@ -5,12 +5,10 @@
   import type { SyncStrategy } from "./storage/utils-storage.js";
 
   let {
-    app,
     intents,
     getSyncStrategy,
     children,
   }: {
-    app: string;
     intents?: Intent[];
     getSyncStrategy: (path: string) => SyncStrategy;
     children: Snippet;
@@ -23,7 +21,6 @@
 
   let backup: (() => void) | undefined = $state();
   readyUp(
-    app,
     intents || [],
     getSyncStrategy,
     aborter.signal,

package/dist/Monoidentity.svelte.d.ts

@@ -2,7 +2,6 @@ import { type Snippet } from "svelte";
 import type { Intent } from "./utils-transport.js";
 import type { SyncStrategy } from "./storage/utils-storage.js";
 type $$ComponentProps = {
-    app: string;
     intents?: Intent[];
     getSyncStrategy: (path: string) => SyncStrategy;
     children: Snippet;

package/dist/client.d.ts

@@ -0,0 +1 @@
+declare const MONOIDENTITY_APP_ID: string;

package/dist/readyup.d.ts

@@ -1,3 +1,3 @@
 import { type Intent } from "./utils-transport.js";
 import type { SyncStrategy } from "./storage/utils-storage.js";
-export declare const readyUp: (app: string, intents: Intent[], getSyncStrategy: (path: string) => SyncStrategy, signal: AbortSignal, requestBackup: (startBackup: () => void) => void) => void;
+export declare const readyUp: (intents: Intent[], getSyncStrategy: (path: string) => SyncStrategy, signal: AbortSignal, requestBackup: (startBackup: () => void) => void) => void;

package/dist/readyup.js

@@ -2,15 +2,14 @@ import {} from "./utils-transport.js";
 // import { createLocalStorage } from "./storage/createlocalstorage.js";
 // import { wrapBackup } from "./storage/wrapbackup.js";
 // import { wrapCloud } from "./storage/wrapcloud.js";
-import { conf, setLoginRecognized } from "./storage.js";
+import { setLoginRecognized } from "./storage.js";
 import { pullFromLocalBackup } from "./storage/backuplocally-pull.js";
 import { mountLocalBackupPush } from "./storage/backuplocally-push.js";
 import { createCloudClient } from "./storage/backupcloud-connection.js";
 import { mountCloudPull, pullFromCloud } from "./storage/backupcloud-pull.js";
 import { mountCloudPush } from "./storage/backupcloud-push.js";
 import { switchToHub } from "./utils-hub.js";
-export const readyUp = (app, intents, getSyncStrategy, signal, requestBackup) => {
-    conf(app);
+export const readyUp = (intents, getSyncStrategy, signal, requestBackup) => {
     let setup = localStorage["monoidentity-x/setup"]
         ? JSON.parse(localStorage["monoidentity-x/setup"])
         : undefined;
@@ -50,11 +49,11 @@ export const readyUp = (app, intents, getSyncStrategy, signal, requestBackup) =>
     }
     if (setup.method == "cloud") {
         const client = createCloudClient(setup);
-        void pullFromCloud(getSyncStrategy, setup, client)
+        void pullFromCloud(getSyncStrategy, client)
             .then(() => {
             signal.throwIfAborted();
-            mountCloudPull(getSyncStrategy, setup, client, signal);
-            mountCloudPush(getSyncStrategy, setup, client, signal);
+            mountCloudPull(getSyncStrategy, client, signal);
+            mountCloudPush(getSyncStrategy, client, signal);
         })
             .catch((err) => {
             console.error("[monoidentity cloud] pull failed", err);

package/dist/storage/backupcloud-connection.d.ts

@@ -1,3 +1,3 @@
 import type { Bucket } from "../utils-transport.js";
-import type { AwsFetch } from "./backupcloud-pull.js";
+export type AwsFetch = (path: string, options?: RequestInit) => Promise<Response>;
 export declare const createCloudClient: (bucket: Bucket) => AwsFetch;

package/dist/storage/backupcloud-connection.js

@@ -4,5 +4,6 @@ export const createCloudClient = (bucket) => {
         accessKeyId: bucket.accessKeyId,
         secretAccessKey: bucket.secretAccessKey,
     });
-    return (url, options) => awsClient.fetch(url, { ...options, aws: { signQuery: true } });
+    const base = bucket.base.endsWith("/") ? bucket.base : bucket.base + "/";
+    return (path, options) => awsClient.fetch(base + path, { ...options, aws: { signQuery: true } });
 };

package/dist/storage/backupcloud-pull.d.ts

@@ -1,6 +1,5 @@
-import type { Bucket } from "../utils-transport.js";
 import { type SyncStrategy } from "./utils-storage.js";
-export type AwsFetch = (url: string, options?: RequestInit) => Promise<Response>;
+import type { AwsFetch } from "./backupcloud-connection.js";
 export declare const setCloudCacheEntry: (key: string, etag: string, content: string) => Promise<void>;
-export declare const pullFromCloud: (getSyncStrategy: (path: string) => SyncStrategy, bucket: Bucket, client: AwsFetch) => Promise<void>;
-export declare const mountCloudPull: (getSyncStrategy: (path: string) => SyncStrategy, bucket: Bucket, client: AwsFetch, signal: AbortSignal) => () => void;
+export declare const pullFromCloud: (getSyncStrategy: (path: string) => SyncStrategy, client: AwsFetch) => Promise<void>;
+export declare const mountCloudPull: (getSyncStrategy: (path: string) => SyncStrategy, client: AwsFetch, signal: AbortSignal) => () => void;

package/dist/storage/backupcloud-pull.js

@@ -22,17 +22,17 @@ export const setCloudCacheEntry = async (key, etag, content) => {
     getCache()[key] = { etag, content };
     await saveCache();
 };
-const loadFromCloud = async (getSyncStrategy, base, client) => {
-    const cacheInit = initCache();
-    const listResp = await client(base);
+const listCloud = async (getSyncStrategy, client) => {
+    const listResp = await client("");
     if (!listResp.ok)
         throw new Error(`List bucket failed: ${listResp.status}`);
     const listXml = await listResp.text();
-    const objects = [...listXml.matchAll(/<Key>(.*?)<\/Key>.*?<ETag>(.*?)<\/ETag>/gs)]
+    return [...listXml.matchAll(/<Key>(.*?)<\/Key>.*?<ETag>(.*?)<\/ETag>/gs)]
         .map((m) => m.slice(1).map((s) => s.replaceAll("&quot;", `"`).replaceAll("&apos;", `'`)))
         .map(([key, etag]) => ({ key, etag: etag.replaceAll(`"`, "") }))
         .filter(({ key }) => getSyncStrategy(key));
-    await cacheInit;
+};
+const loadFromCloud = async (objects, client) => {
     const prevCache = getCache();
     const nextCache = {};
     const model = {};
@@ -44,7 +44,7 @@ const loadFromCloud = async (getSyncStrategy, base, client) => {
             return;
         }
         console.debug("[monoidentity cloud] loading", key);
-        const r = await client(`${base}/${key}`);
+        const r = await client(key);
         if (!r.ok)
             throw new Error(`Fetch ${key} failed: ${r.status}`);
         const content = await decodeCloudContent(key, r);
@@ -55,8 +55,11 @@ const loadFromCloud = async (getSyncStrategy, base, client) => {
     await saveCache();
     return model;
 };
-const _pullFromCloud = async (getSyncStrategy, bucket, client) => {
-    const remote = await loadFromCloud(getSyncStrategy, bucket.base, client);
+const _pullFromCloud = async (getSyncStrategy, client) => {
+    const cachePromise = initCache();
+    const objects = await listCloud(getSyncStrategy, client);
+    await cachePromise;
+    const remote = await loadFromCloud(objects, client);
     const local = storageClient();
     for (const key of Object.keys(local)) {
         if (key in remote)
@@ -71,15 +74,15 @@ const _pullFromCloud = async (getSyncStrategy, bucket, client) => {
         local[key] = value;
     }
 };
-export const pullFromCloud = async (getSyncStrategy, bucket, client) => {
-    const promise = _pullFromCloud(getSyncStrategy, bucket, client);
+export const pullFromCloud = async (getSyncStrategy, client) => {
+    const promise = _pullFromCloud(getSyncStrategy, client);
     addSync("*", promise);
     await promise;
 };
-export const mountCloudPull = (getSyncStrategy, bucket, client, signal) => {
+export const mountCloudPull = (getSyncStrategy, client, signal) => {
     signal.throwIfAborted();
     const syncIntervalId = setInterval(() => {
-        pullFromCloud(getSyncStrategy, bucket, client).catch((err) => {
+        pullFromCloud(getSyncStrategy, client).catch((err) => {
             console.error("[monoidentity cloud] pull failed", err);
         });
     }, 15 * 60 * 1000);

package/dist/storage/backupcloud-push.d.ts

@@ -1,4 +1,3 @@
-import type { Bucket } from "../utils-transport.js";
 import { type SyncStrategy } from "./utils-storage.js";
-import { type AwsFetch } from "./backupcloud-pull.js";
-export declare const mountCloudPush: (getSyncStrategy: (path: string) => SyncStrategy, bucket: Bucket, client: AwsFetch, signal: AbortSignal) => () => void;
+import type { AwsFetch } from "./backupcloud-connection.js";
+export declare const mountCloudPush: (getSyncStrategy: (path: string) => SyncStrategy, client: AwsFetch, signal: AbortSignal) => () => void;

package/dist/storage/backupcloud-push.js

@@ -3,11 +3,10 @@ import { addSync, scheduleSync } from "./utils-sync.js";
 import { shouldPersist } from "./utils-storage.js";
 import { setCloudCacheEntry } from "./backupcloud-pull.js";
 import { encodeCloudContent } from "./_backupcloud.js";
-const write = async (key, value, bucket, client) => {
+const write = async (key, value, client) => {
     console.debug("[monoidentity cloud] saving", key);
-    const url = `${bucket.base}/${key}`;
     if (value != undefined) {
-        const r = await client(url, {
+        const r = await client(key, {
             method: "PUT",
             headers: { "content-type": "application/octet-stream" },
             body: encodeCloudContent(key, value),
@@ -20,13 +19,13 @@ const write = async (key, value, bucket, client) => {
         }
         return;
     }
-    const r = await client(url, { method: "DELETE" });
+    const r = await client(key, { method: "DELETE" });
     if (!r.ok && r.status != 404)
         throw new Error(`DELETE ${key} failed: ${r.status}`);
 };
-export const mountCloudPush = (getSyncStrategy, bucket, client, signal) => {
+export const mountCloudPush = (getSyncStrategy, client, signal) => {
     signal.throwIfAborted();
-    const writeWrapped = async (key, value) => write(key, value, bucket, client).catch((err) => {
+    const writeWrapped = async (key, value) => write(key, value, client).catch((err) => {
         console.error("[monoidentity cloud] save failed", key, err);
     });
     const listener = (event) => {

package/dist/storage.d.ts

@@ -1,4 +1,3 @@
-export declare const conf: (a: string) => void;
 export declare const getLoginRecognized: () => {
     email: string;
     password: string;

package/dist/storage.js

@@ -6,10 +6,6 @@ import { verify } from "@tsndr/cloudflare-worker-jwt";
 import publicKey from "./verification/public-key.js";
 import { storageClient } from "./storage/storageclient.svelte.js";
 import { switchToHub } from "./utils-hub.js";
-let app = "unknown";
-export const conf = (a) => {
-    app = a;
-};
 const LOGIN_RECOGNIZED_PATH = ".local/login.encjson";
 export const getLoginRecognized = () => {
     const client = storageClient();
@@ -43,7 +39,7 @@ export const setVerification = (jwt) => {
     client[VERIFICATION_PATH] = jwt;
 };
 export const getStorage = (realm) => {
-    const prefix = `.${realm}/${app}/`;
+    const prefix = `.${realm}/${MONOIDENTITY_APP_ID}/`;
     return storageClient((key) => `${prefix}${key}.devalue`, (key) => (key.startsWith(prefix) ? key.slice(prefix.length, -".devalue".length) : undefined), stringify, parse);
 };
 export const getScopedFS = (dir) => storageClient((key) => `${dir}/${key}`, (key) => (key.startsWith(dir + "/") ? key.slice(dir.length + 1) : undefined));

package/package.json

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