From 834170689ef2016f5dd5edb4473a06325c57c588 Mon Sep 17 00:00:00 2001 From: deathcap Date: Sun, 31 Jan 2016 15:27:26 -0800 Subject: [PATCH] Remove createClientStream --- package.json | 1 - src/browser.js | 2 -- src/createClient.js | 1 - src/createClientStream.js | 54 --------------------------------------- src/index.js | 2 -- 5 files changed, 60 deletions(-) delete mode 100644 src/createClientStream.js diff --git a/package.json b/package.json index 592b548..fd3abd5 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "prismarine-nbt": "0.1.0", "protodef": "0.2.5", "readable-stream": "^1.1.0", - "through": "^2.3.8", "ursa-purejs": "0.0.3", "uuid-1345": "^0.99.6", "yggdrasil": "0.1.0" diff --git a/src/browser.js b/src/browser.js index 9c9d400..f76c7c7 100644 --- a/src/browser.js +++ b/src/browser.js @@ -1,10 +1,8 @@ -var createClientStream = require('./createClientStream'); var Client = require('./client'); var Server = require('./server'); var serializer = require("./transforms/serializer"); module.exports = { - createClientStream: createClientStream, Client: Client, Server: Server, states: require("./states"), diff --git a/src/createClient.js b/src/createClient.js index 12e1357..40a3d13 100644 --- a/src/createClient.js +++ b/src/createClient.js @@ -1,5 +1,4 @@ var Client = require('./client'); -var createClientStream = require('./createClientStream'); var assert = require('assert'); var encrypt = require('./client/encrypt'); diff --git a/src/createClientStream.js b/src/createClientStream.js deleted file mode 100644 index 4897131..0000000 --- a/src/createClientStream.js +++ /dev/null @@ -1,54 +0,0 @@ -var Client = require('./client'); -var assert = require('assert'); -var states = require("./states"); -var EmptyTransformStream = require('through')(); - -module.exports=createClientStream; - -function createClientStream(options) { - assert.ok(options, "options is required"); - - assert.ok(options.username, "username is required"); - var keepAlive = options.keepAlive == null ? true : options.keepAlive; - var checkTimeoutInterval = options.checkTimeoutInterval || 10 * 1000; - - var optVersion = options.version || require("./version").defaultVersion; - 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) - // TODO: refactor - if (options.noPacketFramer) { - client.framer = EmptyTransformStream; - } - - if(keepAlive) client.on('keep_alive', onKeepAlive); - client.once('success', onLogin); - client.once("compress", onCompressionRequest); - client.on("set_compression", onCompressionRequest); - - client.username = options.username; - - var timeout = null; - return client; - - 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 onLogin(packet) { - client.state = states.PLAY; - client.uuid = packet.uuid; - client.username = packet.username; - } -} diff --git a/src/index.js b/src/index.js index f75ed06..8d90027 100644 --- a/src/index.js +++ b/src/index.js @@ -2,12 +2,10 @@ var Client = require('./client'); var Server = require('./server'); var serializer = require("./transforms/serializer"); var createClient = require("./createClient"); -var createClientStream = require("./createClientStream"); var createServer = require("./createServer"); module.exports = { createClient: createClient, - createClientStream: createClientStream, createServer: createServer, Client: Client, Server: Server,