@argent/x-shared 1.43.1 → 1.44.0

package/dist/src/tokens/service/implementation.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("async-retry"),c=require("url-join"),o=require("./types/backend.model.cjs"),d=require("../../utils/schemas.cjs");class u{constructor(s,e){this.apiBase=s,this.httpService=e,this.TOKENS_INFO_URL="/tokens/info"}async fetchTokensInfoFromBackend(s){const e=c(this.apiBase,this.TOKENS_INFO_URL,s??"","?chain=starknet"),t=await this.httpService.get(e),n=o.apiTokensInfoResponseSchema.safeParse(t);if(n.success)return n.data.tokens;const r=o.apiTokenInfoResponseSchema.safeParse(t);if(r.success)return[r.data]}async fetchAddressTokenBalancesFromBackend(s,e,t){const n=c(this.apiBase,"activity","starknet",e,"account",s,"balance");return(await h(async a=>{let p;try{p=await this.httpService.get(n)}catch{return a(new Error("Error fetching")),[]}const i=o.apiAccountTokenBalancesSchema.safeParse(p);if(!i.success)return a(new Error("Error parsing response")),[];if(i.data.status!=="initialised")throw new Error("Not initialised yet");return i.data.balances},{retries:5,minTimeout:5e3,...t})).map(a=>({address:a.tokenAddress,balance:a.tokenBalance,networkId:e}))}async fetchDefiDecomposition(s,e){const t=c(this.apiBase,"tokens/defi",s,"investments","?chain=starknet",`&application=${e}`),n=await this.httpService.get(t);return d.safeParseAndWarn(o.apiDefiPositionsSchema,n).success||console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."),n.dapps}}exports.TokenServiceWeb=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("url-join"),r=require("../../utils/retryUntilInitialised.cjs"),i=require("./types/backend.model.cjs"),h=require("../../utils/schemas.cjs");class d{constructor(n,e){this.apiBase=n,this.httpService=e,this.TOKENS_INFO_URL="/tokens/info"}async fetchTokensInfoFromBackend(n){const e=o(this.apiBase,this.TOKENS_INFO_URL,n??"","?chain=starknet"),a=await this.httpService.get(e),t=i.apiTokensInfoResponseSchema.safeParse(a);if(t.success)return t.data.tokens;const s=i.apiTokenInfoResponseSchema.safeParse(a);if(s.success)return[s.data]}async fetchAddressTokenBalancesFromBackend(n,e,a){const t=o(this.apiBase,"activity","starknet",e,"account",n,"balance"),s=await r.retryUntilInitialised(()=>this.httpService.get(t),i.apiAccountTokenBalancesSchema,a);return((s==null?void 0:s.status)==="initialised"?s.balances:[]).map(c=>({address:c.tokenAddress,balance:c.tokenBalance,networkId:e}))}async fetchDefiDecomposition(n,e){const a=o(this.apiBase,"tokens/defi",n,"investments","?chain=starknet",`&application=${e}`),t=await this.httpService.get(a);return h.safeParseAndWarn(i.apiDefiPositionsSchema,t).success||console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."),t.dapps}}exports.TokenServiceWeb=d;

package/dist/src/tokens/service/implementation.js

@@ -1,64 +1,42 @@
-import p from "async-retry";
-import i from "url-join";
-import { apiTokensInfoResponseSchema as h, apiTokenInfoResponseSchema as d, apiAccountTokenBalancesSchema as u, apiDefiPositionsSchema as f } from "./types/backend.model.js";
+import o from "url-join";
+import { retryUntilInitialised as c } from "../../utils/retryUntilInitialised.js";
+import { apiTokensInfoResponseSchema as r, apiTokenInfoResponseSchema as p, apiDefiPositionsSchema as h, apiAccountTokenBalancesSchema as d } from "./types/backend.model.js";
 import { safeParseAndWarn as k } from "../../utils/schemas.js";
