commit cce193ea435917469bc7e3c69a817bb66c761a58 Author: Agie Ashwood Date: Sun Jul 28 11:21:15 2024 +0000 Reset diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..1ea4e514 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +lib/ +lib64/ +share/ +src/__pycache__/ +src/webui/build/ +src/webui/htmx-extensions/ +src/webui/res/js/node_modules/ +tui.rst +lib64 +src/Components/__pycache__/ +bin/ +src/daisy/ +src/catch/ +src/Cryptography/__pycache__/ +src/webui/__pycache__ +src/logs +src/Packets/__pycache__ +src/Transmission/__pycache__/ +src/Filters/Protocols/__pycache__ +src/Bubble/__pycache__ diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f288702d --- /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/bubble.png b/bubble.png new file mode 100644 index 00000000..5eb6b949 Binary files /dev/null and b/bubble.png differ diff --git a/builddocs b/builddocs new file mode 100755 index 00000000..725bb352 --- /dev/null +++ b/builddocs @@ -0,0 +1,9 @@ +rm -rf docs/* +sphinx-build -M markdown src docs +mv docs/markdown docs.tmp +rm -rf docs/doctrees +mv docs.tmp/* docs +rm -rf docs.tmp +mv docs/index.md docs/readme.md +sed -i '1s;^;![PierMesh logo](https://git.utopic.work/PierMesh/piermesh/raw/branch/main/piermeshicon.png)\n\n;' docs/readme.md +sed -i '1s;^;![Daisy logo](https://git.utopic.work/PierMesh/piermesh/raw/branch/main/imgs/daisydisplay.png)\n\n;' docs/Components/daisy.md diff --git a/catch.png b/catch.png new file mode 100644 index 00000000..68236cb5 Binary files /dev/null and b/catch.png differ diff --git a/docs/Bubble/config.md b/docs/Bubble/config.md new file mode 100644 index 00000000..26562e96 --- /dev/null +++ b/docs/Bubble/config.md @@ -0,0 +1 @@ +# Configuration utilities diff --git a/docs/Bubble/map.md b/docs/Bubble/map.md new file mode 100644 index 00000000..60929957 --- /dev/null +++ b/docs/Bubble/map.md @@ -0,0 +1,3 @@ +# Network map representation + +### *class* Bubble.map.Network(icg=None, file=None) diff --git a/docs/Bubble/router.md b/docs/Bubble/router.md new file mode 100644 index 00000000..53d86ac9 --- /dev/null +++ b/docs/Bubble/router.md @@ -0,0 +1,3 @@ +# Data routing logic and data + +### *class* Bubble.router.Router(cLog, nfpath='server.info') diff --git a/docs/Components/daisy.md b/docs/Components/daisy.md new file mode 100644 index 00000000..0de78ca2 --- /dev/null +++ b/docs/Components/daisy.md @@ -0,0 +1,92 @@ +![Daisy logo](https://git.utopic.work/PierMesh/piermesh/raw/branch/main/imgs/daisydisplay.png) + +# Schemaless binary database + +### *class* Components.daisy.Daisy(filepath: str, templates: dict = {}, template: bool = False, prefillDict: bool = False) + +Base class for Daisy data representation + +[πŸ”— Source](https://git.utopic.work/PierMesh/piermesh/src/branch/main/Components/daisy.py) + +#### get() + +Get record dictionary from memory + +* **Returns:** + **self.msg** +* **Return type:** + dict + +#### read(decrypt: bool = False, decryptKey=False) + +Read record from disk to memory + +* **Parameters:** + * **decrypt** (*bool*) – Whether to decrypt record + * **decryptKey** – Key to decrypt record + +#### sublist() + +Lists contents of directory if object is a directory, otherwise return None + +#### write(override=False, encrypt: bool = False, encryptKey=None, recur: bool = False) + +Write record to disk + +* **Parameters:** + * **override** – Either false or a dictionary of values to set on the record + * **encrypt** (*bool*) – Whether to encrypt the record (TODO) + * **encryptKey** – Key to encrypt record with, or None if not set + * **recur** (*bool*) – Whether to recursively handle keys + +### *class* Components.daisy.Cache(filepaths=None, cacheFile=None, path: str = 'daisy', walk: bool = False, isCatch: bool = False) + +In memory collection of Daisy records + +#### create(path: str, data: dict) + +Create new record + +* **Parameters:** + * **path** (*str*) – Path to create record at + * **data** (*dict*) – Data to populate record with + +#### get(path: str) + +Get record at path, else return False + +path: str +: Path of record + +#### refresh() + +Reload from disk to memory + +#### search(keydict: dict, strict: bool = True) + +Search cache for record for records with values + +keydict: dict +: Values to search for + +strict: bool +: Whether to require values match + +### *class* Components.daisy.Catch(path: str = 'catch', filepaths=None, catchFile=None, walk: bool = False) + +Sub class of Cache for handling catchs + +![image](https://git.utopic.work/PierMesh/piermesh/raw/branch/main/imgs/catchdisplay.png) + +#### get(head: str, tail: str, fins=None) + +Get catch by pieces + +* **Parameters:** + * **head** (*str*) – First part of catch (maximum: 4 characters) + * **tail** (*str*) – Second part of catch (maximum: 16 characters) + * **fins** – List of (maximum 8 characters) strings at the end of the catch oe None if none + +#### sget(path: str) + +Call Cache’s get to get record diff --git a/docs/Components/hopper.md b/docs/Components/hopper.md new file mode 100644 index 00000000..1f0b78b9 --- /dev/null +++ b/docs/Components/hopper.md @@ -0,0 +1,17 @@ +# Small internet interop utilities + +### Components.hopper.get(url: str, params=None) + +http/s get request + +* **Parameters:** + * **url** (*str*) + * **params** – Requests (library) parameters + +### Components.hopper.post(url: str, params=None) + +http/s post request + +* **Parameters:** + * **url** (*str*) + * **params** – Requests (library) parameters diff --git a/docs/Cryptography/DHEFern.md b/docs/Cryptography/DHEFern.md new file mode 100644 index 00000000..5e6ce65d --- /dev/null +++ b/docs/Cryptography/DHEFern.md @@ -0,0 +1,5 @@ +Diffie hellman ephemeral +Fernet based encryption +========================== + +### *class* Cryptography.DHEFern.DHEFern(cache, nodeNickname, cLog) diff --git a/docs/Filters/base.md b/docs/Filters/base.md new file mode 100644 index 00000000..22a2ca84 --- /dev/null +++ b/docs/Filters/base.md @@ -0,0 +1,17 @@ +Primary filtering functionality +Dispatches to Protocols +=============================== + +### *class* Filters.base.Filter(cache, onodeID, todo, cLog) + +#### *async* protoRoute(completeMessage) + +Shorthand reference + +### *class* Filters.Protocols.bubble.filter(completeMessage, recipient, recipientNode, onodeID, todo) + +### *class* Filters.Protocols.catch.filter(completeMessage, recipient, recipientNode, todo) + +### *class* Filters.Protocols.cryptography.filter(completeMessage, recipientNode, todo) + +### *class* Filters.Protocols.map.filter(completeMessage, todo) diff --git a/docs/Packets/HeaderPacket.md b/docs/Packets/HeaderPacket.md new file mode 100644 index 00000000..c922c6f9 --- /dev/null +++ b/docs/Packets/HeaderPacket.md @@ -0,0 +1,3 @@ +# Header packet: Metadata packet + +### *class* Packets.HeaderPacket.Header(packetsID, packetCount, sender, senderDisplayName, recipient, recipientNode, json=True, fname=False, subpacket=False, wantFullResponse=False, mimeType=-1, protocol=None, packetsClass=0) diff --git a/docs/Packets/Packet.md b/docs/Packets/Packet.md new file mode 100644 index 00000000..c701abd5 --- /dev/null +++ b/docs/Packets/Packet.md @@ -0,0 +1,3 @@ +# Base packet + +### *class* Packets.Packet.Packet(data, packetsID=False, packetNumber=False, packetCount=1, packetsClass=-1) diff --git a/docs/Packets/Packets.md b/docs/Packets/Packets.md new file mode 100644 index 00000000..daea4e73 --- /dev/null +++ b/docs/Packets/Packets.md @@ -0,0 +1,5 @@ +Packets representation for full +message +=============================== + +### *class* Packets.Packets.Packets(bytesObject, sender, senderDisplayName, recipient, recipientNode, dataSize=128, wantFullResponse=False, packetsClass=None) diff --git a/docs/Packets/SinglePacket.md b/docs/Packets/SinglePacket.md new file mode 100644 index 00000000..765c3696 --- /dev/null +++ b/docs/Packets/SinglePacket.md @@ -0,0 +1,5 @@ +SinglePacket: Singular packet +for very low data applications +=============================== + +### *class* Packets.SinglePacket.SinglePacket(data, packetsID, packetsClass=None, cache=None) diff --git a/docs/Packets/SubPacket.md b/docs/Packets/SubPacket.md new file mode 100644 index 00000000..d2ce8502 --- /dev/null +++ b/docs/Packets/SubPacket.md @@ -0,0 +1,3 @@ +SubPacket for handling +individual packets of submessages +================================= diff --git a/docs/Packets/SubPackets.md b/docs/Packets/SubPackets.md new file mode 100644 index 00000000..5023c8e8 --- /dev/null +++ b/docs/Packets/SubPackets.md @@ -0,0 +1,3 @@ +SubPackets for handling +full submessages +======================= diff --git a/docs/Transmission/transmission.md b/docs/Transmission/transmission.md new file mode 100644 index 00000000..7808e2fb --- /dev/null +++ b/docs/Transmission/transmission.md @@ -0,0 +1,3 @@ +# Layer 0 data transmission + +### *class* Transmission.transmission.Transmitter(device, filter, onodeID, cache, catch, cryptographyInfo, cLog) diff --git a/docs/readme.md b/docs/readme.md new file mode 100644 index 00000000..37eca77c --- /dev/null +++ b/docs/readme.md @@ -0,0 +1,70 @@ +![PierMesh logo](https://git.utopic.work/PierMesh/piermesh/raw/branch/main/piermeshicon.png) + + + +# PierMesh documentation + +# Contents: + +* [PierMesh service runner](/PierMesh/piermesh/src/branch/main/docs/run.md) + * [`Node`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node) + * [`Node.action_initNodeDH()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.action_initNodeDH) + * [`Node.action_keyDeriveDH()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.action_keyDeriveDH) + * [`Node.action_map()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.action_map) + * [`Node.action_sendCatch()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.action_sendCatch) + * [`Node.action_sendToPeer()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.action_sendToPeer) + * [`Node.cLog()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.cLog) + * [`Node.fListen()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.fListen) + * [`Node.monitor()`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.monitor) + * [`Node.toLog`](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node.toLog) +* [TUI application](/PierMesh/piermesh/src/branch/main/docs/ui.md) + * [`TUI`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI) + * [`TUI.visibleLogo`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.visibleLogo) + * [`TUI.nodeOb`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.nodeOb) + * [`TUI.done`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.done) + * [`TUI.CSS_PATH`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.CSS_PATH) + * [`TUI.action_quitFull()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.action_quitFull) + * [`TUI.action_toggleFullscreen()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.action_toggleFullscreen) + * [`TUI.compose()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.compose) + * [`TUI.do_set_cpu_percent()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.do_set_cpu_percent) + * [`TUI.do_set_mem()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.do_set_mem) + * [`TUI.do_write_line()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.do_write_line) + * [`TUI.on_mount()`](/PierMesh/piermesh/src/branch/main/docs/ui.md#ui.TUI.on_mount) +* [Configuration utilities](/PierMesh/piermesh/src/branch/main/docs/Bubble/config.md) +* [Network map representation](/PierMesh/piermesh/src/branch/main/docs/Bubble/map.md) + * [`Network`](/PierMesh/piermesh/src/branch/main/docs/Bubble/map.md#Bubble.map.Network) +* [Data routing logic and data](/PierMesh/piermesh/src/branch/main/docs/Bubble/router.md) + * [`Router`](/PierMesh/piermesh/src/branch/main/docs/Bubble/router.md#Bubble.router.Router) +* [Schemaless binary database](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md) + * [`Daisy`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Daisy) + * [`Daisy.get()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Daisy.get) + * [`Daisy.read()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Daisy.read) + * [`Daisy.sublist()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Daisy.sublist) + * [`Daisy.write()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Daisy.write) + * [`Cache`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Cache) + * [`Cache.create()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Cache.create) + * [`Cache.get()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Cache.get) + * [`Cache.refresh()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Cache.refresh) + * [`Cache.search()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Cache.search) + * [`Catch`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Catch) + * [`Catch.get()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Catch.get) + * [`Catch.sget()`](/PierMesh/piermesh/src/branch/main/docs/Components/daisy.md#Components.daisy.Catch.sget) +* [Small internet interop utilities](/PierMesh/piermesh/src/branch/main/docs/Components/hopper.md) + * [`get()`](/PierMesh/piermesh/src/branch/main/docs/Components/hopper.md#Components.hopper.get) + * [`post()`](/PierMesh/piermesh/src/branch/main/docs/Components/hopper.md#Components.hopper.post) +* [`DHEFern`](/PierMesh/piermesh/src/branch/main/docs/Cryptography/DHEFern.md) +* [`Filter`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md) + * [`Filter.protoRoute()`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md#Filters.base.Filter.protoRoute) +* [`filter`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md#Filters.Protocols.bubble.filter) +* [`filter`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md#Filters.Protocols.catch.filter) +* [`filter`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md#Filters.Protocols.cryptography.filter) +* [`filter`](/PierMesh/piermesh/src/branch/main/docs/Filters/base.md#Filters.Protocols.map.filter) +* [Header packet: Metadata packet](/PierMesh/piermesh/src/branch/main/docs/Packets/HeaderPacket.md) + * [`Header`](/PierMesh/piermesh/src/branch/main/docs/Packets/HeaderPacket.md#Packets.HeaderPacket.Header) +* [Base packet](/PierMesh/piermesh/src/branch/main/docs/Packets/Packet.md) + * [`Packet`](/PierMesh/piermesh/src/branch/main/docs/Packets/Packet.md#Packets.Packet.Packet) +* [`Packets`](/PierMesh/piermesh/src/branch/main/docs/Packets/Packets.md) +* [`SinglePacket`](/PierMesh/piermesh/src/branch/main/docs/Packets/SinglePacket.md) +* [Layer 0 data transmission](/PierMesh/piermesh/src/branch/main/docs/Transmission/transmission.md) + * [`Transmitter`](/PierMesh/piermesh/src/branch/main/docs/Transmission/transmission.md#Transmission.transmission.Transmitter) diff --git a/docs/run.md b/docs/run.md new file mode 100644 index 00000000..54929447 --- /dev/null +++ b/docs/run.md @@ -0,0 +1,88 @@ +# PierMesh service runner + +Main method for running the PierMesh service + +### *class* run.Node + +Class that handles most of the PierMesh data + +[πŸ”— Source](https://git.utopic.work/PierMesh/piermesh/src/branch/main/src/run.py) + +#### *async* action_initNodeDH(data: dict) + +Initialize diffie hellman key exchange + +#### SEE ALSO +[`Cryptography.DHEFern.DHEFern`](/PierMesh/piermesh/src/branch/main/docs/Cryptography/DHEFern.md#Cryptography.DHEFern.DHEFern) +: End to end encryption functionality + +#### *async* action_keyDeriveDH(data: dict) + +Derive key via diffie hellman key exchange + +#### *async* action_map(data: dict) + +Map new network data to internal network map + +#### SEE ALSO +`Bubble.network.Network` +: Layered graph etwork representation + +#### *async* action_sendCatch(data: dict) + +Get catch and return the data to a peer + +#### SEE ALSO +[`Bubble.router.Router`](/PierMesh/piermesh/src/branch/main/docs/Bubble/router.md#Bubble.router.Router) +: Routing class + +#### *async* action_sendToPeer(data: dict) + +Send data to a peer connected to the server + +* **Parameters:** + **data** (*dict*) – Data passed from the filter, this is a generic object so it’s similar on all actions here + +#### SEE ALSO +`Filters.Protocols` +: Protocol based packet filtering + +`webui.serve.Server` +: Runs a light Microdot web server with http/s and websocket functionality + +`webui.serve.Server.sendToPeer` +: Function to actually execute the action + +#### cLog(priority: int, message: str) + +Convenience function that logs to the ui and log files + +* **Parameters:** + * **priority** (*int*) – Priority of message to be passed to logging + * **message** (*str*) – Message to log +* **Return type:** + None + +#### *async* fListen() + +Loop to watch for tasks to do + +#### SEE ALSO +`Filters.base.sieve` +: Packet filtering/parsing + +### Notes + +We use a common technique here that calls the function from our preloaded actions via dictionary entry + +#### *async* monitor() + +Monitor and log ram and cpu usage + +#### toLog + +We store logs to be processed here + +#### SEE ALSO +`logPassLoop` +: Loop to handle logging to file and TUI diff --git a/docs/ui.md b/docs/ui.md new file mode 100644 index 00000000..d40c4b7c --- /dev/null +++ b/docs/ui.md @@ -0,0 +1,72 @@ +# TUI application + +### *class* ui.TUI(driver_class: Type[Driver] | None = None, css_path: str | PurePath | List[str | PurePath] | None = None, watch_css: bool = False) + +TUI for PierMesh + +[πŸ”— Source](https://git.utopic.work/PierMesh/piermesh/src/branch/main/src/ui.py) + +#### visibleLogo + +Whether the logo is visible or not, used in toggling visibility + +* **Type:** + bool + +#### nodeOb + +Reference to the Node running the PierMesh service + +* **Type:** + [Node](/PierMesh/piermesh/src/branch/main/docs/run.md#run.Node) + +#### done + +Whether the TUI has been killed + +* **Type:** + bool + +#### CSS_PATH *: ClassVar[CSSPathType | None]* *= 'ui.tcss'* + +File paths to load CSS from. + +#### action_quitFull() + +Kill the whole stack by setting self to done and terminating the thread. We check in run.monitor later and kill the rest of the stack then with psutil + +#### SEE ALSO +`run.monitor` + +#### action_toggleFullscreen() + +Toggle fullscreen logs by either collapsing width or setting it to it’s original size + +#### compose() + +Build the TUI + +#### do_set_cpu_percent(percent: float) + +Set CPU percent in the label and progress bar + +* **Parameters:** + **percent** (*float*) – Percent of the cpu PierMesh is using + +#### do_set_mem(memmb: float) + +Set memory usage label in the ui + +* **Parameters:** + **memmb** (*float*) – Memory usage of PierMesh in megabytes + +#### do_write_line(logLine: str) + +Write line to the logs panel + +* **Parameters:** + **logLine** (*str*) – Line to log + +#### on_mount() + +Called at set up, configures the title and the progess bar diff --git a/imgs/bubble.png b/imgs/bubble.png new file mode 100644 index 00000000..5eb6b949 Binary files /dev/null and b/imgs/bubble.png differ diff --git a/imgs/catch.png b/imgs/catch.png new file mode 100644 index 00000000..68236cb5 Binary files /dev/null and b/imgs/catch.png differ diff --git a/imgs/catchdisplay.png b/imgs/catchdisplay.png new file mode 100644 index 00000000..fc77c4ab Binary files /dev/null and b/imgs/catchdisplay.png differ diff --git a/imgs/daisydisplay.png b/imgs/daisydisplay.png new file mode 100644 index 00000000..3cd00450 Binary files /dev/null and b/imgs/daisydisplay.png differ diff --git a/imgs/overview.png b/imgs/overview.png new file mode 100644 index 00000000..c2a24d08 Binary files /dev/null and b/imgs/overview.png differ diff --git a/imgs/piermeshicon.png b/imgs/piermeshicon.png new file mode 100644 index 00000000..70e6940f Binary files /dev/null and b/imgs/piermeshicon.png differ diff --git a/overview.png b/overview.png new file mode 100644 index 00000000..c2a24d08 Binary files /dev/null and b/overview.png differ diff --git a/piermeshicon.png b/piermeshicon.png new file mode 100644 index 00000000..70e6940f Binary files /dev/null and b/piermeshicon.png differ diff --git a/pyvenv.cfg b/pyvenv.cfg new file mode 100644 index 00000000..0537ffc0 --- /dev/null +++ b/pyvenv.cfg @@ -0,0 +1,3 @@ +home = /usr/bin +include-system-site-packages = false +version = 3.10.12 diff --git a/readme.md b/readme.md new file mode 100644 index 00000000..10c7342c --- /dev/null +++ b/readme.md @@ -0,0 +1,46 @@ +![PierMesh logo](piermeshicon.png) +# PierMesh +## A new internet, a fresh start + +This is the monorepo for PierMesh. + +# Docs + +You can find the full docs here: [docs/](https://git.utopic.work/PierMesh/piermesh/src/branch/main/docs) + +# How to use + +Note: these instructions will probably only work on Linux at the moment + +Note: check the scripts to make sure they'll work with your system, and in general I recommend checking scripts before you run them + +Follow Meshtastic's guide on setting up your device: [https://meshtastic.org/docs/getting-started/](https://meshtastic.org/docs/getting-started/) +Make sure you have the latest Python installed + +``` +git clone https://git.utopic.work/PierMesh/piermesh + +cd piermesh + +python -m venv . + +source bin/activate + +pip install -r requirements.txt + +cd src + +chmod a+x ./scripts/falin + +./scripts/falin +``` + +# License text + +``` +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 [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/). +``` diff --git a/requirements.txt b/requirements.txt new file mode 100755 index 00000000..f50d853d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,15 @@ +pytap +meshtastic +beautifulsoup4 +msgpack +esptool +jinja2 +markdown2 +watchdog +microdot +networkx[default] +psutil +sphinx +textual +textual-dev +sphinx-markdown-builder==0.6.6 diff --git a/src/Bubble/config.py b/src/Bubble/config.py new file mode 100755 index 00000000..e69de29b diff --git a/src/Bubble/config.rst b/src/Bubble/config.rst new file mode 100644 index 00000000..8810e6c7 --- /dev/null +++ b/src/Bubble/config.rst @@ -0,0 +1,3 @@ +Configuration utilities +========================== + diff --git a/src/Bubble/map.py b/src/Bubble/map.py new file mode 100755 index 00000000..8833354d --- /dev/null +++ b/src/Bubble/map.py @@ -0,0 +1,71 @@ +import networkx as nx +import msgpack +import json +import matplotlib.pyplot as plt + +# TODO: Extra maps logic + + +class Network: + """ + Layered graph network + + `πŸ”— Source `_ + """ + + def __init__(self, icg=None, file=None): + self.omap = nx.Graph() + self.imap = nx.Graph() + self.emaps = [] + self.lookup = {} + + def addLookup(self, onodeID, mnodeID): + self.lookup[onodeID] = mnodeID + + def doLookup(self, onodeID): + if onodeID in self.lookup.keys(): + return self.lookup[onodeID] + else: + return False + + def export(self, path): + n = {} + n["omap"] = nx.to_dict_of_dicts(self.omap) + n["imap"] = nx.to_dict_of_dicts(self.imap) + n["emaps"] = [] + for e in self.emaps: + n["emaps"].append(nx.to_dict_of_dicts(e)) + # TODO: Daisy + with open(path, "wb") as f: + f.write(msgpack.dumps(n)) + with open(path + ".json", "w") as f: + f.write(json.dumps(n)) + + def mimport(self, path): + ndata = "" + with open(path, "rb") as f: + ndata = msgpack.loads(f.read()) + self.omap = nx.Graph(ndata["omap"]) + self.imap = nx.Graph(ndata["imap"]) + self.emaps = [] + for e in ndata["emaps"]: + self.emaps.append(nx.Graph(e)) + + def addon(self, id): + self.omap.add_node(id) + + def addoe(self, nodea, nodeb): + self.omap.add_edge(nodea, nodeb) + + def addin(self, id): + self.imap.add_node(id) + + def addie(self, nodea, nodeb): + self.imap.add_edge(nodea, nodeb) + + def getRoute(self, senderNode, recipientNode): + return nx.shortest_path(self.omap, senderNode, recipientNode) + + def render(self): + nx.draw(self.omap) + plt.savefig("tmp/omap.png") diff --git a/src/Bubble/map.rst b/src/Bubble/map.rst new file mode 100644 index 00000000..62b1c3d4 --- /dev/null +++ b/src/Bubble/map.rst @@ -0,0 +1,5 @@ +Network map representation +========================== + +.. autoclass:: Bubble.map.Network + :members: diff --git a/src/Bubble/router.py b/src/Bubble/router.py new file mode 100644 index 00000000..a4cf4b76 --- /dev/null +++ b/src/Bubble/router.py @@ -0,0 +1,41 @@ +import msgpack +from Bubble.map import Network +from Components.daisy import Catch +from Components.daisy import Cache +import random, logging + +# DONE Catch integration +# TODO: Catch examples +# +# 🐟+πŸ”₯+🀀 +# prmh.catchexample.rabbit.hutch +# πŸŸ₯|🟧|🟦 +# πŸ–οΈπŸ“‘πŸŒ +# prmh@Ashwood_Skye +# πŸ’»πŸ’» + + +class Router: + def __init__(self, cLog, nfpath="server.info"): + self.cLog = cLog + # TODO: Better network init + self.n = Network() + self.c = Catch(walk=True) + self.cache = Cache(walk=True) + self.cLog(10, "Loading server info") + self.serverInfo = self.cache.get(nfpath) + if self.serverInfo == False: + self.cache.create(nfpath, {"nodeID": random.randrange(0, 1000000)}) + self.serverInfo = self.cache.get(nfpath) + self.n.addin(self.serverInfo.get()["nodeID"]) + + def getRoute(self, headerPacket): + headerPacket = msgpack.loads(headerPacket) + peer = headerPacket["recipient"] + node = headerPacket["node"] + + def getCatch(self, head, tail, fins=None): + return self.c.get(head, tail, fins=fins) + + def addc(self, peer, node, seperator, head, tail, data, fins=None): + self.c.addc(peer, node, seperator, head, tail, data, fins=fins) diff --git a/src/Bubble/router.rst b/src/Bubble/router.rst new file mode 100644 index 00000000..f01f72bb --- /dev/null +++ b/src/Bubble/router.rst @@ -0,0 +1,5 @@ +Data routing logic and data +=========================== + +.. autoclass:: Bubble.router.Router + :members: diff --git a/src/Bubble/tests/main.py b/src/Bubble/tests/main.py new file mode 100755 index 00000000..93574fa1 --- /dev/null +++ b/src/Bubble/tests/main.py @@ -0,0 +1,27 @@ +from Bubble.map import Network +import random + +# TODO: Creating network from 0 + +n = Network() + +onodes = [random.randrange(1, 1000000) for it in range(20)] + +for onode in onodes: + n.addon(onode) + n.addin(onode) + +for it in range(10): + nodea = random.choice(onodes) + print(nodea) + nodeb = random.choice([n for n in onodes if n != nodea]) + print(nodeb) + n.addoe(nodea, nodeb) + +for it in range(10): + nodea = random.choice(onodes) + nodeb = random.choice([n for n in onodes if n != nodea]) + #print(n.getRoute(nodea, nodeb)) +n.export("tmp/map.bin") +n.render() + diff --git a/src/Clients/base.py b/src/Clients/base.py new file mode 100755 index 00000000..50258965 --- /dev/null +++ b/src/Clients/base.py @@ -0,0 +1,7 @@ +import random + +class Client: + def __init__(self, nodeID, permissions=False): + self.cid = random.randrange(1, 1000000) + self.nodeID = nodeID + \ No newline at end of file diff --git a/src/Components/__init__.py b/src/Components/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/Components/daisy.py b/src/Components/daisy.py new file mode 100755 index 00000000..c99834ad --- /dev/null +++ b/src/Components/daisy.py @@ -0,0 +1,423 @@ +import os +import json +import msgpack +import Cryptography +import random +from watchdog.observers import Observer +from watchdog.events import FileSystemEventHandler +import logging + +# TODO: delete +# TODO: propagate json changes to msgpack automatically +# TODO: propagate msgpack changes to cache automatically +# TODO: Indexing + + +def _json_to_msg(path: str): + """ + Convert json at the path plus .json to a msgpack binary + + Parameters + ---------- + path: str + Path to json minus the extension + """ + rpath = path + ".json" + res = "" + with open(rpath) as f: + res = msgpack.dumps(json.load(f)) + with open(path, "wb") as f: + f.write(res) + + +class Daisy: + """ + Base class for Daisy data representation + + `πŸ”— Source `_ + """ + + def __init__( + self, + filepath: str, + templates: dict = {}, + template: bool = False, + prefillDict: bool = False, + ): + """ + Parameters + ---------- + filepath: str + Path to disk location + + templates: dict + Dictionary of templates to Use + + template: bool + Which template to Use + + prefillDict: bool + Whether to fill the record with a template + """ + self.filepath = filepath + if os.path.exists(filepath) != True: + with open(filepath, "wb") as f: + if template != False: + if template in templates.keys(): + t = templates[template].get() + if prefillDict != False: + for k in prefillDict.keys(): + t[k] = prefillDict[k] + f.write(msgpack.dumps(t)) + self.msg = t + else: + print("No such template as: " + template) + else: + f.write(msgpack.dumps({})) + self.msg = {} + elif os.path.isdir(filepath): + self.msg = "directory" + else: + with open(filepath, "rb") as f: + self.msg = msgpack.loads(f.read()) + + # Use override for updating + + def write( + self, + override=False, + encrypt: bool = False, + encryptKey=None, + recur: bool = False, + ): + """ + Write record to disk + + Parameters + ---------- + override + Either false or a dictionary of values to set on the record + + encrypt: bool + Whether to encrypt the record (TODO) + + encryptKey + Key to encrypt record with, or None if not set + + recur: bool + Whether to recursively handle keys + """ + if override != False: + for key in override.keys(): + # TODO: Deeper recursion + if recur: + if not key in self.msg.keys(): + self.msg[key] = {} + for ikey in override[key].keys(): + self.msg[key][ikey] = override[key][ikey] + else: + self.msg[key] = override[key] + data = msgpack.dumps(self.msg) + with open(self.filepath, "wb") as f: + f.write(data) + + # Use for refreshing + + def read(self, decrypt: bool = False, decryptKey=False): + """ + Read record from disk to memory + + Parameters + ---------- + decrypt: bool + Whether to decrypt record + + decryptKey + Key to decrypt record + """ + if os.path.isdir(self.filepath): + self.msg = "directory" + else: + with open(self.filepath, "rb") as f: + self.msg = msgpack.loads(f.read()) + + def get(self): + """ + Get record dictionary from memory + + Returns + ------- + self.msg: dict + """ + return self.msg + + def sublist(self): + """ + Lists contents of directory if object is a directory, otherwise return None + """ + fpath = self.filepath + if os.path.isdir(fpath): + return ["messages/" + x for x in os.listdir(fpath)] + else: + return None + + +def loadTemplates(templatePath: str = "templates"): + """Load templates for prefilling records + + Parameters + ---------- + templatePath: str + Path to templates + """ + templates = {} + for p in os.listdir(templatePath): + p = templatePath + "/" + p + if os.path.isdir(p): + for ip in os.listdir(p): + ip = p + "/" + ip + if os.path.isdir(ip): + print("Too deep, skipping: " + ip) + else: + templates[ip] = Daisy(ip) + else: + templates[p] = Daisy(p) + self.templates = templates + return templates + + +class CFSHandler(FileSystemEventHandler): + """ + File system watchdog that propagates disk changes to records to their proper cache + """ + + def __init__(self, cache, isCatch: bool = False): + """ + Parameters + ---------- + cache: Cache + Daisy cache to update + + isCatch: bool + Is the cache for catchs + """ + self.cache = cache + self.isCatch = isCatch + super().__init__() + + def on_any_event(self, event): + """ + Called when a CRUD operation is performed on a record file + + Parameters + ---------- + event + Event object provided by watchdog + """ + if not (".json" in event.src_path): + if not (".md" in event.src_path): + tpath = "/".join(event.src_path.split("/")[1:]) + if tpath != "": + if self.isCatch: + self.cache.sget(tpath) + else: + self.cache.get(tpath).get() + + +# TODO: Dumping to cacheFile + + +class Cache: + """ + In memory collection of Daisy records + """ + + def __init__( + self, + filepaths=None, + cacheFile=None, + path: str = "daisy", + walk: bool = False, + isCatch: bool = False, + ): + """ + Parameters + ---------- + filepaths + Either a list of filepaths to load or None + + cacheFile + Path to a cache file which is a collection of paths to load + + path: str + Path prefix to load records from + + walk: bool + Whether to automatically walk the path and load records + + isCatch: bool + Whether this cache is for catchs + """ + self.data = {} + self.path = path + self.event_handler = CFSHandler(self, isCatch=isCatch) + self.observer = Observer() + self.observer.schedule(self.event_handler, self.path, recursive=True) + self.observer.start() + # TODO: Test + + if filepaths != None: + for fp in filepaths: + fp = path + "/" + fp + if os.path.isfile(fp): + self.data[fp] = Daisy(fp) + elif cacheFile != None: + with open(cacheFile, "r") as f: + for fp in f.read().split("\n"): + self.data[fp] = Daisy(fp) + elif walk: + for root, dirs, files in os.walk(self.path): + for p in dirs + files: + # print("walking") + if not (".json" in p): + if not (".md" in p): + tpath = root + "/" + p + # print(p) + # print(tpath) + self.data[tpath] = Daisy(tpath) + + def create(self, path: str, data: dict): + """ + Create new record + + Parameters + ---------- + path: str + Path to create record at + + data: dict + Data to populate record with + """ + with open(self.path + "/" + path, "wb") as f: + f.write(msgpack.dumps(data)) + logging.log(10, "Done creating record") + self.data[path] = Daisy(self.path + "/" + path) + logging.log(10, "Done loading to Daisy") + return self.data[path] + + def get(self, path: str): + """ + Get record at path, else return False + + path: str + Path of record + """ + if path in self.data.keys(): + return self.data[path] + else: + if os.path.exists(self.path + "/" + path): + self.data[path] = Daisy(self.path + "/" + path) + return self.data[path] + else: + logging.log(10, "File does not exist") + return False + + def refresh(self): + """ + Reload from disk to memory + """ + for key in self.data.keys(): + self.data[key].read() + + def search(self, keydict: dict, strict: bool = True): + """ + Search cache for record for records with values + + keydict: dict + Values to search for + + strict: bool + Whether to require values match + """ + results = [] + for key, val in self.data.items(): + val = val.get() + if strict and type(val) != str: + addcheck = False + for k, v in keydict.items(): + if k in val.keys(): + if v in val[k]: + addcheck = True + else: + addcheck = False + break + if addcheck: + results.append([key, val]) + elif type(val) != str: + for k, v in keydict.items(): + if k in val.keys(): + if v in val[k]: + results.append([key, val]) + return results + + +class Catch(Cache): + """ + Sub class of Cache for handling catchs + + .. image:: https://git.utopic.work/PierMesh/piermesh/raw/branch/main/imgs/catchdisplay.png + """ + + catches = {} + + def __init__( + self, path: str = "catch", filepaths=None, catchFile=None, walk: bool = False + ): + """ + Basically the same initialization parameters as Catch + """ + super().__init__( + filepaths=filepaths, cacheFile=catchFile, path=path, walk=walk, isCatch=True + ) + + # TODO: Fins + + def sget(self, path: str): + """ + Call Cache's get to get record + """ + return super().get(path) + + def get(self, head: str, tail: str, fins=None): + """ + Get catch by pieces + + Parameters + ---------- + head: str + First part of catch (maximum: 4 characters) + + tail: str + Second part of catch (maximum: 16 characters) + + fins + List of (maximum 8 characters) strings at the end of the catch oe None if none + """ + r = self.search({"head": head, "tail": tail}) + return r[0][1]["html"] + + def addc(self, peer, node, seperator, head, tail, data, fins=None): + tnpath = "catch/" + node + if os.path.exists(tnpath) != True: + os.makedirs(tnpath) + tppath = tnpath + "/" + peer + if os.path.exists(tppath) != True: + os.makedirs(tppath) + sid = str(random.randrange(0, 999999)).zfill(6) + data["seperator"] = seperator + data["head"] = head + data["tail"] = tail + if fins != None: + data["fins"] = fins + res = self.create("{0}/{1}/{2}".format(node, peer, sid), data) + return [sid, res] diff --git a/src/Components/daisy.rst b/src/Components/daisy.rst new file mode 100644 index 00000000..44d94806 --- /dev/null +++ b/src/Components/daisy.rst @@ -0,0 +1,9 @@ +Schemaless binary database +========================== + +.. autoclass:: Components.daisy.Daisy + :members: +.. autoclass:: Components.daisy.Cache + :members: +.. autoclass:: Components.daisy.Catch + :members: diff --git a/src/Components/hopper.py b/src/Components/hopper.py new file mode 100755 index 00000000..1ab2a3ee --- /dev/null +++ b/src/Components/hopper.py @@ -0,0 +1,37 @@ +import requests +import msgpack +import lzma +from Packets.Packets import Packets + + +def get(url: str, params=None): + """ + http/s get request + + Parameters + ---------- + url: str + + params + Requests (library) parameters + """ + r = requests.get(url, params=params) + r = {"response": r.text, "code": r.status_code} + return Packets(lzma.compress(msgpack.dumps(r))).get() + + +def post(url: str, params=None): + """ + http/s post request + + Parameters + ---------- + url: str + + params + Requests (library) parameters + """ + r = requests.post(url, datan=params) + r = {"response": r.text, "code": r.status_code} + return Packets(lzma.compress(msgpack.dumps(r))).get() + diff --git a/src/Components/hopper.rst b/src/Components/hopper.rst new file mode 100644 index 00000000..e61b7627 --- /dev/null +++ b/src/Components/hopper.rst @@ -0,0 +1,5 @@ +Small internet interop utilities +================================ + +.. automodule:: Components.hopper + :members: diff --git a/src/Cryptography/DHEFern.py b/src/Cryptography/DHEFern.py new file mode 100755 index 00000000..05988039 --- /dev/null +++ b/src/Cryptography/DHEFern.py @@ -0,0 +1,205 @@ +import base64, os +from cryptography.fernet import Fernet +from cryptography.hazmat.primitives import hashes +from cryptography.hazmat.primitives.asymmetric import dh +from cryptography.hazmat.primitives.kdf.hkdf import HKDF +from cryptography.hazmat.primitives.serialization import ( + Encoding, + NoEncryption, + ParameterFormat, + PublicFormat, + PrivateFormat, +) +import cryptography.hazmat.primitives.serialization as Serialization +import msgpack + +# TODO: Different store directories per node + + +class DHEFern: + def __init__(self, cache, nodeNickname, cLog): + self.cLog = cLog + self.loadedParams = {} + self.loadedKeys = {} + self.nodeNickname = nodeNickname + self.cache = cache + if self.cache.get("cryptography/{0}/paramStore".format(nodeNickname)) == False: + self.initStore("param") + else: + self.params = self.loadParamBytes( + self.cache.get( + "cryptography/{0}/paramStore".format(nodeNickname) + ).get()["self"] + ) + if self.cache.get("cryptography/{0}/keyStore".format(nodeNickname)) == False: + self.initStore("key") + self.genKeyPair() + else: + tks = self.cache.get("cryptography/{0}/keyStore".format(nodeNickname)).get() + self.publicKey = tks["self"]["publicKey"] + self.privateKey = tks["self"]["privateKey"] + + def checkInMem(self, store, nodeID): + if store == "param": + return nodeID in self.loadedParams.keys() + elif store == "key": + return nodeID in self.loadedKeys.keys() + + def loadRecordToMem(self, store, nodeID): + r = self.getRecord(store, nodeID) + if r == False: + self.cLog( + 30, "Tried to load nonexistent {0} for node {1}".format(store, nodeID) + ) + return False + elif self.checkInMem(store, nodeID): + self.cLog(10, "{0}s already deserialized, skipping".format(store)) + else: + if store == "param": + self.loadedParams[nodeID] = self.loadParamBytes(r) + elif store == "key": + self.loadedKeys[nodeID] = { + "publicKey": Serialization.load_pem_public_key(r["publicKey"]), + "privateKey": Serialization.load_pem_private_key( + r["privateKey"], None + ), + } + return True + + # TODO: Store class daisy + # + def getRecord(self, store, key): + r = self.cache.get( + "cryptography/{0}/{1}Store".format(self.nodeNickname, store) + ).get() + if r == False: + self.cLog(20, "Record does not exist") + return False + else: + if key in r.keys(): + return r[key] + else: + self.cLog(20, "Record does not exist") + return False + + def initStore(self, store): + if not os.path.exists("daisy/cryptography/" + self.nodeNickname): + os.mkdir("daisy/cryptography/" + self.nodeNickname) + if store == "param": + self.genParams() + self.cache.create( + "cryptography/{0}/paramStore".format(self.nodeNickname), + {"self": self.getParamsBytes()}, + ) + elif store == "key": + self.cache.create( + "cryptography/{0}/keyStore".format(self.nodeNickname), {"self": {}} + ) + else: + self.cLog(30, "Store not defined") + + def updateStore(self, store, entry, data, recur=True): + self.cache.get( + "cryptography/" + self.nodeNickname + "/" + store + "Store" + ).write(override={entry: data}, recur=recur) + + def genParams(self): + params = dh.generate_parameters(generator=2, key_size=2048) + self.params = params + return params + + def genKeyPair(self, paramsOverride=False, setSelf=True): + privateKey = self.params.generate_private_key() + if setSelf: + self.privateKey = privateKey + publicKey = privateKey.public_key() + if setSelf: + self.publicKey = publicKey + self.updateStore( + "key", + "self", + { + "publicKey": self.publicKey.public_bytes( + Encoding.PEM, PublicFormat.SubjectPublicKeyInfo + ), + "privateKey": self.privateKey.private_bytes( + Encoding.PEM, PrivateFormat.PKCS8, NoEncryption() + ), + }, + ) + return [privateKey, publicKey] + else: + publicKey = publicKey.public_bytes( + Encoding.PEM, PublicFormat.SubjectPublicKeyInfo + ) + privateKey = privateKey.private_bytes( + Encoding.PEM, PrivateFormat.PKCS8, NoEncryption() + ) + return [privateKey, publicKey] + + def keyDerive(self, pubKey, salt, nodeID, params): + if self.checkInMem("param", nodeID) == False: + if self.getRecord("param", nodeID) == False: + self.updateStore("param", nodeID, params, recur=False) + self.loadRecordToMem("param", nodeID) + self.cLog(20, "Precheck done for key derivation") + + # TODO: Load them and if private key exists load it, otherwise generate a private key + if self.checkInMem("key", nodeID) == False: + if self.getRecord("key", nodeID) == False: + privateKey, publicKey = self.genKeyPair(setSelf=False) + self.updateStore( + "key", nodeID, {"publicKey": publicKey, "privateKey": privateKey} + ) + self.loadRecordToMem("key", nodeID) + + sharedKey = self.loadedKeys[nodeID]["privateKey"].exchange( + Serialization.load_pem_public_key(pubKey) + ) + # Perform key derivation. + self.cLog(20, "Performing key derivation") + derivedKey = HKDF( + algorithm=hashes.SHA256(), length=32, salt=salt, info=b"handshake data" + ).derive(sharedKey) + self.cLog(20, "Derived key") + ederivedKey = base64.urlsafe_b64encode(derivedKey) + tr = self.getRecord("key", nodeID) + tr["derivedKey"] = ederivedKey + self.updateStore("key", nodeID, tr) + self.cLog(20, "Done with cryptography store updates") + return ederivedKey + + def getSalt(self): + return os.urandom(16) + + def encrypt(self, data, nodeID, isDict=True): + r = self.getRecord("key", nodeID) + if r == False: + self.cLog(20, "Node {0} not in keystore".format(nodeID)) + return False + else: + derivedKey = r["derivedKey"] + fernet = Fernet(derivedKey) + if isDict: + data = msgpack.dumps(data) + token = fernet.encrypt(data) + return token + + def decrypt(self, data, nodeID): + r = self.getRecord("key", nodeID) + if r == False: + self.cLog(20, "No record of node " + nodeID) + return False + elif not "derivedKey" in r.keys(): + self.cLog(20, "No key derived for node " + nodeID) + return False + else: + fernet = Fernet(self.getRecord("key", nodeID)["derivedKey"]) + return msgpack.loads(fernet.decrypt(data)) + + def getParamsBytes(self): + return self.params.parameter_bytes(Encoding.PEM, ParameterFormat.PKCS3) + + def loadParamBytes(self, pemBytes): + self.params = Serialization.load_pem_parameters(pemBytes) + return self.params diff --git a/src/Cryptography/DHEFern.rst b/src/Cryptography/DHEFern.rst new file mode 100644 index 00000000..e83d8999 --- /dev/null +++ b/src/Cryptography/DHEFern.rst @@ -0,0 +1,7 @@ + +Diffie hellman ephemeral +Fernet based encryption +========================== + +.. autoclass:: Cryptography.DHEFern.DHEFern + :members: diff --git a/src/Cryptography/tests/DHEFernTest.py b/src/Cryptography/tests/DHEFernTest.py new file mode 100755 index 00000000..9e3cc400 --- /dev/null +++ b/src/Cryptography/tests/DHEFernTest.py @@ -0,0 +1,15 @@ +import DHEFern as d +from cryptography.fernet import Fernet +# Small enough to send in one packet +parameters = d.getParams() +myKey = d.getPrivateKey(parameters) +yourKey = d.getPublicKey(parameters) +salt = d.getSalt() +derived_key = d.keyDerive(myKey, yourKey, salt) + # Put this somewhere safe! +#key = Fernet.generate_key() +# TODO: how to use derived key +#print(derived_key) +f = Fernet(derived_key) +token = f.encrypt(b"A really secret message. Not for prying eyes.") +print(f.decrypt(token).decode("utf-8")) \ No newline at end of file diff --git a/src/Filters/Protocols/__init__.py b/src/Filters/Protocols/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/Filters/Protocols/bubble.py b/src/Filters/Protocols/bubble.py new file mode 100644 index 00000000..c13fcb0b --- /dev/null +++ b/src/Filters/Protocols/bubble.py @@ -0,0 +1,14 @@ +async def filter(completeMessage, recipient, recipientNode, onodeID, todo): + m = completeMessage + if recipientNode == onodeID: + todo.append( + { + "action": "sendToPeer", + "data": {"res": m["data"]["data"], "recipient": recipient}, + } + ) + else: + # TODO: Forwarding message to next node + # TODO: Method to get next node in path to recipient node + # self.t.addPackets(m.data, sender, senderDisplay, recipient, recipientNode) + pass diff --git a/src/Filters/Protocols/catch.py b/src/Filters/Protocols/catch.py new file mode 100644 index 00000000..fa0bc2b4 --- /dev/null +++ b/src/Filters/Protocols/catch.py @@ -0,0 +1,16 @@ +async def filter(completeMessage, recipient, recipientNode, todo): + m = completeMessage + # TODO: Sending to other nodes clients + todo.append( + { + "action": "sendCatch", + "data": { + "toLocal": True, + "recipientNode": recipientNode, + "recipient": recipient, + "head": m["head"], + "body": m["body"], + "fins": m["fins"], + }, + } + ) diff --git a/src/Filters/Protocols/cryptography.py b/src/Filters/Protocols/cryptography.py new file mode 100644 index 00000000..61ac22c7 --- /dev/null +++ b/src/Filters/Protocols/cryptography.py @@ -0,0 +1,15 @@ +import logging + + +async def filter(completeMessage, recipientNode, todo): + todo.append( + { + "action": "keyDeriveDH", + "data": { + "publicKey": completeMessage["data"]["publicKey"], + "params": completeMessage["data"]["params"], + "recipientNode": recipientNode, + }, + } + ) + logging.log(10, "Adding cryptography request") diff --git a/src/Filters/Protocols/map.py b/src/Filters/Protocols/map.py new file mode 100644 index 00000000..e142c864 --- /dev/null +++ b/src/Filters/Protocols/map.py @@ -0,0 +1,20 @@ +import logging + + +async def filter(completeMessage, todo): + m = completeMessage + todo.append( + { + "action": "map", + "data": { + "onodeID": m["data"]["onodeID"], + "mnodeID": m["data"]["mnodeID"], + }, + } + ) + todo.append( + { + "action": "initNodeDH", + "data": {"mnodeID": m["data"]["mnodeID"], "onodeID": m["data"]["onodeID"]}, + } + ) diff --git a/src/Filters/base.py b/src/Filters/base.py new file mode 100644 index 00000000..a62bcf7a --- /dev/null +++ b/src/Filters/base.py @@ -0,0 +1,121 @@ +from Components.daisy import Cache +from Packets.Packets import Packets +import msgpack, lzma +from Packets.Packet import Packet +from Packets.Packets import Packets +import logging +import Filters.Protocols.bubble +import Filters.Protocols.map +import Filters.Protocols.catch +import Filters.Protocols.cryptography +import asyncio +import traceback + + +# βœ… TODO: Cache integration for messages + + +class Filter: + def __init__(self, cache, onodeID, todo, cLog): + self.cLog = cLog + self.cache = cache + # Note: Messages is temporary storage + # for unfinished messages + self.messages = {} + self.completed = [] + self.todo = todo + self.onodeID = onodeID + + def mCheck(self, payload): + try: + msgpack.loads(payload) + return True + except Exception as e: + self.cLog(20, "Not msgpack encoded, skipping") + return False + + def selfCheck(self, packet): + if packet["fromId"] == packet["toId"]: + self.cLog(20, "Self packet, ignored") + return False + else: + return True + + async def protoMap(self, protocolID): + protocolID = str(protocolID).zfill(6) + return self.cache.get("mlookup").get()[protocolID] + + async def protoRoute(self, completeMessage): + """ + Shorthand reference + """ + m = completeMessage + sender = m["sender"] + senderDisplay = m["senderDisplayName"] + recipient = m["recipient"] + recipientNode = m["recipientNode"] + # TODO: Fix packets to use class + protocol = await self.protoMap(m["packetsClass"]) + self.cLog(20, "Protocol: " + protocol) + if protocol == "bubble": + await Filters.Protocols.bubble.filter( + m, recipient, recipientNode, self.onodeID, self.todo + ) + elif protocol == "map": + await Filters.Protocols.map.filter(m, self.todo) + elif protocol == "catch": + await Filters.Protocols.catch.filter(m, recipient, recipientNode, self.todo) + elif protocol == "cryptography": + await Filters.Protocols.cryptography.filter( + completeMessage, recipientNode, self.todo + ) + else: + self.cLog(30, "Cant route, no protocol") + + async def sieve(self, packet): + p = packet["decoded"]["payload"] + if self.selfCheck(packet) and self.mCheck(p): + try: + p = msgpack.loads(p) + self.cLog(20, p) + packetsID = p["packetsID"] + packetsClass = p["packetsClass"] + if packetsID == 0: + self.cLog(20, "Single packet") + # Do sp handling + pass + if packetsID in self.completed: + raise ValueError("Message already completed") + if not (packetsID in self.messages): + self.messages[packetsID] = { + "packetCount": p["packetCount"], + "data": [], + "finished": False, + "dataOrder": [], + } + if "wantFullResponse" in p.keys(): + for k in p.keys(): + if k != "data": + self.messages[packetsID][k] = p[k] + elif not p["packetNumber"] in self.messages[packetsID]["dataOrder"]: + self.messages[packetsID]["data"].append(p["data"]) + self.messages[packetsID]["dataOrder"].append(p["packetNumber"]) + if (len(self.messages[packetsID]["data"])) >= ( + self.messages[packetsID]["packetCount"] - 1 + ) and ("wantFullResponse" in self.messages[packetsID].keys()): + self.cLog(20, "Finished receiving for message " + str(packetsID)) + self.messages[packetsID]["finished"] = True + if self.messages[packetsID]["wantFullResponse"] != False: + # TO DO: implement loop + # responseLoop(packets_id) + pass + # TODO: Sorting + completeMessage = self.messages[packetsID] + completeMessage["data"] = Packets.reassemble(None, completeMessage) + del self.messages[packetsID] + self.completed.append(packetsID) + self.cLog(20, "Assembly completed, routing") + # self.cache.create("messages/" + str(packetsID), cm) + await self.protoRoute(completeMessage) + except Exception as e: + self.cLog(30, traceback.print_exc()) diff --git a/src/Filters/base.rst b/src/Filters/base.rst new file mode 100644 index 00000000..4a5cb2fd --- /dev/null +++ b/src/Filters/base.rst @@ -0,0 +1,18 @@ +Primary filtering functionality +Dispatches to Protocols +=============================== + +.. autoclass:: Filters.base.Filter + :members: + +.. autoclass:: Filters.Protocols.bubble.filter + :members: + +.. autoclass:: Filters.Protocols.catch.filter + :members: + +.. autoclass:: Filters.Protocols.cryptography.filter + :members: + +.. autoclass:: Filters.Protocols.map.filter + :members: diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 00000000..d0c3cbf1 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = source +BUILDDIR = build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/src/Packets/HeaderPacket.py b/src/Packets/HeaderPacket.py new file mode 100755 index 00000000..9028707d --- /dev/null +++ b/src/Packets/HeaderPacket.py @@ -0,0 +1,53 @@ +from Packets.Packet import Packet +import Components.daisy as d +import msgpack + + +class Header(Packet): + def __init__( + self, + packetsID, + packetCount, + sender, + senderDisplayName, + recipient, + recipientNode, + json=True, + fname=False, + subpacket=False, + wantFullResponse=False, + mimeType=-1, + protocol=None, + packetsClass=0, + ): + super().__init__( + "", packetsID=packetsID, packetCount=packetCount, packetsClass=packetsClass + ) + self.sender = sender + self.senderDisplayName = senderDisplayName + self.recipient = recipient + self.recipientNode = recipientNode + self.json = json + self.fname = fname + self.subpacket = subpacket + self.wantFullResponse = wantFullResponse + self.mimeType = mimeType + + def usePreset(self, path): + preset = d.Daisy(path) + for key in preset.get().keys(): + self.msg[key] = preset.get()[key] + + def dump(self): + res = msgpack.loads(super().dump()) + res["sender"] = self.sender + res["senderDisplayName"] = self.senderDisplayName + res["recipient"] = self.recipient + res["recipientNode"] = self.recipientNode + # res["json"] = self.json + # res["fname"] = self.fname + res["subpacket"] = self.subpacket + res["wantFullResponse"] = self.wantFullResponse + res["mimeType"] = self.mimeType + # res["protocol"] = self.protocol + return msgpack.dumps(res) diff --git a/src/Packets/HeaderPacket.rst b/src/Packets/HeaderPacket.rst new file mode 100644 index 00000000..6d72a821 --- /dev/null +++ b/src/Packets/HeaderPacket.rst @@ -0,0 +1,5 @@ +Header packet: Metadata packet +=============================== + +.. autoclass:: Packets.HeaderPacket.Header + :members: diff --git a/src/Packets/Packet.py b/src/Packets/Packet.py new file mode 100755 index 00000000..018b4f74 --- /dev/null +++ b/src/Packets/Packet.py @@ -0,0 +1,54 @@ +import lzma, sys +from Components.daisy import Daisy +import msgpack +import logging + + +class Packet: + def parsePayload(data): + msg = msgpack.loads(data) + return [ + msg["packetsID"], + msg["packetNumber"], + lzma.decompress(msg["data"]), + msg["packetsClass"], + ] + + def __init__( + self, + data, + packetsID=False, + packetNumber=False, + packetCount=1, + packetsClass=-1, + ): + if packetsID == False: + self.packetsID, self.packetNumber, self.data, self.packetsClass = ( + self.parsePayload(data) + ) + else: + self.packetsID = packetsID + self.packetNumber = packetNumber + self.data = data + self.packetsClass = packetsClass + if packetsClass != -1: + pass + """template = Daisy("daisy/packet_templates/template.lookup").get()[ + str(packetsClass).zfill(2) + ] + edata = Daisy("daisy/packet_templates/" + template) + for key in edata.get().keys(): + self.data[key] = edata.get()[key]""" + + def dump(self): + res = { + "packetsID": self.packetsID, + "packetNumber": self.packetNumber, + "data": self.data, + "packetsClass": self.packetsClass, + } + if res["data"] == "": + res.pop("data") + ores = msgpack.dumps(res) + logging.log(20, "Packet size: " + str(sys.getsizeof(ores))) + return ores diff --git a/src/Packets/Packet.rst b/src/Packets/Packet.rst new file mode 100644 index 00000000..e1396fc9 --- /dev/null +++ b/src/Packets/Packet.rst @@ -0,0 +1,5 @@ +Base packet +=============================== + +.. autoclass:: Packets.Packet.Packet + :members: diff --git a/src/Packets/Packets.py b/src/Packets/Packets.py new file mode 100755 index 00000000..253fc3c3 --- /dev/null +++ b/src/Packets/Packets.py @@ -0,0 +1,91 @@ +import Packets.Packet as p +import Packets.HeaderPacket as h +import lzma +import msgpack +import random +import sys +import math + +# Reassemble method + +# Test +# Polymorph to accept payload array, done +# Create packet instance with payload +# Add to and from node ids +# Node id generation, random, checked against existing ids + +# DO NOT CHANGE DATA SIZE UNLESS YOU KNOW WHAT YOURE DOING + + +class Packets: + def __init__( + self, + bytesObject, + sender, + senderDisplayName, + recipient, + recipientNode, + dataSize=128, + wantFullResponse=False, + packetsClass=None, + ): + if isinstance(bytesObject, list): + # TODO: instantiating HeaderPacket correctly + packets = [h.Header(bytesObject[0])] + for packet in bytesObject: + packets.append( + p.Packet( + packet["data"], + packetsID=packet["packetsID"], + packetNumber=packet["packetNumber"], + packetsClass=packetsClass, + ) + ) + self.packets = packets + else: + bytesObject = lzma.compress(bytesObject) + packets = [] + self.packetsID = random.randrange(0, 999999) + pnum = 1 + blen = math.ceil(len(bytesObject) / dataSize) + tb = b"" + for it in range(blen): + if it >= (blen - 1): + b = bytesObject[it * dataSize :] + else: + b = bytesObject[it * dataSize : (it * dataSize + dataSize)] + packets.append( + p.Packet(b, self.packetsID, pnum, packetsClass=packetsClass) + ) + pnum += 1 + tb += b + packets.insert( + 0, + h.Header( + self.packetsID, + pnum, + sender, + senderDisplayName, + recipient, + recipientNode, + wantFullResponse=wantFullResponse, + packetsClass=packetsClass, + ), + ) + for it in range(pnum): + packet = msgpack.loads(packets[it].dump()) + packet["packetCount"] = pnum + + packets[it] = msgpack.dumps(packet) + + self.packets = packets + + def get(self): + return self.packets + + def reassemble(self, cm): + data = b"" + for it in range(1, int(cm["packetCount"])): + data += cm["data"][cm["dataOrder"].index(it)] + res = msgpack.loads(lzma.decompress(data)) + return res diff --git a/src/Packets/Packets.rst b/src/Packets/Packets.rst new file mode 100644 index 00000000..b042b6b2 --- /dev/null +++ b/src/Packets/Packets.rst @@ -0,0 +1,6 @@ +Packets representation for full +message +=============================== + +.. autoclass:: Packets.Packets.Packets + :members: diff --git a/src/Packets/SinglePacket.py b/src/Packets/SinglePacket.py new file mode 100755 index 00000000..ba85f1bb --- /dev/null +++ b/src/Packets/SinglePacket.py @@ -0,0 +1,16 @@ +from .Packet import Packet +import msgpack, lzma + +# TODO: Instantiation +# TODO: Packet template loading + + +class SinglePacket(Packet): + def __init__(self, data, packetsID, packetsClass=None, cache=None): + super().__init__( + lzma.compress(msgpack.dumps(data)), + packetsID=packetsID, + packetNumber=0, + packetsClass=packetsClass, + ) + self.packetCount = 1 diff --git a/src/Packets/SinglePacket.rst b/src/Packets/SinglePacket.rst new file mode 100644 index 00000000..c93f76ea --- /dev/null +++ b/src/Packets/SinglePacket.rst @@ -0,0 +1,6 @@ +SinglePacket: Singular packet +for very low data applications +=============================== + +.. autoclass:: Packets.SinglePacket.SinglePacket + :members: diff --git a/src/Packets/SubPacket.py b/src/Packets/SubPacket.py new file mode 100644 index 00000000..e69de29b diff --git a/src/Packets/SubPacket.rst b/src/Packets/SubPacket.rst new file mode 100644 index 00000000..d2ce8502 --- /dev/null +++ b/src/Packets/SubPacket.rst @@ -0,0 +1,3 @@ +SubPacket for handling +individual packets of submessages +================================= diff --git a/src/Packets/SubPackets.py b/src/Packets/SubPackets.py new file mode 100644 index 00000000..e69de29b diff --git a/src/Packets/SubPackets.rst b/src/Packets/SubPackets.rst new file mode 100644 index 00000000..5023c8e8 --- /dev/null +++ b/src/Packets/SubPackets.rst @@ -0,0 +1,3 @@ +SubPackets for handling +full submessages +======================= diff --git a/src/Transmission/transmission.py b/src/Transmission/transmission.py new file mode 100644 index 00000000..e2e8005d --- /dev/null +++ b/src/Transmission/transmission.py @@ -0,0 +1,223 @@ +from sys import getsizeof +import meshtastic +import meshtastic.serial_interface +from pubsub import pub +from Packets.Packets import Packets as Packets +from Packets.SinglePacket import SinglePacket +import time +from threading import Thread +from Components.daisy import Catch, Cache +import sys +import logging + +# from Filters.base import Filter +import msgpack + +import asyncio +import random + + +class Transmitter: + def __init__(self, device, filter, onodeID, cache, catch, cryptographyInfo, cLog): + self.cLog = cLog + self.cryptographyInfo = cryptographyInfo + self.filter = filter + self.tcache = cache + self.tcatch = catch + self.html = False + self.notConnected = True + self.messages = {} + self.acks = {} + # self.threads = {} + self.onodeID = onodeID + # Be careful with this + self.cpid = 0 + self.tasks = {} + # TODO: use node id to deliver directly + pub.subscribe(self.onReceive, "meshtastic.receive") + pub.subscribe(self.onConnection, "meshtastic.connection.established") + self.interface = meshtastic.serial_interface.SerialInterface(device) + i = 0 + while self.notConnected: + if i % 5000000 == 0: + self.cLog(20, "Waiting for node initialization...") + i += 1 + self.cLog(20, "Initialized") + + # TODO: Sending packets across multiple nodes/load balancing/distributed packet transmission/reception + def onReceive(self, packet, interface): + asyncio.new_event_loop().run_until_complete(self.filter.sieve(packet)) + self.tcache.refresh() + + async def sendAnnounce(self): + await self.addPackets( + msgpack.dumps( + { + "onodeID": self.onodeID, + "mnodeID": self.interface.localNode.nodeNum, + } + ), + self.onodeID, + None, + True, + None, + packetsClass=0, + ) + + def onConnection(self, interface, topic=pub.AUTO_TOPIC): + # self.send("connect".encode("utf-8")) + # time.sleep(3) + asyncio.run(self.sendAnnounce()) + self.notConnected = False + + def responseCheck(self, packet): + rid = packet["decoded"]["requestId"] + if packet["decoded"]["routing"]["errorReason"] == "MAX_RETRANSMIT": + self.cLog(20, "Got ack error") + self.acks[str(rid)] = False + else: + self.acks[str(rid)] = True + + # TODO: Threaded send method + + def send(self, packet, recipientNode=False): + interface = self.interface + if recipientNode == False: + pid = interface.sendData( + packet, wantAck=True, onResponse=self.responseCheck + ) + else: + pid = interface.sendData( + packet, + destinationId=recipientNode, + wantAck=True, + onResponse=self.responseCheck, + ) + + # Can I use waitForAckNak on cpid? + self.cpid = pid.id + return True + + async def awaitResponse(self, pid): + for i in range(120): + await asyncio.sleep(1) + if str(pid) in self.acks: + break + return True + + async def initNodeDH(self, dhefOb, recipientNode, onodeID): + await self.addPackets( + msgpack.dumps( + {"params": dhefOb.getParamsBytes(), "publicKey": dhefOb.publicKey} + ), + self.onodeID, + 000000, + 000000, + onodeID, + directID=recipientNode, + packetsClass=3, + ) + + def awaitFullResponse(self, pid): + for i in range(1_000_000_000): + time.sleep(5) + if pid in self.messages.keys(): + if self.messages[pid]["finished"]: + break + return True + + async def addPackets( + self, + data, + sender, + senderName, + recipient, + recipientNode, + directID=False, + packetsClass=None, + encrypt=False, + ): + interface = self.interface + tp = Packets( + data, + sender, + senderName, + recipient, + recipientNode, + packetsClass=packetsClass, + ) + # print(sys.getsizeof(tp.packets[0])) + # print(tp.packets[0]) + for p in tp.packets: + # time.sleep(5) + if recipientNode == None: + # print("sending none") + # print(p) + self.send(p) + else: + # print(p) + # print(recipientNode) + self.cLog(10, "Sending target: " + str(directID)) + if directID != False: + recipientNode = directID + self.send(p, recipientNode=recipientNode) + awaitTask = asyncio.create_task(self.awaitResponse(self.cpid)) + await asyncio.sleep(1) + currentTask = { + "ob": awaitTask, + "pid": str(self.cpid), + "packet": p, + "retry": False, + } + self.tasks[str(self.cpid)] = currentTask + + async def progressCheck(self): + # interface = self.interface + while True: + await asyncio.sleep(90) + self.cLog( + 20, "Checking progress of {0} tasks".format(len(self.tasks.keys())) + ) + doneFlag = True + dcTasks = [k for k in self.tasks.keys()] + for task in dcTasks: + task = self.tasks[task] + if task["ob"]: + if task["pid"] in self.acks: + if not self.acks[task["pid"]]: + retry = task["retry"] + remove = False + if retry == False: + retry = 1 + elif retry < 3: + retry += 1 + else: + self.cLog(30, "Too many retries") + remove = True + if remove: + del self.tasks[task["pid"]] + else: + self.cLog(20, "Doing retry") + doneFlag = False + # TODO: Resend to specific node + self.send(task["packet"]) + await_thread = asyncio.create_task( + self.awaitResponse(task["pid"]) + ) + + await asyncio.sleep(1) + currentTask = { + "ob": await_thread, + "pid": str(self.cpid), + "packet": task["packet"], + } + currentTask["retry"] = retry + self.tasks[task["pid"]] = currentTask + else: + del self.tasks[task["pid"]] + + async def announce(self): + while True: + self.cLog(10, "Announce") + await self.sendAnnounce() + await asyncio.sleep(180) diff --git a/src/Transmission/transmission.rst b/src/Transmission/transmission.rst new file mode 100644 index 00000000..556faf25 --- /dev/null +++ b/src/Transmission/transmission.rst @@ -0,0 +1,5 @@ +Layer 0 data transmission +=============================== + +.. autoclass:: Transmission.transmission.Transmitter + :members: diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/builddocs b/src/builddocs new file mode 100755 index 00000000..acadfb2b --- /dev/null +++ b/src/builddocs @@ -0,0 +1 @@ +sphinx-build -M markdown source docs diff --git a/src/conf.py b/src/conf.py new file mode 100644 index 00000000..8067b661 --- /dev/null +++ b/src/conf.py @@ -0,0 +1,37 @@ +import os +import sys + +sys.path.insert(0, os.path.abspath("../src")) + +# Configuration file for the Sphinx documentation builder. +# +# For the full list of built-in configuration values, see the documentation: +# https://www.sphinx-doc.org/en/master/usage/configuration.html + +# -- Project information ----------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information + +project = "PierMesh" +copyright = "2024, Agie Ashwood" +author = "Agie Ashwood" +release = "Proto" + +# -- General configuration --------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration + +extensions = ["sphinx_markdown_builder", "sphinx.ext.autodoc", "sphinx.ext.napoleon"] + +templates_path = ["_templates"] +exclude_patterns = [] + + +# -- Options for HTML output ------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output + +html_theme = "alabaster" +html_static_path = ["_static"] + + +# Added markdown configuration + +markdown_http_base = "/PierMesh/piermesh/src/branch/main/docs" diff --git a/src/docs/doctrees/environment.pickle b/src/docs/doctrees/environment.pickle new file mode 100644 index 00000000..fb8ce806 Binary files /dev/null and b/src/docs/doctrees/environment.pickle differ diff --git a/src/docs/doctrees/index.doctree b/src/docs/doctrees/index.doctree new file mode 100644 index 00000000..46d9e97a Binary files /dev/null and b/src/docs/doctrees/index.doctree differ diff --git a/src/docs/markdown/index.md b/src/docs/markdown/index.md new file mode 100644 index 00000000..dd2b241b --- /dev/null +++ b/src/docs/markdown/index.md @@ -0,0 +1,10 @@ + + +# PierMesh documentation + +Add your content using `reStructuredText` syntax. See the +[reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html) +documentation for details. diff --git a/src/index.rst b/src/index.rst new file mode 100644 index 00000000..4200b859 --- /dev/null +++ b/src/index.rst @@ -0,0 +1,19 @@ +.. PierMesh documentation master file, created by + sphinx-quickstart on Fri Jul 26 23:30:55 2024. + +PierMesh documentation +====================== + +.. toctree:: + :caption: Contents: + :glob: + + run + ../ui + ../Bubble/* + ../Components/* + ../Cryptography/* + ../Filters/* + ../Packets/* + ../Transmission/* + ../webui/* diff --git a/src/make.bat b/src/make.bat new file mode 100644 index 00000000..747ffb7b --- /dev/null +++ b/src/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=source +set BUILDDIR=build + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.https://www.sphinx-doc.org/ + exit /b 1 +) + +if "%1" == "" goto help + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/src/mpify.py b/src/mpify.py new file mode 100644 index 00000000..f88aaa80 --- /dev/null +++ b/src/mpify.py @@ -0,0 +1,4 @@ +import src.Components.daisy as d +import sys + +d._json_to_msg(sys.argv[1]) diff --git a/src/piermesh-mini.ascii b/src/piermesh-mini.ascii new file mode 100644 index 00000000..2ffc2271 --- /dev/null +++ b/src/piermesh-mini.ascii @@ -0,0 +1,9 @@ + β–„β–„β–„β–„β–„β–„β–„β–„ + β–„β–„β–„β–„β–„β–„β–„β–„ +β–„ β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ β–„ +β–ˆ β–ˆ β–ˆ β–ˆ +β–ˆ β–ˆ PIERMESH β–ˆ β–ˆ +β–ˆ β–ˆ β–ˆ β–ˆ +β–€ β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ β–€ + β–€β–€β–€β–€β–€β–€β–€β–€ + β–€β–€β–€β–€β–€β–€β–€β–€ diff --git a/src/piermesh.ascii b/src/piermesh.ascii new file mode 100644 index 00000000..eef76a96 --- /dev/null +++ b/src/piermesh.ascii @@ -0,0 +1,21 @@ + β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ + β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ + β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ + β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ + +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ +β–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆβ–ˆ β–ˆβ–ˆ β–ˆβ–ˆ + + β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ + β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ + β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ + β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ + β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„β–„ + β–Œ PIERMESH ▐ + β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€β–€ + diff --git a/src/run.py b/src/run.py new file mode 100755 index 00000000..3d82e90b --- /dev/null +++ b/src/run.py @@ -0,0 +1,280 @@ +from meshtastic import logging, os +from Filters.base import Filter +from Bubble.router import Router +from webui.serve import Server +from Transmission.transmission import Transmitter +import asyncio +import sys +import time +import psutil +import logging +import datetime +from Cryptography.DHEFern import DHEFern +from microdot import Request +import traceback +from ui import TUI +import threading, os + +if __name__ == "__main__": + + # Global objects for the PierMesh service and the TUI so we can terminate the associated processes later + global nodeOb, tuiOb + tuiOb = None + nodeOb = None + + # Enable 500 kB files in the webui + Request.max_content_length = 1024 * 1024 * 0.5 + Request.max_body_length = 1024 * 1024 * 0.5 + + # Pull startup parameters + device, webPort, serverInfoFile, delay, nodeNickname = sys.argv[1:] + + # Set up file based logging + logPath = "logs" + fileName = datetime.datetime.now().strftime("%m%d%Y_%H%M%S") + logFormat = "%(asctime)s [%(threadName)-12.12s] [%(levelname)-5.5s] %(message)s" + logging.basicConfig( + format=logFormat, + level=logging.INFO, + filename="{0}/{2}_{1}.log".format(logPath, fileName, nodeNickname), + ) + + +class Node: + """ + Class that handles most of the PierMesh data + + `πŸ”— Source `_ + """ + + def __init__(self): + self.toLog = [] + """ + We store logs to be processed here + + See Also + -------- + logPassLoop: Loop to handle logging to file and TUI + """ + actionsList = [f for f in dir(self) if "action" in f] + self.actions = {} + for a in actionsList: + self.actions[a.split("_")[1]] = getattr(self, a) + self.cLog(20, "Past action mapping") + self.r = Router(self.cLog, nfpath=serverInfoFile) + self.cLog(20, "Router initialized") + self.onodeID = str(self.r.serverInfo.get()["nodeID"]) + self.catch = self.r.c + self.cache = self.r.cache + self.s = None + self.todo = [] + self.f = Filter(self.cache, self.onodeID, self.todo, self.cLog) + self.cLog(20, "Filter initialized") + # self.cLog(30, sys.argv) + self.t = None + self.cLog(20, "Cryptography initializing") + self.cryptographyInfo = DHEFern(self.cache, nodeNickname, self.cLog) + self.cLog(20, "Cryptography initialized") + self.processed = [] + self.proc = psutil.Process(os.getpid()) + self.mTasks = {} + + def cLog(self, priority: int, message: str): + """ + Convenience function that logs to the ui and log files + + Parameters + ---------- + + priority: int + Priority of message to be passed to logging + + message: str + Message to log + + Returns + ------- + None + """ + logging.log(priority, message) + self.toLog.append("[{0}]:\n{1}".format(datetime.datetime.now(), message)) + + async def monitor(self): + """ + Monitor and log ram and cpu usage + """ + while True: + if tuiOb != None: + if tuiOb.done: + print("Terminating PierMesh service...") + self.proc.terminate() + await asyncio.sleep(10) + memmb = self.proc.memory_info().rss / (1024 * 1024) + memmb = round(memmb, 2) + cpup = self.proc.cpu_percent(interval=1) + self.cLog( + 20, + " MEM: {0} mB | CPU: {1} %".format( + memmb, + cpup, + ), + ) + # Set cpu and memory usage in the TUI + tuiOb.do_set_cpu_percent(float(cpup)) + tuiOb.do_set_mem(memmb) + + async def fListen(self): + """ + Loop to watch for tasks to do + + See Also + -------- + Filters.base.sieve: Packet filtering/parsing + + Notes + ----- + We use a common technique here that calls the function from our preloaded actions via dictionary entry + """ + while True: + while len(self.todo) >= 1: + todoNow = self.todo.pop() + action = todoNow["action"] + self.cLog(20, "Action: " + action) + data = todoNow["data"] + await self.actions[action](data) + await asyncio.sleep(1) + + async def action_sendToPeer(self, data: dict): + """ + Send data to a peer connected to the server + + Parameters + ---------- + data: dict + Data passed from the filter, this is a generic object so it's similar on all actions here + + See Also + -------- + Filters.Protocols: Protocol based packet filtering + + webui.serve.Server: Runs a light Microdot web server with http/s and websocket functionality + + webui.serve.Server.sendToPeer: Function to actually execute the action + """ + self.s.sendToPeer(data["recipient"], data["res"]) + + async def action_sendCatch(self, data: dict): + """ + Get catch and return the data to a peer + + See Also + -------- + Bubble.router.Router: Routing class + """ + res = self.r.getCatch(data["head"], data["body"], fins=data["fins"]) + self.s.sendToPeer(data["recipient"], res) + + async def action_map(self, data: dict): + """ + Map new network data to internal network map + + See Also + -------- + Bubble.network.Network: Layered graph etwork representation + """ + self.r.n.addLookup(data["onodeID"], data["mnodeID"]) + self.cLog(20, "Lookup addition done") + self.r.n.addon(data["onodeID"]) + + async def action_initNodeDH(self, data: dict): + """ + Initialize diffie hellman key exchange + + See Also + -------- + Cryptography.DHEFern.DHEFern: End to end encryption functionality + """ + if self.cryptographyInfo.getRecord("key", data["onodeID"]) == False: + await self.t.initNodeDH( + self.cryptographyInfo, int(data["mnodeID"]), data["onodeID"] + ) + + async def action_keyDeriveDH(self, data: dict): + """ + Derive key via diffie hellman key exchange + """ + try: + self.cryptographyInfo.keyDerive( + data["publicKey"], + self.cryptographyInfo.getSalt(), + data["recipientNode"], + data["params"], + ) + except: + self.cLog(30, traceback.format_exc()) + + +async def logPassLoop(): + """ + Loop to pass logs up to the TUI + + See Also + -------- + tui.TUI: TUI implementation + """ + global tuiOb, nodeOb + while True: + await asyncio.sleep(1) + if tuiOb == None or nodeOb == None: + await asyncio.sleep(1) + elif tuiOb.done == True: + print("Terminating PierMesh service...") + nodeOb.proc.terminate() + else: + ctoLog = [l for l in nodeOb.toLog] + for l in ctoLog: + tuiOb.do_write_line(l) + nodeOb.toLog.pop() + + +async def main(): + """ + Main method for running the PierMesh service + """ + global nodeOb + try: + n = Node() + nodeOb = n + nodeOb.cLog(20, "Starting up") + nodeOb.cLog(20, "Staggering {0} seconds, please wait".format(sys.argv[4])) + time.sleep(int(sys.argv[4])) + n.t = Transmitter( + sys.argv[1], n.f, n.onodeID, n.cache, n.catch, n.cryptographyInfo, n.cLog + ) + n.s = Server(n.t, n.catch, n.onodeID, n.r.n, n.cLog) + n.mTasks["list"] = asyncio.create_task(n.fListen()) + await asyncio.sleep(1) + n.mTasks["pct"] = asyncio.create_task(n.t.progressCheck()) + await asyncio.sleep(1) + n.mTasks["mon"] = asyncio.create_task(n.monitor()) + await asyncio.sleep(1) + n.mTasks["announce"] = asyncio.create_task(n.t.announce()) + await asyncio.sleep(1) + await n.s.app.start_server(port=int(sys.argv[2]), debug=True) + except KeyboardInterrupt: + sys.exit() + + +if __name__ == "__main__": + try: + t = threading.Thread(target=asyncio.run, args=(main(),)) + t.start() + lplt = threading.Thread(target=asyncio.run, args=(logPassLoop(),)) + lplt.start() + tuiOb = TUI() + tuiOb.nodeOb = nodeOb + tuiOb.run() + except KeyboardInterrupt: + nodeOb.cLog(30, "Terminating PierMesh service...") + except Exception: + nodeOb.cLog(30, sys.gettrace()) diff --git a/src/run.rst b/src/run.rst new file mode 100644 index 00000000..94b806fd --- /dev/null +++ b/src/run.rst @@ -0,0 +1,6 @@ +PierMesh service runner +======================= + +.. automodule:: run.main +.. autoclass:: run.Node + :members: diff --git a/src/scripts/falin b/src/scripts/falin new file mode 100755 index 00000000..73e56083 --- /dev/null +++ b/src/scripts/falin @@ -0,0 +1 @@ +python run.py /dev/ttyACM1 5000 server2.info 0 falin diff --git a/src/scripts/falin.pypy b/src/scripts/falin.pypy new file mode 100755 index 00000000..f0e084ee --- /dev/null +++ b/src/scripts/falin.pypy @@ -0,0 +1 @@ +./tmp/pypy3.10-v7.3.16-linux64/bin/pypy3.10 run.py /dev/ttyACM1 5000 server2.info 0 falin diff --git a/src/scripts/marcille b/src/scripts/marcille new file mode 100755 index 00000000..9436d766 --- /dev/null +++ b/src/scripts/marcille @@ -0,0 +1 @@ +python run.py /dev/ttyACM0 5001 server1.info 30 marcille diff --git a/src/scripts/setregion b/src/scripts/setregion new file mode 100755 index 00000000..6bb5bc8f --- /dev/null +++ b/src/scripts/setregion @@ -0,0 +1 @@ +python -m meshtastic --set lora.region US --port /dev/ttyACM0 diff --git a/src/stale/microplane.py b/src/stale/microplane.py new file mode 100755 index 00000000..87254853 --- /dev/null +++ b/src/stale/microplane.py @@ -0,0 +1,66 @@ +import base64, uuid, json, sys, lzma, bson, random, msgpack +from Packets import Packet, HeaderPacket + +def compressPackets(packets): + cpackets = [] + for packet in packets: + cpacket = lzma.compress(packet) + cpackets.append(cpacket) + return cpackets + +def decompressPackets(packets): + cpackets = [] + for packet in packets: + cpacket = lzma.decompress(packet) + cpackets.append(cpacket) + return cpackets + +# TODO: Sub packets +# Sub packets are indicated by a flag in the header +# TODO: Sub packets implementation +# TODO: Sub packet recursion, collapse +# TODO: Determine sub packet per subpackets allowed for header packet size, done, 5, but user ids and subpackets ids must be 6 digit integers +# Remove duplicate references to objects +# Local db that stores users to lookup for less metadata, daisy +# IDS MUST BE 6 DIGITS +# location prefix added by node +# Check if packet is header by checking if it has sender_id + +# DO NOT CHANGE DATA SIZE UNLESS YOU KNOW WHAT YOURE DOING + +# Moved to Packets/Packets + +def reassemblePackets(packets): + #print(packets) + packet_count = msgpack.loads(packets[0])["packet_count"] + #print("Packet count") + #print(packet_count) + positions = [] + for packet in packets: + p = msgpack.loads(packet) + num = 0 + if "packet_number" in p: + num = p["packet_number"] + #print(p) + positions.append(num) + tpackets = [] + for it in range(0, len(positions)): + tpackets.append(packets[positions.index(it)]) + packets = tpackets + res = b"" + #print("Reassembling") + #print(len(packets)) + for it in range(len(packets)): + if it > 0: + #print(it) + #print(res) + #print(bson.loads(packets[it]).keys()) + res = res + lzma.decompress(msgpack.loads(packets[it])["data"]) + #print(len(res)) + #print(bson.loads(res)) + #print(res) + #print(bson.loads(res)) + return msgpack.loads(res) + +def raiseSizeError(index): + raise ValueError("Field of index: " + str(index) + " too big, maximum is 200 bytes") diff --git a/src/stale/sio.py b/src/stale/sio.py new file mode 100755 index 00000000..c2011d35 --- /dev/null +++ b/src/stale/sio.py @@ -0,0 +1,30 @@ +import socketio +from threading import Thread +import transmission as t +import microplane as m +import bson + +@sio.event +def send(sid, data): + packets = bson.dumps(data) + packets = m.getPackets(packets) + # TODO: Implement awaitFullResponse + threads = [] + threads.append(Thread(target=t.awaitFullResponse, args=[pid]) + for p in packets: + t.send(interface, p) + #awaitResponse(cpid) + pid = t.cpid threads.append(Thread(target=t.awaitResponse, args=[pid]) + threads[-1].start() + time.sleep(1) + done = True + while True: + for th in threads: + if thread.is_alive(): + done = False + if done: + break + sio.emit('done', {'data': t.messages[packets[0]["packets_id"]]["fresponse"]}, room=sid) + +mgr = socketio.RedisManager('redis://') +sio = socketio.Server(client_manager=mgr) diff --git a/src/stale/transmission.old.py b/src/stale/transmission.old.py new file mode 100755 index 00000000..0692d972 --- /dev/null +++ b/src/stale/transmission.old.py @@ -0,0 +1,193 @@ +import meshtastic +import meshtastic.serial_interface +from pubsub import pub +import bson +import microplane as m +import sys +import time +import asyncio +import functools +from util import sendData +from threading import Thread +import webview +from Daisy import Catch, Cache +from Filters import Base + +tcache = Cache() +tcatch = Catch() + +html = False +notConnected = True +messages = {} +acks = {} +# Be careful with this +cpid = 0 +# TODO: Filter out non data packets/log them, DONE +# TODO: Figure out why the message count is resetting, DONE, the while loop was...looping +# TODO: Sending packets across multiple nodes/load balancing/distributed packet transmission/reception +def onReceive(packet, interface): + Base.sieve(packet) + tcache.refresh() + +def onConnection(interface, topic=pub.AUTO_TOPIC): # called when we (re)connect to the radio + # defaults to broadcast, specify a destination ID if you wish + interface.sendData("connect".encode("utf-8")) + global notConnected + notConnected = False +def responseCheck(packet): + #print("got response") + #print("Checking") + #print(packet["decoded"]) + rid = packet["decoded"]["requestId"] + print(rid) + # TODO: Set to false on error + print(packet["decoded"]) + if (packet["decoded"]["routing"]["errorReason"] == "MAX_RETRANSMIT"): + print("Got ack error") + acks[str(rid)] = False + else: + acks[str(rid)] = True + +# TODO: Threaded send nethod + +def send(interface, packet): + global cpid + # TODO: Set to confirm receipt, DONE + # TODO: Async sendData call + # TODO: Fix logging error + print("sending") + pid = interface.sendData(packet, wantAck=True, onResponse=responseCheck) + #pid = await sendData(interface, packet, wantAck=True, onResponse=responseCheck) + #pid = await iloop.run_in_executor(None, functools.partial(interface.sendData, interface, packet, wantAck=True, onResponse=responseCheck)) + # Can I use waitForAckNak on cpid? + cpid = pid.id + print(cpid) + #return pid + return True + +def awaitResponse(pid): + #pid = interface.sendData(p, wantAck=True, onResponse=responseCheck)["id"] + #pid = await loop.run_in_executor(None, send, interface, p) + #pid = await loop.run_in_executor(None, functools.partial(interface.sendData, wantAck=True, onResponse=responseCheck), interface, p) + print(pid) + for i in range(1_000_000_000): + time.sleep(5) + if str(pid) in acks: + print("Response gotten") + break + print("waiting") + return True + +def awaitFullResponse(pid): + for i in range(1_000_000_000): + time.sleep(5) + if pid in messages.keys(): + if messages[pid]["finished"]: + print("Response gotten") + break + print("waiting") + return True + +pub.subscribe(onReceive, "meshtastic.receive") +pub.subscribe(onConnection, "meshtastic.connection.established") +# By default will try to find a meshtastic device, otherwise provide a device path like /dev/ttyUSB0 +interface = meshtastic.serial_interface.SerialInterface(sys.argv[-1]) +# Wait to connect to partner +# TODO: use node id to delivery directly +while notConnected: + time.sleep(5) + print("Waiting") +if "0" in sys.argv[-1]: + tj = [[{"message":"free palestine! free all colonized people!"}], ["the people yearn for freedom"]] + j2 = {"message":"free palestine! free all colonized people!", "message2":"free palestine! free all colonized people!"} + htmlj = {"html": "

Hello world!

"} + htmljl = {"html": ""} + with open("test.html", "r") as f: + htmljl["html"] = f.read() + done = False + threads = {} + for p in m.getPackets(bson.dumps(htmljl), 600123, 600123, 600124): + print(sys.getsizeof(p)) + #send_thread = Thread(target=send, args=[interface, p]) + #send_thread.start() + send(interface, p) + #awaitResponse(cpid) + await_thread = Thread(target=awaitResponse, args=[cpid]) + await_thread.start() + cth = { + "ob": await_thread, + "pid": str(cpid), + "packet": p, + "retry": False + } + threads[str(cpid)] = cth + # TODO: see if theres a better way to do this + time.sleep(10) + #await_thread.join() + #await_thread.join() + #loop = asyncio.new_event_loop() + #loopi = asyncio.new_event_loop() + #loopi.run_until_complete(send(interface, p)) + #res = loop.run_until_complete(awaitResponse(cpid)) + # figure out why it doesnt send before timing out + # TODO: running in different threads + #pid = send(interface, p).id + #loop = asyncio.new_event_loop() + #loopi = asyncio.new_event_loop() + #loopi.run_until_complete(send(loopi, interface, p)) + #interface.waitForAckNak() + #res = loop.run_until_complete(awaitResponse(interface, p, cpid)) + #print("Done waiting") + #interface.waitForAckNak() + # DO NOT RUN UNTIL responseCheck CHECKS FOR ERRORS + isDone = False + while not isDone: + doneFlag = True + for th in threads.keys(): + th = threads[th] + if not th["ob"].is_alive: + if not acks[th["pid"]]: + retry = th["retry"] + if retry == False: + retry = 1 + elif retry < 3: + retry += 1 + else: + print("Too many retries") + break + doneFlag = False + send(interface, th["packet"]) + await_thread = Thread(target=awaitResponse, args=[cpid]) + await_thread.start() + cth = { + "ob": await_thread, + "pid": str(cpid), + "packet": p + } + cth["retry"] = retry + threads[str(cpid)] = cth + # TODO: see if theres a better way to do this + time.sleep(5) + if doneFlag: + isDone = True + + + + + for it, p in enumerate(m.getPacketsFromFile("r.jpg", 600123, 600123, 600124)): + #send(interface, p) + #pid = send(interface, p).id + #loopi = asyncio.new_event_loop() + #loopi.run_until_complete(send(loopi, interface, p)) + #interface.waitForAckNak() + #res = loop.run_until_complete(awaitResponse(interface, p, cpid)) + #interface.waitForAckNak() + #print("Sending packet: " + str(it)) + break +else: + while True: + if html != False: + break + pass + webview.create_window('Home', html=html) + webview.start() diff --git a/src/ui.py b/src/ui.py new file mode 100644 index 00000000..0c81a59a --- /dev/null +++ b/src/ui.py @@ -0,0 +1,129 @@ +from textual.app import App, ComposeResult +from textual.widgets import Log, Label, Footer, Header, ProgressBar +from textual.binding import Binding +from textual.containers import Horizontal, Vertical +import sys, os + +global nodeOb +nodeOb = None + + +class TUI(App): + """ + TUI for PierMesh + + `πŸ”— Source `_ + + Attributes + ---------- + visibleLogo: bool + Whether the logo is visible or not, used in toggling visibility + nodeOb: Node + Reference to the Node running the PierMesh service + done: bool + Whether the TUI has been killed + """ + + visibleLogo = True + nodeOb = None + done = False + CSS_PATH = "ui.tcss" + BINDINGS = [ + Binding(key="q", action="quitFull", description="Quit the app", show=True), + Binding( + key="f", + action="toggleFullscreen", + description="Full screen the logs", + show=True, + ), + ] + + def action_toggleFullscreen(self): + """ + Toggle fullscreen logs by either collapsing width or setting it to it's original size + """ + if self.visibleLogo: + self.query_one("#logo").styles.width = 0 + else: + self.query_one("#logo").styles.width = "50%" + self.visibleLogo = not self.visibleLogo + + def action_quitFull(self): + """ + Kill the whole stack by setting self to done and terminating the thread. We check in run.monitor later and kill the rest of the stack then with psutil + + See Also + -------- + run.monitor + """ + self.done = True + sys.exit("Terminating TUI...") + + def compose(self) -> ComposeResult: + """ + Build the TUI + """ + ascii = "" + with open("piermesh-mini.ascii", "r") as f: + ascii = f.read() + """ + Load the ascii art for display on the left label + """ + yield Header(icon="P") + yield Label(ascii, classes="largeLabel", name="logo", id="logo") + yield Vertical( + Log(auto_scroll=True, classes="baseLog"), + Label("CPU usage:", name="cpul", id="cpul"), + ProgressBar(show_eta=False, show_percentage=True), + Label("MEM usage: ", name="meml", id="meml"), + ) + yield Footer() + + def do_write_line(self, logLine: str): + """ + Write line to the logs panel + + Parameters + ---------- + logLine: str + Line to log + """ + log = self.query_one(Log) + log.write_line(logLine) + + def do_set_cpu_percent(self, percent: float): + """ + Set CPU percent in the label and progress bar + + Parameters + ---------- + percent: float + Percent of the cpu PierMesh is using + """ + self.query_one("#cpul").update("CPU usage: {0} %".format(str(percent))) + pbar = self.query_one(ProgressBar) + pbar.progress = percent + + def do_set_mem(self, memmb: float): + """ + Set memory usage label in the ui + + Parameters + ---------- + memmb: float + Memory usage of PierMesh in megabytes + """ + self.query_one("#meml").update("MEM usage: {0} mB".format(str(memmb))) + + def on_mount(self): + """ + Called at set up, configures the title and the progess bar + """ + self.title = "PierMesh TUI" + self.query_one(ProgressBar).update(total=100) + self.query_one(ProgressBar).update(progress=0) + + +if __name__ == "__main__": + app = TUI() + app.run() diff --git a/src/ui.rst b/src/ui.rst new file mode 100644 index 00000000..2db5421a --- /dev/null +++ b/src/ui.rst @@ -0,0 +1,5 @@ +TUI application +========================== + +.. autoclass:: ui.TUI + :members: diff --git a/src/ui.tcss b/src/ui.tcss new file mode 100644 index 00000000..b594124c --- /dev/null +++ b/src/ui.tcss @@ -0,0 +1,23 @@ +Screen { + layout: horizontal; + scrollbar-size: 0 0; +} + +.largeLabel { + width: 40%; +} + +.baseLog { + height: 80%; + scrollbar-background: $primary-background; + scrollbar-corner-color: $primary-background; + scrollbar-color: green; + scrollbar-size: 0 1; + } + +ProgressBar { + width: 50%; + } +Bar > .bar--bar { + color: green; +} diff --git a/src/webui/build.py b/src/webui/build.py new file mode 100755 index 00000000..d2089e09 --- /dev/null +++ b/src/webui/build.py @@ -0,0 +1,40 @@ +from jinja2 import Environment, FileSystemLoader, select_autoescape +import os, markdown2 +import json, msgpack, subprocess +import shutil +from distutils.dir_util import copy_tree + +env = Environment(loader=FileSystemLoader("templates")) + +# subprocess.check_call("mmdc -i * -e png") + +# TODO: Generating mmd from docstrings + +for path in os.listdir("diagrams/markdown"): + fname = path.split(".")[0] + try: + subprocess.check_call( + "mmdc -i diagrams/markdown/{0} -o res/img/diagrams/{1}.png".format( + path, fname + ), + shell=True, + ) + except Exception as e: + print("Empty file or other error") + + +copy_tree("diagrams/markdown", "res/diagrams") +copy_tree("res", "build/res") +shutil.copyfile("htmx-extensions/src/ws/ws.js", "build/res/js/ws.js") + +tpath = "templates/" + +for path in os.listdir(tpath): + if ("base" in path) != True: + for t in os.listdir(tpath + path): + if os.path.exists("build/" + path) != True: + os.makedirs("build/" + path) + ipath = tpath + path + "/" + t + template = env.get_template(path + "/" + t) + with open("build/{0}/{1}".format(path, t), "w") as f: + f.write(template.render()) diff --git a/src/webui/diagrams/markdown/bubble.mmd b/src/webui/diagrams/markdown/bubble.mmd new file mode 100644 index 00000000..1f8cfdb0 --- /dev/null +++ b/src/webui/diagrams/markdown/bubble.mmd @@ -0,0 +1,13 @@ +--- +title: "πŸ”΅ Bubble" +--- +erDiagram + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server" : "πŸ”Œ WS" + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ“„ HTTP/S" + "πŸ—„οΈ Server" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» send" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» onReceive" + "πŸ“€ Transmitter" |o..o| "🧽 Sieve": "πŸ“» onReceive" + "🧽 Sieve" |o..o| "πŸ’Ώ Cache": "βž• Write" + "πŸ’Ώ Cache" |o..o| "πŸ‘‚ fListen": "βž• Write event" + "πŸ‘‚ fListen" |o..o| "πŸ—„οΈ Server": "βœ‰οΈ Pass message" diff --git a/src/webui/diagrams/markdown/catch.mmd b/src/webui/diagrams/markdown/catch.mmd new file mode 100644 index 00000000..e432c321 --- /dev/null +++ b/src/webui/diagrams/markdown/catch.mmd @@ -0,0 +1,16 @@ +--- +title: "🐟 Catch" +--- +erDiagram + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ”Œ WS" + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ“„ HTTP/S" + "πŸ—„οΈ Server" |o..o| "🐟 Catch": "❔ Queries" + "πŸ“» PierMesh" |o..o| "🧽 Sieve": "🧽 Filters" + "🧽 Sieve" |o..o| "πŸ‘‚ fListen": "πŸ‘‚ Listens for messages" + "πŸ‘‚ fListen" |o..o| "🐟 Catch": "❔ Queries" + "🐟 Catch" |o..}| "🌼 Daisy": "πŸ“„ Store references" + "🌼 Daisy" { + string filepath + dictionary msg + } + "🌼 Daisy" |o..o| "πŸ“ File system": "πŸ“ CRUD" diff --git a/src/webui/diagrams/markdown/daisy.mmd b/src/webui/diagrams/markdown/daisy.mmd new file mode 100644 index 00000000..2fb18b82 --- /dev/null +++ b/src/webui/diagrams/markdown/daisy.mmd @@ -0,0 +1,5 @@ +--- +title: "🌼 Daisy" +--- +erDiagram + diff --git a/src/webui/diagrams/markdown/microplane.mmd b/src/webui/diagrams/markdown/microplane.mmd new file mode 100644 index 00000000..e69de29b diff --git a/src/webui/diagrams/markdown/overview.mmd b/src/webui/diagrams/markdown/overview.mmd new file mode 100755 index 00000000..6f282365 --- /dev/null +++ b/src/webui/diagrams/markdown/overview.mmd @@ -0,0 +1,20 @@ +--- +title: "πŸ“» PierMesh" +--- +erDiagram + "πŸ‘₯ Peer" }|..|{ "πŸ—„οΈServer" : "πŸ”Œ WS" + "πŸ‘₯ Peer" }|..|{ "πŸ—„οΈServer": "πŸ“„ HTTP/S" + "πŸ—„οΈServer" |o..o| "🐟 Catch": "❔ Queries" + "πŸ—„οΈServer" |o..o| "πŸ’Ώ Cache": "❔ Queries" + "πŸ—„οΈServer" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "🐟 Catch" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "🐟 Catch" |o..o| "πŸ‘₯ Peer": "πŸ”Œ WS" + "🐟 Catch" |o..o| "πŸ“€ Transmitter": "βœ‰οΈ Sync packet" + "πŸ’Ώ Cache" |o..o| "πŸ“€ Transmitter": "βœ‰οΈ Sync packet" + "πŸ‘‚ fListen" |o..o| "πŸ’Ώ Cache": "πŸ‘‚ Listen for completed messages" + "πŸ‘‚ fListen" |o..o| "πŸ‘₯ Peer": "πŸ”Œ WS" + "πŸ“€ Transmitter" |o..o| "πŸ”½ onReceive": "βœ‰οΈ Get packet" + "πŸ”½ onReceive" |o..o| "🧽 Sieve": "🧽 Filter packet" + "🧽 Sieve" |o..o| "πŸ’Ώ Cache": "βž• Push completed messages" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» Send" + "πŸ“» PierMesh" |o..o| "πŸ”½ onReceive": "πŸ”½ Receive" diff --git a/src/webui/diagrams/markdown/sieve.mmd b/src/webui/diagrams/markdown/sieve.mmd new file mode 100644 index 00000000..e69de29b diff --git a/src/webui/diagrams/markdown/transmission.mmd b/src/webui/diagrams/markdown/transmission.mmd new file mode 100644 index 00000000..f946aa65 --- /dev/null +++ b/src/webui/diagrams/markdown/transmission.mmd @@ -0,0 +1,5 @@ +--- +title: "πŸ“€ Transmitter" +--- +erDiagram + diff --git a/src/webui/diagrams/renders/dia.png b/src/webui/diagrams/renders/dia.png new file mode 100755 index 00000000..c2a24d08 Binary files /dev/null and b/src/webui/diagrams/renders/dia.png differ diff --git a/src/webui/renderdia.sh b/src/webui/renderdia.sh new file mode 100755 index 00000000..468aa286 --- /dev/null +++ b/src/webui/renderdia.sh @@ -0,0 +1 @@ +mmdc -i res/misc/dia.mmd -o res/misc/dia.png diff --git a/src/webui/res/css/fonts.css b/src/webui/res/css/fonts.css new file mode 100755 index 00000000..699ae14b --- /dev/null +++ b/src/webui/res/css/fonts.css @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Ubuntu Nerd Font'; + src: url('/res/fonts/UbuntuNF.eot'); + src: url('/res/fonts/UbuntuNF.eot?#iefix') format('embedded-opentype'), + url('/res/fonts/UbuntuNF.woff2') format('woff2'), + url('/res/fonts/UbuntuNF.woff') format('woff'); + font-weight: normal; + font-style: normal; + font-display: swap; +} diff --git a/src/webui/res/css/style.css b/src/webui/res/css/style.css new file mode 100755 index 00000000..8279db36 --- /dev/null +++ b/src/webui/res/css/style.css @@ -0,0 +1,37 @@ +:root { + --palette-text-white: #FFFFFF; + --palette-text-black: #000000; + --palette-text-three: #3A424D; + --palette-text-four: #5B8080; + + --palette-one: #3A4D24; + --palette-two: #A6B08E; + --palette-three: #879B77; + --palette-four: #61805B; +} + +html { + background-color: var(--palette-one); + color: var(--palette-text-white); + font-family: 'Ubuntu Nerd Font'; + padding: 10px; +} + +.plank { + padding: 10px; + background-color: var(--palette-two); +} + +ul { + padding: 0; + list-style-type: none !important; +} + +li { + padding-top: 5px; +} + +input[type=text], +input[type=number] { + min-width: 150px; +} diff --git a/src/webui/res/diagrams/bubble.mmd b/src/webui/res/diagrams/bubble.mmd new file mode 100644 index 00000000..1f8cfdb0 --- /dev/null +++ b/src/webui/res/diagrams/bubble.mmd @@ -0,0 +1,13 @@ +--- +title: "πŸ”΅ Bubble" +--- +erDiagram + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server" : "πŸ”Œ WS" + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ“„ HTTP/S" + "πŸ—„οΈ Server" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» send" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» onReceive" + "πŸ“€ Transmitter" |o..o| "🧽 Sieve": "πŸ“» onReceive" + "🧽 Sieve" |o..o| "πŸ’Ώ Cache": "βž• Write" + "πŸ’Ώ Cache" |o..o| "πŸ‘‚ fListen": "βž• Write event" + "πŸ‘‚ fListen" |o..o| "πŸ—„οΈ Server": "βœ‰οΈ Pass message" diff --git a/src/webui/res/diagrams/catch.mmd b/src/webui/res/diagrams/catch.mmd new file mode 100644 index 00000000..e432c321 --- /dev/null +++ b/src/webui/res/diagrams/catch.mmd @@ -0,0 +1,16 @@ +--- +title: "🐟 Catch" +--- +erDiagram + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ”Œ WS" + "πŸ‘₯ Peer" |{..o| "πŸ—„οΈ Server": "πŸ“„ HTTP/S" + "πŸ—„οΈ Server" |o..o| "🐟 Catch": "❔ Queries" + "πŸ“» PierMesh" |o..o| "🧽 Sieve": "🧽 Filters" + "🧽 Sieve" |o..o| "πŸ‘‚ fListen": "πŸ‘‚ Listens for messages" + "πŸ‘‚ fListen" |o..o| "🐟 Catch": "❔ Queries" + "🐟 Catch" |o..}| "🌼 Daisy": "πŸ“„ Store references" + "🌼 Daisy" { + string filepath + dictionary msg + } + "🌼 Daisy" |o..o| "πŸ“ File system": "πŸ“ CRUD" diff --git a/src/webui/res/diagrams/daisy.mmd b/src/webui/res/diagrams/daisy.mmd new file mode 100644 index 00000000..2fb18b82 --- /dev/null +++ b/src/webui/res/diagrams/daisy.mmd @@ -0,0 +1,5 @@ +--- +title: "🌼 Daisy" +--- +erDiagram + diff --git a/src/webui/res/diagrams/microplane.mmd b/src/webui/res/diagrams/microplane.mmd new file mode 100644 index 00000000..e69de29b diff --git a/src/webui/res/diagrams/overview.mmd b/src/webui/res/diagrams/overview.mmd new file mode 100755 index 00000000..6f282365 --- /dev/null +++ b/src/webui/res/diagrams/overview.mmd @@ -0,0 +1,20 @@ +--- +title: "πŸ“» PierMesh" +--- +erDiagram + "πŸ‘₯ Peer" }|..|{ "πŸ—„οΈServer" : "πŸ”Œ WS" + "πŸ‘₯ Peer" }|..|{ "πŸ—„οΈServer": "πŸ“„ HTTP/S" + "πŸ—„οΈServer" |o..o| "🐟 Catch": "❔ Queries" + "πŸ—„οΈServer" |o..o| "πŸ’Ώ Cache": "❔ Queries" + "πŸ—„οΈServer" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "🐟 Catch" |o..o| "πŸ“€ Transmitter": "❔ Queries" + "🐟 Catch" |o..o| "πŸ‘₯ Peer": "πŸ”Œ WS" + "🐟 Catch" |o..o| "πŸ“€ Transmitter": "βœ‰οΈ Sync packet" + "πŸ’Ώ Cache" |o..o| "πŸ“€ Transmitter": "βœ‰οΈ Sync packet" + "πŸ‘‚ fListen" |o..o| "πŸ’Ώ Cache": "πŸ‘‚ Listen for completed messages" + "πŸ‘‚ fListen" |o..o| "πŸ‘₯ Peer": "πŸ”Œ WS" + "πŸ“€ Transmitter" |o..o| "πŸ”½ onReceive": "βœ‰οΈ Get packet" + "πŸ”½ onReceive" |o..o| "🧽 Sieve": "🧽 Filter packet" + "🧽 Sieve" |o..o| "πŸ’Ώ Cache": "βž• Push completed messages" + "πŸ“€ Transmitter" |o..o| "πŸ“» PierMesh": "πŸ“» Send" + "πŸ“» PierMesh" |o..o| "πŸ”½ onReceive": "πŸ”½ Receive" diff --git a/src/webui/res/diagrams/sieve.mmd b/src/webui/res/diagrams/sieve.mmd new file mode 100644 index 00000000..e69de29b diff --git a/src/webui/res/diagrams/transmission.mmd b/src/webui/res/diagrams/transmission.mmd new file mode 100644 index 00000000..f946aa65 --- /dev/null +++ b/src/webui/res/diagrams/transmission.mmd @@ -0,0 +1,5 @@ +--- +title: "πŸ“€ Transmitter" +--- +erDiagram + diff --git a/src/webui/res/fonts/UbuntuNF.eot b/src/webui/res/fonts/UbuntuNF.eot new file mode 100755 index 00000000..157496ab Binary files /dev/null and b/src/webui/res/fonts/UbuntuNF.eot differ diff --git a/src/webui/res/fonts/UbuntuNF.woff b/src/webui/res/fonts/UbuntuNF.woff new file mode 100755 index 00000000..6d9dfd24 Binary files /dev/null and b/src/webui/res/fonts/UbuntuNF.woff differ diff --git a/src/webui/res/fonts/UbuntuNF.woff2 b/src/webui/res/fonts/UbuntuNF.woff2 new file mode 100755 index 00000000..408e05bb Binary files /dev/null and b/src/webui/res/fonts/UbuntuNF.woff2 differ diff --git a/src/webui/res/fonts/UbuntuNerdFont-Regular.ttf b/src/webui/res/fonts/UbuntuNerdFont-Regular.ttf new file mode 100755 index 00000000..87e8e42f Binary files /dev/null and b/src/webui/res/fonts/UbuntuNerdFont-Regular.ttf differ diff --git a/src/webui/res/img/bubbledisplay.png b/src/webui/res/img/bubbledisplay.png new file mode 100644 index 00000000..490eaadc Binary files /dev/null and b/src/webui/res/img/bubbledisplay.png differ diff --git a/src/webui/res/img/catchdisplay.png b/src/webui/res/img/catchdisplay.png new file mode 100644 index 00000000..407a809c Binary files /dev/null and b/src/webui/res/img/catchdisplay.png differ diff --git a/src/webui/res/img/diagrams/bubble.png b/src/webui/res/img/diagrams/bubble.png new file mode 100644 index 00000000..5eb6b949 Binary files /dev/null and b/src/webui/res/img/diagrams/bubble.png differ diff --git a/src/webui/res/img/diagrams/catch.png b/src/webui/res/img/diagrams/catch.png new file mode 100644 index 00000000..68236cb5 Binary files /dev/null and b/src/webui/res/img/diagrams/catch.png differ diff --git a/src/webui/res/img/diagrams/daisy.png b/src/webui/res/img/diagrams/daisy.png new file mode 100644 index 00000000..32f95c3a Binary files /dev/null and b/src/webui/res/img/diagrams/daisy.png differ diff --git a/src/webui/res/img/diagrams/overview.png b/src/webui/res/img/diagrams/overview.png new file mode 100644 index 00000000..c2a24d08 Binary files /dev/null and b/src/webui/res/img/diagrams/overview.png differ diff --git a/src/webui/res/img/diagrams/transmission.png b/src/webui/res/img/diagrams/transmission.png new file mode 100644 index 00000000..bd729bbc Binary files /dev/null and b/src/webui/res/img/diagrams/transmission.png differ diff --git a/src/webui/res/img/logo.png b/src/webui/res/img/logo.png new file mode 100644 index 00000000..3b83d0ca Binary files /dev/null and b/src/webui/res/img/logo.png differ diff --git a/src/webui/res/js/buildmodelviewer b/src/webui/res/js/buildmodelviewer new file mode 100644 index 00000000..7c2d180c --- /dev/null +++ b/src/webui/res/js/buildmodelviewer @@ -0,0 +1 @@ +npx vite build diff --git a/src/webui/res/js/package-lock.json b/src/webui/res/js/package-lock.json new file mode 100755 index 00000000..0bda9c7f --- /dev/null +++ b/src/webui/res/js/package-lock.json @@ -0,0 +1,815 @@ +{ + "name": "piermesh", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "piermesh", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "htmx.org": "2.0.0", + "three": "^0.166.1" + }, + "devDependencies": { + "vite": "^5.3.4" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.0.tgz", + "integrity": "sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.0.tgz", + "integrity": "sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.0.tgz", + "integrity": "sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.0.tgz", + "integrity": "sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.0.tgz", + "integrity": "sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.0.tgz", + "integrity": "sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.0.tgz", + "integrity": "sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.0.tgz", + "integrity": "sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.0.tgz", + "integrity": "sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.0.tgz", + "integrity": "sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.0.tgz", + "integrity": "sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.0.tgz", + "integrity": "sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.0.tgz", + "integrity": "sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.0.tgz", + "integrity": "sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.0.tgz", + "integrity": "sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz", + "integrity": "sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "node_modules/esbuild": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/htmx.org": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.0.tgz", + "integrity": "sha512-N0r1VjrqeCpig0mTi2/sooDZBeQlp1RBohnWQ/ufqc7ICaI0yjs04fNGhawm6+/HWhJFlcXn8MqOjWI9QGG2lQ==" + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, + "node_modules/postcss": { + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.1", + "source-map-js": "^1.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/rollup": { + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.19.0.tgz", + "integrity": "sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==", + "dev": true, + "dependencies": { + "@types/estree": "1.0.5" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.19.0", + "@rollup/rollup-android-arm64": "4.19.0", + "@rollup/rollup-darwin-arm64": "4.19.0", + "@rollup/rollup-darwin-x64": "4.19.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.19.0", + "@rollup/rollup-linux-arm-musleabihf": "4.19.0", + "@rollup/rollup-linux-arm64-gnu": "4.19.0", + "@rollup/rollup-linux-arm64-musl": "4.19.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.19.0", + "@rollup/rollup-linux-riscv64-gnu": "4.19.0", + "@rollup/rollup-linux-s390x-gnu": "4.19.0", + "@rollup/rollup-linux-x64-gnu": "4.19.0", + "@rollup/rollup-linux-x64-musl": "4.19.0", + "@rollup/rollup-win32-arm64-msvc": "4.19.0", + "@rollup/rollup-win32-ia32-msvc": "4.19.0", + "@rollup/rollup-win32-x64-msvc": "4.19.0", + "fsevents": "~2.3.2" + } + }, + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/three": { + "version": "0.166.1", + "resolved": "https://registry.npmjs.org/three/-/three-0.166.1.tgz", + "integrity": "sha512-LtuafkKHHzm61AQA1be2MAYIw1IjmhOUxhBa0prrLpEMWbV7ijvxCRHjSgHPGp2493wLBzwKV46tA9nivLEgKg==" + }, + "node_modules/vite": { + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz", + "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==", + "dev": true, + "dependencies": { + "esbuild": "^0.21.3", + "postcss": "^8.4.39", + "rollup": "^4.13.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || >=20.0.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + } + } +} diff --git a/src/webui/res/js/package.json b/src/webui/res/js/package.json new file mode 100755 index 00000000..e852c331 --- /dev/null +++ b/src/webui/res/js/package.json @@ -0,0 +1,18 @@ +{ + "name": "piermesh", + "version": "1.0.0", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "description": "", + "dependencies": { + "htmx.org": "2.0.0", + "three": "^0.166.1" + }, + "devDependencies": { + "vite": "^5.3.4" + } +} diff --git a/src/webui/res/js/ws.js b/src/webui/res/js/ws.js new file mode 100755 index 00000000..be1f08db --- /dev/null +++ b/src/webui/res/js/ws.js @@ -0,0 +1,467 @@ +/* +WebSockets Extension +============================ +This extension adds support for WebSockets to htmx. See /www/extensions/ws.md for usage instructions. +*/ + +(function() { + /** @type {import("../htmx").HtmxInternalApi} */ + var api + + htmx.defineExtension('ws', { + + /** + * init is called once, when this extension is first registered. + * @param {import("../htmx").HtmxInternalApi} apiRef + */ + init: function(apiRef) { + // Store reference to internal API + api = apiRef + + // Default function for creating new EventSource objects + if (!htmx.createWebSocket) { + htmx.createWebSocket = createWebSocket + } + + // Default setting for reconnect delay + if (!htmx.config.wsReconnectDelay) { + htmx.config.wsReconnectDelay = 'full-jitter' + } + }, + + /** + * onEvent handles all events passed to this extension. + * + * @param {string} name + * @param {Event} evt + */ + onEvent: function(name, evt) { + var parent = evt.target || evt.detail.elt + switch (name) { + // Try to close the socket when elements are removed + case 'htmx:beforeCleanupElement': + + var internalData = api.getInternalData(parent) + + if (internalData.webSocket) { + internalData.webSocket.close() + } + return + + // Try to create websockets when elements are processed + case 'htmx:beforeProcessNode': + + forEach(queryAttributeOnThisOrChildren(parent, 'ws-connect'), function(child) { + ensureWebSocket(child) + }) + forEach(queryAttributeOnThisOrChildren(parent, 'ws-send'), function(child) { + ensureWebSocketSend(child) + }) + } + } + }) + + function splitOnWhitespace(trigger) { + return trigger.trim().split(/\s+/) + } + + function getLegacyWebsocketURL(elt) { + var legacySSEValue = api.getAttributeValue(elt, 'hx-ws') + if (legacySSEValue) { + var values = splitOnWhitespace(legacySSEValue) + for (var i = 0; i < values.length; i++) { + var value = values[i].split(/:(.+)/) + if (value[0] === 'connect') { + return value[1] + } + } + } + } + + /** + * ensureWebSocket creates a new WebSocket on the designated element, using + * the element's "ws-connect" attribute. + * @param {HTMLElement} socketElt + * @returns + */ + function ensureWebSocket(socketElt) { + // If the element containing the WebSocket connection no longer exists, then + // do not connect/reconnect the WebSocket. + if (!api.bodyContains(socketElt)) { + return + } + + // Get the source straight from the element's value + var wssSource = api.getAttributeValue(socketElt, 'ws-connect') + + if (wssSource == null || wssSource === '') { + var legacySource = getLegacyWebsocketURL(socketElt) + if (legacySource == null) { + return + } else { + wssSource = legacySource + } + } + + // Guarantee that the wssSource value is a fully qualified URL + if (wssSource.indexOf('/') === 0) { + var base_part = location.hostname + (location.port ? ':' + location.port : '') + if (location.protocol === 'https:') { + wssSource = 'wss://' + base_part + wssSource + } else if (location.protocol === 'http:') { + wssSource = 'ws://' + base_part + wssSource + } + } + + var socketWrapper = createWebsocketWrapper(socketElt, function() { + return htmx.createWebSocket(wssSource) + }) + + socketWrapper.addEventListener('message', function(event) { + if (maybeCloseWebSocketSource(socketElt)) { + return + } + + var response = event.data + if (!api.triggerEvent(socketElt, 'htmx:wsBeforeMessage', { + message: response, + socketWrapper: socketWrapper.publicInterface + })) { + return + } + + api.withExtensions(socketElt, function(extension) { + response = extension.transformResponse(response, null, socketElt) + }) + + var settleInfo = api.makeSettleInfo(socketElt) + var fragment = api.makeFragment(response) + + if (fragment.children.length) { + var children = Array.from(fragment.children) + for (var i = 0; i < children.length; i++) { + api.oobSwap(api.getAttributeValue(children[i], 'hx-swap-oob') || 'true', children[i], settleInfo) + } + } + + api.settleImmediately(settleInfo.tasks) + api.triggerEvent(socketElt, 'htmx:wsAfterMessage', { message: response, socketWrapper: socketWrapper.publicInterface }) + }) + + // Put the WebSocket into the HTML Element's custom data. + api.getInternalData(socketElt).webSocket = socketWrapper + } + + /** + * @typedef {Object} WebSocketWrapper + * @property {WebSocket} socket + * @property {Array<{message: string, sendElt: Element}>} messageQueue + * @property {number} retryCount + * @property {(message: string, sendElt: Element) => void} sendImmediately sendImmediately sends message regardless of websocket connection state + * @property {(message: string, sendElt: Element) => void} send + * @property {(event: string, handler: Function) => void} addEventListener + * @property {() => void} handleQueuedMessages + * @property {() => void} init + * @property {() => void} close + */ + /** + * + * @param socketElt + * @param socketFunc + * @returns {WebSocketWrapper} + */ + function createWebsocketWrapper(socketElt, socketFunc) { + var wrapper = { + socket: null, + messageQueue: [], + retryCount: 0, + + /** @type {Object} */ + events: {}, + + addEventListener: function(event, handler) { + if (this.socket) { + this.socket.addEventListener(event, handler) + } + + if (!this.events[event]) { + this.events[event] = [] + } + + this.events[event].push(handler) + }, + + sendImmediately: function(message, sendElt) { + if (!this.socket) { + api.triggerErrorEvent() + } + if (!sendElt || api.triggerEvent(sendElt, 'htmx:wsBeforeSend', { + message, + socketWrapper: this.publicInterface + })) { + this.socket.send(message) + sendElt && api.triggerEvent(sendElt, 'htmx:wsAfterSend', { + message, + socketWrapper: this.publicInterface + }) + } + }, + + send: function(message, sendElt) { + if (this.socket.readyState !== this.socket.OPEN) { + this.messageQueue.push({ message, sendElt }) + } else { + this.sendImmediately(message, sendElt) + } + }, + + handleQueuedMessages: function() { + while (this.messageQueue.length > 0) { + var queuedItem = this.messageQueue[0] + if (this.socket.readyState === this.socket.OPEN) { + this.sendImmediately(queuedItem.message, queuedItem.sendElt) + this.messageQueue.shift() + } else { + break + } + } + }, + + init: function() { + if (this.socket && this.socket.readyState === this.socket.OPEN) { + // Close discarded socket + this.socket.close() + } + + // Create a new WebSocket and event handlers + /** @type {WebSocket} */ + var socket = socketFunc() + + // The event.type detail is added for interface conformance with the + // other two lifecycle events (open and close) so a single handler method + // can handle them polymorphically, if required. + api.triggerEvent(socketElt, 'htmx:wsConnecting', { event: { type: 'connecting' } }) + + this.socket = socket + + socket.onopen = function(e) { + wrapper.retryCount = 0 + api.triggerEvent(socketElt, 'htmx:wsOpen', { event: e, socketWrapper: wrapper.publicInterface }) + wrapper.handleQueuedMessages() + } + + socket.onclose = function(e) { + // If socket should not be connected, stop further attempts to establish connection + // If Abnormal Closure/Service Restart/Try Again Later, then set a timer to reconnect after a pause. + if (!maybeCloseWebSocketSource(socketElt) && [1006, 1012, 1013].indexOf(e.code) >= 0) { + var delay = getWebSocketReconnectDelay(wrapper.retryCount) + setTimeout(function() { + wrapper.retryCount += 1 + wrapper.init() + }, delay) + } + + // Notify client code that connection has been closed. Client code can inspect `event` field + // to determine whether closure has been valid or abnormal + api.triggerEvent(socketElt, 'htmx:wsClose', { event: e, socketWrapper: wrapper.publicInterface }) + } + + socket.onerror = function(e) { + api.triggerErrorEvent(socketElt, 'htmx:wsError', { error: e, socketWrapper: wrapper }) + maybeCloseWebSocketSource(socketElt) + } + + var events = this.events + Object.keys(events).forEach(function(k) { + events[k].forEach(function(e) { + socket.addEventListener(k, e) + }) + }) + }, + + close: function() { + this.socket.close() + } + } + + wrapper.init() + + wrapper.publicInterface = { + send: wrapper.send.bind(wrapper), + sendImmediately: wrapper.sendImmediately.bind(wrapper), + queue: wrapper.messageQueue + } + + return wrapper + } + + /** + * ensureWebSocketSend attaches trigger handles to elements with + * "ws-send" attribute + * @param {HTMLElement} elt + */ + function ensureWebSocketSend(elt) { + var legacyAttribute = api.getAttributeValue(elt, 'hx-ws') + if (legacyAttribute && legacyAttribute !== 'send') { + return + } + + var webSocketParent = api.getClosestMatch(elt, hasWebSocket) + processWebSocketSend(webSocketParent, elt) + } + + /** + * hasWebSocket function checks if a node has webSocket instance attached + * @param {HTMLElement} node + * @returns {boolean} + */ + function hasWebSocket(node) { + return api.getInternalData(node).webSocket != null + } + + /** + * processWebSocketSend adds event listeners to the
element so that + * messages can be sent to the WebSocket server when the form is submitted. + * @param {HTMLElement} socketElt + * @param {HTMLElement} sendElt + */ + function processWebSocketSend(socketElt, sendElt) { + var nodeData = api.getInternalData(sendElt) + var triggerSpecs = api.getTriggerSpecs(sendElt) + triggerSpecs.forEach(function(ts) { + api.addTriggerHandler(sendElt, ts, nodeData, function(elt, evt) { + if (maybeCloseWebSocketSource(socketElt)) { + return + } + + /** @type {WebSocketWrapper} */ + var socketWrapper = api.getInternalData(socketElt).webSocket + var headers = api.getHeaders(sendElt, api.getTarget(sendElt)) + var results = api.getInputValues(sendElt, 'post') + var errors = results.errors + var rawParameters = Object.assign({}, results.values) + var expressionVars = api.getExpressionVars(sendElt) + var allParameters = api.mergeObjects(rawParameters, expressionVars) + var filteredParameters = api.filterValues(allParameters, sendElt) + + var sendConfig = { + parameters: filteredParameters, + unfilteredParameters: allParameters, + headers, + errors, + + triggeringEvent: evt, + messageBody: undefined, + socketWrapper: socketWrapper.publicInterface + } + + if (!api.triggerEvent(elt, 'htmx:wsConfigSend', sendConfig)) { + return + } + + if (errors && errors.length > 0) { + api.triggerEvent(elt, 'htmx:validation:halted', errors) + return + } + + var body = sendConfig.messageBody + if (body === undefined) { + var toSend = Object.assign({}, sendConfig.parameters) + if (sendConfig.headers) { toSend.HEADERS = headers } + body = JSON.stringify(toSend) + } + + socketWrapper.send(body, elt) + + if (evt && api.shouldCancel(evt, elt)) { + evt.preventDefault() + } + }) + }) + } + + /** + * getWebSocketReconnectDelay is the default easing function for WebSocket reconnects. + * @param {number} retryCount // The number of retries that have already taken place + * @returns {number} + */ + function getWebSocketReconnectDelay(retryCount) { + /** @type {"full-jitter" | ((retryCount:number) => number)} */ + var delay = htmx.config.wsReconnectDelay + if (typeof delay === 'function') { + return delay(retryCount) + } + if (delay === 'full-jitter') { + var exp = Math.min(retryCount, 6) + var maxDelay = 1000 * Math.pow(2, exp) + return maxDelay * Math.random() + } + + logError('htmx.config.wsReconnectDelay must either be a function or the string "full-jitter"') + } + + /** + * maybeCloseWebSocketSource checks to the if the element that created the WebSocket + * still exists in the DOM. If NOT, then the WebSocket is closed and this function + * returns TRUE. If the element DOES EXIST, then no action is taken, and this function + * returns FALSE. + * + * @param {*} elt + * @returns + */ + function maybeCloseWebSocketSource(elt) { + if (!api.bodyContains(elt)) { + api.getInternalData(elt).webSocket.close() + return true + } + return false + } + + /** + * createWebSocket is the default method for creating new WebSocket objects. + * it is hoisted into htmx.createWebSocket to be overridden by the user, if needed. + * + * @param {string} url + * @returns WebSocket + */ + function createWebSocket(url) { + var sock = new WebSocket(url, []) + sock.binaryType = htmx.config.wsBinaryType + return sock + } + + /** + * queryAttributeOnThisOrChildren returns all nodes that contain the requested attributeName, INCLUDING THE PROVIDED ROOT ELEMENT. + * + * @param {HTMLElement} elt + * @param {string} attributeName + */ + function queryAttributeOnThisOrChildren(elt, attributeName) { + var result = [] + + // If the parent element also contains the requested attribute, then add it to the results too. + if (api.hasAttribute(elt, attributeName) || api.hasAttribute(elt, 'hx-ws')) { + result.push(elt) + } + + // Search all child nodes that match the requested attribute + elt.querySelectorAll('[' + attributeName + '], [data-' + attributeName + '], [data-hx-ws], [hx-ws]').forEach(function(node) { + result.push(node) + }) + + return result + } + + /** + * @template T + * @param {T[]} arr + * @param {(T) => void} func + */ + function forEach(arr, func) { + if (arr) { + for (var i = 0; i < arr.length; i++) { + func(arr[i]) + } + } + } +})() diff --git a/src/webui/serve.py b/src/webui/serve.py new file mode 100755 index 00000000..1b4f883b --- /dev/null +++ b/src/webui/serve.py @@ -0,0 +1,129 @@ +from microdot import Microdot +from microdot import send_file +from microdot.websocket import with_websocket +import random, json, time, msgpack +import logging +from microdot import Request + +Request.max_content_length = 1024 * 1024 * 8 +Request.max_body_length = 1024 * 1024 * 8 +Request.max_readline = 1024 * 1024 + + +class Server: + def __init__(self, transmitter, catch, onodeID, network, cLog): + self.cLog = cLog + self.t = transmitter + self.network = network + self.network.addLookup(onodeID, self.t.interface.localNode.nodeNum) + self.nodeID = str(onodeID) + self.peerIDs = {} + self.app = Microdot() + self.catch = catch + self.nmap = {self.nodeID: self.t.interface.localNode.nodeNum} + # self.cLog(20, "Initialized server") + + @self.app.route("/res/") + async def static(request, path): + if ".." in path: + # directory traversal is not allowed + return "Not found", 404 + return send_file("webui/build/res/" + path, max_age=86400) + + @self.app.route("/bubble") + @with_websocket + async def bubble(request, ws): + while True: + r = await ws.receive() + message = json.loads(r) + trigger = message["HEADERS"]["HX-Trigger"] + # TODO: Drop old id from cache on regen + if trigger == "gpID": + peerID = str(random.randrange(0, 1000000)).zfill(6) + await ws.send( + """ +

Peer ID: {0}

+ """.format( + peerID + ) + ) + await ws.send( + """ + + """.format( + peerID + ) + ) + await ws.send( + """ +

Node ID: {0}

+ """.format( + self.nodeID + ) + ) + await ws.send( + """ """.format( + self.nodeID + ) + ) + await ws.send( + "".format( + peerID + ) + ) + await ws.send( + "".format( + peerID + ) + ) + peer = {"usedLast": round(time.time() * 1000), "ws": ws} + self.peerIDs[peerID] = peer + elif trigger == "bubble": + sender = message["bID"] + data = message["chat_message"] + # TODO: Setting sender name id + # senderName = message["senderID"] + senderName = 000000 + recipient = message["recipientID"] + recipientNode = message["recipientNode"] + await self.t.addPackets( + msgpack.dumps({"data": data}), + sender, + senderName, + recipient, + int(recipientNode), + directID=self.network.doLookup(recipientNode), + packetsClass=2, + ) + elif trigger == "catch": + res = self.catch.get(message["head"], message["body"]) + await ws.send('
{0}
'.format(res)) + # TODO: Catch update packets + # DONE: Shared catch/cache objects + elif trigger == "catchEdit": + self.catch.addc( + message["eID"], + self.nodeID, + message["sep"], + message["head"], + message["body"], + {"html": message["catchContent"]}, + ) + await ws.send( + """ +
  • OK
+ """ + ) + else: + await ws.send( + """
hi
""" + ) + + @self.app.route("/") + async def index(request): + return send_file("webui/build/index/index.html") + + async def sendToPeer(self, peerID, data): + await self.peerIDs[peerID]["ws"].send( + "
  • {0}
".format(data) + ) diff --git a/src/webui/templates/index/index.html b/src/webui/templates/index/index.html new file mode 100755 index 00000000..b5dc5ac9 --- /dev/null +++ b/src/webui/templates/index/index.html @@ -0,0 +1,22 @@ +{% extends "shared/base.html" %} +{% block body %} + +PierMesh logo +
+
+{% include "shared/catch.nav.html" %} +
+{% include "shared/catch.editor.html" %} +
+
+
+
+

Peer ID:

+ +

Node ID:

+ + +
+
+{% include "shared/messenger.html" %} +{% endblock %} diff --git a/src/webui/templates/shared/base.html b/src/webui/templates/shared/base.html new file mode 100755 index 00000000..054866e5 --- /dev/null +++ b/src/webui/templates/shared/base.html @@ -0,0 +1,21 @@ + + + + + + + {{ title }} + + + + + + + + {% include "shared/nav.html" %} + {% block body %} + {% endblock %} + + + diff --git a/src/webui/templates/shared/catch.editor.html b/src/webui/templates/shared/catch.editor.html new file mode 100644 index 00000000..c575d5f5 --- /dev/null +++ b/src/webui/templates/shared/catch.editor.html @@ -0,0 +1,23 @@ +
+ +
+ Catch publisher
+
    +
+ + Head

+ Seperator

+ Body

+ Fins
+
    +
    • +
    • +
+ Content +
+ +
+ + + +
diff --git a/src/webui/templates/shared/catch.html b/src/webui/templates/shared/catch.html new file mode 100644 index 00000000..69e5bf25 --- /dev/null +++ b/src/webui/templates/shared/catch.html @@ -0,0 +1 @@ +
diff --git a/src/webui/templates/shared/catch.nav.html b/src/webui/templates/shared/catch.nav.html new file mode 100755 index 00000000..b087f9f5 --- /dev/null +++ b/src/webui/templates/shared/catch.nav.html @@ -0,0 +1,31 @@ +
+ +
+ Catch

+
+ +
+ +
+ +
+
+ +
+ +
    + Fins: +
  • + +
    • +
  • + +
    • +
+ +
+ Results: +
+ {% include "shared/catch.html" %} +
+
diff --git a/src/webui/templates/shared/messenger.html b/src/webui/templates/shared/messenger.html new file mode 100755 index 00000000..39a8ad5d --- /dev/null +++ b/src/webui/templates/shared/messenger.html @@ -0,0 +1,20 @@ +
+ +
+ Bubble +
+
+ Responses:
    +
+
+
+ Peer ID:
+
+ Node ID:
+
+ Data
+
+ + +
+
diff --git a/src/webui/templates/shared/nav.html b/src/webui/templates/shared/nav.html new file mode 100755 index 00000000..8b137891 --- /dev/null +++ b/src/webui/templates/shared/nav.html @@ -0,0 +1 @@ +