@secondlayer/subgraphs 1.2.1 → 1.2.2

package/README.md

@@ -89,6 +89,10 @@ Delivery bodies and response previews land in `subscription_deliveries`. Rows wh
 | `SECONDLAYER_EMIT_OUTBOX` | `true` | Set `false` to bypass outbox emission on every block (kill-switch). |
 | `SECONDLAYER_ALLOW_PRIVATE_EGRESS` | `false` | Allow the emitter to deliver to private IP ranges (localhost, 10/8, 172.16/12, 192.168/16, link-local, v6 mapped). Leave off in production. |
 | `SECONDLAYER_SECRETS_KEY` | — | 32-byte hex key for the AES-GCM envelope around subscription signing secrets. OSS mode auto-generates + persists to `.env.local`. |
+| `TENANT_PLAN` | unset | Dedicated hosting plan injected by the provisioner. `hobby` uses smaller reindex batches; unset and paid plans use standard batches. |
+| `SUBGRAPH_REINDEX_BATCH_SIZE` | plan-based | Override the default historical block batch size used by reindex/backfill. |
+| `SUBGRAPH_REINDEX_MIN_BATCH_SIZE` | plan-based | Override the adaptive lower bound for reindex/backfill batches. |
+| `SUBGRAPH_REINDEX_MAX_BATCH_SIZE` | plan-based | Override the adaptive upper bound for reindex/backfill batches. |
 
 ## Postgres + pool mode
 

package/dist/src/index.js

