tablinum 0.7.0 → 0.8.0

package/dist/index.js

@@ -547,30 +547,6 @@ function resolveWinner(existing, incoming) {
 function isPlainObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-function deepDiff(before, after) {
-  const result = {};
-  let hasChanges = false;
-  for (const key of Object.keys(after)) {
-    const a = before[key];
-    const b = after[key];
-    if (isPlainObject(a) && isPlainObject(b)) {
-      const nested = deepDiff(a, b);
-      if (nested !== null) {
-        result[key] = nested;
-        hasChanges = true;
-      }
-    } else if (Array.isArray(a) && Array.isArray(b)) {
-      if (JSON.stringify(a) !== JSON.stringify(b)) {
-        result[key] = b;
-        hasChanges = true;
-      }
-    } else if (a !== b) {
-      result[key] = b;
-      hasChanges = true;
-    }
-  }
-  return hasChanges ? result : null;
-}
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {
@@ -1056,13 +1032,12 @@ function createCollectionHandle(def, storage, watchCtx, validator, partialValida
         const { _d, _u, _a, _e, ...existingFields } = existing;
         const merged = { ...existingFields, ...data, id };
         yield* validator(merged);
-        const diff = deepDiff(existingFields, merged);
         const event = {
           id: makeEventId(),
           collection: collectionName,
           recordId: id,
           kind: "u",
-          data: diff ?? { id },
+          data: merged,
           createdAt: Date.now(),
           author: localAuthor
         };
@@ -1070,7 +1045,7 @@ function createCollectionHandle(def, storage, watchCtx, validator, partialValida
         yield* Effect7.logDebug("Record updated", {
           collection: collectionName,
           recordId: id,
-          data: diff
+          data: merged
         });
         yield* pruneEvents(storage, collectionName, id, def.eventRetention);
       })
@@ -2227,6 +2202,20 @@ function fetchAuthorProfile(relay, relayUrls, pubkey) {
   });
 }
 
+// src/sync/deletion.ts
+import { finalizeEvent } from "nostr-tools/pure";
+function createDeletionEvent(targetEventIds, signingKey) {
+  return finalizeEvent(
+    {
+      kind: 5,
+      content: "",
+      tags: targetEventIds.map((id) => ["e", id]),
+      created_at: Math.floor(Date.now() / 1e3)
+    },
+    signingKey
+  );
+}
+
 // src/services/Identity.ts
 import { ServiceMap as ServiceMap3 } from "effect";
 var Identity = class extends ServiceMap3.Service()("tablinum/Identity") {
@@ -2916,6 +2905,12 @@ var TablinumLive = Layer9.effect(
       }
       const gw = wrapResult.success;
       yield* storage.putGiftWrap({ id: gw.id, event: gw, createdAt: gw.created_at });
+      const metaKey = `gw_record:${event.collection}:${event.recordId}`;
+      const prevMapping = yield* storage.getMeta(metaKey).pipe(
+        Effect21.orElseSucceed(() => void 0)
+      );
+      const epochPubKey = gw.tags.find((t) => t[0] === "p")?.[1];
+      yield* storage.putMeta(metaKey, { gwId: gw.id, epochPubKey });
       yield* Effect21.forkIn(
         Effect21.gen(function* () {
           const publishResult = yield* Effect21.result(
@@ -2928,10 +2923,80 @@ var TablinumLive = Layer9.effect(
           if (publishResult._tag === "Failure") {
             reportSyncError(config.onSyncError, publishResult.failure);
           }
+          if (prevMapping?.epochPubKey) {
+            const signingKey = getDecryptionKey(epochStore, prevMapping.epochPubKey);
+            if (signingKey) {
+              const deletionEvent = createDeletionEvent(
+                [prevMapping.gwId],
+                signingKey
+              );
+              yield* relay.publish(deletionEvent, [...config.relays]).pipe(
+                Effect21.tapError(
+                  (e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))
+                ),
+                Effect21.ignore
+              );
+            }
+            yield* storage.deleteGiftWrap(prevMapping.gwId).pipe(Effect21.ignore);
+          }
         }),
         scope
       );
     });
