@secondlayer/sdk 6.48.0 → 6.49.0

package/dist/subgraphs/index.js

@@ -597,13 +597,24 @@ function assertSinkModeCompatible(sink, finalizedOnly) {
     throw new ValidationError("This sink declares capabilities.finalizedOnly — it cannot roll back reorged rows, and following the unfinalized tip would corrupt it at the first fork. Pass finalizedOnly: true to consume(), or use a sink that implements rollback.", 400);
   }
 }
-function batchContext(cursor, height, tip, reorgs = []) {
+function resumeHeight(cursor) {
+  if (cursor === null)
+    return null;
+  try {
+    return Cursor.parse(cursor).blockHeight;
+  } catch {
+    return null;
+  }
+}
+function batchContext(cursor, height, tip, reorgs = [], scannedHeight = null) {
   const tipHeight = tip.block_height;
+  const position = scannedHeight ?? height;
   return {
     cursor,
     height,
+    scannedHeight: position,
     tipHeight,
-    blocksBehind: height === null ? null : Math.max(0, tipHeight - height),
+    blocksBehind: position === null ? null : Math.max(0, tipHeight - position),
     tip,
     reorgs
   };
@@ -669,7 +680,8 @@ async function consumeStreamsEvents(opts) {
   const handledReorgs = new Set;
   let pages = 0;
   let emptyPolls = 0;
-  let height = null;
+  let height = resumeHeight(cursor);
+  let scanned = height;
   while (pages < maxPages && emptyPolls < maxEmptyPolls && !opts.signal?.aborted) {
     const envelope = await fetchPageWithRetry(() => opts.fetchEvents({
       cursor,
@@ -701,6 +713,7 @@ async function consumeStreamsEvents(opts) {
         }
         cursor = rewind;
         height = forkPoint > 0 ? forkPoint - 1 : null;
+        scanned = height;
         emptyPolls = 0;
         continue;
       }
@@ -708,7 +721,14 @@ async function consumeStreamsEvents(opts) {
     const emitted = finalizedOnly ? envelope.events.filter((event) => event.finalized) : envelope.events;
     const checkpoint = finalizedOnly ? emitted.at(-1)?.cursor ?? cursor : envelope.next_cursor;
     height = emitted.at(-1)?.block_height ?? height;
-    const ctx = batchContext(checkpoint, height, envelope.tip, envelope.reorgs);
+    if (emitted.length > 0) {
+      scanned = height;
+    } else if (checkpoint !== null && checkpoint !== cursor) {
+      scanned = resumeHeight(checkpoint) ?? scanned;
+    } else if (envelope.events.length === 0) {
+      scanned = envelope.tip.block_height;
+    }
+    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs, scanned);
     opts.onProgress?.(ctx);
     let nextCursor;
     if (opts.sink) {
@@ -836,7 +856,8 @@ async function consumeIndexFeed(opts) {
   const handledReorgs = new Set;
   let pages = 0;
   let emptyPolls = 0;
-  let height = null;
+  let height = resumeHeight(cursor);
+  let scanned = height;
   while (pages < maxPages && emptyPolls < maxEmptyPolls && !opts.signal?.aborted) {
     const envelope = await fetchPageWithRetry(() => opts.fetchPage({
       cursor,
@@ -862,6 +883,7 @@ async function consumeIndexFeed(opts) {
         }
         cursor = rewind;
         height = forkPoint > 0 ? forkPoint - 1 : null;
+        scanned = height;
         emptyPolls = 0;
         continue;
       }
@@ -870,7 +892,14 @@ async function consumeIndexFeed(opts) {
     const emitted = finalizedOnly ? items.filter((item) => item.block_height <= envelope.tip.finalized_height) : items;
     const checkpoint = finalizedOnly ? emitted.at(-1)?.cursor ?? cursor : envelope.next_cursor;
     height = emitted.at(-1)?.block_height ?? height;
-    const ctx = batchContext(checkpoint, height, envelope.tip, envelope.reorgs);
+    if (emitted.length > 0) {
+      scanned = height;
+    } else if (checkpoint !== null && checkpoint !== cursor) {
+      scanned = resumeHeight(checkpoint) ?? scanned;
+    } else {
+      scanned = finalizedOnly ? envelope.tip.finalized_height : envelope.tip.block_height;
+    }
+    const ctx = batchContext(checkpoint ?? cursor, height, envelope.tip, envelope.reorgs, scanned);
     opts.onProgress?.(ctx);
     let nextCursor;
     if (opts.sink) {
@@ -2203,5 +2232,5 @@ export {
   Subgraphs
 };
 
-//# debugId=5079C103BC48773D64756E2164756E21
+//# debugId=0E0B0BAAF8B4C44E64756E2164756E21
 //# sourceMappingURL=index.js.map