@routstr/sdk 0.3.10 → 0.3.11

package/dist/{store-C8MZlfuz.d.ts → store-CAQLSbEj.d.ts}

@@ -40,14 +40,51 @@ interface ListUsageTrackingOptions {
     baseUrl?: string;
     sessionId?: string;
     client?: string;
+    /** Match any of these client ids (SQL `client IN (...)`). Complements `client`. */
+    clients?: string[];
     provider?: string;
 }
+/** Dimension to group usage aggregates by. `day`/`hour` are timezone-aware. */
+type UsageGroupBy = "modelId" | "baseUrl" | "client" | "sessionId" | "provider" | "day" | "hour";
+interface AggregateUsageOptions extends Omit<ListUsageTrackingOptions, "limit"> {
+    /** Group rows by this dimension. Omit for a single grand-total row. */
+    groupBy?: UsageGroupBy;
+    /**
+     * Minutes to subtract from each timestamp before `day`/`hour` bucketing,
+     * e.g. `new Date().getTimezoneOffset()`. Ignored for other groupings.
+     * Defaults to 0 (UTC).
+     */
+    tzOffsetMinutes?: number;
+}
+interface UsageAggregateRow {
+    /**
+     * The group key: the dimension value, "YYYY-MM-DD" (day) or "00".."23"
+     * (hour). `null` when `groupBy` is omitted or the grouped column is null.
+     */
+    group: string | null;
+    requests: number;
+    promptTokens: number;
+    completionTokens: number;
+    totalTokens: number;
+    cost: number;
+    satsCost: number;
+    baseMsats: number;
+    inputMsats: number;
+    outputMsats: number;
+    totalMsats: number;
+    totalUsd: number;
+    cacheReadInputTokens: number;
+    cacheCreationInputTokens: number;
+    cacheReadMsats: number;
+    cacheCreationMsats: number;
+}
 interface UsageTrackingDriver {
     migrate(): Promise<void>;
     append(entry: UsageTrackingEntry): Promise<void>;
     appendMany(entries: UsageTrackingEntry[]): Promise<void>;
     list(options?: ListUsageTrackingOptions): Promise<UsageTrackingEntry[]>;
     count(options?: Omit<ListUsageTrackingOptions, "limit">): Promise<number>;
+    aggregate(options?: AggregateUsageOptions): Promise<UsageAggregateRow[]>;
     deleteOlderThan(timestamp: number): Promise<number>;
     clear(): Promise<void>;
 }
@@ -183,4 +220,4 @@ declare const createDiscoveryAdapterFromStore: (store: SdkStore) => DiscoveryAda
 declare const createStorageAdapterFromStore: (store: SdkStore) => StorageAdapter;
 declare const createProviderRegistryFromStore: (store: SdkStore, logger?: SdkLogger) => ProviderRegistry;
 
-export { type ListUsageTrackingOptions as L, type SdkStore as S, type UsageTrackingDriver as U, type StorageDriver as a, type UsageTrackingEntry as b, createDiscoveryAdapterFromStore as c, createProviderRegistryFromStore as d, createSdkStore as e, createStorageAdapterFromStore as f };
+export { type AggregateUsageOptions as A, type ListUsageTrackingOptions as L, type SdkStore as S, type UsageAggregateRow as U, type StorageDriver as a, type UsageGroupBy as b, type UsageTrackingDriver as c, type UsageTrackingEntry as d, createDiscoveryAdapterFromStore as e, createProviderRegistryFromStore as f, createSdkStore as g, createStorageAdapterFromStore as h };

package/dist/{store-BiuM2V9N.d.mts → store-CuXwe5Rg.d.mts}

@@ -40,14 +40,51 @@ interface ListUsageTrackingOptions {
     baseUrl?: string;
     sessionId?: string;
     client?: string;
+    /** Match any of these client ids (SQL `client IN (...)`). Complements `client`. */
+    clients?: string[];
     provider?: string;
 }
+/** Dimension to group usage aggregates by. `day`/`hour` are timezone-aware. */
+type UsageGroupBy = "modelId" | "baseUrl" | "client" | "sessionId" | "provider" | "day" | "hour";
+interface AggregateUsageOptions extends Omit<ListUsageTrackingOptions, "limit"> {
+    /** Group rows by this dimension. Omit for a single grand-total row. */
+    groupBy?: UsageGroupBy;
+    /**
+     * Minutes to subtract from each timestamp before `day`/`hour` bucketing,
+     * e.g. `new Date().getTimezoneOffset()`. Ignored for other groupings.
+     * Defaults to 0 (UTC).
+     */
+    tzOffsetMinutes?: number;
+}
+interface UsageAggregateRow {
+    /**
+     * The group key: the dimension value, "YYYY-MM-DD" (day) or "00".."23"
+     * (hour). `null` when `groupBy` is omitted or the grouped column is null.
+     */
+    group: string | null;
+    requests: number;
+    promptTokens: number;
+    completionTokens: number;
+    totalTokens: number;
+    cost: number;
+    satsCost: number;
+    baseMsats: number;
+    inputMsats: number;
+    outputMsats: number;
+    totalMsats: number;
+    totalUsd: number;
+    cacheReadInputTokens: number;
+    cacheCreationInputTokens: number;
+    cacheReadMsats: number;
+    cacheCreationMsats: number;
+}
 interface UsageTrackingDriver {
     migrate(): Promise<void>;
     append(entry: UsageTrackingEntry): Promise<void>;
     appendMany(entries: UsageTrackingEntry[]): Promise<void>;
     list(options?: ListUsageTrackingOptions): Promise<UsageTrackingEntry[]>;
     count(options?: Omit<ListUsageTrackingOptions, "limit">): Promise<number>;
+    aggregate(options?: AggregateUsageOptions): Promise<UsageAggregateRow[]>;
     deleteOlderThan(timestamp: number): Promise<number>;
     clear(): Promise<void>;
 }
