@secondlayer/subgraphs 1.3.1 → 1.3.3

package/dist/src/runtime/reindex.js

@@ -187,9 +187,9 @@ class SubgraphContext {
       const blockHeight = op.data._block_height ?? this.block.height;
       const txId = op.data._tx_id ?? this._tx.txId;
       const baseRow = op.kind === "update" ? { ...op.data, ...op.set ?? {} } : { ...op.data };
-      delete baseRow._upsert_keys;
-      delete baseRow._upsert_fallback_keys;
-      delete baseRow._upsert_fallback_set;
+      baseRow._upsert_keys = undefined;
+      baseRow._upsert_fallback_keys = undefined;
+      baseRow._upsert_fallback_set = undefined;
       return {
         op: op.kind,
         table: op.table,
@@ -1336,16 +1336,16 @@ function generateSubgraphSQL(def, schemaNameOverride) {
   const statements = [];
   const needsTrgm = Object.values(def.schema).some((table) => Object.values(table.columns).some((col) => col.search));
   if (needsTrgm) {
-    statements.push(`CREATE EXTENSION IF NOT EXISTS pg_trgm`);
+    statements.push("CREATE EXTENSION IF NOT EXISTS pg_trgm");
   }
   statements.push(`CREATE SCHEMA IF NOT EXISTS ${schemaName}`);
   for (const [tableName, tableDef] of Object.entries(def.schema)) {
     const qualifiedName = `${schemaName}.${tableName}`;
     const columnDefs = [
-      `_id BIGSERIAL PRIMARY KEY`,
-      `_block_height BIGINT NOT NULL`,
-      `_tx_id TEXT NOT NULL`,
-      `_created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()`
+      "_id BIGSERIAL PRIMARY KEY",
+      "_block_height BIGINT NOT NULL",
+      "_tx_id TEXT NOT NULL",
+      "_created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()"
     ];
     for (const [colName, col] of Object.entries(tableDef.columns)) {
       const sqlType = TYPE_MAP[col.type];
@@ -1441,6 +1441,7 @@ 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,
@@ -1515,6 +1516,8 @@ async function processBlockRange(def, opts) {
   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;
@@ -1527,6 +1530,7 @@ async function processBlockRange(def, opts) {
     pendingErrors = 0;
     pendingLastError = undefined;
     lastHealthFlushBlock = blocksProcessed;
+    lastHealthFlushAt = Date.now();
   };
   let nextBatchEnd = Math.min(currentHeight + batchSize - 1, toBlock);
   let nextBatchPromise = loadBlockRange(sourceDb, currentHeight, nextBatchEnd);
@@ -1590,8 +1594,11 @@ async function processBlockRange(def, opts) {
           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`, {
@@ -1603,7 +1610,11 @@ async function processBlockRange(def, opts) {
         });
       }
     }
-    if (blocksProcessed - lastHealthFlushBlock >= HEALTH_FLUSH_INTERVAL) {
+    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) {
@@ -1849,5 +1860,5 @@ export {
   backfillSubgraph
 };
 
-//# debugId=B7B10AB9772AECD264756E2164756E21
+//# debugId=7C79195F11AC7A3264756E2164756E21
 //# sourceMappingURL=reindex.js.map