@gbozee/ultimate 0.0.2-1 → 0.0.2-5

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;
@@ -302,6 +312,18 @@ export declare class AppDatabase {
 		strategy_instance: Strategy;
 		focus_account: ExchangeAccount;
 	}>;
+	createOrUpdateWindingDownMarket(symbol: string): Promise<import("pocketbase").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;
@@ -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: {

package/dist/index.js

@@ -31920,6 +31920,140 @@ class AppDatabase {
     }
     return null;
   }
+  async createOrUpdateWindingDownMarket(symbol) {
+    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 });
+  }
+  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 = [];
+    let windDownCreatedCount = 0;
+    let currentWindingDown = [];
+    let currentWindingDownSymbols = new Set;
+    try {
+      currentWindingDown = await this.getWindingDownMarkets();
+      currentWindingDownSymbols = new Set(currentWindingDown.map((m) => m.symbol));
+      console.log(`Found ${currentWindingDown.length} existing winding down markets.`);
+    } catch (error) {
+      console.error("Error fetching current winding down markets:", error);
+    }
+    console.log("Processing markets to potentially move to winding down...");
+    for (const market of currentBullish) {
+      if (!newMarketSymbols.has(market.symbol)) {
+        console.log(`Processing ${market.symbol} for winding down.`);
+        recordsToDeleteFromBullish.push(market.id);
+        try {
+          const windingDownRecord = await this.createOrUpdateWindingDownMarket(market.symbol);
+          if (windingDownRecord) {
+            moved_to_winding.push(windingDownRecord);
+            windDownCreatedCount++;
+          }
+        } catch (windDownError) {
+          console.error(`Error creating/updating winding down market for ${market.symbol} sequentially:`, windDownError);
+        }
+      }
+    }
+    console.log(`Finished processing potential winding down markets. ${windDownCreatedCount} processed.`);
+    let deletedCount = 0;
+    if (recordsToDeleteFromBullish.length > 0) {
+      console.log(`Attempting to delete ${recordsToDeleteFromBullish.length} records sequentially from bullish_markets.`);
+      for (const id of recordsToDeleteFromBullish) {
+        try {
+          await this.pb.collection("bullish_markets").delete(id);
+          deletedCount++;
+        } catch (deleteError) {
+          console.error(`Error deleting bullish market record ${id} sequentially:`, deleteError);
+        }
+      }
+      console.log(`Finished sequential deletion. Successfully deleted ${deletedCount} of ${recordsToDeleteFromBullish.length} records.`);
+    }
+    let updatedCount = 0;
+    let createdMarkets = [];
+    const recordsToDeleteFromWindingDown = [];
+    if (totalRisk <= 0) {
+      console.warn("Total percent movement is zero or negative. Cannot allocate risk.");
+    } else {
+      for (const newMarket of new_markets) {
+        const calculatedRisk = newMarket.percent / totalRisk * 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);
+          if (windingDownRecord) {
+            recordsToDeleteFromWindingDown.push(windingDownRecord.id);
+            currentWindingDownSymbols.delete(newMarket.symbol);
+          }
+        }
+        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);
+          }
+        }
+      }
+    }
+    let windingDownDeletedCount = 0;
+    if (recordsToDeleteFromWindingDown.length > 0) {
+      console.log(`Attempting to delete ${recordsToDeleteFromWindingDown.length} records sequentially from winding_down_markets.`);
+      for (const id of recordsToDeleteFromWindingDown) {
+        try {
+          await this.pb.collection("winding_down_markets").delete(id);
+          windingDownDeletedCount++;
+        } catch (deleteError) {
+          console.error(`Error deleting winding down market record ${id} sequentially:`, deleteError);
+        }
+      }
+      console.log(`Finished sequential deletion from winding down. Successfully deleted ${windingDownDeletedCount} of ${recordsToDeleteFromWindingDown.length} records.`);
+    }
+    console.log(`Successfully updated ${updatedCount} bullish markets sequentially.`);
+    console.log(`Successfully created ${createdMarkets.length} bullish markets sequentially.`);
+    const updated_bullish = await this.pb.collection("bullish_markets").getFullList();
+    return { updated_bullish, moved_to_winding };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -35426,6 +35560,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-1",
+  "version": "0.0.2-5",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",