@blockrun/mcp 0.21.4 → 0.21.5

package/dist/index.js

@@ -209,6 +209,18 @@ async function getChainBalance(chain, address) {
   return chain === "solana" ? getSolanaUsdcBalance() : getBaseUsdcBalance(address);
 }
 
+// src/utils/model-cache.ts
+var CACHE_TTL_MS = 5 * 60 * 1e3;
+async function loadModels(llm, cache) {
+  if (!cache.models) {
+    cache.models = llm.listAllModels ? await llm.listAllModels() : await llm.listModels();
+    setTimeout(() => {
+      cache.models = null;
+    }, CACHE_TTL_MS).unref();
+  }
+  return cache.models;
+}
+
 // src/tools/wallet.ts
 import { z } from "zod";
 
@@ -1043,14 +1055,7 @@ function registerModelsTool(server, modelCache) {
       }
     },
     async ({ category, provider }) => {
-      const llm = getClient();
-      if (!modelCache.models) {
-        modelCache.models = "listAllModels" in llm ? await llm.listAllModels() : await llm.listModels();
-        setTimeout(() => {
-          modelCache.models = null;
-        }, 5 * 60 * 1e3);
-      }
-      let models = modelCache.models;
+      let models = await loadModels(getClient(), modelCache);
       if (provider) {
         const p = provider.toLowerCase();
         models = models.filter((m) => m.id.toLowerCase().startsWith(p + "/"));
@@ -1243,6 +1248,26 @@ Error: ${errMsg}` }],
 
 // src/tools/music.ts
 import { z as z5 } from "zod";
+
+// src/utils/http.ts
+async function fetchWithTimeout(url, options, timeoutMs) {
+  const controller = new AbortController();
+  const id = setTimeout(() => controller.abort(), timeoutMs);
+  id.unref?.();
+  try {
+    return await fetch(url, { ...options, signal: controller.signal });
+  } finally {
+    clearTimeout(id);
+  }
+}
+function isTimeoutError(err) {
+  const name = err instanceof Error ? err.name : "";
+  if (name === "AbortError" || name === "TimeoutError") return true;
+  const msg = (err instanceof Error ? err.message : String(err)).toLowerCase();
+  return msg.includes("abort") || msg.includes("timeout") || msg.includes("timed out") || msg.includes("did not complete within");
+}
+
+// src/tools/music.ts
 import { privateKeyToAccount } from "viem/accounts";
 import {
   createPaymentPayload,
@@ -1372,7 +1397,7 @@ Error: ${errMsg}` }],
             isError: true
           };
         }
-        if (errMsg.includes("abort") || errMsg.includes("timeout") || errMsg.includes("Timeout")) {
+        if (isTimeoutError(err)) {
           return {
             content: [{ type: "text", text: `Music generation timed out. This can happen during peak load \u2014 please try again.
 Error: ${errMsg}` }],
@@ -1387,15 +1412,6 @@ Error: ${errMsg}` }],
     }
   );
 }
-async function fetchWithTimeout(url, options, timeoutMs) {
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...options, signal: controller.signal });
-  } finally {
-    clearTimeout(id);
-  }
-}
 
 // src/tools/speech.ts
 import { z as z6 } from "zod";
@@ -1514,7 +1530,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
         }
         const privateKey = getOrCreateWalletKey();
         const account = privateKeyToAccount2(privateKey);
-        const resp402 = await fetchWithTimeout2(endpoint, {
+        const resp402 = await fetchWithTimeout(endpoint, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(body)
@@ -1540,7 +1556,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
             extra: details.extra
           }
         );
-        const resp = await fetchWithTimeout2(endpoint, {
+        const resp = await fetchWithTimeout(endpoint, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -1593,7 +1609,7 @@ Error: ${errMsg}` }],
             isError: true
           };
         }
