selfstore 1.8.33 → 1.8.35

package/dist/{chunk-AFBPJ7KA.js → chunk-SHX36MIE.js}

@@ -1,5 +1,5 @@
-import { createNode, createMeta, gcTombstones, stamp, merge, unsyncableCounts, idPathFor, detectConflicts, changes } from './chunk-A2RRJLIF.js';
-import { inspect, checkPasswordPolicy, writeBox, BACKUP_MIME, readBoxWithSync, asBytes } from './chunk-7U5XMKVP.js';
+import { createNode, createMeta, gcTombstones, stamp, merge, unsyncableCounts, idPathFor, detectConflicts, changes } from './chunk-3P2W3XQD.js';
+import { inspect, checkPasswordPolicy, writeBox, BACKUP_MIME, readBoxWithSync, asBytes } from './chunk-E4S77JSN.js';
 import { seal, isEnvelope, unseal, newDeviceKey } from './chunk-QBCU7OOP.js';
 import { openManifest, GROUP_KEYING } from './chunk-F4ZZEJ5H.js';
 import { mintSlot, MAX_KEY_SLOTS, mintExternalSlot, openSlot } from './chunk-H2T4S3KM.js';
@@ -253,8 +253,12 @@ function createLocalStore(opts) {
     subs.forEach((f) => f());
   };
   const locked = () => durableKind() && encrypted && !pass && !envelope && !group;
