@secondlayer/subgraphs 1.0.0 → 1.1.0

package/dist/src/service.js

@@ -927,7 +927,7 @@ async function emitSubscriptionOutbox(tx, subgraphName, manifest, matcher, block
         subgraph_name: subgraphName,
         table_name: write.table,
         block_height: blockHeight,
-        tx_id: write.pk.txId || null,
+        tx_id: write.pk.txId ?? null,
         row_pk: write.pk,
         event_type: eventType,
         payload: write.row,
@@ -950,7 +950,26 @@ function isPrimitive(v) {
   const t = typeof v;
   return t === "string" || t === "number" || t === "boolean";
 }
-function coerceNumeric(v) {
+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")
@@ -960,13 +979,31 @@ function coerceNumeric(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 (typeof clause === "number" || typeof rowValue === "number") {
-      const a = coerceNumeric(rowValue);
-      const b = coerceNumeric(clause);
-      if (a !== null && b !== null)
-        return a === b;
+    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);
   }
@@ -987,22 +1024,25 @@ function matchClause(rowValue, clause) {
     case "gte":
     case "lt":
     case "lte": {
-      const a = coerceNumeric(rowValue);
-      const b = coerceNumeric(c[op]);
-      if (a === null || b === null)
+      if (!rowIsPrimitive)
+        return false;
+      const cmp = compareNumeric(rowValue, c[op]);
+      if (cmp === null)
         return false;
       if (op === "gt")
-        return a > b;
+        return cmp > 0;
       if (op === "gte")
-        return a >= b;
+        return cmp >= 0;
       if (op === "lt")
-        return a < b;
-      return a <= b;
+        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:
@@ -1185,7 +1225,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
           });
         }
       }
