@gbozee/ultimate 0.0.2-0 → 0.0.2-3

package/dist/index.d.ts

@@ -2,11 +2,12 @@
 
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import PocketBase from 'pocketbase';
+import { RecordModel } from 'pocketbase';
 import { SocksProxyAgent } from 'socks-proxy-agent';
 
 interface Position$1 {
 	id: number;
-	kind: string;
+	kind: "long" | "short";
 	entry: number;
 	symbol: string;
 	quantity: number;
@@ -16,6 +17,9 @@ interface Position$1 {
 	take_profit: number;
 	tp_quantity: number;
 	stop_quantity: number;
+	target_pnl?: number;
+	reduce_ratio?: number;
+	use_full?: boolean;
 }
 export interface Account {
 	id: number | string;
@@ -114,9 +118,6 @@ export interface BaseExchange {
 		decimal_places?: string;
 	}): Promise<any>;
 }
-/**
- * TypeScript type definitions for PocketBase collections and views
- */
 export interface BaseSystemFields {
 	id: string;
 	created: string;
@@ -204,6 +205,15 @@ export interface PositionsView {
 	avg_liquidation?: any;
 	balance?: any;
 }
+export interface BullishMarket extends RecordModel {
+	id: string;
+	symbol: string;
+	risk: number;
+}
+export interface WindingDownMarket extends RecordModel {
+	id: string;
+	symbol: string;
+}
 export type ExchangeType = {
 	owner: string;
 	exchange: string;
@@ -236,16 +246,16 @@ export declare class AppDatabase {
 			config: ScheduledTrade;
 		};
 	})[]>;
-	update_db_position(position: any, payload: any): Promise<import("pocketbase").RecordModel>;
+	update_db_position(position: any, payload: any): Promise<RecordModel>;
 	getSymbolConfigFromDB(symbol: string): Promise<SymbolConfig>;
 	getRunningInstanceFromDB(account: ExchangeType, symbol: string, options?: {
 		delay?: number;
 	}): Promise<TradeBlockTracking>;
