shinjuku-shielded 0.3.59 → 0.3.60

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "a18f4dcc8553e48c173aa610e7b3632d8edb25dbe317dd1f820e44673dd0fa39",
-  "bytes": 12158087,
-  "sourceCommit": "4274f17fee017d2010ae9d1ca94c5c03d200effc",
+  "sha256": "ad143a47257fa8b5e147ba3f6b662576794b06184abbedce42fd4f74993d9b7e",
+  "bytes": 12161659,
+  "sourceCommit": "187538a77af6d819ea08912f6406834a8e144e22",
   "sourceDirty": false,
   "installRecordMatchesLockfile": true,
   "releaseRule": "valid only when two fresh npm ci --ignore-scripts builds on different OSes give the same sha256; installRecordMatchesLockfile true means every entry npm installed equals its package-lock.json entry and every entry not marked optional, devOptional included, is installed: an optional entry (a package for another platform) may be absent",
@@ -1282,5 +1282,5 @@
       "version": "1.8.0"
     }
   ],
-  "publishedAt": "2026-10-22T04:38:17.814Z"
+  "publishedAt": "2026-10-22T05:12:25.176Z"
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.59",
+  "version": "0.3.60",
   "mcpName": "io.github.ShinjukuStaition/shinjuku-mcp",
   "description": "Shinjuku Shielded, the private x402 facilitator on Solana: the self-custody wallet CLI and its MCP server. Shield, pay, and unshield USDC from any MCP agent, under caps you set.",
-  "shinjukuRelease": "a18f4dcc",
-  "shinjukuSha256": "a18f4dcc8553e48c173aa610e7b3632d8edb25dbe317dd1f820e44673dd0fa39",
+  "shinjukuRelease": "ad143a47",
+  "shinjukuSha256": "ad143a47257fa8b5e147ba3f6b662576794b06184abbedce42fd4f74993d9b7e",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -42630,7 +42630,15 @@ function warmOnions({ onions = routedOnions(), fetchImpl = globalThis.fetch, tim
   }
   return () => controller.abort();
 }
