add connect option to createClient for multiple (ping + normal) connections for the proxy examples, use the normal options for pinging in autoVersion to have that option available and fix the proxy examples accordingly

doc/README.md

@@ -21,6 +21,9 @@ automatically logged in and validated against mojang's auth.
  * customPackets (optional) : an object index by version/state/direction/name, see client_custom_packet for an example
  * errorHandler : A way to override the default error handler for client errors. A function that takes a Client and an error.
  The default kicks the client.
+ * stream : a stream to use as connection
+ * connect : a function taking the client as parameter and that should client.setSocket(socket) 
+ and client.emit('connect') when appropriate (see the proxy examples for an example of use)
 
 ## mc.Server(version,[customPackets])
 

examples/client_http_proxy/client_http_proxy.js

@@ -9,6 +9,8 @@ if(process.argv.length < 6 || process.argv.length > 8) {
 const proxyHost=process.argv[4];
 const proxyPort=process.argv[5];
 
+const client = mc.createClient({
+  connect:(client) => {
       const req = Http.request({
         host: proxyHost,
         port: proxyPort,
@@ -18,8 +20,10 @@ const req = Http.request({
       req.end();
 
       req.on("connect", function(res, stream) {
-  const client = mc.createClient({
+        client.setSocket(stream);
-    stream: stream,
+        client.emit('connect');
+      });
+    },
     username: process.argv[6] ? process.argv[6] : "echo",
   password: process.argv[7]
 });
@@ -43,5 +47,3 @@ req.on("connect", function(res, stream) {
   }
 });
 
-});
-

examples/client_http_proxy/package.json

@@ -2,7 +2,6 @@
   "name": "node-minecraft-protocol-example",
   "version": "0.0.0",
   "private": true,
-  "dependencies": {
+  "dependencies": {},
-  },
   "description": "A node-minecraft-protocol example"
 }

examples/client_socks_proxy/client_socks_proxy.js

@@ -9,6 +9,8 @@ if(process.argv.length < 6 || process.argv.length > 8) {
 const proxyHost=process.argv[4];
 const proxyPort=process.argv[5];
 
+const client = mc.createClient({
+  connect: client => {
     socks.createConnection({
         proxy: {
           ipaddress: proxyHost,
@@ -24,8 +26,11 @@ socks.createConnection({
           console.log(err);
           return;
         }
-  const client = mc.createClient({
+
-    stream: socket,
+      client.setSocket(socket);
+      client.emit('connect');
+    });
+  },
   username: process.argv[6] ? process.argv[6] : "echo",
   password: process.argv[7]
 });
@@ -48,5 +53,3 @@ socks.createConnection({
     client.write('chat', {message: msg});
   }
 });
-});
-

src/client/autoVersion.js

@@ -9,9 +9,8 @@ const minecraft_data = require('minecraft-data');
 module.exports = function(client, options) {
   client.wait_connect = true; // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
   debug('pinging',options.host);
-  const pingOptions = {host: options.host, port: options.port};
   // TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
-  ping(pingOptions, function(err, response) {
+  ping(options, function(err, response) {
     if (err) throw err; // hmm
     debug('ping response',response);
     // TODO: could also use ping pre-connect to save description, type, max players, etc.

src/client/tcp_dns.js

@@ -5,6 +5,7 @@ module.exports = function(client, options) {
   options.port = options.port || 25565;
   options.host = options.host || 'localhost';
 
+  if(!options.connect)
     options.connect = (client) => {
     if (options.stream) {
       client.setSocket(options.stream);