@funkit/fun-relay 2.2.0-next.3 → 2.2.0-next.5

package/dist/index.mjs

@@ -195,7 +195,7 @@ function getTxHash({
   };
   logger.info(`${logPrefix}:started`, logProps);
   const getTxHashFromTxHashes = () => {
-    const rawTxHashWithUnreliableTyping = txHashes[0].txHash;
+    const rawTxHashWithUnreliableTyping = txHashes[0]?.txHash;
     const txHash = typeof rawTxHashWithUnreliableTyping === "object" ? rawTxHashWithUnreliableTyping.id : rawTxHashWithUnreliableTyping;
     logger.info(`${logPrefix}:txHashesMode`, {
       ...logProps,
@@ -330,12 +330,14 @@ async function executeRelayQuote({
         ) {
           logger.info(`${logPrefix}:onTransactionConfirmed`, txHashes);
           isTransactionConfirmed = true;
-          if (relayQuote.steps[0].requestId) {
+          const firstStep = relayQuote.steps[0];
+          const firstItem = firstStep?.items[0];
+          if (firstStep?.requestId && firstItem) {
             manuallyRegisterIndex(logger, {
-              requestId: relayQuote.steps[0].requestId,
-              chainId: relayQuote.steps[0].items[0].data.chainId,
+              requestId: firstStep.requestId,
+              chainId: firstItem.data.chainId,
               tx: jsonStringifyWithBigIntSanitization({
-                ...relayQuote.steps[0].items[0].data,
+                ...firstItem.data,
                 txHash
               })
             });
@@ -576,9 +578,9 @@ function getReferrer(clientId) {
   return clientId ? `${FUN_RELAY_REFERRER}|${clientId}` : FUN_RELAY_REFERRER;
 }
 var RelayQuoteClientError = class extends Error {
-  constructor(statusCode, relayErrorCode, message) {
+  constructor(statusCode, relayErrorCode, message, requestId = "") {
     super(
-      `An error occurred trying to generate a relay quote: ${relayErrorCode} - ${message}`
+      `An error occurred trying to generate a relay quote: ${relayErrorCode} - ReqId ${requestId || "NO_REQ_ID"} - ${message}`
     );
     this.statusCode = statusCode;
     this.relayErrorCode = relayErrorCode;
@@ -770,7 +772,8 @@ async function getRelayQuote({
         throw new RelayQuoteClientError(
           apiError.statusCode,
           rawError.errorCode,
-          rawError.message ?? apiError.message
+          rawError.message ?? apiError.message,
+          rawError.requestId
         );
       }
     }