@gbozee/ultimate 0.0.2-166 → 0.0.2-168

package/dist/index.cjs

@@ -60856,12 +60856,18 @@ class ExchangePosition {
   exchange_account;
   app_db;
   instance;
+  orders;
   constructor(payload) {
     this.symbol_config = payload.symbol_config;
     this.exchange = payload.exchange;
     this.app_db = payload.app_db;
     this.instance = payload.instance;
     this.exchange_account = payload.exchange_account;
+    this.orders = payload.orders || {
+      entries: [],
+      stop_orders: [],
+      tp_orders: []
+    };
   }
   async initialize() {
     const proxy = await this.getProxyForAccount();
@@ -61790,17 +61796,68 @@ class ExchangePosition {
       });
     }
     const last_order = focus_position.instance.last_order;
-    const take_profit = this.instance.take_profit;
-    if (this.kind === "short" && last_order && take_profit) {
-      const reduce_ratio = take_profit < last_order ? 1 : 0;
-      await this.getConfig({
-        params: {
-          reduce_ratio
+    let take_profit;
+    if (this.instance.take_profit) {
+      take_profit = to_f(this.instance.take_profit, this.symbol_config.price_places);
+      if (this.kind === "short" && last_order && take_profit) {
+        const reduce_ratio = take_profit < last_order ? 1 : 0;
+        await this.getConfig({
+          params: {
+            reduce_ratio
+          }
+        });
+      }
+      if (this.instance.quantity > 0) {
+        if (focus_position.kind === "long" && focus_position.instance.stop_loss && take_profit > focus_position.appConfig.stop && focus_position.instance.stop_loss?.price < take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
         }
-      });
+        if (focus_position.kind === "short" && focus_position.instance.stop_loss && take_profit < focus_position.appConfig.stop && focus_position.instance.stop_loss?.price > take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
+        }
+      }
     }
     return { profit_percent, take_profit, last_order };
   }
+  getOrders(payload) {
+    const { type = "limit" } = payload;
+    if (type === "limit") {
+      return this.orders.entries.map(convert_to_exchange_order);
+    }
+    if (type === "stop") {
+      return this.orders.stop_orders.map(convert_to_exchange_order);
+    }
+    if (type === "tp") {
+      return this.orders.tp_orders.map(convert_to_exchange_order);
+    }
+  }
+  async cancelExchangeOrder(payload) {
+    const { type, refresh = true } = payload;
+    const orders = this.getOrders({ type });
+    const result = await this.exchange.cancelOrders({
+      symbol: this.symbol,
+      orders: orders.map((x) => x.order_id)
+    });
+    if (refresh) {
+      await this.refresh(true);
+    }
+    return result;
+  }
+}
+function convert_to_exchange_order(order) {
+  return {
+    symbol: order.symbol,
+    price: order.price,
+    quantity: order.quantity,
+    kind: order.kind,
+    side: order.side,
+    stop: order.stop,
+    order_id: order.order_id,
+    triggerPrice: order.triggerPrice
+  };
 }
 
 // src/exchange-account.ts
