@gbozee/ultimate 0.0.2-24 → 0.0.2-27

package/dist/index.d.ts

@@ -133,6 +133,7 @@ export interface BaseExchange {
 	}): Promise<any>;
 	checkDelistedMovers(payload: {
 		movePercent: number;
+		include_delisted?: boolean;
 	}): Promise<any>;
 	closePosition(payload: {
 		symbol: string;
@@ -149,6 +150,7 @@ export interface BaseExchange {
 		symbol: string;
 	}): Promise<any>;
 	getDelistedSpotSymbols(): Promise<any>;
+	getOpenPositions(): Promise<any>;
 }
 export interface BaseSystemFields {
 	id: string;
@@ -169,9 +171,11 @@ export interface ExchangeAccount extends BaseSystemFields {
 	totalRisk?: number;
 	max_non_essential?: number;
 	profit_percent?: number;
+	risk_reward?: number;
 	exclude_coins?: {
 		bullish?: string[];
 	};
+	include_delisted?: boolean;
 }
 export interface SymbolConfig extends BaseSystemFields {
 	symbol: string;
@@ -392,7 +396,10 @@ export declare class AppDatabase {
 		strategy_instance: Strategy;
 		focus_account: ExchangeAccount;
 	}>;
-	createOrUpdateWindingDownMarket(symbol: string): Promise<import("pocketbase").RecordModel>;
+	createOrUpdateWindingDownMarket(payload: {
+		symbol: string;
+		risk_reward?: number;
+	}): Promise<import("pocketbase").RecordModel>;
 	getWindingDownMarkets(symbol?: string): Promise<WindingDownMarket[]>;
 	getBullishMarket(symbol: string): Promise<BullishMarket>;
 	getBullishMarkets(options?: {
@@ -788,14 +795,23 @@ declare class ExchangeAccount$1 {
 		kind: "long" | "short";
 		place?: boolean;
 		tp?: boolean;
+		raw?: boolean;
+		cancel?: boolean;
 	}): Promise<any>;
 }
 declare class App {
 	app_db: AppDatabase;
+	proxyOptions?: {
+		proxy?: any;
+		ignore_proxy?: boolean;
+	};
 	private getCredentials;
 	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => {
 		api_key: string;
 		api_secret: string;
+	}, proxyOptions?: {
+		proxy?: any;
+		ignore_proxy?: boolean;
 	});
 	getExchangeAccount(account: ExchangeType): Promise<ExchangeAccount$1>;
 	syncAccount(payload: {
@@ -891,6 +907,15 @@ declare class App {
 			account: ExchangeType;
 		}) => Promise<any>;
 	}): Promise<void>;
+	placeTrade(payload: {
+		account: ExchangeType;
+		symbol: string;
+		kind: "long" | "short";
+		place?: boolean;
+		tp?: boolean;
+		cancel?: boolean;
+		raw?: boolean;
+	}): Promise<any>;
 }
 export declare function initApp(payload: {
 	db: {
@@ -903,8 +928,14 @@ export declare function initApp(payload: {
 		api_key: string;
 		api_secret: string;
 	};
+	proxy?: any;
+	ignore_proxy?: boolean;
+}): Promise<App>;
+export declare function initialize(payload: {
+	password?: string;
+	proxy?: any;
+	ignore_proxy?: boolean;
 }): Promise<App>;
-export declare function initialize(password?: string): Promise<App>;
 
 export {
 	ExchangeAccount$1 as ExchangeAccount,

package/dist/index.js

@@ -32527,6 +32527,9 @@ class AppDatabase {
           place_tp: payload.place_tp !== undefined ? payload.place_tp : true,
           profit: payload.profit !== undefined ? payload.profit : config.profit
         });
+        await this.update_db_position(db_position, {
+          config: config.id
+        });
         for (const _config of configs) {
           if (_config.id !== config.id) {
             await this.pb.collection("scheduled_trades").delete(_config.id);
@@ -32571,14 +32574,15 @@ class AppDatabase {
     }
     return null;
   }
-  async createOrUpdateWindingDownMarket(symbol) {
+  async createOrUpdateWindingDownMarket(payload) {
+    const { symbol, risk_reward = 30 } = payload;
     const existing_winding_down_market = await this.pb.collection("winding_down_markets").getFullList({
       filter: `symbol:lower="${symbol.toLowerCase()}"`
     });
     if (existing_winding_down_market.length > 0) {
       return existing_winding_down_market[0];
     }
-    return await this.pb.collection("winding_down_markets").create({ symbol, risk_reward: 199 });
+    return await this.pb.collection("winding_down_markets").create({ symbol, risk_reward });
   }
   async getWindingDownMarkets(symbol) {
     const result = await this.pb.collection("winding_down_markets").getFullList();
@@ -32628,7 +32632,9 @@ class AppDatabase {
         console.log(`Processing ${market.symbol} for winding down.`);
         recordsToDeleteFromBullish.push(market.id);
         try {
-          const windingDownRecord = await this.createOrUpdateWindingDownMarket(market.symbol);
+          const windingDownRecord = await this.createOrUpdateWindingDownMarket({
+            symbol: market.symbol
+          });
           if (windingDownRecord) {
             moved_to_winding.push(windingDownRecord);
             windDownCreatedCount++;
@@ -32655,11 +32661,15 @@ class AppDatabase {
     let updatedCount = 0;
     let createdMarkets = [];
     const recordsToDeleteFromWindingDown = [];
+    console.log("new_markets", new_markets);
     if (totalRisk <= 0) {
       console.warn("Total percent movement is zero or negative. Cannot allocate risk.");
     } else {
+      const cumulative_risk = new_markets.reduce((acc, curr) => {
+        return acc + curr.percent;
+      }, 0);
       for (const newMarket of new_markets) {
-        const calculatedRisk = newMarket.percent / totalRisk * totalRisk;
+        const calculatedRisk = newMarket.percent / cumulative_risk * totalRisk;
         if (currentWindingDownSymbols.has(newMarket.symbol)) {
           console.log(`Marking ${newMarket.symbol} for removal from winding down markets as it is now bullish.`);
           const windingDownRecord = currentWindingDown.find((w) => w.symbol === newMarket.symbol);
@@ -33789,16 +33799,20 @@ function createGapPairs(arr, gap, item) {
 async function initClient(credentials, options) {
   const { proxyAgent, type = "future" } = options || {};
   try {
+    const axiosOptions = proxyAgent ? {
+      httpAgent: proxyAgent,
+      httpsAgent: proxyAgent
+    } : undefined;
+    if (!proxyAgent) {
+      console.log("using no proxy");
+    }
     const Klass = type === "future" ? import_binance.USDMClient : type === "spot" ? import_binance.MainClient : import_binance.MainClient;
     const client = new Klass({
       api_key: credentials.api_key,
       api_secret: credentials.api_secret,
       recvWindow: 1e4,
       beautifyResponses: true
-    }, {
-      httpAgent: proxyAgent,
-      httpsAgent: proxyAgent
-    });
+    }, axiosOptions);
     return client;
   } catch (e2) {
     console.log(e2);
@@ -34552,7 +34566,7 @@ class BinanceExchange {
     });
     const _activeSymbols = await getActiveSymbols({ client: this.client });
     const activeSymbols = _activeSymbols.map((s2) => s2.symbol);
-    const delisted = movers.map((x) => x.symbol).filter((symbol) => !activeSymbols.includes(symbol));
+    const delisted = payload.include_delisted ? [] : movers.map((x) => x.symbol).filter((symbol) => !activeSymbols.includes(symbol));
     const validMovers = movers.filter((m) => !delisted.includes(m.symbol)).filter((m) => activeSymbols.includes(m.symbol));
     const activeMovers = [];
     const isActivePromises = validMovers.map(async (m) => {
@@ -34599,6 +34613,10 @@ class BinanceExchange {
     }
     return [];
   }
+  async getOpenPositions() {
+    const response = await this.client.getPositionsV3();
+    return Array.from(new Set(response.map((x) => x.symbol)));
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -34614,14 +34632,15 @@ var import_bybit_api = __toESM(require_lib2(), 1);
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
+    const axiosOptions = proxyAgent ? {
+      httpAgent: proxyAgent,
+      httpsAgent: proxyAgent
+    } : undefined;
     const client = new import_bybit_api.RestClientV5({
       key: credentials.api_key,
       secret: credentials.api_secret,
       recv_window: 1e4
-    }, {
-      httpAgent: proxyAgent,
-      httpsAgent: proxyAgent
-    });
+    }, axiosOptions);
     return client;
   } catch (e2) {
     console.log(e2);
@@ -35247,6 +35266,9 @@ class BybitExchange {
   async getAllOpenSymbols() {
     return [];
   }
+  async getOpenPositions() {
+    return [];
+  }
   async createLimitPurchaseOrders(payload) {
     const {
       orders,
@@ -36959,6 +36981,9 @@ class ExchangeAccount {
       return false;
     }
     const db_instance = await this.app_db.get_exchange_db_instance(this.instance);
+    if (!db_instance.bullish) {
+      return false;
+    }
     if (db_instance.profit_percent) {
       profit_percent = db_instance.profit_percent;
     }
@@ -36970,18 +36995,21 @@ class ExchangeAccount {
     const long_config = await this.buildConfigForSymbol({
       symbol,
       risk: bullish_instance.risk,
-      risk_reward
+      risk_reward: db_instance.risk_reward || risk_reward
     });
     let changed = false;
     if (!position2?.config) {
-      await this.buildAppConfig({
-        entry: long_config.entry,
-        stop: long_config.stop,
-        risk_reward: long_config.risk_reward,
-        risk: long_config.risk,
+      await this.getPositionConfig({
         symbol,
-        profit_percent,
-        update_db: true
+        kind: "long",
+        params: {
+          entry: long_config.entry,
+          stop: long_config.stop,
+          risk_reward: long_config.risk_reward,
+          risk: long_config.risk,
+          profit_percent,
+          place_tp: true
+        }
       });
       changed = true;
     } else {
@@ -37048,12 +37076,28 @@ class ExchangeAccount {
       no_position: true,
       kind: "long"
     });
-    const all_open_symbols = await this.exchange.getAllOpenSymbols();
+    const all_open_symbols = await this.exchange.getOpenPositions();
     await new Promise((resolve) => setTimeout(resolve, interval * 1000));
     for (const symbol of Array.from(new Set(symbols.concat(all_open_symbols)))) {
       await this.getLiveExchangeInstance({ symbol, refresh: true });
       await new Promise((resolve) => setTimeout(resolve, 1000));
     }
+    for (const symbol of all_open_symbols) {
+      await this.syncAccount({
+        symbol,
+        update: true
+      });
+      await this.syncOrders({
+        symbol,
+        kind: "long",
+        update: true
+      });
+      await this.syncOrders({
+        symbol,
+        kind: "short",
+        update: true
+      });
+    }
   }
   async updateAllPositionsWithNoConfig(payload) {
     const { kind } = payload;
@@ -37083,7 +37127,7 @@ class ExchangeAccount {
   }
   async getNonEssentialSymbols() {
     const [all_open_symbols, essential_symbols] = await Promise.all([
-      this.exchange.getAllOpenSymbols(),
+      this.exchange.getOpenPositions(),
       this.app_db.getAllSymbolConfigs({
         custom_filter: `essential = true`
       })
@@ -37095,15 +37139,16 @@ class ExchangeAccount {
     const bullish_symbols = Array.from(new Set(bullish_markets.updated_bullish.map((m) => m.symbol)));
     const symbols = Array.from(new Set(essential_symbols.map((s2) => s2.symbol))).concat(bullish_symbols);
     const not_symbols_filter = symbols.map((s2) => `symbol:lower != "${s2.toLowerCase()}"`).join(" && ");
+    let filters = not_symbols_filter ? `${not_symbols_filter} && account.owner:lower = "${this.instance.owner.toLowerCase()}" && account.exchange:lower = "${this.instance.exchange.toLowerCase()}"` : `account.owner:lower = "${this.instance.owner.toLowerCase()}" && account.exchange:lower = "${this.instance.exchange.toLowerCase()}"`;
     const positions = await this.app_db.getPositions({
-      custom_filter: `${not_symbols_filter} && account.owner:lower = "${this.instance.owner.toLowerCase()}" && account.exchange:lower = "${this.instance.exchange.toLowerCase()}"`,
+      custom_filter: filters,
       symbol: "",
       account: {
         owner: "",
         exchange: ""
       }
     });
-    return Array.from(new Set(positions.map((p) => p.symbol).concat(non_essential_symbols)));
+    return Array.from(new Set(positions.map((p) => p.symbol).concat(non_essential_symbols))).filter((k) => !["BTCUSDT", "BTCUSDC"].includes(k));
   }
   async _terminatePositions(payload) {
     const { symbol } = payload;
@@ -37301,6 +37346,9 @@ class ExchangeAccount {
         symbol,
         kind: "short"
       });
+      await this.app_db.update_db_position(short_position, {
+        config: null
+      });
     }
     if (long_position && short_position && long_position.quantity === 0 && short_position.quantity === 0) {
       await this.cancelOrders({
@@ -37322,26 +37370,31 @@ class ExchangeAccount {
     const db_instance = await this.app_db.get_exchange_db_instance(this.instance);
     const {
       bullish,
-      bearish: _bearish,
+      bearish,
       movePercent,
       totalRisk,
       max_non_essential = 0,
-      exclude_coins
+      exclude_coins,
+      include_delisted = false
     } = db_instance;
     let dont_trade = exclude_coins?.bullish || [];
     let bullishMarkets = [];
     if (bullish) {
       const { movers } = await this.exchange.checkDelistedMovers({
-        movePercent
+        movePercent,
+        include_delisted
       });
       bullishMarkets = movers;
     }
     const non_essential_symbols = await this.getNonEssentialSymbols();
     let symbols_to_remove = non_essential_symbols.filter((k) => !bullishMarkets.map((m) => m.symbol).includes(k)).slice(0, max_non_essential).concat(dont_trade);
+    symbols_to_remove = Array.from(new Set(symbols_to_remove));
     bullishMarkets = bullishMarkets.filter((m) => !symbols_to_remove.includes(m.symbol));
-    if (symbols_to_remove.length > 0) {
-      for (const symbol of symbols_to_remove) {
-        await this.terminatePositions({ symbol });
+    if (bearish) {
+      if (symbols_to_remove.length > 0) {
+        for (const symbol of symbols_to_remove) {
+          await this.terminatePositions({ symbol });
+        }
       }
     }
     const result = await this.app_db.getBullishMarkets({
@@ -37352,7 +37405,7 @@ class ExchangeAccount {
       totalRisk,
       max_count: max_non_essential
     });
-    if (result.updated_bullish.length > max_non_essential) {
+    if (result.updated_bullish.length > max_non_essential || !bullish) {
       return {
         updated_bullish: [],
         moved_to_winding: []
@@ -37393,11 +37446,18 @@ class ExchangeAccount {
     return 0;
   }
   async placeTrade(payload) {
-    const { symbol, kind, place, tp } = payload;
+    const { symbol, kind, place, tp, raw: _raw, cancel } = payload;
+    if (cancel) {
+      await this.cancelOrders({
+        symbol,
+        kind
+      });
+    }
     if (place) {
       return await this.triggerTradeFromConfig({
         symbol,
-        kind
+        kind,
+        raw: payload.raw
       });
     }
     await this.syncAccount({
@@ -37446,8 +37506,9 @@ function getExchangeKlass(exchange) {
   };
 }
 async function getExchangeAccount(payload) {
-  const { account, app_db } = payload;
-  const proxyAgent = await app_db.getProxyForAccount(account);
+  const { account, app_db, proxyOptions = {} } = payload;
+  const _proxyAgent = await app_db.getProxyForAccount(account);
+  const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
     getCredentials: payload.getCredentials,
@@ -37462,16 +37523,19 @@ async function getExchangeAccount(payload) {
 // src/app.ts
 class App {
   app_db;
+  proxyOptions;
   getCredentials;
-  constructor(app_db, getCredentials) {
+  constructor(app_db, getCredentials, proxyOptions) {
     this.app_db = app_db;
     this.getCredentials = getCredentials;
+    this.proxyOptions = proxyOptions;
   }
   async getExchangeAccount(account) {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials
+      getCredentials: this.getCredentials,
+      proxyOptions: this.proxyOptions
     });
   }
   async syncAccount(payload) {
@@ -37821,6 +37885,19 @@ class App {
       }
     }
   }
+  async placeTrade(payload) {
+    const { account, symbol, kind, place, tp, raw, cancel } = payload;
+    const exchange_account = await this.getExchangeAccount(account);
+    const result = await exchange_account.placeTrade({
+      symbol,
+      kind,
+      place,
+      tp,
+      raw,
+      cancel
+    });
+    return result;
+  }
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
@@ -37845,7 +37922,10 @@ async function initApp(payload) {
       console.log("error", error);
     }
   }
-  const app = new App(app_db, _getCredentials);
+  const app = new App(app_db, _getCredentials, {
+    proxy: payload.proxy,
+    ignore_proxy: payload.ignore_proxy
+  });
   return app;
 }
 function getCredentials(account, exchange) {
@@ -37883,7 +37963,8 @@ function getCredentials(account, exchange) {
     api_secret: apiSecret
   };
 }
-async function initialize(password) {
+async function initialize(payload) {
+  const { password, proxy, ignore_proxy } = payload;
   const app = await initApp({
     db: {
       host: process.env.POCKETBASE_HOST,
@@ -37891,7 +37972,9 @@ async function initialize(password) {
       password: process.env.POCKETBASE_PASSWORD
     },
     password,
-    getCredentials
+    getCredentials,
+    proxy,
+    ignore_proxy
   });
   return app;
 }

package/package.json

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