@secondlayer/subgraphs 1.3.0 → 1.3.2

package/dist/src/service.js

@@ -1440,6 +1440,8 @@ function avgEventsPerBlock(batch) {
 
 // src/runtime/reindex.ts
 var LOG_INTERVAL = 1000;
+var HEALTH_FLUSH_INTERVAL = 1000;
+var PROGRESS_FLUSH_INTERVAL_MS = 5000;
 var HOBBY_REINDEX_BATCH_CONFIG = {
   defaultBatchSize: 50,
   minBatchSize: 25,
@@ -1510,10 +1512,26 @@ async function processBlockRange(def, opts) {
   let blocksProcessed = 0;
   let totalEventsProcessed = 0;
   let totalErrors = 0;
+  let pendingEventsProcessed = 0;
+  let pendingErrors = 0;
+  let pendingLastError;
+  let lastHealthFlushBlock = 0;
+  let lastHealthFlushAt = Date.now();
+  let lastProgressFlushAt = Date.now();
   const batchConfig = resolveReindexBatchConfig();
   let batchSize = batchConfig.defaultBatchSize;
   let currentHeight = fromBlock;
   let aborted = false;
+  const flushHealth = async () => {
+    if (pendingEventsProcessed === 0 && pendingErrors === 0)
+      return;
+    await recordSubgraphProcessed2(targetDb, subgraphName, pendingEventsProcessed, pendingErrors, pendingLastError);
+    pendingEventsProcessed = 0;
+    pendingErrors = 0;
+    pendingLastError = undefined;
+    lastHealthFlushBlock = blocksProcessed;
+    lastHealthFlushAt = Date.now();
+  };
   let nextBatchEnd = Math.min(currentHeight + batchSize - 1, toBlock);
   let nextBatchPromise = loadBlockRange(sourceDb, currentHeight, nextBatchEnd);
   while (currentHeight <= toBlock) {
@@ -1556,22 +1574,31 @@ async function processBlockRange(def, opts) {
         });
         batchFailedBlocks.push({ height, reason: "processing_error" });
         await updateSubgraphStatus2(targetDb, subgraphName, status, height).catch(() => {});
-        await recordSubgraphProcessed2(targetDb, subgraphName, 0, 1, errorMsg).catch(() => {});
         blocksProcessed++;
         totalErrors++;
+        pendingErrors++;
+        pendingLastError = errorMsg;
         continue;
       }
       blocksProcessed++;
       totalEventsProcessed += result.processed;
       totalErrors += result.errors;
+      pendingEventsProcessed += result.processed;
+      pendingErrors += result.errors;
+      if (result.errors > 0) {
+        pendingLastError = `${result.errors} error(s) while processing block ${height}`;
+      }
       if (result.timing) {
         stats.record(result.timing, result.processed);
         if (stats.shouldFlush()) {
           await stats.flush(targetDb);
         }
       }
-      if (blocksProcessed % 100 === 0) {
+      const now = Date.now();
+      const shouldFlushProgress = blocksProcessed % 100 === 0 || now - lastProgressFlushAt >= PROGRESS_FLUSH_INTERVAL_MS;
+      if (shouldFlushProgress) {
         await updateSubgraphStatus2(targetDb, subgraphName, status, height);
+        lastProgressFlushAt = now;
       }
       if (blocksProcessed % LOG_INTERVAL === 0) {
         logger5.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
@@ -1583,6 +1610,13 @@ async function processBlockRange(def, opts) {
         });
       }
     }
+    if (status === "reindexing" && blocksProcessed > 0) {
+      await updateSubgraphStatus2(targetDb, subgraphName, status, batchEnd);
+    }
+    const shouldFlushHealth = blocksProcessed - lastHealthFlushBlock >= HEALTH_FLUSH_INTERVAL || Date.now() - lastHealthFlushAt >= PROGRESS_FLUSH_INTERVAL_MS;
+    if (shouldFlushHealth) {
+      await flushHealth();
+    }
     if (batchFailedBlocks.length > 0 && opts.subgraphId) {
       const gaps = coalesceFailedBlocks(batchFailedBlocks);
       await recordGapBatch(targetDb, opts.subgraphId, subgraphName, gaps).catch((err) => {
@@ -1600,6 +1634,7 @@ async function processBlockRange(def, opts) {
     currentHeight = batchEnd + 1;
   }
   await stats.flush(targetDb);
+  await flushHealth();
   return { blocksProcessed, totalEventsProcessed, totalErrors, aborted };
 }
 async function resolveBlockRange(sourceDb, def, opts) {
@@ -1645,6 +1680,10 @@ async function reindexSubgraph(def, opts) {
       last_processed_block: initialReindexProgressBlock(fromBlock),
       reindex_from_block: fromBlock,
       reindex_to_block: toBlock,
+      total_processed: 0,
+      total_errors: 0,
+      last_error: null,
+      last_error_at: null,
       updated_at: new Date
     }).where("name", "=", subgraphName).execute();
     logger5.info("Reindexing blocks", {
@@ -1676,10 +1715,6 @@ async function reindexSubgraph(def, opts) {
       }
       return { processed: result.blocksProcessed };
     }
-    const { recordSubgraphProcessed: recordSubgraphProcessed3 } = await import("@secondlayer/shared/db/queries/subgraphs");
-    if (result.totalEventsProcessed > 0 || result.totalErrors > 0) {
-      await recordSubgraphProcessed3(targetDb, subgraphName, result.totalEventsProcessed, result.totalErrors, result.totalErrors > 0 ? `${result.totalErrors} error(s) during reindex` : undefined);
-    }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
     logger5.info("Reindex complete", {
@@ -1755,10 +1790,6 @@ async function resumeReindex(def, opts) {
       }
       return { processed: result.blocksProcessed };
     }
-    const { recordSubgraphProcessed: recordSubgraphProcessed3 } = await import("@secondlayer/shared/db/queries/subgraphs");
-    if (result.totalEventsProcessed > 0 || result.totalErrors > 0) {
-      await recordSubgraphProcessed3(targetDb, subgraphName, result.totalEventsProcessed, result.totalErrors, result.totalErrors > 0 ? `${result.totalErrors} error(s) during resumed reindex` : undefined);
-    }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
     logger5.info("Resumed reindex complete", {
@@ -1805,10 +1836,6 @@ async function backfillSubgraph(def, opts) {
         resolved
       });
     }
-    const { recordSubgraphProcessed: recordSubgraphProcessed3 } = await import("@secondlayer/shared/db/queries/subgraphs");
-    if (result.totalEventsProcessed > 0 || result.totalErrors > 0) {
-      await recordSubgraphProcessed3(targetDb, subgraphName, result.totalEventsProcessed, result.totalErrors, result.totalErrors > 0 ? `${result.totalErrors} error(s) during backfill` : undefined);
-    }
     logger5.info("Backfill complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed,
@@ -2720,7 +2747,7 @@ async function startSubgraphOperationRunner(opts) {
     }, HEARTBEAT_INTERVAL_MS);
     const cancelPoll = setInterval(() => {
       getSubgraphOperation(db, operation.id).then((row) => {
-        if (row?.cancel_requested && !controller.signal.aborted) {
+        if ((!row || row.cancel_requested) && !controller.signal.aborted) {
           controller.abort("user-cancelled");
         }
       }).catch((err) => {
@@ -2930,5 +2957,5 @@ var shutdown = async () => {
 process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 
-//# debugId=48A79220FFF1766364756E2164756E21
+//# debugId=C53337E6DAF60BED64756E2164756E21
 //# sourceMappingURL=service.js.map