mycomesh-consumer 0.1.35 → 0.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mycomesh-consumer",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "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,
@@ -358,8 +357,11 @@ function normalizeInferenceOptions(endpoint, options) {
   if (typeof options !== "object" || Array.isArray(options)) {
     throw new Error("inference request options must be a JSON object");
   }
+  const requestOptions = Object.fromEntries(
+    Object.entries(options).filter(([key]) => !RESPONSES_LOCAL_OPTION_FIELDS.has(key)),
+  );
   if (endpoint !== "responses") {
-    if (Object.keys(options).length) {
+    if (Object.keys(requestOptions).length) {
       throw new Error("inference request options are supported only for responses");
     }
     return null;
@@ -369,7 +371,7 @@ function normalizeInferenceOptions(endpoint, options) {
   if (unknown.length) throw new Error(`unsupported Responses request options: ${unknown.join(", ")}`);
   const normalized = {};
   for (const key of [...RESPONSES_REQUEST_OPTION_FIELDS].sort()) {
-    if (Object.prototype.hasOwnProperty.call(options, key)) normalized[key] = options[key];
+    if (Object.prototype.hasOwnProperty.call(requestOptions, key)) normalized[key] = requestOptions[key];
   }
   return Object.keys(normalized).length ? normalized : null;
 }
@@ -593,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;
   }
 
@@ -800,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?.();
@@ -1035,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);
@@ -1046,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"})`));
@@ -1061,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 })) {

package/src/consumer.mjs

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