-	updateRunningInstance(id: string, running: boolean): Promise<import("pocketbase").RecordModel>;
+	updateRunningInstance(id: string, running: boolean): Promise<RecordModel>;
 	getOrders(account: ExchangeType, options: {
 		symbol: string;
 		kind: "long" | "short";
-	}): Promise<import("pocketbase").RecordModel[]>;
+	}): Promise<RecordModel[]>;
 	deleteAndRecreateOrders(account: ExchangeType, options: {
 		symbol: string;
 		kind: "long" | "short";
@@ -258,7 +268,7 @@ export declare class AppDatabase {
 		stop: number;
 		order_id: string;
 		triggerPrice?: number;
-	}>): Promise<import("pocketbase").RecordModel[]>;
+	}>): Promise<RecordModel[]>;
 	cancelOrders(payload: {
 		cancelExchangeOrders: (payload: {
 			symbol: string;
@@ -297,11 +307,23 @@ export declare class AppDatabase {
 		symbol: string;
 		kind: "long" | "short";
 		account: ExchangeType;
-	}): Promise<import("pocketbase").RecordModel>;
+	}): Promise<RecordModel>;
 	getPositionStrategy(account: ExchangeType): Promise<{
 		strategy_instance: Strategy;
 		focus_account: ExchangeAccount;
 	}>;
+	createOrUpdateWindingDownMarket(symbol: string): Promise<RecordModel>;
+	getWindingDownMarkets(): Promise<WindingDownMarket[]>;
+	getBullishMarkets(options?: {
+		new_markets: Array<{
+			symbol: string;
+			percent: number;
+		}>;
+		totalRisk: number;
+	}): Promise<{
+		updated_bullish: BullishMarket[];
+		moved_to_winding: WindingDownMarket[];
+	}>;
 }
 export interface CodeNode {
 	minimum_pnl: number;
@@ -484,7 +506,7 @@ declare class ExchangeAccount$1 {
 declare class App {
 	private app_db;
 	private getCredentials;
-	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => (account: string) => Promise<{
+	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => (account: string, exchange: string) => Promise<{
 		api_key: string;
 		api_secret: string;
 	}>);
@@ -599,6 +621,17 @@ declare class App {
 		kind: "long" | "short";
 		revert?: boolean;
 	}): Promise<import("pocketbase").RecordModel[]>;
+	updateTopMovers(payload?: {
+		new_markets: {
+			symbol: string;
+			percent: number;
+		}[];
+		totalRisk: number;
+	}): Promise<{
+		updated_bullish: BullishMarket[];
+		moved_to_winding: WindingDownMarket[];
+	}>;
+	getWindingDownMarkets(): Promise<WindingDownMarket[]>;
 }
 export declare function initApp(payload: {
 	db: {
@@ -606,7 +639,7 @@ export declare function initApp(payload: {
 		email: string;
 		password: string;
 	};
-	getCredentials: (account: string, exchange: string) => (account: string) => Promise<{
+	getCredentials: (account: string, exchange: string) => (account: string, exchange: string) => Promise<{
 		api_key: string;
 		api_secret: string;
 	}>;

package/dist/index.js

@@ -31920,6 +31920,100 @@ class AppDatabase {
     }
     return null;
   }
+  async createOrUpdateWindingDownMarket(symbol) {
+    const existing_winding_down_market = await this.pb.collection("winding_down_markets").getFirstListItem(`symbol:lower="${symbol.toLowerCase()}"`);
+    if (existing_winding_down_market) {
+      return existing_winding_down_market;
+    }
+    return await this.pb.collection("winding_down_markets").create({ symbol });
+  }
+  async getWindingDownMarkets() {
+    return await this.pb.collection("winding_down_markets").getFullList();
+  }
+  async getBullishMarkets(options) {
+    if (!options) {
+      return {
+        updated_bullish: await this.pb.collection("bullish_markets").getFullList(),
+        moved_to_winding: []
+      };
+    }
+    const { new_markets, totalRisk } = options;
+    const newMarketSymbols = new Set(new_markets.map((m) => m.symbol));
+    console.log(`Processing ${new_markets.length} new top movers with total risk ${totalRisk}`);
+    let currentBullish = [];
+    try {
+      currentBullish = await this.pb.collection("bullish_markets").getFullList();
+      console.log(`Found ${currentBullish.length} existing bullish markets.`);
+    } catch (error) {
+      console.error("Error fetching current bullish markets:", error);
+      currentBullish = [];
+    }
+    const currentBullishSymbols = new Set(currentBullish.map((m) => m.symbol));
+    const moved_to_winding = [];
+    const recordsToDeleteFromBullish = [];
+    const windDownPromises = [];
+    for (const market of currentBullish) {
+      if (!newMarketSymbols.has(market.symbol)) {
+        console.log(`Marking ${market.symbol} for winding down.`);
+        recordsToDeleteFromBullish.push(market.id);
+        windDownPromises.push(this.createOrUpdateWindingDownMarket(market.symbol));
+      }
+    }
+    if (windDownPromises.length > 0) {
+      try {
+        const createdWindingDown = await Promise.all(windDownPromises);
+        moved_to_winding.push(...createdWindingDown);
+        console.log(`Successfully created ${moved_to_winding.length} records in winding_down_markets.`);
+        const deletePromises = [];
+        for (const id of recordsToDeleteFromBullish) {
+          deletePromises.push(this.pb.collection("bullish_markets").delete(id));
+        }
+        await Promise.all(deletePromises);
+        console.log(`Successfully deleted ${recordsToDeleteFromBullish.length} records from bullish_markets.`);
+      } catch (error) {
+        console.error("Error moving markets to winding down:", error);
+      }
+    }
+    const totalPercent = new_markets.reduce((sum, market) => sum + (market.percent || 0), 0);
+    let updatedCount = 0;
+    const createdMarkets = [];
+    if (totalPercent <= 0) {
+      console.warn("Total percent movement is zero or negative. Cannot allocate risk.");
+    } else {
+      for (const newMarket of new_markets) {
+        const calculatedRisk = newMarket.percent / totalPercent * totalRisk;
+        const existingMarket = currentBullish.find((m) => m.symbol === newMarket.symbol);
+        if (existingMarket && !recordsToDeleteFromBullish.includes(existingMarket.id)) {
+          if (existingMarket.risk !== calculatedRisk) {
+            console.log(`Updating existing bullish market sequentially: ${newMarket.symbol} with risk ${calculatedRisk}`);
+            try {
+              await this.pb.collection("bullish_markets").update(existingMarket.id, {
+                risk: calculatedRisk
+              });
+              updatedCount++;
+            } catch (updateError) {
+              console.error(`Error updating bullish market ${newMarket.symbol} sequentially:`, updateError);
+            }
+          }
+        } else if (!currentBullishSymbols.has(newMarket.symbol)) {
+          console.log(`Creating new bullish market sequentially: ${newMarket.symbol} with risk ${calculatedRisk}`);
+          try {
+            const createdMarket = await this.pb.collection("bullish_markets").create({
+              symbol: newMarket.symbol,
+              risk: calculatedRisk
+            });
+            createdMarkets.push(createdMarket);
+          } catch (createError) {
+            console.error(`Error creating bullish market ${newMarket.symbol} sequentially:`, createError);
+          }
+        }
+      }
+    }
+    console.log(`Successfully updated ${updatedCount} markets sequentially.`);
+    console.log(`Successfully created ${createdMarkets.length} markets sequentially.`);
+    const updated_bullish = await this.pb.collection("bullish_markets").getFullList();
+    return { updated_bullish, moved_to_winding };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -35084,7 +35178,7 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = await payload.getCredentials(payload.account);
+    const credentials = await payload.getCredentials(payload.account, exchange);
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -35426,6 +35520,12 @@ class App {
       });
     }
   }
+  async updateTopMovers(payload) {
+    return await this.app_db.getBullishMarkets(payload);
+  }
+  async getWindingDownMarkets() {
+    return await this.app_db.getWindingDownMarkets();
+  }
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gbozee/ultimate",
   "type": "module",
-  "version": "0.0.2-0",
+  "version": "0.0.2-3",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,9 +12,11 @@
     "require": "./dist/index.cjs"
   },
   "scripts": {
+    "yarn:publish": "yarn publish --prerelease",
     "build": "bun run build.ts",
     "prepublishOnly": "bun run build",
-    "test": "bun test --timeout 300000 test"
+    "test": "bun test --timeout 300000 test",
+    "npm:publish": "npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "files": [
     "dist"