@gbozee/ultimate 0.0.2-105 → 0.0.2-107

package/dist/frontend-index.d.ts

@@ -78,6 +78,46 @@ export declare function computeSellZones(payload: {
 	exit: number;
 	zones?: number;
 }): number[];
+export type RawPosition = {
+	entry: number;
+	quantity: number;
+	price_places: string;
+	decimal_places: string;
+};
+export type ConfigOptionType = {
+	reduce_ratio: number | string;
+	profit_percent: number | string;
+};
+/**
+ * This function determines the take profit price for a given position based of the profit percent and the reduce ratio
+ * @param payload
+ * @returns {
+ *  tp_price: number;
+ *  pnl: number;
+ *  quantity: number;
+ *  reduce_quantity: number;
+ *  expected_loss: number;
+ * }
+ */
+export declare function determineTPSl(payload: {
+	sell_ratio?: number;
+	positions: {
+		long: RawPosition;
+		short: RawPosition;
+	};
+	configs: {
+		long: ConfigOptionType;
+		short: ConfigOptionType;
+	};
+	kind: "long" | "short";
+	decimal_places?: string;
+}): {
+	tp_price: number;
+	pnl: number;
+	quantity: number;
+	reduce_quantity: number;
+	expected_loss: number;
+};
 export type SignalConfigType = {
 	focus: number;
 	budget: number;

package/dist/frontend-index.js

@@ -1153,6 +1153,47 @@ function computeSellZones(payload) {
   const spread = factor - 1;
   return Array.from({ length: zones }, (_, i) => entry * Math.pow(1 + spread, i));
 }
+function determineTPSl(payload) {
+  const { sell_ratio = 1, kind, positions, configs, decimal_places } = payload;
+  const long_settings = configs.long;
+  const short_settings = configs.short;
+  const settings = kind === "long" ? long_settings : short_settings;
+  const reverse_kind = kind === "long" ? "short" : "long";
+  const _position = positions[kind];
+  const reverse_position = positions[reverse_kind];
+  const reduce_ratio = settings.reduce_ratio;
+  const notion = _position.entry * _position.quantity;
+  const profit_percent = settings.profit_percent;
+  const places = decimal_places || reverse_position.decimal_places;
+  if (profit_percent) {
+    let quantity = to_f(_position.quantity * sell_ratio, places);
+    const as_float = parseFloat(profit_percent) * sell_ratio;
+    const pnl = to_f(as_float * notion / 100, "%.2f");
+    const diff = pnl / quantity;
+    const tp_price = to_f(kind === "long" ? _position.entry + diff : _position.entry - diff, _position.price_places);
+    const expected_loss = to_f(parseFloat(reduce_ratio) * pnl, "%.2f");
+    let reduce_quantity = 0;
+    if (reverse_position.quantity > 0) {
+      const total_loss = Math.abs(tp_price - reverse_position.entry) * reverse_position.quantity;
+      const ratio = expected_loss / total_loss;
+      reduce_quantity = to_f(reverse_position.quantity * ratio, places);
+    }
+    return {
+      tp_price,
+      pnl,
+      quantity,
+      reduce_quantity,
+      expected_loss
+    };
+  }
+  return {
+    tp_price: 0,
+    pnl: 0,
+    quantity: 0,
+    reduce_quantity: 0,
+    expected_loss: 0
+  };
+}
 // src/helpers/shared.ts
 function buildConfig(app_config, {
   take_profit,
@@ -2441,6 +2482,7 @@ export {
   determine_average_entry_and_size,
   determine_amount_to_sell2 as determine_amount_to_sell,
   determine_amount_to_buy,
+  determineTPSl,
   determineRewardFactor,
   determineOptimumReward,
   createGapPairs,

package/dist/index.cjs

@@ -51468,8 +51468,12 @@ async function initPocketBaseClient(proxy_credentials) {
 
 class AppDatabase {
   pb;
-  constructor(pb) {
+  email;
+  salt;
+  constructor(pb, payload) {
     this.pb = pb;
+    this.email = payload.email;
+    this.salt = payload.salt;
     const customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
     this[customInspectSymbol] = function() {
       return `AppDatabase { pb: [PocketBase Instance - Sensitive Data Masked] }`;
@@ -51481,21 +51485,79 @@ class AppDatabase {
       };
     };
   }
-  getCredentials(password) {
+  async getUserByEmail() {
+    if (!this.email) {
+      throw new Error("Email is not set");
+    }
+    const user = await this.pb.collection("users").getFullList({
+      filter: `email="${this.email}"`
+    });
+    return user[0];
+  }
+  async generateUserPassword() {
+    const user = await this.getUserByEmail();
+    if (user) {
+      const userPassword = Math.random().toString(36).substring(2, 15);
+      const encrypted = encryptObject(userPassword, this.salt);
+      await this.pb.collection("users").update(user.id, {
+        settings: {
+          ...user.settings || {},
+          password: encrypted
+        }
+      });
+    }
+  }
+  async getUserCredentials() {
+    const record = await this.getUserByEmail();
+    if (record && record?.settings) {
+      const password = decryptObject(record.settings.password, this.salt);
+      if (password) {
+        if (!record.settings.credentials) {
+          return [];
+        }
+        return decryptObject(record.settings.credentials, password);
+      }
+    }
+    return null;
+  }
+  async getCredentials(payload) {
+    const { password } = payload;
+    if (this.salt && this.email) {
+      return this.getUserCredentials();
+    }
     const credentials = this.pb.authStore.record.credentials;
     if (credentials) {
       return decryptObject(credentials, password);
     }
     return null;
   }
-  async saveCredentials(password, credentials) {
-    const encrypted = encryptObject(credentials, password);
-    await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
-      credentials: encrypted
-    });
+  async saveCredentials(params) {
+    const { password, credentials } = params;
+    if (this.salt && this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        const userPassword = decryptObject(user.settings.password, this.salt);
+        if (userPassword) {
+          const encrypted = encryptObject(credentials, userPassword);
+          return await this.pb.collection("users").update(user.id, {
+            settings: {
+              ...user.settings,
+              credentials: encrypted
+            }
+          });
+        }
+      }
+    }
+    if (password) {
+      const encrypted = encryptObject(credentials, password);
+      await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
+        credentials: encrypted
+      });
+    }
   }
-  async addNewCredential(password, payload) {
-    let credentials = this.getCredentials(password);
+  async addNewCredential(params) {
+    const { password, payload } = params;
+    let credentials = await this.getCredentials({ password });
     if (credentials) {
       let found = false;
       for (const credential of credentials) {
@@ -51509,7 +51571,7 @@ class AppDatabase {
       if (!found) {
         credentials.push(payload);
       }
-      await this.saveCredentials(password, credentials);
+      await this.saveCredentials({ password, credentials });
     }
   }
   async getAccountWithActivePositions() {
@@ -51595,7 +51657,14 @@ class AppDatabase {
     });
   }
   async get_exchange_db_instance(account) {
-    const result = await this.pb.collection("exchange_accounts").getFirstListItem(`owner="${account.owner}" && exchange="${account.exchange}"`, {
+    let filter = `owner="${account.owner}" && exchange="${account.exchange}"`;
+    if (this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        filter = `${filter} && user = "${user.id}"`;
+      }
+    }
+    const result = await this.pb.collection("exchange_accounts").getFirstListItem(filter, {
       expand: "proxy"
     });
     return result;
@@ -59910,11 +59979,16 @@ class App {
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
-  const app_db = new AppDatabase(pb);
+  const app_db = new AppDatabase(pb, {
+    email: payload.email,
+    salt: payload.salt
+  });
   let _getCredentials = payload.getCredentials;
   if (payload.password) {
     try {
-      const credentials = app_db.getCredentials(payload.password);
+      const credentials = await app_db.getCredentials({
+        password: payload.password
+      });
       if (credentials) {
         _getCredentials = (account, exchange) => {
           const credential = credentials.find((c) => c.name === account && c.exchange === exchange);

package/dist/index.d.ts

@@ -437,14 +437,31 @@ export type ExchangeType = {
 };
 export declare class AppDatabase {
 	pb: PocketBase;
-	constructor(pb: PocketBase);
-	getCredentials(password: string): any;
-	saveCredentials(password: string, credentials: any): Promise<void>;
-	addNewCredential(password: string, payload: {
-		name: string;
-		exchange: string;
-		api_key: string;
-		api_secret: string;
+	email?: string;
+	salt?: string;
+	constructor(pb: PocketBase, payload: {
+		email?: string;
+		salt?: string;
+	});
+	getUserByEmail(): Promise<import("pocketbase").RecordModel>;
+	generateUserPassword(): Promise<void>;
+	getUserCredentials(): Promise<any>;
+	getCredentials(payload: {
+		password?: string;
+	}): Promise<any>;
+	saveCredentials(params: {
+		password?: string;
+		credentials: any;
+	}): Promise<import("pocketbase").RecordModel>;
+	addNewCredential(params: {
+		password?: string;
+		payload: {
+			name: string;
+			email: string;
+			exchange: string;
+			api_key: string;
+			api_secret: string;
+		};
 	}): Promise<void>;
 	getAccountWithActivePositions(): Promise<import("pocketbase").RecordModel[]>;
 	getAllSymbolsFromPositions(options?: {
@@ -2387,6 +2404,8 @@ export declare function initApp(payload: {
 		password: string;
 	};
 	password?: string;
+	salt?: string;
+	email?: string;
 	getCredentials: (account: string, exchange: string) => {
 		api_key: string;
 		api_secret: string;

package/dist/index.js

@@ -51420,8 +51420,12 @@ async function initPocketBaseClient(proxy_credentials) {
 
 class AppDatabase {
   pb;
-  constructor(pb) {
+  email;
+  salt;
+  constructor(pb, payload) {
     this.pb = pb;
+    this.email = payload.email;
+    this.salt = payload.salt;
     const customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
     this[customInspectSymbol] = function() {
       return `AppDatabase { pb: [PocketBase Instance - Sensitive Data Masked] }`;
@@ -51433,21 +51437,79 @@ class AppDatabase {
       };
     };
   }
-  getCredentials(password) {
+  async getUserByEmail() {
+    if (!this.email) {
+      throw new Error("Email is not set");
+    }
+    const user = await this.pb.collection("users").getFullList({
+      filter: `email="${this.email}"`
+    });
+    return user[0];
+  }
+  async generateUserPassword() {
+    const user = await this.getUserByEmail();
+    if (user) {
+      const userPassword = Math.random().toString(36).substring(2, 15);
+      const encrypted = encryptObject(userPassword, this.salt);
+      await this.pb.collection("users").update(user.id, {
+        settings: {
+          ...user.settings || {},
+          password: encrypted
+        }
+      });
+    }
+  }
+  async getUserCredentials() {
+    const record = await this.getUserByEmail();
+    if (record && record?.settings) {
+      const password = decryptObject(record.settings.password, this.salt);
+      if (password) {
+        if (!record.settings.credentials) {
+          return [];
+        }
+        return decryptObject(record.settings.credentials, password);
+      }
+    }
+    return null;
+  }
+  async getCredentials(payload) {
+    const { password } = payload;
+    if (this.salt && this.email) {
+      return this.getUserCredentials();
+    }
     const credentials = this.pb.authStore.record.credentials;
     if (credentials) {
       return decryptObject(credentials, password);
     }
     return null;
   }
-  async saveCredentials(password, credentials) {
-    const encrypted = encryptObject(credentials, password);
-    await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
-      credentials: encrypted
-    });
+  async saveCredentials(params) {
+    const { password, credentials } = params;
+    if (this.salt && this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        const userPassword = decryptObject(user.settings.password, this.salt);
+        if (userPassword) {
+          const encrypted = encryptObject(credentials, userPassword);
+          return await this.pb.collection("users").update(user.id, {
+            settings: {
+              ...user.settings,
+              credentials: encrypted
+            }
+          });
+        }
+      }
+    }
+    if (password) {
+      const encrypted = encryptObject(credentials, password);
+      await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
+        credentials: encrypted
+      });
+    }
   }
-  async addNewCredential(password, payload) {
-    let credentials = this.getCredentials(password);
+  async addNewCredential(params) {
+    const { password, payload } = params;
+    let credentials = await this.getCredentials({ password });
     if (credentials) {
       let found = false;
       for (const credential of credentials) {
@@ -51461,7 +51523,7 @@ class AppDatabase {
       if (!found) {
         credentials.push(payload);
       }
-      await this.saveCredentials(password, credentials);
+      await this.saveCredentials({ password, credentials });
     }
   }
   async getAccountWithActivePositions() {
@@ -51547,7 +51609,14 @@ class AppDatabase {
     });
   }
   async get_exchange_db_instance(account) {
-    const result = await this.pb.collection("exchange_accounts").getFirstListItem(`owner="${account.owner}" && exchange="${account.exchange}"`, {
+    let filter = `owner="${account.owner}" && exchange="${account.exchange}"`;
+    if (this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        filter = `${filter} && user = "${user.id}"`;
+      }
+    }
+    const result = await this.pb.collection("exchange_accounts").getFirstListItem(filter, {
       expand: "proxy"
     });
     return result;
@@ -59862,11 +59931,16 @@ class App {
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
-  const app_db = new AppDatabase(pb);
+  const app_db = new AppDatabase(pb, {
+    email: payload.email,
+    salt: payload.salt
+  });
   let _getCredentials = payload.getCredentials;
   if (payload.password) {
     try {
-      const credentials = app_db.getCredentials(payload.password);
+      const credentials = await app_db.getCredentials({
+        password: payload.password
+      });
       if (credentials) {
         _getCredentials = (account, exchange) => {
           const credential = credentials.find((c) => c.name === account && c.exchange === exchange);

package/dist/mcp-server.cjs

@@ -58176,8 +58176,12 @@ async function initPocketBaseClient(proxy_credentials) {
 
 class AppDatabase {
   pb;
-  constructor(pb) {
+  email;
+  salt;
+  constructor(pb, payload) {
     this.pb = pb;
+    this.email = payload.email;
+    this.salt = payload.salt;
     const customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
     this[customInspectSymbol] = function() {
       return `AppDatabase { pb: [PocketBase Instance - Sensitive Data Masked] }`;
@@ -58189,21 +58193,79 @@ class AppDatabase {
       };
     };
   }
-  getCredentials(password) {
+  async getUserByEmail() {
+    if (!this.email) {
+      throw new Error("Email is not set");
+    }
+    const user = await this.pb.collection("users").getFullList({
+      filter: `email="${this.email}"`
+    });
+    return user[0];
+  }
+  async generateUserPassword() {
+    const user = await this.getUserByEmail();
+    if (user) {
+      const userPassword = Math.random().toString(36).substring(2, 15);
+      const encrypted = encryptObject(userPassword, this.salt);
+      await this.pb.collection("users").update(user.id, {
+        settings: {
+          ...user.settings || {},
+          password: encrypted
+        }
+      });
+    }
+  }
+  async getUserCredentials() {
+    const record2 = await this.getUserByEmail();
+    if (record2 && record2?.settings) {
+      const password = decryptObject(record2.settings.password, this.salt);
+      if (password) {
+        if (!record2.settings.credentials) {
+          return [];
+        }
+        return decryptObject(record2.settings.credentials, password);
+      }
+    }
+    return null;
+  }
+  async getCredentials(payload) {
+    const { password } = payload;
+    if (this.salt && this.email) {
+      return this.getUserCredentials();
+    }
     const credentials = this.pb.authStore.record.credentials;
     if (credentials) {
       return decryptObject(credentials, password);
     }
     return null;
   }
-  async saveCredentials(password, credentials) {
-    const encrypted = encryptObject(credentials, password);
-    await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
-      credentials: encrypted
-    });
+  async saveCredentials(params) {
+    const { password, credentials } = params;
+    if (this.salt && this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        const userPassword = decryptObject(user.settings.password, this.salt);
+        if (userPassword) {
+          const encrypted = encryptObject(credentials, userPassword);
+          return await this.pb.collection("users").update(user.id, {
+            settings: {
+              ...user.settings,
+              credentials: encrypted
+            }
+          });
+        }
+      }
+    }
+    if (password) {
+      const encrypted = encryptObject(credentials, password);
+      await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
+        credentials: encrypted
+      });
+    }
   }
-  async addNewCredential(password, payload) {
-    let credentials = this.getCredentials(password);
+  async addNewCredential(params) {
+    const { password, payload } = params;
+    let credentials = await this.getCredentials({ password });
     if (credentials) {
       let found = false;
       for (const credential of credentials) {
@@ -58217,7 +58279,7 @@ class AppDatabase {
       if (!found) {
         credentials.push(payload);
       }
-      await this.saveCredentials(password, credentials);
+      await this.saveCredentials({ password, credentials });
     }
   }
   async getAccountWithActivePositions() {
@@ -58303,7 +58365,14 @@ class AppDatabase {
     });
   }
   async get_exchange_db_instance(account) {
-    const result = await this.pb.collection("exchange_accounts").getFirstListItem(`owner="${account.owner}" && exchange="${account.exchange}"`, {
+    let filter = `owner="${account.owner}" && exchange="${account.exchange}"`;
+    if (this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        filter = `${filter} && user = "${user.id}"`;
+      }
+    }
+    const result = await this.pb.collection("exchange_accounts").getFirstListItem(filter, {
       expand: "proxy"
     });
     return result;
@@ -66592,11 +66661,16 @@ class App {
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
-  const app_db = new AppDatabase(pb);
+  const app_db = new AppDatabase(pb, {
+    email: payload.email,
+    salt: payload.salt
+  });
   let _getCredentials = payload.getCredentials;
   if (payload.password) {
     try {
-      const credentials = app_db.getCredentials(payload.password);
+      const credentials = await app_db.getCredentials({
+        password: payload.password
+      });
       if (credentials) {
         _getCredentials = (account, exchange) => {
           const credential = credentials.find((c) => c.name === account && c.exchange === exchange);

package/dist/mcp-server.js

@@ -58153,8 +58153,12 @@ async function initPocketBaseClient(proxy_credentials) {
 
 class AppDatabase {
   pb;
-  constructor(pb) {
+  email;
+  salt;
+  constructor(pb, payload) {
     this.pb = pb;
+    this.email = payload.email;
+    this.salt = payload.salt;
     const customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
     this[customInspectSymbol] = function() {
       return `AppDatabase { pb: [PocketBase Instance - Sensitive Data Masked] }`;
@@ -58166,21 +58170,79 @@ class AppDatabase {
       };
     };
   }
-  getCredentials(password) {
+  async getUserByEmail() {
+    if (!this.email) {
+      throw new Error("Email is not set");
+    }
+    const user = await this.pb.collection("users").getFullList({
+      filter: `email="${this.email}"`
+    });
+    return user[0];
+  }
+  async generateUserPassword() {
+    const user = await this.getUserByEmail();
+    if (user) {
+      const userPassword = Math.random().toString(36).substring(2, 15);
+      const encrypted = encryptObject(userPassword, this.salt);
+      await this.pb.collection("users").update(user.id, {
+        settings: {
+          ...user.settings || {},
+          password: encrypted
+        }
+      });
+    }
+  }
+  async getUserCredentials() {
+    const record2 = await this.getUserByEmail();
+    if (record2 && record2?.settings) {
+      const password = decryptObject(record2.settings.password, this.salt);
+      if (password) {
+        if (!record2.settings.credentials) {
+          return [];
+        }
+        return decryptObject(record2.settings.credentials, password);
+      }
+    }
+    return null;
+  }
+  async getCredentials(payload) {
+    const { password } = payload;
+    if (this.salt && this.email) {
+      return this.getUserCredentials();
+    }
     const credentials = this.pb.authStore.record.credentials;
     if (credentials) {
       return decryptObject(credentials, password);
     }
     return null;
   }
-  async saveCredentials(password, credentials) {
-    const encrypted = encryptObject(credentials, password);
-    await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
-      credentials: encrypted
-    });
+  async saveCredentials(params) {
+    const { password, credentials } = params;
+    if (this.salt && this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        const userPassword = decryptObject(user.settings.password, this.salt);
+        if (userPassword) {
+          const encrypted = encryptObject(credentials, userPassword);
+          return await this.pb.collection("users").update(user.id, {
+            settings: {
+              ...user.settings,
+              credentials: encrypted
+            }
+          });
+        }
+      }
+    }
+    if (password) {
+      const encrypted = encryptObject(credentials, password);
+      await this.pb.collection("_superusers").update(this.pb.authStore.record.id, {
+        credentials: encrypted
+      });
+    }
   }
-  async addNewCredential(password, payload) {
-    let credentials = this.getCredentials(password);
+  async addNewCredential(params) {
+    const { password, payload } = params;
+    let credentials = await this.getCredentials({ password });
     if (credentials) {
       let found = false;
       for (const credential of credentials) {
@@ -58194,7 +58256,7 @@ class AppDatabase {
       if (!found) {
         credentials.push(payload);
       }
-      await this.saveCredentials(password, credentials);
+      await this.saveCredentials({ password, credentials });
     }
   }
   async getAccountWithActivePositions() {
@@ -58280,7 +58342,14 @@ class AppDatabase {
     });
   }
   async get_exchange_db_instance(account) {
-    const result = await this.pb.collection("exchange_accounts").getFirstListItem(`owner="${account.owner}" && exchange="${account.exchange}"`, {
+    let filter = `owner="${account.owner}" && exchange="${account.exchange}"`;
+    if (this.email) {
+      const user = await this.getUserByEmail();
+      if (user) {
+        filter = `${filter} && user = "${user.id}"`;
+      }
+    }
+    const result = await this.pb.collection("exchange_accounts").getFirstListItem(filter, {
       expand: "proxy"
     });
     return result;
@@ -66569,11 +66638,16 @@ class App {
 }
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
-  const app_db = new AppDatabase(pb);
+  const app_db = new AppDatabase(pb, {
+    email: payload.email,
+    salt: payload.salt
+  });
   let _getCredentials = payload.getCredentials;
   if (payload.password) {
     try {
-      const credentials = app_db.getCredentials(payload.password);
+      const credentials = await app_db.getCredentials({
+        password: payload.password
+      });
       if (credentials) {
         _getCredentials = (account, exchange) => {
           const credential = credentials.find((c) => c.name === account && c.exchange === exchange);

package/package.json

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