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

package/dist/index.mjs

@@ -29,8 +29,15 @@ function asSwapSdkError(error, stage) {
 // src/utils/orderStatus.ts
 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();
@@ -2295,8 +2302,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 +2606,16 @@ var SwapClient = class {
           executionId: build.executionId
         });
       }
+      const waitsForCompletion = (input.waitFor ?? "submitted") === "completed";
+      const requiresOrderStatus = build.isCrossChain || build.request?.confidentiality === "basic";
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
+      const mustReportForStatus = waitsForCompletion && requiresOrderStatus && 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 +2635,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,