@gbozee/ultimate 0.0.2-104 → 0.0.2-106

package/dist/frontend-index.js

@@ -1794,6 +1794,7 @@ function computeProfitDetail(payload) {
     loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
     const ratio = pnl / loss;
     quantity = to_f(reduce_position.quantity * ratio, decimal_places);
+    expected_loss = to_f(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;

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;
@@ -52017,6 +52086,17 @@ class AppDatabase {
         secondary_long_strategy,
         secondary_short_strategy
       } = instance.expand;
+      const update_boolean = (value) => {
+        if (!value) {
+          return value;
+        }
+        return {
+          ...value,
+          follow: Boolean(value.follow),
+          place_tp: Boolean(value.place_tp),
+          pause_tp: Boolean(value.pause_tp)
+        };
+      };
       return {
         ...instance,
         main: {
@@ -52029,6 +52109,10 @@ class AppDatabase {
           position: {
             long: instance.main_long_position,
             short: instance.main_short_position
+          },
+          config: {
+            long: update_boolean(instance.main_long_config),
+            short: update_boolean(instance.main_short_config)
           }
         },
         secondary: {
@@ -52041,6 +52125,10 @@ class AppDatabase {
           position: {
             long: instance.secondary_long_position,
             short: instance.secondary_short_position
+          },
+          config: {
+            long: update_boolean(instance.secondary_long_config),
+            short: update_boolean(instance.secondary_short_config)
           }
         }
       };
@@ -53967,6 +54055,7 @@ function computeProfitDetail(payload) {
     loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
+    expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -59890,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;
@@ -51969,6 +52038,17 @@ class AppDatabase {
         secondary_long_strategy,
         secondary_short_strategy
       } = instance.expand;
+      const update_boolean = (value) => {
+        if (!value) {
+          return value;
+        }
+        return {
+          ...value,
+          follow: Boolean(value.follow),
+          place_tp: Boolean(value.place_tp),
+          pause_tp: Boolean(value.pause_tp)
+        };
+      };
       return {
         ...instance,
         main: {
@@ -51981,6 +52061,10 @@ class AppDatabase {
           position: {
             long: instance.main_long_position,
             short: instance.main_short_position
+          },
+          config: {
+            long: update_boolean(instance.main_long_config),
+            short: update_boolean(instance.main_short_config)
           }
         },
         secondary: {
@@ -51993,6 +52077,10 @@ class AppDatabase {
           position: {
             long: instance.secondary_long_position,
             short: instance.secondary_short_position
+          },
+          config: {
+            long: update_boolean(instance.secondary_long_config),
+            short: update_boolean(instance.secondary_short_config)
           }
         }
       };
@@ -53919,6 +54007,7 @@ function computeProfitDetail(payload) {
     loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
+    expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -59842,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;
@@ -58725,6 +58794,17 @@ class AppDatabase {
         secondary_long_strategy,
         secondary_short_strategy
       } = instance.expand;
+      const update_boolean = (value) => {
+        if (!value) {
+          return value;
+        }
+        return {
+          ...value,
+          follow: Boolean(value.follow),
+          place_tp: Boolean(value.place_tp),
+          pause_tp: Boolean(value.pause_tp)
+        };
+      };
       return {
         ...instance,
         main: {
@@ -58737,6 +58817,10 @@ class AppDatabase {
           position: {
             long: instance.main_long_position,
             short: instance.main_short_position
+          },
+          config: {
+            long: update_boolean(instance.main_long_config),
+            short: update_boolean(instance.main_short_config)
           }
         },
         secondary: {
@@ -58749,6 +58833,10 @@ class AppDatabase {
           position: {
             long: instance.secondary_long_position,
             short: instance.secondary_short_position
+          },
+          config: {
+            long: update_boolean(instance.secondary_long_config),
+            short: update_boolean(instance.secondary_short_config)
           }
         }
       };
@@ -60655,6 +60743,7 @@ function computeProfitDetail(payload) {
     loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
+    expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -66572,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;
@@ -58702,6 +58771,17 @@ class AppDatabase {
         secondary_long_strategy,
         secondary_short_strategy
       } = instance.expand;
+      const update_boolean = (value) => {
+        if (!value) {
+          return value;
+        }
+        return {
+          ...value,
+          follow: Boolean(value.follow),
+          place_tp: Boolean(value.place_tp),
+          pause_tp: Boolean(value.pause_tp)
+        };
+      };
       return {
         ...instance,
         main: {
@@ -58714,6 +58794,10 @@ class AppDatabase {
           position: {
             long: instance.main_long_position,
             short: instance.main_short_position
+          },
+          config: {
+            long: update_boolean(instance.main_long_config),
+            short: update_boolean(instance.main_short_config)
           }
         },
         secondary: {
@@ -58726,6 +58810,10 @@ class AppDatabase {
           position: {
             long: instance.secondary_long_position,
             short: instance.secondary_short_position
+          },
+          config: {
+            long: update_boolean(instance.secondary_long_config),
+            short: update_boolean(instance.secondary_short_config)
           }
         }
       };
@@ -60632,6 +60720,7 @@ function computeProfitDetail(payload) {
     loss = Math.abs(reduce_position.entry - sell_price) * reduce_position.quantity;
     const ratio = pnl / loss;
     quantity = to_f2(reduce_position.quantity * ratio, decimal_places);
+    expected_loss = to_f2(Math.abs(reduce_position.entry - sell_price) * quantity, "%.2f");
   }
   if (reverse_position) {
     expected_loss = Math.abs(reverse_position.avg_price - sell_price) * reverse_position.avg_qty;
@@ -66549,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-104",
+  "version": "0.0.2-106",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",