@@ -61854,8 +61911,7 @@ class ExchangeAccount {
   async initializePositions(payload) {
     const raw_positions = await this.syncAccount({
       update: payload.update,
-      symbol: payload.symbol,
-      live_refresh: payload.update
+      symbol: payload.symbol
     });
     const positions = await this.syncAccount({
       symbol: payload.symbol,
@@ -61864,6 +61920,9 @@ class ExchangeAccount {
     const symbol_config = await this.recomputeSymbolConfig({
       symbol: payload.symbol
     });
+    const active_account = await this.getActiveAccount({
+      symbol: payload.symbol
+    });
     const long_position = positions.find((x) => x.kind === "long");
     const short_position = positions.find((x) => x.kind === "short");
     this.long_position = new ExchangePosition({
@@ -61872,6 +61931,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: long_position,
       app_db: this.app_db,
+      orders: active_account.orders.long,
       without_view: raw_positions.find((x) => x.kind === "long")
     });
     await this.long_position.initialize();
@@ -61881,6 +61941,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: short_position,
       app_db: this.app_db,
+      orders: active_account.orders.short,
       without_view: raw_positions.find((x) => x.kind === "short")
     });
     await this.short_position.initialize();
@@ -63267,6 +63328,7 @@ class ExchangeAccount {
       const opposite_config = focus_position.getOppositeConfig({
         ratio: reward_factor
       });
+      console.log("opposite_config", opposite_config);
       const reverse_config = await reversePosition.getConfig();
       if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
         console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);

package/dist/index.d.ts

@@ -1706,12 +1706,27 @@ export declare function constructAppConfig(payload: {
 		kelly_prediction_model: string;
 	};
 }): AppConfig;
+export type ExchangeOrder = {
+	symbol: string;
+	price: number;
+	quantity: number;
+	kind: "long" | "short";
+	side: "buy" | "sell";
+	stop: number;
+	order_id: string;
+	triggerPrice?: number;
+};
 export declare class ExchangePosition {
 	exchange: BaseExchange;
 	symbol_config: SymbolConfig;
 	exchange_account: ExchangeAccount$1;
 	private app_db;
 	private instance;
+	orders: {
+		entries: ExchangeOrder[];
+		stop_orders: ExchangeOrder[];
+		tp_orders: ExchangeOrder[];
+	};
 	constructor(payload: {
 		exchange: BaseExchange;
 		app_db: AppDatabase;
@@ -1719,6 +1734,11 @@ export declare class ExchangePosition {
 		instance: PositionsView;
 		exchange_account: ExchangeAccount$1;
 		without_view?: PositionsView;
+		orders?: {
+			entries: any[];
+			stop_orders: any[];
+			tp_orders: any[];
+		};
 	});
 	initialize(): Promise<void>;
 	getInstance(): PositionsView;
@@ -2029,9 +2049,25 @@ export declare class ExchangePosition {
 		focus_position: ExchangePosition;
 	}): Promise<{
 		profit_percent: number;
-		take_profit: any;
+		take_profit: number;
 		last_order: number;
 	}>;
+	getOrders(payload: {
+		type?: "limit" | "stop" | "tp";
+	}): {
+		symbol: any;
+		price: any;
+		quantity: any;
+		kind: any;
+		side: any;
+		stop: any;
+		order_id: any;
+		triggerPrice: any;
+	}[];
+	cancelExchangeOrder(payload: {
+		type: "limit" | "stop" | "tp";
+		refresh?: boolean;
+	}): Promise<any>;
 }
 declare class ExchangeAccount$1 {
 	instance: {

package/dist/index.js

@@ -60801,12 +60801,18 @@ class ExchangePosition {
   exchange_account;
   app_db;
   instance;
+  orders;
   constructor(payload) {
     this.symbol_config = payload.symbol_config;
     this.exchange = payload.exchange;
     this.app_db = payload.app_db;
     this.instance = payload.instance;
     this.exchange_account = payload.exchange_account;
+    this.orders = payload.orders || {
+      entries: [],
+      stop_orders: [],
+      tp_orders: []
+    };
   }
   async initialize() {
     const proxy = await this.getProxyForAccount();
@@ -61735,17 +61741,68 @@ class ExchangePosition {
       });
     }
     const last_order = focus_position.instance.last_order;
-    const take_profit = this.instance.take_profit;
-    if (this.kind === "short" && last_order && take_profit) {
-      const reduce_ratio = take_profit < last_order ? 1 : 0;
-      await this.getConfig({
-        params: {
-          reduce_ratio
+    let take_profit;
+    if (this.instance.take_profit) {
+      take_profit = to_f(this.instance.take_profit, this.symbol_config.price_places);
+      if (this.kind === "short" && last_order && take_profit) {
+        const reduce_ratio = take_profit < last_order ? 1 : 0;
+        await this.getConfig({
+          params: {
+            reduce_ratio
+          }
+        });
+      }
+      if (this.instance.quantity > 0) {
+        if (focus_position.kind === "long" && focus_position.instance.stop_loss && take_profit > focus_position.appConfig.stop && focus_position.instance.stop_loss?.price < take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
         }
-      });
+        if (focus_position.kind === "short" && focus_position.instance.stop_loss && take_profit < focus_position.appConfig.stop && focus_position.instance.stop_loss?.price > take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
+        }
+      }
     }
     return { profit_percent, take_profit, last_order };
   }
+  getOrders(payload) {
+    const { type = "limit" } = payload;
+    if (type === "limit") {
+      return this.orders.entries.map(convert_to_exchange_order);
+    }
+    if (type === "stop") {
+      return this.orders.stop_orders.map(convert_to_exchange_order);
+    }
+    if (type === "tp") {
+      return this.orders.tp_orders.map(convert_to_exchange_order);
+    }
+  }
+  async cancelExchangeOrder(payload) {
+    const { type, refresh = true } = payload;
+    const orders = this.getOrders({ type });
+    const result = await this.exchange.cancelOrders({
+      symbol: this.symbol,
+      orders: orders.map((x) => x.order_id)
+    });
+    if (refresh) {
+      await this.refresh(true);
+    }
+    return result;
+  }
+}
+function convert_to_exchange_order(order) {
+  return {
+    symbol: order.symbol,
+    price: order.price,
+    quantity: order.quantity,
+    kind: order.kind,
+    side: order.side,
+    stop: order.stop,
+    order_id: order.order_id,
+    triggerPrice: order.triggerPrice
+  };
 }
 
 // src/exchange-account.ts
@@ -61799,8 +61856,7 @@ class ExchangeAccount {
   async initializePositions(payload) {
     const raw_positions = await this.syncAccount({
       update: payload.update,
-      symbol: payload.symbol,
-      live_refresh: payload.update
+      symbol: payload.symbol
     });
     const positions = await this.syncAccount({
       symbol: payload.symbol,
@@ -61809,6 +61865,9 @@ class ExchangeAccount {
     const symbol_config = await this.recomputeSymbolConfig({
       symbol: payload.symbol
     });
+    const active_account = await this.getActiveAccount({
+      symbol: payload.symbol
+    });
     const long_position = positions.find((x) => x.kind === "long");
     const short_position = positions.find((x) => x.kind === "short");
     this.long_position = new ExchangePosition({
@@ -61817,6 +61876,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: long_position,
       app_db: this.app_db,
+      orders: active_account.orders.long,
       without_view: raw_positions.find((x) => x.kind === "long")
     });
     await this.long_position.initialize();
@@ -61826,6 +61886,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: short_position,
       app_db: this.app_db,
+      orders: active_account.orders.short,
       without_view: raw_positions.find((x) => x.kind === "short")
     });
     await this.short_position.initialize();
@@ -63212,6 +63273,7 @@ class ExchangeAccount {
       const opposite_config = focus_position.getOppositeConfig({
         ratio: reward_factor
       });
+      console.log("opposite_config", opposite_config);
       const reverse_config = await reversePosition.getConfig();
       if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
         console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);

package/dist/mcp-server.cjs

@@ -67529,12 +67529,18 @@ class ExchangePosition {
   exchange_account;
   app_db;
   instance;
+  orders;
   constructor(payload) {
     this.symbol_config = payload.symbol_config;
     this.exchange = payload.exchange;
     this.app_db = payload.app_db;
     this.instance = payload.instance;
     this.exchange_account = payload.exchange_account;
+    this.orders = payload.orders || {
+      entries: [],
+      stop_orders: [],
+      tp_orders: []
+    };
   }
   async initialize() {
     const proxy = await this.getProxyForAccount();
@@ -68463,17 +68469,68 @@ class ExchangePosition {
       });
     }
     const last_order = focus_position.instance.last_order;
-    const take_profit = this.instance.take_profit;
-    if (this.kind === "short" && last_order && take_profit) {
-      const reduce_ratio = take_profit < last_order ? 1 : 0;
-      await this.getConfig({
-        params: {
-          reduce_ratio
+    let take_profit;
+    if (this.instance.take_profit) {
+      take_profit = to_f(this.instance.take_profit, this.symbol_config.price_places);
+      if (this.kind === "short" && last_order && take_profit) {
+        const reduce_ratio = take_profit < last_order ? 1 : 0;
+        await this.getConfig({
+          params: {
+            reduce_ratio
+          }
+        });
+      }
+      if (this.instance.quantity > 0) {
+        if (focus_position.kind === "long" && focus_position.instance.stop_loss && take_profit > focus_position.appConfig.stop && focus_position.instance.stop_loss?.price < take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
         }
-      });
+        if (focus_position.kind === "short" && focus_position.instance.stop_loss && take_profit < focus_position.appConfig.stop && focus_position.instance.stop_loss?.price > take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
+        }
+      }
     }
     return { profit_percent, take_profit, last_order };
   }
+  getOrders(payload) {
+    const { type = "limit" } = payload;
+    if (type === "limit") {
+      return this.orders.entries.map(convert_to_exchange_order);
+    }
+    if (type === "stop") {
+      return this.orders.stop_orders.map(convert_to_exchange_order);
+    }
+    if (type === "tp") {
+      return this.orders.tp_orders.map(convert_to_exchange_order);
+    }
+  }
+  async cancelExchangeOrder(payload) {
+    const { type, refresh = true } = payload;
+    const orders = this.getOrders({ type });
+    const result = await this.exchange.cancelOrders({
+      symbol: this.symbol,
+      orders: orders.map((x) => x.order_id)
+    });
+    if (refresh) {
+      await this.refresh(true);
+    }
+    return result;
+  }
+}
+function convert_to_exchange_order(order) {
+  return {
+    symbol: order.symbol,
+    price: order.price,
+    quantity: order.quantity,
+    kind: order.kind,
+    side: order.side,
+    stop: order.stop,
+    order_id: order.order_id,
+    triggerPrice: order.triggerPrice
+  };
 }
 
 // src/exchange-account.ts
@@ -68527,8 +68584,7 @@ class ExchangeAccount {
   async initializePositions(payload) {
     const raw_positions = await this.syncAccount({
       update: payload.update,
-      symbol: payload.symbol,
-      live_refresh: payload.update
+      symbol: payload.symbol
     });
     const positions = await this.syncAccount({
       symbol: payload.symbol,
@@ -68537,6 +68593,9 @@ class ExchangeAccount {
     const symbol_config = await this.recomputeSymbolConfig({
       symbol: payload.symbol
     });
+    const active_account = await this.getActiveAccount({
+      symbol: payload.symbol
+    });
     const long_position = positions.find((x) => x.kind === "long");
     const short_position = positions.find((x) => x.kind === "short");
     this.long_position = new ExchangePosition({
@@ -68545,6 +68604,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: long_position,
       app_db: this.app_db,
+      orders: active_account.orders.long,
       without_view: raw_positions.find((x) => x.kind === "long")
     });
     await this.long_position.initialize();
@@ -68554,6 +68614,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: short_position,
       app_db: this.app_db,
+      orders: active_account.orders.short,
       without_view: raw_positions.find((x) => x.kind === "short")
     });
     await this.short_position.initialize();
@@ -69940,6 +70001,7 @@ class ExchangeAccount {
       const opposite_config = focus_position.getOppositeConfig({
         ratio: reward_factor
       });
+      console.log("opposite_config", opposite_config);
       const reverse_config = await reversePosition.getConfig();
       if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
         console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);

package/dist/mcp-server.js

@@ -67506,12 +67506,18 @@ class ExchangePosition {
   exchange_account;
   app_db;
   instance;
+  orders;
   constructor(payload) {
     this.symbol_config = payload.symbol_config;
     this.exchange = payload.exchange;
     this.app_db = payload.app_db;
     this.instance = payload.instance;
     this.exchange_account = payload.exchange_account;
+    this.orders = payload.orders || {
+      entries: [],
+      stop_orders: [],
+      tp_orders: []
+    };
   }
   async initialize() {
     const proxy = await this.getProxyForAccount();
@@ -68440,17 +68446,68 @@ class ExchangePosition {
       });
     }
     const last_order = focus_position.instance.last_order;
-    const take_profit = this.instance.take_profit;
-    if (this.kind === "short" && last_order && take_profit) {
-      const reduce_ratio = take_profit < last_order ? 1 : 0;
-      await this.getConfig({
-        params: {
-          reduce_ratio
+    let take_profit;
+    if (this.instance.take_profit) {
+      take_profit = to_f(this.instance.take_profit, this.symbol_config.price_places);
+      if (this.kind === "short" && last_order && take_profit) {
+        const reduce_ratio = take_profit < last_order ? 1 : 0;
+        await this.getConfig({
+          params: {
+            reduce_ratio
+          }
+        });
+      }
+      if (this.instance.quantity > 0) {
+        if (focus_position.kind === "long" && focus_position.instance.stop_loss && take_profit > focus_position.appConfig.stop && focus_position.instance.stop_loss?.price < take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
         }
-      });
+        if (focus_position.kind === "short" && focus_position.instance.stop_loss && take_profit < focus_position.appConfig.stop && focus_position.instance.stop_loss?.price > take_profit) {
+          await focus_position.cancelExchangeOrder({
+            type: "stop"
+          });
+        }
+      }
     }
     return { profit_percent, take_profit, last_order };
   }
+  getOrders(payload) {
+    const { type = "limit" } = payload;
+    if (type === "limit") {
+      return this.orders.entries.map(convert_to_exchange_order);
+    }
+    if (type === "stop") {
+      return this.orders.stop_orders.map(convert_to_exchange_order);
+    }
+    if (type === "tp") {
+      return this.orders.tp_orders.map(convert_to_exchange_order);
+    }
+  }
+  async cancelExchangeOrder(payload) {
+    const { type, refresh = true } = payload;
+    const orders = this.getOrders({ type });
+    const result = await this.exchange.cancelOrders({
+      symbol: this.symbol,
+      orders: orders.map((x) => x.order_id)
+    });
+    if (refresh) {
+      await this.refresh(true);
+    }
+    return result;
+  }
+}
+function convert_to_exchange_order(order) {
+  return {
+    symbol: order.symbol,
+    price: order.price,
+    quantity: order.quantity,
+    kind: order.kind,
+    side: order.side,
+    stop: order.stop,
+    order_id: order.order_id,
+    triggerPrice: order.triggerPrice
+  };
 }
 
 // src/exchange-account.ts
@@ -68504,8 +68561,7 @@ class ExchangeAccount {
   async initializePositions(payload) {
     const raw_positions = await this.syncAccount({
       update: payload.update,
-      symbol: payload.symbol,
-      live_refresh: payload.update
+      symbol: payload.symbol
     });
     const positions = await this.syncAccount({
       symbol: payload.symbol,
@@ -68514,6 +68570,9 @@ class ExchangeAccount {
     const symbol_config = await this.recomputeSymbolConfig({
       symbol: payload.symbol
     });
+    const active_account = await this.getActiveAccount({
+      symbol: payload.symbol
+    });
     const long_position = positions.find((x) => x.kind === "long");
     const short_position = positions.find((x) => x.kind === "short");
     this.long_position = new ExchangePosition({
@@ -68522,6 +68581,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: long_position,
       app_db: this.app_db,
+      orders: active_account.orders.long,
       without_view: raw_positions.find((x) => x.kind === "long")
     });
     await this.long_position.initialize();
@@ -68531,6 +68591,7 @@ class ExchangeAccount {
       exchange_account: this,
       instance: short_position,
       app_db: this.app_db,
+      orders: active_account.orders.short,
       without_view: raw_positions.find((x) => x.kind === "short")
     });
     await this.short_position.initialize();
@@ -69917,6 +69978,7 @@ class ExchangeAccount {
       const opposite_config = focus_position.getOppositeConfig({
         ratio: reward_factor
       });
+      console.log("opposite_config", opposite_config);
       const reverse_config = await reversePosition.getConfig();
       if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
         console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);

package/package.json

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