@gbozee/ultimate 0.0.2-93 → 0.0.2-95

package/dist/frontend-index.d.ts

@@ -398,6 +398,38 @@ export declare function getRiskReward(payload: {
 	risk: number;
 	global_config: GlobalConfig;
 }): any;
+export declare function computeProfitDetail(payload: {
+	focus_position: {
+		kind: "long" | "short";
+		entry: number;
+		quantity: number;
+		avg_qty: number;
+		avg_price: number;
+	};
+	strategy: {
+		reward_factor: number;
+		max_reward_factor: number;
+		risk: number;
+	};
+	reduce_position: {
+		kind: "long" | "short";
+		entry: number;
+		quantity: number;
+		avg_qty: number;
+		avg_price: number;
+	};
+	price_places?: string;
+	decimal_places?: string;
+}): {
+	pnl: number;
+	reward_factor: number;
+	profit_percent: number;
+	kind: "long" | "short";
+	sell_price: number;
+	quantity: number;
+	price_places: string;
+	decimal_places: string;
+};
 export type StrategyPosition = {
 	entry: number;
 	quantity: number;

package/dist/frontend-index.js

@@ -1761,6 +1761,43 @@ function getRiskReward(payload) {
   });
   return risk_reward;
 }
+function computeProfitDetail(payload) {
+  const {
+    focus_position,
+    strategy,
+    price_places = "%.1f",
+    reduce_position,
+    decimal_places
+  } = payload;
+  let reward_factor = strategy.reward_factor;
+  let risk = strategy.risk;
+  if (strategy.max_reward_factor === 0) {
+    reward_factor = strategy.reward_factor;
+  }
+  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
+    reward_factor = focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty;
+  } else {
+    reward_factor = strategy.reward_factor;
+  }
+  const full_pnl = reward_factor * risk;
+  const profit_percent = to_f(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
+  const pnl = to_f(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  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);
+  const loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
+  const ratio = pnl / loss;
+  const quantity = to_f(reduce_position.quantity * ratio, decimal_places);
+  return {
+    pnl,
+    reward_factor,
+    profit_percent,
+    kind: focus_position.kind,
+    sell_price: to_f(sell_price, price_places),
+    quantity,
+    price_places,
+    decimal_places
+  };
+}
 // src/helpers/strategy.ts
 class Strategy {
   position;
@@ -2196,6 +2233,7 @@ export {
   computeTotalAverageForEachTrade,
   computeSellZones,
   computeRiskReward,
+  computeProfitDetail,
   buildConfig,
   buildAvg,
   buildAppConfig,

package/dist/index.cjs

@@ -41904,6 +41904,7 @@ __export(exports_src, {
   database: () => exports_database,
   createArray: () => createArray,
   computeRiskReward: () => computeRiskReward,
+  computeProfitDetail: () => computeProfitDetail,
   buildConfig: () => buildConfig,
   buildAvg: () => buildAvg,
   buildAppConfig: () => buildAppConfig,
@@ -51603,7 +51604,7 @@ class AppDatabase {
       table: "positions_view",
       params: {
         filter: `symbol:lower="${symbol.toLowerCase()}" && account:lower="${account.owner.toLowerCase()} ${account.exchange.toLowerCase()}"`,
-        expand: "config"
+        expand: "config, account_strategy, p_account"
       }
     } : {
       table: "positions",
@@ -53840,6 +53841,43 @@ function getRiskReward(payload) {
   });
   return risk_reward;
 }
+function computeProfitDetail(payload) {
+  const {
+    focus_position,
+    strategy,
+    price_places = "%.1f",
+    reduce_position,
+    decimal_places
+  } = payload;
+  let reward_factor = strategy.reward_factor;
+  let risk = strategy.risk;
+  if (strategy.max_reward_factor === 0) {
+    reward_factor = strategy.reward_factor;
+  }
+  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
+    reward_factor = focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty;
+  } else {
+    reward_factor = strategy.reward_factor;
+  }
+  const full_pnl = reward_factor * risk;
+  const profit_percent = to_f2(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
+  const pnl = to_f2(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  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);
+  const loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
+  const ratio = pnl / loss;
+  const quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
+  return {
+    pnl,
+    reward_factor,
+    profit_percent,
+    kind: focus_position.kind,
+    sell_price: to_f2(sell_price, price_places),
+    quantity,
+    price_places,
+    decimal_places
+  };
+}
 
 // src/helpers/strategy.ts
 class Strategy {
@@ -54246,6 +54284,54 @@ class Strategy {
 
 // src/exchanges/binance.ts
 var import_binance = __toESM(require_lib2());
+
+// src/types/index.ts
+class BaseExchange {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async customStopLoss(payload) {
+    const {
+      symbol,
+      kind,
+      stop: _stop,
+      quantity,
+      increase = false,
+      price_places,
+      decimal_places
+    } = payload;
+    const spread = 1.00005;
+    const stop = kind === "long" ? _stop * spread ** -1 : _stop * spread;
+    const order = [
+      {
+        kind,
+        side: kind === "long" ? "sell" : "buy",
+        price: stop,
+        quantity,
+        stop: _stop,
+        is_market: false
+      }
+    ];
+    if (increase) {
+      order.push({
+        kind,
+        price: stop,
+        side: kind === "long" ? "buy" : "sell",
+        quantity,
+        is_market: false
+      });
+    }
+    return this.rawCreateLimitPurchaseOrders({
+      orders: order,
+      symbol,
+      price_places,
+      decimal_places
+    });
+  }
+}
+
+// src/exchanges/binance.ts
 var CONSTANTS = {
   SPOT_TO_FIAT: "MAIN_C2C",
   SPOT_TO_USDT_FUTURE: "MAIN_UMFUTURE",
@@ -55016,12 +55102,13 @@ async function getAllOpenOrders(payload) {
   return response;
 }
 
-class BinanceExchange {
+class BinanceExchange extends BaseExchange {
   client;
   main_client;
   getCredentials;
   proxyAgent;
   constructor(client, main_client) {
+    super(client);
     this.client = client;
     this.main_client = main_client;
   }
@@ -55333,6 +55420,10 @@ class BinanceExchange {
       }
     ]);
   }
+  async rawCreateLimitPurchaseOrders(payload) {
+    const { symbol, orders, price_places, decimal_places } = payload;
+    return createLimitPurchaseOrders(this.client, symbol, price_places, decimal_places, orders);
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -55830,10 +55921,11 @@ async function analyzeCharts2(params) {
   return finalPairs;
 }
 
-class BybitExchange {
+class BybitExchange extends BaseExchange {
   client;
   main_client;
   constructor(client, main_client) {
+    super(client);
     this.client = client;
     this.main_client = main_client;
   }
@@ -56007,6 +56099,10 @@ class BybitExchange {
   }
   async placeMarketOrder(payload) {
   }
+  async rawCreateLimitPurchaseOrders(payload) {
+    const { symbol, orders, price_places, decimal_places } = payload;
+    return createLimitPurchaseOrders2(this.client, symbol, price_places, decimal_places, orders);
+  }
 }
 
 // src/helpers/accounts.ts
@@ -58771,15 +58867,19 @@ class ExchangeAccount {
   async profitWithinGapStrategy(payload) {
     const { symbol } = payload;
     let reward_factor = 1;
-    const strategy = await this.getAccountStrategy({ symbol });
-    if (!strategy) {
-      return;
-    }
     console.log("Fetching positions for ", symbol);
     const positions = await this.syncAccount({
       symbol,
       as_view: true
     });
+    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    if (!focus_position) {
+      return;
+    }
+    const strategy = focus_position?.expand?.account_strategy;
+    if (!strategy) {
+      return;
+    }
     const risk = strategy.risk;
     const kind = strategy.kind;
     const support = strategy.support;
@@ -58788,7 +58888,6 @@ class ExchangeAccount {
     const long_position = positions.find((k) => k.kind === "long");
     const short_position = positions.find((k) => k.kind === "short");
     console.log("Getting focus position for ", symbol, kind);
-    const focus_position = kind === "long" ? long_position : short_position;
     const reverse_position = kind === "long" ? short_position : long_position;
     if (strategy.max_reward_factor === 0) {
       reward_factor = strategy.reward_factor;
@@ -58968,6 +59067,47 @@ class ExchangeAccount {
       }
     };
   }
+  async getSellPriceFromStrategy(payload) {
+    const { symbol, reduce_position } = payload;
+    const symbol_config = await this.recomputeSymbolConfig({
+      symbol
+    });
+    const positions = await this.syncAccount({
+      symbol,
+      as_view: true
+    });
+    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    if (!focus_position) {
+      return;
+    }
+    const strategy = focus_position?.expand?.account_strategy;
+    if (!strategy) {
+      return;
+    }
+    return computeProfitDetail({
+      focus_position: {
+        kind: focus_position.kind,
+        entry: focus_position.entry,
+        quantity: focus_position.quantity,
+        avg_price: focus_position.avg_price,
+        avg_qty: focus_position.avg_qty
+      },
+      strategy: {
+        reward_factor: strategy.reward_factor,
+        risk: strategy.risk,
+        max_reward_factor: strategy.max_reward_factor
+      },
+      reduce_position: {
+        kind: reduce_position.kind,
+        entry: reduce_position.entry,
+        quantity: reduce_position.quantity,
+        avg_price: reduce_position.avg_price,
+        avg_qty: reduce_position.avg_qty
+      },
+      price_places: symbol_config.price_places,
+      decimal_places: symbol_config.decimal_places
+    });
+  }
 }
 function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
@@ -59300,6 +59440,32 @@ class App {
     });
     return result;
   }
+  async reduceExistingPosition(payload) {
+    const { main_account, reduce_account, kind, place, increase } = payload;
+    const main_exchange_account = await this.getExchangeAccount(main_account);
+    const reduce_exchange_account = await this.getExchangeAccount(reduce_account);
+    const reduce_position = await reduce_exchange_account.syncAccount({
+      symbol: reduce_account.symbol,
+      kind,
+      as_view: true
+    });
+    const result = await main_exchange_account.getSellPriceFromStrategy({
+      symbol: main_account.symbol,
+      reduce_position
+    });
+    if (place) {
+      return reduce_exchange_account.exchange.customStopLoss({
+        symbol: reduce_account.symbol,
+        kind: reduce_position.kind,
+        stop: result.sell_price,
+        quantity: result.quantity,
+        price_places: result.price_places,
+        decimal_places: result.decimal_places,
+        increase
+      });
+    }
+    return result;
+  }
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);

package/dist/index.d.ts

@@ -208,9 +208,26 @@ export interface Account {
 		short: any;
 	};
 }
-export interface BaseExchange {
+interface Order$1 {
+	order_id?: string;
+	symbol?: string;
+	price: number;
+	quantity: number;
+	kind: "long" | "short";
+	side: "buy" | "sell";
+	stop: number;
+	triggerPrice?: number;
+}
+declare abstract class BaseExchange {
 	client: any;
-	placeStopOrders(payload: {
+	constructor(client: any);
+	abstract rawCreateLimitPurchaseOrders(payload: {
+		symbol: string;
+		orders: Order$1[];
+		price_places?: string;
+		decimal_places?: string;
+	}): Promise<any>;
+	abstract placeStopOrders(payload: {
 		symbol: string;
 		quantity: number;
 		kind: "long" | "short";
@@ -219,7 +236,7 @@ export interface BaseExchange {
 		decimal_places?: string;
 		place?: boolean;
 	}): Promise<any>;
-	bulkPlaceLimitOrders(payload: {
+	abstract bulkPlaceLimitOrders(payload: {
 		orders: any[];
 		kind: "long" | "short";
 		decimal_places?: string;
@@ -227,14 +244,14 @@ export interface BaseExchange {
 		symbol: string;
 		place?: boolean;
 	}): Promise<any>;
-	get_current_price(symbol: string): Promise<any>;
-	analyzeCharts(payload: {
+	abstract get_current_price(symbol: string): Promise<any>;
+	abstract analyzeCharts(payload: {
 		symbol: string;
 		chartType: any;
 		count: number;
 		raw?: boolean;
 	}): Promise<any>;
-	getExchangeAccountInfo(options: {
+	abstract getExchangeAccountInfo(options: {
 		price_places?: string;
 		decimal_places?: string;
 		account: {
@@ -243,11 +260,11 @@ export interface BaseExchange {
 		};
 		symbol: string;
 	}): Promise<any>;
-	cancelOrders(payload: {
+	abstract cancelOrders(payload: {
 		symbol: string;
 		orders: number[];
 	}): Promise<any>;
-	placeTpOrder(payload: {
+	abstract placeTpOrder(payload: {
 		symbol: string;
 		take_profit: number;
 		kind: "long" | "short";
@@ -256,7 +273,7 @@ export interface BaseExchange {
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
-	placeLimitOrder(payload: {
+	abstract placeLimitOrder(payload: {
 		symbol: string;
 		quantity: number;
 		kind: "long" | "short";
@@ -264,7 +281,7 @@ export interface BaseExchange {
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
-	placeStopOrder(payload: {
+	abstract placeStopOrder(payload: {
 		symbol: string;
 		stop: number;
 		quantity: number;
@@ -272,36 +289,36 @@ export interface BaseExchange {
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
-	setLeverage(payload: {
+	abstract setLeverage(payload: {
 		symbol: string;
 		leverage: number;
 	}): Promise<any>;
-	generateConfig(payload: {
+	abstract generateConfig(payload: {
 		symbol: string;
 		interval?: any;
 		limit?: number;
 	}): Promise<any>;
-	checkDelistedMovers(payload: {
+	abstract checkDelistedMovers(payload: {
 		movePercent: number;
 		include_delisted?: boolean;
 	}): Promise<any>;
-	closePosition(payload: {
+	abstract closePosition(payload: {
 		symbol: string;
 		kind: "long" | "short";
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
-	getAllOpenSymbols(): Promise<string[]>;
-	createLimitPurchaseOrders(payload: {
+	abstract getAllOpenSymbols(): Promise<string[]>;
+	abstract createLimitPurchaseOrders(payload: {
 		orders: any[];
 		kind: "long" | "short";
 		decimal_places?: string;
 		price_places?: string;
 		symbol: string;
 	}): Promise<any>;
-	getDelistedSpotSymbols(): Promise<any>;
-	getOpenPositions(): Promise<any>;
-	crossAccountTransfer(payload: {
+	abstract getDelistedSpotSymbols(): Promise<any>;
+	abstract getOpenPositions(): Promise<any>;
+	abstract crossAccountTransfer(payload: {
 		from: {
 			owner: string;
 			wallet: string;
@@ -313,13 +330,22 @@ export interface BaseExchange {
 		asset: string;
 		amount: number;
 	}): Promise<any>;
-	placeMarketOrder(payload: {
+	abstract placeMarketOrder(payload: {
 		symbol: string;
 		kind: "long" | "short";
 		quantity: number;
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
+	customStopLoss(payload: {
+		price_places: string;
+		decimal_places: string;
+		symbol: string;
+		kind: "long" | "short";
+		stop: number;
+		quantity: number;
+		increase?: boolean;
+	}): Promise<any>;
 }
 declare function initPocketBaseClient(proxy_credentials: {
 	host: string;
@@ -1029,6 +1055,38 @@ export declare function getRiskReward(payload: {
 	risk: number;
 	global_config: GlobalConfig;
 }): any;
+export declare function computeProfitDetail(payload: {
+	focus_position: {
+		kind: "long" | "short";
+		entry: number;
+		quantity: number;
+		avg_qty: number;
+		avg_price: number;
+	};
+	strategy: {
+		reward_factor: number;
+		max_reward_factor: number;
+		risk: number;
+	};
+	reduce_position: {
+		kind: "long" | "short";
+		entry: number;
+		quantity: number;
+		avg_qty: number;
+		avg_price: number;
+	};
+	price_places?: string;
+	decimal_places?: string;
+}): {
+	pnl: number;
+	reward_factor: number;
+	profit_percent: number;
+	kind: "long" | "short";
+	sell_price: number;
+	quantity: number;
+	price_places: string;
+	decimal_places: string;
+};
 declare class ExchangePosition {
 	exchange: BaseExchange;
 	exchange_account: ExchangeAccount$1;
@@ -1728,8 +1786,16 @@ declare class ExchangeAccount$1 {
 		};
 		reverse_orders_to_buy: any;
 		positions: {
-			long: PositionsView;
-			short: PositionsView;
+			long: PositionsView & {
+				expand?: {
+					account_strategy?: AccountStrategy;
+				};
+			};
+			short: PositionsView & {
+				expand?: {
+					account_strategy?: AccountStrategy;
+				};
+			};
 		};
 		orders_to_place: any;
 		config_details: {
@@ -1779,6 +1845,19 @@ declare class ExchangeAccount$1 {
 			pnl: number;
 		};
 	}>;
+	getSellPriceFromStrategy(payload: {
+		symbol: string;
+		reduce_position: PositionsView;
+	}): Promise<{
+		pnl: number;
+		reward_factor: number;
+		profit_percent: number;
+		kind: "long" | "short";
+		sell_price: number;
+		quantity: number;
+		price_places: string;
+		decimal_places: string;
+	}>;
 }
 declare function getExchangeAccount(payload: {
 	account: ExchangeType;
@@ -1942,8 +2021,16 @@ declare class App {
 		};
 		reverse_orders_to_buy: any;
 		positions: {
-			long: PositionsView;
-			short: PositionsView;
+			long: PositionsView & {
+				expand?: {
+					account_strategy?: AccountStrategy;
+				};
+			};
+			short: PositionsView & {
+				expand?: {
+					account_strategy?: AccountStrategy;
+				};
+			};
 		};
 		orders_to_place: any;
 		config_details: {
@@ -1993,6 +2080,17 @@ declare class App {
 			pnl: number;
 		};
 	}>;
+	reduceExistingPosition(payload: {
+		main_account: ExchangeType & {
+			symbol: string;
+		};
+		reduce_account: ExchangeType & {
+			symbol: string;
+		};
+		kind: "long" | "short";
+		place?: boolean;
+		increase?: boolean;
+	}): Promise<any>;
 }
 export declare function initApp(payload: {
 	db: {