effect 4.0.5 → 4.0.7

package/dist/eventlog/EventLogServer.js

@@ -2,9 +2,12 @@ import * as Arr from "../Array.js";
 import * as Cache from "../Cache.js";
 import * as Context from "../Context.js";
 import * as Data from "../Data.js";
+import * as Duration from "../Duration.js";
 import * as Effect from "../Effect.js";
 import * as Equal from "../Equal.js";
+import * as Exit from "../Exit.js";
 import * as Hash from "../Hash.js";
+import * as Uuid from "../internal/uuid.js";
 import * as Layer from "../Layer.js";
 import * as Option from "../Option.js";
 import * as Redacted from "../Redacted.js";
@@ -46,6 +49,9 @@ export const layerAuthMiddleware = /*#__PURE__*/Layer.succeed(EventLogAuthentica
  * chunked writes, delegates write and change handling to the supplied callbacks,
  * and frames large change payloads into chunks.
  *
+ * Use the connection's `ConnectionWrites.track` in `onWrite` and
+ * `ConnectionWrites.filter` in `changes` to suppress its own write echoes.
+ *
  * @stability unstable
  * @category layers
  * @since 4.0.0
@@ -57,14 +63,14 @@ export const layerRpcHandlers = options => EventLogRemoteRpcs.toLayer(Effect.gen
     timeToLive: EventLogSessionAuth.SessionAuthChallengeTimeToLiveMillis
   });
   let chunkedIdCounter = 0;
