http-proxy-to-socks - npm Package Compare versions

Comparing version 1.0.4 to 1.1.0

CHANGELOG.md

 # CHANGELOG
 
+## 1.1.0
+- src: Support setting local address of the http-service.
+- src: Format timestamp of logs.
+
 ## 1.0.4
@@ -4,0 +8,0 @@ - src: Support setting the `--level` option in `createServer()`.

lib/cli.js

@@ -17,3 +17,3 @@ 'use strict';
 
-var optionNames = ['socks', 'port', 'level', 'config'];
+var optionNames = ['socks', 'port', 'level', 'config', 'host'];
 
@@ -54,3 +54,3 @@ function getFileConfig(filePath) {
 function main() {
-  cli.version(version).option('-s, --socks [socks]', 'specify your socks proxy host, default: 127.0.0.1:1080').option('-p, --port [port]', 'specify the listening port of http proxy server, default: 8080').option('-c, --config [config]', 'read configs from file in json format').option('--level [level]', 'log level, vals: info, error').parse(process.argv);
+  cli.version(version).option('-s, --socks [socks]', 'specify your socks proxy host, default: 127.0.0.1:1080').option('-p, --port [port]', 'specify the listening port of http proxy server, default: 8080').option('-l, --host [host]', 'specify the listening host of http proxy server, default: 127.0.0.1').option('-c, --config [config]', 'read configs from file in json format').option('--level [level]', 'log level, vals: info, error').parse(process.argv);
 
@@ -57,0 +57,0 @@ var options = getOptionsArgs(cli);

lib/logger.js

 'use strict';
 
 var winston = require('winston');
+var chalk = require('chalk');
 
-var Logger = winston.Logger,
+var format = winston.format,
+    createWinstonLogger = winston.createLogger,
     transports = winston.transports;
 var Console = transports.Console;
+var combine = format.combine,
+    printf = format.printf;
 
@@ -15,2 +19,17 @@
 
+function fillDigit(num) {
+  var str = String(num);
+  if (str.length === 1) {
+    return '0' + str;
+  }
+
+  return str;
+}
+
+function getFormatedDate() {
+  var date = new Date();
+
+  return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + (' ' + fillDigit(date.getHours()) + ':' + fillDigit(date.getMinutes()) + ':' + fillDigit(date.getSeconds()));
+}
+
 function createTransports() {
@@ -20,6 +39,19 @@ return [new Console(Object.assign({}, DEFAULT_COMMON_OPTIONS))];
 
+function colorLevel(str) {
+  if (str === 'error') {
+    return chalk.red(str);
+  } else if (str === 'info') {
+    return chalk.green(str);
+  }
+
+  return str;
+}
+
 function createLogger() {
   var level = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'warn';
 
-  return new Logger({
+  return createWinstonLogger({
+    format: combine(printf(function (info) {
+      return getFormatedDate() + ' - ' + colorLevel(info.level) + ' ' + info.message;
+    })),
     level: level,
@@ -26,0 +58,0 @@ transports: createTransports()

lib/server.js

@@ -11,2 +11,3 @@ 'use strict';
 var DEFAULT_OPTIONS = {
+  host: '127.0.0.1',
   socks: '127.0.0.1:1080',
@@ -25,9 +26,10 @@ proxyListReloadTimeout: 60,
   var port = options.port,
-      socks = options.socks;
+      socks = options.socks,
+      host = options.host;
 
   // eslint-disable-next-line
 
-  console.log('SOCKS: ' + socks + '\nhttp-proxy listening: http://127.0.0.1:' + port);
+  console.log('SOCKS: ' + socks + '\nhttp-proxy listening: ' + host + ':' + port);
 
-  return createProxyServer(options).listen(port);
+  return createProxyServer(options).listen(port, host);
 }
@@ -34,0 +36,0 @@

package.json

 {
   "name": "http-proxy-to-socks",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "hpts(http-proxy-to-socks) is a nodejs client to convert socks proxy into http proxy",
@@ -26,5 +26,6 @@ "main": "lib/server.js",
   "dependencies": {
+    "chalk": "^2.4.1",
     "commander": "^2.9.0",
     "socks": "^1.1.10",
-    "winston": "^2.3.1"
+    "winston": "^3.1.0"
   },
@@ -31,0 +32,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

15787

increased by7.48%

Lines of code

293

increased by10.57%

Worsened metrics

Dependency count

4

increased by33.33%

Dependency changes

• + Addedchalk@^2.4.1

• + Added@colors/colors@1.6.0(transitive)

• + Added@dabh/diagnostics@2.0.3(transitive)

• + Added@types/triple-beam@1.3.5(transitive)

• + Addedansi-styles@3.2.1(transitive)

• + Addedasync@3.2.6(transitive)

• + Addedchalk@2.4.2(transitive)

• + Addedcolor@3.2.1(transitive)

• + Addedcolor-convert@1.9.3(transitive)

• + Addedcolor-name@1.1.3(transitive)

• + Addedcolor-string@1.9.1(transitive)

• + Addedcolorspace@1.1.4(transitive)

• + Addedenabled@2.0.0(transitive)

• + Addedescape-string-regexp@1.0.5(transitive)

• + Addedfecha@4.2.3(transitive)

• + Addedfn.name@1.1.0(transitive)

• + Addedhas-flag@3.0.0(transitive)

• + Addedinherits@2.0.4(transitive)

• + Addedis-arrayish@0.3.2(transitive)

• + Addedis-stream@2.0.1(transitive)

• + Addedkuler@2.0.0(transitive)

• + Addedlogform@2.7.0(transitive)

• + Addedms@2.1.3(transitive)

• + Addedone-time@1.0.0(transitive)

• + Addedreadable-stream@3.6.2(transitive)

• + Addedsafe-buffer@5.2.1(transitive)

• + Addedsafe-stable-stringify@2.5.0(transitive)

• + Addedsimple-swizzle@0.2.2(transitive)

• + Addedstring_decoder@1.3.0(transitive)

• + Addedsupports-color@5.5.0(transitive)

• + Addedtext-hex@1.0.0(transitive)

• + Addedtriple-beam@1.4.1(transitive)

• + Addedutil-deprecate@1.0.2(transitive)

• + Addedwinston@3.17.0(transitive)

• + Addedwinston-transport@4.9.0(transitive)

• - Removedasync@2.6.4(transitive)

• - Removedcolors@1.0.3(transitive)

• - Removedcycle@1.0.3(transitive)

• - Removedeyes@0.1.8(transitive)

• - Removedisstream@0.1.2(transitive)

• - Removedlodash@4.17.21(transitive)

• - Removedwinston@2.4.7(transitive)

• Updatedwinston@^3.1.0