AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-10-01 23:20:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor createClient to use createClientStream

Browse Source
This commit is contained in:
deathcap 2016-01-18 13:13:20 -08:00
parent b33dd88ac2
commit 9a781ca662
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/createClient.js
View File

@ -2,6 +2,7 @@ var ursa=require("./ursa");
var net = require('net'); var net = require('net');
var dns = require('dns'); var dns = require('dns');
var Client = require('./client'); var Client = require('./client');
var createClientStream = require('./createClientStream');
var assert = require('assert'); var assert = require('assert');
var crypto = require('crypto'); var crypto = require('crypto');
var yggdrasil = require('yggdrasil')({}); var yggdrasil = require('yggdrasil')({});
@ -36,21 +37,14 @@ function createClient(options) {
assert.ok(options.username, "username is required"); assert.ok(options.username, "username is required");
var haveCredentials = options.password != null || (clientToken != null && options.session != null); var haveCredentials = options.password != null || (clientToken != null && options.session != null);
var keepAlive = options.keepAlive == null ? true : options.keepAlive;
var checkTimeoutInterval = options.checkTimeoutInterval || 10 * 1000;
var optVersion = options.version || require("./version").defaultVersion; var optVersion = options.version || require("./version").defaultVersion;
var mcData=require("minecraft-data")(optVersion); var mcData=require("minecraft-data")(optVersion);
var version = mcData.version; var version = mcData.version;
var client = createClientStream(options);
var client = new Client(false,version.majorVersion);
client.on('connect', onConnect); client.on('connect', onConnect);
if(keepAlive) client.on('keep_alive', onKeepAlive);
client.once('encryption_begin', onEncryptionKeyRequest); client.once('encryption_begin', onEncryptionKeyRequest);
client.once('success', onLogin);
client.once("compress", onCompressionRequest);
client.on("set_compression", onCompressionRequest);
if(haveCredentials) { if(haveCredentials) {
// make a request to get the case-correct username before connecting. // make a request to get the case-correct username before connecting.
var cb = function(err, session) { var cb = function(err, session) {
@ -102,18 +96,6 @@ function createClient(options) {
}); });
} }
function onCompressionRequest(packet) {
client.compressionThreshold = packet.threshold;
}
function onKeepAlive(packet) {
if (timeout)
clearTimeout(timeout);
timeout = setTimeout(() => client.end(), checkTimeoutInterval);
client.write('keep_alive', {
keepAliveId: packet.keepAliveId
});
}
function onEncryptionKeyRequest(packet) { function onEncryptionKeyRequest(packet) {
crypto.randomBytes(16, gotSharedSecret); crypto.randomBytes(16, gotSharedSecret);
@ -159,12 +141,6 @@ function createClient(options) {
} }
} }
} }
function onLogin(packet) {
client.state = states.PLAY;
client.uuid = packet.uuid;
client.username = packet.username;
}
} }