@gbozee/ultimate 0.0.2-107 → 0.0.2-108

package/dist/frontend-index.d.ts

@@ -82,7 +82,7 @@ export type RawPosition = {
 	entry: number;
 	quantity: number;
 	price_places: string;
-	decimal_places: string;
+	decimal_places?: string;
 };
 export type ConfigOptionType = {
 	reduce_ratio: number | string;
@@ -451,6 +451,7 @@ export declare function computeProfitDetail(payload: {
 		max_reward_factor: number;
 		risk: number;
 	};
+	pnl: number;
 	reduce_position?: {
 		kind: "long" | "short";
 		entry: number;

package/dist/frontend-index.js

@@ -152,8 +152,7 @@ class Signal {
       support: kind === "long" ? _stop_loss : this.support
     };
     const instance = new Signal(derivedConfig);
-    if (kind === "short") {
-    }
+    if (kind === "short") {}
     let result = instance.get_bulk_trade_zones({ current_price, kind });
     return result;
     return result?.filter((x) => {
@@ -371,8 +370,7 @@ class Signal {
     kind = "long",
     raw
   }) {
-    if (raw) {
-    }
+    if (raw) {}
     const margin_range = this.get_margin_range(current_price, kind);
     let margin_zones = this.get_margin_zones({ current_price });
     let remaining_zones = margin_zones.filter((x) => JSON.stringify(x) != JSON.stringify(margin_range));
@@ -583,8 +581,7 @@ class Signal {
         return true;
       });
       let total_orders = limit_trades.concat(market_trades);
-      if (kind === "short") {
-      }
+      if (kind === "short") {}
       if (this.minimum_size && total_orders.length > 0) {
         let payload = total_orders;
         let greater_than_min_size = total_orders.filter((o) => o ? o.quantity >= this.minimum_size : true);
@@ -670,8 +667,7 @@ class Signal {
     });
     const multiplier = start - index;
     const incurred_fees = fees.reduce((a, b) => a + b, 0) + previous_risks.reduce((a, b) => a + b, 0);
-    if (index === 0) {
-    }
+    if (index === 0) {}
     let quantity = determine_position_size({
       entry,
       stop,
@@ -837,8 +833,7 @@ function extractValue(_param, condition) {
     try {
       let value2 = JSON.parse(_param || "[]");
       param = value2.map((o) => parseFloat(o));
-    } catch (error) {
-    }
+    } catch (error) {}
   } else {
     param = parseFloat(_param);
   }
@@ -853,8 +848,7 @@ function asCoins(symbol) {
   if (symbol.toLowerCase().includes("-")) {
     result = result.split("-")[0];
   }
-  if (symbol.toLowerCase() == "usdt-usd") {
-  }
+  if (symbol.toLowerCase() == "usdt-usd") {}
   let result2 = _type == "usdt" ? symbol.split(result)[0] : result;
   if (result.includes("-")) {
     result2 = result;
@@ -1243,8 +1237,7 @@ function buildConfig(app_config, {
     return [];
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
-  if (kind === "short") {
-  }
+  if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -1807,24 +1800,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = 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 = to_f(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } 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 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;
@@ -2381,6 +2364,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,