Commit graph

948 commits

Author SHA1 Message Date
deathcap
9b824b5b88 Legacy ping is only allowed when in HANDSHAKING state (otherwise, varint packet length 254) 2016-01-30 15:28:40 -08:00
deathcap
4840ffe7b1 Splitter prepends length header to legacy ping for deserializer support 2016-01-30 15:20:53 -08:00
deathcap
c24718f64c Recognize legacy ping in splitter. GH-332 2016-01-30 14:45:41 -08:00
deathcap
9ec6d876ba Add wait_connect option, to require 'connect_allowed' event before src/client/setProtocol proceeds
Intended to allow clients to configure the client object before any data
is sent, specifically, before src/client/setProtocol sends the
set_protocol packet.
2016-01-28 09:49:37 -08:00
deathcap
a53a2977f2 Add dynamic cross-protocol support 2016-01-27 23:28:27 -08:00
deathcap
069a79ba3e Update client/forgeHandshake.js to be installable as module 2016-01-27 20:42:15 -08:00
deathcap
0ab5b6150d Rename src/fml.js -> src/client/forgeHandshake.js 2016-01-27 20:34:48 -08:00
deathcap
fd9caddb67 Merge branch 'master' into forge (client modularization)
Merging https://github.com/PrismarineJS/node-minecraft-protocol/pull/333
2016-01-27 20:27:53 -08:00
Romain Beaumont
a6a673a8c8 Merge pull request #333 from deathcap/m2client
Modularization attempt of createClient()
2016-01-27 22:46:26 +01:00
deathcap
c3d86d7674 Add client.connect(port, host) for backwards-compatibility
Would like to remove this method because it is hardcoded to dependent on
TCP/IP, but the serverTest uses it. Load tcp_dns as needed.
2016-01-26 01:15:59 -08:00
deathcap
bf5ce9e569 Pass haveCredentials/accessToken between client/caseCorrect and client/encrypt 2016-01-26 00:55:44 -08:00
deathcap
2f60088fdf Fix missing tcp_dns host option 2016-01-26 00:47:21 -08:00
deathcap
cf5f8c1c4c Pass options to all src/client/*, for consistency 2016-01-26 00:01:09 -08:00
deathcap
fe327c85e1 Move net.socket() and dns.resolveSrv() into client/net_tcp
This has been the trickest to refactor/remodularize, since it used to
modify the Client prototype to augument connect(host, port). This added
a dependence on TCP/IP host/port socketpairs, refactor to add a
'connect' option instead, called with the client instance. Update ping
accordingly, but it has to call connect itself since it does not include
client/caseCorrect, which normally calls connect. Still may be able to
improve further and untangle these interdependencies cleanlier.
2016-01-25 23:57:10 -08:00
deathcap
de36de8496 Break client/caseCorrect dependence on TCP/IP host/port; generalize options.connect(client) 2016-01-25 23:47:23 -08:00
deathcap
9c2112802a Fix ursa imports 2016-01-25 23:40:35 -08:00
deathcap
34534b2aa6 Move onLogin set state=PLAY to client/play 2016-01-25 23:36:36 -08:00
deathcap
b37dcc4d08 Move onConnect/set_protocol to client/setProtocol 2016-01-25 23:33:58 -08:00
deathcap
821227d73e Move making a request to get case-correct username before connecting to client/caseCorrect 2016-01-25 23:28:14 -08:00
deathcap
8c4406b4a2 Move keepAlive/checkTimeoutInterval to client/keepalive 2016-01-25 23:24:20 -08:00
deathcap
20e076ebcf Move onCompressionRequest to client/compress 2016-01-25 23:22:35 -08:00
deathcap
a727829a98 Move onKeepAlive to client/keepalive 2016-01-25 23:19:57 -08:00
deathcap
cbaaeb8eb2 Move onEncryptionKeyRequest to client/encryption 2016-01-25 23:18:32 -08:00
deathcap
bd72488bf3 Move FML|HS listener to forge_client example, reduce changes in createClient 2016-01-24 11:19:19 -08:00
deathcap
93c5c7315a Add tagHost option, clients can use to append to set_protocol serverHost
This is used by Forge clients to tell the server they support FML|HS,
otherwise the server will kick with "you must have FML/Forge installed".
2016-01-24 11:11:47 -08:00
deathcap
92b6c3778b Add documentation for forge/forgeMods options and forgeMods event 2016-01-23 21:00:00 -08:00
deathcap
c0271874d2 Emit forgeMods event when receiving server's ModList 2016-01-23 20:56:00 -08:00
deathcap
2802ac9d2b fml console.log -> debug 2016-01-23 20:54:43 -08:00
deathcap
f6ad1d8061 Move FML|HS to fml.js 2016-01-23 20:47:29 -08:00
deathcap
283b75d694 Forge client example pings server to get forgeMods list
Avoids the need to hardcode the mod list in the client, in order to
successfully connect to arbitrary Forge servers (with various mods).
2016-01-23 20:01:07 -08:00
deathcap
0b45b439bc Use symbolic values for writeAck() phase 2016-01-23 19:29:27 -08:00
deathcap
6c33ec2856 Refactor FML|HS to use state machine
Instead of responding based on the packet type received, maintain a
local state and ensure the correct packets are received. Should help
avoid unexpected states/behavior. See:
https://github.com/ORelio/Minecraft-Console-Client/pull/100/files#diff-65b97c02a9736311374109e22d30ca9cR297
2016-01-23 19:26:50 -08:00
deathcap
8fd30f6af9 Move to fmlHandshakeStep() 2016-01-23 19:03:54 -08:00
deathcap
0b2550e206 Add forgeMods option, set to array of Forge modifications installed on client 2016-01-23 18:17:18 -08:00
deathcap
1349fdfc73 Update examples to log when connection is lost
Normally, the client will send a kick packet if the client is
disconnected from the server, but if the connection is lost due to
network or lower-level protocol issues, the 'end' event will be emitted.
Log this event in the examples so it is clear why the scripts exit.
2016-01-23 18:08:18 -08:00
deathcap
46a134c5e9 Fix sending Handshake|Ack phase 2016-01-23 17:44:20 -08:00
deathcap
c680c0d12a Fix RegistryData hasMore field definition and usage 2016-01-23 17:05:33 -08:00
deathcap
265fcd9d4c ModList field uses 'modid' to match ServerPingList packet JSON 2016-01-23 17:04:02 -08:00
deathcap
6a6bdff5c8 fmlProtocolVersion client/server no longer collide 2016-01-23 17:03:13 -08:00
deathcap
b9bc0e1cb8 Switch on packet type through an anonymous container 2016-01-23 17:02:07 -08:00
deathcap
74c5b74950 Use a mapper for symbolic subpacket names vs discriminator byte values 2016-01-23 16:29:15 -08:00
deathcap
80cc68e480 Add a mapper for FML|HS discrminator bytes 2016-01-23 16:16:31 -08:00
deathcap
30b347cb99 FML|HS client sends HandshakeAck COMPLETE in response to server 2016-01-23 15:42:03 -08:00
deathcap
e80471753b Complete the HandshakeAck exchange 2016-01-23 15:41:07 -08:00
deathcap
06f8a5fe28 Send client HandshakeAck with WAITINGSERVERDATA 2016-01-23 15:31:33 -08:00
deathcap
790ba538d9 Show FML|HS ModList from server 2016-01-23 15:19:28 -08:00
deathcap
735b7f6d65 Hardcode a mod list for now 2016-01-23 15:14:02 -08:00
deathcap
1f68b30d87 Add missing string type in FML|HS serializer
Fixes Error: SizeOf error for mods.2.0.name : missing data type: string
2016-01-23 15:12:40 -08:00
deathcap
459da049c1 FML|HS ModList packet array 2016-01-23 14:45:52 -08:00
deathcap
cb9e6db991 FML|HS: ModList: send empty client modlist 2016-01-23 14:31:03 -08:00