@@ -582,7 +582,8 @@ function buildEventPayload(filter, tx, event) {
         tx: txMeta
       };
     case "print_event": {
-      const rawValue = decoded.value;
+      const decodedRawValue = decoded.raw_value;
+      const rawValue = decodedRawValue && typeof decodedRawValue === "object" && !Array.isArray(decodedRawValue) ? decodedRawValue : decoded.value;
       const clarityObj = rawValue && typeof rawValue === "object" && !Array.isArray(rawValue) ? rawValue : null;
       const topic = clarityObj?.topic ? String(clarityObj.topic) : decoded.topic ?? "";
       const { topic: _, ...rest } = clarityObj ?? {};
@@ -893,7 +894,7 @@ function matchFilter(filter, transactions, eventsByTx) {
       for (const tx of transactions) {
         const txEvents = eventsByTx.get(tx.tx_id) ?? [];
         const matched = txEvents.filter((e) => {
-          if (e.type !== "smart_contract_event")
+          if (e.type !== "smart_contract_event" && e.type !== "contract_event")
             return false;
           const data = e.data;
           if (!data)
@@ -1508,9 +1509,44 @@ function avgEventsPerBlock(batch) {
 
 // src/runtime/reindex.ts
 var LOG_INTERVAL = 1000;
-var DEFAULT_BATCH_SIZE = 500;
-var MIN_BATCH_SIZE = 100;
-var MAX_BATCH_SIZE = 1000;
+var HOBBY_REINDEX_BATCH_CONFIG = {
+  defaultBatchSize: 50,
+  minBatchSize: 25,
+  maxBatchSize: 100
+};
+var STANDARD_REINDEX_BATCH_CONFIG = {
+  defaultBatchSize: 500,
+  minBatchSize: 100,
+  maxBatchSize: 1000
+};
+function initialReindexProgressBlock(fromBlock) {
+  return Math.max(0, fromBlock - 1);
+}
+function resolveReindexResumeBlock(row) {
+  if (row.reindex_from_block == null || row.reindex_to_block == null) {
+    return null;
+  }
+  const lastProcessedBlock = Number(row.last_processed_block);
+  const reindexFromBlock = Number(row.reindex_from_block);
+  return Math.max(lastProcessedBlock + 1, reindexFromBlock);
+}
+function parsePositiveInt(value) {
+  if (value == null || value.trim() === "")
+    return;
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
+}
+function resolveReindexBatchConfig(env = process.env) {
+  const base = env.TENANT_PLAN?.trim().toLowerCase() === "hobby" ? HOBBY_REINDEX_BATCH_CONFIG : STANDARD_REINDEX_BATCH_CONFIG;
+  const minBatchSize = parsePositiveInt(env.SUBGRAPH_REINDEX_MIN_BATCH_SIZE) ?? base.minBatchSize;
+  const maxBatchSize = parsePositiveInt(env.SUBGRAPH_REINDEX_MAX_BATCH_SIZE) ?? base.maxBatchSize;
+  const defaultBatchSize = parsePositiveInt(env.SUBGRAPH_REINDEX_BATCH_SIZE) ?? base.defaultBatchSize;
+  return {
+    minBatchSize,
+    maxBatchSize,
+    defaultBatchSize: Math.min(Math.max(defaultBatchSize, minBatchSize), maxBatchSize)
+  };
+}
 function coalesceFailedBlocks(blocks) {
   if (blocks.length === 0)
     return [];
@@ -1543,7 +1579,8 @@ async function processBlockRange(def, opts) {
   let blocksProcessed = 0;
   let totalEventsProcessed = 0;
   let totalErrors = 0;
-  let batchSize = DEFAULT_BATCH_SIZE;
+  const batchConfig = resolveReindexBatchConfig();
+  let batchSize = batchConfig.defaultBatchSize;
   let currentHeight = fromBlock;
   let aborted = false;
   let nextBatchEnd = Math.min(currentHeight + batchSize - 1, toBlock);
@@ -1626,9 +1663,9 @@ async function processBlockRange(def, opts) {
     }
     const avg = avgEventsPerBlock(batch);
     if (avg > 50)
-      batchSize = Math.max(Math.round(batchSize * 0.5), MIN_BATCH_SIZE);
+      batchSize = Math.max(Math.round(batchSize * 0.5), batchConfig.minBatchSize);
     else if (avg < 10)
-      batchSize = Math.min(Math.round(batchSize * 1.5), MAX_BATCH_SIZE);
+      batchSize = Math.min(Math.round(batchSize * 1.5), batchConfig.maxBatchSize);
     currentHeight = batchEnd + 1;
   }
   await stats.flush(targetDb);
@@ -1667,13 +1704,18 @@ async function reindexSubgraph(def, opts) {
       await updateSubgraphStatus2(targetDb, subgraphName, "active", 0);
       return { processed: 0 };
     }
-    await targetDb.updateTable("subgraphs").set({ reindex_from_block: fromBlock, reindex_to_block: toBlock }).where("name", "=", subgraphName).execute();
     await client.unsafe(`DROP SCHEMA IF EXISTS "${schemaName}" CASCADE`);
     const { statements } = generateSubgraphSQL(def, schemaName);
     for (const stmt of statements) {
       await client.unsafe(stmt);
     }
     logger5.info("Schema recreated for reindex", { subgraph: subgraphName });
+    await targetDb.updateTable("subgraphs").set({
+      last_processed_block: initialReindexProgressBlock(fromBlock),
+      reindex_from_block: fromBlock,
+      reindex_to_block: toBlock,
+      updated_at: new Date
+    }).where("name", "=", subgraphName).execute();
     logger5.info("Reindexing blocks", {
       subgraph: subgraphName,
       fromBlock,
@@ -1736,7 +1778,9 @@ async function resumeReindex(def, opts) {
   ]).where("name", "=", subgraphName).executeTakeFirst();
   if (!row)
     throw new Error(`Subgraph "${subgraphName}" not found`);
-  if (row.reindex_from_block == null || row.reindex_to_block == null) {
+  const fromBlock = resolveReindexResumeBlock(row);
+  const toBlock = Number(row.reindex_to_block);
+  if (fromBlock == null) {
     logger5.info("No reindex metadata, starting fresh reindex", {
       subgraph: subgraphName
     });
@@ -1745,8 +1789,6 @@ async function resumeReindex(def, opts) {
       signal: opts.signal
     });
   }
-  const fromBlock = Math.max(row.last_processed_block + 1, row.reindex_from_block);
-  const toBlock = row.reindex_to_block;
   if (fromBlock > toBlock) {
     logger5.info("Resume: no remaining blocks", { subgraph: subgraphName });
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
@@ -2089,5 +2131,5 @@ export {
   backfillSubgraph
 };
 
-//# debugId=E6D35F38651A38BA64756E2164756E21
+//# debugId=A62D0D17F8163B5364756E2164756E21
 //# sourceMappingURL=index.js.map