@gbozee/ultimate 0.0.2-21 → 0.0.2-23

package/dist/index.d.ts

@@ -265,6 +265,14 @@ export type ExchangeType = {
 export declare class AppDatabase {
 	private pb;
 	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;
+	}): Promise<void>;
 	getAllSymbolsFromPositions(options?: {
 		no_position?: boolean;
 		kind?: "long" | "short";
@@ -462,6 +470,7 @@ declare class ExchangeAccount$1 {
 	 details for each symbol for an account in the database with an option
 	 to refresh.
 	 */
+	getDBInstance(): AppDatabase;
 	getLiveExchangeInstance(payload: {
 		symbol: string;
 		refresh?: boolean;
@@ -784,10 +793,10 @@ declare class ExchangeAccount$1 {
 declare class App {
 	private app_db;
 	private getCredentials;
-	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => (account: string, exchange: string) => Promise<{
+	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => {
 		api_key: string;
 		api_secret: string;
-	}>);
+	});
 	getExchangeAccount(account: ExchangeType): Promise<ExchangeAccount$1>;
 	syncAccount(payload: {
 		account: ExchangeType;
@@ -889,12 +898,13 @@ export declare function initApp(payload: {
 		email: string;
 		password: string;
 	};
-	getCredentials: (account: string, exchange: string) => (account: string, exchange: string) => Promise<{
+	password?: string;
+	getCredentials: (account: string, exchange: string) => {
 		api_key: string;
 		api_secret: string;
-	}>;
+	};
 }): Promise<App>;
-export declare function initialize(): Promise<App>;
+export declare function initialize(password?: string): Promise<App>;
 
 export {
 	ExchangeAccount$1 as ExchangeAccount,

package/dist/index.js

@@ -25320,7 +25320,7 @@ var require_websocket = __commonJS((exports, module) => {
   var http = __require("http");
   var net = __require("net");
   var tls = __require("tls");
-  var { randomBytes, createHash } = __require("crypto");
+  var { randomBytes: randomBytes2, createHash } = __require("crypto");
   var { Duplex, Readable } = __require("stream");
   var { URL: URL2 } = __require("url");
   var PerMessageDeflate = require_permessage_deflate();
@@ -25729,7 +25729,7 @@ var require_websocket = __commonJS((exports, module) => {
       }
     }
     const defaultPort = isSecure ? 443 : 80;
-    const key = randomBytes(16).toString("base64");
+    const key = randomBytes2(16).toString("base64");
     const request = isSecure ? https.request : http.request;
     const protocolSet = new Set;
     let perMessageDeflate;
@@ -32104,6 +32104,47 @@ class Client {
 // src/database.ts
 var import_socks_proxy_agent = __toESM(require_dist2(), 1);
 var import_https_proxy_agent = __toESM(require_dist3(), 1);
+import {
+  createCipheriv,
+  createDecipheriv,
+  randomBytes,
+  scryptSync
+} from "crypto";
+function encryptObject(obj, password) {
+  const jsonString = JSON.stringify(obj);
+  const salt = randomBytes(16);
+  const key = scryptSync(password, salt, 32);
+  const iv = randomBytes(12);
+  const cipher = createCipheriv("aes-256-gcm", key, iv);
+  const encrypted = Buffer.concat([
+    cipher.update(jsonString, "utf8"),
+    cipher.final()
+  ]);
+  const authTag = cipher.getAuthTag();
+  const resultBuffer = Buffer.concat([salt, iv, authTag, encrypted]);
+  return resultBuffer.toString("base64");
+}
+function decryptObject(encryptedString, password) {
+  try {
+    const dataBuffer = Buffer.from(encryptedString, "base64");
+    const salt = dataBuffer.subarray(0, 16);
+    const iv = dataBuffer.subarray(16, 28);
+    const authTag = dataBuffer.subarray(28, 44);
+    const encrypted = dataBuffer.subarray(44);
+    const key = scryptSync(password, salt, 32);
+    const decipher = createDecipheriv("aes-256-gcm", key, iv);
+    decipher.setAuthTag(authTag);
+    const decrypted = Buffer.concat([
+      decipher.update(encrypted),
+      decipher.final()
+    ]);
+    const jsonString = decrypted.toString("utf8");
+    return JSON.parse(jsonString);
+  } catch (error) {
+    console.error("Decryption failed:", error.message);
+    return null;
+  }
+}
 async function initPocketBaseClient(proxy_credentials) {
   const pb = new Client(proxy_credentials.host);
   await pb.collection("_superusers").authWithPassword(proxy_credentials.email, proxy_credentials.password);
@@ -32115,6 +32156,37 @@ class AppDatabase {
   constructor(pb) {
     this.pb = pb;
   }
+  getCredentials(password) {
+    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 addNewCredential(password, payload) {
+    let credentials = this.getCredentials(password);
+    if (credentials) {
+      let found = false;
+      for (const credential of credentials) {
+        if (credential.name === payload.name && credential.exchange === payload.exchange) {
+          credential.api_key = payload.api_key;
+          credential.api_secret = payload.api_secret;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        credentials.push(payload);
+      }
+      await this.saveCredentials(password, credentials);
+    }
+  }
   async getAllSymbolsFromPositions(options) {
     const { no_position = false, kind = "long", custom_filter } = options || {};
     let filter = custom_filter || (no_position ? `quantity = 0` : undefined);
@@ -35873,6 +35945,9 @@ class ExchangeAccount {
     this.app_db = options.app_db;
     this.main_exchange = options.main_exchange;
   }
+  getDBInstance() {
+    return this.app_db;
+  }
   async getLiveExchangeInstance(payload) {
     const symbol_config = await this.recomputeSymbolConfig({
       symbol: payload.symbol,
@@ -36133,12 +36208,7 @@ class ExchangeAccount {
     };
   }
   async determineAmountToBuy(payload) {
-    const {
-      orders,
-      kind,
-      decimal_places = "%.3f",
-      symbol
-    } = payload;
+    const { orders, kind, decimal_places = "%.3f", symbol } = payload;
     const totalQuantity = orders.reduce((sum, order) => sum + (order.quantity || 0), 0);
     let runningTotal = to_f(totalQuantity, decimal_places);
     let sortedOrders = [...orders].sort((a, b) => (a.entry || 0) - (b.entry || 0));
@@ -37357,7 +37427,7 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = await payload.getCredentials(payload.account, exchange);
+    const credentials = payload.getCredentials(payload.account, exchange);
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -37398,11 +37468,10 @@ class App {
     this.getCredentials = getCredentials;
   }
   async getExchangeAccount(account) {
-    const credentials = this.getCredentials(account.owner, account.exchange);
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: credentials
+      getCredentials: this.getCredentials
     });
   }
   async syncAccount(payload) {
@@ -37756,10 +37825,30 @@ class App {
 async function initApp(payload) {
   const pb = await initPocketBaseClient(payload.db);
   const app_db = new AppDatabase(pb);
-  const app = new App(app_db, payload.getCredentials);
+  let _getCredentials = payload.getCredentials;
+  if (payload.password) {
+    try {
+      const credentials = app_db.getCredentials(payload.password);
+      if (credentials) {
+        _getCredentials = (account, exchange) => {
+          const credential = credentials.find((c) => c.name === account && c.exchange === exchange);
+          if (!credential) {
+            throw new Error(`Missing API Key or Secret for account '${account}' in .env file. Please check your environment variables.`);
+          }
+          return {
+            api_key: credential?.api_key,
+            api_secret: credential?.api_secret
+          };
+        };
+      }
+    } catch (error) {
+      console.log("error", error);
+    }
+  }
+  const app = new App(app_db, _getCredentials);
   return app;
 }
-async function getCredentials(account, exchange) {
+function getCredentials(account, exchange) {
   console.log(`Fetching credentials for account: ${account}, exchange: ${exchange}`);
   let apiKey;
   let apiSecret;
@@ -37794,14 +37883,15 @@ async function getCredentials(account, exchange) {
     api_secret: apiSecret
   };
 }
-async function initialize() {
+async function initialize(password) {
   const app = await initApp({
     db: {
       host: process.env.POCKETBASE_HOST,
       email: process.env.POCKETBASE_EMAIL,
       password: process.env.POCKETBASE_PASSWORD
     },
-    getCredentials: (account, exchange) => getCredentials
+    password,
+    getCredentials
   });
   return app;
 }

package/package.json

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