@gbozee/ultimate 0.0.2-112 → 0.0.2-113

package/dist/index.cjs

@@ -59851,7 +59851,10 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = payload.getCredentials(payload.account, exchange);
+    const credentials = await payload.getCredentials({
+      account: payload.account,
+      exchange
+    });
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -59882,7 +59885,9 @@ async function getExchangeAccount(payload) {
   const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
-    getCredentials: payload.getCredentials,
+    getCredentials: async (_payload) => {
+      return await payload.getCredentials({ ..._payload, app_db });
+    },
     proxyAgent,
     canWithdraw
   });
@@ -59906,7 +59911,7 @@ class App {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials,
+      getCredentials: (p) => this.getCredentials({ ...p, app_db: this.app_db }),
       proxyOptions: this.proxyOptions,
       canWithdraw: this.proxyOptions?.canWithdraw
     });
@@ -60224,7 +60229,8 @@ async function initApp(payload) {
         password: payload.password
       });
       if (credentials) {
-        _getCredentials = (account, exchange) => {
+        _getCredentials = async (payload2) => {
+          const { account, exchange } = payload2;
           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.`);
@@ -60252,41 +60258,16 @@ async function initApp(payload) {
   });
   return app;
 }
-function getCredentials(account, exchange) {
+async function getCredentials(payload) {
+  const { account, exchange, app_db } = payload;
   console.log(`Fetching credentials for account: ${account}, exchange: ${exchange}`);
-  let apiKey;
-  let apiSecret;
-  switch (account) {
-    case "sub_account":
-      apiKey = process.env.SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.SUB_ACCOUNT_API_SECRET;
-      break;
-    case "tola_sub_account":
-      apiKey = process.env.TOLA_SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.TOLA_SUB_ACCOUNT_API_SECRET;
-      break;
-    case "gbozee1_sub_account":
-      apiKey = process.env.GBOZEE1_SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.GBOZEE1_SUB_ACCOUNT_API_SECRET;
-      break;
-    case "tomi_account":
-      apiKey = process.env.TOMI_ACCOUNT_API_KEY;
-      apiSecret = process.env.TOMI_ACCOUNT_API_SECRET;
-      break;
-    case "main_account":
-    default:
-      apiKey = process.env.MAIN_ACCOUNT_API_KEY;
-      apiSecret = process.env.MAIN_ACCOUNT_API_SECRET;
-      break;
-  }
-  if (!apiKey || !apiSecret) {
+  const password = process.env.POCKETBASE_PASSWORD;
+  const credentials = await app_db.getCredentials({ password });
+  const result = credentials.find((c) => c.name === account && c.exchange === exchange);
+  if (!result.api_key || !result.api_secret) {
     throw new Error(`Missing API Key or Secret for account '${account}' in .env file. Please check your environment variables.`);
   }
-  return {
-    api_key: apiKey,
-    api_secret: apiSecret,
-    email: process.env.POCKETBASE_EMAIL
-  };
+  return result;
 }
 async function initialize(payload) {
   const { password, proxy, ignore_proxy, canWithdraw } = payload;

package/dist/index.d.ts

@@ -2251,11 +2251,15 @@ declare class ExchangeAccount$1 {
 declare function getExchangeAccount(payload: {
 	account: ExchangeType;
 	app_db: AppDatabase;
-	getCredentials: (account: string, exchange: string) => {
+	getCredentials: (payload: {
+		account: string;
+		exchange: string;
+		app_db: AppDatabase;
+	}) => Promise<{
 		api_key: string;
 		api_secret: string;
 		email: string;
-	};
+	}>;
 	proxyOptions?: {
 		proxy?: any;
 		ignore_proxy?: boolean;
@@ -2270,11 +2274,14 @@ declare class App {
 		canWithdraw?: boolean;
 	};
 	private getCredentials;
-	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => {
+	constructor(app_db: AppDatabase, getCredentials: (payload: {
+		account: string;
+		exchange: string;
+	}) => Promise<{
 		api_key: string;
 		api_secret: string;
 		email: string;
-	}, proxyOptions?: {
+	}>, proxyOptions?: {
 		proxy?: any;
 		ignore_proxy?: boolean;
 		canWithdraw?: boolean;
@@ -2491,21 +2498,25 @@ export declare function initApp(payload: {
 	password?: string;
 	salt?: string;
 	email?: string;
-	getCredentials: (account: string, exchange: string) => {
+	getCredentials: (payload: {
+		account: string;
+		exchange: string;
+		app_db: AppDatabase;
+	}) => Promise<{
 		api_key: string;
 		api_secret: string;
 		email: string;
-	};
+	}>;
 	proxy?: any;
 	ignore_proxy?: boolean;
 	canWithdraw?: boolean;
 	triggerToken?: string;
 }): Promise<App>;
-declare function getCredentials(account: string, exchange: string): {
-	api_key: string;
-	api_secret: string;
-	email: string;
-};
+declare function getCredentials(payload: {
+	account: string;
+	exchange: string;
+	app_db: AppDatabase;
+}): Promise<any>;
 export declare function initialize(payload: {
 	password?: string;
 	proxy?: any;

package/dist/index.js

@@ -59801,7 +59801,10 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = payload.getCredentials(payload.account, exchange);
+    const credentials = await payload.getCredentials({
+      account: payload.account,
+      exchange
+    });
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -59832,7 +59835,9 @@ async function getExchangeAccount(payload) {
   const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
-    getCredentials: payload.getCredentials,
+    getCredentials: async (_payload) => {
+      return await payload.getCredentials({ ..._payload, app_db });
+    },
     proxyAgent,
     canWithdraw
   });
@@ -59856,7 +59861,7 @@ class App {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials,
+      getCredentials: (p) => this.getCredentials({ ...p, app_db: this.app_db }),
       proxyOptions: this.proxyOptions,
       canWithdraw: this.proxyOptions?.canWithdraw
     });
@@ -60174,7 +60179,8 @@ async function initApp(payload) {
         password: payload.password
       });
       if (credentials) {
-        _getCredentials = (account, exchange) => {
+        _getCredentials = async (payload2) => {
+          const { account, exchange } = payload2;
           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.`);
@@ -60202,41 +60208,16 @@ async function initApp(payload) {
   });
   return app;
 }
