@gbozee/ultimate 0.0.2-122 → 0.0.2-123

package/dist/index.cjs

@@ -51971,7 +51971,7 @@ class AppDatabase {
     }
   }
   async cancelLimitOrders(payload) {
-    const { symbol, kind, account, cancelExchangeOrders } = payload;
+    const { symbol, kind, account, cancelExchangeOrders, raw } = payload;
     const side = kind === "long" ? "buy" : "sell";
     const 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="${side}" && stop = 0`
@@ -51981,6 +51981,9 @@ class AppDatabase {
       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));
+    if (raw) {
+      return exchange_order_ids;
+    }
     try {
       console.log(`Attempting to cancel ${exchange_order_ids.length} orders on ${account.exchange} for ${account.owner}...`);
       const cancel_result = await cancelExchangeOrders({
@@ -56279,6 +56282,7 @@ async function cancelOrdersParallel(payload) {
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3());
+var import_p_limit2 = __toESM(require_p_limit());
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
@@ -56385,14 +56389,22 @@ async function getPositionInfo2(client, symbol) {
   const short = result.find((x) => x.side.toLowerCase() === "sell");
   return { long, short };
 }
+var ORDERS_PER_SECONDS = 10;
+var BATCH_SIZE2 = 10;
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
-    const batch2 = payload.orders.slice(i2, i2 + 15);
-    let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+  const batches = [];
+  for (let i2 = 0;i2 < payload.orders.length; i2 += BATCH_SIZE2) {
+    batches.push(payload.orders.slice(i2, i2 + BATCH_SIZE2));
+  }
+  const limit = import_p_limit2.default(ORDERS_PER_SECONDS);
+  for (let i2 = 0;i2 < batches.length; i2++) {
+    const batch2 = batches[i2];
+    let rr = await limit(async () => {
+      return await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+    });
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -57808,7 +57820,7 @@ class ExchangeAccount {
     }
   }
   async cancelOrders(payload) {
-    const { symbol, kind, price: _price, all, stop, limit } = payload;
+    const { symbol, kind, price: _price, all, stop, limit, raw } = payload;
     let price = _price || 0;
     await this.syncAccount({
       symbol,
@@ -57817,6 +57829,7 @@ class ExchangeAccount {
     });
     if (limit) {
       return await this.app_db.cancelLimitOrders({
+        raw,
         symbol,
         kind,
         account: this.instance,

package/dist/index.d.ts

@@ -656,11 +656,12 @@ export declare class AppDatabase {
 		symbol: string;
 		kind: "long" | "short";
 		account: ExchangeType;
+		raw?: boolean;
 		cancelExchangeOrders: (payload: {
 			symbol: string;
 			orders: number[];
 		}) => Promise<any>;
-	}): Promise<void>;
+	}): Promise<any[]>;
 	cancelOrders(payload: {
 		cancelExchangeOrders: (payload: {
 			symbol: string;
@@ -1516,7 +1517,7 @@ declare class ExchangePosition {
 	cancelOrders(payload: {
 		limit?: boolean;
 		price?: number;
-	}): Promise<void | {
+	}): Promise<any[] | {
 		success: boolean;
 		message: string;
 		exchange_result?: undefined;
@@ -1710,7 +1711,8 @@ declare class ExchangeAccount$1 {
 		all?: boolean;
 		stop?: boolean;
 		limit?: boolean;
-	}): Promise<void | {
+		raw?: boolean;
+	}): Promise<any[] | {
 		success: boolean;
 		message: string;
 		exchange_result?: undefined;
@@ -2362,7 +2364,7 @@ declare class App {
 		price?: number;
 		all?: boolean;
 		stop?: boolean;
-	}): Promise<void | {
+	}): Promise<any[] | {
 		success: boolean;
 		message: string;
 		exchange_result?: undefined;

package/dist/index.js

@@ -51921,7 +51921,7 @@ class AppDatabase {
     }
   }
   async cancelLimitOrders(payload) {
-    const { symbol, kind, account, cancelExchangeOrders } = payload;
+    const { symbol, kind, account, cancelExchangeOrders, raw } = payload;
     const side = kind === "long" ? "buy" : "sell";
     const 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="${side}" && stop = 0`
@@ -51931,6 +51931,9 @@ class AppDatabase {
       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));
