@gbozee/ultimate 0.0.2-187 → 0.0.2-188

package/dist/index.cjs

@@ -54936,7 +54936,8 @@ class AppDatabase {
             side: order.side,
             stop: order.stop || order.triggerPrice || 0,
             order_id: order.order_id.toString(),
-            account: account.id
+            account: account.id,
+            client_order_id: order.clientOrderId || ""
           };
           batch2.collection("orders").create(order_data);
         }
@@ -54959,7 +54960,7 @@ class AppDatabase {
     const existing_stop_orders = await this.pb.collection("orders").getFullList({
       filter: `symbol:lower="${symbol.toLowerCase()}" && account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}" && kind="${kind}" && side:lower="${stop_side}" && stop > 0`
     });
-    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : parseInt(o.order_id, 10));
+    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : symbol.startsWith("ETH") ? o.client_order_id : parseInt(o.order_id, 10));
     if (raw) {
       return exchange_order_ids;
     }
@@ -58696,6 +58697,7 @@ class Strategy {
 // src/types/index.ts
 class BaseExchange {
   client;
+  name;
   getCredentials;
   proxyAgent;
   constructor(client) {
@@ -58799,7 +58801,13 @@ class BaseExchange {
   async cancelOrders(payload) {
     return await this._cancelOrders({
       symbol: payload.symbol,
-      orders: payload.orders.map((x) => ({ orderId: x }))
+      orders: payload.orders.map((x) => {
+        let key = "orderId";
+        if (payload.symbol.startsWith("ETH") && this.name === "binance") {
+          key = "clientOrderId";
+        }
+        return { [key]: x };
+      })
     });
   }
   async placeTpOrder(payload) {
@@ -59841,6 +59849,7 @@ class BinanceExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "binance";
     this.client = client;
     this.main_client = main_client;
   }
@@ -60124,10 +60133,14 @@ async function cancelOrdersParallel(payload) {
   const limit = import_p_limit.default(ORDERS_PER_SECOND);
   const results = await Promise.all(batches.map((batch2) => limit(async () => {
     try {
-      const result = await Promise.all(batch2.map((x) => client.cancelOrder({
-        symbol: payload.symbol,
-        orderId: x.orderId
-      })));
+      const result = await Promise.all(batch2.map((x) => {
+        let key = x.orderId ? "orderId" : "origClientOrderId";
+        let value2 = x.orderId ? x.orderId : x.clientOrderId;
+        return client.cancelOrder({
+          symbol: payload.symbol,
+          [key]: value2
+        });
+      }));
       console.log("Cancel batch result:", result);
       return result;
     } catch (error) {
@@ -60663,6 +60676,7 @@ class BybitExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "bybit";
     this.client = client;
     this.main_client = main_client;
   }
@@ -62186,7 +62200,7 @@ class ExchangePosition {
     const orders = this.getOrders({ type });
     const result = await this.exchange.cancelOrders({
       symbol: this.symbol,
-      orders: orders.map((x) => x.order_id)
+      orders: orders.map((x) => this.symbol.startsWith("ETH") ? x.client_order_id : x.order_id)
     });
     if (refresh) {
       await this.refresh(true);
@@ -62284,7 +62298,8 @@ function convert_to_exchange_order(order) {
     side: order.side,
     stop: order.stop,
     order_id: order.order_id,
-    triggerPrice: order.triggerPrice
+    triggerPrice: order.triggerPrice,
+    client_order_id: order.clientOrderId
   };
 }
 

package/dist/index.d.ts

@@ -372,6 +372,7 @@ export interface CandlestickAnalysisResult {
 }
 declare abstract class BaseExchange {
 	client: any;
+	name: string;
 	getCredentials: (payload: {
 		account: string;
 	}) => Promise<{
@@ -446,7 +447,8 @@ declare abstract class BaseExchange {
 	protected abstract _cancelOrders(payload: {
 		symbol: string;
 		orders: Array<{
-			orderId: number;
+			orderId?: any;
+			clientOrderId?: any;
 		}>;
 	}): Promise<any>;
 	cancelOrders(payload: {
@@ -740,6 +742,7 @@ export declare class AppDatabase {
 			stop: number;
 			order_id: string;
 			triggerPrice?: number;
+			clientOrderId?: string;
 		}>;
 	}): Promise<void>;
 	cancelLimitOrders(payload: {
@@ -2302,6 +2305,7 @@ export declare class ExchangePosition {
 		stop: any;
 		order_id: any;
 		triggerPrice: any;
+		client_order_id: any;
 	}[];
 	cancelExchangeOrder(payload: {
 		type: "limit" | "stop" | "tp";

package/dist/index.js

@@ -54874,7 +54874,8 @@ class AppDatabase {
             side: order.side,
             stop: order.stop || order.triggerPrice || 0,
             order_id: order.order_id.toString(),
-            account: account.id
+            account: account.id,
+            client_order_id: order.clientOrderId || ""
           };
           batch2.collection("orders").create(order_data);
         }
@@ -54897,7 +54898,7 @@ class AppDatabase {
     const existing_stop_orders = await this.pb.collection("orders").getFullList({
       filter: `symbol:lower="${symbol.toLowerCase()}" && account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}" && kind="${kind}" && side:lower="${stop_side}" && stop > 0`
     });
-    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : parseInt(o.order_id, 10));
+    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : symbol.startsWith("ETH") ? o.client_order_id : parseInt(o.order_id, 10));
     if (raw) {
       return exchange_order_ids;
     }
@@ -58634,6 +58635,7 @@ class Strategy {
 // src/types/index.ts
 class BaseExchange {
   client;
+  name;
   getCredentials;
   proxyAgent;
   constructor(client) {
@@ -58737,7 +58739,13 @@ class BaseExchange {
   async cancelOrders(payload) {
     return await this._cancelOrders({
       symbol: payload.symbol,
-      orders: payload.orders.map((x) => ({ orderId: x }))
+      orders: payload.orders.map((x) => {
+        let key = "orderId";
+        if (payload.symbol.startsWith("ETH") && this.name === "binance") {
+          key = "clientOrderId";
+        }
+        return { [key]: x };
+      })
     });
   }
   async placeTpOrder(payload) {
@@ -59779,6 +59787,7 @@ class BinanceExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "binance";
     this.client = client;
     this.main_client = main_client;
   }
@@ -60062,10 +60071,14 @@ async function cancelOrdersParallel(payload) {
   const limit = import_p_limit.default(ORDERS_PER_SECOND);
   const results = await Promise.all(batches.map((batch2) => limit(async () => {
     try {
-      const result = await Promise.all(batch2.map((x) => client.cancelOrder({
-        symbol: payload.symbol,
-        orderId: x.orderId
-      })));
+      const result = await Promise.all(batch2.map((x) => {
+        let key = x.orderId ? "orderId" : "origClientOrderId";
+        let value2 = x.orderId ? x.orderId : x.clientOrderId;
+        return client.cancelOrder({
+          symbol: payload.symbol,
+          [key]: value2
+        });
+      }));
       console.log("Cancel batch result:", result);
       return result;
     } catch (error) {
@@ -60601,6 +60614,7 @@ class BybitExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "bybit";
     this.client = client;
     this.main_client = main_client;
   }
@@ -62124,7 +62138,7 @@ class ExchangePosition {
     const orders = this.getOrders({ type });
     const result = await this.exchange.cancelOrders({
       symbol: this.symbol,
-      orders: orders.map((x) => x.order_id)
+      orders: orders.map((x) => this.symbol.startsWith("ETH") ? x.client_order_id : x.order_id)
     });
     if (refresh) {
       await this.refresh(true);
@@ -62222,7 +62236,8 @@ function convert_to_exchange_order(order) {
     side: order.side,
     stop: order.stop,
     order_id: order.order_id,
-    triggerPrice: order.triggerPrice
+    triggerPrice: order.triggerPrice,
+    client_order_id: order.clientOrderId
   };
 }
 

package/dist/mcp-server.cjs

@@ -61630,7 +61630,8 @@ class AppDatabase {
             side: order.side,
             stop: order.stop || order.triggerPrice || 0,
             order_id: order.order_id.toString(),
-            account: account.id
+            account: account.id,
+            client_order_id: order.clientOrderId || ""
           };
           batch2.collection("orders").create(order_data);
         }
@@ -61653,7 +61654,7 @@ class AppDatabase {
     const existing_stop_orders = await this.pb.collection("orders").getFullList({
       filter: `symbol:lower="${symbol.toLowerCase()}" && account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}" && kind="${kind}" && side:lower="${stop_side}" && stop > 0`
     });
-    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : parseInt(o.order_id, 10));
+    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : symbol.startsWith("ETH") ? o.client_order_id : parseInt(o.order_id, 10));
     if (raw) {
       return exchange_order_ids;
     }
@@ -65272,6 +65273,7 @@ class Strategy {
 // src/types/index.ts
 class BaseExchange {
   client;
+  name;
   getCredentials;
   proxyAgent;
   constructor(client) {
@@ -65375,7 +65377,13 @@ class BaseExchange {
   async cancelOrders(payload) {
     return await this._cancelOrders({
       symbol: payload.symbol,
-      orders: payload.orders.map((x) => ({ orderId: x }))
+      orders: payload.orders.map((x) => {
+        let key = "orderId";
+        if (payload.symbol.startsWith("ETH") && this.name === "binance") {
+          key = "clientOrderId";
+        }
+        return { [key]: x };
+      })
     });
   }
   async placeTpOrder(payload) {
@@ -66417,6 +66425,7 @@ class BinanceExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "binance";
     this.client = client;
     this.main_client = main_client;
   }
@@ -66700,10 +66709,14 @@ async function cancelOrdersParallel(payload) {
   const limit = import_p_limit.default(ORDERS_PER_SECOND);
   const results = await Promise.all(batches.map((batch2) => limit(async () => {
     try {
-      const result = await Promise.all(batch2.map((x) => client.cancelOrder({
-        symbol: payload.symbol,
-        orderId: x.orderId
-      })));
+      const result = await Promise.all(batch2.map((x) => {
+        let key = x.orderId ? "orderId" : "origClientOrderId";
+        let value2 = x.orderId ? x.orderId : x.clientOrderId;
+        return client.cancelOrder({
+          symbol: payload.symbol,
+          [key]: value2
+        });
+      }));
       console.log("Cancel batch result:", result);
       return result;
     } catch (error) {
@@ -67239,6 +67252,7 @@ class BybitExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "bybit";
     this.client = client;
     this.main_client = main_client;
   }
@@ -68762,7 +68776,7 @@ class ExchangePosition {
     const orders = this.getOrders({ type });
     const result = await this.exchange.cancelOrders({
       symbol: this.symbol,
-      orders: orders.map((x) => x.order_id)
+      orders: orders.map((x) => this.symbol.startsWith("ETH") ? x.client_order_id : x.order_id)
     });
     if (refresh) {
       await this.refresh(true);
@@ -68860,7 +68874,8 @@ function convert_to_exchange_order(order) {
     side: order.side,
     stop: order.stop,
     order_id: order.order_id,
-    triggerPrice: order.triggerPrice
+    triggerPrice: order.triggerPrice,
+    client_order_id: order.clientOrderId
   };
 }
 

package/dist/mcp-server.js

@@ -61603,7 +61603,8 @@ class AppDatabase {
             side: order.side,
             stop: order.stop || order.triggerPrice || 0,
             order_id: order.order_id.toString(),
-            account: account.id
+            account: account.id,
+            client_order_id: order.clientOrderId || ""
           };
           batch2.collection("orders").create(order_data);
         }
@@ -61626,7 +61627,7 @@ class AppDatabase {
     const existing_stop_orders = await this.pb.collection("orders").getFullList({
       filter: `symbol:lower="${symbol.toLowerCase()}" && account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}" && kind="${kind}" && side:lower="${stop_side}" && stop > 0`
     });
-    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : parseInt(o.order_id, 10));
+    const exchange_order_ids = orders.concat(existing_stop_orders).map((o) => account.exchange === "bybit" ? o.order_id : symbol.startsWith("ETH") ? o.client_order_id : parseInt(o.order_id, 10));
     if (raw) {
       return exchange_order_ids;
     }
@@ -65245,6 +65246,7 @@ class Strategy {
 // src/types/index.ts
 class BaseExchange {
   client;
+  name;
   getCredentials;
   proxyAgent;
   constructor(client) {
@@ -65348,7 +65350,13 @@ class BaseExchange {
   async cancelOrders(payload) {
     return await this._cancelOrders({
       symbol: payload.symbol,
-      orders: payload.orders.map((x) => ({ orderId: x }))
+      orders: payload.orders.map((x) => {
+        let key = "orderId";
+        if (payload.symbol.startsWith("ETH") && this.name === "binance") {
+          key = "clientOrderId";
+        }
+        return { [key]: x };
+      })
     });
   }
   async placeTpOrder(payload) {
@@ -66390,6 +66398,7 @@ class BinanceExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "binance";
     this.client = client;
     this.main_client = main_client;
   }
@@ -66673,10 +66682,14 @@ async function cancelOrdersParallel(payload) {
   const limit = import_p_limit.default(ORDERS_PER_SECOND);
   const results = await Promise.all(batches.map((batch2) => limit(async () => {
     try {
-      const result = await Promise.all(batch2.map((x) => client.cancelOrder({
-        symbol: payload.symbol,
-        orderId: x.orderId
-      })));
+      const result = await Promise.all(batch2.map((x) => {
+        let key = x.orderId ? "orderId" : "origClientOrderId";
+        let value2 = x.orderId ? x.orderId : x.clientOrderId;
+        return client.cancelOrder({
+          symbol: payload.symbol,
+          [key]: value2
+        });
+      }));
       console.log("Cancel batch result:", result);
       return result;
     } catch (error) {
@@ -67212,6 +67225,7 @@ class BybitExchange extends BaseExchange {
   main_client;
   constructor(client, main_client) {
     super(client);
+    this.name = "bybit";
     this.client = client;
     this.main_client = main_client;
   }
@@ -68735,7 +68749,7 @@ class ExchangePosition {
     const orders = this.getOrders({ type });
     const result = await this.exchange.cancelOrders({
       symbol: this.symbol,
-      orders: orders.map((x) => x.order_id)
+      orders: orders.map((x) => this.symbol.startsWith("ETH") ? x.client_order_id : x.order_id)
     });
     if (refresh) {
       await this.refresh(true);
@@ -68833,7 +68847,8 @@ function convert_to_exchange_order(order) {
     side: order.side,
     stop: order.stop,
     order_id: order.order_id,
-    triggerPrice: order.triggerPrice
+    triggerPrice: order.triggerPrice,
+    client_order_id: order.clientOrderId
   };
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gbozee/ultimate",
   "type": "module",
-  "version": "0.0.2-187",
+  "version": "0.0.2-188",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",