@gbozee/ultimate 0.0.2-51 → 0.0.2-54

package/dist/index.d.ts

@@ -59,7 +59,11 @@ export interface ScheduledTrade extends BaseSystemFields {
 export interface AccountStrategy extends BaseSystemFields {
 	account: string;
 	symbol: string;
-	watch_symbol: string;
+	tp_percent: number;
+	short_tp_factor: number;
+	fee_percent: number;
+	budget: number;
+	risk_reward: number;
 }
 interface Proxy$1 extends BaseSystemFields {
 	ip_address?: string;
@@ -291,6 +295,12 @@ export interface BaseExchange {
 		decimal_places?: string;
 	}): Promise<any>;
 }
+declare function initPocketBaseClient(proxy_credentials: {
+	host: string;
+	email: string;
+	password: string;
+	auto_cancellation?: boolean;
+}): Promise<PocketBase>;
 export type ExchangeType = {
 	owner: string;
 	exchange: string;
@@ -1096,9 +1106,6 @@ declare class ExchangeAccount$1 {
 	}): Promise<ScheduledTrade | import("pocketbase").RecordModel>;
 	getCurrentPrice(symbol: string): Promise<any>;
 	getPositionStrategy(): Promise<AccountStrategy>;
-	toUpdate(payload: {
-		refresh?: boolean;
-	}): Promise<void>;
 	buildReduceConfig(payload: {
 		symbol: string;
 		kind?: "long" | "short";
@@ -1223,6 +1230,11 @@ declare class ExchangeAccount$1 {
 		symbol: string;
 		kind: "long" | "short";
 	}): Promise<number>;
+	getCurrentRun(payload: {
+		symbol: string;
+		kind?: "long" | "short";
+		pnl?: number;
+	}): Promise<true | import("pocketbase").RecordModel>;
 	recomputeSymbolConfig(payload: {
 		symbol: string;
 		refresh?: boolean;
@@ -1292,6 +1304,20 @@ declare class ExchangeAccount$1 {
 		kind: "long" | "short";
 	}): Promise<void>;
 }
+declare function getExchangeAccount(payload: {
+	account: ExchangeType;
+	app_db: AppDatabase;
+	getCredentials: (account: string, exchange: string) => {
+		api_key: string;
+		api_secret: string;
+		email: string;
+	};
+	proxyOptions?: {
+		proxy?: any;
+		ignore_proxy?: boolean;
+	};
+	canWithdraw?: boolean;
+}): Promise<ExchangeAccount$1>;
 declare class App {
 	app_db: AppDatabase;
 	proxyOptions?: {
@@ -1424,6 +1450,11 @@ export declare function initApp(payload: {
 	canWithdraw?: boolean;
 	triggerToken?: string;
 }): Promise<App>;
+declare function getCredentials(account: string, exchange: string): {
+	api_key: string;
+	api_secret: string;
+	email: string;
+};
 export declare function initialize(payload: {
 	password?: string;
 	proxy?: any;
@@ -1435,13 +1466,11 @@ export type StrategyPosition = {
 	quantity: number;
 };
 export type Config = {
-	leverage: number;
 	tp_percent: number;
 	short_tp_factor: number;
-	price_places: string;
-	decimal_places: string;
 	fee_percent?: number;
 	budget: number;
+	risk_reward: number;
 	global_config: GlobalConfig;
 };
 export declare class Strategy {
@@ -1455,6 +1484,8 @@ export declare class Strategy {
 		short: StrategyPosition;
 		config: Config;
 	});
+	get price_places(): string;
+	get decimal_places(): string;
 	to_f(price: number): number;
 	to_df(quantity: number): number;
 	pnl(kind: "long" | "short"): number;
@@ -1467,10 +1498,10 @@ export declare class Strategy {
 	get short_tp(): number;
 	generateGapClosingAlgorithm(payload: {
 		kind: "long" | "short";
-		risk_reward?: number;
 	}): {
 		[x: string]: any;
 		risk: number;
+		risk_reward: number;
 		last_entry: any;
 		first_entry: any;
 		threshold: any;
@@ -1482,14 +1513,28 @@ export declare class Strategy {
 	}): {
 		[x: string]: any;
 		risk: number;
+		risk_reward: number;
 		last_entry: any;
 		first_entry: any;
 		threshold: any;
 	}[];
 }
 
+declare namespace database {
+	export { AppDatabase, ExchangeType, initPocketBaseClient };
+}
+declare namespace exchange_account {
+	export { ExchangeAccount$1 as ExchangeAccount, getExchangeAccount };
+}
+declare namespace app {
+	export { App, getCredentials, initApp, initialize };
+}
+
 export {
 	ExchangeAccount$1 as ExchangeAccount,
+	app,
+	database,
+	exchange_account,
 };
 
 export {};

package/dist/index.js

@@ -41711,6 +41711,15 @@ var require_lib3 = __commonJS((exports) => {
   __exportStar(require_enum(), exports);
 });
 
+// src/app.ts
+var exports_app = {};
+__export(exports_app, {
+  initialize: () => initialize,
+  initApp: () => initApp,
+  getCredentials: () => getCredentials,
+  App: () => App
+});
+
 // node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -50103,6 +50112,11 @@ function configure(options) {
   apiClientManager.setGlobalAPIClientConfiguration(options);
 }
 // src/database.ts
+var exports_database = {};
+__export(exports_database, {
+  initPocketBaseClient: () => initPocketBaseClient,
+  AppDatabase: () => AppDatabase
+});
 var import_https_proxy_agent = __toESM(require_dist2(), 1);
 import {
   createCipheriv as createCipheriv3,
@@ -51989,6 +52003,13 @@ class AppDatabase {
   }
 }
 
+// src/exchange-account.ts
+var exports_exchange_account = {};
+__export(exports_exchange_account, {
+  getExchangeAccount: () => getExchangeAccount,
+  ExchangeAccount: () => ExchangeAccount
+});
+
 // src/exchanges/binance.ts
 var import_binance = __toESM(require_lib2(), 1);
 
@@ -56487,23 +56508,6 @@ class ExchangeAccount {
   async getPositionStrategy() {
     return await this.app_db.getPositionStrategy(this.instance);
   }
-  async toUpdate(payload) {
-    const { refresh } = payload;
-    const strategy = await this.getPositionStrategy();
-    if (!strategy) {
-      return;
-    }
-    const { symbol: _symbol, watch_symbol } = strategy;
-    const watch_positions = await this.syncAccount({
-      symbol: watch_symbol,
-      live_refresh: refresh,
-      update: true
-    });
-    const long_watch_position = watch_positions.find((x) => x.kind === "long");
-    const short_watch_position = watch_positions.find((x) => x.kind === "short");
-    if (long_watch_position.quantity === short_watch_position.quantity && long_watch_position.quantity > 0) {
-    }
-  }
   async buildReduceConfig(payload) {
     const positions = await this.syncAccount({
       symbol: payload.symbol
@@ -57061,6 +57065,38 @@ class ExchangeAccount {
     }
     return 0;
   }
+  async getCurrentRun(payload) {
+    const { symbol, kind = "long", pnl } = payload;
+    const instances = await this.app_db.pb.collection("strategy_runs").getFullList({
+      filter: `account.owner:lower = "${this.instance.owner.toLowerCase()}" && account.exchange:lower = "${this.instance.exchange.toLowerCase()}" && symbol = "${symbol}" && kind = "${kind}" && completed = false`
+    });
+    if (instances.length > 0) {
+      const instance = instances[0];
+      if (!pnl) {
+        return instance;
+      }
+      await this.app_db.pb.collection("strategy_runs").update(instance.id, {
+        completed: true,
+        pnl
+      });
+      return true;
+    }
+    const position2 = await this.syncAccount({
+      symbol,
+      kind
+    });
+    if (position2.quantity == 0) {
+      return null;
+    }
+    return await this.app_db.pb.collection("strategy_runs").create({
+      account: position2.account,
+      symbol,
+      kind,
+      entry: position2.entry,
+      quantity: position2.quantity,
+      completed: false
+    });
+  }
   async recomputeSymbolConfig(payload) {
     const { symbol, refresh = false } = payload;
     const _config = await this.app_db.getSymbolConfigFromDB(symbol);
@@ -58084,11 +58120,17 @@ class Strategy {
       this.config.fee_percent = 0.05;
     }
   }
+  get price_places() {
+    return this.config.global_config.price_places;
+  }
+  get decimal_places() {
+    return this.config.global_config.decimal_places;
+  }
   to_f(price) {
-    return to_f(price, this.config.price_places);
+    return to_f(price, this.price_places);
   }
   to_df(quantity) {
-    return to_f(quantity, this.config.decimal_places);
+    return to_f(quantity, this.decimal_places);
   }
   pnl(kind) {
     const position2 = this.position[kind];
@@ -58120,15 +58162,20 @@ class Strategy {
     return this.tp("short");
   }
   generateGapClosingAlgorithm(payload) {
-    const { kind, risk_reward = 199 } = payload;
+    const { kind } = payload;
     const { entry, quantity } = this.position[kind];
     const focus_position = this.position[kind];
     const reverse_kind = kind == "long" ? "short" : "long";
     const reverse_position = this.position[reverse_kind];
+    let _entry = this.tp(kind);
+    let _stop = this.tp(reverse_kind);
+    if (!_entry && !_stop) {
+      return null;
+    }
     const second_payload = {
-      entry: this.tp(kind),
-      stop: this.tp(reverse_kind),
-      risk_reward,
+      entry: _entry,
+      stop: _stop,
+      risk_reward: this.config.risk_reward,
       start_risk: this.pnl(reverse_kind),
       max_risk: this.config.budget
     };
@@ -58205,6 +58252,7 @@ class Strategy {
     const remaining_quantity = this.to_df(avg.quantity - quantity_to_sell);
     return {
       risk,
+      risk_reward: this.config.risk_reward,
       [kind]: {
         avg_entry: avg.entry,
         avg_size: avg.quantity,
@@ -58229,7 +58277,7 @@ class Strategy {
     };
   }
   runIterations(payload) {
-    const { kind, iterations, risk_reward = 199 } = payload;
+    const { kind, iterations } = payload;
     const reverse_kind = kind == "long" ? "short" : "long";
     const result = [];
     let position2 = {
@@ -58246,8 +58294,7 @@ class Strategy {
         }
       });
       const algorithm = instance.generateGapClosingAlgorithm({
-        kind,
-        risk_reward
+        kind
       });
       if (!algorithm) {
         console.log("No algorithm found");
@@ -58275,13 +58322,16 @@ export {
   getOptimumStopAndRisk,
   generate_config_params,
   generateOptimumAppConfig,
+  exports_exchange_account as exchange_account,
   determine_break_even_price,
   determine_average_entry_and_size,
   determine_amount_to_buy,
+  exports_database as database,
   createArray,
   buildConfig,
   buildAvg,
   buildAppConfig,
+  exports_app as app,
   Strategy,
   ExchangeAccount,
   AppDatabase

package/package.json

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