-  const persistedSigningPublicKeys = yield* Cache.make({
-    lookup: key => options.getOrCreateSessionAuthBinding(key.publicKey, key.signingPublicKey).pipe(Effect.catchCause(_ => Effect.fail(new EventLogProtocolError({
-      requestTag: "Authenticate",
-      publicKey: key.publicKey,
-      code: "Forbidden",
-      message: "Session auth binding lookup failed"
-    })))),
-    capacity: 4096
+  const persistedSigningPublicKeys = yield* Cache.makeWith(key => options.getOrCreateSessionAuthBinding(key.publicKey, key.signingPublicKey).pipe(Effect.catchCause(_ => Effect.fail(new EventLogProtocolError({
+    requestTag: "Authenticate",
+    publicKey: key.publicKey,
+    code: "Forbidden",
+    message: "Session auth binding lookup failed"
+  })))), {
+    capacity: 4096,
+    timeToLive: exit => Exit.isSuccess(exit) ? Duration.infinity : Duration.zero
   });
   return EventLogRemoteRpcs.of({
     "EventLog.Hello": Effect.fnUntraced(function* (_, {
@@ -73,7 +79,8 @@ export const layerRpcHandlers = options => EventLogRemoteRpcs.toLayer(Effect.gen
       const challenge = yield* Cache.get(clientChallenges, client.id);
       return new HelloResponse({
         remoteId: options.remoteId,
-        challenge
+        challenge,
+        firstSequence: options.firstSequence
       });
     }),
     "EventLog.Authenticate": Effect.fnUntraced(function* (request, {
@@ -119,19 +126,17 @@ export const layerRpcHandlers = options => EventLogRemoteRpcs.toLayer(Effect.gen
         privateKey: constEmptyPrivateKey
       }).annotate(AuthenticatedIdentities, authenticatedIdentities).annotate(ChunkedMessageState, new Map());
     }),
-    "EventLog.WriteSingle": Effect.fnUntraced(function* (request, {
+    "EventLog.WriteSingle": (request, {
       client
-    }) {
-      yield* options.onWrite(request.data, Context.getOrUndefined(client.annotations, AuthenticatedIdentities) ?? new Set());
-    }),
-    "EventLog.WriteChunked": Effect.fnUntraced(function* (request, {
+    }) => options.onWrite(request.data, Context.getOrUndefined(client.annotations, AuthenticatedIdentities) ?? new Set(), getConnectionWrites(client)),
+    "EventLog.WriteChunked": (request, {
       client
-    }) {
+    }) => {
       const state = Context.get(client.annotations, ChunkedMessageState);
       const data = ChunkedMessage.join(state, request);
-      if (!data) return;
-      yield* options.onWrite(data, Context.getOrUndefined(client.annotations, AuthenticatedIdentities) ?? new Set());
-    }),
+      if (!data) return Effect.succeed([]);
+      return options.onWrite(data, Context.getOrUndefined(client.annotations, AuthenticatedIdentities) ?? new Set(), getConnectionWrites(client));
+    },
     "EventLog.Changes": (request, {
       client
     }) => {
@@ -147,7 +152,8 @@ export const layerRpcHandlers = options => EventLogRemoteRpcs.toLayer(Effect.gen
       return options.changes({
         publicKey: request.publicKey,
         storeId: request.storeId,
-        startSequence: request.startSequence
+        startSequence: request.startSequence,
+        writes: getConnectionWrites(client)
       }).pipe(Stream.mapArray(Arr.flatMap(data => {
         if (data.byteLength <= ChunkedMessage.chunkSize) {
           return [new SingleMessage({
@@ -180,6 +186,100 @@ export const layerRpcHandlers = options => EventLogRemoteRpcs.toLayer(Effect.gen
 export class ChunkedMessageState extends /*#__PURE__*/Context.Reference("effect/eventlog/EventLogServer/ChunkedMessageState", {
   defaultValue: () => new Map()
 }) {}
+/**
+ * Tracks writes to suppress their echoes on the same RPC connection.
+ *
+ * **Details**
+ *
+ * Only tracks entries for stores with an open change stream.
+ *
+ * @stability unstable
+ * @category models
+ * @since 4.0.6
+ */
+export class ConnectionWrites {
+  streams = /*#__PURE__*/new Map();
+  /**
+   * Runs a storage write while suppressing its entries on this connection's streams.
+   *
+   * @stability unstable
+   * @since 4.0.6
+   */
+  track(options, write) {
+    const open = this.streams.get(makeStreamKey(options.publicKey, options.storeId));
+    if (open === undefined || options.entryIds.length === 0) return write;
+    const streams = Array.from(open);
+    const started = streams.map(stream => stream.position);
+    const ids = options.entryIds.map(Uuid.stringify);
+    // Track before writing: storage can publish an entry before the write
+    // returns. Each occurrence is counted, as an id can be stored more than once.
+    for (const stream of streams) {
+      for (const id of ids) stream.ids.set(id, (stream.ids.get(id) ?? 0) + 1);
+    }
+    return Effect.onExit(write, exit => Effect.sync(() => {
+      for (let i = 0; i < streams.length; i++) {
+        const stream = streams[i];
+        if (exit._tag === "Failure") {
+          for (const id of ids) release(stream.ids, id);
+          continue;
+        }
+        // Release occurrences the stream had already passed when the write began.
+        for (const ack of exit.value) {
+          if (ack.sequence <= started[i]) release(stream.ids, Uuid.stringify(ack.entryId));
+        }
+      }
+    }));
+  }
+  /**
+   * Filters this connection's writes from a store's change stream. An item can
+   * hold several entries; `sequence` returns its highest one.
+   *
+   * @stability unstable
+   * @since 4.0.6
+   */
+  filter(options, stream) {
+    return Stream.suspend(() => {
+      const key = makeStreamKey(options.publicKey, options.storeId);
+      const state = {
+        ids: new Map(),
+        position: -1
+      };
+      let open = this.streams.get(key);
+      if (open === undefined) {
+        open = new Set();
+        this.streams.set(key, open);
+      }
+      open.add(state);
+      return stream.pipe(Stream.filter(item => {
+        const sequence = options.sequence(item);
+        if (sequence > state.position) state.position = sequence;
+        if (state.ids.size === 0) return true;
+        // An item is written by one request, so it is either all or none of ours.
+        const ids = options.entryIds(item).map(Uuid.stringify);
+        if (!ids.every(id => state.ids.has(id))) return true;
+        for (const id of ids) release(state.ids, id);
+        return false;
+      }), Stream.ensuring(Effect.sync(() => {
+        open.delete(state);
+        if (open.size === 0) this.streams.delete(key);
+      })));
+    });
+  }
+}
+const release = (ids, id) => {
+  const count = ids.get(id);
+  if (count === undefined) return;
+  if (count <= 1) ids.delete(id);else ids.set(id, count - 1);
+};
+const makeStreamKey = (publicKey, storeId) => `${publicKey}/${storeId}`;
+class ConnectionWritesState extends /*#__PURE__*/Context.Service()("effect/eventlog/EventLogServer/ConnectionWrites") {}
+const getConnectionWrites = client => {
+  const existing = Context.getOrUndefined(client.annotations, ConnectionWritesState);
+  if (existing !== undefined) return existing;
+  const writes = new ConnectionWrites();
+  client.annotate(ConnectionWritesState, writes);
+  return writes;
+};
 /**
  * Annotation containing the public keys authenticated on an RPC connection.
  *

package/dist/eventlog/EventLogServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventLogServer.js","names":["EventLog.Changes"],"sources":["../../src/eventlog/EventLogServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"EventLogServer.js","names":["EventLog.WriteSingle","EventLog.WriteChunked","EventLog.Changes"],"sources":["../../src/eventlog/EventLogServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/eventlog/EventLogServerEncrypted.d.ts

@@ -2,21 +2,19 @@ import * as Context from "../Context.ts";
 import * as Effect from "../Effect.ts";
 import * as Layer from "../Layer.ts";
 import * as RpcServer from "../rpc/RpcServer.ts";
-import * as Schema from "../Schema.ts";
 import type * as Scope from "../Scope.ts";
 import * as Stream from "../Stream.ts";
-import * as Transferable from "../workers/Transferable.ts";
-import { type RemoteId } from "./EventJournal.ts";
-import type { EncryptedRemoteEntry } from "./EventLogEncryption.ts";
-import { type StoreId } from "./EventLogMessage.ts";
+import { type EntryId, type RemoteId } from "./EventJournal.ts";
+import type { EncryptedBatch, EncryptedRemoteBatch } from "./EventLogEncryption.ts";
+import { type StoreId, type WriteAck } from "./EventLogMessage.ts";
 /**
  * Provides RPC handlers for the encrypted event-log server.
  *
  * **Details**
  *
- * Incoming encrypted write payloads are decoded and persisted through `Storage`;
- * change streams read encrypted entries from storage and encode them for the
- * remote protocol.
+ * Decodes and persists writes through `Storage`, acknowledging their stored
+ * sequences. Change streams encode stored batches, excluding this connection's
+ * writes.
  *
  * @stability unstable
  * @category layers
@@ -35,7 +33,7 @@ export declare const layerRpcHandlers: Layer.Layer<import("./EventLogMessage.ts"
  * **Details**
  *
  * This layer installs `EventLogRemoteRpcs` on the provided RPC server protocol
- * and wires those RPCs to `layerRpcHandlers`. Encrypted entries, session
+ * and wires those RPCs to `layerRpcHandlers`. Encrypted batches, session
  * authentication bindings, remote ids, and change streams are delegated to
  * `Storage`.
  *
@@ -48,32 +46,16 @@ export declare const layerRpcHandlers: Layer.Layer<import("./EventLogMessage.ts"
  * @since 4.0.0
  */
 export declare const layer: Layer.Layer<never, never, RpcServer.Protocol | Storage>;
-declare const PersistedEntry_base: Schema.Class<PersistedEntry, Schema.Struct<{
-    readonly entryId: Schema.brand<Schema.instanceOf<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>>, "effect/eventlog/EventJournal/EntryId">;
-    readonly iv: Transferable.Transferable<Schema.instanceOf<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>>>;
-    readonly encryptedEntry: Transferable.Transferable<Schema.instanceOf<Uint8Array<ArrayBuffer>, Uint8Array<ArrayBuffer>>>;
-}>, {}>;
-/**
- * Schema for encrypted entries persisted by the encrypted event-log server.
- *
- * @stability unstable
- * @category models
- * @since 4.0.0
- */
-export declare class PersistedEntry extends PersistedEntry_base {
-    /**
-     * String representation of the encrypted entry id.
-     *
-     * @stability unstable
-     * @since 4.0.0
-     */
-    get entryIdString(): string;
-}
 declare const Storage_base: Context.ServiceClass<Storage, "effect/eventlog/EventLogServer/Storage", {
     readonly getId: Effect.Effect<RemoteId>;
+    /**
+     * Lowest assigned sequence (default 0). Overestimating skips entries.
+     */
+    readonly firstSequence?: number | undefined;
     readonly getOrCreateSessionAuthBinding: (publicKey: string, signingPublicKey: Uint8Array<ArrayBuffer>) => Effect.Effect<Uint8Array<ArrayBuffer>>;
-    readonly write: (publicKey: string, storeId: StoreId, entries: ReadonlyArray<PersistedEntry>) => Effect.Effect<ReadonlyArray<EncryptedRemoteEntry>>;
-    readonly changes: (publicKey: string, storeId: StoreId, startSequence: number) => Stream.Stream<EncryptedRemoteEntry>;
+    readonly write: (publicKey: string, storeId: StoreId, batches: ReadonlyArray<EncryptedBatch>) => Effect.Effect<ReadonlyArray<EncryptedRemoteBatch>>;
+    readonly entrySequences: (publicKey: string, storeId: StoreId, entryIds: ReadonlyArray<EntryId>) => Effect.Effect<ReadonlyArray<WriteAck>>;
+    readonly changes: (publicKey: string, storeId: StoreId, startSequence: number) => Stream.Stream<EncryptedRemoteBatch>;
 }>;
 /**
  * Defines the backing store service used by the encrypted event-log server.
@@ -86,9 +68,17 @@ declare const Storage_base: Context.ServiceClass<Storage, "effect/eventlog/Event
  * **Details**
  *
  * It provides the server remote id, stores session authentication bindings,
- * persists encrypted entries, and streams encrypted changes for a public key and
+ * persists encrypted batches, and streams encrypted changes for a public key and
  * store id.
  *
+ * A batch owns one remote sequence per entry, starting at its `sequence`.
+ * `write` stores a batch unless every one of its entry ids is already stored,
+ * which makes retried writes idempotent, and returns the batches it stored.
+ * `entrySequences` returns the sequence each entry was first stored at, so
+ * skipped batches can still be acknowledged. `changes` streams every batch
+ * whose last sequence is at or after `startSequence`, followed by newly stored
+ * batches.
+ *
  * @stability unstable
  * @category services
  * @since 4.0.0

package/dist/eventlog/EventLogServerEncrypted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventLogServerEncrypted.d.ts","sourceRoot":"","sources":["../../src/eventlog/EventLogServerEncrypted.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAEtC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAGpC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,YAAY,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAA+B,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AACnE,OAAO,EAAyD,KAAK,OAAO,EAAgB,MAAM,sBAAsB,CAAA;AAGxH;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,8WAqD1B,CAAA;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAEzE,CAAA;;;;;;AAED;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,mBAMlC;IACA;;;;;OAKG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;CACF;;oBAqBiB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;4CACC,CACtC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,UAAU,CAAC,WAAW,CAAC,KACtC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;oBAC3B,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;sBACrC,CAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,KAClB,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;;AAjC1C;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,OAAQ,SAAQ,YAgBiB;CAAG;AAEjD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAoElF,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAA4C,CAAA"}
+{"version":3,"file":"EventLogServerEncrypted.d.ts","sourceRoot":"","sources":["../../src/eventlog/EventLogServerEncrypted.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAGtC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAGpC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,KAAK,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AACnF,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAA;AAG7B;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,8WA0D1B,CAAA;AAkCH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAEzE,CAAA;;oBA6BiB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;IACvC;;OAEG;6BACsB,MAAM,GAAG,SAAS;4CACH,CACtC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,UAAU,CAAC,WAAW,CAAC,KACtC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;oBAC3B,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;6BAC9B,CACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,KAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;sBACzB,CAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,KAClB,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;;AAlD1C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,OAAQ,SAAQ,YAyBiB;CAAG;AAEjD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CA0ElF,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAA4C,CAAA"}

package/dist/eventlog/EventLogServerEncrypted.js

@@ -14,15 +14,14 @@
 import * as Arr from "../Array.js";
 import * as Context from "../Context.js";
 import * as Effect from "../Effect.js";
+import * as Equal from "../Equal.js";
 import * as Uuid from "../internal/uuid.js";
 import * as Layer from "../Layer.js";
 import * as PubSub from "../PubSub.js";
 import * as RcMap from "../RcMap.js";
 import * as RpcServer from "../rpc/RpcServer.js";
-import * as Schema from "../Schema.js";
 import * as Stream from "../Stream.js";
-import * as Transferable from "../workers/Transferable.js";
-import { EntryId, makeRemoteIdUnsafe } from "./EventJournal.js";
+import { makeRemoteIdUnsafe } from "./EventJournal.js";
 import { ChangesRpc, EventLogProtocolError, EventLogRemoteRpcs, WriteEntries } from "./EventLogMessage.js";
 import * as EventLogServer from "./EventLogServer.js";
 /**
@@ -30,9 +29,9 @@ import * as EventLogServer from "./EventLogServer.js";
  *
  * **Details**
  *
- * Incoming encrypted write payloads are decoded and persisted through `Storage`;
- * change streams read encrypted entries from storage and encode them for the
- * remote protocol.
+ * Decodes and persists writes through `Storage`, acknowledging their stored
+ * sequences. Change streams encode stored batches, excluding this connection's
+ * writes.
  *
  * @stability unstable
  * @category layers
@@ -43,8 +42,9 @@ export const layerRpcHandlers = /*#__PURE__*/Layer.unwrap(/*#__PURE__*/Effect.ge
   const remoteId = yield* storage.getId;
   return EventLogServer.layerRpcHandlers({
     remoteId,
+    firstSequence: storage.firstSequence,
     getOrCreateSessionAuthBinding: (publicKey, signingPublicKey) => storage.getOrCreateSessionAuthBinding(publicKey, signingPublicKey),
-    onWrite: Effect.fnUntraced(function* (data, authenticatedPublicKeys) {
+    onWrite: Effect.fnUntraced(function* (data, authenticatedPublicKeys, writes) {
       const request = yield* WriteEntries.decode(data).pipe(Effect.mapError(_ => new EventLogProtocolError({
         requestTag: "WriteEntries",
         publicKey: undefined,
@@ -59,17 +59,13 @@ export const layerRpcHandlers = /*#__PURE__*/Layer.unwrap(/*#__PURE__*/Effect.ge
           message: "Identity is not authenticated"
         });
       }
-      if (request.encryptedEntries.length === 0) return;
-      const entries = request.encryptedEntries.map(({
-        encryptedEntry,
-        entryId,
-        iv
-      }) => new PersistedEntry({
-        entryId,
-        iv,
-        encryptedEntry
-      }));
-      return yield* storage.write(request.publicKey, request.storeId, entries).pipe(Effect.catchCause(_ => Effect.fail(new EventLogProtocolError({
+      if (request.batches.length === 0) return [];
+      const entryIds = request.batches.flatMap(batch => batch.entryIds);
+      return yield* storage.write(request.publicKey, request.storeId, request.batches).pipe(Effect.flatMap(stored => toWriteAcks(storage, request.publicKey, request.storeId, request.batches, stored)), write => writes.track({
+        publicKey: request.publicKey,
+        storeId: request.storeId,
+        entryIds
+      }, write), Effect.catchCause(_ => Effect.fail(new EventLogProtocolError({
         requestTag: "WriteEntries",
         publicKey: request.publicKey,
         code: "InternalServerError",
@@ -77,12 +73,44 @@ export const layerRpcHandlers = /*#__PURE__*/Layer.unwrap(/*#__PURE__*/Effect.ge
       }))));
     }),
     changes: ({
+      publicKey,
+      startSequence,
+      storeId,
+      writes
+    }) => writes.filter({
       publicKey,
       storeId,
-      startSequence
-    }) => storage.changes(publicKey, storeId, startSequence).pipe(Stream.mapArrayEffect(entries => Effect.map(ChangesRpc.encodeEncrypted(entries), Arr.of)))
+      entryIds: batch => batch.entryIds,
+      sequence: batch => batch.sequence + batch.entryIds.length - 1
+    }, storage.changes(publicKey, storeId, startSequence)).pipe(Stream.mapArrayEffect(batches => Effect.map(ChangesRpc.encodeEncrypted(batches), Arr.of)))
   });
 }));
+// Acknowledges each entry occurrence in request order: at its position in the
+// batch this write stored, or, for a skipped batch, where it was first stored.
+const toWriteAcks = /*#__PURE__*/Effect.fnUntraced(function* (storage, publicKey, storeId, batches, stored) {
+  // Stored batches keep request order, and each batch has its own random iv.
+  let next = 0;
+  const storedAt = batches.map(batch => {
+    if (stored[next] === undefined || !Equal.equals(stored[next].iv, batch.iv)) return undefined;
+    return stored[next++].sequence;
+  });
+  const skipped = batches.flatMap((batch, i) => storedAt[i] === undefined ? batch.entryIds : []);
+  const firstStored = new Map();
+  if (skipped.length > 0) {
+    for (const ack of yield* storage.entrySequences(publicKey, storeId, skipped)) {
+      firstStored.set(Uuid.stringify(ack.entryId), ack.sequence);
+    }
+  }
+  const acks = [];
+  batches.forEach((batch, b) => batch.entryIds.forEach((entryId, i) => {
+    const sequence = storedAt[b] === undefined ? firstStored.get(Uuid.stringify(entryId)) : storedAt[b] + i;
+    if (sequence !== undefined) acks.push({
+      entryId,
+      sequence
+    });
+  }));
+  return acks;
+});
 /**
  * Provides an encrypted event-log RPC server using `EventLogRemoteRpcs` and the
  * encrypted server RPC handlers.
@@ -95,7 +123,7 @@ export const layerRpcHandlers = /*#__PURE__*/Layer.unwrap(/*#__PURE__*/Effect.ge
  * **Details**
  *
  * This layer installs `EventLogRemoteRpcs` on the provided RPC server protocol
- * and wires those RPCs to `layerRpcHandlers`. Encrypted entries, session
+ * and wires those RPCs to `layerRpcHandlers`. Encrypted batches, session
  * authentication bindings, remote ids, and change streams are delegated to
  * `Storage`.
  *
@@ -108,28 +136,6 @@ export const layerRpcHandlers = /*#__PURE__*/Layer.unwrap(/*#__PURE__*/Effect.ge
  * @since 4.0.0
  */
 export const layer = /*#__PURE__*/RpcServer.layer(EventLogRemoteRpcs).pipe(/*#__PURE__*/Layer.provide(layerRpcHandlers));
-/**
- * Schema for encrypted entries persisted by the encrypted event-log server.
- *
- * @stability unstable
- * @category models
- * @since 4.0.0
- */
-export class PersistedEntry extends /*#__PURE__*/Schema.Class("effect/eventlog/EventLogServerEncrypted/PersistedEntry")({
-  entryId: EntryId,
-  iv: Transferable.Uint8Array,
-  encryptedEntry: Transferable.Uint8Array
-}) {
-  /**
-   * String representation of the encrypted entry id.
-   *
-   * @stability unstable
-   * @since 4.0.0
-   */
-  get entryIdString() {
-    return Uuid.stringify(this.entryId);
-  }
-}
 /**
  * Defines the backing store service used by the encrypted event-log server.
  *
@@ -141,9 +147,17 @@ export class PersistedEntry extends /*#__PURE__*/Schema.Class("effect/eventlog/E
  * **Details**
  *
  * It provides the server remote id, stores session authentication bindings,
- * persists encrypted entries, and streams encrypted changes for a public key and
+ * persists encrypted batches, and streams encrypted changes for a public key and
  * store id.
  *
+ * A batch owns one remote sequence per entry, starting at its `sequence`.
+ * `write` stores a batch unless every one of its entry ids is already stored,
+ * which makes retried writes idempotent, and returns the batches it stored.
+ * `entrySequences` returns the sequence each entry was first stored at, so
+ * skipped batches can still be acknowledged. `changes` streams every batch
+ * whose last sequence is at or after `startSequence`, followed by newly stored
+ * batches.
+ *
  * @stability unstable
  * @category services
  * @since 4.0.0
@@ -162,21 +176,17 @@ export class Storage extends /*#__PURE__*/Context.Service()("effect/eventlog/Eve
  * @since 4.0.0
  */
 export const makeStorageMemory = /*#__PURE__*/Effect.gen(function* () {
-  const knownIds = new Map();
   const journals = new Map();
   const sessionAuthBindings = new Map();
   const remoteId = makeRemoteIdUnsafe();
-  const ensureKnownIds = scopeKey => {
-    let storeKnownIds = knownIds.get(scopeKey);
-    if (storeKnownIds) return storeKnownIds;
-    storeKnownIds = new Map();
-    knownIds.set(scopeKey, storeKnownIds);
-    return storeKnownIds;
-  };
   const ensureJournal = scopeKey => {
     let journal = journals.get(scopeKey);
     if (journal) return journal;
-    journal = [];
+    journal = {
+      knownIds: new Map(),
+      batches: [],
+      nextSequence: 0
+    };
     journals.set(scopeKey, journal);
     return journal;
   };
@@ -192,31 +202,46 @@ export const makeStorageMemory = /*#__PURE__*/Effect.gen(function* () {
       sessionAuthBindings.set(publicKey, signingPublicKey);
       return signingPublicKey;
     }),
-    write: Effect.fnUntraced(function* (publicKey, storeId, entries) {
+    write: Effect.fnUntraced(function* (publicKey, storeId, batches) {
       const scopeKey = makeEncryptedScopeKey({
         publicKey,
         storeId
       });
       const pubsub = yield* RcMap.get(pubsubs, scopeKey);
-      const storeKnownIds = ensureKnownIds(scopeKey);
       const journal = ensureJournal(scopeKey);
-      const encryptedEntries = [];
-      for (const entry of entries) {
-        const idString = entry.entryIdString;
-        if (storeKnownIds.has(idString)) continue;
-        const encrypted = {
-          sequence: journal.length,
-          entryId: entry.entryId,
-          iv: entry.iv,
-          encryptedEntry: entry.encryptedEntry
+      const stored = [];
+      for (const batch of batches) {
+        const ids = batch.entryIds.map(Uuid.stringify);
+        if (ids.every(id => journal.knownIds.has(id))) continue;
+        ids.forEach((id, i) => {
+          if (!journal.knownIds.has(id)) journal.knownIds.set(id, journal.nextSequence + i);
+        });
+        const remoteBatch = {
+          sequence: journal.nextSequence,
+          ...batch
         };
-        encryptedEntries.push(encrypted);
-        storeKnownIds.set(idString, encrypted.sequence);
-        journal.push(encrypted);
-        PubSub.publishUnsafe(pubsub, encrypted);
+        journal.nextSequence += ids.length;
+        journal.batches.push(remoteBatch);
+        stored.push(remoteBatch);
+        PubSub.publishUnsafe(pubsub, remoteBatch);
       }
-      return encryptedEntries;
+      return stored;
     }, Effect.scoped),
+    entrySequences: (publicKey, storeId, entryIds) => Effect.sync(() => {
+      const knownIds = ensureJournal(makeEncryptedScopeKey({
+        publicKey,
+        storeId
+      })).knownIds;
+      const acks = [];
+      for (const entryId of entryIds) {
+        const sequence = knownIds.get(Uuid.stringify(entryId));
+        if (sequence !== undefined) acks.push({
+          entryId,
+          sequence
+        });
+      }
+      return acks;
+    }),
     changes: Effect.fnUntraced(function* (publicKey, storeId, startSequence) {
       const scopeKey = makeEncryptedScopeKey({
         publicKey,
@@ -224,7 +249,9 @@ export const makeStorageMemory = /*#__PURE__*/Effect.gen(function* () {
       });
       const pubsub = yield* RcMap.get(pubsubs, scopeKey);
       const subscription = yield* PubSub.subscribe(pubsub);
-      return Stream.fromArray(ensureJournal(scopeKey).slice(startSequence)).pipe(Stream.concat(Stream.fromSubscription(subscription)));
+      const batches = ensureJournal(scopeKey).batches;
+      const first = batches.findIndex(batch => batch.sequence + batch.entryIds.length > startSequence);
+      return Stream.fromArray(first === -1 ? [] : batches.slice(first)).pipe(Stream.concat(Stream.fromSubscription(subscription)));
     }, Stream.unwrap)
   });
 });

package/dist/eventlog/EventLogServerEncrypted.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventLogServerEncrypted.js","names":[],"sources":["../../src/eventlog/EventLogServerEncrypted.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"EventLogServerEncrypted.js","names":[],"sources":["../../src/eventlog/EventLogServerEncrypted.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}