@gardenfi/orderbook 2.4.5 → 2.4.6

package/dist/index2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@gardenfi/utils"),O=require("./index5.cjs");class f{constructor(s){this.Url=s}async createOrder(s,c){const n=await c.getAuthHeaders();if(n.error)return r.Err(n.error);try{const e=await r.Fetcher.post(this.Url,{body:JSON.stringify(s),headers:{...n.val,"Content-Type":"application/json"}});return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("CreateOrder: Unexpected error, result is undefined")}catch(e){return r.Err("CreateOrder Err:",String(e))}}async getOrder(s,c,n){const e=this.Url.endpoint(c?`/id/${s}/matched`:`/id/${s}/unmatched`);try{const t=await r.Fetcher.get(e,{...n});return t.error?r.Err(t.error):t.result?r.Ok(t.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(t){return r.Err("GetOrder:",String(t))}}async getMatchedOrders(s,c,n,e){const t=O.ConstructUrl(this.Url,`/user/${s}/matched`,{...n,status:c});try{const o=await r.Fetcher.get(t,{...e});return o.error?r.Err(o.error):o.result?r.Ok(o.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(o){return r.Err("GetMatchedOrders:",String(o))}}async getUnMatchedOrders(s,c,n){const e=O.ConstructUrl(this.Url,`/user/${s}/unmatched`,c);try{const t=await r.Fetcher.get(e,{...n});return t.error?r.Err(t.error):t.result?r.Ok(t.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(t){return r.Err("GetUnMatchedOrders:",String(t))}}async getOrders(s,c,n,e,t,o,i,l){const h=s?"/matched":"/unmatched",u={};c&&(u.page=c.page,u.per_page=c.per_page),n&&(u.address=n),e&&(u.tx_hash=e),t&&(u.from_chain=t),o&&(u.to_chain=o),i&&(u.status=i);const a=O.ConstructUrl(this.Url,h,u);try{const d=await r.Fetcher.get(a,{...l});return d.error?r.Err(d.error):d.result?r.Ok(d.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(d){return r.Err("GetAllOrders:",String(d))}}async subscribeOrders(s,c,n,e,t="all",o,i){let l=!1;const h=async()=>{if(!l){l=!0;try{const a=c?await this.getMatchedOrders(s,t,o,i):await this.getUnMatchedOrders(s,o,i);a.ok?await e(a.val):console.error("Error fetching orders:",a.error)}catch(a){console.error("Error fetching orders:",a)}finally{l=!1}}};await h();const u=setInterval(h,n);return()=>{clearInterval(u)}}async getOrdersCount(s,c){const n=this.Url.endpoint(`/user/${s}/count`);try{const e=await r.Fetcher.get(n,{...c});return e.error?r.Err(e.error):e.status===r.ApiStatus.Ok&&e.result!==void 0?r.Ok(e.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrdersCount:",String(e))}}}exports.Orderbook=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@gardenfi/utils"),a=require("./index5.cjs");class O{constructor(c){this.Url=c}async createOrder(c,n){const t=await n.getAuthHeaders();if(t.error)return r.Err(t.error);try{const e=await r.Fetcher.post(this.Url,{body:JSON.stringify(c),headers:{...t.val,"Content-Type":"application/json"}});return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("CreateOrder: Unexpected error, result is undefined")}catch(e){return r.Err("CreateOrder Err:",String(e))}}async getOrder(c,n,t){const e=this.Url.endpoint(n?`/id/${c}/matched`:`/id/${c}/unmatched`);try{const s=await r.Fetcher.get(e,{...t});return s.error?r.Err(s.error):s.result?r.Ok(s.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(s){return r.Err("GetOrder:",String(s))}}async getMatchedOrders(c,n,t,e){const s=a.ConstructUrl(this.Url,`/user/${c}/matched`,{...t,status:n});try{const u=await r.Fetcher.get(s,{...e});return u.error?r.Err(u.error):u.result?r.Ok(u.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(u){return r.Err("GetMatchedOrders:",String(u))}}async getUnMatchedOrders(c,n,t){const e=a.ConstructUrl(this.Url,`/user/${c}/unmatched`,n);try{const s=await r.Fetcher.get(e,{...t});return s.error?r.Err(s.error):s.result?r.Ok(s.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(s){return r.Err("GetUnMatchedOrders:",String(s))}}async getOrders(c,n,t,e){const s=c?"/matched":"/unmatched",u={page:t==null?void 0:t.page,per_page:t==null?void 0:t.per_page,...n},l=a.ConstructUrl(this.Url,s,u);try{const d=await r.Fetcher.get(l,{...e});return d.error?r.Err(d.error):d.result?r.Ok(d.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(d){return r.Err("GetAllOrders:",String(d))}}async subscribeOrders(c,n,t,e,s="all",u,l){let d=!1;const h=async()=>{if(!d){d=!0;try{const o=n?await this.getMatchedOrders(c,s,u,l):await this.getUnMatchedOrders(c,u,l);o.ok?await e(o.val):console.error("Error fetching orders:",o.error)}catch(o){console.error("Error fetching orders:",o)}finally{d=!1}}};await h();const i=setInterval(h,t);return()=>{clearInterval(i)}}async getOrdersCount(c,n){const t=this.Url.endpoint(`/user/${c}/count`);try{const e=await r.Fetcher.get(t,{...n});return e.error?r.Err(e.error):e.status===r.ApiStatus.Ok&&e.result!==void 0?r.Ok(e.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrdersCount:",String(e))}}}exports.Orderbook=O;

