@rhea-finance/cross-chain-aggregation-dex 2.1.2 → 2.1.4

package/README.md

@@ -382,7 +382,7 @@ if (result.status === "completed") {
 }
 ```
 
-After `POST /api/swap/report` returns an `id`, the SDK always polls `GET /api/swap/order-status?orderId=<report id>`. That report id is the only status key. The SDK does not query by `recordId` or source `txHash`. Confidential swaps also require order-status polling when they are same-chain. For confidential Near Intents builds, the SDK uses `deposit.orderId` when present and otherwise uses `deposit.depositAddress` as the status key. If a cross-chain or confidential swap provides none of these identifiers, the SDK throws `INVALID_API_RESPONSE` at the `status` stage instead of treating source-chain confirmation as completion.
+After `POST /api/swap/report` returns an `id`, the SDK polls `GET /api/swap/order-status?orderId=<report id>&router=<swap router>`. The router comes from the swap response. The SDK does not query by `recordId` or source `txHash`. Confidential swaps also require order-status polling when they are same-chain. For confidential Near Intents builds, the SDK uses `deposit.orderId` when present and otherwise uses `deposit.depositAddress` as the status key. If a cross-chain or confidential swap provides none of these identifiers, the SDK throws `INVALID_API_RESPONSE` at the `status` stage instead of treating source-chain confirmation as completion.
 
 The default polling interval is 5 seconds. There is no default polling timeout, so polling continues until the order reaches a terminal state or the supplied `AbortSignal` is aborted.
 

package/dist/index.d.mts

@@ -386,8 +386,7 @@ declare function shouldPollSwapOrderStatus(input: {
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
 /**
- * Status queries use `orderId`.
- * The report response `id` is that orderId and is sent alone.
+ * Status queries use the report id as `orderId`, plus the swap response `router`.
  */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {

package/dist/index.d.ts

@@ -386,8 +386,7 @@ declare function shouldPollSwapOrderStatus(input: {
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
 /**
- * Status queries use `orderId`.
- * The report response `id` is that orderId and is sent alone.
+ * Status queries use the report id as `orderId`, plus the swap response `router`.
  */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {

package/dist/index.js

@@ -49,29 +49,31 @@ function resolveSwapReportRecordId(reportData) {
 }
 function buildOrderStatusQuery(params) {
   const reportId = String(params.recordId ?? "").trim();
-  if (reportId) {
-    return { orderId: reportId };
-  }
-  const orderId = params.orderId?.trim();
+  const orderId = reportId || params.orderId?.trim();
   if (!orderId) return {};
   const query = { orderId };
   const router = params.router?.trim();
   if (router) query.router = router;
-  const chainId = params.chainId;
-  if (chainId !== void 0 && chainId !== null && String(chainId).trim() !== "") {
-    query.chainId = chainId;
+  if (!reportId) {
+    const chainId = params.chainId;
+    if (chainId !== void 0 && chainId !== null && String(chainId).trim() !== "") {
+      query.chainId = chainId;
+    }
   }
   return query;
 }
 function resolveOrderStatusLookup(input) {
   const reportId = String(input.recordId ?? "").trim();
-  if (reportId) {
-    return { orderId: reportId };
-  }
-  const orderId = input.orderId?.trim();
+  const orderId = reportId || input.orderId?.trim();
   if (!orderId) return void 0;
   const router = input.router?.trim();
-  const chainId = input.chainId !== void 0 && input.chainId !== null && String(input.chainId).trim() !== "" ? String(input.chainId).trim() : void 0;
+  const chainId = reportId ? void 0 : input.chainId !== void 0 && input.chainId !== null && String(input.chainId).trim() !== "" ? String(input.chainId).trim() : void 0;
+  if (reportId) {
+    return {
+      orderId,
+      ...router ? { router } : {}
+    };
+  }
   return {
     orderId,
     ...router ? { router } : {},
@@ -92,7 +94,10 @@ function assertOrderStatusParams(params) {
 function orderStatusParamsFromHistoryItem(item) {
   const reportId = String(item.id ?? "").trim();
   if (reportId) {
-    return { orderId: reportId };
+    return {
+      orderId: reportId,
+      ...item.router ? { router: item.router } : {}
+    };
   }
   return {
     ...item.orderId ? { orderId: item.orderId } : {},
@@ -2292,7 +2297,8 @@ var McaSwapService = class {
       }
       if (input.waitFor === "completed") {
         const statusLookup = resolveOrderStatusLookup({
-          recordId: reportRecordId ?? result.report?.recordId
+          recordId: reportRecordId ?? result.report?.recordId,
+          router
         });
         if (!statusLookup) {
           throw new SwapSdkError(
@@ -2606,7 +2612,8 @@ var SwapClient = class {
         reportRecordId
       });
       const statusLookup = resolveOrderStatusLookup({
-        recordId: reportRecordId ?? result.report?.recordId
+        recordId: reportRecordId ?? result.report?.recordId,
+        router: build.order?.router ?? build.router
       });
       if (shouldPollOrderStatus && !statusLookup) {
         throw new SwapSdkError(