@secondlayer/subgraphs 6.6.1 → 7.0.0

package/dist/runtime/emitter.js

@@ -11,18 +11,21 @@ import { listen, targetListenerUrl } from "@secondlayer/shared/queue/listener";
 import {
   webhookTimeoutMsCeiling
 } from "@secondlayer/shared/schemas/webhooks";
-import { sql as sql2 } from "kysely";
+import { sql } from "kysely";
 
 // src/runtime/formats/index.ts
 import { signSecondlayerWebhook } from "@secondlayer/shared/crypto/secondlayer-webhook";
 import { logger } from "@secondlayer/shared/logger";
 
 // src/runtime/formats/cloudevents.ts
+function chainOf(payload) {
+  return payload?.chain === "bitcoin" ? "bitcoin" : "stacks";
+}
 function buildCloudEvents(outboxRow, _sub) {
   const event = {
     specversion: "1.0",
     type: outboxRow.event_type,
-    source: `secondlayer:${outboxRow.subgraph_name}`,
+    source: `secondlayer:${chainOf(outboxRow.payload)}`,
     id: outboxRow.id,
     time: new Date(outboxRow.created_at).toISOString(),
     datacontenttype: "application/json",
@@ -191,178 +194,6 @@ function recordDelivery() {
   pending += 1;
 }
 
-// src/runtime/webhook-state.ts
-import { sql } from "kysely";
-
-// src/runtime/emitter-matcher.ts
-function isPrimitive(v) {
-  const t = typeof v;
-  return t === "string" || t === "number" || t === "boolean";
-}
-function coerceBigInt(v) {
-  if (typeof v === "bigint")
-    return v;
-  if (typeof v === "number") {
-    if (!Number.isFinite(v))
-      return null;
-    if (!Number.isInteger(v))
-      return null;
-    return BigInt(v);
-  }
-  if (typeof v === "string" && /^-?\d+$/.test(v)) {
-    try {
-      return BigInt(v);
-    } catch {
-      return null;
-    }
-  }
-  return null;
-}
-function coerceFloat(v) {
-  if (typeof v === "number" && Number.isFinite(v))
-    return v;
-  if (typeof v === "bigint")
-    return Number(v);
-  if (typeof v === "string" && v !== "" && !Number.isNaN(Number(v))) {
-    return Number(v);
-  }
-  return null;
-}
-function compareNumeric(a, b) {
-  const ba = coerceBigInt(a);
-  const bb = coerceBigInt(b);
-  if (ba !== null && bb !== null) {
-    if (ba === bb)
-      return 0;
-    return ba > bb ? 1 : -1;
-  }
-  const fa = coerceFloat(a);
-  const fb = coerceFloat(b);
-  if (fa === null || fb === null)
-    return null;
-  if (fa === fb)
-    return 0;
-  return fa > fb ? 1 : -1;
-}
-function matchClause(rowValue, clause) {
-  const rowIsPrimitive = isPrimitive(rowValue) || typeof rowValue === "bigint";
-  if (isPrimitive(clause)) {
-    if (!rowIsPrimitive)
-      return false;
-    if (typeof clause === "number" || typeof rowValue === "number" || typeof rowValue === "bigint") {
-      const cmp = compareNumeric(rowValue, clause);
-      if (cmp !== null)
-        return cmp === 0;
-    }
-    return rowValue === clause || String(rowValue) === String(clause);
-  }
-  if (clause === null || typeof clause !== "object" || Array.isArray(clause)) {
-    return false;
-  }
-  const keys = Object.keys(clause);
-  if (keys.length !== 1)
-    return false;
-  const op = keys[0];
-  const c = clause;
-  switch (op) {
-    case "eq":
-      return matchClause(rowValue, c.eq);
-    case "neq":
-      return !matchClause(rowValue, c.neq);
-    case "gt":
-    case "gte":
-    case "lt":
-    case "lte": {
-      if (!rowIsPrimitive)
-        return false;
-      const cmp = compareNumeric(rowValue, c[op]);
-      if (cmp === null)
-        return false;
-      if (op === "gt")
-        return cmp > 0;
-      if (op === "gte")
-        return cmp >= 0;
-      if (op === "lt")
-        return cmp < 0;
-      return cmp <= 0;
-    }
-    case "in": {
-      const list = c.in;
-      if (!Array.isArray(list))
-        return false;
-      if (!rowIsPrimitive)
-        return false;
-      return list.some((item) => isPrimitive(item) && matchClause(rowValue, item));
-    }
-    default:
-      return false;
-  }
-}
-function matchesFilter(filter, row) {
-  if (!filter || Object.keys(filter).length === 0)
-    return true;
-  for (const [col, clause] of Object.entries(filter)) {
-    if (!matchClause(row[col], clause))
-      return false;
-  }
-  return true;
-}
-function key(subgraphName, tableName) {
-  return `${subgraphName}\x00${tableName}`;
-}
-
-class WebhookMatcher {
-  byKey = new Map;
-  byId = new Map;
-  setAll(subs) {
-    this.byKey.clear();
-    this.byId.clear();
-    for (const sub of subs) {
-      if (sub.status !== "active")
-        continue;
-      if (sub.kind !== "subgraph" || !sub.subgraph_name || !sub.table_name)
-        continue;
-      this.byId.set(sub.id, sub);
-      const k = key(sub.subgraph_name, sub.table_name);
-      const arr = this.byKey.get(k);
-      if (arr)
-        arr.push(sub);
-      else
-        this.byKey.set(k, [sub]);
-    }
-  }
-  match(subgraphName, tableName, row) {
-    const bucket = this.byKey.get(key(subgraphName, tableName));
-    if (!bucket)
-      return [];
-    const hits = [];
-    for (const sub of bucket) {
-      if (matchesFilter(sub.filter, row))
-        hits.push(sub);
-    }
-    return hits;
-  }
-  has(subgraphName, tableName) {
-    return this.byKey.has(key(subgraphName, tableName));
-  }
-  size() {
-    return this.byId.size;
-  }
-  get(id) {
-    return this.byId.get(id);
-  }
-}
-
-// src/runtime/webhook-state.ts
-var matcher = new WebhookMatcher;
-async function refreshMatcher(db) {
-  const rows = await sql`
-		SELECT * FROM webhooks WHERE status = 'active'
-	`.execute(db);
-  matcher.setAll(rows.rows);
-  return matcher.size();
-}
-
 // src/runtime/emitter.ts
 var BATCH_SIZE = 50;
 var LIVE_SHARE = 0.9;
@@ -598,12 +429,10 @@ function buildTestOutboxRow(sub) {
     id: randomUUID(),
     webhook_id: sub.id,
     kind: sub.kind,
-    subgraph_name: sub.subgraph_name ?? null,
-    table_name: sub.table_name ?? null,
     block_height: 0,
     tx_id: null,
     row_pk: null,
-    event_type: sub.kind === "chain" ? "chain.test.apply" : `${sub.subgraph_name ?? "subgraph"}.${sub.table_name ?? "test"}.created`,
+    event_type: "chain.test.apply",
     payload: {
       test: true,
       message: "Secondlayer test delivery",
@@ -694,7 +523,7 @@ async function settleFailed(db, outboxRow, sub, errText) {
       });
       return;
     }
-    const incResult = await sql2`
+    const incResult = await sql`
 			UPDATE webhooks
 			SET circuit_failures = circuit_failures + 1,
 				last_delivery_at = NOW(),
@@ -756,23 +585,23 @@ async function claimAndDispatchOnce(db, state, emitterId, trigger) {
   const liveLimit = Math.max(1, Math.round(BATCH_SIZE * LIVE_SHARE));
   const replayLimit = BATCH_SIZE - liveLimit;
   const { combined, liveCount, replayCount } = await db.transaction().execute(async (tx) => {
-    const live = await sql2`
+    const live = await sql`
 					SELECT * FROM webhook_outbox
 					WHERE status = 'pending'
 						AND next_attempt_at <= NOW()
 						AND is_replay = FALSE
 					ORDER BY next_attempt_at ASC
 					FOR UPDATE SKIP LOCKED
-					LIMIT ${sql2.lit(liveLimit)}
+					LIMIT ${sql.lit(liveLimit)}
 				`.execute(tx);
-    const replay = await sql2`
+    const replay = await sql`
 					SELECT * FROM webhook_outbox
 					WHERE status = 'pending'
 						AND next_attempt_at <= NOW()
 						AND is_replay = TRUE
 					ORDER BY next_attempt_at ASC
 					FOR UPDATE SKIP LOCKED
-					LIMIT ${sql2.lit(replayLimit)}
+					LIMIT ${sql.lit(replayLimit)}
 				`.execute(tx);
     const rows = [...live.rows, ...replay.rows];
     if (rows.length === 0) {
@@ -891,15 +720,15 @@ async function runOne(db, state, sq, row) {
   }
 }
 async function runRetention(db) {
-  await sql2`
+  await sql`
 		DELETE FROM webhook_outbox
 		WHERE status = 'delivered' AND delivered_at < NOW() - interval '7 days'
 	`.execute(db);
-  await sql2`
+  await sql`
 		DELETE FROM webhook_deliveries
 		WHERE dispatched_at < NOW() - interval '30 days'
 	`.execute(db);
-  await sql2`
+  await sql`
 		DELETE FROM webhook_outbox
 		WHERE status = 'dead' AND failed_at < NOW() - interval '90 days'
 	`.execute(db);
@@ -918,27 +747,6 @@ async function startEmitter(opts) {
   const pollIntervalMs = opts?.pollIntervalMs ?? 120000;
   const retentionIntervalMs = opts?.retentionIntervalMs ?? 60 * 60000;
   logger3.info("[emitter] started", { id: emitterId });
-  const MATCHER_BOOT_ATTEMPTS = 5;
-  let lastErr = null;
-  for (let i = 0;i < MATCHER_BOOT_ATTEMPTS; i++) {
-    try {
-      await refreshMatcher(db);
-      lastErr = null;
-      break;
-    } catch (err) {
-      lastErr = err;
-      const delayMs = 500 * 2 ** i;
-      logger3.warn("[emitter] matcher refresh failed, retrying", {
-        attempt: i + 1,
-        delayMs,
-        error: err instanceof Error ? err.message : String(err)
-      });
-      await new Promise((r) => setTimeout(r, delayMs));
-    }
-  }
-  if (lastErr) {
-    throw new Error(`[emitter] matcher refresh failed ${MATCHER_BOOT_ATTEMPTS}×; aborting boot: ${lastErr instanceof Error ? lastErr.message : String(lastErr)}`);
-  }
   const listenUrl = targetListenerUrl();
   const stopNew = await listen("webhooks:new_outbox", () => {
     if (!state.running)
@@ -950,9 +758,6 @@ async function startEmitter(opts) {
   const stopChanged = await listen("webhooks:changed", () => {
     if (!state.running)
       return;
-    refreshMatcher(db).catch((err) => logger3.error("[emitter] matcher refresh failed", {
-      error: err instanceof Error ? err.message : String(err)
-    }));
     claimAndDrain(db, state, emitterId, "changed").catch((err) => logger3.error("[emitter] claim failed", {
       error: err instanceof Error ? err.message : String(err)
     }));
@@ -1018,5 +823,5 @@ export {
   startEmitter
 };
 
-//# debugId=F345D8FE7F2FF6CC64756E2164756E21
+//# debugId=CAA46708A06EDDEB64756E2164756E21
 //# sourceMappingURL=emitter.js.map