@gbozee/ultimate 0.0.2-next.40 → 0.0.2-next.41

package/dist/frontend-index.js

@@ -1723,7 +1723,7 @@ function buildConfig(app_config, {
   if (!stop) {
     return [];
   }
-  const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
+  const condition = true;
   if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
@@ -2206,7 +2206,7 @@ function determineOptimumReward(payload) {
   const criterion = app_config.strategy || "quantity";
   const risk_rewards = createArray(low_range, high_range, 1);
   let func = risk_rewards.map((trade_no) => {
-    let trades = sortedBuildConfig(app_config, {
+    const pp = {
       take_profit: app_config.take_profit,
       entry: app_config.entry,
       stop: app_config.stop,
@@ -2218,7 +2218,8 @@ function determineOptimumReward(payload) {
       decimal_places: app_config.decimal_places,
       distribution,
       distribution_params: payload.distribution_params
-    });
+    };
+    let trades = sortedBuildConfig(app_config, pp);
     let total = 0;
     let max = -Infinity;
     let min = Infinity;
@@ -2309,7 +2310,6 @@ function findIndexByCondition(lst, kind, condition, defaultKey = "neg_pnl") {
       return b.net_diff - a.net_diff;
     }
   });
-  console.log("found", sortedFound);
   if (defaultKey === "quantity") {
     return sortedFound[0].index;
   }

package/dist/index.cjs

@@ -62165,7 +62165,7 @@ function buildConfig(app_config, {
   if (!stop) {
     return [];
   }
-  const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
+  const condition = true;
   if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
@@ -62648,7 +62648,7 @@ function determineOptimumReward(payload) {
   const criterion = app_config.strategy || "quantity";
   const risk_rewards = createArray(low_range, high_range, 1);
   let func = risk_rewards.map((trade_no) => {
-    let trades = sortedBuildConfig(app_config, {
+    const pp = {
       take_profit: app_config.take_profit,
       entry: app_config.entry,
       stop: app_config.stop,
@@ -62660,7 +62660,8 @@ function determineOptimumReward(payload) {
       decimal_places: app_config.decimal_places,
       distribution,
       distribution_params: payload.distribution_params
-    });
+    };
+    let trades = sortedBuildConfig(app_config, pp);
     let total = 0;
     let max = -Infinity;
     let min = Infinity;
@@ -62751,7 +62752,6 @@ function findIndexByCondition(lst, kind, condition, defaultKey = "neg_pnl") {
       return b.net_diff - a.net_diff;
     }
   });
-  console.log("found", sortedFound);
   if (defaultKey === "quantity") {
     return sortedFound[0].index;
   }
@@ -68302,19 +68302,21 @@ class ExchangePosition {
   async buildTrades(payload) {
     const { risk, use_progressive_risk } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
-      risk_reward: config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
       risk: risk || config2.risk,
       distribution: config2.distribution,
       distribution_params: config2.distribution_params,
       use_progressive_risk
     });
     const { trades } = await this.placeConfigOrders(app_config, {
-      risk_reward: config2.risk_reward,
-      entry: config2.entry,
-      stop: config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_per_trade: risk || config2.risk,
       avg_size: 0,
       neg_pnl: 0,
@@ -68356,9 +68358,11 @@ class ExchangePosition {
   async tradeConfig(payload) {
     const { override = {} } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_reward: config2.risk_reward,
       risk: config2.risk,
       symbol: this.symbol,
@@ -68403,8 +68407,9 @@ class ExchangePosition {
       ratio: payload.ratio
     });
   }
-  async getOptimumRiskReward() {
-    const app_config = await this.tradeConfig({});
+  async getOptimumRiskReward(payload) {
+    const app_config = await this.tradeConfig(payload || {});
+    console.log("app_config", app_config);
     const risk_reward = computeRiskReward({
       app_config,
       entry: app_config.entry,

package/dist/index.d.ts

@@ -6890,6 +6890,9 @@ export declare class ExchangePosition {
 	buildTrades(payload: {
 		risk?: number;
 		use_progressive_risk?: boolean;
+		support?: number;
+		risk_reward?: number;
+		resistance?: number;
 	}): Promise<{
 		trades: any[];
 		actual_trades: any[];
@@ -6900,6 +6903,8 @@ export declare class ExchangePosition {
 	}>;
 	tradeConfig(payload: {
 		override?: any;
+		support?: number;
+		resistance?: number;
 	}): Promise<AppConfig>;
 	getOrCreatePositionConfig(payload: {
 		risk?: number;
@@ -6923,7 +6928,7 @@ export declare class ExchangePosition {
 			entry: any;
 		};
 	};
-	getOptimumRiskReward(): Promise<number | {
+	getOptimumRiskReward(payload?: any): Promise<number | {
 		result: any[];
 		value: number;
 		total: number;

package/dist/index.js

@@ -62078,7 +62078,7 @@ function buildConfig(app_config, {
   if (!stop) {
     return [];
   }
-  const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
+  const condition = true;
   if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
@@ -62561,7 +62561,7 @@ function determineOptimumReward(payload) {
   const criterion = app_config.strategy || "quantity";
   const risk_rewards = createArray(low_range, high_range, 1);
   let func = risk_rewards.map((trade_no) => {
-    let trades = sortedBuildConfig(app_config, {
+    const pp = {
       take_profit: app_config.take_profit,
       entry: app_config.entry,
       stop: app_config.stop,
@@ -62573,7 +62573,8 @@ function determineOptimumReward(payload) {
       decimal_places: app_config.decimal_places,
       distribution,
       distribution_params: payload.distribution_params
-    });
+    };
+    let trades = sortedBuildConfig(app_config, pp);
     let total = 0;
     let max = -Infinity;
     let min = Infinity;
@@ -62664,7 +62665,6 @@ function findIndexByCondition(lst, kind, condition, defaultKey = "neg_pnl") {
       return b.net_diff - a.net_diff;
     }
   });
-  console.log("found", sortedFound);
   if (defaultKey === "quantity") {
     return sortedFound[0].index;
   }
@@ -68215,19 +68215,21 @@ class ExchangePosition {
   async buildTrades(payload) {
     const { risk, use_progressive_risk } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
-      risk_reward: config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
       risk: risk || config2.risk,
       distribution: config2.distribution,
       distribution_params: config2.distribution_params,
       use_progressive_risk
     });
     const { trades } = await this.placeConfigOrders(app_config, {
-      risk_reward: config2.risk_reward,
-      entry: config2.entry,
-      stop: config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_per_trade: risk || config2.risk,
       avg_size: 0,
       neg_pnl: 0,
@@ -68269,9 +68271,11 @@ class ExchangePosition {
   async tradeConfig(payload) {
     const { override = {} } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_reward: config2.risk_reward,
       risk: config2.risk,
       symbol: this.symbol,
@@ -68316,8 +68320,9 @@ class ExchangePosition {
       ratio: payload.ratio
     });
   }
-  async getOptimumRiskReward() {
-    const app_config = await this.tradeConfig({});
+  async getOptimumRiskReward(payload) {
+    const app_config = await this.tradeConfig(payload || {});
+    console.log("app_config", app_config);
     const risk_reward = computeRiskReward({
       app_config,
       entry: app_config.entry,

package/dist/mcp-server.cjs

@@ -65999,7 +65999,7 @@ function buildConfig(app_config, {
   if (!stop) {
     return [];
   }
-  const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
+  const condition = true;
   if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
@@ -66469,7 +66469,7 @@ function determineOptimumReward(payload) {
   const criterion = app_config.strategy || "quantity";
   const risk_rewards = createArray(low_range, high_range, 1);
   let func = risk_rewards.map((trade_no) => {
-    let trades = sortedBuildConfig(app_config, {
+    const pp = {
       take_profit: app_config.take_profit,
       entry: app_config.entry,
       stop: app_config.stop,
@@ -66481,7 +66481,8 @@ function determineOptimumReward(payload) {
       decimal_places: app_config.decimal_places,
       distribution,
       distribution_params: payload.distribution_params
-    });
+    };
+    let trades = sortedBuildConfig(app_config, pp);
     let total = 0;
     let max = -Infinity;
     let min = Infinity;
@@ -66572,7 +66573,6 @@ function findIndexByCondition(lst, kind, condition, defaultKey = "neg_pnl") {
       return b.net_diff - a.net_diff;
     }
   });
-  console.log("found", sortedFound);
   if (defaultKey === "quantity") {
     return sortedFound[0].index;
   }
@@ -72025,19 +72025,21 @@ class ExchangePosition {
   async buildTrades(payload) {
     const { risk, use_progressive_risk } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
-      risk_reward: config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
       risk: risk || config2.risk,
       distribution: config2.distribution,
       distribution_params: config2.distribution_params,
       use_progressive_risk
     });
     const { trades } = await this.placeConfigOrders(app_config, {
-      risk_reward: config2.risk_reward,
-      entry: config2.entry,
-      stop: config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_per_trade: risk || config2.risk,
       avg_size: 0,
       neg_pnl: 0,
@@ -72079,9 +72081,11 @@ class ExchangePosition {
   async tradeConfig(payload) {
     const { override = {} } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_reward: config2.risk_reward,
       risk: config2.risk,
       symbol: this.symbol,
@@ -72126,8 +72130,9 @@ class ExchangePosition {
       ratio: payload.ratio
     });
   }
-  async getOptimumRiskReward() {
-    const app_config = await this.tradeConfig({});
+  async getOptimumRiskReward(payload) {
+    const app_config = await this.tradeConfig(payload || {});
+    console.log("app_config", app_config);
     const risk_reward = computeRiskReward({
       app_config,
       entry: app_config.entry,

package/dist/mcp-server.js

@@ -65972,7 +65972,7 @@ function buildConfig(app_config, {
   if (!stop) {
     return [];
   }
-  const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
+  const condition = true;
   if (kind === "short") {}
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
@@ -66442,7 +66442,7 @@ function determineOptimumReward(payload) {
   const criterion = app_config.strategy || "quantity";
   const risk_rewards = createArray(low_range, high_range, 1);
   let func = risk_rewards.map((trade_no) => {
-    let trades = sortedBuildConfig(app_config, {
+    const pp = {
       take_profit: app_config.take_profit,
       entry: app_config.entry,
       stop: app_config.stop,
@@ -66454,7 +66454,8 @@ function determineOptimumReward(payload) {
       decimal_places: app_config.decimal_places,
       distribution,
       distribution_params: payload.distribution_params
-    });
+    };
+    let trades = sortedBuildConfig(app_config, pp);
     let total = 0;
     let max = -Infinity;
     let min = Infinity;
@@ -66545,7 +66546,6 @@ function findIndexByCondition(lst, kind, condition, defaultKey = "neg_pnl") {
       return b.net_diff - a.net_diff;
     }
   });
-  console.log("found", sortedFound);
   if (defaultKey === "quantity") {
     return sortedFound[0].index;
   }
@@ -71998,19 +71998,21 @@ class ExchangePosition {
   async buildTrades(payload) {
     const { risk, use_progressive_risk } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
-      risk_reward: config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
       risk: risk || config2.risk,
       distribution: config2.distribution,
       distribution_params: config2.distribution_params,
       use_progressive_risk
     });
     const { trades } = await this.placeConfigOrders(app_config, {
-      risk_reward: config2.risk_reward,
-      entry: config2.entry,
-      stop: config2.stop,
+      risk_reward: payload.risk_reward || config2.risk_reward,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_per_trade: risk || config2.risk,
       avg_size: 0,
       neg_pnl: 0,
@@ -72052,9 +72054,11 @@ class ExchangePosition {
   async tradeConfig(payload) {
     const { override = {} } = payload;
     const config2 = await this.getConfig();
+    const entry = this.kind === "long" ? payload.resistance : payload.support;
+    const stop = this.kind === "long" ? payload.support : payload.resistance;
     const app_config = await this.buildAppConfig({
-      entry: config2.entry,
-      stop: config2.stop,
+      entry: entry || config2.entry,
+      stop: stop || config2.stop,
       risk_reward: config2.risk_reward,
       risk: config2.risk,
       symbol: this.symbol,
@@ -72099,8 +72103,9 @@ class ExchangePosition {
       ratio: payload.ratio
     });
   }
-  async getOptimumRiskReward() {
-    const app_config = await this.tradeConfig({});
+  async getOptimumRiskReward(payload) {
+    const app_config = await this.tradeConfig(payload || {});
+    console.log("app_config", app_config);
     const risk_reward = computeRiskReward({
       app_config,
       entry: app_config.entry,

package/package.json

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