@gbozee/ultimate 0.0.2-157 → 0.0.2-159

package/dist/frontend-index.d.ts

@@ -277,6 +277,7 @@ export type GlobalConfig = {
 	risk_reward: number;
 	reverse_factor: number;
 	leverage?: number;
+	max_quantity?: number;
 };
 export interface BaseSystemFields {
 	id: string;
@@ -327,6 +328,20 @@ export interface ScheduledTrade extends BaseSystemFields {
 		kelly_prediction_model?: "exponential" | "normal" | "uniform";
 	};
 }
+export interface AccountStrategy extends BaseSystemFields {
+	account: string;
+	symbol: string;
+	risk?: number;
+	reward_factor?: number;
+	kind?: "long" | "short";
+	support?: number;
+	resistance?: number;
+	running?: boolean;
+	max_reward_factor?: number;
+	follow?: boolean;
+	risk_reward?: number;
+	dynamic?: boolean;
+}
 interface Proxy$1 extends BaseSystemFields {
 	ip_address?: string;
 	type?: "http" | "socks5";
@@ -370,6 +385,7 @@ export interface PositionsView {
 		p_account?: ExchangeAccount;
 		b_config?: ScheduledTrade;
 		proxy?: Proxy$1;
+		account_strategy?: AccountStrategy;
 	};
 }
 export type AppConfig = {

package/dist/frontend-index.js

@@ -1539,7 +1539,8 @@ function get_app_config_and_max_size(config, payload) {
     price_places: config.price_places,
     decimal_places: config.decimal_places,
     min_profit: config.profit_percent * config.profit / 100,
-    symbol: config.symbol
+    symbol: config.symbol,
+    max_quantity: config.max_quantity
   };
   const initialResult = sortedBuildConfig(app_config, {
     entry: app_config.entry,

package/dist/index.cjs

@@ -55167,9 +55167,9 @@ class AppDatabase {
     }
     return null;
   }
-  async getRunningAccountStrategies() {
+  async getRunningAccountStrategies(filter = "running=true") {
     const result = await this.pb.collection("account_strategies").getFullList({
-      filter: `running=true`,
+      filter,
       expand: "account"
     });
     return result;
@@ -56934,7 +56934,8 @@ function get_app_config_and_max_size(config2, payload) {
     price_places: config2.price_places,
     decimal_places: config2.decimal_places,
     min_profit: config2.profit_percent * config2.profit / 100,
-    symbol: config2.symbol
+    symbol: config2.symbol,
+    max_quantity: config2.max_quantity
   };
   const initialResult = sortedBuildConfig(app_config, {
     entry: app_config.entry,
@@ -60921,7 +60922,14 @@ class ExchangePosition {
           place_tp: payload.params.place_tp !== undefined ? payload.params.place_tp : true,
           profit: payload.params.profit !== undefined ? payload.params.profit : config2?.profit
         };
-        return await this.app_db.createOrUpdatePositionConfig(this.instance, params);
+        return await this.app_db.createOrUpdatePositionConfig({
+          ...this.instance,
+          expand: {
+            ...this.instance.expand || {},
+            account: this.account
+          },
+          account: this.account.id
+        }, params);
       }
     }
     if (this.instance.expand?.b_config) {
@@ -61700,8 +61708,8 @@ class ExchangePosition {
       });
       return this.getConfig({
         params: {
-          entry: config2.entry,
-          stop: config2.stop,
+          entry: long_c.entry,
+          stop: long_c.stop,
           risk_reward: long_c.risk_reward,
           risk: long_c.risk
         }
@@ -63165,6 +63173,53 @@ class ExchangeAccount {
       short_percent
     };
   }
+  async oppositeGapExists(payload) {
+    const focus_position = await this.getFocusPosition({
+      symbol: payload.symbol,
+      kind: payload.kind
+    });
+    const strategy2 = focus_position.getInstance().expand?.account_strategy;
+    if (!strategy2) {
+      return;
+    }
+    const kind = strategy2.kind;
+    const reward_factor = strategy2.reward_factor;
+    const { symbol } = payload;
+    const reversePosition = await this.getFocusPosition({
+      symbol,
+      kind: kind === "long" ? "short" : "long"
+    });
+    if (focus_position.getInstance().quantity > 0) {
+      const opposite_config = focus_position.getOppositeConfig({
+        ratio: reward_factor
+      });
+      const reverse_config = await reversePosition.getConfig();
+      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
+        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
+        await reversePosition.getConfig({
+          params: {
+            entry: opposite_config.entry,
+            stop: opposite_config.stop,
+            risk: opposite_config.risk,
+            risk_reward: opposite_config.risk_reward
+          }
+        });
+        console.log("Placing trade for ", symbol, reversePosition.kind);
+        await reversePosition.placeTrade({
+          ignore_config: true,
+          limit: true,
+          place: true
+        });
+      }
+      console.log("Opposite config for ", symbol, kind, opposite_config);
+    } else {
+      if (focus_position.getInstance().avg_qty > 0 && strategy2.running === false) {
+        await focus_position.cancelOrders({
+          limit: true
+        });
+      }
+    }
+  }
   async profitWithinGapStrategy(payload) {
     const { symbol } = payload;
     console.log("Fetching positions for ", symbol);
@@ -63181,7 +63236,6 @@ class ExchangeAccount {
       return;
     }
     const kind = strategy2.kind;
-    const reward_factor = strategy2.reward_factor;
     const { entries, last_value, ...app_config } = await this.tradeConfig({
       symbol,
       kind
@@ -63209,34 +63263,10 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    const reversePosition = await this.getFocusPosition({
+    await this.oppositeGapExists({
       symbol,
-      kind: kind === "long" ? "short" : "long"
+      kind
     });
-    if (focusPosition.getInstance().quantity > 0) {
-      const opposite_config = focusPosition.getOppositeConfig({
-        ratio: reward_factor
-      });
-      const reverse_config = await reversePosition.getConfig();
-      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focusPosition.getInstance().quantity > 0) {
-        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
-        await reversePosition.getConfig({
-          params: {
-            entry: opposite_config.entry,
-            stop: opposite_config.stop,
-            risk: opposite_config.risk,
-            risk_reward: opposite_config.risk_reward
-          }
-        });
-        console.log("Placing trade for ", symbol, reversePosition.kind);
-        await reversePosition.placeTrade({
-          ignore_config: true,
-          limit: true,
-          place: true
-        });
-      }
-      console.log("Opposite config for ", symbol, kind, opposite_config);
-    }
     return {
       config_details: {
         app_config,
@@ -63701,15 +63731,25 @@ class App {
     });
     return result;
   }
-  async runDbStrategyAccounts(callback) {
+  async runDbStrategyAccounts(payload) {
+    const { runningCallback, notRunningCallback } = payload;
     const strategies = await this.app_db.getRunningAccountStrategies();
     for (const strategy2 of strategies) {
       console.log("Running strategy for ", strategy2.symbol, "for account", strategy2.expand.account.owner, strategy2.expand.account.exchange);
-      await callback({
+      await runningCallback({
         symbol: strategy2.symbol,
         account: strategy2.expand.account
       });
     }
+    const not_running_strategies = await this.app_db.getRunningAccountStrategies("running=false");
+    for (const strategy2 of not_running_strategies) {
+      console.log("Not running strategy for ", strategy2.symbol);
+      await notRunningCallback({
+        symbol: strategy2.symbol,
+        account: strategy2.expand.account,
+        kind: strategy2.kind
+      });
+    }
   }
   async profitWithinGapStrategy(payload) {
     const { account, symbol } = payload;

package/dist/index.d.ts

@@ -141,6 +141,7 @@ export interface PositionsView {
 		p_account?: ExchangeAccount;
 		b_config?: ScheduledTrade;
 		proxy?: Proxy$1;
+		account_strategy?: AccountStrategy;
 	};
 }
 export interface BullishMarket extends RecordModel {
@@ -240,6 +241,7 @@ export type GlobalConfig = {
 	risk_reward: number;
 	reverse_factor: number;
 	leverage?: number;
+	max_quantity?: number;
 };
 interface Position$1 {
 	id: number;
@@ -738,7 +740,7 @@ export declare class AppDatabase {
 		kind: "long" | "short";
 		account: ExchangeType;
 	}): Promise<ScheduledTrade | null>;
-	getRunningAccountStrategies(): Promise<(AccountStrategy & {
+	getRunningAccountStrategies(filter?: string): Promise<(AccountStrategy & {
 		expand?: {
 			account: ExchangeAccount;
 		};
@@ -2569,6 +2571,10 @@ declare class ExchangeAccount$1 {
 		long_percent: number;
 		short_percent: number;
 	}>;
+	oppositeGapExists(payload: {
+		symbol: string;
+		kind: "long" | "short";
+	}): Promise<void>;
 	profitWithinGapStrategy(payload: {
 		symbol: string;
 	}): Promise<{
@@ -2816,10 +2822,17 @@ declare class App {
 		cancel?: boolean;
 		raw?: boolean;
 	}): Promise<any>;
-	runDbStrategyAccounts(callback: (params: {
-		symbol: string;
-		account: ExchangeType;
-	}) => Promise<any>): Promise<void>;
+	runDbStrategyAccounts(payload: {
+		runningCallback: (params: {
+			symbol: string;
+			account: ExchangeType;
+		}) => Promise<any>;
+		notRunningCallback: (params: {
+			symbol: string;
+			account: ExchangeType;
+			kind: "long" | "short";
+		}) => Promise<any>;
+	}): Promise<void>;
 	profitWithinGapStrategy(payload: {
 		account: ExchangeType;
 		symbol: string;

package/dist/index.js

@@ -55113,9 +55113,9 @@ class AppDatabase {
     }
     return null;
   }
-  async getRunningAccountStrategies() {
+  async getRunningAccountStrategies(filter = "running=true") {
     const result = await this.pb.collection("account_strategies").getFullList({
-      filter: `running=true`,
+      filter,
       expand: "account"
     });
     return result;
@@ -56880,7 +56880,8 @@ function get_app_config_and_max_size(config2, payload) {
     price_places: config2.price_places,
     decimal_places: config2.decimal_places,
     min_profit: config2.profit_percent * config2.profit / 100,
-    symbol: config2.symbol
+    symbol: config2.symbol,
+    max_quantity: config2.max_quantity
   };
   const initialResult = sortedBuildConfig(app_config, {
     entry: app_config.entry,
@@ -60867,7 +60868,14 @@ class ExchangePosition {
           place_tp: payload.params.place_tp !== undefined ? payload.params.place_tp : true,
           profit: payload.params.profit !== undefined ? payload.params.profit : config2?.profit
         };
-        return await this.app_db.createOrUpdatePositionConfig(this.instance, params);
+        return await this.app_db.createOrUpdatePositionConfig({
+          ...this.instance,
+          expand: {
+            ...this.instance.expand || {},
+            account: this.account
+          },
+          account: this.account.id
+        }, params);
       }
     }
     if (this.instance.expand?.b_config) {
@@ -61646,8 +61654,8 @@ class ExchangePosition {
       });
       return this.getConfig({
         params: {
-          entry: config2.entry,
-          stop: config2.stop,
+          entry: long_c.entry,
+          stop: long_c.stop,
           risk_reward: long_c.risk_reward,
           risk: long_c.risk
         }
@@ -63111,6 +63119,53 @@ class ExchangeAccount {
       short_percent
     };
   }
+  async oppositeGapExists(payload) {
+    const focus_position = await this.getFocusPosition({
+      symbol: payload.symbol,
+      kind: payload.kind
+    });
+    const strategy2 = focus_position.getInstance().expand?.account_strategy;
+    if (!strategy2) {
+      return;
+    }
+    const kind = strategy2.kind;
+    const reward_factor = strategy2.reward_factor;
+    const { symbol } = payload;
+    const reversePosition = await this.getFocusPosition({
+      symbol,
+      kind: kind === "long" ? "short" : "long"
+    });
+    if (focus_position.getInstance().quantity > 0) {
+      const opposite_config = focus_position.getOppositeConfig({
+        ratio: reward_factor
+      });
+      const reverse_config = await reversePosition.getConfig();
+      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
+        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
+        await reversePosition.getConfig({
+          params: {
+            entry: opposite_config.entry,
+            stop: opposite_config.stop,
+            risk: opposite_config.risk,
+            risk_reward: opposite_config.risk_reward
+          }
+        });
+        console.log("Placing trade for ", symbol, reversePosition.kind);
+        await reversePosition.placeTrade({
+          ignore_config: true,
+          limit: true,
+          place: true
+        });
+      }
+      console.log("Opposite config for ", symbol, kind, opposite_config);
+    } else {
+      if (focus_position.getInstance().avg_qty > 0 && strategy2.running === false) {
+        await focus_position.cancelOrders({
+          limit: true
+        });
+      }
+    }
+  }
   async profitWithinGapStrategy(payload) {
     const { symbol } = payload;
     console.log("Fetching positions for ", symbol);
@@ -63127,7 +63182,6 @@ class ExchangeAccount {
       return;
     }
     const kind = strategy2.kind;
-    const reward_factor = strategy2.reward_factor;
     const { entries, last_value, ...app_config } = await this.tradeConfig({
       symbol,
       kind
@@ -63155,34 +63209,10 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    const reversePosition = await this.getFocusPosition({
+    await this.oppositeGapExists({
       symbol,
-      kind: kind === "long" ? "short" : "long"
+      kind
     });
-    if (focusPosition.getInstance().quantity > 0) {
-      const opposite_config = focusPosition.getOppositeConfig({
-        ratio: reward_factor
-      });
-      const reverse_config = await reversePosition.getConfig();
-      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focusPosition.getInstance().quantity > 0) {
-        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
-        await reversePosition.getConfig({
-          params: {
-            entry: opposite_config.entry,
-            stop: opposite_config.stop,
-            risk: opposite_config.risk,
-            risk_reward: opposite_config.risk_reward
-          }
-        });
-        console.log("Placing trade for ", symbol, reversePosition.kind);
-        await reversePosition.placeTrade({
-          ignore_config: true,
-          limit: true,
-          place: true
-        });
-      }
-      console.log("Opposite config for ", symbol, kind, opposite_config);
-    }
     return {
       config_details: {
         app_config,
@@ -63647,15 +63677,25 @@ class App {
     });
     return result;
   }
-  async runDbStrategyAccounts(callback) {
+  async runDbStrategyAccounts(payload) {
+    const { runningCallback, notRunningCallback } = payload;
     const strategies = await this.app_db.getRunningAccountStrategies();
     for (const strategy2 of strategies) {
       console.log("Running strategy for ", strategy2.symbol, "for account", strategy2.expand.account.owner, strategy2.expand.account.exchange);
-      await callback({
+      await runningCallback({
         symbol: strategy2.symbol,
         account: strategy2.expand.account
       });
     }
+    const not_running_strategies = await this.app_db.getRunningAccountStrategies("running=false");
+    for (const strategy2 of not_running_strategies) {
+      console.log("Not running strategy for ", strategy2.symbol);
+      await notRunningCallback({
+        symbol: strategy2.symbol,
+        account: strategy2.expand.account,
+        kind: strategy2.kind
+      });
+    }
   }
   async profitWithinGapStrategy(payload) {
     const { account, symbol } = payload;

package/dist/mcp-server.cjs

@@ -61867,9 +61867,9 @@ class AppDatabase {
     }
     return null;
   }
-  async getRunningAccountStrategies() {
+  async getRunningAccountStrategies(filter = "running=true") {
     const result = await this.pb.collection("account_strategies").getFullList({
-      filter: `running=true`,
+      filter,
       expand: "account"
     });
     return result;
@@ -63614,7 +63614,8 @@ function get_app_config_and_max_size(config2, payload) {
     price_places: config2.price_places,
     decimal_places: config2.decimal_places,
     min_profit: config2.profit_percent * config2.profit / 100,
-    symbol: config2.symbol
+    symbol: config2.symbol,
+    max_quantity: config2.max_quantity
   };
   const initialResult = sortedBuildConfig(app_config, {
     entry: app_config.entry,
@@ -67595,7 +67596,14 @@ class ExchangePosition {
           place_tp: payload.params.place_tp !== undefined ? payload.params.place_tp : true,
           profit: payload.params.profit !== undefined ? payload.params.profit : config2?.profit
         };
-        return await this.app_db.createOrUpdatePositionConfig(this.instance, params);
+        return await this.app_db.createOrUpdatePositionConfig({
+          ...this.instance,
+          expand: {
+            ...this.instance.expand || {},
+            account: this.account
+          },
+          account: this.account.id
+        }, params);
       }
     }
     if (this.instance.expand?.b_config) {
@@ -68374,8 +68382,8 @@ class ExchangePosition {
       });
       return this.getConfig({
         params: {
-          entry: config2.entry,
-          stop: config2.stop,
+          entry: long_c.entry,
+          stop: long_c.stop,
           risk_reward: long_c.risk_reward,
           risk: long_c.risk
         }
@@ -69839,6 +69847,53 @@ class ExchangeAccount {
       short_percent
     };
   }
+  async oppositeGapExists(payload) {
+    const focus_position = await this.getFocusPosition({
+      symbol: payload.symbol,
+      kind: payload.kind
+    });
+    const strategy2 = focus_position.getInstance().expand?.account_strategy;
+    if (!strategy2) {
+      return;
+    }
+    const kind = strategy2.kind;
+    const reward_factor = strategy2.reward_factor;
+    const { symbol } = payload;
+    const reversePosition = await this.getFocusPosition({
+      symbol,
+      kind: kind === "long" ? "short" : "long"
+    });
+    if (focus_position.getInstance().quantity > 0) {
+      const opposite_config = focus_position.getOppositeConfig({
+        ratio: reward_factor
+      });
+      const reverse_config = await reversePosition.getConfig();
+      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
+        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
+        await reversePosition.getConfig({
+          params: {
+            entry: opposite_config.entry,
+            stop: opposite_config.stop,
+            risk: opposite_config.risk,
+            risk_reward: opposite_config.risk_reward
+          }
+        });
+        console.log("Placing trade for ", symbol, reversePosition.kind);
+        await reversePosition.placeTrade({
+          ignore_config: true,
+          limit: true,
+          place: true
+        });
+      }
+      console.log("Opposite config for ", symbol, kind, opposite_config);
+    } else {
+      if (focus_position.getInstance().avg_qty > 0 && strategy2.running === false) {
+        await focus_position.cancelOrders({
+          limit: true
+        });
+      }
+    }
+  }
   async profitWithinGapStrategy(payload) {
     const { symbol } = payload;
     console.log("Fetching positions for ", symbol);
@@ -69855,7 +69910,6 @@ class ExchangeAccount {
       return;
     }
     const kind = strategy2.kind;
-    const reward_factor = strategy2.reward_factor;
     const { entries, last_value, ...app_config } = await this.tradeConfig({
       symbol,
       kind
@@ -69883,34 +69937,10 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    const reversePosition = await this.getFocusPosition({
+    await this.oppositeGapExists({
       symbol,
-      kind: kind === "long" ? "short" : "long"
+      kind
     });
-    if (focusPosition.getInstance().quantity > 0) {
-      const opposite_config = focusPosition.getOppositeConfig({
-        ratio: reward_factor
-      });
-      const reverse_config = await reversePosition.getConfig();
-      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focusPosition.getInstance().quantity > 0) {
-        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
-        await reversePosition.getConfig({
-          params: {
-            entry: opposite_config.entry,
-            stop: opposite_config.stop,
-            risk: opposite_config.risk,
-            risk_reward: opposite_config.risk_reward
-          }
-        });
-        console.log("Placing trade for ", symbol, reversePosition.kind);
-        await reversePosition.placeTrade({
-          ignore_config: true,
-          limit: true,
-          place: true
-        });
-      }
-      console.log("Opposite config for ", symbol, kind, opposite_config);
-    }
     return {
       config_details: {
         app_config,
@@ -70375,15 +70405,25 @@ class App {
     });
     return result;
   }
-  async runDbStrategyAccounts(callback) {
+  async runDbStrategyAccounts(payload) {
+    const { runningCallback, notRunningCallback } = payload;
     const strategies = await this.app_db.getRunningAccountStrategies();
     for (const strategy2 of strategies) {
       console.log("Running strategy for ", strategy2.symbol, "for account", strategy2.expand.account.owner, strategy2.expand.account.exchange);
-      await callback({
+      await runningCallback({
         symbol: strategy2.symbol,
         account: strategy2.expand.account
       });
     }
+    const not_running_strategies = await this.app_db.getRunningAccountStrategies("running=false");
+    for (const strategy2 of not_running_strategies) {
+      console.log("Not running strategy for ", strategy2.symbol);
+      await notRunningCallback({
+        symbol: strategy2.symbol,
+        account: strategy2.expand.account,
+        kind: strategy2.kind
+      });
+    }
   }
   async profitWithinGapStrategy(payload) {
     const { account, symbol } = payload;

package/dist/mcp-server.js

@@ -61844,9 +61844,9 @@ class AppDatabase {
     }
     return null;
   }
-  async getRunningAccountStrategies() {
+  async getRunningAccountStrategies(filter = "running=true") {
     const result = await this.pb.collection("account_strategies").getFullList({
-      filter: `running=true`,
+      filter,
       expand: "account"
     });
     return result;
@@ -63591,7 +63591,8 @@ function get_app_config_and_max_size(config2, payload) {
     price_places: config2.price_places,
     decimal_places: config2.decimal_places,
     min_profit: config2.profit_percent * config2.profit / 100,
-    symbol: config2.symbol
+    symbol: config2.symbol,
+    max_quantity: config2.max_quantity
   };
   const initialResult = sortedBuildConfig(app_config, {
     entry: app_config.entry,
@@ -67572,7 +67573,14 @@ class ExchangePosition {
           place_tp: payload.params.place_tp !== undefined ? payload.params.place_tp : true,
           profit: payload.params.profit !== undefined ? payload.params.profit : config2?.profit
         };
-        return await this.app_db.createOrUpdatePositionConfig(this.instance, params);
+        return await this.app_db.createOrUpdatePositionConfig({
+          ...this.instance,
+          expand: {
+            ...this.instance.expand || {},
+            account: this.account
+          },
+          account: this.account.id
+        }, params);
       }
     }
     if (this.instance.expand?.b_config) {
@@ -68351,8 +68359,8 @@ class ExchangePosition {
       });
       return this.getConfig({
         params: {
-          entry: config2.entry,
-          stop: config2.stop,
+          entry: long_c.entry,
+          stop: long_c.stop,
           risk_reward: long_c.risk_reward,
           risk: long_c.risk
         }
@@ -69816,6 +69824,53 @@ class ExchangeAccount {
       short_percent
     };
   }
+  async oppositeGapExists(payload) {
+    const focus_position = await this.getFocusPosition({
+      symbol: payload.symbol,
+      kind: payload.kind
+    });
+    const strategy2 = focus_position.getInstance().expand?.account_strategy;
+    if (!strategy2) {
+      return;
+    }
+    const kind = strategy2.kind;
+    const reward_factor = strategy2.reward_factor;
+    const { symbol } = payload;
+    const reversePosition = await this.getFocusPosition({
+      symbol,
+      kind: kind === "long" ? "short" : "long"
+    });
+    if (focus_position.getInstance().quantity > 0) {
+      const opposite_config = focus_position.getOppositeConfig({
+        ratio: reward_factor
+      });
+      const reverse_config = await reversePosition.getConfig();
+      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focus_position.getInstance().quantity > 0) {
+        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
+        await reversePosition.getConfig({
+          params: {
+            entry: opposite_config.entry,
+            stop: opposite_config.stop,
+            risk: opposite_config.risk,
+            risk_reward: opposite_config.risk_reward
+          }
+        });
+        console.log("Placing trade for ", symbol, reversePosition.kind);
+        await reversePosition.placeTrade({
+          ignore_config: true,
+          limit: true,
+          place: true
+        });
+      }
+      console.log("Opposite config for ", symbol, kind, opposite_config);
+    } else {
+      if (focus_position.getInstance().avg_qty > 0 && strategy2.running === false) {
+        await focus_position.cancelOrders({
+          limit: true
+        });
+      }
+    }
+  }
   async profitWithinGapStrategy(payload) {
     const { symbol } = payload;
     console.log("Fetching positions for ", symbol);
@@ -69832,7 +69887,6 @@ class ExchangeAccount {
       return;
     }
     const kind = strategy2.kind;
-    const reward_factor = strategy2.reward_factor;
     const { entries, last_value, ...app_config } = await this.tradeConfig({
       symbol,
       kind
@@ -69860,34 +69914,10 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    const reversePosition = await this.getFocusPosition({
+    await this.oppositeGapExists({
       symbol,
-      kind: kind === "long" ? "short" : "long"
+      kind
     });
-    if (focusPosition.getInstance().quantity > 0) {
-      const opposite_config = focusPosition.getOppositeConfig({
-        ratio: reward_factor
-      });
-      const reverse_config = await reversePosition.getConfig();
-      if ((reverse_config.entry !== opposite_config.entry || reverse_config.stop !== opposite_config.stop || reverse_config.risk !== opposite_config.risk || reverse_config.risk_reward !== opposite_config.risk_reward) && focusPosition.getInstance().quantity > 0) {
-        console.log("Updating reverse config for ", symbol, kind, "with opposite config", opposite_config);
-        await reversePosition.getConfig({
-          params: {
-            entry: opposite_config.entry,
-            stop: opposite_config.stop,
-            risk: opposite_config.risk,
-            risk_reward: opposite_config.risk_reward
-          }
-        });
-        console.log("Placing trade for ", symbol, reversePosition.kind);
-        await reversePosition.placeTrade({
-          ignore_config: true,
-          limit: true,
-          place: true
-        });
-      }
-      console.log("Opposite config for ", symbol, kind, opposite_config);
-    }
     return {
       config_details: {
         app_config,
@@ -70352,15 +70382,25 @@ class App {
     });
     return result;
   }
-  async runDbStrategyAccounts(callback) {
+  async runDbStrategyAccounts(payload) {
+    const { runningCallback, notRunningCallback } = payload;
     const strategies = await this.app_db.getRunningAccountStrategies();
     for (const strategy2 of strategies) {
       console.log("Running strategy for ", strategy2.symbol, "for account", strategy2.expand.account.owner, strategy2.expand.account.exchange);
-      await callback({
+      await runningCallback({
         symbol: strategy2.symbol,
         account: strategy2.expand.account
       });
     }
+    const not_running_strategies = await this.app_db.getRunningAccountStrategies("running=false");
+    for (const strategy2 of not_running_strategies) {
+      console.log("Not running strategy for ", strategy2.symbol);
+      await notRunningCallback({
+        symbol: strategy2.symbol,
+        account: strategy2.expand.account,
+        kind: strategy2.kind
+      });
+    }
   }
   async profitWithinGapStrategy(payload) {
     const { account, symbol } = payload;

package/package.json

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