13
0
geforkt von Mirrors/Velocity
Commit graph

932 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
0cb4c02107 Run all commands on a separate thread pool. 2020-05-25 13:09:04 -04:00
Andrew Steinborn
ec1fc3944d Make sure this runs on the event loop. 2020-05-25 12:08:24 -04:00
Andrew Steinborn
942e2f2e1a Better generic cleanup. 2020-05-25 11:56:56 -04:00
Andrew Steinborn
74ff56cbc9 Also reset when an exception is thrown. 2020-05-25 11:49:45 -04:00
Andrew Steinborn
64c16e61d2 Reset in-flight connection only if the server disconnects the client. 2020-05-25 11:44:02 -04:00
Andrew Steinborn
b0f1398b45 Further confinement of preconnect checks to event loop. 2020-05-25 10:26:05 -04:00
Andrew Steinborn
fa954ab717 Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:41 -04:00
Andrew Steinborn
75ddeb062f Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:22 -04:00
Andrew Steinborn
a98a7dd67e Merge branch 'dev/1.1.0' into decode-multiple 2020-05-24 11:41:17 -04:00
Andrew Steinborn
b3bd773fea Switch out Cloudflare zlib for libdeflate.
libdeflate is significantly faster than vanilla zlib, zlib-ng, and Cloudflare zlib. It is also MIT-licensed (so no licensing concerns). In addition, it simplifies a lot of the native code (something that's been tricky to get right).

While we're at it, I have also taken the time to fine-time compression in Velocity in general. Thanks to this work, native compression only requires one JNI call, an improvement from the more than 2 (sometimes up to 5) that were possible before. This optimization also extends to the existing Java compressors, though they require potentially two JNI calls.
2020-05-24 10:56:26 -04:00
Five (Xer)
38487c5bba
Server-change mechanics update 2020-05-23 13:03:33 +02:00
Five (Xer)
197bc4f288
Make checkstyle happy again 2020-05-23 11:49:27 +02:00
Five (Xer)
fca73bae67
Some minor touch-ups 2020-05-23 11:46:27 +02:00
Five (Xer)
d37b6a361c
Snapshot 20w21a 2020-05-23 00:18:36 +02:00
Andrew Steinborn
91e9769c5a Cap /server list to 50 servers.
Any more, and the server list is arguably useless. Thanks to BXBW for finding this particular issue!
2020-05-17 00:24:00 -04:00
Andrew Steinborn
feb7c2f893 Reject invalid tab complete command requests. 2020-05-08 18:22:21 -04:00
Andrew Steinborn
b42045c050 Reject invalid tab complete command requests. 2020-05-08 18:17:02 -04:00
Andrew Steinborn
10680f16d3 Reject invalid tab complete command requests. 2020-05-08 18:16:40 -04:00
Andrew Steinborn
2418cc271a
Merge pull request #307 from mikroskeem/feature/prevent-proxy-connections
Add prevent-proxy-connections option
2020-05-08 14:57:20 -04:00
Mark Vainomaa
21f03d5d50
Add prevent-proxy-connections option to make sending client IP to Mojang toggleable 2020-05-08 21:16:12 +03:00
Andrew Steinborn
4d62d61485 We're well into 2020, just saying. 2020-05-08 14:04:07 -04:00
Andrew Steinborn
f7e70cff20 We're well into 2020, just saying. 2020-05-08 14:03:57 -04:00
Andrew Steinborn
3bc8323ed5 We're well into 2020, just saying. 2020-05-08 14:03:35 -04:00
Andrew Steinborn
42ad7594ae
Merge pull request #300 from Leymooo/command-event
fix command forwarding to server
2020-04-29 15:26:29 -04:00
Leymooo
aa55af8eb7 fix command forwarding 2020-04-29 22:13:16 +03:00
Andrew Steinborn
e759668f53
Merge pull request #299 from Leymooo/command-event
Add event for commands
2020-04-29 12:51:47 -04:00
Andrew Steinborn
37a1a49fda Allow disabling BungeeCord plugin message channel. 2020-04-28 14:10:54 -04:00
Leymooo
26bf94f08f fix typos, update javadocs 2020-04-27 13:09:04 +03:00
Leymooo
c0b8e9d646 add async methods, also add separate methods which will call event and which will not call event 2020-04-27 01:05:57 +03:00
Leymooo
fb64333813 pass eventLoop to thenApplyAsync 2020-04-27 00:11:49 +03:00
Leymooo
1fb382e0f6 fix logic 2020-04-27 00:09:25 +03:00
Leymooo
6555e0e337 Add CommandExecuteEvent 2020-04-27 00:04:12 +03:00
Andrew Steinborn
1441dec367 Implement brigadier:long argument type, fixes #295 2020-04-23 16:21:44 -04:00
Andrew Steinborn
957c0dd307 Implement brigadier:long argument type, fixes #295 2020-04-23 16:21:22 -04:00
Andrew Steinborn
88641662d8 Implement brigadier:long argument type, fixes #295 2020-04-23 16:19:49 -04:00
Andrew Steinborn
bb129a3d0b Fix rare race condition with transitioning
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
2020-04-22 10:31:13 -04:00
Andrew Steinborn
81a0cbe3b9 Fix rare race condition with transitioning
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
2020-04-22 10:31:05 -04:00
Andrew Steinborn
2b84d35798 Fix bug in ConnectOther message
Credits to @Jay113355 for spotting this
2020-04-21 06:23:04 -04:00
Andrew Steinborn
d0cbcf65e9 Fix some tab-complete regressions 2020-04-19 09:07:17 -04:00
Andrew Steinborn
413578f979 Fix rare race condition with transitioning
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
2020-04-19 03:39:15 -04:00
creeper123123321
9f6d7c2e82 fix name 2020-04-13 11:57:12 -03:00
creeper123123321
e93a510b0f (Implementation) Allow injecting into backend connection 2020-04-13 10:35:26 -03:00
Andrew Steinborn
aae151e3d9 No need to register multiple times 2020-04-12 17:21:00 -04:00
Andrew Steinborn
4ddc55a5b7 No need to register multiple times 2020-04-12 17:20:54 -04:00
Andrew Steinborn
4494033fbe No need to register multiple times 2020-04-12 17:20:38 -04:00
Andrew Steinborn
558c158592 Close one last "proxy crasher" loophole 2020-04-12 17:19:00 -04:00
Andrew Steinborn
49ab2764c4 Close one last "proxy crasher" loophole 2020-04-12 17:18:53 -04:00
Andrew Steinborn
f49d36b719 Close one last "proxy crasher" loophole 2020-04-12 17:05:36 -04:00
Andrew Steinborn
b04b43954f Merge branch 'dev/1.1.0' into decode-multiple 2020-04-11 22:05:43 -04:00
Andrew Steinborn
2e38e0e1cb Properly fix the previous patch 2020-04-11 21:52:01 -04:00
Andrew Steinborn
8df4467392 Upon connection exception, discard all incoming packets instead 2020-04-11 21:24:39 -04:00
Andrew Steinborn
6ed61848e9 Upon connection exception, discard all incoming packets instead 2020-04-11 21:19:54 -04:00
Hugo Manrique
2c2eca3548 Only finish non-repeating tasks 2020-04-11 21:09:15 -04:00
Hugo Manrique
55818ce5eb Remove tasks from lookup map upon completion 2020-04-11 21:09:02 -04:00
Crypnotic
d4e51e2d07 Add cleanServerName to VelocityConfiguration to remove quotes and other unforeseen characters from server names before registration 2020-04-11 21:08:47 -04:00
Andrew Steinborn
c0ef3edcc4
Merge pull request #274 from Crypnotic/bugfix/invalid-server-key
Clean server name keys before attempting to register
2020-04-08 16:45:02 -04:00
Andrew Steinborn
98b03376e5
Merge pull request #281 from Gabik21/tablist-improvement
Don't send ping update twice (1.7)
2020-04-07 13:35:18 -04:00
Gabik21
2217e8a5c9
Fix 1.7 tablist behaving weird with colored names
The 1.7 tablist packet only contains three types of information:

 - Name of the tablist entry (limited to 16 characters including colors)
 - Ping of the entry
 - If this entry needs to be added or removed (client accepts duplicates
 as 'ping update')

The previous logic was trying to preserve parity with
GameProfile#getName returning a stripped down name to have a 'real'
username.
That is fundamentally broken, because entries with duplicate content,
but different colors are very common, especially with custom tablists.

For packets coming from a native 1.7 server we just won't define the
displayname anymore, as there is no such thing as a 'displayname',
because tablist entries are not bound to any player.

Using the Velocity Tablist API to modify existing entries will work, though
the backend server will completely loose control over the entry. Custom
entries added over the Velocity Tablist API will work, but are cut off
by the 16 character limitation.

This commit only fixes the bug, where entries are incorrectly handled
with their stripped name, a lot of the things explained above were
already implemented correctly.
2020-04-07 12:17:02 +02:00
Gabik21
5089da07fc
Don't send ping update twice
VelocityTabListEntry#setLatency calls the update method, which
constructs a new packet and sends it to the client.
The backend packet we are processing also reaches the client, therefore
we are sending the same packet twice.
VelocityTabListEntry#setLatencyInternal is the correct method here.
2020-04-02 17:46:24 +02:00
Hugo Manrique
d722422947
Only finish non-repeating tasks 2020-03-13 18:52:15 +01:00
Hugo Manrique
6ec6beedbd
Remove tasks from lookup map upon completion 2020-03-13 18:17:06 +01:00
Andrew Steinborn
ae7f0143de Do not trim the args for string-based command APIs 2020-02-28 16:54:46 -05:00
Andrew Steinborn
29bedf0943 Do not trim the args for string-based command APIs 2020-02-28 16:54:25 -05:00
Andrew Steinborn
65acb13dca Checkstyle 2020-02-21 18:51:41 -05:00
Andrew Steinborn
3e053d63b4 Allow ping passthrough for descriptions too 2020-02-21 18:36:10 -05:00
Andrew Steinborn
932f3bc2bf Merge branch 'dev/1.1.0' into decode-multiple 2020-02-17 20:52:19 -05:00
Andrew Steinborn
c63bd4cd02 Fix checkstyle error 2020-02-17 20:35:28 -05:00
Andrew Steinborn
8ae7945b9f Upon connection exception, discard all incoming packets instead 2020-02-17 19:34:22 -05:00
Andrew Steinborn
37994449d7 Fix regressions with plugin dependency loading from #272
This is a quick and dirty fix because it's late. I'll need to
commit a better fix later.
2020-02-16 03:19:13 -05:00
Andrew Steinborn
3b6f8e2421 Use more obvious/broken-down test cases for topological sort tests 2020-02-16 00:29:35 -05:00
Andrew Steinborn
5c6163d8cd Use more obvious/broken-down test cases for topological sort tests 2020-02-13 19:20:53 -05:00
Andrew Steinborn
e558b7ca1f Update to new bStats revision 2020-02-13 12:58:24 -05:00
Andrew Steinborn
29168ae549 Update to new bStats revision 2020-02-13 12:57:48 -05:00
Crypnotic
8fba9d7438 Add cleanServerName to VelocityConfiguration to remove quotes and other unforeseen characters from server names before registration 2020-02-09 13:40:15 -06:00
alexstaeding
da8cee2260
Make PluginContainer injectable (#272) 2020-02-07 16:22:47 -05:00
Andrew Steinborn
77526d9bf4
Merge pull request #266 from alex11441/dev/1.1.0
Allow users to specify a reason in the shutdown command
2020-01-24 16:01:23 -05:00
Andrew Steinborn
0c7a995767 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:44 -05:00
Andrew Steinborn
c7bac69290 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:32 -05:00
Andrew Steinborn
53c951bc52 Revert "Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content"
This reverts commit 92571a65db.

It looks like c3fab89bd7 nabbed it at last.
2020-01-24 01:21:50 -05:00
Andrew Steinborn
c3fab89bd7 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-20 17:37:21 -05:00
Andrew Steinborn
92571a65db Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content 2020-01-14 22:18:05 -05:00
Andrew Steinborn
c14ceb315d Return the magic-3 loop again... :( 2020-01-01 10:14:15 -05:00
Andrew Steinborn
a15c8ecc2b Merge branch 'dev/1.1.0' into decode-multiple 2019-12-31 21:43:11 -05:00
Andrew Steinborn
08df080771 Try to diagnose memory leak 2019-12-31 21:43:02 -05:00
Alex
9f340347b6 Allow users to specify a reason in the shutdown command 2019-12-30 23:20:55 -07:00
Alex
941800ce96 Add VelocityServer#shutdown(boolean, TextComponent) 2019-12-30 23:20:25 -07:00
Andrew Steinborn
fb0446f4fc Add DisconnectEvent#disconnectedDuringLogin() 2019-12-24 23:56:39 -05:00
Andrew Steinborn
deede70070 Rename mystery field in JoinGame 2019-12-17 13:57:48 -05:00
Andrew Steinborn
c3068ea26b Rename mystery field in JoinGame 2019-12-14 17:45:54 -05:00
Andrew Steinborn
fa489f6014 Rename mystery field in JoinGame 2019-12-14 17:45:10 -05:00
Andrew Steinborn
b56302b17e Minecraft 1.15 (backport from 1.1.0) 2019-12-10 12:22:24 -05:00
Andrew Steinborn
97da6753b5 Merge branch 'dev/1.1.0' into decode-multiple 2019-12-06 03:10:25 -05:00
Andrew Steinborn
8c3f7e2ecc Optimize DNS resolution logic for AsyncHttpClient 2019-12-01 15:17:17 -05:00
Andrew Steinborn
75359256b3 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:27:27 -05:00
Andrew Steinborn
e06e2e4cf9 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:26:59 -05:00
Andrew Steinborn
667610c251 Fix command block tab complete on <=1.12.2 2019-11-28 15:28:02 -05:00
Andrew Steinborn
d137d6ce46 Fix command block tab complete on <=1.12.2 2019-11-28 15:22:26 -05:00
Andrew Steinborn
d1acd5b6d5 Merge branch 'dev/1.1.0' into decode-multiple 2019-11-28 13:23:46 -05:00
Andrew Steinborn
50b50f3cbb Fix 1.13+ tab complete for server commands 2019-11-28 13:12:53 -05:00
Andrew Steinborn
ae82bb21af Merge branch 'dev/1.1.0' into decode-multiple 2019-11-27 01:09:21 -05:00
Andrew Steinborn
68e5372b2e QuietException should be a RuntimeException 2019-11-27 01:04:48 -05:00
Andrew Steinborn
467fe34da3 Provide useful information for "unexpectedly disconnected from server"
Fixes #233
2019-11-27 01:01:50 -05:00
Andrew Steinborn
0c14eabe6b Fix Checkstyle issues 2019-11-26 16:32:50 -05:00
Andrew Steinborn
87ad188f92 Finalize integrated BungeeQuack 2019-11-26 16:27:30 -05:00
Andrew Steinborn
b08f27b5c4 Merge branch 'dev/1.1.0' into bungeequack-integrate 2019-11-26 15:52:53 -05:00
Andrew Steinborn
0b6fc06e67 Initial 1.15-pre2 support 2019-11-26 15:10:22 -05:00
Andrew Steinborn
bfeca40b17 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:08:16 -05:00
Andrew Steinborn
2baa162d91 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:07:55 -05:00
Andrew Steinborn
893391202b Manually backport e29e20b from Velocity 1.1.0 2019-11-26 13:47:58 -05:00
Andrew Steinborn
e29e20b1e8 Fix 1.13+ tab-complete with command but no arguments
As a nice side-effect, this simplifies the tab complete code
a bit.
2019-11-26 13:44:21 -05:00
Andrew Steinborn
ae14eb8ccb Fix potential UDP speculative reflection attack 2019-11-23 01:07:29 -05:00
Andrew Steinborn
da63406ee7 Fix potential UDP speculative reflection attack 2019-11-23 01:06:00 -05:00
Andrew Steinborn
8725178d6d Flush queued packets to the client in case we can't write 2019-11-17 14:52:12 -05:00
Andrew Steinborn
3eeea8e8f8 Add limited flush consolidation, if the remote server supports it. 2019-11-17 11:14:56 -05:00
Andrew Steinborn
d2b8271eb4 Allow running Velocity without any servers.
This is a niche setup, however if your network is 100% dynamically configured, this is a handy feature to have available.

To support this functionality, a new PlayerChooseInitialServerEvent event was added to allow the initial server to connect to be changed as desired.
2019-11-16 23:17:09 -05:00
Andrew Steinborn
e12f970684 Fix fresh 1.1.0 velocity.toml generation. 2019-11-16 22:34:30 -05:00
Andrew Steinborn
010a10f50f Do not try to prevent people from running Velocity behind Velocity.
This commit absolutely does not change our support policy on this: this
is a completely unsupported setup. In any event, there is an existing
forwarding check in Velocity that covers this case quite well.

I am making this change to make the login process less "chatty" for
higher-latency links and 1.13+ servers.
2019-11-15 01:35:44 -05:00
Andrew Steinborn
ba8629ca0e Try to decode multiple packets at once 2019-11-15 00:39:11 -05:00
Andrew Steinborn
d333eb30b8 Always create the length buffer using the best possible native buffer 2019-11-09 22:07:54 -05:00
Andrew Steinborn
8c98f5a4a6 Simplify and harden Netty handlers 2019-11-05 20:07:47 -05:00
Andrew Steinborn
09d33de03e
Merge pull request #256 from Gabik21/previous-server-in-event
Add previous server to ServerConnectedEvent
2019-10-31 19:51:32 -04:00
Gabik21
7c0a402cca
Add previous server to ServerConnectedEvent 2019-10-28 14:45:13 +01:00
Andrew Steinborn
3f321a5219 Indicate plugin loads 2019-10-26 21:10:38 -04:00
Andrew Steinborn
9d5930d96b Integrate BungeeQuack functionality into Velocity 2019-10-20 00:58:55 -04:00
Andrew Steinborn
19e1e05bbc Bring back kqueue transport from the dead
My PR to AsyncHttpClient was accepted and 2.10.4 was released with it
included.
2019-10-20 00:27:31 -04:00
Andrew Steinborn
6ff5cac4d3 Fix issues with decoding and Java fallback native 2019-10-19 23:56:44 -04:00
Joe Hirschfeld
a16684564b Make AES crypto operations use one buffer
All AES implementations being used are 'copy safe', where the source and
destination arrays may be the same. Lets save ourself a copy and reap
the performance wins!
2019-10-19 19:55:02 -07:00
james58899
bd35c6835e
Allow set redirect message 2019-10-17 08:32:50 +08:00
Andrew Steinborn
7747679ee1 Implement optimized compression for Java 11+
Using the fact that the Java Deflater/Inflater API now supports
ByteBuffers as of Java 11, we can provide performance benefits equivalent
to the Velocity 1.0.x native compression on servers running Java 11+ on
non-macOS and non-Linux platforms (such as Windows).
2019-10-04 17:08:14 -04:00
Andrew Steinborn
39e48c9467 Implement #149 to send just one respawn packet 2019-09-28 00:29:51 -04:00
Andrew Steinborn
62cd2c661a Clean up HandshakeSessionHandler 2019-09-27 22:39:16 -04:00
Andrew Steinborn
17e6944dae Clean up HandshakeSessionHandler 2019-09-27 22:37:42 -04:00
Andrew Steinborn
546307b0d6 Suppress invalid protocol spam 2019-09-27 22:24:21 -04:00
Andrew Steinborn
1824c7ad7e Suppress invalid protocol spam 2019-09-27 22:23:40 -04:00
Andrew Steinborn
9b570ff599 Revert this entirely for now. 2019-09-17 09:38:12 -04:00
Andrew Steinborn
8dea7567d8 Correctly handle 0-length packet 2019-09-17 09:33:43 -04:00
Andrew Steinborn
009c9afe09 Decode multiple VarInt-prefixed packets
If the remote server does flush consolidation, Velocity will be able to
frame the packets all at once instead of having to constantly decode
packets. This should provide a modest performance boost for them whilst
not impacting un-optimized servers.
2019-09-16 20:01:38 -04:00
Andrew Steinborn
138a887d73 Fix "all" not appearing in the tab-complete for /server 2019-09-15 19:55:04 -04:00
Andrew Steinborn
aff06164cd Fix "all" not appearing in the tab-complete for /server 2019-09-15 19:54:33 -04:00
Andrew Steinborn
9c9fa1c5ae Remove flush consolidation for now
This is still highly experimental
2019-09-09 00:47:42 -04:00
Andrew Steinborn
63dcc56735 Also sort servers for /glist all 2019-09-07 17:09:36 -04:00
Andrew Steinborn
08173c50ef Refactor and improve ServerCommand
The code has been cleaned up and reorganized. As a small quality of life
change, the server names are now sorted in alphabetical order.
2019-09-07 17:06:10 -04:00
Andrew Steinborn
983f3012a6 Merge branch 'dev/1.1.0' into feature/flush-consolidation-v2 2019-09-07 00:34:08 -04:00
Andrew Steinborn
ecfb14411d Merge remote-tracking branch 'origin/dev/1.1.0' into dev/1.1.0 2019-09-07 00:15:34 -04:00
Andrew Steinborn
35856fec04 Merge branch 'dev/1.1.0' into natives-java-improvements
# Conflicts:
#	native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
2019-09-07 00:06:13 -04:00
Gabik21
aef0f2ca8c
Fix name mapping not being cleared on switch
This fixes a bug where tablist would be messed up for 1.7 clients due to
an internal misconception.
2019-09-05 12:17:19 +02:00
Leymooo
fd367c6efd Add method to determine if player is in OnlineMode 2019-09-04 01:44:40 +03:00
Gabik21
592517b9f3
Remove unnessecary diff 2019-08-29 19:58:00 +02:00
Gabik21
18a56d8b1d
Merge remote-tracking branch 'upstream/dev/1.1.0' 2019-08-29 19:47:04 +02:00
Andrew Steinborn
dbfbd1e2a9 Rename ConnectedPlayer#minecraftConnection -> ConnectedPlayer#connection
This is consistent with VelocityServerConnection
2019-08-17 20:17:12 -04:00
Gabik21
ca81b05551
Remove no longer used imports 2019-08-16 11:50:49 +02:00
Andrew Steinborn
b3ca066a17 Lower write water mark to 1MB 2019-08-10 14:08:45 -04:00
Andrew Steinborn
7cb86067bc Lower the explicit flush count
Initial testing suggests this makes flush consolidation stable, although
the CPU usage will be increased as we are more aggressive in flushing
messages to the channels.
2019-08-08 18:39:22 -04:00
Andrew Steinborn
ca3426033f Revert "Revert "Merge branch 'feature/flush-consolidation' into dev/1.1.0""
This reverts commit e476ee815a.
2019-08-08 18:00:52 -04:00
Andrew Steinborn
c64d16326c Fix bug where connect() wouldn't reset in-flight connections 2019-08-08 17:22:55 -04:00
Andrew Steinborn
648c149872 Fix bug where connect() wouldn't reset in-flight connections 2019-08-08 17:22:38 -04:00
Andrew Steinborn
e476ee815a Revert "Merge branch 'feature/flush-consolidation' into dev/1.1.0"
This reverts commit f72f50819d, reversing
changes made to 3b9db94ce9.
2019-08-08 08:22:37 -04:00
Andrew Steinborn
f72f50819d Merge branch 'feature/flush-consolidation' into dev/1.1.0 2019-08-07 21:17:52 -04:00
Andrew Steinborn
3b9db94ce9 Explicitly parse IP addresses before using an unresolved address
This allows plugins to more correctly use InetSocketAddress#getAddress(),
however "gotchas" remain.
2019-08-07 16:22:07 -04:00
Andrew Steinborn
7c2cbdbf1f Explicitly parse IP addresses before using an unresolved address
This allows plugins to more correctly use InetSocketAddress#getAddress(),
however "gotchas" remain.
2019-08-07 16:21:15 -04:00
Andrew Steinborn
32ef77f954 Flush consolidation tweaks 2019-08-07 16:04:34 -04:00
Andrew Steinborn
195a506117 Flush consolidation 2019-08-07 15:02:48 -04:00
Andrew Steinborn
2c3b30fff2
Merge pull request #240 from VelocityPowered/feature/ping-passthrough
Ping passthrough
2019-08-07 12:21:50 -04:00
Andrew Steinborn
e3c75a7fcc Silence TCP_FASTOPEN warnings when not using epoll and fast open enabled 2019-08-06 06:43:27 -04:00
Andrew Steinborn
62c6adb204 Consider forced hosts in ping passthrough 2019-08-06 03:26:55 -04:00
Andrew Steinborn
d8fb7c11e7 Clean up slightly, don't use streams 2019-08-06 03:16:24 -04:00
Andrew Steinborn
ca9a4492c4 Add support for ping pass-through
By default, ping pass-through is not enabled. However, you can use
ping passthrough to pass through just mods (great for modded servers)
or everything.
2019-08-06 02:06:53 -04:00
Andrew Steinborn
9f3d1a2390 Fix Checkstyle, again 2019-08-05 11:01:18 -04:00
Andrew Steinborn
b4e62443c9 Add arbitrary chat tab complete event. Fixes #236 2019-08-05 10:30:55 -04:00
Andrew Steinborn
19cec571d0 Clean up some junk 2019-08-05 09:53:18 -04:00
Andrew Steinborn
4940f6b447 Allow certain mangled large packets to pass through 2019-07-30 17:11:26 -04:00
Andrew Steinborn
7db757cd04 Allow certain mangled large packets to pass through 2019-07-30 17:10:10 -04:00
Andrew Steinborn
121ab41d96 Introduce TCP_FASTOPEN support
For best results, use Linux 4.11+ and a server modified to set the
TCP_FASTOPEN flag.

This should in particular benefit users of legacy forwarding.
2019-07-29 17:32:56 -04:00
Andrew Steinborn
0acb1ed7d4 Send disconnect message on getting kicked from the server 2019-07-29 14:27:40 -04:00
Andrew Steinborn
03c9729e63 Don't disconnect the player if the connection unexpectedly closes 2019-07-29 14:19:21 -04:00
Andrew Steinborn
04efd16a83 Avoid a memory copy in creating modern-style forwarding data 2019-07-29 06:04:37 -04:00
Andrew Steinborn
1da51b8ffb Batch handshake and server login/ping packets 2019-07-29 05:25:29 -04:00
Andrew Steinborn
d65e371038 Fix up the Travis build... 2019-07-29 00:24:57 -04:00
Andrew Steinborn
ead8a21362 Most proper clean way of using a DnsAddressResolverGroup with AHC
Let us never speak of this again.
2019-07-29 00:19:15 -04:00
Andrew Steinborn
bf035bce73 Properly use non-blocking DNS in AsyncHttpClient 2019-07-28 23:40:23 -04:00
Andrew Steinborn
454b3c9bee Add flag to disable native transports 2019-07-26 01:34:21 -04:00
Andrew Steinborn
d1736bf94c Move from custom HTTP client to Async HTTP Client
The most significant advantage is that Velocity gets a well-tested
HTTP client implementation which also includes a connection pool,
allowing us to avoid the overhead of TCP and TLS handshakes upon each
login.

Unfortunately, Async HTTP Client does not work with the kqueue transport.
Since almost nobody runs a production Velocity server on macOS, we have
decided to remove kqueue support. The benefits that Async HTTP Client
provides outweigh the disadvantages of not having a macOS native transport.
macOS is adequately supported by the normal NIO transport.
2019-07-26 01:29:51 -04:00
Minecrell
fde5ec36e7 Update TerminalConsoleAppender to 1.2.0
Add log4j.skipJansi to prevent Log4j from initializing a Jansi
terminal. It is redundant because this is handled by TCA and it
will be only active for a few seconds until TCA is loaded.
2019-07-21 16:51:08 +02:00
Andrew Steinborn
2b5b14e4ec Switch to new TCA version and jansi 2019-07-20 14:25:47 -04:00
Andrew Steinborn
6d5bacb262 Minor Netty cleanup 2019-07-20 00:30:44 -04:00
Andrew Steinborn
85e5fb4827 Allow existing players to be kicked from server if in online-mode
Fixes #226
2019-07-19 13:25:04 -04:00
Andrew Steinborn
58b52cce0c Add flag to disable native transports 2019-07-12 14:32:37 -04:00
Andrew Steinborn
40c8343494 Help smoke out some internal concurrency issues 2019-07-08 21:28:18 -04:00
Gabik21
3a1b5099c9
Merge branch 'dev/1.1.0' of github.com:VelocityPowered/Velocity 2019-07-06 01:08:21 +02:00
Andrew Steinborn
2671590ad2 Clean up LoginPluginResponse and use DeferredByteBufHolder too 2019-07-05 12:53:17 -04:00
Gabik21
d0ad0fac36
Merge branch 'dev/1.1.0' of github.com:VelocityPowered/Velocity 2019-07-05 10:59:29 +02:00
Seppe Volkaerts
145dfa8ac6 Wait for player disconnect events on shutdown. (#229) 2019-07-05 00:54:23 -04:00
Andrew Steinborn
8bf9e0e829 Improve backwards-compatibility with 1.0.x due to RawCommand changes 2019-07-04 23:53:04 -04:00
Seppe Volkaerts
6d2e1bf379 Wait for player disconnect events on shutdown. (#229) 2019-07-04 23:49:40 -04:00
Andrew Steinborn
a053ab6c34 Remove resource leak detection level setting 2019-07-03 22:46:47 -04:00
Andrew Steinborn
fba3bfb0be Forge is confirmed working 2019-07-03 22:45:25 -04:00
Andrew Steinborn
11a86e9bb9 Convert Velocity to use ByteBuf-derived plugin message packets
Only tested with 1.12.2, not 1.13 or Forge
2019-07-03 09:20:32 -04:00
Andrew Steinborn
39c505f6fd Readd missing null check. Fixes #228 2019-07-02 13:25:17 -04:00
Andrew Steinborn
a63e905edf Use custom ThreadFactory that does FastThreadLocal wrapping for us
This primarily has the benefit of not giving threads strange names
2019-07-02 09:10:00 -04:00
Andrew Steinborn
5b518eaf20 Remove kqueue bug workaround since the issue is now fixed upstream
See https://github.com/netty/netty/pull/9149
2019-07-02 02:37:15 -04:00
Andrew Steinborn
190f2fee75 Remove kqueue bug workaround since the issue is now fixed upstream
See https://github.com/netty/netty/pull/9149
2019-07-02 02:36:46 -04:00
Andrew Steinborn
dab9c9a382 Use Netty thread factory to take advantage of FastThreadLocal
This should reduce CPU usage slightly.
2019-07-02 02:19:52 -04:00
Andrew Steinborn
c0becce276 Remove debug code 2019-07-02 00:33:25 -04:00
Andrew Steinborn
7834acd67f Reduce duplicated code used to support RawCommand. Fixes #227 2019-07-02 00:25:43 -04:00
Gabik21
5c314c9068
Add 1.7 Protocol Support 2019-07-01 08:56:22 +02:00
Andrew Steinborn
f0ba7e1eea Add method to check if an entry already exists in the tab list. 2019-07-01 00:07:20 -04:00
Andrew Steinborn
275685f45f Merge branch 'master' into dev/1.1.0
# Conflicts:
#	build.gradle
2019-06-30 23:52:22 -04:00
Andrew Steinborn
226074a0df Add suggestion for reconnecting for "not online-mode" message 2019-06-29 14:35:28 -04:00
Andrew Steinborn
81840abc86 Enforce at least one parameter in CommandManager#register()
The old register method has been deprecated.
2019-06-22 21:13:20 -04:00
Andrew Steinborn
04a23e3622 Introduce raw String-based command API 2019-06-18 00:13:49 -04:00
Andrew Steinborn
1fd2bd9ee4 Avoid sending duplicate set latency/gamemode/display name packets 2019-06-15 17:08:05 -04:00
kashike
335c34a679 Explicity bind the main plugin class in the singleton scope 2019-06-14 01:06:08 -07:00
Andrew Steinborn
d7e4e20c76 This is Velocity 1.0.0 2019-06-12 18:10:33 -04:00
Andrew Steinborn
cc6d060fc5 Clarify error message 2019-06-12 00:43:30 -04:00
Andrew Steinborn
b19d36e939 Strictly enforce packet size limits for incoming compressed packets 2019-06-09 04:25:13 -04:00
Vjatšeslav Maspanov
f64b44ec21 Remove protocol linking (#212) 2019-06-02 19:44:23 -04:00
Andrew Steinborn
8d61e7ffd0 Removed redundant (non-)nullable annotations from boss bar. 2019-06-02 17:57:31 -04:00
kashike
0a53343547 Rename some bossbar-related fields and methods 2019-06-02 14:47:41 -07:00
MrIvanPlays
20b34447f8 Add BossBar API (#213) 2019-06-02 15:02:43 -04:00
Andrew Steinborn
dfe210707f Replace uses of deprecated LegacyComponentSerializer.INSTANCE 2019-05-31 15:50:46 -04:00
Andrew Steinborn
4e71788aba Work around kqueue transport bug with fallback connections. 2019-05-27 14:00:20 -04:00
Leymooo
85c6238d68 1.14.2 support 2019-05-27 17:20:42 +03:00
Andrew Steinborn
b5f099824d Remove debug. 2019-05-26 18:37:33 -04:00
Andrew Steinborn
4d6e836890 Fix Checkstyle 2019-05-26 18:14:54 -04:00
Andrew Steinborn
deeb068825 Merge branch 'metrics' 2019-05-26 18:10:56 -04:00
Andrew Steinborn
9d14af5a8b Add Metrics to Velocity
Velocity will send metrics to bStats.org. These statistics are
publicly viewable at https://bstats.org/plugin/server-implementation/Velocity

You can always opt-out by disabling metrics in your velocity.toml.
There is no obligation to allow us to collect metrics, but you can
show your support by leaving metrics on.
2019-05-26 18:10:44 -04:00
Andrew Steinborn
df9883cc6c Reduce unnecessary memory copies in StatusSessionHandler
Take advantage of the fact that Java has mutable strings when writing
out server ping responses, which Netty can work with when writing out
UTF-8 character sequences. This reduces the memory allocation impact of
server list ping responses by ~31%.
2019-05-24 06:55:19 -04:00
Andrew Steinborn
3cee15a9cb Move proxy shutdown to take place in a new thread. 2019-05-23 15:09:11 -04:00
Andrew Steinborn
df7eb4ade0 Ensure the proxy doesn't shut down too early if stdin is EOF. 2019-05-23 14:50:58 -04:00
Andrew Steinborn
b09331b79b Small optimization for writing packets to the client from the server
The layers of indirection to get to the MinecraftConnection causes a
small, but not insignificant hit to performance.
2019-05-21 00:33:35 -04:00
Andrew Steinborn
a684aaa325 Make sure to complete the result too 2019-05-19 21:56:09 -04:00
Andrew Steinborn
321b42d225 Add some exception logging to the transition session handler. 2019-05-19 21:55:38 -04:00
Andrew Steinborn
5524f3b720 Ensure empty (un)register packets are never sent.
Bukkit 1.13+, in particular, doesn't seem to like it very much. This was
also a bug in ViaVersion.
2019-05-17 18:16:28 -04:00
Andrew Steinborn
40b2c9993b Clean up some connection checks 2019-05-17 06:27:19 -04:00
Luck
72c668c048
Only unregister event handlers/listeners if the correct matching plugin is given
Currently, unregister will succeed & unregister a handler/listener if any valid plugin is given, not necessarily the one the handler was registered with.
2019-05-17 10:59:35 +01:00
Luck
21a79d8142
Correctly register Event handlers in the registeredHandlersByPlugin map 2019-05-17 10:58:11 +01:00
Andrew Steinborn
3ec67a7d4d Optimize VelocityEventManager#fireAndForget()
There isn't a need to create a CompletableFuture when firing an event
and we do not want to know when it is completed.
2019-05-16 17:29:55 -04:00
Andrew Steinborn
9e6e1856e6 Add /glist command.
A much-needed base command, this is now available in Velocity directly.
It is partially inspired by the RedisBungee /glist command, which I also
created.

By default, /glist only provides the player count of the proxy. You can
view the player list for an individual server with /glist <server>, or
you can view the information for all players with /glist all.
2019-05-16 01:46:54 -04:00
Andrew Steinborn
4ab02cb636 Clean this up a bit 2019-05-15 19:02:31 -04:00
Andrew Steinborn
a21eaa085a Do a better job of passing channel (un)registration to the client.
Also fixes a regression related to WDLCompanion.
2019-05-15 18:59:28 -04:00
Andrew Steinborn
552f02ed60 Fix Checkstyle 2019-05-15 17:10:07 -04:00
Andrew Steinborn
6d42a3c37c Explicitly rewrite legacy plugin message channels for 1.13+ clients. 2019-05-15 17:04:45 -04:00
Andrew Steinborn
d805f79d9b Try to unbreak ViaVersion a little bit. 2019-05-15 15:52:07 -04:00
Andrew Steinborn
742865bf0a
Merge pull request #204 from VelocityPowered/plugin-message-cleanups
Plugin message handling cleanup and fixes
2019-05-15 06:31:18 -04:00
Andrew Steinborn
6eabf82513 Fix inaccurate comment. 2019-05-14 04:26:16 -04:00
Andrew Steinborn
d7136150fd Get rid of the Guava Subscribe annotation check
I think we can trust that if you're working with Velocity, you can find
the right Velocity subscribe annotation.
2019-05-14 04:18:18 -04:00
Andrew Steinborn
5bd9f0a96f CappedSet.newCappedSet() -> CappedSet.create() 2019-05-14 04:11:49 -04:00
Andrew Steinborn
57085feb42 Better document what plugin channels we need to forward onto clients. 2019-05-12 11:09:50 -04:00
Andrew Steinborn
3c9cc2c4a8 Remove unrelated change 2019-05-12 10:48:47 -04:00
Andrew Steinborn
16d557a109 Fix checkstyle 2019-05-12 10:46:11 -04:00