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

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @funkit/fun-relay
 
+## 2.2.0-next.5
+
+### Patch Changes
+
+- 0152e69: chore(fun-relay): expose `RelayExecute` type
+- dc9cc8c: add relay request id to error message
+
+## 2.2.0-next.4
+
+### Patch Changes
+
+- 7312429: adopt checkedIndexedAccess for safety
+
 ## 2.2.0-next.3
 
 ### Minor Changes

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { type ExecuteRelayQuoteParams, type RelayAddress, type RelayChainId, typ
 export { parseRelayFees } from './src/fees';
 export { getRelayAssetPriceInfo } from './src/price';
 export { getRelayAssetInfo } from './src/currency';
-export { type GetRelayQuoteParams, type RelayQuote, getRelayQuote, getReferrer, RelayQuoteClientError, } from './src/quote';
+export { type GetRelayQuoteParams, type RelayQuote, type RelayExecute, getRelayQuote, getReferrer, RelayQuoteClientError, } from './src/quote';
 export { type SolanaAddress, type SolanaTxHash, type SolanaWallet, getSolanaWallet, } from './src/solana';
 export { type TronAddress, type TronTxHash, type TronWallet, getTronWallet, } from './src/tron';
 export type { LighterAccountIndex, LighterWallet } from './src/lighter';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,KAAK,2BAA2B,GACjC,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,sBAAsB,EACtB,6BAA6B,EAC7B,0BAA0B,EAC1B,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACrB,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,aAAa,EACb,WAAW,EACX,qBAAqB,GACtB,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,eAAe,GAChB,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,aAAa,GACd,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACvE,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,8BAA8B,EAC9B,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,GACzB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxE,YAAY,EACV,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,cAAc,EACd,eAAe,GAChB,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,wBAAwB,EAC7B,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,KAAK,2BAA2B,GACjC,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,sBAAsB,EACtB,6BAA6B,EAC7B,0BAA0B,EAC1B,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACrB,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,aAAa,EACb,WAAW,EACX,qBAAqB,GACtB,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,eAAe,GAChB,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,aAAa,GACd,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACvE,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,8BAA8B,EAC9B,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,GACzB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxE,YAAY,EACV,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,cAAc,EACd,eAAe,GAChB,MAAM,2BAA2B,CAAA"}

package/dist/index.js

@@ -244,7 +244,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,
@@ -379,12 +379,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
               })
             });
@@ -623,9 +625,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;
@@ -817,7 +819,8 @@ async function getRelayQuote({
         throw new RelayQuoteClientError(
           apiError.statusCode,
           rawError.errorCode,
-          rawError.message ?? apiError.message
+          rawError.message ?? apiError.message,
+          rawError.requestId
         );
       }
     }