@rhea-finance/cross-chain-aggregation-dex 2.0.8 → 2.1.0

package/dist/index.mjs

@@ -27,10 +27,22 @@ function asSwapSdkError(error, stage) {
 }
 
 // src/utils/orderStatus.ts
+function shouldPollSwapOrderStatus(input) {
+  const waitMode = input.waitFor ?? "submitted";
+  const requiresOrderStatus = input.isCrossChain || input.confidentiality === "basic";
+  return requiresOrderStatus && waitMode !== "submitted";
+}
 function resolveSwapReportRecordId(reportData) {
   if (!reportData || typeof reportData !== "object") return "";
-  const id = reportData.id;
-  return id === void 0 || id === null ? "" : String(id).trim();
+  const record = reportData;
+  for (const key of ["id", "recordId", "record_id"]) {
+    const value = record[key];
+    if (value !== void 0 && value !== null) {
+      const normalized = String(value).trim();
+      if (normalized) return normalized;
+    }
+  }
+  return "";
 }
 function buildOrderStatusQuery(params) {
   const normalizedRecordId = String(params.recordId ?? "").trim();
@@ -2055,41 +2067,13 @@ var McaSwapService = class {
         "MCA NEAR withdraw is missing a status deposit address"
       );
     }
-    const result = await this.client.executeSwap({
+    return this.client.executeSwap({
       build,
       waitFor: input.quote.executionMode === "withdraw-near" && input.waitFor === "completed" ? "source-confirmed" : input.waitFor,
       orderPolling: input.orderPolling,
       signal: input.signal,
       onEvent: input.onEvent
     });
-    if (input.quote.executionMode === "withdraw-near" && input.waitFor === "completed") {
-      const statusLookup = resolveOrderStatusLookup({
-        recordId: result.report?.recordId,
-        orderId: nearStatusKey,
-        router: input.quote.route.router
-      }) ?? { orderId: nearStatusKey, router: input.quote.route.router };
-      const status = await this.client.waitForOrder({
-        ...statusLookup,
-        ...input.orderPolling,
-        signal: input.signal
-      });
-      this.emitEvent(
-        {
-          type: "order-status",
-          executionId: result.executionId,
-          status: status.status
-        },
-        input.onEvent
-      );
-      result.status = status.status === "unknown" || status.status === "pending" ? "processing" : status.status;
-      if (status.status === "completed") {
-        this.emitEvent(
-          { type: "completed", executionId: result.executionId },
-          input.onEvent
-        );
-      }
-    }
-    return result;
   }
   reportIfManaged(result) {
     const request = this.relayerReports.get(result.executionId);
@@ -2295,8 +2279,10 @@ var McaSwapService = class {
         raw
       };
       emit({ type: "submitted", executionId, orderId });
+      const mustReportForStatus = input.waitFor === "completed";
+      const shouldReportNow = this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
       let reportRecordId;
-      if (this.reportMode === "auto") {
+      if (shouldReportNow) {
         try {
           const reportData = await this.client.reportRaw(reportRequest, {
             signal: input.signal
@@ -2597,12 +2583,20 @@ var SwapClient = class {
           executionId: build.executionId
         });
       }
+      const waitMode = input.waitFor ?? "submitted";
+      const shouldPollOrderStatus = shouldPollSwapOrderStatus({
+        waitFor: waitMode,
+        isCrossChain: build.isCrossChain,
+        confidentiality: build.request?.confidentiality
+      });
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
+      const mustReportForStatus = shouldPollOrderStatus && Boolean(reportRequest);
+      const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
       let reportRecordId;
-      if (this.reportMode === "auto" && reportRequest) {
+      if (shouldReportNow && reportRequest) {
         try {
           const reportData = await this.api.report(reportRequest, {
             signal: input.signal
@@ -2622,8 +2616,6 @@ var SwapClient = class {
           emit({ type: "warning", executionId: build.executionId, warning });
         }
       }
-      const waitsForCompletion = (input.waitFor ?? "submitted") === "completed";
-      const requiresOrderStatus = build.isCrossChain || build.request?.confidentiality === "basic";
       const statusLookup = resolveOrderStatusLookup({
         recordId: reportRecordId ?? result.report?.recordId,
         orderId,
@@ -2631,7 +2623,7 @@ var SwapClient = class {
         router: orderRouter ?? build.router,
         chainId: orderChainId
       });
-      if (waitsForCompletion && requiresOrderStatus && !statusLookup) {
+      if (shouldPollOrderStatus && !statusLookup) {
         throw new SwapSdkError(
           "INVALID_API_RESPONSE",
           "status",
@@ -2644,7 +2636,7 @@ var SwapClient = class {
           }
         );
       }
-      if (waitsForCompletion && statusLookup) {
+      if (shouldPollOrderStatus && statusLookup) {
         const status = await this.waitForOrder({
           ...statusLookup,
           ...input.orderPolling,
@@ -2908,6 +2900,6 @@ function delay(ms, signal) {
   });
 }
 
-export { ApiClient, DEFAULT_MCA_SIGNER_PRIORITY, ExecutorRegistry, SwapClient, SwapSdkError, asSwapSdkError, assertBaseUnitAmount, assertOrderStatusParams, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, buildOrderStatusQuery, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeOrderStatus, normalizeQuote, orderStatusParamsFromHistoryItem, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, resolveOrderStatusLookup, resolveSourceTxHash, resolveSwapReportRecordId, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, toApiAssetAddress, toApiChain };
+export { ApiClient, DEFAULT_MCA_SIGNER_PRIORITY, ExecutorRegistry, SwapClient, SwapSdkError, asSwapSdkError, assertBaseUnitAmount, assertOrderStatusParams, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, buildOrderStatusQuery, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeOrderStatus, normalizeQuote, orderStatusParamsFromHistoryItem, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, resolveOrderStatusLookup, resolveSourceTxHash, resolveSwapReportRecordId, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, shouldPollSwapOrderStatus, toApiAssetAddress, toApiChain };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map