@@ -183,4 +220,4 @@ declare const createDiscoveryAdapterFromStore: (store: SdkStore) => DiscoveryAda
 declare const createStorageAdapterFromStore: (store: SdkStore) => StorageAdapter;
 declare const createProviderRegistryFromStore: (store: SdkStore, logger?: SdkLogger) => ProviderRegistry;
 
-export { type ListUsageTrackingOptions as L, type SdkStore as S, type UsageTrackingDriver as U, type StorageDriver as a, type UsageTrackingEntry as b, createDiscoveryAdapterFromStore as c, createProviderRegistryFromStore as d, createSdkStore as e, createStorageAdapterFromStore as f };
+export { type AggregateUsageOptions as A, type ListUsageTrackingOptions as L, type SdkStore as S, type UsageAggregateRow as U, type StorageDriver as a, type UsageGroupBy as b, type UsageTrackingDriver as c, type UsageTrackingEntry as d, createDiscoveryAdapterFromStore as e, createProviderRegistryFromStore as f, createSdkStore as g, createStorageAdapterFromStore as h };

package/dist/wallet/index.js

@@ -1032,8 +1032,8 @@ var BalanceManager = class _BalanceManager {
     const refundableProviderBalance = Object.entries(
       balanceState.providerBalances
     ).filter(([providerBaseUrl]) => providerBaseUrl !== baseUrl).reduce((sum, [, value]) => sum + value, 0);
-    if (totalMintBalance + targetProviderBalance < adjustedAmount && totalMintBalance + targetProviderBalance + refundableProviderBalance >= adjustedAmount && retryCount < 2) {
-      await this._refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount);
+    if (totalMintBalance + targetProviderBalance < adjustedAmount && totalMintBalance + targetProviderBalance + refundableProviderBalance >= adjustedAmount && retryCount < 3) {
+      await this._refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount, adjustedAmount);
       return this.createProviderToken({
         ...options,
         retryCount: retryCount + 1
@@ -1172,33 +1172,47 @@ var BalanceManager = class _BalanceManager {
     }
     return candidates;
   }
-  async _refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount) {
+  async _refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount, requiredAmount) {
     const apiKeyDistribution = this.storageAdapter.getApiKeyDistribution();
     const forceRefund = retryCount >= 2;
-    const apiKeysToRefund = apiKeyDistribution.filter(
-      (apiKey) => apiKey.baseUrl !== baseUrl && apiKey.amount > 0
-    );
-    const apiKeyRefundResults = await Promise.allSettled(
-      apiKeysToRefund.map(async (apiKeyEntry) => {
-        const fullApiKeyEntry = this.storageAdapter.getApiKey(
-          apiKeyEntry.baseUrl
-        );
-        if (!fullApiKeyEntry) {
-          return { baseUrl: apiKeyEntry.baseUrl, success: false };
-        }
-        const result = await this.refundApiKey({
+    const candidates = apiKeyDistribution.filter((apiKey) => apiKey.baseUrl !== baseUrl && apiKey.amount > 0).map((apiKey) => {
+      const full = this.storageAdapter.getApiKey(apiKey.baseUrl);
+      return {
+        baseUrl: apiKey.baseUrl,
+        amount: apiKey.amount,
+        lastUsed: full?.lastUsed ?? 0,
+        key: full?.key
+      };
+    }).filter((c) => c.key != null).sort((a, b) => a.lastUsed - b.lastUsed);
+    if (candidates.length === 0) return;
+    if (forceRefund) {
+      for (const candidate of candidates) {
+        await this.refundApiKey({
           mintUrl,
-          baseUrl: apiKeyEntry.baseUrl,
-          apiKey: fullApiKeyEntry.key,
-          forceRefund
+          baseUrl: candidate.baseUrl,
+          apiKey: candidate.key,
+          forceRefund: true
         });
-        return { baseUrl: apiKeyEntry.baseUrl, success: result.success };
-      })
-    );
-    for (const result of apiKeyRefundResults) {
-      if (result.status === "fulfilled" && result.value.success) {
-        this.storageAdapter.updateApiKeyBalance(result.value.baseUrl, 0);
+        const newState = await this.getBalanceState();
+        const newAvailable = (newState.mintBalances[mintUrl] || 0) + (newState.providerBalances[baseUrl] || 0);
+        if (newAvailable >= requiredAmount) {
+          this.logger.log(
+            `_refundOtherProvidersForTopUp: freed enough balance (${newAvailable} >= ${requiredAmount}), stopping early`
+          );
+          return;
+        }
       }
+    } else {
+      await Promise.allSettled(
+        candidates.map(
+          (candidate) => this.refundApiKey({
+            mintUrl,
+            baseUrl: candidate.baseUrl,
+            apiKey: candidate.key,
+            forceRefund: false
+          })
+        )
+      );
     }
   }
   /**