Merge pull request #490 from tiagosiebler/webpack

chore(v2.13.20): bump webpack & nanoid modules, update webpack config

Author: tiagosiebler

.gitignore

@@ -10,3 +10,4 @@ testfile.ts
 privaterepotracker
 restClientRegex.ts
 .DS_Store
+dist

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "binance",
-  "version": "2.13.19",
+  "version": "2.13.20",
   "description": "Node.js & JavaScript SDK for Binance REST APIs & WebSockets, with TypeScript & end-to-end tests.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -47,10 +47,9 @@
     "typescript": "^4.7.4"
   },
   "optionalDependencies": {
-    "https-proxy-agent": "^6.1.0",
     "source-map-loader": "^2.0.0",
     "ts-loader": "^8.0.11",
-    "webpack": "^5.4.0"
+    "webpack": "^5.97.1"
   },
   "keywords": [
     "binance",

package.json

@@ -8,7 +8,6 @@ export * from './types/shared';
 export * from './types/spot';
 export * from './types/websockets';
 export * from './usdm-client';
-export * from './util/proxy';
 export * from './util/requestUtils';
 export * from './util/typeGuards';
 export * from './util/WsStore';

src/index.ts

@@ -24,3 +24,42 @@ export function getTestProxy(): AxiosRequestConfig {
     },
   };
 }
+
+/**
+ * Returns an axios & websocket compatible proxy config using brightdata credentials
+ */
+export function getHttpsProxyAgent(
+  host: string,
+  port: string | number,
+  user: string,
+  pass: string,
+): AxiosRequestConfig | undefined {
+  try {
+    // Optional dependency that might be missing
+    const { HttpsProxyAgent } = require('https-proxy-agent');
+
+    const url = `https://${user}:${pass}@${host}:${port}`;
+    return new HttpsProxyAgent(url);
+  } catch (e) {
+    const msg = `Failed to prepare https proxy config - proxy agent dependency not installed`;
+    console.error(new Date(), msg, e);
+    throw new Error(msg);
+  }
+}
+
+export function getWsProxyAgent(
+  host: string,
+  port: string | number,
+  user: string,
+  pass: string,
+): any {
+  try {
+    const { SocksProxyAgent } = require('socks-proxy-agent');
+    const url = `socks://${user}:${pass}@${host}:${port}`;
+    return new SocksProxyAgent(url);
+  } catch (e) {
+    const msg = `Failed to prepare WS proxy config - proxy agent dependency not installed`;
+    console.error(new Date(), msg, e);
+    throw new Error(msg);
+  }
+}

src/util/proxy.ts

@@ -1,8 +1,4 @@
-import {
-  MainClient,
-  NewSpotOrderParams,
-  getHttpsProxyAgent,
-} from '../../src/index';
+import { MainClient, NewSpotOrderParams } from '../../src/index';
 import { getTestProxy } from '../proxy.util';
 
 describe('Private Spot REST API Endpoints', () => {

test/proxy.util.ts

@@ -33,7 +33,10 @@ function generateConfig(name) {
 
         {
           test: /\.m?js$/,
-          exclude: /(node_modules|bower_components|samples|lib|test|coverage)/,
+          exclude: [
+            /(node_modules|bower_components|samples|lib|test|coverage)/,
+            '/lib/util/proxy.js'
+          ],
           use: {
             loader: 'babel-loader',
             options: {
@@ -46,13 +49,13 @@ function generateConfig(name) {
           }
         }
       ]
-    }
+    },
   };
 
   config.plugins = [
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
-    }),
+    // new webpack.DefinePlugin({
+    //   'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+    // }),
     // new BundleAnalyzerPlugin({
     //   defaultSizes: 'stat',
     //   analyzerMode: 'static',