@gbozee/ultimate 0.0.2-83 → 0.0.2-89

package/dist/mcp-server.js

@@ -58632,7 +58632,7 @@ class AppDatabase {
           profit: payload.profit !== undefined ? payload.profit : config2.profit
         });
         await this.update_db_position(db_position, {
-          config: config2.id
+          config: null
         });
         for (const _config of configs) {
           if (_config.id !== config2.id) {
@@ -58654,7 +58654,7 @@ class AppDatabase {
         });
       }
       await this.pb.collection("positions").update(db_position.id, {
-        config: config2?.id
+        config: null
       });
       return config2;
     }
@@ -58668,9 +58668,17 @@ class AppDatabase {
     }
     return null;
   }
-  async getPositionStrategy(account) {
+  async getRunningAccountStrategies() {
+    const result = await this.pb.collection("account_strategies").getFullList({
+      filter: `running=true`,
+      expand: "account"
+    });
+    return result;
+  }
+  async getAccountStrategy(payload) {
+    const { symbol, account } = payload;
     const _strategy_instance = await this.pb.collection("account_strategies").getFullList({
-      filter: `account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}"`,
+      filter: `symbol:lower="${symbol.toLowerCase()}" && account.owner:lower="${account.owner.toLowerCase()}" && account.exchange:lower="${account.exchange.toLowerCase()}"`,
       expand: "account"
     });
     if (_strategy_instance.length > 0) {
@@ -64066,8 +64074,11 @@ class ExchangeAccount {
   async getCurrentPrice(symbol) {
     return await this.exchange.get_current_price(symbol);
   }
-  async getPositionStrategy() {
-    return await this.app_db.getPositionStrategy(this.instance);
+  async getAccountStrategy(payload) {
+    return await this.app_db.getAccountStrategy({
+      symbol: payload.symbol,
+      account: this.instance
+    });
   }
   async buildReduceConfig(payload) {
     const positions = await this.syncAccount({
@@ -65393,6 +65404,196 @@ class ExchangeAccount {
       });
     }
   }
+  async profitWithinGapStrategy(payload) {
+    const {
+      symbol,
+      kind,
+      risk,
+      resistance,
+      support,
+      reward_factor = 1
+    } = payload;
+    console.log("Getting entry and stop for ", symbol, kind);
+    const entry = kind === "long" ? resistance : support;
+    const stop = kind === "long" ? support : resistance;
+    console.log("Building app config for ", symbol, kind);
+    const initial_app_config = await this.buildAppConfig({
+      entry,
+      stop,
+      risk_reward: 199,
+      risk,
+      symbol
+    });
+    console.log("Computing risk reward for ", symbol, kind);
+    const risk_reward = computeRiskReward({
+      app_config: initial_app_config,
+      entry: initial_app_config.entry,
+      stop: initial_app_config.stop,
+      risk_per_trade: initial_app_config.risk_per_trade
+    });
+    console.log("Re-computing app config for ", symbol, kind);
+    const { entries, last_value, ...app_config } = await this.buildAppConfig({
+      entry: initial_app_config.entry,
+      stop: initial_app_config.stop,
+      risk_reward,
+      risk,
+      symbol
+    });
+    console.log("Computing profit percent for ", symbol, kind);
+    const pnl = reward_factor * risk;
+    const profit_percent = to_f2(pnl * 100 / (last_value.avg_entry * last_value.avg_size), "%.4f");
+    let config2 = {
+      entry,
+      stop,
+      risk,
+      risk_reward,
+      profit_percent
+    };
+    console.log("Saving new config for ", symbol, kind);
+    const data = await this.getPositionConfig({
+      symbol,
+      kind,
+      params: config2
+    });
+    console.log("Checking orders to place for ", symbol, kind);
+    const orders_to_place = await this.placeTrade({
+      symbol,
+      raw: true,
+      kind,
+      place: false,
+      ignore_config: true
+    });
+    await this.placeTrade({
+      symbol,
+      kind,
+      limit: false,
+      ignore_config: true,
+      tp: true
+    });
+    config2 = {
+      ...config2,
+      ...data
+    };
+    console.log("Fetching positions for ", symbol);
+    const positions = await this.syncAccount({
+      symbol,
+      as_view: true
+    });
+    console.log("Getting long and short positions for ", symbol);
+    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;
+    let reverse_action = null;
+    let reverse_orders_to_buy = [];
+    let reverse_config = null;
+    if (focus_position.avg_qty < last_value.avg_size) {
+      console.log("Placing trade for ", symbol, kind);
+      await this.placeTrade({
+        symbol,
+        kind,
+        ignore_config: true,
+        place: true
+      });
+    }
+    console.log("Checking if focus position has quantity for ", symbol, kind);
+    if (focus_position.quantity > 0) {
+      console.log("Getting details for ", reverse_position.kind);
+      reverse_action = await this.buildOppositeTrades({
+        symbol,
+        kind
+      });
+      console.log("Updating config for ", symbol, reverse_action.kind);
+      await this.getPositionConfig({
+        symbol,
+        kind: reverse_action.kind,
+        params: {
+          entry: reverse_action.entry,
+          stop: reverse_action.stop,
+          risk: reverse_action.risk_per_trade,
+          profit_percent: reverse_action.profit_percent,
+          risk_reward: reverse_action.risk_reward
+        }
+      });
+      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
+      const reverse_app_config = await this.buildAppConfig({
+        entry: reverse_action.entry,
+        stop: reverse_action.stop,
+        risk_reward: reverse_action.risk_reward,
+        risk: reverse_action.risk_per_trade,
+        symbol
+      });
+      if (reverse_app_config.max_size != reverse_position.avg_qty) {
+        reverse_orders_to_buy = await this.placeTrade({
+          symbol,
+          raw: true,
+          kind: reverse_action.kind,
+          ignore_config: true,
+          place: false
+        });
+        let _reverse_config = {
+          avg: reverse_action.avg,
+          entry: reverse_action.entry,
+          stop: reverse_action.stop,
+          risk_per_trade: reverse_action.risk_per_trade,
+          profit_percent: reverse_action.profit_percent,
+          risk_reward: reverse_action.risk_reward
+        };
+        if (reverse_orders_to_buy.length > 0) {
+          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
+          let existing = await this.placeOppositeTradeAction({
+            symbol,
+            kind: reverse_action.kind,
+            data: _reverse_config
+          });
+          _reverse_config = {
+            ...existing,
+            ..._reverse_config
+          };
+        }
+        reverse_config = _reverse_config;
+      }
+      if (!reverse_config?.id) {
+        console.log("fetching reverse config for ", symbol, reverse_action.kind);
+        reverse_config = await this.getPositionConfig({
+          symbol,
+          kind: reverse_action.kind
+        });
+      }
+      if (reverse_position.quantity > 0 && reverse_config?.id) {
+        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
+        const max_size = app_config.max_size * 0.98;
+        if (reverse_config.threshold_qty !== max_size) {
+          await this.app_db.updateScheduledTrade(reverse_config.id, {
+            follow: true,
+            threshold_qty: max_size
+          });
+        }
+        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
+      } else {
+        await this.app_db.updateScheduledTrade(reverse_config.id, {
+          follow: false
+        });
+      }
+    }
+    return {
+      reverse_config,
+      reverse_action,
+      reverse_orders_to_buy,
+      positions: {
+        long: long_position,
+        short: short_position
+      },
+      orders_to_place,
+      config_details: {
+        app_config,
+        last_value,
+        config: config2,
+        pnl
+      }
+    };
+  }
 }
 function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
@@ -65438,6 +65639,7 @@ async function getExchangeAccount(payload) {
     app_db
   });
 }
+
 // src/app.ts
 class App {
   app_db;
@@ -65658,7 +65860,8 @@ class App {
         await exchange_account.placeTrade({
           symbol,
           kind: "long",
-          tp: true
+          tp: true,
+          limit: false
         });
         await new Promise((resolve) => setTimeout(resolve, 500));
       }
@@ -65705,6 +65908,21 @@ class App {
     });
     return result;
   }
+  async runDbStrategyAccounts(callback) {
+    const strategies = await this.app_db.getRunningAccountStrategies();
+    for (const strategy of strategies) {
+      console.log("Running strategy for ", strategy.symbol, "for account", strategy.expand.account.owner, strategy.expand.account.exchange);
+      await callback({
+        symbol: strategy.symbol,
+        kind: strategy.kind,
+        risk: strategy.risk,
+        resistance: strategy.resistance,
+        support: strategy.support,
+        account: strategy.expand.account,
+        reward_factor: strategy.reward_factor
+      });
+    }
+  }
   async profitWithinGapStrategy(payload) {
     const {
       account,
@@ -65716,168 +65934,15 @@ class App {
       reward_factor = 1
     } = payload;
     const exchange_account = await this.getExchangeAccount(account);
-    console.log("Getting entry and stop for ", symbol, kind);
-    const entry = kind === "long" ? resistance : support;
-    const stop = kind === "long" ? support : resistance;
-    console.log("Building app config for ", symbol, kind);
-    const initial_app_config = await exchange_account.buildAppConfig({
-      entry,
-      stop,
-      risk_reward: 199,
-      risk,
-      symbol
-    });
-    console.log("Computing risk reward for ", symbol, kind);
-    const risk_reward = computeRiskReward({
-      app_config: initial_app_config,
-      entry: initial_app_config.entry,
-      stop: initial_app_config.stop,
-      risk_per_trade: initial_app_config.risk_per_trade
-    });
-    console.log("Re-computing app config for ", symbol, kind);
-    const { entries, last_value, ...app_config } = await exchange_account.buildAppConfig({
-      entry: initial_app_config.entry,
-      stop: initial_app_config.stop,
-      risk_reward,
-      risk,
-      symbol
-    });
-    console.log("Computing profit percent for ", symbol, kind);
-    const pnl = reward_factor * risk;
-    const profit_percent = to_f2(pnl * 100 / (last_value.avg_entry * last_value.avg_size), "%.4f");
-    let config2 = {
-      entry,
-      stop,
-      risk,
-      risk_reward,
-      profit_percent
-    };
-    console.log("Saving new config for ", symbol, kind);
-    const data = await exchange_account.getPositionConfig({
+    const result = await exchange_account.profitWithinGapStrategy({
       symbol,
       kind,
-      params: config2
-    });
-    console.log("Checking orders to place for ", symbol, kind);
-    const orders_to_place = await exchange_account.placeTrade({
-      symbol,
-      raw: true,
-      kind,
-      place: false
-    });
-    config2 = {
-      ...config2,
-      ...data
-    };
-    console.log("Fetching positions for ", symbol);
-    const positions = await exchange_account.syncAccount({
-      symbol,
-      as_view: true
+      risk,
+      resistance,
+      support,
+      reward_factor
     });
-    console.log("Getting long and short positions for ", symbol);
-    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;
-    let reverse_action = null;
-    let reverse_orders_to_buy = [];
-    let reverse_config = null;
-    console.log("Checking if focus position has quantity for ", symbol, kind);
-    if (focus_position.quantity > 0) {
-      console.log("Getting details for ", reverse_position.kind);
-      reverse_action = await exchange_account.buildOppositeTrades({
-        symbol,
-        kind
-      });
-      console.log("Updating config for ", symbol, reverse_action.kind);
-      await exchange_account.getPositionConfig({
-        symbol,
-        kind: reverse_action.kind,
-        params: {
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        }
-      });
-      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
-      const reverse_app_config = await exchange_account.buildAppConfig({
-        entry: reverse_action.entry,
-        stop: reverse_action.stop,
-        risk_reward: reverse_action.risk_reward,
-        risk: reverse_action.risk_per_trade,
-        symbol
-      });
-      if (reverse_app_config.max_size != reverse_position.avg_qty) {
-        reverse_orders_to_buy = await exchange_account.placeTrade({
-          symbol,
-          raw: true,
-          kind: reverse_action.kind,
-          place: false
-        });
-        let _reverse_config = {
-          avg: reverse_action.avg,
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk_per_trade: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        };
-        if (reverse_orders_to_buy.length > 0) {
-          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
-          let existing = await exchange_account.placeOppositeTradeAction({
-            symbol,
-            kind: reverse_action.kind,
-            data: _reverse_config
-          });
-          _reverse_config = {
-            ...existing,
-            ..._reverse_config
-          };
-        }
-        reverse_config = _reverse_config;
-      }
-      if (!reverse_config?.id) {
-        console.log("fetching reverse config for ", symbol, reverse_action.kind);
-        reverse_config = await exchange_account.getPositionConfig({
-          symbol,
-          kind: reverse_action.kind
-        });
-      }
-      if (reverse_position.quantity > 0 && reverse_config?.id) {
-        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
-        const max_size = app_config.max_size * 0.98;
-        if (reverse_config.threshold_qty !== max_size) {
-          await this.app_db.updateScheduledTrade(reverse_config.id, {
-            follow: true,
-            threshold_qty: max_size
-          });
-        }
-        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
-      } else {
-        await this.app_db.updateScheduledTrade(reverse_config.id, {
-          follow: false
-        });
-      }
-    }
-    return {
-      reverse_config,
-      reverse_action,
-      reverse_orders_to_buy,
-      positions: {
-        long: long_position,
-        short: short_position
-      },
-      orders_to_place,
-      config_details: {
-        app_config,
-        last_value,
-        config: config2,
-        pnl
-      }
-    };
+    return result;
   }
 }
 async function initApp(payload) {
@@ -66010,18 +66075,6 @@ async function getPositions(payload) {
     ...payload,
     refresh: true
   });
-  const symbol_config = await exchange_account.recomputeSymbolConfig({
-    symbol: payload.symbol
-  });
-  const strategy2 = await exchange_account.getPositionStrategy();
-  const strategy_config = {
-    tp_percent: strategy2?.tp_percent,
-    short_tp_factor: strategy2?.short_tp_factor,
-    fee_percent: strategy2?.fee_percent,
-    budget: strategy2?.budget,
-    risk_reward: strategy2?.risk_reward,
-    global_config: symbol_config
-  };
   const positions = await exchange_account.syncAccount({
     symbol: payload.symbol,
     as_view: true
@@ -66040,12 +66093,11 @@ async function getPositions(payload) {
       long: long_position,
       short: short_position
     },
-    runs: runs2,
-    strategy_config
+    runs: runs2
   };
 }
 async function fetchExchangeDetails(payload) {
-  const { strategy_config, ...positions } = await getPositions({
+  const { ...positions } = await getPositions({
     symbol: payload.symbol,
     account: payload.account,
     kind: payload.kind

package/package.json

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