@gbozee/ultimate 0.0.2-131 → 0.0.2-134

package/dist/frontend-index.d.ts

@@ -491,11 +491,13 @@ export declare function computeProfitDetail(payload: {
 			quantity: number;
 		};
 	};
+	full_ratio?: number;
 	price_places?: string;
 	decimal_places?: string;
 }): {
 	pnl: number;
 	loss: number;
+	full_loss: number;
 	original_pnl: number;
 	reward_factor: number;
 	profit_percent: number;
@@ -854,6 +856,7 @@ export declare class Strategy {
 	}): {
 		pnl: number;
 		loss: number;
+		full_loss: number;
 		original_pnl: number;
 		reward_factor: number;
 		profit_percent: number;

package/dist/frontend-index.js

@@ -1895,13 +1895,15 @@ function computeProfitDetail(payload) {
     price_places = "%.1f",
     reduce_position,
     decimal_places,
-    reverse_position
+    reverse_position,
+    full_ratio = 1
   } = payload;
   let reward_factor = strategy.reward_factor;
   const profit_percent = to_f(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
+  let full_loss = 0;
   let expected_loss = 0;
   let quantity = 0;
   let new_pnl = pnl;
@@ -1910,6 +1912,7 @@ function computeProfitDetail(payload) {
     const ratio = pnl / loss;
     quantity = to_f(reduce_position.quantity * ratio, decimal_places);
     expected_loss = to_f(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
+    full_loss = Math.abs(reduce_position.avg_price - sell_price) * reduce_position.avg_qty * full_ratio;
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -1918,6 +1921,7 @@ function computeProfitDetail(payload) {
   return {
     pnl: new_pnl,
     loss: to_f(expected_loss, "%.2f"),
+    full_loss: to_f(full_loss, "%.2f"),
     original_pnl: pnl,
     reward_factor,
     profit_percent,
@@ -2150,8 +2154,10 @@ function determineCompoundLongTrade(payload) {
   const short_max_size = short_app_config.last_value.avg_size;
   const start_risk = Math.abs(short_app_config.last_value.neg_pnl) * rr;
   const short_profit = short_app_config.last_value.avg_size * short_app_config.last_value.avg_entry * shortConfig.profit_percent / 100;
-  const support = Math.abs(short_app_config.last_value.avg_entry - short_profit) * rr;
+  const diff = short_profit * rr / short_app_config.last_value.avg_size;
+  const support = Math.abs(short_app_config.last_value.avg_entry - diff);
   const resistance = focus_short_position.next_order || focus_long_position.take_profit;
+  console.log({ support, resistance, short_profit });
   const result = getRiskReward({
     entry: resistance,
     stop: support,

package/dist/index.cjs

@@ -54232,13 +54232,15 @@ function computeProfitDetail(payload) {
     price_places = "%.1f",
     reduce_position,
     decimal_places,
-    reverse_position
+    reverse_position,
+    full_ratio = 1
   } = payload;
   let reward_factor = strategy.reward_factor;
   const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
+  let full_loss = 0;
   let expected_loss = 0;
   let quantity = 0;
   let new_pnl = pnl;
@@ -54247,6 +54249,7 @@ function computeProfitDetail(payload) {
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
     expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
+    full_loss = Math.abs(reduce_position.avg_price - sell_price) * reduce_position.avg_qty * full_ratio;
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -54255,6 +54258,7 @@ function computeProfitDetail(payload) {
   return {
     pnl: new_pnl,
     loss: to_f2(expected_loss, "%.2f"),
+    full_loss: to_f2(full_loss, "%.2f"),
     original_pnl: pnl,
     reward_factor,
     profit_percent,
@@ -54487,8 +54491,10 @@ function determineCompoundLongTrade(payload) {
   const short_max_size = short_app_config.last_value.avg_size;
   const start_risk = Math.abs(short_app_config.last_value.neg_pnl) * rr;
   const short_profit = short_app_config.last_value.avg_size * short_app_config.last_value.avg_entry * shortConfig.profit_percent / 100;
-  const support = Math.abs(short_app_config.last_value.avg_entry - short_profit) * rr;
+  const diff = short_profit * rr / short_app_config.last_value.avg_size;
+  const support = Math.abs(short_app_config.last_value.avg_entry - diff);
   const resistance = focus_short_position.next_order || focus_long_position.take_profit;
+  console.log({ support, resistance, short_profit });
   const result = getRiskReward({
     entry: resistance,
     stop: support,
@@ -60142,7 +60148,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position, kind } = payload;
+    const { symbol, reduce_position, kind, full_ratio = 1 } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -60192,7 +60198,8 @@ class ExchangeAccount {
         stop_loss: reverse_position.stop_loss
       },
       price_places: symbol_config.price_places,
-      decimal_places: symbol_config.decimal_places
+      decimal_places: symbol_config.decimal_places,
+      full_ratio
     });
   }
   async placeCompoundShortTrade(payload) {
@@ -60611,6 +60618,7 @@ class App {
       kind,
       place,
       increase,
+      full_ratio = 1,
       cancel_limit = true
     } = payload;
     const main_exchange_account = await this.getExchangeAccount(main_account);
@@ -60624,7 +60632,8 @@ class App {
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
       reduce_position,
-      kind: main_account.kind || reverse_kind
+      kind: main_account.kind || reverse_kind,
+      full_ratio
     });
     if (place) {
       if (cancel_limit) {

package/dist/index.d.ts

@@ -1017,6 +1017,7 @@ export declare class Strategy {
 	}): {
 		pnl: number;
 		loss: number;
+		full_loss: number;
 		original_pnl: number;
 		reward_factor: number;
 		profit_percent: number;
@@ -1427,11 +1428,13 @@ export declare function computeProfitDetail(payload: {
 			quantity: number;
 		};
 	};
+	full_ratio?: number;
 	price_places?: string;
 	decimal_places?: string;
 }): {
 	pnl: number;
 	loss: number;
+	full_loss: number;
 	original_pnl: number;
 	reward_factor: number;
 	profit_percent: number;
@@ -2384,9 +2387,11 @@ declare class ExchangeAccount$1 {
 		symbol: string;
 		reduce_position: PositionsView;
 		kind?: "long" | "short";
+		full_ratio?: number;
 	}): Promise<{
 		pnl: number;
 		loss: number;
+		full_loss: number;
 		original_pnl: number;
 		reward_factor: number;
 		profit_percent: number;
@@ -2632,6 +2637,7 @@ declare class App {
 		kind: "long" | "short";
 		place?: boolean;
 		increase?: boolean;
+		full_ratio?: number;
 		cancel_limit?: boolean;
 	}): Promise<any>;
 }

package/dist/index.js

@@ -54180,13 +54180,15 @@ function computeProfitDetail(payload) {
     price_places = "%.1f",
     reduce_position,
     decimal_places,
-    reverse_position
+    reverse_position,
+    full_ratio = 1
   } = payload;
   let reward_factor = strategy.reward_factor;
   const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
+  let full_loss = 0;
   let expected_loss = 0;
   let quantity = 0;
   let new_pnl = pnl;
@@ -54195,6 +54197,7 @@ function computeProfitDetail(payload) {
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
     expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
+    full_loss = Math.abs(reduce_position.avg_price - sell_price) * reduce_position.avg_qty * full_ratio;
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -54203,6 +54206,7 @@ function computeProfitDetail(payload) {
   return {
     pnl: new_pnl,
     loss: to_f2(expected_loss, "%.2f"),
+    full_loss: to_f2(full_loss, "%.2f"),
     original_pnl: pnl,
     reward_factor,
     profit_percent,
@@ -54435,8 +54439,10 @@ function determineCompoundLongTrade(payload) {
   const short_max_size = short_app_config.last_value.avg_size;
   const start_risk = Math.abs(short_app_config.last_value.neg_pnl) * rr;
   const short_profit = short_app_config.last_value.avg_size * short_app_config.last_value.avg_entry * shortConfig.profit_percent / 100;
-  const support = Math.abs(short_app_config.last_value.avg_entry - short_profit) * rr;
+  const diff = short_profit * rr / short_app_config.last_value.avg_size;
+  const support = Math.abs(short_app_config.last_value.avg_entry - diff);
   const resistance = focus_short_position.next_order || focus_long_position.take_profit;
+  console.log({ support, resistance, short_profit });
   const result = getRiskReward({
     entry: resistance,
     stop: support,
@@ -60090,7 +60096,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position, kind } = payload;
+    const { symbol, reduce_position, kind, full_ratio = 1 } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -60140,7 +60146,8 @@ class ExchangeAccount {
         stop_loss: reverse_position.stop_loss
       },
       price_places: symbol_config.price_places,
-      decimal_places: symbol_config.decimal_places
+      decimal_places: symbol_config.decimal_places,
+      full_ratio
     });
   }
   async placeCompoundShortTrade(payload) {
@@ -60559,6 +60566,7 @@ class App {
       kind,
       place,
       increase,
+      full_ratio = 1,
       cancel_limit = true
     } = payload;
     const main_exchange_account = await this.getExchangeAccount(main_account);
@@ -60572,7 +60580,8 @@ class App {
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
       reduce_position,
-      kind: main_account.kind || reverse_kind
+      kind: main_account.kind || reverse_kind,
+      full_ratio
     });
     if (place) {
       if (cancel_limit) {

package/dist/mcp-server.cjs

@@ -60914,13 +60914,15 @@ function computeProfitDetail(payload) {
     price_places = "%.1f",
     reduce_position,
     decimal_places,
-    reverse_position
+    reverse_position,
+    full_ratio = 1
   } = payload;
   let reward_factor = strategy.reward_factor;
   const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
+  let full_loss = 0;
   let expected_loss = 0;
   let quantity = 0;
   let new_pnl = pnl;
@@ -60929,6 +60931,7 @@ function computeProfitDetail(payload) {
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
     expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
+    full_loss = Math.abs(reduce_position.avg_price - sell_price) * reduce_position.avg_qty * full_ratio;
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -60937,6 +60940,7 @@ function computeProfitDetail(payload) {
   return {
     pnl: new_pnl,
     loss: to_f2(expected_loss, "%.2f"),
+    full_loss: to_f2(full_loss, "%.2f"),
     original_pnl: pnl,
     reward_factor,
     profit_percent,
@@ -61163,8 +61167,10 @@ function determineCompoundLongTrade(payload) {
   const short_max_size = short_app_config.last_value.avg_size;
   const start_risk = Math.abs(short_app_config.last_value.neg_pnl) * rr;
   const short_profit = short_app_config.last_value.avg_size * short_app_config.last_value.avg_entry * shortConfig.profit_percent / 100;
-  const support = Math.abs(short_app_config.last_value.avg_entry - short_profit) * rr;
+  const diff = short_profit * rr / short_app_config.last_value.avg_size;
+  const support = Math.abs(short_app_config.last_value.avg_entry - diff);
   const resistance = focus_short_position.next_order || focus_long_position.take_profit;
+  console.log({ support, resistance, short_profit });
   const result = getRiskReward({
     entry: resistance,
     stop: support,
@@ -66818,7 +66824,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position, kind } = payload;
+    const { symbol, reduce_position, kind, full_ratio = 1 } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -66868,7 +66874,8 @@ class ExchangeAccount {
         stop_loss: reverse_position.stop_loss
       },
       price_places: symbol_config.price_places,
-      decimal_places: symbol_config.decimal_places
+      decimal_places: symbol_config.decimal_places,
+      full_ratio
     });
   }
   async placeCompoundShortTrade(payload) {
@@ -67287,6 +67294,7 @@ class App {
       kind,
       place,
       increase,
+      full_ratio = 1,
       cancel_limit = true
     } = payload;
     const main_exchange_account = await this.getExchangeAccount(main_account);
@@ -67300,7 +67308,8 @@ class App {
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
       reduce_position,
-      kind: main_account.kind || reverse_kind
+      kind: main_account.kind || reverse_kind,
+      full_ratio
     });
     if (place) {
       if (cancel_limit) {

package/dist/mcp-server.js

@@ -60891,13 +60891,15 @@ function computeProfitDetail(payload) {
     price_places = "%.1f",
     reduce_position,
     decimal_places,
-    reverse_position
+    reverse_position,
+    full_ratio = 1
   } = payload;
   let reward_factor = strategy.reward_factor;
   const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
+  let full_loss = 0;
   let expected_loss = 0;
   let quantity = 0;
   let new_pnl = pnl;
@@ -60906,6 +60908,7 @@ function computeProfitDetail(payload) {
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
     expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
+    full_loss = Math.abs(reduce_position.avg_price - sell_price) * reduce_position.avg_qty * full_ratio;
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -60914,6 +60917,7 @@ function computeProfitDetail(payload) {
   return {
     pnl: new_pnl,
     loss: to_f2(expected_loss, "%.2f"),
+    full_loss: to_f2(full_loss, "%.2f"),
     original_pnl: pnl,
     reward_factor,
     profit_percent,
@@ -61140,8 +61144,10 @@ function determineCompoundLongTrade(payload) {
   const short_max_size = short_app_config.last_value.avg_size;
   const start_risk = Math.abs(short_app_config.last_value.neg_pnl) * rr;
   const short_profit = short_app_config.last_value.avg_size * short_app_config.last_value.avg_entry * shortConfig.profit_percent / 100;
-  const support = Math.abs(short_app_config.last_value.avg_entry - short_profit) * rr;
+  const diff = short_profit * rr / short_app_config.last_value.avg_size;
+  const support = Math.abs(short_app_config.last_value.avg_entry - diff);
   const resistance = focus_short_position.next_order || focus_long_position.take_profit;
+  console.log({ support, resistance, short_profit });
   const result = getRiskReward({
     entry: resistance,
     stop: support,
@@ -66795,7 +66801,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position, kind } = payload;
+    const { symbol, reduce_position, kind, full_ratio = 1 } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -66845,7 +66851,8 @@ class ExchangeAccount {
         stop_loss: reverse_position.stop_loss
       },
       price_places: symbol_config.price_places,
-      decimal_places: symbol_config.decimal_places
+      decimal_places: symbol_config.decimal_places,
+      full_ratio
     });
   }
   async placeCompoundShortTrade(payload) {
@@ -67264,6 +67271,7 @@ class App {
       kind,
       place,
       increase,
+      full_ratio = 1,
       cancel_limit = true
     } = payload;
     const main_exchange_account = await this.getExchangeAccount(main_account);
@@ -67277,7 +67285,8 @@ class App {
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
       reduce_position,
-      kind: main_account.kind || reverse_kind
+      kind: main_account.kind || reverse_kind,
+      full_ratio
     });
     if (place) {
       if (cancel_limit) {

package/package.json

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