-        if (errMsg.includes("abort") || errMsg.includes("timeout") || errMsg.includes("Timeout")) {
+        if (isTimeoutError(err)) {
           return {
             content: [{ type: "text", text: `Speech generation timed out \u2014 please try again.
 Error: ${errMsg}` }],
@@ -1610,7 +1626,7 @@ Error: ${errMsg}` }],
 }
 async function listVoices() {
   try {
-    const resp = await fetchWithTimeout2(`${BLOCKRUN_API2}/v1/audio/voices`, { method: "GET" }, VOICES_TIMEOUT);
+    const resp = await fetchWithTimeout(`${BLOCKRUN_API2}/v1/audio/voices`, { method: "GET" }, VOICES_TIMEOUT);
     if (resp.ok) {
       const payload = await resp.json();
       const voices = payload.data || [];
@@ -1637,15 +1653,6 @@ Any raw ElevenLabs voice_id also works.` }],
     structuredContent: { voices: VOICE_ALIASES }
   };
 }
-async function fetchWithTimeout2(url, options, timeoutMs) {
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...options, signal: controller.signal });
-  } finally {
-    clearTimeout(id);
-  }
-}
 
 // src/tools/video.ts
 import { z as z7 } from "zod";
@@ -1749,7 +1756,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
         if (image_url) body.image_url = image_url;
         if (real_face_asset_id) body.real_face_asset_id = real_face_asset_id;
         if (duration_seconds !== void 0) body.duration_seconds = duration_seconds;
-        const resp402 = await fetchWithTimeout3(submitUrl, {
+        const resp402 = await fetchWithTimeout(submitUrl, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(body)
@@ -1777,7 +1784,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
             extra: details.extra
           }
         );
-        const submitResp = await fetchWithTimeout3(submitUrl, {
+        const submitResp = await fetchWithTimeout(submitUrl, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -1802,7 +1809,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
         let completed = null;
         while (Date.now() - startedAt < TOTAL_BUDGET_MS) {
           await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-          const pollResp = await fetchWithTimeout3(pollAbsoluteUrl, {
+          const pollResp = await fetchWithTimeout(pollAbsoluteUrl, {
             method: "GET",
             headers: { "PAYMENT-SIGNATURE": paymentPayload }
           }, 9e4);
@@ -1866,7 +1873,7 @@ Error: ${errMsg}` }],
             isError: true
           };
         }
-        if (errMsg.includes("abort") || errMsg.includes("timeout") || errMsg.includes("Timeout") || errMsg.includes("timed out") || errMsg.includes("did not complete within")) {
+        if (isTimeoutError(err)) {
           return {
             content: [{ type: "text", text: `Video generation timed out. The upstream async job didn't complete in time \u2014 please try again.
 Error: ${errMsg}` }],
@@ -1881,15 +1888,6 @@ Error: ${errMsg}` }],
     }
   );
 }
-async function fetchWithTimeout3(url, options, timeoutMs) {
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...options, signal: controller.signal });
-  } finally {
-    clearTimeout(id);
-  }
-}
 
 // src/tools/realface.ts
 import { z as z8 } from "zod";
@@ -1901,19 +1899,10 @@ import {
 } from "@blockrun/llm";
 var BLOCKRUN_API4 = "https://blockrun.ai/api";
 var ENROLLMENT_PRICE_USD = 0.01;