-function raceOnions(onions, { fetchImpl = globalThis.fetch, timeoutMs = RACE_TIMEOUT_MS, path = "/api/health", onNone } = {}) {
+function raceOnions(onions, {
+  fetchImpl = globalThis.fetch,
+  timeoutMs = RACE_TIMEOUT_MS,
+  path = "/api/health",
+  onNone,
+  spares = [],
+  spareAfterMs = SPARE_AFTER_MS,
+  onSpares
+} = {}) {
   const controller = new AbortController();
   const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(timeoutMs)]);
   const probe = (onion) => Promise.resolve().then(() => fetchImpl(`${onion}${path}`, onionInit({ redirect: "error", signal, headers: { accept: "application/json" } }))).then((response) => {
@@ -42639,11 +42647,46 @@ function raceOnions(onions, { fetchImpl = globalThis.fetch, timeoutMs = RACE_TIM
     if (!response?.ok) throw new Error(`onion answered ${response?.status}`);
     return onion;
   });
-  const winner = Promise.any(onions.map(probe)).catch(() => {
-    if (!controller.signal.aborted) onNone?.();
-    return onions[0];
-  }).finally(() => controller.abort());
-  return { winner, abort: () => controller.abort() };
+  let startSpares = () => {
+  };
+  let spareTimer;
+  const winner = new Promise((resolve38) => {
+    let open3 = 0;
+    let done = false;
+    let sparesStarted = spares.length === 0;
+    const settle = (onion) => {
+      if (done) return;
+      done = true;
+      resolve38(onion);
+    };
+    const failed = () => {
+      open3 -= 1;
+      if (open3 > 0 || done) return;
+      if (!sparesStarted && !signal.aborted) return startSpares();
+      if (!controller.signal.aborted) onNone?.();
+      settle(onions[0]);
+    };
+    const start = (onion) => {
+      open3 += 1;
+      probe(onion).then(settle, failed);
+    };
+    startSpares = () => {
+      if (sparesStarted || done || signal.aborted) return;
+      sparesStarted = true;
+      clearTimeout(spareTimer);
+      onSpares?.();
+      for (const onion of spares) start(onion);
+    };
+    if (!sparesStarted) {
+      spareTimer = setTimeout(() => startSpares(), spareAfterMs);
+      spareTimer.unref?.();
+    }
+    for (const onion of onions) start(onion);
+  }).finally(() => {
+    clearTimeout(spareTimer);
+    controller.abort();
+  });
+  return { winner, abort: () => controller.abort(), startSpares: () => startSpares() };
 }
 function facilitatorOrigins(argv2) {
   const origins = /* @__PURE__ */ new Set();
@@ -42692,7 +42735,8 @@ async function routeFacilitatorsOverOnion(argv2, {
   fetchImpl = globalThis.fetch,
   err = (text3) => process.stderr.write(text3),
   raceTimeoutMs = RACE_TIMEOUT_MS,
-  routeWaitMs = ROUTE_WAIT_MS
+  routeWaitMs = ROUTE_WAIT_MS,
+  spareAfterMs = SPARE_AFTER_MS
 } = {}) {
   const routes = /* @__PURE__ */ new Map();
   const groups = /* @__PURE__ */ new Map();
@@ -42700,17 +42744,29 @@ async function routeFacilitatorsOverOnion(argv2, {
   for (const origin of named.length > 0 ? named : [DEFAULT_FACILITATOR_ORIGIN]) {
     const pinned = PINNED_FACILITATOR_ONIONS[origin];
     const onions = (pinned ?? [await publishedOnion(origin, fetchImpl)]).filter((onion) => onion && V3_ONION.test(onion));
+    const spares = pinned ? (PINNED_SPARE_ONIONS[origin] ?? []).filter((onion) => V3_ONION.test(onion)) : [];
     if (onions.length > 0) {
       const key = onions.join(" ");
       if (!groups.has(key)) {
-        groups.set(key, { onions, waitMs: routeWaitMs, onNone: () => err(`tor: no onion of ${origin} answered its start probe (${onions.length} tried); its requests go to its onions in turn and wait for them (Tor may still be building circuits)
-`) });
+        const spareHosts = spares.map((onion) => `${new URL(onion).host.slice(0, 8)}...`).join(", ");
+        const group = {
+          onions: [...onions, ...spares],
+          live: onions.length,
+          spares,
+          waitMs: routeWaitMs,
+          onSpares: () => err(`tor: no onion of ${origin} has answered yet; its ${spares.length} spare onions ${spareHosts} join (Tor may still be fetching the onion addresses)
+`),
+          onNone: () => err(`tor: no onion of ${origin} answered its start probe (${liveOnions(group).length} tried); its requests go to its onions in turn and wait for them (Tor may still be building circuits)
+`)
+        };
+        groups.set(key, group);
       }
       routes.set(origin, groups.get(key));
       routes.set(payHostOf(origin), groups.get(key));
       const hosts = onions.map((onion) => `${new URL(onion).host.slice(0, 8)}...`).join(", ");
       const source = pinned ? "pinned in this wallet" : `published by ${origin}`;
-      err(`tor: ${origin} is reached over its onion service ${hosts} (${onions.length > 1 ? `${source}; the first to answer serves this run` : source}), so no Tor exit and no front such as Cloudflare sees these requests
+      const spareNote = spares.length > 0 ? `; ${spares.length} spares join if none answers in ${Math.round(spareAfterMs / 1e3)} s` : "";
+      err(`tor: ${origin} is reached over its onion service ${hosts} (${onions.length > 1 ? `${source}; the first to answer serves this run` : source}${spareNote}), so no Tor exit and no front such as Cloudflare sees these requests
 `);
     } else {
       err(`tor: ${origin} publishes no onion service; its requests go through a Tor exit, which sees the host name (TLS hides the content)
@@ -42734,12 +42790,18 @@ async function routeFacilitatorsOverOnion(argv2, {
       aborts.push(warmOnions({ onions: group.onions, fetchImpl }));
       continue;
     }
-    const race = raceOnions(group.onions, {
+    const spares = group.spares ?? [];
+    const race = raceOnions(liveOnions(group), {
       fetchImpl,
       timeoutMs: raceTimeoutMs,
       ...group.path ? { path: group.path } : {},
-      ...group.onNone ? { onNone: group.onNone } : {}
+      ...group.onNone ? { onNone: group.onNone } : {},
+      ...spares.length > 0 ? { spares, spareAfterMs, onSpares: () => {
+        group.live = group.onions.length;
+        group.onSpares?.();
+      } } : {}
     });
+    group.startSpares = race.startSpares;
     group.pending = race.winner.then((onion) => {
       group.winner = onion;
       group.pending = void 0;
@@ -42760,7 +42822,11 @@ async function routeFacilitatorsOverOnion(argv2, {
     const group = url && routes.get(url.origin);
     if (!group) return original(input, init);
     const send3 = (onion) => {
-      if (onion === void 0) onion = group.onions[(group.sent = (group.sent ?? 0) + 1) % group.onions.length];
+      if (onion === void 0) {
+        group.startSpares?.();
+        const live = liveOnions(group);
+        onion = live[(group.sent = (group.sent ?? 0) + 1) % live.length];
+      }
       const target = `${onion}${url.pathname}${url.search}`;
       return original(input instanceof Request ? new Request(target, input) : target, onionInit(init));
     };
@@ -42782,7 +42848,7 @@ async function routeFacilitatorsOverOnion(argv2, {
     }
   };
 }
-var SITE_ONIONS, PINNED_FACILITATOR_ONIONS, HISTORY_ONIONS, PINNED_HISTORY_ONIONS, HISTORY_PROBE_PATH, FACILITATOR_FLAGS, V3_ONION, DISCOVERY_TIMEOUT_MS, WARM_TIMEOUT_MS, RACE_TIMEOUT_MS, ROUTE_WAIT_MS, routedGroups, routedOnions, routedOrigins, onionsOfOrigin, routesOverOnion, GLOBAL_DISPATCHER, onionDispatchers;
+var SITE_ONIONS, SITE_SPARE_ONIONS, PINNED_FACILITATOR_ONIONS, PINNED_SPARE_ONIONS, HISTORY_ONIONS, PINNED_HISTORY_ONIONS, HISTORY_PROBE_PATH, FACILITATOR_FLAGS, V3_ONION, DISCOVERY_TIMEOUT_MS, WARM_TIMEOUT_MS, RACE_TIMEOUT_MS, ROUTE_WAIT_MS, SPARE_AFTER_MS, routedGroups, liveOnions, routedOnions, routedOrigins, onionsOfOrigin, routesOverOnion, GLOBAL_DISPATCHER, onionDispatchers;
 var init_facilitatorOnion = __esm({
   "wallet/src/net/facilitatorOnion.mjs"() {
     "use strict";
@@ -42791,11 +42857,20 @@ var init_facilitatorOnion = __esm({
       "http://2kfhlfuyuwvhmibjrpxqsg4nrbcxasjgjq7kmnfzgfwzptkhhznz3dad.onion",
       "http://chhgw7nfggqhhjawz54bpsiihdow66s2yvkh6ccnugpcdmhhww6xkkqd.onion"
     ]);
+    SITE_SPARE_ONIONS = Object.freeze([
+      "http://ntr5qkdfgff4gspwderjnqtkzekyhb5a4j76ov4dqncxmcb53gdsmmid.onion",
+      "http://vofhhl336r4bnwn7hid2uvqaa72wx66xkdu2yt4n54xljsxwn2yds6qd.onion"
+    ]);
     PINNED_FACILITATOR_ONIONS = Object.freeze({
       "https://shinjukustaition.com": SITE_ONIONS,
       "https://www.shinjukustaition.com": SITE_ONIONS,
       "https://pay.shinjukustaition.com": SITE_ONIONS
     });
+    PINNED_SPARE_ONIONS = Object.freeze({
+      "https://shinjukustaition.com": SITE_SPARE_ONIONS,
+      "https://www.shinjukustaition.com": SITE_SPARE_ONIONS,
+      "https://pay.shinjukustaition.com": SITE_SPARE_ONIONS
+    });
     HISTORY_ONIONS = Object.freeze([
       "http://d6xg3phhurxhzqcsgh2mh52yf744labhrnd7mducwynlertfsjzyslqd.onion",
       "http://3yccoinnouxbjx3emvdxwhbu56cq4de7sfwgvcp4xb7hveccnpurcrid.onion",
@@ -42810,8 +42885,10 @@ var init_facilitatorOnion = __esm({
     WARM_TIMEOUT_MS = 3e4;
     RACE_TIMEOUT_MS = 9e4;
     ROUTE_WAIT_MS = 15e3;
+    SPARE_AFTER_MS = ROUTE_WAIT_MS;
     routedGroups = [];
-    routedOnions = () => [...new Set(routedGroups.flatMap((group) => group.winner ? [group.winner] : group.onions))];
+    liveOnions = (group) => group.onions.slice(0, group.live ?? group.onions.length);
+    routedOnions = () => [...new Set(routedGroups.flatMap((group) => group.winner ? [group.winner] : liveOnions(group)))];
     routedOrigins = /* @__PURE__ */ new Map();
     onionsOfOrigin = (origin) => routedOrigins.get(origin) ?? PINNED_FACILITATOR_ONIONS[origin] ?? [];
     routesOverOnion = (origin) => routedOrigins.has(origin);
@@ -118627,8 +118704,12 @@ ${canonical5}`;
       const linkReads = readOpenLinkHeld(store);
       const finishing = finishSentDeposits(store);
       const finishDeadline = finishing.length ? balanceStartedAt + balanceRefreshWaitMs : void 0;
+      let finishedHere = [];
       if (finishing.length) {
-        const finished = Promise.all(finishing).then((outcomes) => outcomes.some((outcome2) => outcome2?.stage === "done" || outcome2?.stage === "partly_shielded") ? refreshShared().then(() => "done") : "passed").catch(() => "failed");
+        const finished = Promise.all(finishing).then((outcomes) => {
+          finishedHere = outcomes.filter((outcome2) => outcome2?.stage === "done" || outcome2?.stage === "partly_shielded");
+          return finishedHere.length ? refreshShared().then(() => "done") : "passed";
+        }).catch(() => "failed");
         const outcome = await Promise.race([
           finished,
           new Promise((resolve38) => {
@@ -118780,6 +118861,22 @@ ${canonical5}`;
       } catch {
         landingAtomic = 0n;
       }
+      if (landingAtomic === 0n && shieldedAtomic === null && !refresh.refreshError && finishedHere.length) {
+        for (const outcome of finishedHere) {
+          const id = outcome.record?.id;
+          const round = outcome.record?.round ?? 1;
+          let amount = payMeAmounts.get(`${id}:${round}`);
+          if (amount === void 0) {
+            try {
+              const deposit = store.readWal(`deposit-${outcome.record?.depositId ?? payMeRoundDepositId(id, round)}`);
+              if (/^[1-9][0-9]*$/.test(String(deposit?.amountAtomic ?? ""))) amount = BigInt(deposit.amountAtomic);
+            } catch {
+              amount = void 0;
+            }
+          }
+          if (typeof amount === "bigint" && amount > 0n) landingAtomic += amount;
+        }
+      }
       const landedNext = landingAtomic > 0n && !refresh.refreshError ? `${usdcText2(landingAtomic)} USDC you added landed on chain and is being counted (landingAtomic, not in balanceAtomic yet): call wallet_balance again in ${POLL_SECONDS3} s; that call waits up to ${waitSeconds} s for it. Tell the user it needs no step from them` : void 0;
       if (landedNext) next = landedNext;
       const stalled = [...resumeRefusals].map(([requestId, error2]) => `"${requestId}" (${error2})`);