+    const republishAllUnderCurrentEpoch = () => Effect21.gen(function* () {
+      const oldGwDeletions = [];
+      for (const [, def] of allSchemaEntries) {
+        const collectionName = def.name;
+        const allRecords = yield* storage.getAllRecords(collectionName);
+        for (const record of allRecords) {
+          const recordId = record.id;
+          const { _d, _u, _a, _e, ...fields } = record;
+          const content = _d ? JSON.stringify(null) : JSON.stringify(fields);
+          const dTag = `${collectionName}:${recordId}`;
+          const wrapResult = yield* Effect21.result(
+            giftWrap.wrap({
+              kind: 1,
+              content,
+              tags: [["d", dTag]],
+              created_at: Math.floor(Date.now() / 1e3)
+            })
+          );
+          if (wrapResult._tag === "Failure") continue;
+          const gw = wrapResult.success;
+          yield* storage.putGiftWrap({ id: gw.id, event: gw, createdAt: gw.created_at });
+          const metaKey = `gw_record:${collectionName}:${recordId}`;
+          const prevMapping = yield* storage.getMeta(metaKey).pipe(
+            Effect21.orElseSucceed(() => void 0)
+          );
+          if (prevMapping) oldGwDeletions.push(prevMapping);
+          const epochPubKey = gw.tags.find((t) => t[0] === "p")?.[1];
+          yield* storage.putMeta(metaKey, { gwId: gw.id, epochPubKey });
+          yield* relay.publish(gw, [...config.relays]).pipe(
+            Effect21.tapError((e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))),
+            Effect21.ignore
+          );
+        }
+      }
+      const byEpoch = /* @__PURE__ */ new Map();
+      for (const { gwId, epochPubKey } of oldGwDeletions) {
+        const ids = byEpoch.get(epochPubKey) ?? [];
+        ids.push(gwId);
+        byEpoch.set(epochPubKey, ids);
+      }
+      for (const [epochPubKey, gwIds] of byEpoch) {
+        const signingKey = getDecryptionKey(epochStore, epochPubKey);
+        if (signingKey) {
+          const deletionEvent = createDeletionEvent(gwIds, signingKey);
+          yield* relay.publish(deletionEvent, [...config.relays]).pipe(
+            Effect21.tapError((e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))),
+            Effect21.ignore
+          );
+        }
+        for (const gwId of gwIds) {
+          yield* storage.deleteGiftWrap(gwId).pipe(Effect21.ignore);
+        }
+      }
+    });
     const knownAuthors = /* @__PURE__ */ new Set();
     const putMemberRecord = (record) => Effect21.gen(function* () {
       const existing = yield* storage.getRecord("_members", record.id);
@@ -3019,6 +3084,13 @@ var TablinumLive = Layer9.effect(
         addedInEpoch: getCurrentEpoch(epochStore).id
       });
     }