-    } catch {}
+    } catch (err) {
+      logger4.debug("Row count sample failed", {
+        subgraph: subgraphName,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
   }
   return result;
 }
@@ -1544,11 +1589,7 @@ import { decryptSecret } from "@secondlayer/shared/crypto/secrets";
 function resolveBearer(sub) {
   const cfg = sub.auth_config;
   if (cfg.tokenEnc) {
-    try {
-      return decryptSecret(Buffer.from(cfg.tokenEnc, "base64"));
-    } catch {
-      return null;
-    }
+    return decryptSecret(Buffer.from(cfg.tokenEnc, "base64"));
   }
   return cfg.token ?? null;
 }
@@ -1608,15 +1649,16 @@ function buildRaw(outboxRow, sub) {
 // src/runtime/formats/standard-webhooks.ts
 import { sign } from "@secondlayer/shared/crypto/standard-webhooks";
 function buildStandardWebhooks(outboxRow, signingSecret) {
+  const nowSeconds = Math.floor(Date.now() / 1000);
   const payload = {
     type: outboxRow.event_type,
-    timestamp: new Date(outboxRow.created_at).toISOString(),
+    timestamp: new Date(nowSeconds * 1000).toISOString(),
     data: outboxRow.payload
   };
   const body = JSON.stringify(payload);
   const sigHeaders = sign(body, signingSecret, {
     id: outboxRow.id,
-    timestampSeconds: Math.floor(new Date(outboxRow.created_at).getTime() / 1000)
+    timestampSeconds: nowSeconds
   });
   return {
     body,
@@ -1632,11 +1674,7 @@ import { decryptSecret as decryptSecret2 } from "@secondlayer/shared/crypto/secr
 function resolveBearer2(sub) {
   const cfg = sub.auth_config;
   if (cfg.tokenEnc) {
-    try {
-      return decryptSecret2(Buffer.from(cfg.tokenEnc, "base64"));
-    } catch {
-      return null;
-    }
+    return decryptSecret2(Buffer.from(cfg.tokenEnc, "base64"));
   }
   return cfg.token ?? null;
 }
@@ -1685,6 +1723,7 @@ var BATCH_SIZE = 50;
 var LIVE_SHARE = 0.9;
 var BACKOFF_SECONDS = [30, 120, 600, 3600, 21600, 86400, 259200];
 var CIRCUIT_THRESHOLD = 20;
+var LOCK_WINDOW_MS = 60000;
 function nextDelaySeconds(attempt) {
   return BACKOFF_SECONDS[Math.min(attempt, BACKOFF_SECONDS.length - 1)];
 }
@@ -1707,13 +1746,34 @@ function isPrivateEgress(url) {
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
     return true;
   }
-  const host = parsed.hostname.toLowerCase();
-  if (host === "localhost")
+  const raw = parsed.hostname.toLowerCase();
+  const host = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  if (host === "localhost" || host === "0.0.0.0")
+    return true;
+  if (host === "::" || host === "::1")
     return true;
-  if (host === "::1" || host === "[::1]")
+  if (/^f[cd][0-9a-f]{2}:/.test(host))
     return true;
-  if (host.startsWith("fd") || host.startsWith("fe80:"))
+  if (/^fe[89ab][0-9a-f]:/.test(host))
     return true;
+  const mapped = host.match(/^::ffff:(.+)$/);
+  if (mapped) {
+    const inner = mapped[1];
+    if (/^\d+\.\d+\.\d+\.\d+$/.test(inner)) {
+      for (const p of PRIVATE_V4_PATTERNS)
+        if (p.test(inner))
+          return true;
+    }
+    const hex = inner.match(/^([0-9a-f]{1,4}):([0-9a-f]{1,4})$/);
+    if (hex) {
+      const a = Number.parseInt(hex[1], 16);
+      const b = Number.parseInt(hex[2], 16);
+      const dotted = `${a >> 8 & 255}.${a & 255}.${b >> 8 & 255}.${b & 255}`;
+      for (const p of PRIVATE_V4_PATTERNS)
+        if (p.test(dotted))
+          return true;
+    }
+  }
   for (const p of PRIVATE_V4_PATTERNS) {
     if (p.test(host))
       return true;
@@ -1812,16 +1872,23 @@ async function settleFailed(db, outboxRow, sub, errText) {
       locked_by: null,
       locked_until: null
     }).where("id", "=", outboxRow.id).execute();
-    const newFailures = sub.circuit_failures + 1;
+    const incResult = await sql4`
+			UPDATE subscriptions
+			SET circuit_failures = circuit_failures + 1,
+				last_delivery_at = NOW(),
+				last_error = ${errText.slice(0, 500)},
+				updated_at = NOW()
+			WHERE id = ${sub.id}
+			RETURNING circuit_failures
+		`.execute(tx);
+    const newFailures = incResult.rows[0]?.circuit_failures ?? sub.circuit_failures + 1;
     const shouldTripCircuit = newFailures >= CIRCUIT_THRESHOLD;
-    await tx.updateTable("subscriptions").set({
-      last_delivery_at: new Date,
-      last_error: errText.slice(0, 500),
-      circuit_failures: newFailures,
-      ...shouldTripCircuit ? { status: "paused", circuit_opened_at: new Date } : {},
-      updated_at: new Date
-    }).where("id", "=", outboxRow.subscription_id).execute();
     if (shouldTripCircuit) {
+      await tx.updateTable("subscriptions").set({
+        status: "paused",
+        circuit_opened_at: new Date,
+        updated_at: new Date
+      }).where("id", "=", sub.id).execute();
       logger8.warn("Subscription circuit tripped — paused after consecutive failures", {
         subscription: sub.name,
         failures: newFailures
@@ -1859,8 +1926,12 @@ async function claimAndDrain(db, state, emitterId) {
       if (combined.length === 0)
         return [];
       const now = new Date;
-      const lockUntil = new Date(now.getTime() + 60000);
-      await tx.updateTable("subscription_outbox").set({ locked_by: emitterId, locked_until: lockUntil }).where("id", "in", combined.map((r) => r.id)).execute();
+      const lockUntil = new Date(now.getTime() + LOCK_WINDOW_MS);
+      await tx.updateTable("subscription_outbox").set({
+        locked_by: emitterId,
+        locked_until: lockUntil,
+        next_attempt_at: lockUntil
+      }).where("id", "in", combined.map((r) => r.id)).execute();
       return combined;
     });
     if (claimed.length === 0)
@@ -1944,11 +2015,27 @@ async function startEmitter(opts) {
   const pollIntervalMs = opts?.pollIntervalMs ?? 120000;
   const retentionIntervalMs = opts?.retentionIntervalMs ?? 60 * 60000;
   logger8.info("[emitter] started", { id: emitterId });
-  await refreshMatcher(db).catch((err) => {
-    logger8.error("[emitter] initial matcher refresh failed", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-  });
+  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;
+      logger8.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 stopNew = await listen("subscriptions:new_outbox", () => {
     if (!state.running)
       return;
@@ -2140,5 +2227,5 @@ var shutdown = async () => {
 process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 
-//# debugId=4DE5FBD02184D64464756E2164756E21
+//# debugId=C2E636DFAA9174B264756E2164756E21
 //# sourceMappingURL=service.js.map