@routstr/sdk 0.2.11 → 0.2.12

package/dist/client/index.mjs

@@ -1,6 +1,9 @@
 import { getDecodedToken } from '@cashu/cashu-ts';
 import { createStore } from 'zustand/vanilla';
 import { Transform, Readable } from 'stream';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
 
 // core/errors.ts
 var InsufficientBalanceError = class extends Error {
@@ -54,10 +57,10 @@ var AuditLogger = class _AuditLogger {
     const logLine = JSON.stringify(fullEntry) + "\n";
     if (typeof window === "undefined") {
       try {
-        const fs = await import('fs');
-        const path = await import('path');
-        const logPath = path.join(process.cwd(), "audit.log");
-        fs.appendFileSync(logPath, logLine);
+        const fs2 = await import('fs');
+        const path2 = await import('path');
+        const logPath = path2.join(process.cwd(), "audit.log");
+        fs2.appendFileSync(logPath, logLine);
       } catch (error) {
         console.error("[AuditLogger] Failed to write to file:", error);
       }
@@ -1725,6 +1728,7 @@ var ProviderManager = class _ProviderManager {
   }
   /**
    * Clean up expired cooldown entries
+   * Also removes the provider from failedProviders so it can be retried
    */
   cleanupExpiredCooldowns() {
     const now = Date.now();
@@ -1737,6 +1741,10 @@ var ProviderManager = class _ProviderManager {
           console.log(
             `[cleanupExpiredCooldowns:${this.instanceId}] Removing expired cooldown for ${url} (age: ${age}ms, cooldown: ${_ProviderManager.COOLDOWN_DURATION_MS}ms)`
           );
+          this.failedProviders.delete(url);
+          if (this.store) {
+            this.store.getState().removeFailedProvider(url);
+          }
         }
         return !isExpired;
       }
@@ -1910,60 +1918,47 @@ 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)}`);
+      console.log(
+        `[findNextBestProvider:${this.instanceId}] Starting search for model: ${modelId}`
+      );
+      console.log(
+        `[findNextBestProvider:${this.instanceId}] disabledProviders: ${[...disabledProviders]}`
+      );
+      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}`);
+      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) {
-          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (current): ${baseUrl}`);
-          skippedCurrent++;
-          continue;
-        }
-        if (this.failedProviders.has(baseUrl)) {
-          console.log(`[findNextBestProvider:${this.instanceId}] SKIP (failed): ${baseUrl}`);
-          skippedFailed++;
+          console.log(
+            `[findNextBestProvider:${this.instanceId}] SKIP (current): ${baseUrl}`
+          );
           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) {
-          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);
       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) {
@@ -3436,10 +3431,26 @@ var getDefaultUsageTrackingDriver = () => {
 };
 function createSSEParserTransform(onUsage, onResponseId) {
   let buffer = "";
-  let usageCaptured = false;
+  let capturedUsage = null;
   let responseIdCaptured = false;
+  const mergeUsage = (previous, next) => {
+    if (!previous) return next;
+    return {
+      promptTokens: next.promptTokens > 0 ? next.promptTokens : previous.promptTokens,
+      completionTokens: next.completionTokens > 0 ? next.completionTokens : previous.completionTokens,
+      totalTokens: next.totalTokens > 0 ? next.totalTokens : previous.totalTokens,
+      cost: next.cost > 0 ? next.cost : previous.cost,
+      satsCost: next.satsCost > 0 ? next.satsCost : previous.satsCost
+    };
+  };
+  const hasUsageChanged = (previous, next) => {
+    if (!previous) return true;
+    return previous.promptTokens !== next.promptTokens || previous.completionTokens !== next.completionTokens || previous.totalTokens !== next.totalTokens || previous.cost !== next.cost || previous.satsCost !== next.satsCost;
+  };
   const inspectDataPayload = (jsonText) => {
-    if (usageCaptured && responseIdCaptured) return;
+    if (responseIdCaptured && capturedUsage?.satsCost && capturedUsage.totalTokens) {
+      return;
+    }
     const trimmed = jsonText.trim();
     if (!trimmed || trimmed === "[DONE]") return;
     if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return;
@@ -3452,18 +3463,21 @@ function createSSEParserTransform(onUsage, onResponseId) {
           responseIdCaptured = true;
         }
       }
-      if (!usageCaptured) {
-        const usage = extractUsageFromSSEJson(data);
-        if (usage) {
-          onUsage(usage);
-          usageCaptured = true;
+      const usage = extractUsageFromSSEJson(data);
+      if (usage) {
+        const mergedUsage = mergeUsage(capturedUsage, usage);
+        if (hasUsageChanged(capturedUsage, mergedUsage)) {
+          capturedUsage = mergedUsage;
+          onUsage(mergedUsage);
         }
       }
     } catch {
     }
   };
   const inspectEventBlock = (eventBlock) => {
-    if (usageCaptured && responseIdCaptured) return;
+    if (responseIdCaptured && capturedUsage?.satsCost && capturedUsage.totalTokens) {
+      return;
+    }
     const lines = eventBlock.split(/\r?\n/);
     const dataParts = [];
     for (const line of lines) {
@@ -3689,7 +3703,7 @@ var RoutstrClient = class {
   }
   async _prepareRoutedRequest(params) {
     const {
-      path,
+      path: requestPath,
       method,
       body,
       headers = {},
@@ -3730,7 +3744,7 @@ var RoutstrClient = class {
     const baseHeaders = this._buildBaseHeaders();
     const requestHeaders = this._withAuthHeader(baseHeaders, token);
     const response = await this._makeRequest({
-      path,
+      path: requestPath,
       method,
       body: method === "GET" ? void 0 : requestBody,
       baseUrl,
@@ -3749,7 +3763,20 @@ var RoutstrClient = class {
     let capturedUsage;
     let capturedResponseId;
     if (contentType.includes("text/event-stream") && response.body) {
+      const logDir = path.join(os.homedir(), ".routstrd", "stream-response");
+      if (!fs.existsSync(logDir)) {
+        fs.mkdirSync(logDir, { recursive: true });
+      }
+      const logFile = path.join(logDir, `${Date.now()}.jsonl`);
+      const logStream = fs.createWriteStream(logFile);
       const nodeReadable = Readable.fromWeb(response.body);
+      const loggingTransform = new Transform({
+        transform(chunk, encoding, callback) {
+          const raw = chunk.toString();
+          logStream.write(JSON.stringify({ raw, timestamp: Date.now() }) + "\n");
+          callback(null, chunk);
+        }
+      });
       const sseParser = createSSEParserTransform(
         (usage) => {
           capturedUsage = usage;
@@ -3760,7 +3787,7 @@ var RoutstrClient = class {
           processedResponse.requestId = responseId;
         }
       );
-      const transformed = nodeReadable.pipe(sseParser, { end: true });
+      const transformed = nodeReadable.pipe(loggingTransform).pipe(sseParser, { end: true });
       const webStream = Readable.toWeb(
         transformed
       );
@@ -3829,7 +3856,6 @@ var RoutstrClient = class {
       callbacks.onTokenCreated?.(this._getPendingCashuTokenAmount());
       const baseHeaders = this._buildBaseHeaders(headers);
       const requestHeaders = this._withAuthHeader(baseHeaders, token);
-      this.providerManager.resetFailedProviders();
       const providerInfo = await this.providerRegistry.getProviderInfo(baseUrl);
       const providerVersion = providerInfo?.version ?? "";
       let modelIdForRequest = selectedModel.id;
@@ -3932,9 +3958,9 @@ var RoutstrClient = class {
    * Make the API request with failover support
    */
   async _makeRequest(params) {
-    const { path, method, body, baseUrl, token, headers } = params;
+    const { path: path2, method, body, baseUrl, token, headers } = params;
     try {
-      const url = `${baseUrl.replace(/\/$/, "")}${path}`;
+      const url = `${baseUrl.replace(/\/$/, "")}${path2}`;
       if (this.mode === "xcashu") this._log("DEBUG", "HEADERS,", headers);
       const response = await fetch(url, {
         method,
@@ -3984,7 +4010,7 @@ var RoutstrClient = class {
    */
   async _handleErrorResponse(params, token, status, requestId, xCashuRefundToken, responseBody, retryCount = 0) {
     const MAX_RETRIES_PER_PROVIDER = 2;
-    const { path, method, body, selectedModel, baseUrl, mintUrl } = params;
+    const { path: path2, method, body, selectedModel, baseUrl, mintUrl } = params;
     let tryNextProvider = false;
     const errorMessage = responseBody;
     this._log(
@@ -4286,7 +4312,7 @@ var RoutstrClient = class {
       });
       return this._makeRequest({
         ...params,
-        path,
+        path: path2,
         method,
         body,
         baseUrl: nextProvider,