+    const migrated = yield* storage.getMeta("migration_gw_republish").pipe(
+      Effect21.orElseSucceed(() => void 0)
+    );
+    if (!migrated) {
+      yield* republishAllUnderCurrentEpoch().pipe(Effect21.ignore);
+      yield* storage.putMeta("migration_gw_republish", true);
+    }
     const withLog = (effect) => Effect21.provideService(effect, References3.MinimumLogLevel, config.logLevel);
     const ensureOpen = (effect) => withLog(
       Effect21.gen(function* () {
@@ -3098,6 +3170,7 @@ var TablinumLive = Layer9.effect(
             removedAt: Date.now(),
             removedInEpoch: result.epoch.id
           });
+          yield* republishAllUnderCurrentEpoch();
           yield* Effect21.forEach(
             result.wrappedEvents,
             (wrappedEvent) => relay.publish(wrappedEvent, [...config.relays]).pipe(
@@ -3172,6 +3245,7 @@ var TablinumLive = Layer9.effect(
             removedAt: Date.now(),
             removedInEpoch: result.epoch.id
           });
+          yield* republishAllUnderCurrentEpoch();
           yield* Effect21.forEach(
             result.wrappedEvents,
             (wrappedEvent) => relay.publish(wrappedEvent, [...config.relays]).pipe(

package/dist/svelte/index.svelte.js

@@ -581,30 +581,6 @@ function resolveWinner(existing, incoming) {
 function isPlainObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-function deepDiff(before, after) {
-  const result = {};
-  let hasChanges = false;
-  for (const key of Object.keys(after)) {
-    const a = before[key];
-    const b = after[key];
-    if (isPlainObject(a) && isPlainObject(b)) {
-      const nested = deepDiff(a, b);
-      if (nested !== null) {
-        result[key] = nested;
-        hasChanges = true;
-      }
-    } else if (Array.isArray(a) && Array.isArray(b)) {
-      if (JSON.stringify(a) !== JSON.stringify(b)) {
-        result[key] = b;
-        hasChanges = true;
-      }
-    } else if (a !== b) {
-      result[key] = b;
-      hasChanges = true;
-    }
-  }
-  return hasChanges ? result : null;
-}
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {
@@ -1090,13 +1066,12 @@ function createCollectionHandle(def, storage, watchCtx, validator, partialValida
         const { _d, _u, _a, _e, ...existingFields } = existing;
         const merged = { ...existingFields, ...data, id };
         yield* validator(merged);
-        const diff = deepDiff(existingFields, merged);
         const event = {
           id: makeEventId(),
           collection: collectionName,
           recordId: id,
           kind: "u",
-          data: diff ?? { id },
+          data: merged,
           createdAt: Date.now(),
           author: localAuthor
         };
@@ -1104,7 +1079,7 @@ function createCollectionHandle(def, storage, watchCtx, validator, partialValida
         yield* Effect7.logDebug("Record updated", {
           collection: collectionName,
           recordId: id,
-          data: diff
+          data: merged
         });
         yield* pruneEvents(storage, collectionName, id, def.eventRetention);
       })
@@ -2261,6 +2236,20 @@ function fetchAuthorProfile(relay, relayUrls, pubkey) {
   });
 }
 
+// src/sync/deletion.ts
+import { finalizeEvent } from "nostr-tools/pure";
+function createDeletionEvent(targetEventIds, signingKey) {
+  return finalizeEvent(
+    {
+      kind: 5,
+      content: "",
+      tags: targetEventIds.map((id) => ["e", id]),
+      created_at: Math.floor(Date.now() / 1e3)
+    },
+    signingKey
+  );
+}
+
 // src/services/Identity.ts
 import { ServiceMap as ServiceMap3 } from "effect";
 var Identity = class extends ServiceMap3.Service()("tablinum/Identity") {
@@ -2950,6 +2939,12 @@ var TablinumLive = Layer9.effect(
       }
       const gw = wrapResult.success;
       yield* storage.putGiftWrap({ id: gw.id, event: gw, createdAt: gw.created_at });
+      const metaKey = `gw_record:${event.collection}:${event.recordId}`;
+      const prevMapping = yield* storage.getMeta(metaKey).pipe(
+        Effect21.orElseSucceed(() => void 0)
+      );
+      const epochPubKey = gw.tags.find((t) => t[0] === "p")?.[1];
+      yield* storage.putMeta(metaKey, { gwId: gw.id, epochPubKey });
       yield* Effect21.forkIn(
         Effect21.gen(function* () {
           const publishResult = yield* Effect21.result(
@@ -2962,10 +2957,80 @@ var TablinumLive = Layer9.effect(
           if (publishResult._tag === "Failure") {
             reportSyncError(config.onSyncError, publishResult.failure);
           }
+          if (prevMapping?.epochPubKey) {
+            const signingKey = getDecryptionKey(epochStore, prevMapping.epochPubKey);
+            if (signingKey) {
+              const deletionEvent = createDeletionEvent(
+                [prevMapping.gwId],
+                signingKey
+              );
+              yield* relay.publish(deletionEvent, [...config.relays]).pipe(
+                Effect21.tapError(
+                  (e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))
+                ),
+                Effect21.ignore
+              );
+            }
+            yield* storage.deleteGiftWrap(prevMapping.gwId).pipe(Effect21.ignore);
+          }
         }),
         scope
       );
     });
+    const republishAllUnderCurrentEpoch = () => Effect21.gen(function* () {
+      const oldGwDeletions = [];
+      for (const [, def] of allSchemaEntries) {
+        const collectionName = def.name;
+        const allRecords = yield* storage.getAllRecords(collectionName);
+        for (const record of allRecords) {
+          const recordId = record.id;
+          const { _d, _u, _a, _e, ...fields } = record;
+          const content = _d ? JSON.stringify(null) : JSON.stringify(fields);
+          const dTag = `${collectionName}:${recordId}`;
+          const wrapResult = yield* Effect21.result(
+            giftWrap.wrap({
+              kind: 1,
+              content,
+              tags: [["d", dTag]],
+              created_at: Math.floor(Date.now() / 1e3)
+            })
+          );
+          if (wrapResult._tag === "Failure") continue;
+          const gw = wrapResult.success;
+          yield* storage.putGiftWrap({ id: gw.id, event: gw, createdAt: gw.created_at });
+          const metaKey = `gw_record:${collectionName}:${recordId}`;
+          const prevMapping = yield* storage.getMeta(metaKey).pipe(
+            Effect21.orElseSucceed(() => void 0)
+          );
+          if (prevMapping) oldGwDeletions.push(prevMapping);
+          const epochPubKey = gw.tags.find((t) => t[0] === "p")?.[1];
+          yield* storage.putMeta(metaKey, { gwId: gw.id, epochPubKey });
+          yield* relay.publish(gw, [...config.relays]).pipe(
+            Effect21.tapError((e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))),
+            Effect21.ignore
+          );
+        }
+      }
+      const byEpoch = /* @__PURE__ */ new Map();
+      for (const { gwId, epochPubKey } of oldGwDeletions) {
+        const ids = byEpoch.get(epochPubKey) ?? [];
+        ids.push(gwId);
+        byEpoch.set(epochPubKey, ids);
+      }
+      for (const [epochPubKey, gwIds] of byEpoch) {
+        const signingKey = getDecryptionKey(epochStore, epochPubKey);
+        if (signingKey) {
+          const deletionEvent = createDeletionEvent(gwIds, signingKey);
+          yield* relay.publish(deletionEvent, [...config.relays]).pipe(
+            Effect21.tapError((e) => Effect21.sync(() => reportSyncError(config.onSyncError, e))),
+            Effect21.ignore
+          );
+        }
+        for (const gwId of gwIds) {
+          yield* storage.deleteGiftWrap(gwId).pipe(Effect21.ignore);
+        }
+      }
+    });
     const knownAuthors = /* @__PURE__ */ new Set();
     const putMemberRecord = (record) => Effect21.gen(function* () {
       const existing = yield* storage.getRecord("_members", record.id);
@@ -3053,6 +3118,13 @@ var TablinumLive = Layer9.effect(
         addedInEpoch: getCurrentEpoch(epochStore).id
       });
     }
+    const migrated = yield* storage.getMeta("migration_gw_republish").pipe(
+      Effect21.orElseSucceed(() => void 0)
+    );
+    if (!migrated) {
+      yield* republishAllUnderCurrentEpoch().pipe(Effect21.ignore);
+      yield* storage.putMeta("migration_gw_republish", true);
+    }
     const withLog = (effect) => Effect21.provideService(effect, References3.MinimumLogLevel, config.logLevel);
     const ensureOpen = (effect) => withLog(
       Effect21.gen(function* () {
@@ -3132,6 +3204,7 @@ var TablinumLive = Layer9.effect(
             removedAt: Date.now(),
             removedInEpoch: result.epoch.id
           });
+          yield* republishAllUnderCurrentEpoch();
           yield* Effect21.forEach(
             result.wrappedEvents,
             (wrappedEvent) => relay.publish(wrappedEvent, [...config.relays]).pipe(
@@ -3206,6 +3279,7 @@ var TablinumLive = Layer9.effect(
             removedAt: Date.now(),
             removedInEpoch: result.epoch.id
           });
+          yield* republishAllUnderCurrentEpoch();
           yield* Effect21.forEach(
             result.wrappedEvents,
             (wrappedEvent) => relay.publish(wrappedEvent, [...config.relays]).pipe(

package/dist/sync/deletion.d.ts

@@ -0,0 +1,10 @@
+import type { NostrEvent } from "nostr-tools/pure";
+/**
+ * Creates a NIP-09 deletion request (kind 5) for one or more events.
+ *
+ * For gift wraps (kind 1059), NIP-59 specifies that relays SHOULD honor
+ * deletions where the signer's pubkey matches the gift wrap's p-tag.
+ * This means the epoch key holder can delete any gift wrap addressed
+ * to that epoch — regardless of who originally created it.
+ */
+export declare function createDeletionEvent(targetEventIds: readonly string[], signingKey: Uint8Array): NostrEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tablinum",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kevmodrome/tablinum.git",