-  const ownGroupRead = () => group ? { identity: group.identity, authors: [group.identity.sigPub] } : void 0;
-  const peerGroupRead = () => group ? { identity: group.identity, authors: group.manifest.members.map((m) => m.sig) } : void 0;
+  const ownGroupRead = () => group ? { identity: group.identity, authors: [group.identity.sigPub], group: group.manifest.group } : void 0;
+  const peerGroupRead = () => group ? {
+    identity: group.identity,
+    authors: group.manifest.members.map((m) => m.sig),
+    group: group.manifest.group
+  } : void 0;
   const groupSeqKey = (id) => `groupSeq:${id}`;
   async function persistGroupSeq(id, seq) {
     await kv.set(groupSeqKey(id), seq);
@@ -286,22 +290,25 @@ function createLocalStore(opts) {
     if (p === null) envelope = null;
     armIdleLock();
   }
-  const toCachedFiles = (snap) => snap.files.map((f) => ({
-    id: f.id,
-    name: f.name,
-    mime: f.mime,
-    blob: new Blob([f.bytes], { type: f.mime })
-  }));
+  const blobOf = /* @__PURE__ */ new WeakMap();
+  const blobFor = (f) => {
+    let blob = blobOf.get(f.bytes);
+    if (!blob) {
+      blob = new Blob([f.bytes], { type: f.mime });
+      blobOf.set(f.bytes, blob);
+    }
+    return blob;
+  };
+  const toCachedFiles = (snap) => snap.files.map((f) => ({ id: f.id, name: f.name, mime: f.mime, blob: blobFor(f) }));
   async function cachedToSnapshot(local) {
     return {
       collections: local.collections,
       files: await Promise.all(
-        local.files.map(async (f) => ({
-          id: f.id,
-          name: f.name,
-          mime: f.mime,
-          bytes: new Uint8Array(await f.blob.arrayBuffer())
-        }))
+        local.files.map(async (f) => {
+          const bytes = new Uint8Array(await f.blob.arrayBuffer());
+          blobOf.set(bytes, f.blob);
+          return { id: f.id, name: f.name, mime: f.mime, bytes };
+        })
       )
     };
   }
@@ -349,7 +356,8 @@ function createLocalStore(opts) {
       recipients: [
         .../* @__PURE__ */ new Set([...group.manifest.members.map((m) => m.enc), group.identity.encPub])
       ],
-      sign: { pub: group.identity.sigPub, priv: group.identity.sigPriv }
+      sign: { pub: group.identity.sigPub, priv: group.identity.sigPriv },
+      id: group.manifest.group
     } : void 0;
     const bytes = await writeBox(
       { collections: snap.collections, files: snap.files },
@@ -1894,6 +1902,24 @@ function memoryCache() {
 var COLLECTIONS_KEY = "__collections";
 var DEVICE_KEY = "__deviceKey";
 var CACHE_KDF = "__cacheKdf";
+async function sealFile(k, meta, bytes) {
+  const sealedMeta = await seal(k, new TextEncoder().encode(JSON.stringify(meta)));
+  return { meta: sealedMeta, ...await seal(k, bytes) };
+}
+async function openFileMeta(k, v) {
+  if (!("meta" in v)) return { name: v.name, mime: v.mime };
+  if (!isEnvelope(v.meta)) {
+    throw new SelfstoreError("BAD_FORMAT", "Unrecognized cache record (not a sealed envelope).");
+  }
+  const meta = JSON.parse(new TextDecoder().decode(await unseal(k, v.meta)));
+  if (typeof meta.name !== "string" || typeof meta.mime !== "string") {
+    throw new SelfstoreError(
+      "BAD_FORMAT",
+      "Unrecognized cache record (file name or type missing)."
+    );
+  }
+  return { name: meta.name, mime: meta.mime };
+}
 function indexedDbCache(name, opts) {
   let _db = null;
   const db = () => _db ??= openDB(name, 1, {
@@ -1930,8 +1956,10 @@ function indexedDbCache(name, opts) {
     if (!isEnvelope(v)) {
       throw new SelfstoreError("BAD_FORMAT", "Unrecognized cache record (not a sealed envelope).");
     }
-    const bytes = await unseal(await key(), v);
-    return { name: v.name, mime: v.mime, blob: new Blob([bytes], { type: v.mime }) };
+    const k = await key();
+    const { name: name2, mime } = await openFileMeta(k, v);
+    const bytes = await unseal(k, v);
+    return { name: name2, mime, blob: new Blob([bytes], { type: mime }) };
   }
   const kv = {
     async get(key2) {
@@ -1944,6 +1972,8 @@ function indexedDbCache(name, opts) {
       await (await db()).delete("kv", `m:${key2}`);
     }
   };
+  const written = /* @__PURE__ */ new Map();
+  const changed = (f, have) => !have.has(f.id) || written.has(f.id) && written.get(f.id) !== f.blob;
   const base = {
     kv,
     async load() {
@@ -1962,7 +1992,10 @@ function indexedDbCache(name, opts) {
       const files = [];
       for (const fileKey of await d.getAllKeys("files")) {
         const v = await d.get("files", fileKey);
-        if (v) files.push({ id: String(fileKey), ...await decodeFile(v) });
+        if (!v) continue;
+        const file = { id: String(fileKey), ...await decodeFile(v) };
+        written.set(file.id, file.blob);
+        files.push(file);
       }
       return { collections, files };
     },
@@ -1977,20 +2010,23 @@ function indexedDbCache(name, opts) {
       const want = new Set(files.map((f) => f.id));
       const k = await key();
       const fresh = await Promise.all(
-        files.filter((f) => !have.has(f.id)).map(async (f) => {
-          const env = await seal(k, new Uint8Array(await f.blob.arrayBuffer()));
-          return { id: f.id, rec: { name: f.name, mime: f.mime, ...env } };
+        files.filter((f) => changed(f, have)).map(async (f) => {
+          const bytes = new Uint8Array(await f.blob.arrayBuffer());
+          return { id: f.id, rec: await sealFile(k, { name: f.name, mime: f.mime }, bytes) };
         })
       );
       const tx = d.transaction("files", "readwrite");
       for (const { id, rec } of fresh) tx.store.put(rec, id);
       for (const id of have) if (!want.has(id)) tx.store.delete(id);
       await tx.done;
+      written.clear();
+      for (const f of files) written.set(f.id, f.blob);
     },
     async clear() {
       const d = await db();
       await d.clear("kv");
       await d.clear("files");
+      written.clear();
       _key = null;
       sealKey = null;
     },
@@ -2031,11 +2067,8 @@ function indexedDbCache(name, opts) {
       for (const fileKey of await d.getAllKeys("files")) {
         const v = await d.get("files", fileKey);
         if (!v) continue;
-        const bytes = await unseal(previous, v);
-        files.push({
-          id: fileKey,
-          rec: { name: v.name, mime: v.mime, ...await seal(next, bytes) }
-        });
+        const meta = await openFileMeta(previous, v);
+        files.push({ id: fileKey, rec: await sealFile(next, meta, await unseal(previous, v)) });
       }
       const tx = d.transaction(["kv", "files"], "readwrite");
       const store = tx.objectStore("kv");
@@ -2203,5 +2236,5 @@ function gisDriveAuth(opts) {
 }
 
 export { RESERVED_STORE_MODES, createLocalStore, deriveStatus, gisDriveAuth, indexedDbCache, isLockableCache, isReservedStoreMode, memoryCache, preloadGoogleIdentity };
-//# sourceMappingURL=chunk-AFBPJ7KA.js.map
-//# sourceMappingURL=chunk-AFBPJ7KA.js.map
+//# sourceMappingURL=chunk-SHX36MIE.js.map
+//# sourceMappingURL=chunk-SHX36MIE.js.map