@secondlayer/subgraphs 0.5.6 → 0.6.0

package/dist/src/service.js

@@ -122,53 +122,83 @@ class SubgraphContext {
     }
     return opsToFlush.length;
   }
+  prepareInsert(op) {
+    const upsertKeys = op.data._upsert_keys;
+    const data = { ...op.data };
+    delete data._upsert_keys;
+    delete data._upsert_fallback_keys;
+    delete data._upsert_fallback_set;
+    data._block_height = this.block.height;
+    data._tx_id = this._tx.txId;
+    data._created_at = "NOW()";
+    const cols = Object.keys(data);
+    cols.forEach(validateColumnName);
+    const vals = cols.map((c) => data[c] === "NOW()" ? "NOW()" : escapeLiteral(data[c]));
+    const batchKey = `${op.table}:${[...cols].sort().join(",")}:${upsertKeys ? [...upsertKeys].sort().join(",") : ""}`;
+    return { data, cols, vals, upsertKeys, batchKey };
+  }
   buildStatements(ops) {
     const statements = [];
+    let currentBatch = null;
+    let currentBatchKey = "";
+    const flushInsertBatch = () => {
+      if (!currentBatch)
+        return;
+      const qualifiedTable = `"${this.pgSchemaName}"."${currentBatch.table}"`;
+      const colList = currentBatch.cols.map((c) => `"${c}"`).join(", ");
+      let rows = currentBatch.rows;
+      if (currentBatch.upsertKeys && currentBatch.upsertKeys.length > 0) {
+        const keyIndices = currentBatch.upsertKeys.map((k) => currentBatch.cols.indexOf(k));
+        const seen = new Map;
+        for (let i = 0;i < rows.length; i++) {
+          const key = keyIndices.map((ki) => rows[i][ki]).join("\x00");
+          seen.set(key, i);
+        }
+        if (seen.size < rows.length) {
+          rows = Array.from(seen.values()).map((i) => rows[i]);
+        }
+      }
+      const valuesList = rows.map((r) => `(${r.join(", ")})`).join(", ");
+      let stmt = `INSERT INTO ${qualifiedTable} (${colList}) VALUES ${valuesList}`;
+      if (currentBatch.upsertKeys && currentBatch.upsertKeys.length > 0) {
+        const updateCols = currentBatch.cols.filter((c) => !currentBatch.upsertKeys.includes(c) && !c.startsWith("_"));
+        if (updateCols.length > 0) {
+          const setClauses = updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`);
+          stmt += ` ON CONFLICT (${currentBatch.upsertKeys.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`;
+        } else {
+          stmt += ` ON CONFLICT (${currentBatch.upsertKeys.map((k) => `"${k}"`).join(", ")}) DO NOTHING`;
+        }
+      }
+      statements.push(stmt);
+      currentBatch = null;
+      currentBatchKey = "";
+    };
     for (const op of ops) {
       const qualifiedTable = `"${this.pgSchemaName}"."${op.table}"`;
-      switch (op.kind) {
-        case "insert": {
-          const upsertKeys = op.data._upsert_keys;
-          const fallbackKeys = op.data._upsert_fallback_keys;
-          const fallbackSet = op.data._upsert_fallback_set;
-          const data = { ...op.data };
-          delete data._upsert_keys;
-          delete data._upsert_fallback_keys;
-          delete data._upsert_fallback_set;
-          data._block_height = this.block.height;
-          data._tx_id = this._tx.txId;
-          data._created_at = "NOW()";
-          const cols = Object.keys(data);
-          cols.forEach(validateColumnName);
-          const vals = cols.map((c) => data[c] === "NOW()" ? "NOW()" : escapeLiteral(data[c]));
-          let stmt = `INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) VALUES (${vals.join(", ")})`;
-          if (upsertKeys && upsertKeys.length > 0) {
-            const updateCols = cols.filter((c) => !upsertKeys.includes(c) && !c.startsWith("_"));
-            if (updateCols.length > 0) {
-              const setClauses = updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`);
-              stmt += ` ON CONFLICT (${upsertKeys.map((k) => `"${k}"`).join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`;
-            } else {
-              stmt += ` ON CONFLICT (${upsertKeys.map((k) => `"${k}"`).join(", ")}) DO NOTHING`;
-            }
-          } else if (fallbackKeys && fallbackSet) {}
-          statements.push(stmt);
-          break;
+      if (op.kind === "insert") {
+        const { cols, vals, upsertKeys, batchKey } = this.prepareInsert(op);
+        if (batchKey === currentBatchKey && currentBatch) {
+          currentBatch.rows.push(vals);
+        } else {
+          flushInsertBatch();
+          currentBatch = { table: op.table, cols, rows: [vals], upsertKeys };
+          currentBatchKey = batchKey;
         }
-        case "update": {
+      } else {
+        flushInsertBatch();
+        if (op.kind === "update") {
           const setEntries = Object.entries(op.set);
           setEntries.forEach(([k]) => validateColumnName(k));
           const setClauses = setEntries.map(([k, v]) => `"${k}" = ${escapeLiteral(v)}`);
           const { clause } = buildWhereClause(op.data);
           statements.push(`UPDATE ${qualifiedTable} SET ${setClauses.join(", ")} WHERE ${clause}`);
-          break;
-        }
-        case "delete": {
+        } else if (op.kind === "delete") {
           const { clause } = buildWhereClause(op.data);
           statements.push(`DELETE FROM ${qualifiedTable} WHERE ${clause}`);
-          break;
         }
       }
     }
+    flushInsertBatch();
     return statements;
   }
   validateTable(table) {
@@ -418,6 +448,7 @@ import { updateSubgraphStatus, recordSubgraphProcessed } from "@secondlayer/shar
 import { pgSchemaName } from "@secondlayer/shared/db/queries/subgraphs";
 
 // src/runtime/block-processor.ts
+var schemaNameCache = new Map;
 async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   const db = getDb();
   const blockStart = performance.now();
@@ -428,19 +459,26 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     errors: 0,
     skipped: false
   };
-  const block = await db.selectFrom("blocks").selectAll().where("height", "=", blockHeight).executeTakeFirst();
-  if (!block) {
-    logger3.warn("Block not found for subgraph processing", { subgraph: subgraphName, blockHeight });
-    result.skipped = true;
-    return result;
-  }
-  if (!block.canonical) {
-    logger3.debug("Skipping non-canonical block", { subgraph: subgraphName, blockHeight });
-    result.skipped = true;
-    return result;
+  let block, txs, evts;
+  if (opts?.preloaded) {
+    block = opts.preloaded.block;
+    txs = opts.preloaded.txs;
+    evts = opts.preloaded.events;
+  } else {
+    block = await db.selectFrom("blocks").selectAll().where("height", "=", blockHeight).executeTakeFirst();
+    if (!block) {
+      logger3.warn("Block not found for subgraph processing", { subgraph: subgraphName, blockHeight });
+      result.skipped = true;
+      return result;
+    }
+    if (!block.canonical) {
+      logger3.debug("Skipping non-canonical block", { subgraph: subgraphName, blockHeight });
+      result.skipped = true;
+      return result;
+    }
+    txs = await db.selectFrom("transactions").selectAll().where("block_height", "=", blockHeight).execute();
+    evts = await db.selectFrom("events").selectAll().where("block_height", "=", blockHeight).execute();
   }
-  const txs = await db.selectFrom("transactions").selectAll().where("block_height", "=", blockHeight).execute();
-  const evts = await db.selectFrom("events").selectAll().where("block_height", "=", blockHeight).execute();
   const matched = matchSources(subgraph.sources, txs, evts);
   result.matched = matched.length;
   if (matched.length === 0) {
@@ -449,8 +487,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     }
     return result;
   }
-  const subgraphRecord = await db.selectFrom("subgraphs").select("schema_name").where("name", "=", subgraphName).executeTakeFirst();
-  const schemaName = subgraphRecord?.schema_name ?? pgSchemaName(subgraphName);
+  let schemaName = schemaNameCache.get(subgraphName);
+  if (!schemaName) {
+    const subgraphRecord = await db.selectFrom("subgraphs").select("schema_name").where("name", "=", subgraphName).executeTakeFirst();
+    schemaName = subgraphRecord?.schema_name ?? pgSchemaName(subgraphName);
+    schemaNameCache.set(subgraphName, schemaName);
+  }
   const blockMeta = {
     height: block.height,
     hash: block.hash,
@@ -578,8 +620,62 @@ class StatsAccumulator {
 import { getDb as getDb2 } from "@secondlayer/shared/db";
 import { logger as logger4 } from "@secondlayer/shared/logger";
 import { getSubgraph } from "@secondlayer/shared/db/queries/subgraphs";
+
+// src/runtime/batch-loader.ts
+async function loadBlockRange(db, fromHeight, toHeight) {
+  const [blocks, txs, events] = await Promise.all([
+    db.selectFrom("blocks").selectAll().where("height", ">=", fromHeight).where("height", "<=", toHeight).where("canonical", "=", true).execute(),
+    db.selectFrom("transactions").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute(),
+    db.selectFrom("events").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute()
+  ]);
+  const txsByHeight = new Map;
+  for (const tx of txs) {
+    const h = Number(tx.block_height);
+    const list = txsByHeight.get(h) ?? [];
+    list.push(tx);
+    txsByHeight.set(h, list);
+  }
+  const eventsByHeight = new Map;
+  for (const evt of events) {
+    const h = Number(evt.block_height);
+    const list = eventsByHeight.get(h) ?? [];
+    list.push(evt);
+    eventsByHeight.set(h, list);
+  }
+  const result = new Map;
+  for (const block of blocks) {
+    const h = Number(block.height);
+    result.set(h, {
+      block,
+      txs: txsByHeight.get(h) ?? [],
+      events: eventsByHeight.get(h) ?? []
+    });
+  }
+  return result;
+}
+function avgEventsPerBlock(batch) {
+  if (batch.size === 0)
+    return 0;
+  let totalEvents = 0;
+  for (const data of batch.values()) {
+    totalEvents += data.events.length;
+  }
+  return totalEvents / batch.size;
+}
+
+// src/runtime/catchup.ts
 var LOG_INTERVAL = 1000;
+var DEFAULT_BATCH_SIZE = 500;
+var MIN_BATCH_SIZE = 100;
+var MAX_BATCH_SIZE = 1000;
 var catchingUp = new Set;
+function adjustBatchSize(current, avgEvents) {
+  if (avgEvents > 50)
+    return Math.max(Math.round(current * 0.5), MIN_BATCH_SIZE);
+  if (avgEvents < 10)
+    return Math.min(Math.round(current * 1.5), MAX_BATCH_SIZE);
+  return current;
+}
 async function catchUpSubgraph(subgraph, subgraphName) {
   if (catchingUp.has(subgraphName))
     return 0;
@@ -606,24 +702,59 @@ async function catchUpSubgraph(subgraph, subgraphName) {
     });
     const stats = new StatsAccumulator(subgraphName, subgraphRow.api_key_id, true);
     let processed = 0;
-    for (let height = startBlock;height <= chainTip; height++) {
-      const result = await processBlock(subgraph, subgraphName, height);
-      processed++;
-      if (result.timing) {
-        stats.record(result.timing, result.processed);
-        if (stats.shouldFlush()) {
-          await stats.flush(db);
-        }
+    let batchSize = DEFAULT_BATCH_SIZE;
+    let currentHeight = startBlock;
+    let nextBatchPromise = loadBlockRange(db, currentHeight, Math.min(currentHeight + batchSize - 1, chainTip));
+    while (currentHeight <= chainTip) {
+      const batch = await nextBatchPromise;
+      const batchEnd = Math.min(currentHeight + batchSize - 1, chainTip);
+      const nextStart = batchEnd + 1;
+      if (nextStart <= chainTip) {
+        const nextEnd = Math.min(nextStart + batchSize - 1, chainTip);
+        nextBatchPromise = loadBlockRange(db, nextStart, nextEnd);
       }
-      if (processed % LOG_INTERVAL === 0) {
-        logger4.info("Subgraph catch-up progress", {
-          subgraph: subgraphName,
-          processed,
-          total: totalBlocks,
-          currentBlock: height,
-          pct: Math.round(processed / totalBlocks * 100)
-        });
+      for (let height = currentHeight;height <= batchEnd; height++) {
+        const blockData = batch.get(height);
+        if (!blockData) {
+          processed++;
+          continue;
+        }
+        let result;
+        try {
+          result = await processBlock(subgraph, subgraphName, height, {
+            preloaded: blockData
+          });
+        } catch (err) {
+          logger4.error("Block processing error during catch-up", {
+            subgraph: subgraphName,
+            blockHeight: height,
+            error: err instanceof Error ? err.message : String(err)
+          });
+          const { updateSubgraphStatus: updateSubgraphStatus2 } = await import("@secondlayer/shared/db/queries/subgraphs");
+          await updateSubgraphStatus2(db, subgraphName, "active", height).catch(() => {});
+          processed++;
+          continue;
+        }
+        processed++;
+        if (result.timing) {
+          stats.record(result.timing, result.processed);
+          if (stats.shouldFlush()) {
+            await stats.flush(db);
+          }
+        }
+        if (processed % LOG_INTERVAL === 0) {
+          logger4.info("Subgraph catch-up progress", {
+            subgraph: subgraphName,
+            processed,
+            total: totalBlocks,
+            currentBlock: height,
+            pct: Math.round(processed / totalBlocks * 100)
+          });
+        }
       }
+      const avg = avgEventsPerBlock(batch);
+      batchSize = adjustBatchSize(batchSize, avg);
+      currentHeight = batchEnd + 1;
     }
     await stats.flush(db);
     logger4.info("Subgraph catch-up complete", {
@@ -650,7 +781,7 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
   logger5.info("Propagating reorg to subgraphs", { blockHeight, subgraphCount: activeSubgraphs.length });
   for (const sg of activeSubgraphs) {
     try {
-      const schema = sg.definition?.schema;
+      const schema = sg.definition.schema;
       if (!schema)
         continue;
       const schemaName = sg.schema_name ?? pgSchemaName(sg.name);
@@ -789,5 +920,5 @@ var shutdown = async () => {
 process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 
-//# debugId=3ED765B9AA3142E064756E2164756E21
+//# debugId=4CDF75EDA895AA0964756E2164756E21
 //# sourceMappingURL=service.js.map