mycomesh-consumer 0.1.39 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mycomesh-consumer",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "Native Node.js MycoMesh Consumer and OpenAI-compatible request CLI.",
   "publishConfig": {
     "access": "public"

package/src/consumer-runtime.mjs

@@ -84,6 +84,7 @@ const RESPONSES_REQUEST_OPTION_FIELDS = new Set([
 const RESPONSES_LOCAL_OPTION_FIELDS = new Set(["stream", "stream_options"]);
 const MAX_SHARE_MINUTES = 24 * 60;
 const TUNNEL_START_TIMEOUT_MS = 30_000;
+const TUNNEL_STOP_TIMEOUT_MS = 2_000;
 
 const DEFAULT_NETWORK = Object.freeze({
   chain_id: DEFAULT_CHAIN_ID,
@@ -792,18 +793,30 @@ export class NativeConsumerState {
     };
     this.share = share;
     try {
-      const child = this.tunnelSpawn(
-        this.tunnelCommand,
-        ["tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${address.port}`],
-        { stdio: ["ignore", "pipe", "pipe"] },
-      );
-      share.process = child;
-      const publicUrl = await waitForTunnelUrl(child);
+      let publicUrl;
+      let lastError;
+      for (let attempt = 0; attempt < 2; attempt += 1) {
+        const child = this.tunnelSpawn(
+          this.tunnelCommand,
+          ["tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${address.port}`],
+          { stdio: ["ignore", "pipe", "pipe"] },
+        );
+        share.process = child;
+        try {
+          publicUrl = await waitForTunnelUrl(child);
+          break;
+        } catch (error) {
+          lastError = error;
+          if (this.share !== share || attempt === 1) throw error;
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
+      }
+      if (!publicUrl) throw lastError || new Error("cloudflared did not publish a URL");
       if (this.share !== share) throw new Error("temporary share was cancelled");
       share.baseUrl = `${publicUrl.replace(/\/+$/, "")}/v1`;
       share.timer = setTimeout(() => { void this.stopShare(); }, minutes * 60 * 1000);
       share.timer.unref?.();
-      child.once("exit", () => { if (this.share === share) void this.stopShare(); });
+      share.process?.once("exit", () => { if (this.share === share) void this.stopShare(); });
       return this.sharePayload();
     } catch (error) {
       await this.stopShare();
@@ -816,7 +829,7 @@ export class NativeConsumerState {
     this.share = null;
     if (!share) return { active: false };
     if (share.timer) clearTimeout(share.timer);
-    if (share.process && share.process.exitCode === null) share.process.kill("SIGTERM");
+    await stopTunnelProcess(share.process);
     await share.runtime?.close();
     return { active: false };
   }
@@ -1035,6 +1048,7 @@ function waitForTunnelUrl(child) {
     let output = "";
     let publicUrl = "";
     let connected = false;
+    const diagnostics = () => output.trim().replace(/\s+/g, " ").slice(-1000);
     const finish = (error, url) => {
       clearTimeout(timer);
       child.removeListener("error", onError);
@@ -1051,9 +1065,15 @@ function waitForTunnelUrl(child) {
       if (publicUrl && connected) finish(null, publicUrl);
     };
     const onError = (error) => finish(new Error(`could not start cloudflared: ${error.message}`));
-    const onExit = (code) => finish(new Error(`cloudflared exited before publishing a URL (${code ?? "signal"})`));
+    const onExit = (code) => {
+      const detail = diagnostics();
+      finish(new Error(`cloudflared exited before publishing a URL (${code ?? "signal"})${detail ? `: ${detail}` : ""}`));
+    };
     const timer = setTimeout(
-      () => finish(new Error("timed out waiting for the temporary HTTPS URL")),
+      () => {
+        const detail = diagnostics();
+        finish(new Error(`timed out waiting for the temporary HTTPS URL${detail ? `: ${detail}` : ""}`));
+      },
       TUNNEL_START_TIMEOUT_MS,
     );
     child.once("error", onError);
@@ -1063,6 +1083,23 @@ function waitForTunnelUrl(child) {
   });
 }
 
+async function stopTunnelProcess(child) {
+  if (!child || child.exitCode !== null) return;
+  await new Promise((resolve) => {
+    let settled = false;
+    const finish = () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      child.removeListener("exit", finish);
+      resolve();
+    };
+    const timer = setTimeout(finish, TUNNEL_STOP_TIMEOUT_MS);
+    child.once("exit", finish);
+    try { child.kill("SIGTERM"); } catch { finish(); }
+  });
+}
+
 async function handleInference(state, request, response, path, alphaSearchQuery, shareOnly = false) {
   const authorization = String(request.headers.authorization || "");
   if (!state.authorizeBearer(authorization, { shareOnly })) {

package/src/consumer.mjs

@@ -11,7 +11,7 @@ import {
   createConsumerServer,
 } from "./consumer-runtime.mjs";
 
-export const CONSUMER_RELEASE_VERSION = "0.1.39";
+export const CONSUMER_RELEASE_VERSION = "0.1.41";
 export const API_COMMANDS = new Set(["health", "models", "responses", "chat"]);
 const API_VALUE_OPTIONS = new Set([
   "--base-url",