mycomesh-consumer 0.1.36 → 0.1.38

package/package.json

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

package/src/consumer-runtime.mjs

@@ -84,7 +84,6 @@ 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_READY_TIMEOUT_MS = 90_000;
 
 const DEFAULT_NETWORK = Object.freeze({
   chain_id: DEFAULT_CHAIN_ID,
@@ -596,7 +595,6 @@ export class NativeConsumerState {
     this.paymentAddress = paymentKeyAddress(this.paymentKey);
     this.tunnelCommand = options.tunnelCommand || env.MYCOMESH_CONSUMER_TUNNEL_COMMAND || "cloudflared";
     this.tunnelSpawn = options.tunnelSpawn || defaultSpawn;
-    this.tunnelProbe = options.tunnelProbe || waitForTunnelReady;
     this.share = null;
   }
 
@@ -803,8 +801,6 @@ export class NativeConsumerState {
       share.process = child;
       const publicUrl = await waitForTunnelUrl(child);
       if (this.share !== share) throw new Error("temporary share was cancelled");
-      await this.tunnelProbe(publicUrl, apiKey, this.dispatcher);
-      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?.();
@@ -1038,6 +1034,8 @@ function writeJson(response, status, value, headers = {}) {
 function waitForTunnelUrl(child) {
   return new Promise((resolve, reject) => {
     let output = "";
+    let publicUrl = "";
+    let connected = false;
     const finish = (error, url) => {
       clearTimeout(timer);
       child.removeListener("error", onError);
@@ -1049,7 +1047,9 @@ function waitForTunnelUrl(child) {
     const onData = (chunk) => {
       output = `${output}${String(chunk)}`.slice(-16_384);
       const match = output.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i);
-      if (match) finish(null, match[0]);
+      if (match) publicUrl = match[0];
+      if (/Registered tunnel connection/i.test(output)) connected = true;
+      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"})`));
@@ -1064,26 +1064,6 @@ function waitForTunnelUrl(child) {
   });
 }
 
-async function waitForTunnelReady(publicUrl, apiKey, dispatcher) {
-  const deadline = Date.now() + TUNNEL_READY_TIMEOUT_MS;
-  let lastError;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetchWithTimeout(`${publicUrl.replace(/\/+$/, "")}/v1/health`, {
-        headers: { authorization: `Bearer ${apiKey}` },
-        dispatcher,
-      }, Math.min(3000, deadline - Date.now()));
-      const payload = await readJsonResponse(response);
-      if (response.ok && payload.protocol === "mycomesh-temporary-share/v1") return;
-      lastError = new Error(`HTTP ${response.status}`);
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 500));
-  }
-  throw new Error(`temporary HTTPS URL was not reachable: ${lastError?.message || "timed out"}`);
-}
-
 async function handleInference(state, request, response, path, alphaSearchQuery, shareOnly = false) {
   const authorization = String(request.headers.authorization || "");
   if (!state.authorizeBearer(authorization, { shareOnly })) {
@@ -1371,7 +1351,7 @@ $('register').onclick=()=>showPlan('register_key',true);$('topup').onclick=()=>s
 $('rotate').onclick=async()=>{try{await requireWallet();const oldAddress=state.key.address;const pending=await api('/v1/mycomesh/local/key/prepare',{method:'POST',headers:{authorization:'Bearer '+state.credentials.api_key}});const plan=await api('/v1/mycomesh/local/transactions',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({action:'register_key',wallet})});await sendPlan(plan);let activated;for(let i=0;i<8&&!activated;i++){try{activated=await api('/v1/mycomesh/local/key/activate',{method:'POST',headers:{authorization:'Bearer '+state.credentials.api_key,'content-type':'application/json'},body:JSON.stringify({wallet})})}catch(error){if(i===7)throw error;await new Promise(resolve=>setTimeout(resolve,1800))}}const revoke=await api('/v1/mycomesh/local/transactions',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({action:'revoke_key',wallet,key_address:oldAddress})});await sendPlan(revoke);$('plan').textContent=JSON.stringify({pending,activated,revoke},null,2);await load()}catch(error){$('plan').textContent=error.message}};
 $('shareStart').onclick=async()=>{const button=$('shareStart');button.disabled=true;button.textContent='Starting...';try{const v=await api('/v1/mycomesh/local/share/start',{method:'POST',headers:{authorization:'Bearer '+state.credentials.api_key,'content-type':'application/json'},body:JSON.stringify({minutes:Number($('shareMinutes').value)})});state.share=v.share;render()}catch(error){$('shareExpiry').textContent=error.message}finally{button.disabled=false;button.textContent='Start sharing'}};
 $('shareStop').onclick=async()=>{try{const v=await api('/v1/mycomesh/local/share/stop',{method:'POST',headers:{authorization:'Bearer '+state.credentials.api_key}});state.share=v.share;render()}catch(error){$('shareExpiry').textContent=error.message}};
-$('shareCopy').onclick=()=>navigator.clipboard?.writeText("export OPENAI_BASE_URL='"+$('shareUrl').textContent+"'\nexport OPENAI_API_KEY='"+$('shareKey').textContent+"'");
+$('shareCopy').onclick=()=>navigator.clipboard?.writeText("export OPENAI_BASE_URL='"+$('shareUrl').textContent+"'\\nexport OPENAI_API_KEY='"+$('shareKey').textContent+"'");
 load().catch(error=>$('plan').textContent=error.message);
 </script></body></html>`;
 }

package/src/consumer.mjs

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