diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..0792949 --- /dev/null +++ b/CREDITS @@ -0,0 +1 @@ +Many thanks to PoolloverNathan (https://github.com/PoolloverNathan) and Martinz64 (https://github.com/Martinz64) for their work on which Sculptor was developed. diff --git a/Cargo.lock b/Cargo.lock index ce7e3ae..2ef3311 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,6 +229,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", "windows-targets 0.52.5", ] @@ -308,19 +309,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "elyby-api" -version = "0.1.0" -dependencies = [ - "anyhow", - "log", - "reqwest", - "serde", - "serde_json", - "tokio", - "uuid", -] - [[package]] name = "encoding_rs" version = "0.8.34" @@ -1108,15 +1096,16 @@ dependencies = [ "base64 0.22.1", "chrono", "dashmap", - "elyby-api", "fern", "hex", "log", "rand", + "reqwest", "ring", "serde", "serde_json", "tokio", + "toml", "tower-http", "uuid", ] @@ -1185,6 +1174,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1404,6 +1402,40 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -1826,6 +1858,15 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.52.0" diff --git a/Cargo.toml b/Cargo.toml index 1ad681c..47f719f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,22 +5,27 @@ version = "0.1.0" edition = "2021" publish = false -[workspace] -members = ["elyby-api"] - [dependencies] # Logging log = "0.4.21" fern = { version = "0.6.2", features = ["colored"] } + +# Errors handelers anyhow = "1.0.83" +anyhow-http = { version = "0.3.0", features = ["axum"] } # Serialization -chrono = { version = "0.4.38", features = ["now"] } +chrono = { version = "0.4.38", features = ["now", "serde"] } serde = { version = "1.0.201", features = ["derive"] } +serde_json = "1.0.117" +toml = "0.8.13" # Other -elyby-api = { path = "./elyby-api" } dashmap = "5.5.3" +hex = "0.4.3" +uuid = { version = "1.8.0", features = ["serde"] } +base64 = "0.22.1" +reqwest = { version = "0.12.4" } # Crypto ring = "0.17.8" @@ -30,12 +35,7 @@ rand = "0.8.5" axum = { version = "0.7.5", features = ["ws", "macros", "http2"] } tower-http = { version = "0.5.2", features = ["trace"] } tokio = { version = "1.37.0", features = ["full"] } -hex = "0.4.3" -uuid = { version = "1.8.0", features = ["serde"] } -base64 = "0.22.1" -serde_json = "1.0.117" -anyhow-http = { version = "0.3.0", features = ["axum"] } -# TODO: Рассортировать! -# TODO: Заменить Vec и &[u8] на Bytes +# TODO: Sort it! +# TODO: Replace Vec and &[u8] by Bytes # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html \ No newline at end of file diff --git a/Config.toml b/Config.toml new file mode 100644 index 0000000..9d088d1 --- /dev/null +++ b/Config.toml @@ -0,0 +1,43 @@ +listen = "0.0.0.0:6665" +motd = """ +[ + { + "text": "The Sculptor\nUnofficial Backend V2 for Figura\n\n" + }, + { + "clickEvent": { + "action": "open_url", + "value": "https://github.com/shiroyashik/sculptor" + }, + "text": "Please " + }, + { + "clickEvent": { + "action": "open_url", + "value": "https://github.com/shiroyashik/sculptor" + }, + "color": "gold", + "text": "Star", + "underlined": true + }, + { + "clickEvent": { + "action": "open_url", + "value": "https://github.com/shiroyashik/sculptor" + }, + "text": " me on GitHub!\n\n" + } +] +""" + +# Shiroyashik +[advancedUsers.66004548-4de5-49de-bade-9c3933d8eb97] +special = [0,0,0,1,0,0] # 6 +pride = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # 25 + +# Your nickname here +# [advancedUsers.your uuid here] +# special = [0,1,0,0,0,0] # and set badges what you want! :D +# pride = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + +# you can create an unlimited number of "advancedUsers" for any users. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a22935f --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +## The Sculptor + +Unofficial backend V2 for the Minecraft mod [Figura](https://github.com/FiguraMC/Figura). + +Implements Ping transmission functionality via Websocket and full avatar upload and download functionality. Currently incomplete and under active development + +And also a distinctive feature is the possibility of player identification through the third-party authorization system [Ely.By](https://ely.by/) + +### TODO: +- [ ] Realization of storing profiles in the database +- [ ] Frontend for moderation +- [ ] Check the possibility of replacing assets to display the authorization system used by the player +- [ ] and many other... diff --git a/elyby-api/Cargo.toml b/elyby-api/Cargo.toml deleted file mode 100644 index 7ccd3d0..0000000 --- a/elyby-api/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "elyby-api" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -anyhow = "1.0.83" -log = "0.4.21" -reqwest = { version = "0.12.4" } -serde = { version = "1.0.201", features = ["derive"] } -serde_json = "1.0.117" -tokio = { version = "1.37.0", features = ["full"] } -uuid = "1.8.0" diff --git a/elyby-api/src/lib.rs b/elyby-api/src/lib.rs deleted file mode 100644 index c9ae645..0000000 --- a/elyby-api/src/lib.rs +++ /dev/null @@ -1,37 +0,0 @@ -use anyhow::{anyhow, Result}; -use log::debug; -use serde_json::Value; -use uuid::Uuid; - -pub async fn has_joined(server_id: &str, username: &str) -> Result> { - let client = reqwest::Client::new(); - let res = client.get( - format!("http://minecraft.ely.by/session/hasJoined?serverId={server_id}&username={username}")).send().await?; - debug!("{res:?}"); - match res.status().as_u16() { - 200 => { - let json = serde_json::from_str::(&res.text().await?)?; - let uuid = Uuid::parse_str(json["id"].as_str().unwrap())?; - Ok(Some(uuid)) - }, - 401 => Ok(None), - _ => Err(anyhow!("Unknown code: {}", res.status().as_u16())) - } -} - -#[tokio::test] -async fn test_has_joined() { - let result = has_joined("0f8fef917f1f62b963804d822b67fe6f59aad7d", "test").await.unwrap(); - assert_eq!(result, None) -} - -// #[cfg(test)] -// mod tests { -// use super::*; - -// #[test] -// fn it_works() { -// let result = add(2, 2); -// assert_eq!(result, 4); -// } -// } \ No newline at end of file diff --git a/note.txt b/note.txt index 366b183..d91f1d0 100644 --- a/note.txt +++ b/note.txt @@ -17,4 +17,39 @@ 3000 Unauthorized 4000 Re-Auth 4001 Banned -4002 Too Many Connections \ No newline at end of file +4002 Too Many Connections + +Special badges +1 Разработчик +2 Член персонала официального сервера +3 Победитель контеста +4 Спасибо за поддержку +5 Переводчик +6 Художник текстур мода + +Pride badges +1 Агендерный +2 Ароэйс +3 Ароматик +4 Асексуал +5 Бигендер +6 Бисексуал +7 Демибой +8 Демигендер +9 Демигирл +10 Демироматик +11 Демисексуал +12 Инвалидности +13 Финсексуал +14 Гей Мужчины +15 Гендерфай +16 Гендерфлюид +17 Гендерквир +18 Интерсекс +19 Лесбиянка +20 Небинар +21 Пансексуал +22 Плюрал +23 Полисексуал +24 Прайд +25 Трансгендер \ No newline at end of file diff --git a/src/auth.rs b/src/auth.rs index 1b532e7..a335cc7 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -1,7 +1,9 @@ +use anyhow::anyhow; use axum::{async_trait, debug_handler, extract::{FromRequestParts, Query, State}, http::{request::Parts, StatusCode}, response::{IntoResponse, Response}, routing::get, Router}; -use log::debug; +use log::{debug, info, trace}; use serde::Deserialize; use ring::digest::{self, digest}; +use uuid::Uuid; use crate::utils::*; use crate::AppState; @@ -18,7 +20,7 @@ pub fn router() -> Router { struct Id {username: String} #[debug_handler] -async fn id( // 1 этап аутентификации +async fn id( // First stage of authentication Query(query): Query, State(state): State, ) -> String { @@ -32,17 +34,18 @@ async fn id( // 1 этап аутентификации struct Verify {id: String} #[debug_handler] -async fn verify( // 2 этап аутентификации +async fn verify( // Second stage of authentication Query(query): Query, State(state): State, ) -> String { let server_id = query.id.clone(); let username = state.pending.lock().await.remove(&server_id).unwrap().1; - if let Some(uuid) = elyby_api::has_joined(&server_id, &username).await.unwrap() { + if let Some((uuid, auth_system)) = has_joined(&server_id, &username).await.unwrap() { + info!("[Authorization] {username} logged in using {auth_system:?}"); let authenticated = state.authenticated.lock().await; - let link = state.authenticated_link.lock().await; - authenticated.insert(server_id.clone(), crate::Userinfo { username, uuid }); - link.insert(uuid, crate::AuthenticatedLink(server_id.clone())); + // let link = state.authenticated_link.lock().await; // // Реализация поиска пользователя в HashMap по UUID + authenticated.insert(server_id.clone(), crate::Userinfo { username, uuid, auth_system }); + // link.insert(uuid, crate::AuthenticatedLink(server_id.clone())); // Реализация поиска пользователя в HashMap по UUID return format!("{server_id}") } else { return String::from("failed to verify") @@ -88,11 +91,55 @@ where .headers .get("token") .and_then(|value| value.to_str().ok()); - debug!("[Extractor Token] Данные: {token:?}"); + trace!("[Extractor Token] Data: {token:?}"); match token { Some(token) => Ok(Self(Some(token.to_string()))), None => Ok(Self(None)), } } } -// Конец экстрактора \ No newline at end of file +// Конец экстрактора + +// Work with external APIs + +#[derive(Debug, Clone)] +pub enum AuthSystem { + ElyBy, + Mojang, +} + +pub async fn has_joined(server_id: &str, username: &str) -> anyhow::Result> { + let client = reqwest::Client::new(); + tokio::select! { + Ok(Some(res)) = async { + let res = client.clone().get( + format!("http://minecraft.ely.by/session/hasJoined?serverId={server_id}&username={username}")).send().await?; + debug!("{res:?}"); + match res.status().as_u16() { + 200 => { + let json = serde_json::from_str::(&res.text().await?)?; + let uuid = Uuid::parse_str(json["id"].as_str().unwrap())?; + Ok(Some((uuid, AuthSystem::ElyBy))) + }, + 401 => Ok(None), + _ => Err(anyhow::anyhow!("Unknown code: {}", res.status().as_u16())) + } + } => {Ok(Some(res))} + Ok(Some(res)) = async { + let res = client.clone().get( + format!("https://sessionserver.mojang.com/session/minecraft/hasJoined?serverId={server_id}&username={username}")).send().await?; + debug!("{res:?}"); + match res.status().as_u16() { + 200 => { + let json = serde_json::from_str::(&res.text().await?)?; + let uuid = Uuid::parse_str(json["id"].as_str().unwrap())?; + Ok(Some((uuid, AuthSystem::Mojang))) + }, + 204 => Ok(None), + _ => Err(anyhow::anyhow!("Unknown code: {}", res.status().as_u16())) + } + } => {Ok(Some(res))} + else => {Err(anyhow!("Something went wrong in external apis request process"))} + } +} +// End of work with external APIs \ No newline at end of file diff --git a/src/config.rs b/src/config.rs new file mode 100644 index 0000000..4570a12 --- /dev/null +++ b/src/config.rs @@ -0,0 +1,23 @@ +use std::{io::Read, path::PathBuf}; + +use serde::Deserialize; +use toml::Table; + +#[derive(Deserialize, Clone, Debug)] +#[serde(rename_all = "camelCase")] +pub struct Config { + pub listen: String, + pub motd: String, + pub advanced_users: Table, +} + + +impl Config { + pub fn parse(path: PathBuf) -> Self { + let mut file = std::fs::File::open(path).expect("Access denied or file doesn't exists!"); + let mut data = String::new(); + file.read_to_string(&mut data).unwrap(); + + toml::from_str(&data).unwrap() + } +} \ No newline at end of file diff --git a/src/info.rs b/src/info.rs index 8fd1c49..5233f42 100644 --- a/src/info.rs +++ b/src/info.rs @@ -4,8 +4,8 @@ use serde_json::{json, Value}; pub async fn version() -> Json { Json(json!({ - "release": "1.7.1", - "prerelease": "1.7.2" + "release": "0.1.4", + "prerelease": "0.1.4" })) } @@ -13,7 +13,7 @@ pub async fn limits() -> Json { Json(json!({ "rate": { "pingSize": 1024, - "pingRate": 32, // TODO: Проверить + "pingRate": 32, "equip": 1, "download": 50, "upload": 1 diff --git a/src/main.rs b/src/main.rs index f3cb359..245c9ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -30,24 +30,27 @@ use profile as api_profile; // Utils mod utils; +// Config +mod config; + #[derive(Debug, Clone)] pub struct Userinfo { username: String, uuid: Uuid, + auth_system: api_auth::AuthSystem, + } -#[derive(Debug, Clone)] -pub struct AuthenticatedLink(String); - #[derive(Debug, Clone)] pub struct AppState { - // Пользователи с незаконченной аутентификацией + // Users with incomplete authentication pending: Arc>>, // - // Аутентифицированные пользователи - authenticated: Arc>>, // NOTE: В будущем попробовать в отдельной ветке LockRw - authenticated_link: Arc>>, // Получаем токен из Uuid - // Трансляции Ping'ов для WebSocket соединений + // Authenticated users + authenticated: Arc>>, // NOTE: In the future, try it in a separate LockRw branch + // Ping broadcasts for WebSocket connections broadcasts: Arc>>>>, + // Advanced configured users + advanced_users: Arc>, } #[tokio::main] @@ -68,41 +71,55 @@ async fn main() -> Result<()> { message )) }) - .level(log::LevelFilter::Debug) + .level(log::LevelFilter::Info) // .level_for("hyper", log::LevelFilter::Info) .chain(std::io::stdout()) .chain(fern::log_file("output.log")?) .apply()?; - // Конфиг - // TODO: Сделать Config.toml для установки настроек сервера - let listen = "0.0.0.0:6665"; + // Config + let config = config::Config::parse("Config.toml".into()); + let listen = config.listen.as_str(); - // Состояние - // TODO: Сделать usersStorage.toml как "временная" замена базе данных. + // State let state = AppState { pending: Arc::new(Mutex::new(DashMap::new())), authenticated: Arc::new(Mutex::new(DashMap::new())), - authenticated_link: Arc::new(Mutex::new(DashMap::new())), broadcasts: Arc::new(Mutex::new(DashMap::new())), + advanced_users: Arc::new(Mutex::new(config.advanced_users)), }; + + // Automatic update of advanced_users while the server is running + let advanced_users = state.advanced_users.clone(); + tokio::spawn(async move { + loop { + tokio::time::sleep(std::time::Duration::from_secs(10)).await; + + let new_config = config::Config::parse("Config.toml".into()).advanced_users; + let mut config = advanced_users.lock().await; + + if new_config != *config { + *config = new_config; + } + } + }); let api = Router::new() .nest( "//auth", api_auth::router() - ) // check Auth; return 200 OK if token valid + ) .route( "/limits", get(api_info::limits) - ) // Need more info :( TODO: + ) // TODO: .route( "/version", get(api_info::version), ) .route( "/motd", - get(|| async { "\"written by an black cat :3 mew\"" }), + get(|| async { config.motd }), ) .route( "/equip", diff --git a/src/profile.rs b/src/profile.rs index 41f43e3..3a54406 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -1,17 +1,18 @@ use anyhow_http::{http_error_ret, response::Result}; use axum::{body::Bytes, debug_handler, extract::{Path, State}, Json}; +use log::{debug, warn}; use serde_json::{json, Value}; use tokio::{fs, io::{AsyncReadExt, BufWriter, self}}; use uuid::Uuid; -use crate::{utils::{calculate_file_sha256, format_uuid}, auth::Token, AppState}; +use crate::{auth::Token, utils::{calculate_file_sha256, format_uuid, get_correct_array}, ws::S2CMessage, AppState}; #[debug_handler] pub async fn user_info( Path(uuid): Path, - State(_state): State, // FIXME: Variable doesn't using! + State(state): State, // FIXME: Variable doesn't using! ) -> Json { - log::info!("Получение информации для {}",uuid); + log::info!("Receiving profile information for {}",uuid); let formatted_uuid = format_uuid(uuid); @@ -23,13 +24,23 @@ pub async fn user_info( "equipped": [], "lastUsed": "2024-05-11T22:20:48.884Z", "equippedBadges": { - "special": [1,1,1,1,1,1], - "pride": [0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + "special": [0,0,0,0,0,0], + "pride": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] }, "version": "0.1.4+1.20.1", "banned": false }); + if let Some(settings) = state.advanced_users.lock().await.get(&formatted_uuid) { + let pride = get_correct_array(settings.get("pride").unwrap()); + let special = get_correct_array(settings.get("special").unwrap()); + let badges = user_info_response.get_mut("equippedBadges").and_then(Value::as_object_mut).unwrap(); + badges.append(json!({ + "special": special, + "pride": pride + }).as_object_mut().unwrap()) + } + if fs::metadata(&avatar_file).await.is_ok() { if let Some(equipped) = user_info_response.get_mut("equipped").and_then(Value::as_array_mut){ match calculate_file_sha256(&avatar_file){ @@ -54,11 +65,11 @@ pub async fn download_avatar( Path(uuid): Path, ) -> Result> { let uuid = format_uuid(uuid); - log::info!("Запрашиваем аватар: {}", uuid); + log::info!("Requesting an avatar: {}", uuid); let mut file = if let Ok(file) = fs::File::open(format!("avatars/{}.moon", uuid)).await { file } else { - http_error_ret!(NOT_FOUND, "Ошибка! Данный аватар не существует!"); + http_error_ret!(NOT_FOUND, "Error! This avatar does not exist!"); }; let mut buffer = Vec::new(); file.read_to_end(&mut buffer).await?; @@ -81,12 +92,12 @@ pub async fn upload_avatar( let token = match token { Some(t) => t, - None => http_error_ret!(UNAUTHORIZED, "Ошибка аутентификации!"), + None => http_error_ret!(UNAUTHORIZED, "Authentication error!"), }; let userinfos = state.authenticated.lock().await; if let Some(user_info) = userinfos.get(token.as_str()) { - log::info!("{} ({}) пытается загрузить аватар",user_info.uuid,user_info.username); + log::info!("{} ({}) trying to upload an avatar",user_info.uuid,user_info.username); let avatar_file = format!("avatars/{}.moon",user_info.uuid); let mut file = BufWriter::new(fs::File::create(&avatar_file).await?); io::copy(&mut request_data.as_ref(), &mut file).await?; @@ -94,7 +105,15 @@ pub async fn upload_avatar( Ok(format!("ok")) } -pub async fn equip_avatar() -> String { +pub async fn equip_avatar( + Token(token): Token, + State(state): State, +) -> String { + debug!("[API] S2C : Equip"); + let uuid = state.authenticated.lock().await.get(&token.unwrap()).unwrap().uuid; + if state.broadcasts.lock().await.get(&uuid).unwrap().send(S2CMessage::Event(uuid).to_vec()).is_err() { + warn!("[WebSocket] Failed to send Event! Maybe there is no one to send") // FIXME: Засунуть в Handler + }; format!("ok") } @@ -104,11 +123,11 @@ pub async fn delete_avatar( ) -> Result { let token = match token { Some(t) => t, - None => http_error_ret!(UNAUTHORIZED, "Ошибка аутентификации!"), + None => http_error_ret!(UNAUTHORIZED, "Authentication error!"), }; let userinfos = state.authenticated.lock().await; if let Some(user_info) = userinfos.get(token.as_str()) { - log::info!("{} ({}) пытается удалить аватар",user_info.uuid,user_info.username); + log::info!("{} ({}) is trying to delete the avatar",user_info.uuid,user_info.username); let avatar_file = format!("avatars/{}.moon",user_info.uuid); fs::remove_file(avatar_file).await?; } diff --git a/src/utils.rs b/src/utils.rs index a7fc7c1..52e09d7 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -33,6 +33,11 @@ pub fn _generate_hex_string(length: usize) -> String { // FIXME: Variable doesn' hex::encode(random_bytes) } +pub fn get_correct_array(value: &toml::Value) -> Vec { + // let res: Vec; + value.as_array().unwrap().iter().map(move |x| x.as_integer().unwrap() as u8).collect() +} + pub fn format_uuid(uuid: Uuid) -> String { // let uuid = Uuid::parse_str(&uuid)?; TODO: Вероятно format_uuid стоит убрать // .map_err(|_| tide::Error::from_str(StatusCode::InternalServerError, "Failed to parse UUID"))?; diff --git a/src/ws/c2s.rs b/src/ws/c2s.rs index 71fbc03..e59db51 100644 --- a/src/ws/c2s.rs +++ b/src/ws/c2s.rs @@ -88,19 +88,4 @@ impl<'a> Into> for C2SMessage<'a> { }; a } -} - -impl<'a> C2SMessage<'a> { - pub fn ping_data(self) -> Box<[u8]> { - use std::iter; - let a: Box<[u8]> = match self { - C2SMessage::Ping(p, s, d) => iter::empty() - .chain(p.to_be_bytes()) - .chain(iter::once(s.into())) - .chain(d.into_iter().copied()) - .collect(), - _ => todo!() // FIXME: Это всё нихеровых размеров костыль! - }; - a - } } \ No newline at end of file diff --git a/src/ws/handler.rs b/src/ws/handler.rs index ec91507..c5a32ac 100644 --- a/src/ws/handler.rs +++ b/src/ws/handler.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use axum::{extract::{ws::{Message, WebSocket}, State, WebSocketUpgrade}, response::Response}; use dashmap::DashMap; -use log::{debug, error, info, log, warn}; +use log::{debug, error, info, trace, warn}; use tokio::sync::{broadcast::{self, Receiver}, mpsc, Notify}; use uuid::Uuid; @@ -36,18 +36,18 @@ impl WSOwner { } async fn handle_socket(mut socket: WebSocket, state: AppState) { + debug!("[WebSocket] New unknown connection!"); let mut owner = WSOwner(None); let cutoff: DashMap> = DashMap::new(); let (mtx, mut mrx) = mpsc::channel(64); - // let (bctx, mut _bcrx) = broadcast::channel(64); let mut bctx: Option>> = None; loop { tokio::select! { Some(msg) = socket.recv() => { - debug!("[WebSocket{}] Raw: {msg:?}", owner.name()); + trace!("[WebSocket{}] Raw: {msg:?}", owner.name()); let mut msg = if let Ok(msg) = msg { if let Message::Close(_) = msg { - info!("[WebSocket{}] Соединение удачно закрыто!", owner.name()); + info!("[WebSocket{}] Connection successfully closed!", owner.name()); if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -55,8 +55,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { } msg } else { - // если попали сюда, значит вероятнее всего клиент отключился - warn!("[WebSocket{}] Ошибка получения! Соединение разорвано!", owner.name()); + warn!("[WebSocket{}] Receive error! Connection terminated!", owner.name()); if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -69,7 +68,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { let newmsg = match C2SMessage::try_from(msg_array) { Ok(data) => data, Err(e) => { - error!("[WebSocket{}] Это сообщение не от Figura! {e:?}", owner.name()); + error!("[WebSocket{}] This message is not from Figura! {e:?}", owner.name()); if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -77,11 +76,11 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { }, }; - info!("[WebSocket{}] Данные: {newmsg:?}", owner.name()); + debug!("[WebSocket{}] Raw: {newmsg:?}", owner.name()); match newmsg { C2SMessage::Token(token) => { // FIXME: Написать переменную спомощью которой бужет проверяться авторизовался ли пользователь или нет - info!("[WebSocket{}] Token", owner.name()); + debug!("[WebSocket{}] C2S : Token", owner.name()); let token = String::from_utf8(token.to_vec()).unwrap(); let authenticated = state.authenticated.lock().await; match authenticated.get(&token) { // Принцип прост: если токена в authenticated нет, значит это trash @@ -102,7 +101,8 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { }; }, None => { - warn!("[WebSocket] Ошибка авторизации! Соединение разорвано! {token}"); + warn!("[WebSocket] Authenticaton error! Connection terminated!"); + debug!("[WebSocket] Tried to log in with {token}"); // Tried to log in with token: {token} if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -111,17 +111,16 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { }; }, C2SMessage::Ping(_, _, _) => { - info!("[WebSocket{}] Ping", owner.name()); + debug!("[WebSocket{}] C2S : Ping", owner.name()); let data = into_s2c_ping(msg_vec, owner.0.clone().unwrap().uuid); - info!("Im gotcha homie! {:?}", data); match bctx.clone().unwrap().send(data) { Ok(_) => (), - Err(_) => error!("[WebSocket{}] Не удалось отправить Пинг!", owner.name()), + Err(_) => warn!("[WebSocket{}] Failed to send Ping! Maybe there's no one to send", owner.name()), }; continue; }, C2SMessage::Sub(uuid) => { // FIXME: Исключить возможность использования SUB без авторизации - info!("[WebSocket{}] Sub", owner.name()); + debug!("[WebSocket{}] C2S : Sub", owner.name()); // Отбрасываю Sub на самого себя if uuid == owner.0.clone().unwrap().uuid { continue; @@ -131,7 +130,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { let rx = match broadcast.get(&uuid) { Some(rx) => rx.to_owned().subscribe(), None => { - warn!("Внимание! Необходимый UUID для подписки не найден!"); + warn!("[WebSocket{}] Attention! The required UUID for subscription was not found!", owner.name()); let (tx, rx) = broadcast::channel(64); broadcast.insert(uuid, tx); rx @@ -144,7 +143,7 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { continue; }, C2SMessage::Unsub(uuid) => { - info!("[WebSocket{}] Unsub", owner.name()); + debug!("[WebSocket{}] C2S : Unsub", owner.name()); // Отбрасываю Unsub на самого себя if uuid == owner.0.clone().unwrap().uuid { continue; @@ -153,14 +152,12 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { shutdown.notify_one(); continue; }, - // _ => continue } - // Отправка сообщения - warn!("[WebSocket{}] Отвечаю: {msg:?}", owner.name()); + // Sending message + debug!("[WebSocket{}] Answering: {msg:?}", owner.name()); if socket.send(msg).await.is_err() { - // если попали сюда, значит вероятнее всего клиент отключился - warn!("[WebSocket{}] Ошибка отправки! Соединение разорвано!", owner.name()); + warn!("[WebSocket{}] Send error! Connection terminated!", owner.name()); if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -170,11 +167,10 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) { msg = mrx.recv() => { match socket.send(Message::Binary(msg.clone().unwrap())).await { Ok(_) => { - warn!("[WebSocketSubscribe{}] Отвечаю: {}", owner.name(), hex::encode(msg.unwrap())); + debug!("[WebSocketSubscribe{}] Answering: {}", owner.name(), hex::encode(msg.unwrap())); } Err(_) => { - // если попали сюда, значит вероятнее всего клиент отключился - warn!("[WebSocketSubscriber{}] Ошибка отправки! Соединение разорвано!", owner.name()); + warn!("[WebSocketSubscriber{}] Send error! Connection terminated!", owner.name()); if let Some(u) = owner.0 { remove_broadcast(state.broadcasts.clone(), u.uuid).await; } @@ -190,11 +186,14 @@ async fn subscribe(socket: mpsc::Sender>, mut rx: Receiver>, shu loop { tokio::select! { _ = shutdown.notified() => { - debug!("Unsubscribing!"); + debug!("Shutdown SUB!"); return; } msg = rx.recv() => { - socket.send(msg.unwrap()).await.unwrap(); + if socket.send(msg.unwrap()).await.is_err() { + error!("Forced shutdown SUB due error!"); + return; + }; } } } @@ -202,15 +201,7 @@ async fn subscribe(socket: mpsc::Sender>, mut rx: Receiver>, shu fn into_s2c_ping(buf: Vec, uuid: Uuid) -> Vec { use std::iter::once; - // let mut vec = Vec::new(); - // vec - //let uuid = uuid.as_u128(); - //let uuid = uuid.into_bytes(); - // info!("UUID {} UUID BE {}", hex::encode(uuid.into_bytes()), hex::encode(uuid128.to_be_bytes())); - let res: Vec = once(1).chain(uuid.into_bytes().iter().copied()).chain(buf.as_slice()[1..].iter().copied()).collect(); - debug!("Sending ping: {}", hex::encode(res.clone())); - res - // vec + once(1).chain(uuid.into_bytes().iter().copied()).chain(buf.as_slice()[1..].iter().copied()).collect() } async fn remove_broadcast(broadcasts: Arc>>>>, uuid: Uuid) { diff --git a/src/ws/s2c.rs b/src/ws/s2c.rs index f59a440..58db9ac 100644 --- a/src/ws/s2c.rs +++ b/src/ws/s2c.rs @@ -1,15 +1,14 @@ -use log::debug; -use uuid::Uuid; - use super::MessageLoadError; use std::convert::{TryFrom, TryInto}; +use uuid::Uuid; + #[repr(u8)] #[derive(Debug, Clone, PartialEq, Eq)] pub enum S2CMessage<'a> { Auth = 0, Ping(Uuid, u32, bool, &'a [u8]) = 1, - Event(Uuid) = 2, // UUID Обновляет аватар других игроков + Event(Uuid) = 2, // Updates avatar for other players Toast(u8, &'a str, Option<&'a str>) = 3, Chat(&'a str) = 4, Notice(u8) = 5, @@ -88,16 +87,6 @@ impl<'a> Into> for S2CMessage<'a> { } impl<'a> S2CMessage<'a> { - pub fn to_s2c_ping(uuid: Uuid, buf: &'a [u8]) -> S2CMessage<'a> { - use S2CMessage::Ping; - debug!("!!! {buf:?}"); - Ping( - uuid, - u32::from_be_bytes((&buf[1..5]).try_into().unwrap()), - buf[5] != 0, // Ping может быть короче чем ожидалось - &buf[6..], - ) - } pub fn to_array(self) -> Box<[u8]> { >>::into(self) }