Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to use protocol stream in node-minecraft-protocol #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to use protocol stream in node-minecraft-protocol #26

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dd181d
Move protocol stream to node-minecraft-protocol (createClientStream)
deathcap Jan 18, 2016
fb59638
Move stream option to use client setSocket()
deathcap Jan 18, 2016
b8c8dbf
Update to use createClient() with stream option
deathcap Feb 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 3 additions & 45 deletions minecraft-protocol-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,20 @@ var Client = require('minecraft-protocol').Client;
var protocol = require('minecraft-protocol');
var assert = require('assert');
var states = protocol.states;
var createClient = require('minecraft-protocol').createClient;

module.exports = {
protocol: protocol,
createClient: createClient
};

// generic stream version of index.js createClient()
function createClient(options) {
assert.ok(options, "options is required");
var stream = options.stream;
assert.ok(stream, "stream is required");
assert.ok(options.stream, "stream is required");

assert.ok(options.username, "username is required");
var keepAlive = options.keepAlive == null ? true : options.keepAlive;

var optVersion = options.version || require('./mcversion.js');
var mcData = require('minecraft-data')(optVersion);
var version = mcData.version;

var client = new Client(false, version.majorVersion);

// Options to opt-out of MC protocol packet framing (useful since WS is alreay framed)
if (options.noPacketFramer) {
client.framer = EmptyTransformStream;
}
if (options.noPacketSplitter) {
client.splitter = EmptyTransformStream;
}
var client = createClient(options);

client.on('connect', onConnect);
client.once('success', onLogin);
client.once('compress', onCompressionRequest);
client.once('set_compression', onCompressionRequest);
if (keepAlive) client.on('keep_alive', onKeepAlive);

client.username = options.username;
client.setSocket(stream);

return client;

Expand All @@ -53,23 +30,4 @@ function createClient(options) {
// directly to LOGIN, to receive login success and set compression packets
client.state = states.LOGIN;
}

function onLogin(packet) {
console.log('onLogin',packet);
// successful login, transition to play phase
client.state = states.PLAY;
client.uuid = packet.uuid;
client.username = packet.username;
}

function onCompressionRequest(packet) {
console.log('onCompressionRequest', packet);
client.compressionThreshold = packet.threshold;
}

function onKeepAlive(packet) {
client.write('keep_alive', {
keepAliveId: packet.keepAliveId
});
}
}