package/dist/index2.js

@@ -1,8 +1,8 @@
-import { Err as t, Fetcher as i, Ok as l, ApiStatus as p } from "@gardenfi/utils";
-import { ConstructUrl as g } from "./index5.js";
+import { Err as s, Fetcher as o, Ok as a, ApiStatus as U } from "@gardenfi/utils";
+import { ConstructUrl as i } from "./index5.js";
 class w {
-  constructor(s) {
-    this.Url = s;
+  constructor(c) {
+    this.Url = c;
   }
   /**
    * Creates an order
@@ -10,106 +10,113 @@ class w {
    * @param {IAuth} auth - The auth object.
    * @returns {string} The create order ID.
    */
-  async createOrder(s, c) {
-    const n = await c.getAuthHeaders();
-    if (n.error)
-      return t(n.error);
+  async createOrder(c, n) {
+    const e = await n.getAuthHeaders();
+    if (e.error)
+      return s(e.error);
     try {
-      const r = await i.post(this.Url, {
-        body: JSON.stringify(s),
+      const r = await o.post(this.Url, {
+        body: JSON.stringify(c),
         headers: {
-          ...n.val,
+          ...e.val,
           "Content-Type": "application/json"
         }
       });
-      return r.error ? t(r.error) : r.result ? l(r.result) : t("CreateOrder: Unexpected error, result is undefined");
+      return r.error ? s(r.error) : r.result ? a(r.result) : s("CreateOrder: Unexpected error, result is undefined");
     } catch (r) {
-      return t("CreateOrder Err:", String(r));
+      return s("CreateOrder Err:", String(r));
     }
   }
-  async getOrder(s, c, n) {
+  async getOrder(c, n, e) {
     const r = this.Url.endpoint(
-      c ? `/id/${s}/matched` : `/id/${s}/unmatched`
+      n ? `/id/${c}/matched` : `/id/${c}/unmatched`
     );
     try {
-      const e = await i.get(r, { ...n });
-      return e.error ? t(e.error) : e.result ? l(e.result) : t("GetOrder: Unexpected error, result is undefined");
-    } catch (e) {
-      return t("GetOrder:", String(e));
+      const t = await o.get(r, { ...e });
+      return t.error ? s(t.error) : t.result ? a(t.result) : s("GetOrder: Unexpected error, result is undefined");
+    } catch (t) {
+      return s("GetOrder:", String(t));
     }
   }
-  async getMatchedOrders(s, c, n, r) {
-    const e = g(this.Url, `/user/${s}/matched`, {
-      ...n,
-      status: c
+  async getMatchedOrders(c, n, e, r) {
+    const t = i(this.Url, `/user/${c}/matched`, {
+      ...e,
+      status: n
     });
     try {
-      const o = await i.get(
-        e,
+      const d = await o.get(
+        t,
         { ...r }
       );
-      return o.error ? t(o.error) : o.result ? l(o.result) : t("GetMatchedOrders: Unexpected error, result is undefined");
-    } catch (o) {
-      return t("GetMatchedOrders:", String(o));
+      return d.error ? s(d.error) : d.result ? a(d.result) : s("GetMatchedOrders: Unexpected error, result is undefined");
+    } catch (d) {
+      return s("GetMatchedOrders:", String(d));
     }
   }
-  async getUnMatchedOrders(s, c, n) {
-    const r = g(
+  async getUnMatchedOrders(c, n, e) {
+    const r = i(
       this.Url,
-      `/user/${s}/unmatched`,
-      c
+      `/user/${c}/unmatched`,
+      n
     );
     try {
-      const e = await i.get(
+      const t = await o.get(
         r,
-        { ...n }
+        { ...e }
       );
-      return e.error ? t(e.error) : e.result ? l(e.result) : t("GetUnMatchedOrders: Unexpected error, result is undefined");
-    } catch (e) {
-      return t("GetUnMatchedOrders:", String(e));
+      return t.error ? s(t.error) : t.result ? a(t.result) : s("GetUnMatchedOrders: Unexpected error, result is undefined");
+    } catch (t) {
+      return s("GetUnMatchedOrders:", String(t));
     }
   }
-  async getOrders(s, c, n, r, e, o, h, f) {
-    const O = s ? "/matched" : "/unmatched", a = {};
-    c && (a.page = c.page, a.per_page = c.per_page), n && (a.address = n), r && (a.tx_hash = r), e && (a.from_chain = e), o && (a.to_chain = o), h && (a.status = h);
-    const d = g(this.Url, O, a);
+  async getOrders(c, n, e, r) {
+    const t = c ? "/matched" : "/unmatched", d = {
+      page: e == null ? void 0 : e.page,
+      per_page: e == null ? void 0 : e.per_page,
+      ...n
+    }, h = i(this.Url, t, d);
     try {
-      const u = await i.get(d, { ...f });
-      return u.error ? t(u.error) : u.result ? l(u.result) : t("GetAllOrders: Unexpected error, result is undefined");
+      const u = await o.get(h, { ...r });
+      return u.error ? s(u.error) : u.result ? a(u.result) : s("GetAllOrders: Unexpected error, result is undefined");
     } catch (u) {
-      return t("GetAllOrders:", String(u));
+      return s("GetAllOrders:", String(u));
     }
   }
-  async subscribeOrders(s, c, n, r, e = "all", o, h) {
-    let f = !1;
+  async subscribeOrders(c, n, e, r, t = "all", d, h) {
+    let u = !1;
     const O = async () => {
-      if (!f) {
-        f = !0;
+      if (!u) {
+        u = !0;
         try {
-          const d = c ? await this.getMatchedOrders(s, e, o, h) : await this.getUnMatchedOrders(s, o, h);
-          d.ok ? await r(
-            d.val
-          ) : console.error("Error fetching orders:", d.error);
-        } catch (d) {
-          console.error("Error fetching orders:", d);
+          const l = n ? await this.getMatchedOrders(
+            c,
+            t,
+            d,
+            h
+          ) : await this.getUnMatchedOrders(c, d, h);
+          l.ok ? await r(
+            l.val
+          ) : console.error("Error fetching orders:", l.error);
+        } catch (l) {
+          console.error("Error fetching orders:", l);
         } finally {
-          f = !1;
+          u = !1;
         }
       }
     };
     await O();
-    const a = setInterval(O, n);
+    const y = setInterval(O, e);
     return () => {
-      clearInterval(a);
+      clearInterval(y);
     };
   }
-  async getOrdersCount(s, c) {
-    const n = this.Url.endpoint(`/user/${s}/count`);
+  async getOrdersCount(c, n) {
+    const e = this.Url.endpoint(`/user/${c}/count`);
     try {
-      const r = await i.get(n, { ...c });
-      return r.error ? t(r.error) : r.status === p.Ok && r.result !== void 0 ? l(r.result) : t("GetOrdersCount: Unexpected error, result is undefined");
+      const r = await o.get(e, { ...n });
+      return r.error ? s(r.error) : r.status === U.Ok && r.result !== void 0 ? a(r.result) : s("GetOrdersCount: Unexpected error, result is undefined");
     } catch (r) {
-      return t("GetOrdersCount:", String(r));
+      return s("GetOrdersCount:", String(r));
     }
   }
 }

package/dist/src/lib/orderbook/orderbook.d.ts

@@ -20,7 +20,14 @@ export declare class Orderbook implements IOrderbook {
     getOrder<T extends boolean>(id: string, matched: T, request?: UtilsRequest): AsyncResult<T extends true ? MatchedOrder : CreateOrder, string>;
     getMatchedOrders(address: string, status: Status, paginationConfig?: PaginationConfig, request?: UtilsRequest): AsyncResult<PaginatedData<MatchedOrder>, string>;
     getUnMatchedOrders(address: string, paginationConfig?: PaginationConfig, request?: UtilsRequest): AsyncResult<PaginatedData<CreateOrder>, string>;
-    getOrders<T extends boolean>(matched: T, paginationConfig?: PaginationConfig, address?: string, tx_hash?: string, fromChain?: Chain, toChain?: Chain, status?: OrderStatus, request?: UtilsRequest): AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>;
+    getOrders<T extends boolean>(matched: T, filters: {
+        address?: string;
+        tx_hash?: string;
+        fromChain?: Chain;
+        toChain?: Chain;
+        status?: OrderStatus;
+        [key: string]: string | undefined;
+    }, paginationConfig?: PaginationConfig, request?: UtilsRequest): AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>;
     subscribeOrders<T extends boolean>(account: string, matched: T, interval: number, cb: (orders: PaginatedData<T extends true ? MatchedOrder : CreateOrder>) => Promise<void>, status?: Status, paginationConfig?: PaginationConfig, request?: UtilsRequest): Promise<() => void>;
     getOrdersCount(address: string, request?: UtilsRequest): AsyncResult<number, string>;
 }

package/dist/src/lib/orderbook/orderbook.types.d.ts

@@ -1,4 +1,4 @@
-import { APIResponse, AsyncResult, IAuth, IStore } from '@gardenfi/utils';
+import { APIResponse, AsyncResult, IAuth, IStore, Request as UtilsRequest } from '@gardenfi/utils';
 import { Asset, Chain } from '../asset';
 
 /**
@@ -114,14 +114,19 @@ export interface IOrderbook {
     /**
      * Get all orders from the orderbook based on the match status.
      * @param matched - If true, returns matched orders, else returns unmatched orders.
+     * @param filters - Object containing filter parameters like: `address`, `tx_hash`, `fromChain`, `toChain`, `status` and any additional key-value pairs for query parameters.
      * @param paginationConfig - The configuration for the pagination.
-     * @param address - The address to get the orders for.
-     * @param tx_hash - The tx hash to get the orders for (initiate_tx_hash, redeem_tx_hash, refund_tx_hash).
-     * @param fromChain - The source chain to filter orders by.
-     * @param toChain - The destination chain to filter orders by.
+     * @param request - Optional request configuration.
      * @returns {AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>} A promise that resolves to the orders.
      */
-    getOrders<T extends boolean>(matched: T, paginationConfig?: PaginationConfig, address?: string, tx_hash?: string): AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>;
+    getOrders<T extends boolean>(matched: T, filters: {
+        address?: string;
+        tx_hash?: string;
+        fromChain?: Chain;
+        toChain?: Chain;
+        status?: OrderStatus;
+        [key: string]: string | undefined;
+    }, paginationConfig?: PaginationConfig, request?: UtilsRequest): AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>;
     /**
      * Polls for every provided interval and returns matched and unmatched orders associated on the account.
      * @param account The account to subscribe to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/orderbook",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
-    "@gardenfi/utils": "2.4.5",
+    "@gardenfi/utils": "2.4.6",
     "bufferutil": "^4.0.8",
     "siwe": "^2.1.4",
     "utf-8-validate": "^6.0.3",