-async function fetchWithTimeout4(url, options, timeoutMs) {
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...options, signal: controller.signal });
-  } finally {
-    clearTimeout(id);
-  }
-}
 async function payAndPostJson(url, reqBody, fallbackDescription) {
   const privateKey = getOrCreateWalletKey();
   const account = privateKeyToAccount4(privateKey);
-  const resp402 = await fetchWithTimeout4(url, {
+  const resp402 = await fetchWithTimeout(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: reqBody
@@ -1939,7 +1928,7 @@ async function payAndPostJson(url, reqBody, fallbackDescription) {
       extra: details.extra
     }
   );
-  const resp = await fetchWithTimeout4(url, {
+  const resp = await fetchWithTimeout(url, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -1988,7 +1977,7 @@ Privacy: BlockRun does not store face/liveness data \u2014 only the asset id, na
           }
           const body = { name };
           if (group_id) body.groupId = group_id;
-          const resp = await fetchWithTimeout4(`${BLOCKRUN_API4}/v1/realface/init`, {
+          const resp = await fetchWithTimeout(`${BLOCKRUN_API4}/v1/realface/init`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify(body)
@@ -2037,7 +2026,7 @@ QR opened for scanning (${qrPath}).`;
           if (!group_id) {
             return { content: [{ type: "text", text: formatError('group_id is required for action:"status".') }], isError: true };
           }
-          const resp = await fetchWithTimeout4(`${BLOCKRUN_API4}/v1/realface/status?groupId=${encodeURIComponent(group_id)}`, {
+          const resp = await fetchWithTimeout(`${BLOCKRUN_API4}/v1/realface/status?groupId=${encodeURIComponent(group_id)}`, {
             method: "GET"
           }, 3e4);
           const data = await resp.json().catch(() => ({}));
@@ -2067,8 +2056,8 @@ QR opened for scanning (${qrPath}).`;
         if (action === "list") {
           const account = privateKeyToAccount4(getOrCreateWalletKey());
           const [rfResp, vpResp] = await Promise.all([
-            fetchWithTimeout4(`${BLOCKRUN_API4}/v1/wallet/${account.address}/realfaces`, { method: "GET" }, 3e4),
-            fetchWithTimeout4(`${BLOCKRUN_API4}/v1/wallet/${account.address}/portraits`, { method: "GET" }, 3e4).catch(() => null)
+            fetchWithTimeout(`${BLOCKRUN_API4}/v1/wallet/${account.address}/realfaces`, { method: "GET" }, 3e4),
+            fetchWithTimeout(`${BLOCKRUN_API4}/v1/wallet/${account.address}/portraits`, { method: "GET" }, 3e4).catch(() => null)
           ]);
           const data = await rfResp.json().catch(() => ({}));
           if (!rfResp.ok) {
@@ -2165,7 +2154,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
           const account = privateKeyToAccount4(privateKey);
           const enrollUrl = `${BLOCKRUN_API4}/v1/realface/enroll`;
           const reqBody = JSON.stringify({ name, image_url, group_id });
-          const resp402 = await fetchWithTimeout4(enrollUrl, {
+          const resp402 = await fetchWithTimeout(enrollUrl, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: reqBody
@@ -2191,7 +2180,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
               extra: details.extra
             }
           );
-          const resp = await fetchWithTimeout4(enrollUrl, {
+          const resp = await fetchWithTimeout(enrollUrl, {
             method: "POST",
             headers: {
               "Content-Type": "application/json",
@@ -3075,18 +3064,12 @@ function initializeMcpServer(server) {
     "blockrun://models",
     { description: "Available AI models with pricing", mimeType: "application/json" },
     async () => {
-      const llm = getClient();
-      if (!modelCache.models) {
-        modelCache.models = "listAllModels" in llm ? await llm.listAllModels() : await llm.listModels();
-        setTimeout(() => {
-          modelCache.models = null;
-        }, 5 * 60 * 1e3);
-      }
+      const models = await loadModels(getClient(), modelCache);
       return {
         contents: [{
           uri: "blockrun://models",
           mimeType: "application/json",
-          text: JSON.stringify(modelCache.models, null, 2)
+          text: JSON.stringify(models, null, 2)
         }]
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/mcp",
-  "version": "0.21.4",
+  "version": "0.21.5",
   "mcpName": "io.github.BlockRunAI/blockrun-mcp",
   "description": "BlockRun MCP Server - Give your AI agent web search, deep research, prediction markets, crypto data, X/Twitter intelligence. Paid via x402 micropayments.",
   "type": "module",