diff --git a/LICENSE b/LICENSE index d645695..2c03e26 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,61 @@ +Copyright © 2007 Free Software Foundation, Inc. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. +0. Additional Definitions. - 1. Definitions. +As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. +1. Exception to Section 3 of the GNU GPL. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. +You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. +2. Conveying Modified Versions. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. + a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or + b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." +3. Object Code Incorporating Material from Library Header Files. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. + b) Accompany the object code with a copy of the GNU GPL and this license document. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. +4. Combined Works. - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: +You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. + b) Accompany the Combined Work with a copy of the GNU GPL and this license document. + c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. + d) Do one of the following: + 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. + 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. + e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and +5. Combined Libraries. - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and +You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. + a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. + b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. +6. Revised Versions of the GNU Lesser General Public License. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. +The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. +Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. \ No newline at end of file diff --git a/client/client.go b/client/client.go index 0cbc069..5502caf 100644 --- a/client/client.go +++ b/client/client.go @@ -7,6 +7,7 @@ import ( "github.com/admin-else/strom/proto_base" ) +// Connect connects to the given address note that it does not resolve the SRV records its just a raw net.Dial func Connect(addr string) (ret *proto.Conn, err error) { ret = &proto.Conn{} err = ret.SetVersion("1.21.8") diff --git a/client/modules/config_ignorer.go b/client/modules/config_ignorer.go index 744575c..581af7b 100644 --- a/client/modules/config_ignorer.go +++ b/client/modules/config_ignorer.go @@ -3,6 +3,7 @@ package modules import ( "errors" "fmt" + "log/slog" "github.com/admin-else/strom/event" "github.com/admin-else/strom/proto" @@ -14,8 +15,8 @@ type ConfigIgnorer struct { *proto.Conn } -func (c *ConfigIgnorer) Default(event any) (err error) { - fmt.Printf("%#v\n", event) +func (c *ConfigIgnorer) Default(event event.Anything) (err error) { + slog.Debug("Config ignorer", "packet", fmt.Sprintf("%#v", event)) return } @@ -23,7 +24,7 @@ func (c *ConfigIgnorer) OnKnownPacks(packet *v1_21_8.ConfigurationToClientPacket return c.Send(&v1_21_8.ConfigurationToServerPacketCommonSelectKnownPacks{Packs: packet.Packs}) } -func (c *ConfigIgnorer) OnFinish(_ v1_21_8.ConfigurationToClientPacketFinishConfiguration) (err error) { +func (c *ConfigIgnorer) OnFinish(_ *v1_21_8.ConfigurationToClientPacketFinishConfiguration) (err error) { err = c.Send(&v1_21_8.ConfigurationToServerPacketFinishConfiguration{}) if err != nil { return diff --git a/client/modules/status.go b/client/modules/status.go index 70b6598..d2c3521 100644 --- a/client/modules/status.go +++ b/client/modules/status.go @@ -25,7 +25,7 @@ func (s *StatusClient) Default(event any) (err error) { func (s *StatusClient) OnStart(_ event.OnStart) (err error) { parts := strings.Split(s.RemoteAddr().String(), ":") - versionData, err := data.LookUpProtocolVersionByName(s.Version) + versionData, err := data.LookUpVersionByName(s.Version) if err != nil { return } @@ -34,7 +34,7 @@ func (s *StatusClient) OnStart(_ event.OnStart) (err error) { return } err = s.Send(&v1_21_8.HandshakingToServerPacketSetProtocol{ - ProtocolVersion: int32(versionData.Version), + ProtocolVersion: versionData.Version, ServerHost: parts[0], ServerPort: uint16(port), NextState: int32(proto_base.Status), diff --git a/data/protocol_version.go b/data/protocol_version.go index 11ef00f..c79489f 100644 --- a/data/protocol_version.go +++ b/data/protocol_version.go @@ -9,18 +9,18 @@ package data // "releaseType": "snapshot" // }, -type ProtocolVersion struct { +type VersionInfo struct { MinecraftVersion string - Version int + Version int32 DataVersion int UsesNetty bool MajorVersion string ReleaseType string } -var ProtocolVersions []ProtocolVersion +var ProtocolVersions []VersionInfo -func LookUpProtocolVersionByName(name string) (ret ProtocolVersion, err error) { +func LookUpVersionByName(name string) (ret VersionInfo, err error) { for _, v := range ProtocolVersions { if v.MinecraftVersion == name { ret = v @@ -31,7 +31,7 @@ func LookUpProtocolVersionByName(name string) (ret ProtocolVersion, err error) { return } -func LookUpProtocolVersionByVersion(version int) (ret ProtocolVersion, err error) { +func LookUpVersionByProtocolVersion(version int32) (ret VersionInfo, err error) { for _, v := range ProtocolVersions { if v.Version == version { ret = v diff --git a/data/protocol_version_test.go b/data/protocol_version_test.go index 171df13..7da5d9b 100644 --- a/data/protocol_version_test.go +++ b/data/protocol_version_test.go @@ -7,7 +7,7 @@ import ( ) func TestLookUpProtocolVersion(t *testing.T) { - version, err := data.LookUpProtocolVersionByVersion(772) + version, err := data.LookUpVersionByProtocolVersion(772) if err != nil { t.Fatalf("Expected to find version 772, got error: %v", err) } diff --git a/event/event_bus.go b/event/event_bus.go index 71e8a68..94ee444 100644 --- a/event/event_bus.go +++ b/event/event_bus.go @@ -44,8 +44,8 @@ func (e HandlerDoneErr) Unwrap() error { // ErrDontForward will stop the event from being forwarded to other handlers, including anything handlers. var ErrDontForward = errors.New("dont forward") -// FindHandlers initializes and populates the HandlerFunctions map by reflecting over methods of registered handlers. -func (l *Loop) FindHandlers() { +// SetHandlerFunctions initializes and populates the HandlerFunctions map by reflecting over methods of registered handlers. +func (l *Loop) SetHandlerFunctions() { l.HandlerFunctions = make(map[reflect.Type][]reflect.Value) for _, inst := range l.Handlers { t := reflect.TypeOf(inst) @@ -104,7 +104,7 @@ func (l *Loop) Fire(event any) (err error) { func (l *Loop) Start() (err error) { _ = *l // exit early on nil connection - l.FindHandlers() + l.SetHandlerFunctions() err = l.Fire(OnStart{}) for err == nil { err = l.Fire(Tick{}) diff --git a/go.work b/go.work deleted file mode 100644 index f5d1a66..0000000 --- a/go.work +++ /dev/null @@ -1,8 +0,0 @@ -go 1.25 - -use ( - .devres/examples/ishacking - . - .devres/examples/ishackingapis - .devres/examples/testmod -) \ No newline at end of file diff --git a/nbt/nbt.go b/nbt/nbt.go index 626068f..909a0e2 100644 --- a/nbt/nbt.go +++ b/nbt/nbt.go @@ -62,7 +62,7 @@ func (s *Anon) Encode(w io.Writer) (err error) { return } -func (s *Tag) Read(r io.Reader) (err error) { +func (s *Tag) Decode(r io.Reader) (err error) { id := int8(0) err = binary.Read(r, Order, &id) if err != nil { @@ -81,7 +81,7 @@ func (s *Tag) Read(r io.Reader) (err error) { return } -func (s *Tag) Write(w io.Writer) (err error) { +func (s *Tag) Encode(w io.Writer) (err error) { id, err := getId(s.Value) if err != nil { return diff --git a/proto/connection.go b/proto/connection.go index 647c7a7..25d6979 100644 --- a/proto/connection.go +++ b/proto/connection.go @@ -3,7 +3,9 @@ package proto import ( "bytes" "errors" + "fmt" "io" + "log/slog" "sync" "github.com/admin-else/strom/data" @@ -56,7 +58,7 @@ func (c *Conn) State() proto_base.State { func (c *Conn) SetVersion(version string) (err error) { c.Version = version - versionData, err := data.LookUpProtocolVersionByName(c.Version) + versionData, err := data.LookUpVersionByName(c.Version) if err != nil { return } @@ -122,6 +124,7 @@ func (c *Conn) OnTick(_ event.Tick) (err error) { if err != nil { return } + slog.Debug("packet", "actor", c.Actor, "packet", fmt.Sprintf("%#v", packet)) err = c.Loop.Fire(packet) return } @@ -131,5 +134,7 @@ func (c *Conn) Start(handlers ...any) (err error) { c.Handlers = append(c.Handlers, c) c.Handlers = append(c.Handlers, handlers...) err = c.Loop.Start() + c.Handlers = c.Handlers[:len(c.Handlers)-len(handlers)] + c.Loop.SetHandlerFunctions() return } diff --git a/proto_base/base_types.go b/proto_base/base_types.go index 0d6292f..967ac3e 100644 --- a/proto_base/base_types.go +++ b/proto_base/base_types.go @@ -45,6 +45,17 @@ const ( Client ) +func (a Actor) String() string { + switch a { + case Servee: + return "Servee" + case Client: + return "Client" + default: + return "Unknown" + } +} + func (a Actor) SendDirection() Direction { switch a { case Servee: @@ -67,12 +78,6 @@ func (a Actor) ReceiveDirection() Direction { } } -type PacketIdentifier struct { - Direction Direction - State State - Name string -} - type ( ToDo struct{} RestBuffer []byte diff --git a/proto_generator/main.go b/proto_generator/main.go index 4880fe7..7948460 100644 --- a/proto_generator/main.go +++ b/proto_generator/main.go @@ -247,7 +247,7 @@ func (g *Generator) GenerateTypes(prefix string, types Types) (err error) { } func (g *Generator) GenerateProtocol(protocol Protocol, version string) (err error) { - versionData, err := data.LookUpProtocolVersionByName(version) + versionData, err := data.LookUpVersionByName(version) if err != nil { return } @@ -298,7 +298,7 @@ func (g *Generator) GenerateProtocol(protocol Protocol, version string) (err err Direction: types.Direction, State: types.State, PacketId: packetIdsRev[k2], - ProtocolVersion: strconv.Itoa(versionData.Version), + ProtocolVersion: strconv.Itoa(int(versionData.Version)), MinecraftVersion: version, }) } diff --git a/server/server.go b/server/server.go index b641957..229e022 100644 --- a/server/server.go +++ b/server/server.go @@ -6,7 +6,6 @@ import ( "github.com/admin-else/strom/proto" "github.com/admin-else/strom/proto_base" - "github.com/admin-else/strom/server/server_modules" "github.com/admin-else/strom/text" ) @@ -43,7 +42,12 @@ func StartServerWithFactory(listenAddr string, factory func(c *proto.Conn) (h an if err != nil { return } - go ServeClient(cNet, factory) + go func() { + err := ServeClient(cNet, factory) + if err != nil { + slog.Error("error while serving client", "error", err, "client", cNet.RemoteAddr()) + } + }() } } @@ -67,7 +71,7 @@ func StartServerWithOnConn(listenAddr string, onConn func(c *proto.Conn) (err er return // we dont care about status packets } slog.Error("Error while handling client", "error", connErr, "client", c.Conn.RemoteAddr()) - connErr = server_modules.Kick(c, text.Pretty(connErr.Error())) + connErr = Kick(c, text.Pretty(connErr.Error())) if connErr != nil { slog.Error("Error while kicking client", "error", connErr, "client", c.Conn.RemoteAddr()) } diff --git a/server/server_modules/kicker.go b/server/server_modules/kicker.go deleted file mode 100644 index bab6781..0000000 --- a/server/server_modules/kicker.go +++ /dev/null @@ -1,39 +0,0 @@ -package server_modules - -import ( - "errors" - - "github.com/admin-else/strom/nbt" - "github.com/admin-else/strom/proto" - "github.com/admin-else/strom/proto_base" - "github.com/admin-else/strom/proto_generated/v1_21_8" - "github.com/admin-else/strom/text" -) - -var ( - NotClientErr = errors.New("not a servee") - CantKickInStateErr = errors.New("cant kick in this state") -) - -func Kick(c *proto.Conn, reason *text.Component) (err error) { - if c.Actor != proto_base.Servee { - err = NotClientErr - return - } - switch c.State() { - case proto_base.Handshaking, proto_base.Status: - err = CantKickInStateErr - case proto_base.Login: - var b []byte - b, err = reason.MarshalJSON() - if err != nil { - return - } - err = c.Send(&v1_21_8.LoginToClientPacketDisconnect{Reason: string(b)}) - case proto_base.Configuration: - err = c.Send(&v1_21_8.ConfigurationToClientPacketDisconnect{Reason: nbt.Anon{Value: reason.ToNBT()}}) - case proto_base.Play: - err = c.Send(&v1_21_8.PlayToClientPacketKickDisconnect{Reason: nbt.Anon{Value: reason.ToNBT()}}) - } - return -} diff --git a/server/server_modules/login_server.go b/server/server_modules/login_server.go deleted file mode 100644 index e997648..0000000 --- a/server/server_modules/login_server.go +++ /dev/null @@ -1,181 +0,0 @@ -package server_modules - -import ( - "encoding/json" - "errors" - "fmt" - "log/slog" - "slices" - - "github.com/admin-else/strom/api" - "github.com/admin-else/strom/event" - "github.com/admin-else/strom/proto" - "github.com/admin-else/strom/proto_base" - "github.com/admin-else/strom/proto_generated/v1_21_8" - "github.com/google/uuid" -) - -var StatusServedError = errors.New("status served") - -var UnexpectedStatusRequest = UnexpectedNextStateError{proto_base.Status} - -type NameAndUUID struct { - Name string - UUID uuid.UUID -} - -type UnexpectedNextStateError struct { - NextState proto_base.State -} - -func (u UnexpectedNextStateError) Error() string { - return fmt.Sprintf("unexpected next state: %v", u.NextState) -} - -type LoginServer struct { - *proto.Conn - //OnlineMode bool FIXME: implement this - ServerHost string - ServerPort uint16 - Requested NameAndUUID - Given *NameAndUUID - CompressionThreshold int32 - Status []byte - CompatibleVersions []int32 -} - -func (l *LoginServer) OnHandshake(packet *v1_21_8.HandshakingToServerPacketSetProtocol) (err error) { - l.SetState(proto_base.State(packet.NextState)) - l.ServerHost = packet.ServerHost - l.ServerPort = packet.ServerPort - - if packet.NextState != int32(proto_base.Login) && !(l.Status != nil && packet.NextState == int32(proto_base.Status)) { - err = UnexpectedNextStateError{proto_base.State(packet.NextState)} - } - - if len(l.CompatibleVersions) != 0 { - if !slices.Contains(l.CompatibleVersions, packet.ProtocolVersion) { - err = fmt.Errorf("incompatible protocol version please use one of %v you can look up the real coresponding version at https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers", l.CompatibleVersions) - return - } - } - - return -} - -func (l *LoginServer) OnStatusRequest(_ *v1_21_8.StatusToServerPacketPingStart) (err error) { - err = l.Send(&v1_21_8.StatusToClientPacketServerInfo{Response: string(l.Status)}) - return -} - -func (l *LoginServer) OnStatusPing(packet *v1_21_8.StatusToServerPacketPing) (err error) { - err = l.Send(&v1_21_8.StatusToClientPacketPing{Time: packet.Time}) - if err != nil { - return - } - return event.HandlerDoneErr{Return: StatusServedError} -} - -func (l *LoginServer) SetCompressionThreshold(threshold int32) (err error) { - err = l.Send(&v1_21_8.LoginToClientPacketCompress{Threshold: threshold}) - if err != nil { - return - } - l.CompressionThreshold = threshold - return -} - -func (l *LoginServer) OnLoginStart(packet *v1_21_8.LoginToServerPacketLoginStart) (err error) { - l.Requested = NameAndUUID{packet.Username, packet.PlayerUUID} - //err = l.SetCompressionThreshold(l.CompressionThreshold) - //if err != nil { - // return - //} - if l.Given == nil { - l.Given = &l.Requested - } - err = l.Send(&v1_21_8.LoginToClientPacketSuccess{ - Uuid: l.Given.UUID, - Username: l.Given.Name, - Properties: nil, - }) - return -} - -func (l *LoginServer) OnLoginAcknowledged(_ *v1_21_8.LoginToServerPacketLoginAcknowledged) (err error) { - l.SetState(proto_base.Configuration) - err = event.HandlerDoneErr{} - return -} - -func (l *LoginServer) OnDefault(event event.Unhandled) (err error) { - err = fmt.Errorf("unexpected event during login: %#v", event) - fmt.Println(err) - return -} - -func (l *LoginServer) OnStart(_ event.OnStart) (err error) { - return -} - -func (l *LoginServer) OnCycle(_ event.Tick) (err error) { - return -} - -type LoginServerSetting func(*LoginServer) - -func WithOtherAccount(a *api.Account) LoginServerSetting { - return func(s *LoginServer) { - if s.Given == nil { - return - } - s.Given = &NameAndUUID{ - Name: a.Name, - UUID: a.Uuid, - } - } -} - -func WithRawStatus(status []byte) LoginServerSetting { - return func(s *LoginServer) { - s.Status = status - } -} - -func WithStatus(response StatusResponse) LoginServerSetting { - var status []byte - status, err := json.Marshal(response) - if err != nil { - panic(err) - } - slog.Debug("With status", "status", status) - return WithRawStatus(status) -} - -func WithCompatibleVersion(versions int32) LoginServerSetting { - return WithCompatibleVersions([]int32{versions}) -} - -func WithCompatibleVersionsRange(start, end int32) LoginServerSetting { - var versions []int32 - for i := start; i <= end; i++ { - versions = append(versions, i) - } - return WithCompatibleVersions(versions) -} - -func WithCompatibleVersions(versions []int32) LoginServerSetting { - return func(s *LoginServer) { - s.CompatibleVersions = versions - } -} - -func ServeLogin(c *proto.Conn, settings ...LoginServerSetting) (ret *LoginServer, err error) { - ret = &LoginServer{Conn: c} - for _, s := range settings { - s(ret) - } - ret.CompressionThreshold = 256 - err = ret.Start(ret) - return -} diff --git a/server/server_modules/status.go b/server/server_modules/status.go deleted file mode 100644 index 21e56e5..0000000 --- a/server/server_modules/status.go +++ /dev/null @@ -1,58 +0,0 @@ -package server_modules - -import ( - "encoding/json" - - "github.com/admin-else/strom/proto" - "github.com/admin-else/strom/proto_generated/v1_21_8" - "github.com/admin-else/strom/text" -) - -// StatusResponse here is the structure I used: https://minecraft.wiki/w/Java_Edition_protocol/Server_List_Ping#Status_Response -type StatusResponse struct { - Version struct { - Name *text.Component `json:"name"` - Protocol int `json:"protocol"` - } `json:"version"` - Players struct { - Max int `json:"max"` - Online int `json:"online"` - Sample []struct { - Name *text.Component `json:"name"` - ID string `json:"id"` - } `json:"sample"` - } `json:"players"` - Description *text.Component `json:"description"` - Favicon string `json:"favicon"` - EnforcesSecureChat bool `json:"enforcesSecureChat"` -} - -type StatusServer struct { - *proto.Conn - Status string -} - -func (p *StatusServer) Default(_ any) (err error) { - return -} - -func (p *StatusServer) OnStatusRequest(_ *v1_21_8.StatusToServerPacketPingStart) (err error) { - return p.Send(&v1_21_8.StatusToClientPacketServerInfo{Response: p.Status}) -} - -func (p *StatusServer) OnStatusPing(packet *v1_21_8.StatusToServerPacketPing) (err error) { - return p.Send(&v1_21_8.StatusToClientPacketPing{Time: packet.Time}) -} - -func ServeStatus(c *proto.Conn, s StatusResponse) (err error) { - status, err := json.Marshal(s) - if err != nil { - return - } - server := &StatusServer{ - Conn: c, - Status: string(status), - } - err = server.Start(server) - return -} diff --git a/text/text.go b/text/text.go index 6ac64cc..a8d2153 100644 --- a/text/text.go +++ b/text/text.go @@ -62,11 +62,56 @@ func (c *Component) MarshalJSON() ([]byte, error) { if c.isSimpleText() { return json.Marshal(c.Text) } + if c.hasFormattingButNoContent() { + // just like component but text does not have omitempty + type AliasWithText struct { + Bold *bool `json:"bold,omitempty"` + Italic *bool `json:"italic,omitempty"` + Underlined *bool `json:"underlined,omitempty"` + Strikethrough *bool `json:"strikethrough,omitempty"` + Obfuscated *bool `json:"obfuscated,omitempty"` + Font string `json:"font,omitempty"` + Color string `json:"color,omitempty"` + Insertion string `json:"insertion,omitempty"` + ClickEvent *ClickEvent `json:"clickEvent,omitempty"` + HoverEvent *HoverEvent `json:"hoverEvent,omitempty"` + Extra []Component `json:"extra,omitempty"` + Text string `json:"text"` + + Translate string `json:"translate,omitempty"` + With []Component `json:"with,omitempty"` + Score *Score `json:"score,omitempty"` + Selector string `json:"selector,omitempty"` + Keybind string `json:"keybind,omitempty"` + NBT string `json:"nbt,omitempty"` + Interpret bool `json:"interpret,omitempty"` + Block string `json:"block,omitempty"` + Entity string `json:"entity,omitempty"` + Storage string `json:"storage,omitempty"` + Separator *Component `json:"separator,omitempty"` + } + return json.Marshal(AliasWithText(*c)) + } type Alias Component + return json.Marshal(Alias(*c)) } +// hasFormattingButNoContent checks if the component has formatting/styling but no content fields +func (c *Component) hasFormattingButNoContent() bool { + hasFormatting := c.Bold != nil || c.Italic != nil || c.Underlined != nil || + c.Strikethrough != nil || c.Obfuscated != nil || c.Font != "" || + c.Color != "" || c.Insertion != "" || c.ClickEvent != nil || + c.HoverEvent != nil || len(c.Extra) > 0 || c.Separator != nil + + hasContent := c.Text != "" || c.Translate != "" || len(c.With) > 0 || + c.Score != nil || c.Selector != "" || c.Keybind != "" || + c.NBT != "" || c.Block != "" || c.Entity != "" || c.Storage != "" + + return hasFormatting && !hasContent +} + func (c *Component) isSimpleText() bool { return c.Text != "" && c.Bold == nil && c.Italic == nil && c.Underlined == nil && c.Strikethrough == nil && c.Obfuscated == nil && @@ -215,6 +260,10 @@ func (c *Component) ToNBT() any { m["separator"] = c.Separator.ToNBT() } + if c.hasFormattingButNoContent() { + m["text"] = "" + } + return m } diff --git a/tools/uncodeable_packet_hunter_proxy/main.go b/tools/uncodeable_packet_hunter_proxy/main.go index ac3e0aa..385f707 100644 --- a/tools/uncodeable_packet_hunter_proxy/main.go +++ b/tools/uncodeable_packet_hunter_proxy/main.go @@ -4,6 +4,7 @@ package main import ( "crypto/sha256" "fmt" + "log/slog" "os" "github.com/admin-else/strom/api" @@ -13,7 +14,6 @@ import ( "github.com/admin-else/strom/proto_base" "github.com/admin-else/strom/proto_generated/v1_21_8" "github.com/admin-else/strom/server" - "github.com/admin-else/strom/server/server_modules" "github.com/admin-else/strom/text" ) @@ -116,6 +116,7 @@ func SaveUnCodeAbleAsTest(d proto_base.Direction, packet proto.UnCodablePacket) if err != nil { panic(err) } + //goland:noinspection GoUnhandledErrorResult defer f.Close() _, err = fmt.Fprintf(f, TestSrcF, packet.Err, h, d.Opposite(), packet.Data) if err != nil { @@ -124,32 +125,23 @@ func SaveUnCodeAbleAsTest(d proto_base.Direction, packet proto.UnCodablePacket) fmt.Println("Error", packet.Err, "saved to", f.Name(), "data:", packet.Data) } -var StatusResponse = server_modules.StatusResponse{ - Version: struct { - Name *text.Component `json:"name"` - Protocol int `json:"protocol"` - }{ +var StatusResponse = server.StatusResponse{ + Version: server.StatusResponseVersion{ Name: text.Pretty("STROM"), Protocol: 772, }, - Players: struct { - Max int `json:"max"` - Online int `json:"online"` - Sample []struct { - Name *text.Component `json:"name"` - ID string `json:"id"` - } `json:"sample"` - }{}, + Players: server.StatusResponsePlayers{}, Description: text.Pretty("Hunt the uncodeable packets"), Favicon: "", EnforcesSecureChat: false, } func main() { + slog.SetLogLoggerLevel(slog.LevelDebug) err := server.StartServerWithOnConn(":25565", func(serveeConn *proto.Conn) (err error) { p := &Proxy{Conn: serveeConn, Client: nil} acc := api.NewOfflineAccount("sigma") - _, err = server_modules.ServeLogin(serveeConn, server_modules.WithOtherAccount(acc), server_modules.WithStatus(StatusResponse)) + _, err = server.ServeLogin(serveeConn, server.WithOtherAccount(acc), server.WithStatus(StatusResponse)) if err != nil { return } @@ -161,7 +153,6 @@ func main() { p.Client = pc errChan := make(chan error) defer pc.Close() - defer p.Close() go func() { errChan <- pc.Start(pc) }()