@gardenfi/orderbook 2.0.0 → 2.0.2

package/dist/index2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("@catalogfi/utils"),l=require("./index6.cjs"),c=require("@gardenfi/utils"),d=require("./index4.cjs");class i extends d.OrdersProvider{constructor(r){const e=new c.Url("/relayer",r.url??l.MAINNET_ORDERBOOK_API);super(e),this.Url=e,this.walletClient=r.walletClient,this.auth=r.auth}static async init(r){return await r.auth.getToken(),new i(r)}async createOrder(r){const e=await this.auth.getToken();if(e.error)return s.Err(e.error);try{const t=await s.Fetcher.post(this.Url.endpoint("create-order"),{body:JSON.stringify(r),headers:{Authorization:c.Authorization(e.val),"Content-Type":"application/json"}});return t.error?s.Err(t.error):t.result?s.Ok(t.result):s.Err("CreateOrder: Unexpected error, result is undefined")}catch(t){return s.Err("CreateOrder:",String(t))}}async fetchOrders(r,e=!1,t){var n;const a=(n=this.walletClient.account)==null?void 0:n.address;return a?r?await super.getMatchedOrders(a,e,t):await super.getUnMatchedOrders(a,t):s.Err("Wallet client does not have an account")}async subscribeToOrders(r,e,t,a){var u;const n=(u=this.walletClient.account)==null?void 0:u.address;return n?await super.subscribeOrders(n,!0,r,e,a,t):()=>{}}async getUserOrdersCount(){var e;const r=(e=this.walletClient.account)==null?void 0:e.address;return r?super.getOrdersCount(r):s.Err("Wallet client does not have an account")}}exports.Orderbook=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index6.cjs"),c=require("./index7.cjs"),d=require("@gardenfi/utils"),l=require("./index4.cjs");class u extends l.OrdersProvider{constructor(r){const e=new d.Url("/relayer",r.url??c.MAINNET_ORDERBOOK_API);if(super(e),!r.auth)throw new Error("Auth is required");this.Url=e,this.walletClient=r.walletClient,this.auth=r.auth}static async init(r){var e;return await((e=r.auth.siwe)==null?void 0:e.getToken()),new u(r)}async createOrder(r){const e=await this.auth.getAuthHeaders();if(e.error)return s.Err(e.error);try{const t=await s.Fetcher.post(this.Url.endpoint("create-order"),{body:JSON.stringify(r),headers:{...e.val,"Content-Type":"application/json"}});return t.error?s.Err(t.error):t.result?s.Ok(t.result):s.Err("CreateOrder: Unexpected error, result is undefined")}catch(t){return s.Err("CreateOrder:",String(t))}}async fetchOrders(r,e=!1,t){var n;const a=(n=this.walletClient.account)==null?void 0:n.address;return a?r?await super.getMatchedOrders(a,e,t):await super.getUnMatchedOrders(a,t):s.Err("Wallet client does not have an account")}async subscribeToOrders(r,e,t,a){var i;const n=(i=this.walletClient.account)==null?void 0:i.address;return n?await super.subscribeOrders(n,!0,r,e,a,t):()=>{}}async getUserOrdersCount(){var e;const r=(e=this.walletClient.account)==null?void 0:e.address;return r?super.getOrdersCount(r):s.Err("Wallet client does not have an account")}}exports.Orderbook=u;

package/dist/index2.js