+    if (raw) {
+      return exchange_order_ids;
+    }
     try {
       console.log(`Attempting to cancel ${exchange_order_ids.length} orders on ${account.exchange} for ${account.owner}...`);
       const cancel_result = await cancelExchangeOrders({
@@ -56229,6 +56232,7 @@ async function cancelOrdersParallel(payload) {
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3(), 1);
+var import_p_limit2 = __toESM(require_p_limit(), 1);
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
@@ -56335,14 +56339,22 @@ async function getPositionInfo2(client, symbol) {
   const short = result.find((x) => x.side.toLowerCase() === "sell");
   return { long, short };
 }
+var ORDERS_PER_SECONDS = 10;
+var BATCH_SIZE2 = 10;
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
-    const batch2 = payload.orders.slice(i2, i2 + 15);
-    let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+  const batches = [];
+  for (let i2 = 0;i2 < payload.orders.length; i2 += BATCH_SIZE2) {
+    batches.push(payload.orders.slice(i2, i2 + BATCH_SIZE2));
+  }
+  const limit = import_p_limit2.default(ORDERS_PER_SECONDS);
+  for (let i2 = 0;i2 < batches.length; i2++) {
+    const batch2 = batches[i2];
+    let rr = await limit(async () => {
+      return await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+    });
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -57758,7 +57770,7 @@ class ExchangeAccount {
     }
   }
   async cancelOrders(payload) {
-    const { symbol, kind, price: _price, all, stop, limit } = payload;
+    const { symbol, kind, price: _price, all, stop, limit, raw } = payload;
     let price = _price || 0;
     await this.syncAccount({
       symbol,
@@ -57767,6 +57779,7 @@ class ExchangeAccount {
     });
     if (limit) {
       return await this.app_db.cancelLimitOrders({
+        raw,
         symbol,
         kind,
         account: this.instance,

package/dist/mcp-server.cjs

@@ -58675,7 +58675,7 @@ class AppDatabase {
     }
   }
   async cancelLimitOrders(payload) {
-    const { symbol, kind, account, cancelExchangeOrders } = payload;
+    const { symbol, kind, account, cancelExchangeOrders, raw } = payload;
     const side = kind === "long" ? "buy" : "sell";
     const 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="${side}" && stop = 0`
@@ -58685,6 +58685,9 @@ class AppDatabase {
       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));
+    if (raw) {
+      return exchange_order_ids;
+    }
     try {
       console.log(`Attempting to cancel ${exchange_order_ids.length} orders on ${account.exchange} for ${account.owner}...`);
       const cancel_result = await cancelExchangeOrders({
@@ -62957,6 +62960,7 @@ async function cancelOrdersParallel(payload) {
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3());
+var import_p_limit2 = __toESM(require_p_limit());
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
@@ -63063,14 +63067,22 @@ async function getPositionInfo2(client, symbol) {
   const short = result.find((x) => x.side.toLowerCase() === "sell");
   return { long, short };
 }
+var ORDERS_PER_SECONDS = 10;
+var BATCH_SIZE2 = 10;
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
-    const batch2 = payload.orders.slice(i2, i2 + 15);
-    let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+  const batches = [];
+  for (let i2 = 0;i2 < payload.orders.length; i2 += BATCH_SIZE2) {
+    batches.push(payload.orders.slice(i2, i2 + BATCH_SIZE2));
+  }
+  const limit = import_p_limit2.default(ORDERS_PER_SECONDS);
+  for (let i2 = 0;i2 < batches.length; i2++) {
+    const batch2 = batches[i2];
+    let rr = await limit(async () => {
+      return await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+    });
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -64486,7 +64498,7 @@ class ExchangeAccount {
     }
   }
   async cancelOrders(payload) {
-    const { symbol, kind, price: _price, all, stop, limit } = payload;
+    const { symbol, kind, price: _price, all, stop, limit, raw } = payload;
     let price = _price || 0;
     await this.syncAccount({
       symbol,
@@ -64495,6 +64507,7 @@ class ExchangeAccount {
     });
     if (limit) {
       return await this.app_db.cancelLimitOrders({
+        raw,
         symbol,
         kind,
         account: this.instance,

package/dist/mcp-server.js

@@ -58652,7 +58652,7 @@ class AppDatabase {
     }
   }
   async cancelLimitOrders(payload) {
-    const { symbol, kind, account, cancelExchangeOrders } = payload;
+    const { symbol, kind, account, cancelExchangeOrders, raw } = payload;
     const side = kind === "long" ? "buy" : "sell";
     const 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="${side}" && stop = 0`
@@ -58662,6 +58662,9 @@ class AppDatabase {
       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));
+    if (raw) {
+      return exchange_order_ids;
+    }
     try {
       console.log(`Attempting to cancel ${exchange_order_ids.length} orders on ${account.exchange} for ${account.owner}...`);
       const cancel_result = await cancelExchangeOrders({
@@ -62934,6 +62937,7 @@ async function cancelOrdersParallel(payload) {
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3(), 1);
+var import_p_limit2 = __toESM(require_p_limit(), 1);
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
@@ -63040,14 +63044,22 @@ async function getPositionInfo2(client, symbol) {
   const short = result.find((x) => x.side.toLowerCase() === "sell");
   return { long, short };
 }
+var ORDERS_PER_SECONDS = 10;
+var BATCH_SIZE2 = 10;
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
-    const batch2 = payload.orders.slice(i2, i2 + 15);
-    let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+  const batches = [];
+  for (let i2 = 0;i2 < payload.orders.length; i2 += BATCH_SIZE2) {
+    batches.push(payload.orders.slice(i2, i2 + BATCH_SIZE2));
+  }
+  const limit = import_p_limit2.default(ORDERS_PER_SECONDS);
+  for (let i2 = 0;i2 < batches.length; i2++) {
+    const batch2 = batches[i2];
+    let rr = await limit(async () => {
+      return await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
+    });
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -64463,7 +64475,7 @@ class ExchangeAccount {
     }
   }
   async cancelOrders(payload) {
-    const { symbol, kind, price: _price, all, stop, limit } = payload;
+    const { symbol, kind, price: _price, all, stop, limit, raw } = payload;
     let price = _price || 0;
     await this.syncAccount({
       symbol,
@@ -64472,6 +64484,7 @@ class ExchangeAccount {
     });
     if (limit) {
       return await this.app_db.cancelLimitOrders({
+        raw,
         symbol,
         kind,
         account: this.instance,

package/package.json

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