-function getCredentials(account, exchange) {
+async function getCredentials(payload) {
+  const { account, exchange, app_db } = payload;
   console.log(`Fetching credentials for account: ${account}, exchange: ${exchange}`);
-  let apiKey;
-  let apiSecret;
-  switch (account) {
-    case "sub_account":
-      apiKey = process.env.SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.SUB_ACCOUNT_API_SECRET;
-      break;
-    case "tola_sub_account":
-      apiKey = process.env.TOLA_SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.TOLA_SUB_ACCOUNT_API_SECRET;
-      break;
-    case "gbozee1_sub_account":
-      apiKey = process.env.GBOZEE1_SUB_ACCOUNT_API_KEY;
-      apiSecret = process.env.GBOZEE1_SUB_ACCOUNT_API_SECRET;
-      break;
-    case "tomi_account":
-      apiKey = process.env.TOMI_ACCOUNT_API_KEY;
-      apiSecret = process.env.TOMI_ACCOUNT_API_SECRET;
-      break;
-    case "main_account":
-    default:
-      apiKey = process.env.MAIN_ACCOUNT_API_KEY;
-      apiSecret = process.env.MAIN_ACCOUNT_API_SECRET;
-      break;
-  }
-  if (!apiKey || !apiSecret) {
+  const password = process.env.POCKETBASE_PASSWORD;
+  const credentials = await app_db.getCredentials({ password });
+  const result = credentials.find((c) => c.name === account && c.exchange === exchange);
+  if (!result.api_key || !result.api_secret) {
     throw new Error(`Missing API Key or Secret for account '${account}' in .env file. Please check your environment variables.`);
   }
-  return {
-    api_key: apiKey,
-    api_secret: apiSecret,
-    email: process.env.POCKETBASE_EMAIL
-  };
+  return result;
 }
 async function initialize(payload) {
   const { password, proxy, ignore_proxy, canWithdraw } = payload;

package/dist/mcp-server.cjs

@@ -66531,7 +66531,10 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = payload.getCredentials(payload.account, exchange);
+    const credentials = await payload.getCredentials({
+      account: payload.account,
+      exchange
+    });
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -66562,7 +66565,9 @@ async function getExchangeAccount(payload) {
   const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
-    getCredentials: payload.getCredentials,
+    getCredentials: async (_payload) => {
+      return await payload.getCredentials({ ..._payload, app_db });
+    },
     proxyAgent,
     canWithdraw
   });
@@ -66586,7 +66591,7 @@ class App {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials,
+      getCredentials: (p) => this.getCredentials({ ...p, app_db: this.app_db }),
       proxyOptions: this.proxyOptions,
       canWithdraw: this.proxyOptions?.canWithdraw
     });
@@ -66904,7 +66909,8 @@ async function initApp(payload) {
         password: payload.password
       });
       if (credentials) {
-        _getCredentials = (account, exchange) => {
+        _getCredentials = async (payload2) => {
+          const { account, exchange } = payload2;
           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.`);
@@ -66942,11 +66948,19 @@ async function getApp() {
       password: process.env.POCKETBASE_PASSWORD
     },
     password: process.env.POCKETBASE_PASSWORD,
-    getCredentials: (account, exchange) => {
+    getCredentials: async (payload) => {
+      const { account, exchange, app_db } = payload;
+      const credentials = await app_db.getCredentials({
+        password: process.env.POCKETBASE_PASSWORD
+      });
+      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: "",
-        api_secret: "",
-        email: ""
+        api_key: credential.api_key,
+        api_secret: credential.api_secret,
+        email: credential.email
       };
     }
   });

package/dist/mcp-server.js

@@ -66508,7 +66508,10 @@ function getExchangeKlass(exchange) {
   const func = exchange === "binance" ? BinanceExchange : BybitExchange;
   const clientFunc = exchange === "binance" ? initClient : initClient2;
   return async (payload) => {
-    const credentials = payload.getCredentials(payload.account, exchange);
+    const credentials = await payload.getCredentials({
+      account: payload.account,
+      exchange
+    });
     const client = await clientFunc(credentials, {
       type: "future",
       proxyAgent: payload.proxyAgent
@@ -66539,7 +66542,9 @@ async function getExchangeAccount(payload) {
   const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
-    getCredentials: payload.getCredentials,
+    getCredentials: async (_payload) => {
+      return await payload.getCredentials({ ..._payload, app_db });
+    },
     proxyAgent,
     canWithdraw
   });
@@ -66563,7 +66568,7 @@ class App {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials,
+      getCredentials: (p) => this.getCredentials({ ...p, app_db: this.app_db }),
       proxyOptions: this.proxyOptions,
       canWithdraw: this.proxyOptions?.canWithdraw
     });
@@ -66881,7 +66886,8 @@ async function initApp(payload) {
         password: payload.password
       });
       if (credentials) {
-        _getCredentials = (account, exchange) => {
+        _getCredentials = async (payload2) => {
+          const { account, exchange } = payload2;
           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.`);
@@ -66919,11 +66925,19 @@ async function getApp() {
       password: process.env.POCKETBASE_PASSWORD
     },
     password: process.env.POCKETBASE_PASSWORD,
-    getCredentials: (account, exchange) => {
+    getCredentials: async (payload) => {
+      const { account, exchange, app_db } = payload;
+      const credentials = await app_db.getCredentials({
+        password: process.env.POCKETBASE_PASSWORD
+      });
+      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: "",
-        api_secret: "",
-        email: ""
+        api_key: credential.api_key,
+        api_secret: credential.api_secret,
+        email: credential.email
       };
     }
   });

package/package.json

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