@@ -1,26 +1,29 @@
-import { Err as s, Fetcher as c, Ok as o } from "@catalogfi/utils";
-import { MAINNET_ORDERBOOK_API as l } from "./index6.js";
-import { Url as d, Authorization as h } from "@gardenfi/utils";
-import { OrdersProvider as O } from "./index4.js";
-class u extends O {
+import { Err as s, Fetcher as c, Ok as d } from "./index6.js";
+import { MAINNET_ORDERBOOK_API as l } from "./index7.js";
+import { Url as o } from "@gardenfi/utils";
+import { OrdersProvider as h } from "./index4.js";
+class u extends h {
   /**
    * Creates an instance of Orderbook. Does not login to the orderbook.
    * @constructor
    * @param {OrderbookConfig} orderbookConfig - The configuration object for the orderbook.
    */
   constructor(r) {
-    const e = new d(
+    const e = new o(
       "/relayer",
       r.url ?? l
     );
-    super(e), this.Url = e, this.walletClient = r.walletClient, this.auth = r.auth;
+    if (super(e), !r.auth)
+      throw new Error("Auth is required");
+    this.Url = e, this.walletClient = r.walletClient, this.auth = r.auth;
   }
   /**
    * Initializes the orderbook as well as logs in the orderbook (fetches the auth token).
    * @param {OrderbookConfig} orderbookConfig - The configuration object for the orderbook.
    */
   static async init(r) {
-    return await r.auth.getToken(), new u(r);
+    var e;
+    return await ((e = r.auth.siwe) == null ? void 0 : e.getToken()), new u(r);
   }
   /**
    * Creates an order
@@ -28,7 +31,7 @@ class u extends O {
    * @returns {string} The create order ID.
    */
   async createOrder(r) {
-    const e = await this.auth.getToken();
+    const e = await this.auth.getAuthHeaders();
     if (e.error) return s(e.error);
     try {
       const t = await c.post(
@@ -36,12 +39,12 @@ class u extends O {
         {
           body: JSON.stringify(r),
           headers: {
-            Authorization: h(e.val),
+            ...e.val,
             "Content-Type": "application/json"
           }
         }
       );
-      return t.error ? s(t.error) : t.result ? o(t.result) : s("CreateOrder: Unexpected error, result is undefined");
+      return t.error ? s(t.error) : t.result ? d(t.result) : s("CreateOrder: Unexpected error, result is undefined");
     } catch (t) {
       return s("CreateOrder:", String(t));
     }

package/dist/index4.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@catalogfi/utils"),l=require("@gardenfi/utils"),d=require("./index7.cjs");class O{constructor(s){this.url=new l.Url("/orders",s)}async getOrder(s,c){const t=c?`/id/matched/${s}`:`/id/unmatched/${s}`,n=this.url.endpoint(t);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrder:",String(e))}}async getMatchedOrders(s,c,t){const n=d.ConstructUrl(this.url,`/user/matched/${s}`,{...t,pending:c});try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetMatchedOrders:",String(e))}}async getUnMatchedOrders(s,c){const t=d.ConstructUrl(this.url,`/user/unmatched/${s}`,c);try{const n=await r.Fetcher.get(t);return n.error?r.Err(n.error):n.result?r.Ok(n.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(n){return r.Err("GetUnMatchedOrders:",String(n))}}async getOrders(s,c){const t=s?"/matched":"/unmatched",n=d.ConstructUrl(this.url,t,c);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetAllOrders:",String(e))}}async subscribeOrders(s,c,t,n,e=!1,i){let o=!1;const a=async()=>{if(!o){o=!0;try{const u=c?await this.getMatchedOrders(s,e,i):await this.getUnMatchedOrders(s,i);u.ok?await n(u.val):console.error("Error fetching orders:",u.error)}catch(u){console.error("Error fetching orders:",u)}finally{o=!1}}};await a();const h=setInterval(a,t);return()=>{clearInterval(h)}}async getOrdersCount(s){const c=this.url.endpoint(`/user/count/${s}`);try{const t=await r.Fetcher.get(c);return t.error?r.Err(t.error):t.status===l.ApiStatus.Ok&&t.result!==void 0?r.Ok(t.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(t){return r.Err("GetOrdersCount:",String(t))}}}exports.OrdersProvider=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index6.cjs"),l=require("@gardenfi/utils"),d=require("./index8.cjs");class O{constructor(s){this.url=new l.Url("/orders",s)}async getOrder(s,c){const t=c?`/id/matched/${s}`:`/id/unmatched/${s}`,n=this.url.endpoint(t);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrder:",String(e))}}async getMatchedOrders(s,c,t){const n=d.ConstructUrl(this.url,`/user/matched/${s}`,{...t,pending:c});try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetMatchedOrders:",String(e))}}async getUnMatchedOrders(s,c){const t=d.ConstructUrl(this.url,`/user/unmatched/${s}`,c);try{const n=await r.Fetcher.get(t);return n.error?r.Err(n.error):n.result?r.Ok(n.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(n){return r.Err("GetUnMatchedOrders:",String(n))}}async getOrders(s,c){const t=s?"/matched":"/unmatched",n=d.ConstructUrl(this.url,t,c);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetAllOrders:",String(e))}}async subscribeOrders(s,c,t,n,e=!1,i){let o=!1;const a=async()=>{if(!o){o=!0;try{const u=c?await this.getMatchedOrders(s,e,i):await this.getUnMatchedOrders(s,i);u.ok?await n(u.val):console.error("Error fetching orders:",u.error)}catch(u){console.error("Error fetching orders:",u)}finally{o=!1}}};await a();const h=setInterval(a,t);return()=>{clearInterval(h)}}async getOrdersCount(s){const c=this.url.endpoint(`/user/count/${s}`);try{const t=await r.Fetcher.get(c);return t.error?r.Err(t.error):t.status===l.ApiStatus.Ok&&t.result!==void 0?r.Ok(t.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(t){return r.Err("GetOrdersCount:",String(t))}}}exports.OrdersProvider=O;

package/dist/index4.js

@@ -1,6 +1,6 @@
-import { Fetcher as u, Err as s, Ok as d } from "@catalogfi/utils";
+import { Fetcher as u, Err as s, Ok as d } from "./index6.js";
 import { Url as f, ApiStatus as g } from "@gardenfi/utils";
-import { ConstructUrl as i } from "./index7.js";
+import { ConstructUrl as i } from "./index8.js";
 class w {
   constructor(t) {
     this.url = new f("/orders", t);

package/dist/index6.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="https://api.garden.finance";exports.MAINNET_ORDERBOOK_API=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});var p=(a,t,e)=>{if(!t.has(a))throw TypeError("Cannot "+e)},u=(a,t,e)=>(p(a,t,"read from private field"),e?e.call(a):t.get(a)),w=(a,t,e)=>{if(t.has(a))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(a):t.set(a,e)},f=(a,t,e,r)=>(p(a,t,"write to private field"),t.set(a,e),e);const d=a=>new Promise(t=>setTimeout(t,a));class g{constructor(t,e){this.maxRetries=Math.max(t,0),this.delay=e}async retry(t){let e=0,r;for(;e<this.maxRetries+1;)try{return await t()}catch(s){e++,r=s,await d(this.delay*e)}throw r}}const v=a=>{try{return JSON.parse(a)}catch{return a}};class m{static async _postWithFallback(t,e){let r="";for(const s of t)try{const i=await fetch(s,{method:"POST",...e});if(i.status>=500){r=await(i.text()||i.json());continue}return await this.parse(i)}catch(i){r=y(i);continue}throw new Error(r||"All APIs failed")}static async postWithFallback(t,e){return await n(e).retry(()=>this._postWithFallback(t,e))}static async _getWithFallback(t,e){let r="";for(const s of t)try{const i=await fetch(s,e);if(i.status>=500){r=await(i.text()||i.json());continue}return await this.parse(i)}catch(i){r=y(i);continue}throw new Error(r||"All APIs failed")}static async getWithFallback(t,e){return await n(e).retry(()=>this._getWithFallback(t,e))}static async _get(t,e){return await this.parse(await fetch(t,e))}static async get(t,e){return await n(e).retry(()=>this._get(t,e))}static async _post(t,e){return await this.parse(await fetch(t,{method:"POST",...e}))}static async post(t,e){return await n(e).retry(()=>this._post(t,e))}static async parse(t){const e=await t.text();if(t.status>=200&&t.status<300)return v(e);throw new Error(e)}}function y(a){return(a==null?void 0:a.message)||(a==null?void 0:a.toString())||"unknown error"}const n=a=>new g((a==null?void 0:a.retryCount)??2,(a==null?void 0:a.retryDelay)??1e3);var o,c,l;class h{constructor(t,e,r=void 0){w(this,o,void 0),w(this,c,void 0),w(this,l,void 0),f(this,o,t),f(this,l,r),f(this,c,e)}get ok(){return u(this,o)}get error(){return u(this,l)}get val(){return u(this,c)}}o=new WeakMap,c=new WeakMap,l=new WeakMap;const k=a=>new h(!0,a),W=(a,...t)=>{if(typeof a=="string"&&t&&t.length>0){let e=[a,...t].map(r=>{if(r){if(r instanceof Error)return r.message;if(typeof r=="string")return r;if(r!=null&&r.toString)return r.toString()}});return new h(!1,null,e.filter(r=>r!==void 0).join(" "))}return new h(!1,null,a)};exports.Err=W;exports.Fetcher=m;exports.Ok=k;exports.Result=h;exports.Retry=g;exports.safeParseJson=v;exports.sleep=d;

package/dist/index6.js

@@ -1,4 +1,190 @@
-const n = "https://api.garden.finance";
+var p = (e, t, a) => {
+  if (!t.has(e))
+    throw TypeError("Cannot " + a);
+}, h = (e, t, a) => (p(e, t, "read from private field"), a ? a.call(e) : t.get(e)), u = (e, t, a) => {
+  if (t.has(e))
+    throw TypeError("Cannot add the same private member more than once");
+  t instanceof WeakSet ? t.add(e) : t.set(e, a);
+}, w = (e, t, a, r) => (p(e, t, "write to private field"), t.set(e, a), a);
+const d = (e) => new Promise((t) => setTimeout(t, e));
+class g {
+  /**
+   * @param {number} maxRetries - The maximum number of retries, if less < 0 then it is set to 0
+   * @param {number} delay - The delay between retries
+   */
+  constructor(t, a) {
+    this.maxRetries = Math.max(t, 0), this.delay = a;
+  }
+  /**
+   * Retries a function until it succeeds or the max number of retries is reached
+   *
+   * @param {() => Promise<T>} fn - The function to retry
+   * @return {Promise<T>} a Promise that resolves to the result of the function
+   */
+  async retry(t) {
+    let a = 0, r;
+    for (; a < this.maxRetries + 1; )
+      try {
+        return await t();
+      } catch (i) {
+        a++, r = i, await d(this.delay * a);
+      }
+    throw r;
+  }
+}
+const v = (e) => {
+  try {
+    return JSON.parse(e);
+  } catch {
+    return e;
+  }
+};
+class m {
+  static async _postWithFallback(t, a) {
+    let r = "";
+    for (const i of t)
+      try {
+        const s = await fetch(i, {
+          method: "POST",
+          ...a
+        });
+        if (s.status >= 500) {
+          r = await (s.text() || s.json());
+          continue;
+        }
+        return await this.parse(s);
+      } catch (s) {
+        r = y(s);
+        continue;
+      }
+    throw new Error(r || "All APIs failed");
+  }
+  /**
+   * Asynchronously sends a POST request to multiple URLs with fallback logic.
+   *
+   * @param {string[]} input - array of URLs to send the POST request to
+   * @param {RequestInit} [init] - optional request initialization options
+   * @return {Promise<T>} a Promise that resolves to the parsed response data
+   */
+  static async postWithFallback(t, a) {
+    return await n(a).retry(
+      () => this._postWithFallback(t, a)
+    );
+  }
+  static async _getWithFallback(t, a) {
+    let r = "";
+    for (const i of t)
+      try {
+        const s = await fetch(i, a);
+        if (s.status >= 500) {
+          r = await (s.text() || s.json());
+          continue;
+        }
+        return await this.parse(s);
+      } catch (s) {
+        r = y(s);
+        continue;
+      }
+    throw new Error(r || "All APIs failed");
+  }
+  /**
+   * Asynchronously sends a POST request to multiple URLs with fallback mechanism.
+   *
+   * @param {string[]} input - An array of URLs to retrieve data from.
+   * @param {RequestInit} [init] - Optional request options.
+   * @return {Promise<T>} A promise that resolves to the retrieved data.
+   */
+  static async getWithFallback(t, a) {
+    return await n(a).retry(
+      () => this._getWithFallback(t, a)
+    );
+  }
+  static async _get(t, a) {
+    return await this.parse(await fetch(t, a));
+  }
+  /**
+   * Asynchronously retrieves data of type T from the specified URL or RequestInfo, with optional initialization options.
+   *
+   * @param {RequestInfo | URL} input - The URL or RequestInfo to fetch data from
+   * @param {RequestInit} init - Optional initialization options for the fetch request
+   * @return {Promise<T>} The retrieved data of type T
+   */
+  static async get(t, a) {
+    return await n(a).retry(() => this._get(t, a));
+  }
+  static async _post(t, a) {
+    return await this.parse(
+      await fetch(t, {
+        method: "POST",
+        ...a
+      })
+    );
+  }
+  /**
+   * Asynchronously sends a POST request to the specified URL or RequestInfo, with optional initialization options.
+   */
+  static async post(t, a) {
+    return await n(a).retry(() => this._post(t, a));
+  }
+  /**
+   * Parses the response and returns the result as the specified type.
+   *
+   * @param {Response} res - the response object to be parsed
+   * @return {Promise<T>} the parsed result of type T
+   */
+  static async parse(t) {
+    const a = await t.text();
+    if (t.status >= 200 && t.status < 300)
+      return v(a);
+    throw new Error(a);
+  }
+}
+function y(e) {
+  return (e == null ? void 0 : e.message) || (e == null ? void 0 : e.toString()) || "unknown error";
+}
+const n = (e) => new g((e == null ? void 0 : e.retryCount) ?? 2, (e == null ? void 0 : e.retryDelay) ?? 1e3);
+var o, c, l;
+class f {
+  constructor(t, a, r = void 0) {
+    u(this, o, void 0), u(this, c, void 0), u(this, l, void 0), w(this, o, t), w(this, l, r), w(this, c, a);
+  }
+  get ok() {
+    return h(this, o);
+  }
+  get error() {
+    return h(this, l);
+  }
+  get val() {
+    return h(this, c);
+  }
+}
+o = /* @__PURE__ */ new WeakMap(), c = /* @__PURE__ */ new WeakMap(), l = /* @__PURE__ */ new WeakMap();
+const k = (e) => new f(!0, e), W = (e, ...t) => {
+  if (typeof e == "string" && t && t.length > 0) {
+    let a = [e, ...t].map((r) => {
+      if (r) {
+        if (r instanceof Error)
+          return r.message;
+        if (typeof r == "string")
+          return r;
+        if (r != null && r.toString)
+          return r.toString();
+      }
+    });
+    return new f(
+      !1,
+      null,
+      a.filter((r) => r !== void 0).join(" ")
+    );
+  }
+  return new f(!1, null, e);
+};
 export {
-  n as MAINNET_ORDERBOOK_API
+  W as Err,
+  m as Fetcher,
+  k as Ok,
+  f as Result,
+  g as Retry,
+  v as safeParseJson,
+  d as sleep
 };

package/dist/index7.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=(n,o,t)=>{const r=n.endpoint(o);return t&&Object.entries(t).forEach(([c,e])=>{e!==void 0&&r.searchParams.append(c,e.toString())}),r};exports.ConstructUrl=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="https://api.garden.finance";exports.MAINNET_ORDERBOOK_API=e;

package/dist/index7.js

@@ -1,9 +1,4 @@
-const i = (o, e, t) => {
-  const r = o.endpoint(e);
-  return t && Object.entries(t).forEach(([c, n]) => {
-    n !== void 0 && r.searchParams.append(c, n.toString());
-  }), r;
-};
+const n = "https://api.garden.finance";
 export {
-  i as ConstructUrl
+  n as MAINNET_ORDERBOOK_API
 };

package/dist/index8.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=(n,o,t)=>{const r=n.endpoint(o);return t&&Object.entries(t).forEach(([c,e])=>{e!==void 0&&r.searchParams.append(c,e.toString())}),r};exports.ConstructUrl=i;

package/dist/index8.js

@@ -0,0 +1,9 @@
+const i = (o, e, t) => {
+  const r = o.endpoint(e);
+  return t && Object.entries(t).forEach(([c, n]) => {
+    n !== void 0 && r.searchParams.append(c, n.toString());
+  }), r;
+};
+export {
+  i as ConstructUrl
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/orderbook",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -26,8 +26,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@catalogfi/utils": "^0.1.6",
-    "@gardenfi/utils": "^2.0.0",
+    "@gardenfi/utils": "^2.0.1",
     "bufferutil": "^4.0.8",
     "siwe": "^2.1.4",
     "utf-8-validate": "^6.0.3",