@rhea-finance/cross-chain-aggregation-dex 2.1.7 → 2.1.9

package/dist/index.js

@@ -2,6 +2,68 @@
 
 var zod = require('zod');
 
+// src/core/catchLog.ts
+var MAX_CAUSE_DEPTH = 8;
+var catchLoggingEnabled = false;
+function setSdkCatchLogging(enabled) {
+  catchLoggingEnabled = Boolean(enabled);
+}
+function isSdkCatchLoggingEnabled() {
+  return catchLoggingEnabled;
+}
+function readProp(value, key) {
+  if (typeof value !== "object" || value === null) return void 0;
+  return Reflect.get(value, key);
+}
+function redactSensitive(text) {
+  return text.replace(/(https?:\/\/[^\s?'"`]+)\?[^\s'"`]*/gi, "$1?[redacted]");
+}
+function serializeCaughtError(error, depth = 0) {
+  if (error === null || error === void 0) {
+    return { value: error };
+  }
+  if (typeof error !== "object") {
+    return {
+      value: typeof error === "string" ? redactSensitive(error) : error
+    };
+  }
+  const name = typeof readProp(error, "name") === "string" ? readProp(error, "name") : void 0;
+  const message = typeof readProp(error, "message") === "string" ? redactSensitive(readProp(error, "message")) : void 0;
+  const code = readProp(error, "code");
+  const stage = readProp(error, "stage");
+  const details = readProp(error, "details");
+  const stack = typeof readProp(error, "stack") === "string" ? redactSensitive(readProp(error, "stack")) : void 0;
+  const options = readProp(error, "options");
+  const optionsCause = typeof options === "object" && options !== null ? Reflect.get(options, "cause") : void 0;
+  const directCause = readProp(error, "cause");
+  const cause = optionsCause ?? directCause;
+  const out = {
+    ...name ? { name } : {},
+    ...message !== void 0 ? { message } : {},
+    ...code !== void 0 ? { code } : {},
+    ...stage !== void 0 ? { stage } : {},
+    ...details !== void 0 ? { details } : {},
+    ...stack ? { stack } : {}
+  };
+  if (cause !== void 0 && depth < MAX_CAUSE_DEPTH) {
+    out.cause = serializeCaughtError(cause, depth + 1);
+  } else if (Object.keys(out).length === 0) {
+    try {
+      out.raw = JSON.parse(
+        redactSensitive(JSON.stringify(error) ?? "null")
+      );
+    } catch {
+      out.raw = redactSensitive(String(error));
+    }
+  }
+  return out;
+}
+function logSdkCaughtError(scope, error) {
+  if (!catchLoggingEnabled) return;
+  const payload = serializeCaughtError(error);
+  console.error(`[cross-chain-aggregation-dex] catch:${scope}`, payload);
+}
+
 // src/core/errors.ts
 var SwapSdkError = class extends Error {
   constructor(code, stage, message, options = {}) {
@@ -23,6 +85,7 @@ var SwapSdkError = class extends Error {
   }
 };
 function asSwapSdkError(error, stage) {
+  logSdkCaughtError(`asSwapSdkError:${stage}`, error);
   if (error instanceof SwapSdkError) return error;
   const message = error instanceof Error ? error.message : String(error);
   return new SwapSdkError("API_ERROR", stage, message, { cause: error });
@@ -120,6 +183,9 @@ var ApiClient = class {
   constructor(config) {
     this.config = config;
     this.baseUrl = config.baseUrl.replace(/\/$/, "");
+    if (config.debugCatchLogging !== void 0) {
+      setSdkCatchLogging(config.debugCatchLogging);
+    }
     const fetchImpl = config.fetch ?? globalThis.fetch;
     if (typeof fetchImpl !== "function") {
       throw new SwapSdkError(
@@ -302,6 +368,7 @@ var ApiClient = class {
       }
       return parsed.data;
     } catch (error) {
+      logSdkCaughtError("api/ApiClient.ts", error);
       if (error instanceof SwapSdkError) throw error;
       if (controller.signal.aborted) {
         throw new SwapSdkError(
@@ -362,6 +429,7 @@ var ApiClient = class {
     try {
       return text ? JSON.parse(text) : {};
     } catch (error) {
+      logSdkCaughtError("api/ApiClient.ts", error);
       throw new SwapSdkError(
         status >= 400 ? "HTTP_ERROR" : "INVALID_API_RESPONSE",
         stage,
@@ -713,6 +781,7 @@ function normalizeBuild(raw, executionId = createExecutionId(), request) {
       raw
     };
   } catch (error) {
+    logSdkCaughtError("normalizers/build.ts", error);
     if (error instanceof SwapSdkError) throw error;
     throw invalidBuild(error);
   }
@@ -853,6 +922,10 @@ function normalizeTronExecution(raw, chain) {
 }
 function isTronRawDataTx(value) {
   if (typeof value !== "object" || value === null) return false;
+  const kind = Reflect.get(value, "kind");
+  if (typeof kind === "string" && kind.toLowerCase() === "tron_contract") {
+    return true;
+  }
   const format = Reflect.get(value, "format");
   if (typeof format === "string" && format.toLowerCase() === "tron-raw-data") {
     return true;
@@ -1069,6 +1142,7 @@ function serializeQuoteRequest(request) {
     quoteWaitingTimeMs: request.quoteWaitingTimeMs ?? DEFAULT_QUOTE_WAITING_TIME_MS,
     sameChainTimeoutMs: request.sameChainTimeoutMs ?? DEFAULT_SAME_CHAIN_TIMEOUT_MS,
     crossChainTimeoutMs: request.crossChainTimeoutMs ?? DEFAULT_CROSS_CHAIN_TIMEOUT_MS,
+    ...request.excludeDexs !== void 0 ? { excludeDexs: [...request.excludeDexs] } : {},
     ...request.confidentiality ? { confidentiality: request.confidentiality } : {},
     sender: request.sender.trim(),
     ...request.recipient?.trim() ? { recipient: request.recipient.trim() } : {}
@@ -1212,6 +1286,7 @@ function validateResponseAmount(value, field) {
   try {
     return assertBaseUnitAmount(value);
   } catch (error) {
+    logSdkCaughtError("normalizers/quote.ts", error);
     throw invalidQuote(`Quote response has invalid ${field}`, error);
   }
 }
@@ -1974,6 +2049,7 @@ function normalizeDeposit2(value) {
   try {
     return parseUnits(decimal, 24);
   } catch (error) {
+    logSdkCaughtError("mca/withdraw.ts", error);
     throw new SwapSdkError(
       "INVALID_API_RESPONSE",
       "build",
@@ -2195,6 +2271,7 @@ var McaSwapService = class {
           }
         })).trim();
       } catch (error) {
+        logSdkCaughtError("mca/McaSwapService.ts", error);
         if (error instanceof SwapSdkError) throw error;
         throw new SwapSdkError(
           "SIGNING_FAILED",
@@ -2284,6 +2361,7 @@ var McaSwapService = class {
             ...reportRecordId ? { recordId: reportRecordId } : {}
           };
         } catch (error) {
+          logSdkCaughtError("mca/McaSwapService.ts", error);
           const warning = {
             code: "REPORT_FAILED",
             message: "MCA withdraw submitted but report failed",
@@ -2318,6 +2396,7 @@ var McaSwapService = class {
       }
       return result;
     } catch (error) {
+      logSdkCaughtError("mca/McaSwapService.ts", error);
       const sdkError = asSwapSdkError(error, "submit");
       emit({ type: "failed", executionId, error: sdkError });
       throw sdkError;
@@ -2328,6 +2407,7 @@ var McaSwapService = class {
     try {
       identityKey = (await provider.getIdentityKey()).trim();
     } catch (error) {
+      logSdkCaughtError("mca/McaSwapService.ts", error);
       if (error instanceof SwapSdkError) throw error;
       throw new SwapSdkError(
         "SIGNING_FAILED",
@@ -2389,6 +2469,9 @@ var SwapClient = class {
     this.reportRequests = /* @__PURE__ */ new Map();
     this.tokenListCache = /* @__PURE__ */ new Map();
     this.tokenListInflight = /* @__PURE__ */ new Map();
+    if (config.debugCatchLogging !== void 0) {
+      setSdkCatchLogging(config.debugCatchLogging);
+    }
     this.config = config;
     this.api = new ApiClient(config);
     this.registry = new ExecutorRegistry(config.executors ?? []);
@@ -2516,18 +2599,63 @@ var SwapClient = class {
       if (input.onEvent !== this.config.onEvent) input.onEvent?.(event);
     };
     try {
+      let activeBuild = build;
       const executor = this.registry.get(build.execution.kind);
+      if (build.execution.kind === "tron-transaction" && build.execution.approval && !build.request) {
+        throw new SwapSdkError(
+          "INVALID_REQUEST",
+          "sign",
+          "Tron approval builds require the original build request to rebuild after approval"
+        );
+      }
+      const needsTronRebuild = build.execution.kind === "tron-transaction" && Boolean(build.execution.approval) && Boolean(build.request);
       const context = {
         executionId: build.executionId,
         signal: input.signal,
         waitFor: input.waitFor ?? "submitted",
         emit,
-        ...input.beforeSign ? { beforeSign: input.beforeSign } : {}
+        ...input.beforeSign ? { beforeSign: input.beforeSign } : {},
+        ...needsTronRebuild ? {
+          refreshTronExecution: async () => {
+            const request = build.request;
+            if (!request) {
+              throw new SwapSdkError(
+                "INVALID_REQUEST",
+                "build",
+                "Missing build request to rebuild Tron swap after approval"
+              );
+            }
+            const raw = await this.api.build(request, {
+              signal: input.signal
+            });
+            const refreshed = normalizeBuild(
+              raw,
+              build.executionId,
+              request
+            );
+            if (refreshed.execution.kind !== "tron-transaction") {
+              throw new SwapSdkError(
+                "INVALID_API_RESPONSE",
+                "build",
+                "Rebuilt Tron swap must return a tron-transaction execution"
+              );
+            }
+            if (refreshed.execution.approval) {
+              throw new SwapSdkError(
+                "INVALID_API_RESPONSE",
+                "build",
+                "Tron approval is still required after rebuild"
+              );
+            }
+            activeBuild = refreshed;
+            return refreshed.execution;
+          }
+        } : {}
       };
       await executor.validate(build.execution, context);
       emit({ type: "signing-requested", executionId: build.executionId });
       const chainResult = await executor.execute(build.execution, context);
-      let orderId = chainResult.orderId ?? build.order?.orderId;
+      let orderId = chainResult.orderId ?? activeBuild.order?.orderId;
       if (chainResult.signature) {
         if (build.execution.kind !== "evm-signature") {
           throw new SwapSdkError(
@@ -2552,33 +2680,33 @@ var SwapClient = class {
         orderId = submitted.orderId;
       }
       const result = {
-        executionId: build.executionId,
+        executionId: activeBuild.executionId,
         status: chainResult.status,
-        router: build.router,
+        router: activeBuild.router,
         ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
         ...chainResult.txHashes ? { txHashes: chainResult.txHashes } : {},
         ...orderId ? { orderId } : {},
-        ...build.deposit?.depositAddress ? { depositAddress: build.deposit.depositAddress } : {},
+        ...activeBuild.deposit?.depositAddress ? { depositAddress: activeBuild.deposit.depositAddress } : {},
         report: { status: "skipped" },
-        raw: chainResult.raw ?? build.raw
+        raw: chainResult.raw ?? activeBuild.raw
       };
       emit({
         type: "submitted",
-        executionId: build.executionId,
+        executionId: activeBuild.executionId,
         ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
         ...orderId ? { orderId } : {}
       });
       if (chainResult.status === "source-confirmed") {
         emit({
           type: "source-confirmed",
-          executionId: build.executionId
+          executionId: activeBuild.executionId
         });
       }
       const waitMode = input.waitFor ?? "submitted";
-      const requiresTrackedStatus = build.isCrossChain || build.request?.confidentiality === "basic";
-      const reportRequest = this.createReportRequest(build, result);
+      const requiresTrackedStatus = activeBuild.isCrossChain || activeBuild.request?.confidentiality === "basic";
+      const reportRequest = this.createReportRequest(activeBuild, result);
       if (reportRequest) {
-        this.reportRequests.set(build.executionId, reportRequest);
+        this.reportRequests.set(activeBuild.executionId, reportRequest);
       }
       const mustReportForStatus = requiresTrackedStatus && waitMode !== "submitted" && Boolean(reportRequest);
       const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
@@ -2594,24 +2722,29 @@ var SwapClient = class {
             ...reportRecordId ? { recordId: reportRecordId } : {}
           };
         } catch (error) {
+          logSdkCaughtError("client/SwapClient.ts", error);
           const warning = {
             code: "REPORT_FAILED",
             message: "Swap submitted but report failed",
             cause: error
           };
           result.report = { status: "failed", warning };
-          emit({ type: "warning", executionId: build.executionId, warning });
+          emit({
+            type: "warning",
+            executionId: activeBuild.executionId,
+            warning
+          });
         }
       }
       const shouldPollOrderStatus = shouldPollSwapOrderStatus({
         waitFor: waitMode,
-        isCrossChain: build.isCrossChain,
-        confidentiality: build.request?.confidentiality,
+        isCrossChain: activeBuild.isCrossChain,
+        confidentiality: activeBuild.request?.confidentiality,
         reportRecordId
       });
       const statusLookup = resolveOrderStatusLookup({
         recordId: reportRecordId ?? result.report?.recordId,
-        router: build.order?.router ?? build.router
+        router: activeBuild.order?.router ?? activeBuild.router
       });
       if (shouldPollOrderStatus && !statusLookup) {
         throw new SwapSdkError(
@@ -2620,8 +2753,8 @@ var SwapClient = class {
           "Swap submitted, but the report response did not include an id to query",
           {
             details: {
-              executionId: build.executionId,
-              router: build.router
+              executionId: activeBuild.executionId,
+              router: activeBuild.router
             }
           }
         );
@@ -2639,6 +2772,7 @@ var SwapClient = class {
       }
       return result;
     } catch (error) {
+      logSdkCaughtError("client/SwapClient.ts", error);
       const sdkError = asSwapSdkError(error, "broadcast");
       emit({ type: "failed", executionId: build.executionId, error: sdkError });
       throw sdkError;
@@ -2909,6 +3043,8 @@ exports.formatMcaWallet = formatMcaWallet;
 exports.formatUnits = formatUnits;
 exports.fromApiChain = fromApiChain;
 exports.isSameMcaSignerIdentity = isSameMcaSignerIdentity;
+exports.isSdkCatchLoggingEnabled = isSdkCatchLoggingEnabled;
+exports.logSdkCaughtError = logSdkCaughtError;
 exports.normalizeBuild = normalizeBuild;
 exports.normalizeCrossChainToTokenList = normalizeCrossChainToTokenList;
 exports.normalizeFromTokenList = normalizeFromTokenList;
@@ -2928,6 +3064,7 @@ exports.resolveSwapReportRecordId = resolveSwapReportRecordId;
 exports.selectMcaSigner = selectMcaSigner;
 exports.serializeMcaQuoteRequest = serializeMcaQuoteRequest;
 exports.serializeQuoteRequest = serializeQuoteRequest;
+exports.setSdkCatchLogging = setSdkCatchLogging;
 exports.shouldPollSwapOrderStatus = shouldPollSwapOrderStatus;
 exports.toApiAssetAddress = toApiAssetAddress;
 exports.toApiChain = toApiChain;