@gbozee/ultimate 0.0.2-3 → 0.0.2-5

package/dist/index.d.ts

@@ -246,16 +246,16 @@ export declare class AppDatabase {
 			config: ScheduledTrade;
 		};
 	})[]>;
-	update_db_position(position: any, payload: any): Promise<RecordModel>;
+	update_db_position(position: any, payload: any): Promise<import("pocketbase").RecordModel>;
 	getSymbolConfigFromDB(symbol: string): Promise<SymbolConfig>;
 	getRunningInstanceFromDB(account: ExchangeType, symbol: string, options?: {
 		delay?: number;
 	}): Promise<TradeBlockTracking>;
-	updateRunningInstance(id: string, running: boolean): Promise<RecordModel>;
+	updateRunningInstance(id: string, running: boolean): Promise<import("pocketbase").RecordModel>;
 	getOrders(account: ExchangeType, options: {
 		symbol: string;
 		kind: "long" | "short";
-	}): Promise<RecordModel[]>;
+	}): Promise<import("pocketbase").RecordModel[]>;
 	deleteAndRecreateOrders(account: ExchangeType, options: {
 		symbol: string;
 		kind: "long" | "short";
@@ -268,7 +268,7 @@ export declare class AppDatabase {
 		stop: number;
 		order_id: string;
 		triggerPrice?: number;
-	}>): Promise<RecordModel[]>;
+	}>): Promise<import("pocketbase").RecordModel[]>;
 	cancelOrders(payload: {
 		cancelExchangeOrders: (payload: {
 			symbol: string;
@@ -307,12 +307,12 @@ export declare class AppDatabase {
 		symbol: string;
 		kind: "long" | "short";
 		account: ExchangeType;
-	}): Promise<RecordModel>;
+	}): Promise<import("pocketbase").RecordModel>;
 	getPositionStrategy(account: ExchangeType): Promise<{
 		strategy_instance: Strategy;
 		focus_account: ExchangeAccount;
 	}>;
-	createOrUpdateWindingDownMarket(symbol: string): Promise<RecordModel>;
+	createOrUpdateWindingDownMarket(symbol: string): Promise<import("pocketbase").RecordModel>;
 	getWindingDownMarkets(): Promise<WindingDownMarket[]>;
 	getBullishMarkets(options?: {
 		new_markets: Array<{

package/dist/index.js

@@ -31921,9 +31921,11 @@ 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;
+    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 });
   }
@@ -31951,37 +31953,62 @@ class AppDatabase {
     const currentBullishSymbols = new Set(currentBullish.map((m) => m.symbol));
     const moved_to_winding = [];
     const recordsToDeleteFromBullish = [];
-    const windDownPromises = [];
+    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(`Marking ${market.symbol} for winding down.`);
+        console.log(`Processing ${market.symbol} for winding down.`);
         recordsToDeleteFromBullish.push(market.id);
-        windDownPromises.push(this.createOrUpdateWindingDownMarket(market.symbol));
+        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);
+        }
       }
     }
-    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);
+    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.`);
     }
-    const totalPercent = new_markets.reduce((sum, market) => sum + (market.percent || 0), 0);
     let updatedCount = 0;
-    const createdMarkets = [];
-    if (totalPercent <= 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 / totalPercent * totalRisk;
+        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) {
@@ -32009,8 +32036,21 @@ class AppDatabase {
         }
       }
     }
-    console.log(`Successfully updated ${updatedCount} markets sequentially.`);
-    console.log(`Successfully created ${createdMarkets.length} markets sequentially.`);
+    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 };
   }

package/package.json

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