-class R {
-  constructor(s, e) {
-    this.apiBase = s, this.httpService = e, this.TOKENS_INFO_URL = "/tokens/info";
+class v {
+  constructor(t, e) {
+    this.apiBase = t, this.httpService = e, this.TOKENS_INFO_URL = "/tokens/info";
   }
   /**
    * Fetch tokens info from backend
    * @param {Address} tokenAddress - The token address.
    * @returns {Promise<ApiTokenInfo[]>} - The fetched tokens or undefined if there was an error or not default network
    */
-  async fetchTokensInfoFromBackend(s) {
-    const e = i(this.apiBase, this.TOKENS_INFO_URL, s ?? "", "?chain=starknet"), n = await this.httpService.get(e), t = h.safeParse(n);
-    if (t.success)
-      return t.data.tokens;
-    const r = d.safeParse(n);
-    if (r.success)
-      return [r.data];
+  async fetchTokensInfoFromBackend(t) {
+    const e = o(this.apiBase, this.TOKENS_INFO_URL, t ?? "", "?chain=starknet"), a = await this.httpService.get(e), n = r.safeParse(a);
+    if (n.success)
+      return n.data.tokens;
+    const s = p.safeParse(a);
+    if (s.success)
+      return [s.data];
   }
   /**
    * Fetch list of tokens and balances for given account from backend
    * @param {Address} address - The account address.
    * @returns {Promise<WebBaseTokenWithBalance[]>} - The fetched balances for the account address.
    */
-  async fetchAddressTokenBalancesFromBackend(s, e, n) {
-    const t = i(this.apiBase, "activity", "starknet", e, "account", s, "balance");
-    return (await p(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      async (a) => {
-        let c;
-        try {
-          c = await this.httpService.get(t);
-        } catch {
-          return a(new Error("Error fetching")), [];
-        }
-        const o = u.safeParse(c);
-        if (!o.success)
-          return a(new Error("Error parsing response")), [];
-        if (o.data.status !== "initialised")
-          throw new Error("Not initialised yet");
-        return o.data.balances;
-      },
-      {
-        /** seems to take 5-10 sec for initialised state */
-        retries: 5,
-        minTimeout: 5e3,
-        ...n
-      }
-    )).map((a) => ({
-      address: a.tokenAddress,
-      balance: a.tokenBalance,
+  async fetchAddressTokenBalancesFromBackend(t, e, a) {
+    const n = o(this.apiBase, "activity", "starknet", e, "account", t, "balance"), s = await c(() => this.httpService.get(n), d, a);
+    return ((s == null ? void 0 : s.status) === "initialised" ? s.balances : []).map((i) => ({
+      address: i.tokenAddress,
+      balance: i.tokenBalance,
       networkId: e
     }));
   }
-  async fetchDefiDecomposition(s, e) {
-    const n = i(this.apiBase, "tokens/defi", s, "investments", "?chain=starknet", `&application=${e}`), t = await this.httpService.get(n);
-    return k(f, t).success || console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."), t.dapps;
+  async fetchDefiDecomposition(t, e) {
+    const a = o(this.apiBase, "tokens/defi", t, "investments", "?chain=starknet", `&application=${e}`), n = await this.httpService.get(a);
+    return k(h, n).success || console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."), n.dapps;
   }
 }
 export {
-  R as TokenServiceWeb
+  v as TokenServiceWeb
 };

package/dist/src/utils/retryUntilInitialised.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("async-retry"),o=require("./schemas.cjs");async function u(n,i,s={retries:5,minTimeout:5e3}){return a(async e=>{let t=null;try{t=await n()}catch{return e(new Error("Error fetching")),null}const r=o.safeParseAndWarn(i,t);if(!r.success)return e(new Error("Error parsing response")),null;if(r.data.status!=="initialised")throw new Error("Not initialised yet");return r.data},s)}exports.retryUntilInitialised=u;

package/dist/src/utils/retryUntilInitialised.d.ts

@@ -0,0 +1,16 @@
+import { default as retry } from 'async-retry';
+import { z } from 'zod';
+type InitialisationStatus = {
+    status: "initialising";
+} | {
+    status: "initialised";
+};
+/**
+ * Retries an async function until the "initialised" status is achieved or the maximum number of retries is reached.
+ * @param fn The async function to retry
+ * @param validationSchema A Zod schema to validate the response from the async function
+ * @param opts Retry options
+ * @returns The result of the successful function call, or null if the maximum number of retries is reached or an error occurs
+ */
+export declare function retryUntilInitialised<T extends InitialisationStatus>(fn: () => Promise<T>, validationSchema: z.ZodType, opts?: retry.Options): Promise<T | null>;
+export {};

package/dist/src/utils/retryUntilInitialised.js

@@ -0,0 +1,21 @@
+import a from "async-retry";
+import { safeParseAndWarn as o } from "./schemas.js";
+async function c(n, i, s = { retries: 5, minTimeout: 5e3 }) {
+  return a(async (t) => {
+    let e = null;
+    try {
+      e = await n();
+    } catch {
+      return t(new Error("Error fetching")), null;
+    }
+    const r = o(i, e);
+    if (!r.success)
+      return t(new Error("Error parsing response")), null;
+    if (r.data.status !== "initialised")
+      throw new Error("Not initialised yet");
+    return r.data;
+  }, s);
+}
+export {
+  c as retryUntilInitialised
+};

package/dist/src/utils/schemas.d.ts

@@ -4,8 +4,12 @@ export declare const stringToBooleanSchema: z.ZodEffects<z.ZodString, boolean, s
 export declare function createSchemaWithWarnings<T extends z.ZodRawShape>(shape: T): z.ZodEffects<z.ZodObject<T, "passthrough", z.ZodTypeAny, z.objectOutputType<T, z.ZodTypeAny, "passthrough">, z.objectInputType<T, z.ZodTypeAny, "passthrough">>, z.objectOutputType<T, z.ZodTypeAny, "passthrough">, z.objectInputType<T, z.ZodTypeAny, "passthrough">> & {
     extend: <E extends z.ZodRawShape>(extension: E) => z.ZodEffects<z.ZodObject<T & E, "passthrough", z.ZodTypeAny, z.objectOutputType<T & E, z.ZodTypeAny, "passthrough">, z.objectInputType<T & E, z.ZodTypeAny, "passthrough">>, z.objectOutputType<T & E, z.ZodTypeAny, "passthrough">, z.objectInputType<T & E, z.ZodTypeAny, "passthrough">>;
 };
-export declare const safeParseAndWarn: <T extends z.ZodType>(schema: T, data: unknown) => {
-    success: boolean;
-    data?: z.infer<T>;
-    error?: z.ZodError;
+type ISafeParseAndWarn<T extends z.ZodType> = {
+    success: true;
+    data: z.infer<T>;
+} | {
+    success: false;
+    error: z.ZodError;
 };
+export declare const safeParseAndWarn: <T extends z.ZodType>(schema: T, data: unknown) => ISafeParseAndWarn<T>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-shared",
-  "version": "1.43.1",
+  "version": "1.44.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/argentlabs/x-shared.git"