@riftresearch/sdk 0.4.2 → 0.4.3

package/dist/index.d.ts

@@ -136,6 +136,9 @@ interface SwapStatusResponse {
 	depositTransaction?: TxHash;
 	quote: QuoteResponse;
 }
+interface ErrorResponse {
+	error: string;
+}
 /**
 * Execution actions - the mechanism by which a step is executed.
 */
@@ -228,11 +231,15 @@ declare const Currencies: {
 		CBBTC: Currency;
 	};
 };
-import { treaty } from "@elysiajs/eden";
-import { Elysia } from "elysia";
-declare const app: Elysia;
+import { Treaty } from "@elysiajs/eden";
+declare const app: unknown;
 declare const appTyped: typeof app;
 type App = typeof appTyped;
+declare class SwapRouterApiError extends Error {
+	status: number;
+	body: ErrorResponse | undefined;
+	constructor(message: string, status: number, body?: ErrorResponse);
+}
 /**
 * Create a type-safe API client for the Rift Swap Router.
 *
@@ -283,7 +290,7 @@ type App = typeof appTyped;
 * ```
 */
 /** Type of the Rift API client */
-type RiftClient = ReturnType<typeof treaty<App>>;
+type RiftClient = Treaty.Create<App>;
 declare function createClient(baseUrl: string): RiftClient;
 /**
 * Discriminated union of all possible swap routes.
@@ -447,6 +454,7 @@ declare class RiftSdk {
 	private debug;
 	constructor(options: RiftSdkOptions);
 	private logDebug;
+	private unwrapEdenResult;
 	/**
 	* Get a quote for a swap and return a function to execute it.
 	*
@@ -497,4 +505,4 @@ declare class RiftSdk {
 	getSwapStatus(swapId: string): Promise<SwapStatusResponse>;
 }
 declare function createRiftSdk(options: RiftSdkOptions): RiftSdk;
-export { getSupportedModes, detectRoute, createRiftSdk, createCurrency, createClient, TradeParameters, TokenIdentifier, SwapStatus2 as SwapStatus, SwapRoute, SwapResult, SwapResponse, SupportedModes, SendBitcoinFn, RiftSwap, RiftSdkOptions, RiftSdk, RiftClient, QuoteResult, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Currencies, Chain, BtcTransferStep, BtcTransferKind, BitcoinChain, App };
+export { getSupportedModes, detectRoute, createRiftSdk, createCurrency, createClient, TradeParameters, TokenIdentifier, SwapStatus2 as SwapStatus, SwapRouterApiError, SwapRoute, SwapResult, SwapResponse, SupportedModes, SendBitcoinFn, RiftSwap, RiftSdkOptions, RiftSdk, RiftClient, QuoteResult, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Currencies, Chain, BtcTransferStep, BtcTransferKind, BitcoinChain, App };

package/dist/index.js

@@ -85,7 +85,9 @@ var Currencies = {
     }
   }
 };
-// src/apiClient.ts
+// src/client.ts
+import { treaty } from "@elysiajs/eden";
+
 class SwapRouterApiError extends Error {
   status;
   body;
@@ -96,57 +98,6 @@ class SwapRouterApiError extends Error {
     this.body = body;
   }
 }
-
-class SwapRouterClient {
-  baseUrl;
-  fetch;
-  constructor(options) {
-    this.baseUrl = options.baseUrl.replace(/\/$/, "");
-    this.fetch = options.fetch ?? globalThis.fetch;
-  }
-  async request(method, path, body) {
-    const url = `${this.baseUrl}${path}`;
-    const response = await this.fetch(url, {
-      method,
-      headers: body ? { "Content-Type": "application/json" } : undefined,
-      body: body ? JSON.stringify(body) : undefined
-    });
-    const text = await response.text();
-    let data;
-    try {
-      data = JSON.parse(text);
-    } catch {
-      if (!response.ok) {
-        throw new SwapRouterApiError(text || `Request failed with status ${response.status}`, response.status);
-      }
-      throw new SwapRouterApiError(`Invalid JSON response: ${text}`, response.status);
-    }
-    if (!response.ok) {
-      throw new SwapRouterApiError(data.error ?? `Request failed with status ${response.status}`, response.status, data);
-    }
-    return data;
-  }
-  async health() {
-    return this.request("GET", "/health");
-  }
-  async status() {
-    return this.request("GET", "/status");
-  }
-  async quote(request) {
-    return this.request("POST", "/quote", request);
-  }
-  async createSwap(request) {
-    return this.request("POST", "/swap", request);
-  }
-  async getSwap(swapId) {
-    return this.request("GET", `/swap/${swapId}`);
-  }
-  async reportStepResult(swapId, result) {
-    await this.request("POST", `/swap/${swapId}/tx`, result);
-  }
-}
-// src/client.ts
-import { treaty } from "@elysiajs/eden";
 function createClient(baseUrl) {
   return treaty(baseUrl);
 }
@@ -214,9 +165,8 @@ class RiftSdk {
   integratorName;
   debug;
   constructor(options) {
-    this.riftClient = new SwapRouterClient({
-      baseUrl: options.apiUrl ?? "https://router-api-v2-production.up.railway.app"
-    });
+    const baseUrl = (options.apiUrl ?? "https://router-api-v2-production.up.railway.app").replace(/\/$/, "");
+    this.riftClient = createClient(baseUrl);
     this.preflightCheckBalances = options.preflight?.checkBalances !== false;
     this.integratorName = options.integratorName;
     this.debug = options.debug ?? false;
@@ -230,6 +180,24 @@ class RiftSdk {
     }
     console.log(`[RiftSdk] ${message}`);
   }
+  unwrapEdenResult(result) {
+    if (!result.error) {
+      if (result.data === null) {
+        throw new SwapRouterApiError(`Request failed with status ${result.status}`, result.status);
+      }
+      return result.data;
+    }
+    const error = result.error;
+    const status = error.status ?? result.status;
+    const value = error.value;
+    let message = `Request failed with status ${status}`;
+    if (value && typeof value === "object" && "error" in value && typeof value.error === "string") {
+      message = value.error;
+    } else if (typeof error.message === "string") {
+      message = error.message;
+    }
+    throw new SwapRouterApiError(message, status, value);
+  }
   async getQuote(params) {
     const route = detectRoute(params.from, params.to);
     const isMonochain = route.type === "oneinch_monochain";
@@ -239,7 +207,7 @@ class RiftSdk {
       to: params.to,
       amount: params.amount
     };
-    const riftQuote = await this.riftClient.quote(quoteRequest);
+    const riftQuote = this.unwrapEdenResult(await this.riftClient.quote.post(quoteRequest));
     const quote = this.buildQuoteResult(riftQuote, params);
     const isChained = route.type === "direct_rift" && route.direction === "from_btc" && !isCbBtc(params.to);
     return {
@@ -259,13 +227,13 @@ class RiftSdk {
           await this.assertSufficientBalance(params.from, quote.from.amount, context);
         }
         this.logDebug("creating swap", { quoteId: riftQuote.id });
-        const swapResponse = await this.riftClient.createSwap({
+        const swapResponse = this.unwrapEdenResult(await this.riftClient.swap.post({
           id: riftQuote.id,
           destinationAddress: params.destinationAddress,
           refundAddress,
           integratorName: this.integratorName,
           approvalMode: params.approvalMode
-        });
+        }));
         this.logDebug("swap created", {
           swapId: swapResponse.swapId,
           steps: swapResponse.executionSteps.length
@@ -288,16 +256,16 @@ class RiftSdk {
               stepId: step.id,
               oneinchSwap: true
             });
-            await this.riftClient.reportStepResult(swapResponse.swapId, {
+            this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).tx.post({
               stepId: step.id,
               ...result
-            });
+            }));
           }
         }
         this.logDebug("fetching swap status", {
           swapId: swapResponse.swapId
         });
-        const swap = await this.riftClient.getSwap(swapResponse.swapId);
+        const swap = this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).get());
         this.logDebug("swap fetched", {
           swapId: swapResponse.swapId,
           status: swap.status
@@ -472,7 +440,7 @@ class RiftSdk {
     return context.sendBitcoin;
   }
   async getSwapStatus(swapId) {
-    return this.riftClient.getSwap(swapId);
+    return this.unwrapEdenResult(await this.riftClient.swap({ swapId }).get());
   }
 }
 function createRiftSdk(options) {
@@ -484,6 +452,7 @@ export {
   createRiftSdk,
   createCurrency,
   createClient,
+  SwapRouterApiError,
   RiftSdk,
   Currencies
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@riftresearch/sdk",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"description": "SDK for swapping between bitcoin and evm chains",
 	"license": "MIT",
 	"files": [