@gbozee/ultimate 0.0.2-26 → 0.0.2-27

package/dist/index.d.ts

@@ -801,10 +801,17 @@ declare class ExchangeAccount$1 {
 }
 declare class App {
 	app_db: AppDatabase;
+	proxyOptions?: {
+		proxy?: any;
+		ignore_proxy?: boolean;
+	};
 	private getCredentials;
 	constructor(app_db: AppDatabase, getCredentials: (account: string, exchange: string) => {
 		api_key: string;
 		api_secret: string;
+	}, proxyOptions?: {
+		proxy?: any;
+		ignore_proxy?: boolean;
 	});
 	getExchangeAccount(account: ExchangeType): Promise<ExchangeAccount$1>;
 	syncAccount(payload: {
@@ -921,8 +928,14 @@ export declare function initApp(payload: {
 		api_key: string;
 		api_secret: string;
 	};
+	proxy?: any;
+	ignore_proxy?: boolean;
+}): Promise<App>;
+export declare function initialize(payload: {
+	password?: string;
+	proxy?: any;
+	ignore_proxy?: boolean;
 }): Promise<App>;
-export declare function initialize(password?: string): Promise<App>;
 
 export {
 	ExchangeAccount$1 as ExchangeAccount,

package/dist/index.js

@@ -33799,16 +33799,20 @@ function createGapPairs(arr, gap, item) {
 async function initClient(credentials, options) {
   const { proxyAgent, type = "future" } = options || {};
   try {
+    const axiosOptions = proxyAgent ? {
+      httpAgent: proxyAgent,
+      httpsAgent: proxyAgent
+    } : undefined;
+    if (!proxyAgent) {
+      console.log("using no proxy");
+    }
     const Klass = type === "future" ? import_binance.USDMClient : type === "spot" ? import_binance.MainClient : import_binance.MainClient;
     const client = new Klass({
       api_key: credentials.api_key,
       api_secret: credentials.api_secret,
       recvWindow: 1e4,
       beautifyResponses: true
-    }, {
-      httpAgent: proxyAgent,
-      httpsAgent: proxyAgent
-    });
+    }, axiosOptions);
     return client;
   } catch (e2) {
     console.log(e2);
@@ -34628,14 +34632,15 @@ var import_bybit_api = __toESM(require_lib2(), 1);
 async function initClient2(credentials, options) {
   const { proxyAgent } = options;
   try {
+    const axiosOptions = proxyAgent ? {
+      httpAgent: proxyAgent,
+      httpsAgent: proxyAgent
+    } : undefined;
     const client = new import_bybit_api.RestClientV5({
       key: credentials.api_key,
       secret: credentials.api_secret,
       recv_window: 1e4
-    }, {
-      httpAgent: proxyAgent,
-      httpsAgent: proxyAgent
-    });
+    }, axiosOptions);
     return client;
   } catch (e2) {
     console.log(e2);
@@ -37501,8 +37506,9 @@ function getExchangeKlass(exchange) {
   };
 }
 async function getExchangeAccount(payload) {
-  const { account, app_db } = payload;
-  const proxyAgent = await app_db.getProxyForAccount(account);
+  const { account, app_db, proxyOptions = {} } = payload;
+  const _proxyAgent = await app_db.getProxyForAccount(account);
+  const proxyAgent = proxyOptions?.ignore_proxy ? null : proxyOptions?.proxy || _proxyAgent;
   const exchange_instance = await getExchangeKlass(account.exchange)({
     account: account.owner,
     getCredentials: payload.getCredentials,
@@ -37517,16 +37523,19 @@ async function getExchangeAccount(payload) {
 // src/app.ts
 class App {
   app_db;
+  proxyOptions;
   getCredentials;
-  constructor(app_db, getCredentials) {
+  constructor(app_db, getCredentials, proxyOptions) {
     this.app_db = app_db;
     this.getCredentials = getCredentials;
+    this.proxyOptions = proxyOptions;
   }
   async getExchangeAccount(account) {
     return await getExchangeAccount({
       account,
       app_db: this.app_db,
-      getCredentials: this.getCredentials
+      getCredentials: this.getCredentials,
+      proxyOptions: this.proxyOptions
     });
   }
   async syncAccount(payload) {
@@ -37913,7 +37922,10 @@ async function initApp(payload) {
       console.log("error", error);
     }
   }
-  const app = new App(app_db, _getCredentials);
+  const app = new App(app_db, _getCredentials, {
+    proxy: payload.proxy,
+    ignore_proxy: payload.ignore_proxy
+  });
   return app;
 }
 function getCredentials(account, exchange) {
@@ -37951,7 +37963,8 @@ function getCredentials(account, exchange) {
     api_secret: apiSecret
   };
 }
-async function initialize(password) {
+async function initialize(payload) {
+  const { password, proxy, ignore_proxy } = payload;
   const app = await initApp({
     db: {
       host: process.env.POCKETBASE_HOST,
@@ -37959,7 +37972,9 @@ async function initialize(password) {
       password: process.env.POCKETBASE_PASSWORD
     },
     password,
-    getCredentials
+    getCredentials,
+    proxy,
+    ignore_proxy
   });
   return app;
 }

package/package.json

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