diff --git a/README.md b/README.md index 88832c5..91b7768 100644 --- a/README.md +++ b/README.md @@ -131,10 +131,10 @@ See [doc](doc/README.md) ## Debugging -You can enable some protocol debugging output using `NODE_DEBUG` environment variable: +You can enable some protocol debugging output using `DEBUG` environment variable: ```bash -NODE_DEBUG="minecraft-protocol" node [...] +DEBUG="minecraft-protocol" node [...] ``` ## History diff --git a/package.json b/package.json index 021e108..12a2f4c 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ }, "dependencies": { "buffer-equal": "^1.0.0", + "debug": "^2.2.0", "endian-toggle": "^0.0.0", "lodash.get": "^4.1.2", "lodash.merge": "^4.3.0", diff --git a/src/client.js b/src/client.js index 2b394ba..addae5d 100644 --- a/src/client.js +++ b/src/client.js @@ -1,5 +1,5 @@ const EventEmitter = require('events').EventEmitter; -const debug = require('./debug'); +const debug = require('debug')('minecraft-protocol'); const compression = require('./transforms/compression'); const framing = require('./transforms/framing'); const crypto = require('crypto'); diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js index 37e1b8c..2123948 100644 --- a/src/client/autoVersion.js +++ b/src/client/autoVersion.js @@ -1,5 +1,5 @@ const ping = require('../ping'); -const debug = require('../debug'); +const debug = require('debug')('minecraft-protocol'); const states = require('../states'); const assert = require('assert'); const minecraft_data = require('minecraft-data'); diff --git a/src/client/encrypt.js b/src/client/encrypt.js index deb7993..81cff81 100644 --- a/src/client/encrypt.js +++ b/src/client/encrypt.js @@ -1,7 +1,7 @@ const crypto = require('crypto'); const yggserver = require('yggdrasil').server({}); const ursa=require("../ursa"); -const debug = require("../debug"); +const debug = require('debug')('minecraft-protocol'); module.exports = function(client, options) { client.once('encryption_begin', onEncryptionKeyRequest); diff --git a/src/debug.js b/src/debug.js deleted file mode 100644 index 7ea4f99..0000000 --- a/src/debug.js +++ /dev/null @@ -1,18 +0,0 @@ -const util = require('util'); - -let debug; -if(process.env.NODE_DEBUG && /(minecraft-protocol|mc-proto)/.test(process.env.NODE_DEBUG)) { - const pid = process.pid; - debug = function(x) { - // if console is not set up yet, then skip this. - if(!console.error) - return; - console.error('MC-PROTO: %d', pid, - util.format.apply(util, arguments).slice(0, 500)); - }; -} else { - debug = function() { - }; -} - -module.exports = debug;