@gardenfi/orderbook 2.4.4 → 2.4.5

package/dist/index2.cjs

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

package/dist/index2.js

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

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

@@ -1,5 +1,5 @@
-import { CreateOrder, CreateOrderReqWithStrategyId, IOrderbook, MatchedOrder, PaginatedData, PaginationConfig, Status } from './orderbook.types';
-import { AsyncResult, IAuth, Url } from '@gardenfi/utils';
+import { CreateOrder, CreateOrderReqWithStrategyId, IOrderbook, MatchedOrder, OrderStatus, PaginatedData, PaginationConfig, Status } from './orderbook.types';
+import { AsyncResult, IAuth, Url, Request as UtilsRequest } from '@gardenfi/utils';
 import { Chain } from '../asset';
 
 /**
@@ -17,10 +17,10 @@ export declare class Orderbook implements IOrderbook {
      * @returns {string} The create order ID.
      */
     createOrder(order: CreateOrderReqWithStrategyId, auth: IAuth): AsyncResult<MatchedOrder, string>;
-    getOrder<T extends boolean>(id: string, matched: T): AsyncResult<T extends true ? MatchedOrder : CreateOrder, string>;
-    getMatchedOrders(address: string, status: Status, paginationConfig?: PaginationConfig): AsyncResult<PaginatedData<MatchedOrder>, string>;
-    getUnMatchedOrders(address: string, paginationConfig?: PaginationConfig): AsyncResult<PaginatedData<CreateOrder>, string>;
-    getOrders<T extends boolean>(matched: T, paginationConfig?: PaginationConfig, address?: string, tx_hash?: string, fromChain?: Chain, toChain?: Chain): 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): Promise<() => void>;
-    getOrdersCount(address: string): AsyncResult<number, string>;
+    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>;
+    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

@@ -220,6 +220,8 @@ export type Swap = {
     swap_id: string;
     chain: Chain;
     asset: string;
+    htlc_address: string;
+    token_address: string;
     initiator: string;
     redeemer: string;
     timelock: number;
@@ -234,6 +236,10 @@ export type Swap = {
     redeem_block_number: string | null;
     refund_block_number: string | null;
     required_confirmations: number;
+    current_confirmations: number;
+    initiate_timestamp: string | null;
+    redeem_timestamp: string | null;
+    refund_timestamp: string | null;
 };
 export type MatchedOrder = {
     created_at: string;
@@ -256,3 +262,4 @@ export type PaginationConfig = {
     per_page?: number;
 };
 export type Status = 'all' | 'pending' | 'fulfilled';
+export type OrderStatus = 'refunded' | 'expired' | 'completed' | 'in-progress' | 'not-initiated';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/orderbook",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "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.4",
+    "@gardenfi/utils": "2.4.5",
     "bufferutil": "^4.0.8",
     "siwe": "^2.1.4",
     "utf-8-validate": "^6.0.3",