@orangecheck/sdk 1.3.0 → 1.5.0

package/dist/index.mjs

@@ -191,16 +191,25 @@ var log = createLogger("ocp/nostr");
 var ATTESTATION_EVENT_KIND = 30078;
 var DEFAULT_RELAYS = [
   "wss://relay.damus.io",
-  "wss://relay.nostr.band",
   "wss://nos.lol",
-  "wss://relay.snort.social"
+  "wss://relay.snort.social",
+  "wss://relay.ochk.io"
 ];
+var FANOUT_DEADLINE_MS = 4e3;
+var QUERY_TIMEOUT_MS = 1e4;
+function budgetFor(deadlineAt) {
+  return Math.max(0, Math.min(QUERY_TIMEOUT_MS, deadlineAt - Date.now()));
+}
 function createAttestationEvent(envelope, pubkey) {
   const tags = [
     ["d", envelope.attestation_id],
-    // Parameterized replaceable event identifier
+    // Parameterized replaceable event identifier (indexed)
+    ["t", envelope.address],
+    // Indexed btc-address tag — query with `#t`
+    ["t", "oc-attest"],
+    // Family marker — `#t=["oc-attest"]` for cross-cut discovery
     ["address", envelope.address],
-    // Bitcoin address
+    // Diagnostic / legacy — relay won't index this
     ["scheme", envelope.scheme],
     // Signature scheme (bip322 or legacy)
     ["issued_at", envelope.issued_at]
@@ -230,8 +239,20 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
   const success = [];
   const failed = [];
   log.info({ eventId: event.id, relayCount: relays.length }, "Publishing event to relays");
+  const deadlineAt = Date.now() + FANOUT_DEADLINE_MS;
   const publishPromises = relays.map(async (relayUrl) => {
     let ws = null;
+    let settled = false;
+    const recordSuccess = () => {
+      if (settled) return;
+      settled = true;
+      success.push(relayUrl);
+    };
+    const recordFailure = () => {
+      if (settled) return;
+      settled = true;
+      failed.push(relayUrl);
+    };
     try {
       ws = new WebSocket(relayUrl);
       const wsRef = ws;
@@ -239,7 +260,7 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
         const deadline = setTimeout(() => {
           wsRef.close();
           reject(new Error("Relay publish timeout"));
-        }, 1e4);
+        }, budgetFor(deadlineAt));
         const cleanup = () => {
           clearTimeout(deadline);
           wsRef.close();
@@ -252,7 +273,7 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
             const data = JSON.parse(msg.data);
             if (data[0] === "OK" && data[1] === event.id) {
               if (data[2] === true) {
-                success.push(relayUrl);
+                recordSuccess();
                 cleanup();
                 resolve();
               } else {
@@ -260,7 +281,7 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
                   { relay: relayUrl, reason: data[3] },
                   "Relay rejected event"
                 );
-                failed.push(relayUrl);
+                recordFailure();
                 cleanup();
                 reject(new Error(data[3] || "Relay rejected event"));
               }
@@ -270,14 +291,14 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
               { relay: relayUrl, error: err },
               "Failed to parse relay response"
             );
-            failed.push(relayUrl);
+            recordFailure();
             cleanup();
             reject(err);
           }
         };
         wsRef.onerror = (err) => {
           log.error({ relay: relayUrl, error: err }, "WebSocket error");
-          failed.push(relayUrl);
+          recordFailure();
           cleanup();
           reject(err);
         };
@@ -287,9 +308,7 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
       });
     } catch (err) {
       log.error({ relay: relayUrl, error: err }, "Failed to publish to relay");
-      if (!failed.includes(relayUrl)) {
-        failed.push(relayUrl);
-      }
+      recordFailure();
     } finally {
       if (ws && ws.readyState !== WebSocket.CLOSED) {
         ws.close();
@@ -303,6 +322,7 @@ async function publishToRelays(event, relays = DEFAULT_RELAYS) {
 async function queryByAttestationId(attestationId, relays = DEFAULT_RELAYS) {
   const events = [];
   log.info({ attestationId, relayCount: relays.length }, "Querying relays for attestation");
+  const deadlineAt = Date.now() + FANOUT_DEADLINE_MS;
   const queryPromises = relays.map(async (relayUrl) => {
     let ws = null;
     try {
@@ -312,7 +332,7 @@ async function queryByAttestationId(attestationId, relays = DEFAULT_RELAYS) {
         const timeout = setTimeout(() => {
           wsRef.close();
           reject(new Error("Query timeout"));
-        }, 1e4);
+        }, budgetFor(deadlineAt));
         const cleanup = () => {
           clearTimeout(timeout);
           wsRef.close();
@@ -368,6 +388,7 @@ async function queryByAttestationId(attestationId, relays = DEFAULT_RELAYS) {
 async function queryByAddress(address, relays = DEFAULT_RELAYS) {
   const events = [];
   log.info({ address, relayCount: relays.length }, "Querying relays for address");
+  const deadlineAt = Date.now() + FANOUT_DEADLINE_MS;
   const queryPromises = relays.map(async (relayUrl) => {
     try {
       const ws = new WebSocket(relayUrl);
@@ -375,7 +396,7 @@ async function queryByAddress(address, relays = DEFAULT_RELAYS) {
         const timeout = setTimeout(() => {
           ws.close();
           reject(new Error("Query timeout"));
-        }, 1e4);
+        }, budgetFor(deadlineAt));
         ws.onopen = () => {
           const subscriptionId = `ochk_addr_${Date.now()}`;
           ws.send(
@@ -384,8 +405,15 @@ async function queryByAddress(address, relays = DEFAULT_RELAYS) {
               subscriptionId,
               {
                 kinds: [30078],
-                "#address": [address],
-                limit: 10
+                // `#t`, NOT `#address`: NIP-12 relays index
+                // single-letter tags only, so `#address`
+                // matched nothing on any relay and this
+                // function returned empty for every real
+                // attestation. attest.ochk.io's verifier has
+                // queried `#t` since the same fix landed
+                // there; this is the back-port.
+                "#t": [address],
+                limit: 50
               }
             ])
           );
@@ -422,6 +450,7 @@ async function queryByIdentity(protocol, identifier, relays = DEFAULT_RELAYS) {
   const events = [];
   const identityTag = `${protocol}:${identifier}`;
   log.info({ protocol, identifier, relayCount: relays.length }, "Querying relays for identity");
+  const deadlineAt = Date.now() + FANOUT_DEADLINE_MS;
   const queryPromises = relays.map(async (relayUrl) => {
     try {
       const ws = new WebSocket(relayUrl);
@@ -429,7 +458,7 @@ async function queryByIdentity(protocol, identifier, relays = DEFAULT_RELAYS) {
         const timeout = setTimeout(() => {
           ws.close();
           reject(new Error("Query timeout"));
-        }, 1e4);
+        }, budgetFor(deadlineAt));
         ws.onopen = () => {
           const subscriptionId = `ochk_identity_${Date.now()}`;
           ws.send(