@thru/replay 0.2.18 → 0.2.20

package/dist/index.cjs

@@ -797,7 +797,7 @@ function createEventReplay(options) {
       orderBy: PAGE_ORDER_ASC3,
       pageToken: cursor
     });
-    const baseFilter = slotLiteralFilter("event.slot", startSlot);
+    const baseFilter = eventBackfillFilter(startSlot, options.resumeAfter);
     const mergedFilter = combineFilters(baseFilter, options.filter);
     const response = await client.listEvents(
       protobuf.create(proto.ListEventsRequestSchema, {
@@ -808,13 +808,19 @@ function createEventReplay(options) {
     return backfillPage(response.events, response.page);
   };
   const createSubscribeLive = (client) => (startSlot) => {
-    const mergedFilter = combineFilters(slotLiteralFilter("event.slot", startSlot), options.filter);
+    const mergedFilter = combineFilters(
+      slotLiteralFilter("event.slot", startSlot),
+      options.filter
+    );
     const request = protobuf.create(proto.StreamEventsRequestSchema, {
       filter: mergedFilter
     });
     return mapAsyncIterable(
       client.streamEvents(request),
-      (resp) => streamResponseToEvent(resp)
+      (resp) => {
+        const event = streamResponseToEvent(resp);
+        return shouldEmitLiveEvent(event, startSlot, options.resumeAfter) ? event : null;
+      }
     );
   };
   const onReconnect = options.clientFactory ? () => {
@@ -852,6 +858,48 @@ function eventKey(event) {
   const slotPart = event.slot?.toString() ?? "0";
   return `${slotPart}:${event.callIdx ?? 0}`;
 }
+function eventBackfillFilter(startSlot, resumeAfter) {
+  const boundary = parseEventId(resumeAfter);
+  if (!boundary || startSlot > boundary.slot) {
+    return slotLiteralFilter("event.slot", startSlot);
+  }
+  return protobuf.create(proto.FilterSchema, {
+    expression: `event.slot > uint(${boundary.slot.toString()}) || (event.slot == uint(${boundary.slot.toString()}) && (event.block_offset > uint(${boundary.blockOffset.toString()}) || (event.block_offset == uint(${boundary.blockOffset.toString()}) && event.call_idx > uint(${boundary.callIdx.toString()}))))`
+  });
+}
+function parseEventId(resumeAfter) {
+  if (!resumeAfter?.eventId) return null;
+  return parseCanonicalEventId(resumeAfter.eventId, resumeAfter.slot);
+}
+function parseCanonicalEventId(eventId, expectedSlot) {
+  if (!eventId) return null;
+  const match = /^ts(\d+)_(\d+)_(\d+)$/.exec(eventId);
+  if (!match) return null;
+  const [slotPart, blockOffsetPart, callIdxPart] = match.slice(1);
+  const slot = BigInt(slotPart);
+  if (slot !== expectedSlot) return null;
+  return {
+    slot,
+    blockOffset: BigInt(blockOffsetPart),
+    callIdx: BigInt(callIdxPart)
+  };
+}
+function isAfterBoundary(event, boundary) {
+  if (event.slot !== boundary.slot) return event.slot > boundary.slot;
+  if (event.blockOffset !== boundary.blockOffset) {
+    return event.blockOffset > boundary.blockOffset;
+  }
+  return event.callIdx > boundary.callIdx;
+}
+function shouldEmitLiveEvent(event, startSlot, resumeAfter) {
+  const boundary = parseEventId(resumeAfter);
+  if (!boundary || startSlot > boundary.slot) return true;
+  const eventSlot = event.slot ?? 0n;
+  if (eventSlot > boundary.slot) return true;
+  if (eventSlot < boundary.slot) return false;
+  const eventPosition = parseCanonicalEventId(event.eventId, boundary.slot);
+  return eventPosition ? isAfterBoundary(eventPosition, boundary) : false;
+}
 
 // src/page-assembler.ts
 var PAGE_SIZE = 4096;