@routstr/sdk 0.2.9 → 0.2.11

package/dist/index.js

@@ -1929,17 +1929,48 @@ function extractResponseId(body) {
   return trimmed.length > 0 ? trimmed : void 0;
 }
 function extractUsageFromSSEJson(parsed, fallbackSatsCost = 0) {
-  if (!parsed || typeof parsed !== "object" || !parsed.usage) {
+  if (!parsed || typeof parsed !== "object") {
+    return null;
+  }
+  if (!parsed.usage && parsed.cost && typeof parsed.cost === "object") {
+    const costObj = parsed.cost;
+    const msats2 = costObj.total_msats ?? 0;
+    const cost2 = costObj.total_usd ?? 0;
+    if (msats2 === 0 && cost2 === 0) return null;
+    return {
+      promptTokens: Number(costObj.input_tokens ?? 0),
+      completionTokens: Number(costObj.output_tokens ?? 0),
+      totalTokens: Number((costObj.input_tokens ?? 0) + (costObj.output_tokens ?? 0)),
+      cost: Number(cost2),
+      satsCost: msats2 > 0 ? msats2 / 1e3 : fallbackSatsCost
+    };
+  }
+  if (!parsed.usage) {
     return null;
   }
   const usage = parsed.usage;
   const usageCost = usage.cost;
-  const cost = typeof usageCost === "number" ? usageCost : usageCost?.total_usd ?? parsed.metadata?.routstr?.cost?.total_usd ?? 0;
-  const msats = parsed.metadata?.routstr?.cost?.total_msats ?? (typeof usage.cost_sats === "number" ? usage.cost_sats * 1e3 : 0);
+  let cost = 0;
+  let msats = 0;
+  if (typeof usageCost === "number") {
+    cost = usageCost;
+  } else if (usageCost && typeof usageCost === "object") {
+    cost = usageCost.total_usd ?? 0;
+    msats = usageCost.total_msats ?? 0;
+  }
+  if (cost === 0) {
+    cost = parsed.metadata?.routstr?.cost?.total_usd ?? 0;
+  }
+  if (msats === 0) {
+    msats = parsed.metadata?.routstr?.cost?.total_msats ?? (typeof usage.cost_sats === "number" ? usage.cost_sats * 1e3 : 0);
+  }
+  const promptTokens = Number(usage.prompt_tokens ?? usage.input_tokens ?? 0);
+  const completionTokens = Number(usage.completion_tokens ?? usage.output_tokens ?? 0);
+  const totalTokens = Number(usage.total_tokens ?? promptTokens + completionTokens);
   const result = {
-    promptTokens: Number(usage.prompt_tokens ?? 0),
-    completionTokens: Number(usage.completion_tokens ?? 0),
-    totalTokens: Number(usage.total_tokens ?? 0),
+    promptTokens,
+    completionTokens,
+    totalTokens,
     cost: Number(cost ?? 0),
     satsCost: msats > 0 ? msats / 1e3 : fallbackSatsCost
   };
@@ -2065,11 +2096,14 @@ var StreamProcessor = class {
       if (parsed.choices?.[0]?.delta?.reasoning) {
         result.reasoning = parsed.choices[0].delta.reasoning;
       }
-      if (parsed.usage) {
-        result.usage = toUsageStats(extractUsageFromSSEJson(parsed)) ?? {
-          total_tokens: parsed.usage.total_tokens,
-          prompt_tokens: parsed.usage.prompt_tokens,
-          completion_tokens: parsed.usage.completion_tokens
+      const extractedUsage = extractUsageFromSSEJson(parsed);
+      if (extractedUsage) {
+        result.usage = toUsageStats(extractedUsage);
+      } else if (parsed.usage) {
+        result.usage = {
+          total_tokens: parsed.usage.total_tokens ?? parsed.usage.input_tokens + parsed.usage.output_tokens,
+          prompt_tokens: parsed.usage.prompt_tokens ?? parsed.usage.input_tokens,
+          completion_tokens: parsed.usage.completion_tokens ?? parsed.usage.output_tokens
         };
       }
       if (parsed.id) {
@@ -2568,22 +2602,62 @@ var ProviderManager = class _ProviderManager {
       const disabledProviders = new Set(
         this.providerRegistry.getDisabledProviders()
       );
+      console.log(`[findNextBestProvider:${this.instanceId}] Starting search for model: ${modelId}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] currentBaseUrl: ${currentBaseUrl}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] torMode: ${torMode}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] disabledProviders: ${[...disabledProviders]}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] failedProviders: ${[...this.failedProviders]}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] providersOnCooldown: ${this.providersOnCoolDown.map(([url]) => url)}`);
       const allProviders = this.providerRegistry.getAllProvidersModels();
+      console.log(`[findNextBestProvider:${this.instanceId}] Total providers in registry: ${Object.keys(allProviders).length}`);
       const candidates = [];
+      let skippedCurrent = 0, skippedFailed = 0, skippedDisabled = 0, skippedCooldown = 0, skippedOnion = 0, skippedNoModel = 0;
       for (const [baseUrl, models] of Object.entries(allProviders)) {
-        if (baseUrl === currentBaseUrl || this.failedProviders.has(baseUrl) || disabledProviders.has(baseUrl) || this.isOnCooldown(baseUrl)) {
+        if (baseUrl === currentBaseUrl) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (current): ${baseUrl}`);
+          skippedCurrent++;
+          continue;
+        }
+        if (this.failedProviders.has(baseUrl)) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (failed): ${baseUrl}`);
+          skippedFailed++;
+          continue;
+        }
+        if (disabledProviders.has(baseUrl)) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (disabled): ${baseUrl}`);
+          skippedDisabled++;
+          continue;
+        }
+        if (this.isOnCooldown(baseUrl)) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (cooldown): ${baseUrl}`);
+          skippedCooldown++;
           continue;
         }
         if (!torMode && (isOnionUrl(baseUrl) || isInsecureHttpUrl(baseUrl))) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (onion/http): ${baseUrl}`);
+          skippedOnion++;
           continue;
         }
         const model = models.find((m) => m.id === modelId);
-        if (!model) continue;
+        if (!model) {
+          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (no model ${modelId}): ${baseUrl} has models: ${models.map((m) => m.id).join(", ")}`);
+          skippedNoModel++;
+          continue;
+        }
         const cost = model.sats_pricing?.completion ?? 0;
+        console.log(`[findNextBestProvider:${this.instanceId}] CANDIDATE: ${baseUrl} cost: ${cost}`);
         candidates.push({ baseUrl, model, cost });
       }
+      console.log(`[findNextBestProvider:${this.instanceId}] Skipped: current=${skippedCurrent}, failed=${skippedFailed}, disabled=${skippedDisabled}, cooldown=${skippedCooldown}, onion=${skippedOnion}, noModel=${skippedNoModel}`);
+      console.log(`[findNextBestProvider:${this.instanceId}] Total candidates: ${candidates.length}`);
       candidates.sort((a, b) => a.cost - b.cost);
-      return candidates.length > 0 ? candidates[0].baseUrl : null;
+      if (candidates.length > 0) {
+        console.log(`[findNextBestProvider:${this.instanceId}] Selected provider: ${candidates[0].baseUrl} with cost: ${candidates[0].cost}`);
+        return candidates[0].baseUrl;
+      } else {
+        console.log(`[findNextBestProvider:${this.instanceId}] No candidate providers found`);
+        return null;
+      }
     } catch (error) {
       console.error("Error finding next best provider:", error);
       return null;
@@ -4453,67 +4527,74 @@ function createSSEParserTransform(onUsage, onResponseId) {
   let buffer = "";
   let usageCaptured = false;
   let responseIdCaptured = false;
-  const maybeCaptureUsageFromJson = (jsonText) => {
+  const inspectDataPayload = (jsonText) => {
+    if (usageCaptured && responseIdCaptured) return;
+    const trimmed = jsonText.trim();
+    if (!trimmed || trimmed === "[DONE]") return;
+    if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return;
     try {
-      const data = JSON.parse(jsonText);
-      const responseId = data.id;
-      if (typeof responseId === "string" && responseId.trim().length > 0) {
-        onResponseId?.(responseId.trim());
-        responseIdCaptured = true;
+      const data = JSON.parse(trimmed);
+      if (!responseIdCaptured) {
+        const responseId = data?.id;
+        if (typeof responseId === "string" && responseId.trim().length > 0) {
+          onResponseId?.(responseId.trim());
+          responseIdCaptured = true;
+        }
       }
-      const usage = extractUsageFromSSEJson(data);
-      if (usage) {
-        onUsage(usage);
-        usageCaptured = true;
+      if (!usageCaptured) {
+        const usage = extractUsageFromSSEJson(data);
+        if (usage) {
+          onUsage(usage);
+          usageCaptured = true;
+        }
       }
     } catch {
     }
   };
-  const processLine = (self, line) => {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      return;
-    }
-    if (trimmed === "data: [DONE]" || trimmed === "[DONE]") {
-      self.push("data: [DONE]\n\n");
-      return;
-    }
-    if (trimmed.startsWith("data:")) {
-      const dataStr = trimmed.startsWith("data: ") ? trimmed.slice(6) : trimmed.slice(5).trimStart();
-      if (dataStr === "[DONE]") {
-        self.push("data: [DONE]\n\n");
-        return;
-      }
-      maybeCaptureUsageFromJson(dataStr);
-      self.push(`data: ${dataStr}
-
-`);
-      return;
-    }
-    if (trimmed.startsWith("{")) {
-      maybeCaptureUsageFromJson(trimmed);
-      self.push(`data: ${trimmed}
-
-`);
-      return;
-    }
-    self.push(line + "\n");
+  const inspectEventBlock = (eventBlock) => {
+    if (usageCaptured && responseIdCaptured) return;
+    const lines = eventBlock.split(/\r?\n/);
+    const dataParts = [];
+    for (const line of lines) {
+      if (!line || line.startsWith(":")) continue;
+      if (line.startsWith("data:")) {
+        const value = line.startsWith("data: ") ? line.slice(6) : line.slice(5);
+        dataParts.push(value);
+      }
+    }
+    if (dataParts.length === 0) return;
+    const payload = dataParts.join("\n");
+    inspectDataPayload(payload);
+  };
+  const emitEventBlock = (self, eventBlock) => {
+    if (eventBlock.length === 0) return;
+    inspectEventBlock(eventBlock);
+    self.push(eventBlock + "\n\n");
   };
   return new stream.Transform({
-    transform(chunk, encoding, callback) {
+    transform(chunk, _encoding, callback) {
       buffer += chunk.toString();
-      const lines = buffer.split(/\r?\n/);
-      buffer = lines.pop() || "";
-      for (const line of lines) {
-        processLine(this, line);
+      const terminator = /\r?\n\r?\n/g;
+      let lastIndex = 0;
+      let match;
+      while ((match = terminator.exec(buffer)) !== null) {
+        const block = buffer.slice(lastIndex, match.index);
+        lastIndex = match.index + match[0].length;
+        emitEventBlock(this, block);
+      }
+      if (lastIndex > 0) {
+        buffer = buffer.slice(lastIndex);
       }
       callback();
     },
     flush(callback) {
-      if (buffer.trim()) {
-        processLine(this, buffer);
+      if (buffer.length > 0) {
+        const tail = buffer.replace(/\r?\n+$/, "");
+        if (tail.length > 0) {
+          emitEventBlock(this, tail);
+        }
+        buffer = "";
       }
-      buffer = "";
       callback();
     }
   });
@@ -4994,9 +5075,10 @@ var RoutstrClient = class {
     const MAX_RETRIES_PER_PROVIDER = 2;
     const { path, method, body, selectedModel, baseUrl, mintUrl } = params;
     let tryNextProvider = false;
+    const errorMessage = responseBody;
     this._log(
       "DEBUG",
-      `[RoutstrClient] _handleErrorResponse: status=${status}, baseUrl=${baseUrl}, mode=${this.mode}, token preview=${token}, requestId=${requestId}`
+      `[RoutstrClient] _handleErrorResponse: status=${status}, baseUrl=${baseUrl}, mode=${this.mode}, token preview=${token}, requestId=${requestId}, errorMessage=${errorMessage}`
     );
     this._log(
       "DEBUG",