diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0ad25db..0000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 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 Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - 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 AGPL, see -. diff --git a/Readme.md b/Readme.md index 1d99b6f..71cd940 100644 --- a/Readme.md +++ b/Readme.md @@ -113,6 +113,3 @@ It basically sends: app version, processor architecture, operating system, used Even though the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52) -## License - -[AGPL 3](./LICENSE) diff --git a/Readme.tpl.md b/Readme.tpl.md index 68ed0e3..34ac79e 100644 --- a/Readme.tpl.md +++ b/Readme.tpl.md @@ -113,6 +113,3 @@ It basically sends: app version, processor architecture, operating system, used Even though the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52) -## License - -[AGPL 3](./LICENSE) diff --git a/app/src/App.tsx b/app/src/App.tsx index c99aff0..3ac8941 100644 --- a/app/src/App.tsx +++ b/app/src/App.tsx @@ -33,10 +33,6 @@ class App extends React.PureComponent { this.state = { } } - public componentDidMount() { - this.props.settingsActions.loadSettings() - } - private renderError() { if (this.props.error) { const error = typeof this.props.error === 'string' ? this.props.error : JSON.stringify(this.props.error) @@ -49,6 +45,10 @@ class App extends React.PureComponent { } } + public componentDidMount() { + this.props.settingsActions.loadSettings() + } + public render() { const { settingsVisible } = this.props const { content, contentShift, centerContent, paneDefaults, heightProperty } = this.props.classes diff --git a/app/src/ErrorBoundary.tsx b/app/src/ErrorBoundary.tsx index 245cf87..72d6392 100644 --- a/app/src/ErrorBoundary.tsx +++ b/app/src/ErrorBoundary.tsx @@ -21,19 +21,14 @@ interface Props { } class ErrorBoundary extends React.Component { - constructor(props: Props) { - super(props) - this.state = {} - } - - public componentDidCatch(error: Error, errorInfo: any) { - electronRendererTelementry.trackError(error) - console.log('did catch', error) - } public static getDerivedStateFromError(error: Error) { return { error } } + constructor(props: Props) { + super(props) + this.state = {} + } private restart = () => { window.location = window.location @@ -44,6 +39,11 @@ class ErrorBoundary extends React.Component { window.location = window.location } + public componentDidCatch(error: Error, errorInfo: any) { + electronRendererTelementry.trackError(error) + console.log('did catch', error) + } + public render() { if (!this.state.error) { return this.props.children diff --git a/app/src/UpdateNotifier.tsx b/app/src/UpdateNotifier.tsx index a5ce061..fa84f61 100644 --- a/app/src/UpdateNotifier.tsx +++ b/app/src/UpdateNotifier.tsx @@ -102,15 +102,6 @@ class UpdateNotifier extends React.Component { this.props.actions.showUpdateDetails(false) } - public render() { - return ( -
- {this.renderUpdateNotification()} - {this.renderUpdateDetails()} -
- ) - } - private renderUpdateNotification() { const snackbarAnchor: any = { vertical: 'top', @@ -207,7 +198,7 @@ class UpdateNotifier extends React.Component { private renderDownloads() { const latestUpdate = this.state.newerVersions[0] - if (!latestUpdate || !latestUpdate.assets) { + if (!latestUpdate || !latestUpdate.assets) { return null } @@ -224,6 +215,15 @@ class UpdateNotifier extends React.Component { )) } + + public render() { + return ( +
+ {this.renderUpdateNotification()} + {this.renderUpdateDetails()} +
+ ) + } } const styles = (theme: Theme) => ({ diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts index fa45134..10d2d22 100644 --- a/app/src/actions/ConnectionManager.ts +++ b/app/src/actions/ConnectionManager.ts @@ -70,7 +70,7 @@ async function openCertificate(): Promise { return } - if (data.length > 16_384 || data.length < 128) { + if (data.length > 16_384 || data.length < 128) { reject(rejectReasons.certificateSizeDoesNotMatch) return } diff --git a/app/src/actions/Publish.ts b/app/src/actions/Publish.ts index 0e3bcfd..b432e62 100644 --- a/app/src/actions/Publish.ts +++ b/app/src/actions/Publish.ts @@ -4,7 +4,7 @@ import { Base64Message } from '../../../backend/src/Model/Base64Message' import { Dispatch } from 'redux' import { makePublishEvent, rendererEvents } from '../../../events' -export const setTopic = (topic?: string): Action => { +export const setTopic = (topic?: string): Action => { return { topic, type: ActionTypes.PUBLISH_SET_TOPIC, diff --git a/app/src/actions/Settings.ts b/app/src/actions/Settings.ts index e323a55..f5e4ffb 100644 --- a/app/src/actions/Settings.ts +++ b/app/src/actions/Settings.ts @@ -62,7 +62,7 @@ export const selectTopicWithMouseOver = (selectTopicWithMouseOver: boolean) => ( dispatch(storeSettings()) } -export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch, getState: () => AppState) => { +export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch, getState: () => AppState) => { dispatch({ valueRendererDisplayMode, type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE, @@ -100,7 +100,7 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch, get type: ActionTypes.SETTINGS_FILTER_TOPICS, }) - if (!filterStr || !tree) { + if (!filterStr || !tree) { dispatch(batchActions([setAutoExpandLimit(0), (showTree(tree) as any)])) return } diff --git a/app/src/actions/Tree.ts b/app/src/actions/Tree.ts index 8998d78..5689971 100644 --- a/app/src/actions/Tree.ts +++ b/app/src/actions/Tree.ts @@ -19,7 +19,7 @@ const debouncedSelectTopic = debounce((topic: q.TreeNode, dispat // Update publish topic let setTopicDispatch: any | undefined - if (selectedTopic && (selectedTopic.path() === getState().publish.topic || !getState().publish.topic)) { + if (selectedTopic && (selectedTopic.path() === getState().publish.topic || !getState().publish.topic)) { setTopicDispatch = setTopic(topic.path()) } diff --git a/app/src/components/BrokerStatistics.tsx b/app/src/components/BrokerStatistics.tsx index dc8bc22..22059bf 100644 --- a/app/src/components/BrokerStatistics.tsx +++ b/app/src/components/BrokerStatistics.tsx @@ -40,6 +40,15 @@ class BrokerStatistics extends React.Component { this.state = {} } + private renderPair(tree: q.Tree, a: Stats, b: Stats) { + return ( +
+
{this.renderStat(tree, a)}
+
{this.renderStat(tree, b)}
+
+ ) + } + public render() { const { tree, classes } = this.props if (!tree || !tree.findNode('$SYS/broker/clients/total')) { @@ -96,15 +105,6 @@ class BrokerStatistics extends React.Component { ) } - private renderPair(tree: q.Tree, a: Stats, b: Stats) { - return ( -
-
{this.renderStat(tree, a)}
-
{this.renderStat(tree, b)}
-
- ) - } - public renderStat(tree: q.Tree, stat: Stats) { const node = tree.findNode(stat.topic) if (!node || !node.message) { diff --git a/app/src/components/CodeDiff.tsx b/app/src/components/CodeDiff.tsx index f0cd545..a5d146c 100644 --- a/app/src/components/CodeDiff.tsx +++ b/app/src/components/CodeDiff.tsx @@ -19,44 +19,9 @@ class CodeDiff extends React.Component { super(props) } - public render() { - const changes = diff.diffLines(this.props.previous, this.props.current) - const styledLines = Prism.highlight(this.props.current, Prism.languages.json).split('\n') - - let lineNumber = 0 - const code = changes.map((change, key) => { - const hasStyledCode = change.removed !== true - const changedLines = change.count || 0 - if (hasStyledCode && this.props.language === 'json') { - const currentLines = styledLines.slice(lineNumber, lineNumber + changedLines) - const lines = currentLines.map((l, idx) => { - return
- }) - lineNumber += changedLines - - return
{lines}
- } - - return this.trimNewlineRight(change.value) - .split('\n') - .map((line, idx) => { - return
{line}
- }) - }) - - return ( -
- 
-          {code}
-
- {this.renderChangeAmount(changes)} -
- ) - } - private renderChangeAmount(changes: Diff.Change[]) { - const additions = changes.map(change => (change.added === true) ? (change.count || 0) : 0).reduce((a, b) => a + b) - const deletions = changes.map(change => (change.removed === true) ? (change.count || 0) : 0).reduce((a, b) => a + b) + const additions = changes.map(change => (change.added === true) ? (change.count || 0) : 0).reduce((a, b) => a + b) + const deletions = changes.map(change => (change.removed === true) ? (change.count || 0) : 0).reduce((a, b) => a + b) if (additions === 0 && deletions === 0) { return null } @@ -92,6 +57,41 @@ class CodeDiff extends React.Component { return this.props.classes.noChange } + + public render() { + const changes = diff.diffLines(this.props.previous, this.props.current) + const styledLines = Prism.highlight(this.props.current, Prism.languages.json).split('\n') + + let lineNumber = 0 + const code = changes.map((change, key) => { + const hasStyledCode = change.removed !== true + const changedLines = change.count || 0 + if (hasStyledCode && this.props.language === 'json') { + const currentLines = styledLines.slice(lineNumber, lineNumber + changedLines) + const lines = currentLines.map((l, idx) => { + return
+ }) + lineNumber += changedLines + + return
{lines}
+ } + + return this.trimNewlineRight(change.value) + .split('\n') + .map((line, idx) => { + return
{line}
+ }) + }) + + return ( +
+ 
+          {code}
+
+ {this.renderChangeAmount(changes)} +
+ ) + } } const style = (theme: Theme) => { diff --git a/app/src/components/ConnectionHealthIndicator.tsx b/app/src/components/ConnectionHealthIndicator.tsx index c7d7d85..8708565 100644 --- a/app/src/components/ConnectionHealthIndicator.tsx +++ b/app/src/components/ConnectionHealthIndicator.tsx @@ -41,7 +41,7 @@ class ConnectionHealthIndicator extends React.Component { public render() { const { classes, health, connected } = this.props - if (!health || !connected) { + if (!health || !connected) { return null } @@ -56,7 +56,7 @@ class ConnectionHealthIndicator extends React.Component { const mapStateToProps = (state: AppState) => { return { health: state.connection.health, - connected: state.connection.connected || state.connection.connecting, + connected: state.connection.connected || state.connection.connecting, } } diff --git a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx index 9ead89e..7198454 100644 --- a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx +++ b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx @@ -44,6 +44,40 @@ class ConnectionSettings extends React.Component { }) } + private renderCertificateInfo() { + if (!this.props.connection.selfSignedCertificate) { + return null + } + + return ( + + + + + {this.props.connection.selfSignedCertificate.name} + + + + ) + } + + private clearCertificate = () => { + this.props.managerActions.updateConnection(this.props.connection.id, { + selfSignedCertificate: undefined, + }) + } + + private renderSubscriptions() { + const connection = this.props.connection + return connection.subscriptions.map(subscription => ( + this.props.managerActions.deleteSubscription(subscription, connection.id)} + subscription={subscription} + key={subscription} + /> + )) + } + public render() { const { classes } = this.props return ( @@ -115,40 +149,6 @@ class ConnectionSettings extends React.Component { ) } - - private renderCertificateInfo() { - if (!this.props.connection.selfSignedCertificate) { - return null - } - - return ( - - - - - {this.props.connection.selfSignedCertificate.name} - - - - ) - } - - private clearCertificate = () => { - this.props.managerActions.updateConnection(this.props.connection.id, { - selfSignedCertificate: undefined, - }) - } - - private renderSubscriptions() { - const connection = this.props.connection - return connection.subscriptions.map(subscription => ( - this.props.managerActions.deleteSubscription(subscription, connection.id)} - subscription={subscription} - key={subscription} - /> - )) - } } const Subscription = (props: { diff --git a/app/src/components/ConnectionSetup/ConnectionSettings.tsx b/app/src/components/ConnectionSetup/ConnectionSettings.tsx index ba53641..46300fe 100644 --- a/app/src/components/ConnectionSetup/ConnectionSettings.tsx +++ b/app/src/components/ConnectionSetup/ConnectionSettings.tsx @@ -90,105 +90,6 @@ class ConnectionSettings extends React.Component { }) } - public render() { - const { classes, connection } = this.props - - const passwordVisibilityButton = ( - - - {this.state.showPassword ? : } - - - ) - - return ( -
-
- - - - - - {this.renderCertValidationSwitch()} - - - {this.renderTlsSwitch()} - - - {this.renderProtocols()} - - - - - - - - {this.requiresBasePath() ? this.renderBasePathInput() : null} - - - - - - Password - - - - -
-
-
- - -
-
- - {this.renderConnectButton()} -
-
-
-
- ) - } - private renderProtocols() { const { classes, connection } = this.props @@ -305,6 +206,105 @@ class ConnectionSettings extends React.Component { this.props.actions.connect(mqttOptions, this.props.connection.id) } } + + public render() { + const { classes, connection } = this.props + + const passwordVisibilityButton = ( + + + {this.state.showPassword ? : } + + + ) + + return ( +
+
+ + + + + + {this.renderCertValidationSwitch()} + + + {this.renderTlsSwitch()} + + + {this.renderProtocols()} + + + + + + + + {this.requiresBasePath() ? this.renderBasePathInput() : null} + + + + + + Password + + + + +
+
+
+ + +
+
+ + {this.renderConnectButton()} +
+
+
+
+ ) + } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/ConnectionSetup/ConnectionSetup.tsx b/app/src/components/ConnectionSetup/ConnectionSetup.tsx index f93597f..2d9eefe 100644 --- a/app/src/components/ConnectionSetup/ConnectionSetup.tsx +++ b/app/src/components/ConnectionSetup/ConnectionSetup.tsx @@ -29,6 +29,20 @@ class ConnectionSetup extends React.Component { super(props) } + private renderSettings() { + const { connection, showAdvancedSettings } = this.props + if (!connection) { + return null + } + + return ( +
+ + +
+ ) + } + public componentDidMount() { this.props.actions.loadConnectionSettings() } @@ -55,20 +69,6 @@ class ConnectionSetup extends React.Component { ) } - - private renderSettings() { - const { connection, showAdvancedSettings } = this.props - if (!connection) { - return null - } - - return ( -
- - -
- ) - } } const connectionHeight = '440px' diff --git a/app/src/components/ConnectionSetup/ProfileList.tsx b/app/src/components/ConnectionSetup/ProfileList.tsx index 2fa8898..422e861 100644 --- a/app/src/components/ConnectionSetup/ProfileList.tsx +++ b/app/src/components/ConnectionSetup/ProfileList.tsx @@ -92,7 +92,7 @@ const connectionItemRenderer = withStyles(connectionItemStyle)((props: Connectio onClick={() => props.actions.selectConnection(props.connection.id)} > - {props.connection.name || 'mqtt broker'} + {props.connection.name || 'mqtt broker'} {connection && connection.url} diff --git a/app/src/components/Copy.tsx b/app/src/components/Copy.tsx index e00955b..332c6ee 100644 --- a/app/src/components/Copy.tsx +++ b/app/src/components/Copy.tsx @@ -31,6 +31,16 @@ class Copy extends React.Component { this.state = { didCopy: false, snackBarOpen: false } } + private handleClick = (event: React.MouseEvent) => { + event.stopPropagation() + + copy(this.props.value) + this.setState({ didCopy: true, snackBarOpen: true }) + setTimeout(() => { + this.setState({ didCopy: false }) + }, 1500) + } + public render() { const icon = !this.state.didCopy ? @@ -64,16 +74,6 @@ class Copy extends React.Component { ) } - - private handleClick = (event: React.MouseEvent) => { - event.stopPropagation() - - copy(this.props.value) - this.setState({ didCopy: true, snackBarOpen: true }) - setTimeout(() => { - this.setState({ didCopy: false }) - }, 1500) - } } export default withStyles(styles)(Copy) diff --git a/app/src/components/CustomIconButton.tsx b/app/src/components/CustomIconButton.tsx index c6eb6dd..803ef4c 100644 --- a/app/src/components/CustomIconButton.tsx +++ b/app/src/components/CustomIconButton.tsx @@ -19,16 +19,16 @@ class CustomIconButton extends React.Component { super(props) } + private onClick = (event: React.MouseEvent) => { + event.stopPropagation() + this.props.onClick(event) + } + public render() { return ( {this.props.children} ) } - - private onClick = (event: React.MouseEvent) => { - event.stopPropagation() - this.props.onClick(event) - } } export default withStyles(styles)(CustomIconButton) diff --git a/app/src/components/Demo/Mouse.tsx b/app/src/components/Demo/Mouse.tsx index af74d78..3847ecd 100644 --- a/app/src/components/Demo/Mouse.tsx +++ b/app/src/components/Demo/Mouse.tsx @@ -18,18 +18,6 @@ class Demo extends React.Component<{}, State> { this.state = { enabled: false, target: { x: 0, y: 0 }, position: { x: 0, y: 0 }, stepSizeX: 1, stepSizeY: 1 } } - public componentDidMount() { - (window as any).demo.enableMouse = () => { - this.setState({ enabled: true }) - } - (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => { - const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval) - const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval) - this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } }) - this.moveCloser() - } - } - private moveCloser(steps: number = 0) { const steSizeX = Math.min(this.state.stepSizeX, Math.abs(this.state.position.x - this.state.target.x)) const steSizeY = Math.min(this.state.stepSizeY, Math.abs(this.state.position.y - this.state.target.y)) @@ -53,6 +41,18 @@ class Demo extends React.Component<{}, State> { }, this.frameInterval) } + public componentDidMount() { + (window as any).demo.enableMouse = () => { + this.setState({ enabled: true }) + } + (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => { + const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval) + const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval) + this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } }) + this.moveCloser() + } + } + public render() { if (!this.state.enabled) { return null diff --git a/app/src/components/PauseButton.tsx b/app/src/components/PauseButton.tsx index 8b0920e..d4328b9 100644 --- a/app/src/components/PauseButton.tsx +++ b/app/src/components/PauseButton.tsx @@ -28,6 +28,35 @@ class PauseButton extends React.Component { this.state = { changes: 0 } } + private renderResume() { + return ( + + + + ) + } + + private renderPause() { + return ( + + + + ) + } + + private renderBufferStats() { + if (!this.props.tree) { + return + } + + return ( + + {this.state.changes} changes
+ buffer at {Math.round(this.props.tree.unmergedChanges().fillState() * 10000) / 100}% + + ) + } + public componentDidMount() { this.timer = setInterval(() => { if (!this.props.paused || !this.props.tree) { @@ -59,35 +88,6 @@ class PauseButton extends React.Component { ) } - - private renderResume() { - return ( - - - - ) - } - - private renderPause() { - return ( - - - - ) - } - - private renderBufferStats() { - if (!this.props.tree) { - return - } - - return ( - - {this.state.changes} changes
- buffer at {Math.round(this.props.tree.unmergedChanges().fillState() * 10000) / 100}% - - ) - } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/Settings.tsx b/app/src/components/Settings.tsx index bbc5734..93ccce9 100644 --- a/app/src/components/Settings.tsx +++ b/app/src/components/Settings.tsx @@ -86,45 +86,6 @@ class Settings extends React.Component { this.state = {} } - public render() { - const { classes, actions, visible } = this.props - return ( - -
- - - - - - Settings - - - - {this.renderAutoExpand()} - {this.renderNodeOrder()} - {this.renderHighlightTopicUpdates()} - {this.selectTopicsOnMouseOver()} - {this.toggleTheme()} -
- - - by Thomas Nordquist - - - - - ) - } - private openGithubPage = () => { shell.openExternal('https://github.com/thomasnordquist') } @@ -232,6 +193,45 @@ class Settings extends React.Component { private onChangeSorting = (e: React.ChangeEvent) => { this.props.actions.setTopicOrder(e.target.value as TopicOrder) } + + public render() { + const { classes, actions, visible } = this.props + return ( + +
+ + + + + + Settings + + + + {this.renderAutoExpand()} + {this.renderNodeOrder()} + {this.renderHighlightTopicUpdates()} + {this.selectTopicsOnMouseOver()} + {this.toggleTheme()} +
+ + + by Thomas Nordquist + + + + + ) + } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/Sidebar/History.tsx b/app/src/components/Sidebar/History.tsx index a9cb26a..41db15b 100644 --- a/app/src/components/Sidebar/History.tsx +++ b/app/src/components/Sidebar/History.tsx @@ -29,6 +29,10 @@ class MessageHistory extends React.Component { } } + private toggle = () => { + this.setState({ collapsed: !this.state.collapsed }) + } + public renderHistory() { const style = (element: HistoryItem) => ({ backgroundColor: element.selected ? this.props.theme.palette.action.selected : this.props.theme.palette.action.hover, @@ -87,10 +91,6 @@ class MessageHistory extends React.Component { ) } - - private toggle = () => { - this.setState({ collapsed: !this.state.collapsed }) - } } const styles = (theme: Theme) => ({ @@ -98,7 +98,7 @@ const styles = (theme: Theme) => ({ backgroundColor: 'rgba(170, 170, 170, 0.2)', marginTop: '16px', }, - badge: { right:'-25px' }, + badge: { right: '-25px' }, }) export default withStyles(styles, { withTheme: true })(MessageHistory) diff --git a/app/src/components/Sidebar/Publish/Publish.tsx b/app/src/components/Sidebar/Publish/Publish.tsx index b8aa255..0765440 100644 --- a/app/src/components/Sidebar/Publish/Publish.tsx +++ b/app/src/components/Sidebar/Publish/Publish.tsx @@ -56,6 +56,11 @@ interface State { } class Publish extends React.Component { + + private editorOptions = { + showLineNumbers: false, + tabSize: 2, + } constructor(props: any) { super(props) this.state = { history: [] } @@ -88,7 +93,7 @@ class Publish extends React.Component { } } - private addMessageToHistory(topic: string, payload?: string) { + private addMessageToHistory(topic: string, payload?: string) { // Remove duplicates let filteredHistory = this.state.history.filter(e => e.payload !== payload || e.topic !== topic) filteredHistory = filteredHistory.slice(-7) @@ -96,16 +101,6 @@ class Publish extends React.Component { this.setState({ history }) } - public render() { - return ( -
- {this.topic()} - {this.editor()} - {this.history()} -
- ) - } - private clearTopic = () => { this.props.actions.setTopic('') } @@ -138,11 +133,6 @@ class Publish extends React.Component { } } - private editorOptions = { - showLineNumbers: false, - tabSize: 2, - } - private publishButton() { return ( - )], + )] ) if (breadCrumps.length === 0) { @@ -54,7 +54,7 @@ class Topic extends React.Component { } const joinedBreadCrumps = breadCrumps.reduce((prev, current) => - prev.concat([/]).concat(current), + prev.concat([/]).concat(current) ) return {joinedBreadCrumps} diff --git a/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx b/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx index d219841..0ac06e8 100644 --- a/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx +++ b/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx @@ -22,14 +22,21 @@ interface State { } class MessageHistory extends React.Component { + + private updateNode = throttle(() => { + this.setState(this.state) + }, 300) constructor(props: any) { super(props) this.state = { } } - private updateNode = throttle(() => { - this.setState(this.state) - }, 300) + private displayMessage = (index: number, eventTarget: EventTarget) => { + const message = this.props.node && this.props.node.messageHistory.toArray().reverse()[index] + if (message) { + this.props.onSelect(message) + } + } public componentWillReceiveProps(nextProps: Props) { this.props.node && this.props.node.onMessage.unsubscribe(this.updateNode) @@ -82,20 +89,13 @@ class MessageHistory extends React.Component { ) } - public renderPlot(data: {x: number, y: number}[]) { + public renderPlot(data: Array<{x: number, y: number}>) { return ( Loading...}> ) } - - private displayMessage = (index: number, eventTarget: EventTarget) => { - const message = this.props.node && this.props.node.messageHistory.toArray().reverse()[index] - if (message) { - this.props.onSelect(message) - } - } } export default MessageHistory diff --git a/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx b/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx index a093f02..183d7ee 100644 --- a/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx +++ b/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx @@ -8,7 +8,7 @@ const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('re const abbreviate = require('number-abbreviate') interface Props { - data: {x: number, y: number}[] + data: Array<{x: number, y: number}> } interface Stats { @@ -26,6 +26,23 @@ class PlotHistory extends React.Component { this.setState({ width: width - 12 }) } + private hintFormatter = (point: any) => { + return [ + { title: Time, value: }, + { title: Value, value: point.y }, + ] + } + + private _forgetValue = () => { + this.setState({ + value: undefined, + }) + } + + private _rememberValue = (value: any) => { + this.setState({ value }) + } + public render() { const data = this.props.data @@ -50,23 +67,6 @@ class PlotHistory extends React.Component { ) } - - private hintFormatter = (point: any) => { - return [ - { title: Time, value: }, - { title: Value, value: point.y }, - ] - } - - private _forgetValue = () => { - this.setState({ - value: undefined, - }) - } - - private _rememberValue = (value: any) => { - this.setState({ value }) - } } export default PlotHistory diff --git a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx index 4e7a08d..43f5c31 100644 --- a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx +++ b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx @@ -47,30 +47,6 @@ class ValuePanel extends React.Component { this.state = { } } - public render() { - const { node, classes } = this.props - const { detailsStyle, summaryStyle } = this.panelStyle() - - const copyValue = (node && node.message && node.message.value) ? : null - - return ( - - } style={summaryStyle}> - Value {copyValue} - - - {this.messageMetaInfo()} -
- Loading...
}> - {this.renderValue()} - - -
- - - ) - } - private renderValue() { const node = this.props.node if (!node || !node.message) { @@ -87,7 +63,7 @@ class ValuePanel extends React.Component { } private messageMetaInfo() { - if (!this.props.node || !this.props.node.message || !this.props.node.mqttMessage) { + if (!this.props.node || !this.props.node.message || !this.props.node.mqttMessage) { return null } @@ -152,6 +128,30 @@ class ValuePanel extends React.Component { this.setState({ compareMessage: undefined }) } } + + public render() { + const { node, classes } = this.props + const { detailsStyle, summaryStyle } = this.panelStyle() + + const copyValue = (node && node.message && node.message.value) ? : null + + return ( + + } style={summaryStyle}> + Value {copyValue} + + + {this.messageMetaInfo()} +
+ Loading...
}> + {this.renderValue()} + + +
+ + + ) + } } const mapDispatchToProps = (dispatch: any) => { diff --git a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx index d9c936b..b4fd0ae 100644 --- a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx +++ b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx @@ -24,6 +24,36 @@ class ValueRenderer extends React.Component { this.state = { width: 0 } } + private renderDiff(current: string = '', previous: string = '', language?: 'json') { + return ( + + ) + } + + private messageToPrettyJson(str: string): string | undefined { + try { + const json = JSON.parse(str) + return JSON.stringify(json, undefined, ' ') + } catch { + return undefined + } + } + + private updateWidth = (width: number) => { + if (width !== this.state.width) { + this.setState({ width }) + } + } + + private renderRawValue(value: string, compare: string) { + return this.renderDiff(value, compare) + } + public render() { return (
@@ -38,7 +68,7 @@ class ValueRenderer extends React.Component { const previousMessages = messageHistory.toArray() const previousMessage = previousMessages[previousMessages.length - 2] - let compareMessage = compareWith || previousMessage || message + let compareMessage = compareWith || previousMessage || message if (renderMode === 'raw') { compareMessage = message } @@ -71,36 +101,6 @@ class ValueRenderer extends React.Component { return this.renderDiff(current, compare, language) } } - - private renderDiff(current: string = '', previous: string = '', language?: 'json') { - return ( - - ) - } - - private messageToPrettyJson(str: string): string | undefined { - try { - const json = JSON.parse(str) - return JSON.stringify(json, undefined, ' ') - } catch { - return undefined - } - } - - private updateWidth = (width: number) => { - if (width !== this.state.width) { - this.setState({ width }) - } - } - - private renderRawValue(value: string, compare: string) { - return this.renderDiff(value, compare) - } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/TitleBar.tsx b/app/src/components/TitleBar.tsx index aabc4ee..846bc92 100644 --- a/app/src/components/TitleBar.tsx +++ b/app/src/components/TitleBar.tsx @@ -91,27 +91,6 @@ class TitleBar extends React.Component { this.state = { } } - public render() { - const { actions, classes } = this.props - - return ( - - - - - - MQTT Explorer - {this.renderSearch()} - - - - - - ) - } - private renderSearch() { const { classes, topicFilter } = this.props @@ -138,6 +117,27 @@ class TitleBar extends React.Component { private onFilterChange = (event: React.ChangeEvent) => { this.props.actions.settings.filterTopics(event.target.value) } + + public render() { + const { actions, classes } = this.props + + return ( + + + + + + MQTT Explorer + {this.renderSearch()} + + + + + + ) + } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/Tree/Tree.tsx b/app/src/components/Tree/Tree.tsx index b761393..a1aacd0 100644 --- a/app/src/components/Tree/Tree.tsx +++ b/app/src/components/Tree/Tree.tsx @@ -42,6 +42,10 @@ class Tree extends React.PureComponent { this.state = { lastUpdate: 0 } } + private performanceCallback = (ms: number) => { + average.push(Date.now(), ms) + } + public time(): number { const time = performance.now() - this.perf this.perf = performance.now() @@ -121,10 +125,6 @@ class Tree extends React.PureComponent {
) } - - private performanceCallback = (ms: number) => { - average.push(Date.now(), ms) - } } const mapStateToProps = (state: AppState) => { diff --git a/app/src/components/Tree/TreeNode.tsx b/app/src/components/Tree/TreeNode.tsx index 19ccbb0..fb1d542 100644 --- a/app/src/components/Tree/TreeNode.tsx +++ b/app/src/components/Tree/TreeNode.tsx @@ -75,17 +75,9 @@ class TreeNode extends React.Component { private willUpdateTime: number = performance.now() private nodeRef?: React.RefObject = React.createRef() - private subnodesDidchange = () => { - this.dirtySubnodes = true - } - - private messageDidChange = () => { - this.dirtyMessage = true - } - - private edgesDidChange = () => { - this.dirtyMessage = true - } + private setHover = debounce((hover: boolean) => { + this.setState({ mouseOver: hover }) + }, 45) constructor(props: Props) { super(props) @@ -97,9 +89,16 @@ class TreeNode extends React.Component { } } - public componentDidMount() { - const { treeNode } = this.props - this.addSubscriber(treeNode) + private subnodesDidchange = () => { + this.dirtySubnodes = true + } + + private messageDidChange = () => { + this.dirtyMessage = true + } + + private edgesDidChange = () => { + this.dirtyMessage = true } private addSubscriber(treeNode: q.TreeNode) { @@ -122,49 +121,14 @@ class TreeNode extends React.Component { treeNode.onMessage.unsubscribe(this.messageDidChange) } - public componentWillReceiveProps(nextProps: Props) { - if (nextProps.treeNode !== this.props.treeNode) { - this.removeSubscriber(this.props.treeNode) - this.addSubscriber(nextProps.treeNode) - } - } - - public componentWillUnmount() { - const { treeNode } = this.props - this.removeSubscriber(treeNode) - this.nodeRef = undefined - } - private stateHasChanged(newState: State) { - return this.state.collapsedOverride !== newState.collapsedOverride - || this.state.mouseOver !== newState.mouseOver + return this.state.collapsedOverride !== newState.collapsedOverride + || this.state.mouseOver !== newState.mouseOver || this.state.selected !== newState.selected } private propsHasChanged(newProps: Props) { - return this.props.autoExpandLimit !== newProps.autoExpandLimit - } - - public shouldComponentUpdate(nextProps: Props, nextState: State) { - const shouldRenderToRemoveCssAnimation = this.cssAnimationWasSetAt !== undefined - return this.stateHasChanged(nextState) - || this.propsHasChanged(nextProps) - || (this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes) - || this.animationDirty - || shouldRenderToRemoveCssAnimation - } - - public componentDidUpdate() { - if (this.props.performanceCallback) { - const renderTime = performance.now() - this.willUpdateTime - this.props.performanceCallback(renderTime) - } - } - - public componentWillUpdate() { - if (this.props.performanceCallback) { - this.willUpdateTime = performance.now() - } + return this.props.autoExpandLimit !== newProps.autoExpandLimit } private toggle() { @@ -179,9 +143,97 @@ class TreeNode extends React.Component { return this.props.treeNode.edgeCount() > this.props.autoExpandLimit } + private didSelectTopic = () => { + this.props.didSelectTopic(this.props.treeNode) + } + + private didClickTitle = (event: React.MouseEvent) => { + event.preventDefault() + this.props.didSelectTopic(this.props.treeNode) + this.toggle() + } + + private mouseOver = (event: React.MouseEvent) => { + event.stopPropagation() + this.setHover(true) + if (this.props.selectTopicWithMouseOver && this.props.treeNode && this.props.treeNode.message && this.props.treeNode.message.value) { + this.props.didSelectTopic(this.props.treeNode) + } + } + + private mouseOut = (event: React.MouseEvent) => { + event.stopPropagation() + this.setHover(false) + } + + private toggleCollapsed = (event: React.MouseEvent) => { + event.stopPropagation() + this.toggle() + } + + private renderNodes() { + if (this.collapsed()) { + return null + } + + return ( + + ) + } + + public componentDidMount() { + const { treeNode } = this.props + this.addSubscriber(treeNode) + } + + public componentWillReceiveProps(nextProps: Props) { + if (nextProps.treeNode !== this.props.treeNode) { + this.removeSubscriber(this.props.treeNode) + this.addSubscriber(nextProps.treeNode) + } + } + + public componentWillUnmount() { + const { treeNode } = this.props + this.removeSubscriber(treeNode) + this.nodeRef = undefined + } + + public shouldComponentUpdate(nextProps: Props, nextState: State) { + const shouldRenderToRemoveCssAnimation = this.cssAnimationWasSetAt !== undefined + return this.stateHasChanged(nextState) + || this.propsHasChanged(nextProps) + || (this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes) + || this.animationDirty + || shouldRenderToRemoveCssAnimation + } + + public componentDidUpdate() { + if (this.props.performanceCallback) { + const renderTime = performance.now() - this.willUpdateTime + this.props.performanceCallback(renderTime) + } + } + + public componentWillUpdate() { + if (this.props.performanceCallback) { + this.willUpdateTime = performance.now() + } + } + public render() { const { classes } = this.props - const isDirty = this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes + const isDirty = this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes this.dirtyEdges = this.dirtyMessage = this.dirtySubnodes = false const shouldStartAnimation = (isDirty && !this.animationDirty) && !this.props.isRoot && this.props.highlightTopicUpdates @@ -217,58 +269,6 @@ class TreeNode extends React.Component { ) } - - private didSelectTopic = () => { - this.props.didSelectTopic(this.props.treeNode) - } - - private didClickTitle = (event: React.MouseEvent) => { - event.preventDefault() - this.props.didSelectTopic(this.props.treeNode) - this.toggle() - } - - private mouseOver = (event: React.MouseEvent) => { - event.stopPropagation() - this.setHover(true) - if (this.props.selectTopicWithMouseOver && this.props.treeNode && this.props.treeNode.message && this.props.treeNode.message.value) { - this.props.didSelectTopic(this.props.treeNode) - } - } - - private mouseOut = (event: React.MouseEvent) => { - event.stopPropagation() - this.setHover(false) - } - - private setHover = debounce((hover: boolean) => { - this.setState({ mouseOver: hover }) - }, 45) - - private toggleCollapsed = (event: React.MouseEvent) => { - event.stopPropagation() - this.toggle() - } - - private renderNodes() { - if (this.collapsed()) { - return null - } - - return ( - - ) - } } export default withStyles(styles, { withTheme: true })(TreeNode) diff --git a/app/src/components/Tree/TreeNodeSubnodes.tsx b/app/src/components/Tree/TreeNodeSubnodes.tsx index 903053e..a3995b1 100644 --- a/app/src/components/Tree/TreeNodeSubnodes.tsx +++ b/app/src/components/Tree/TreeNodeSubnodes.tsx @@ -32,7 +32,7 @@ class TreeNodeSubnodes extends React.Component { this.state = { alreadyAdded: 10 } } - private sortedNodes(): q.TreeNode[] { + private sortedNodes(): Array> { const { topicOrder, treeNode } = this.props let edges = treeNode.edgeArray diff --git a/app/src/components/Tree/TreeNodeTitle.tsx b/app/src/components/Tree/TreeNodeTitle.tsx index 3a05cd3..3437fb6 100644 --- a/app/src/components/Tree/TreeNodeTitle.tsx +++ b/app/src/components/Tree/TreeNodeTitle.tsx @@ -16,18 +16,6 @@ export interface TreeNodeProps extends React.HTMLAttributes { } class TreeNodeTitle extends React.Component { - public render() { - const { classes, treeNode, style, className } = this.props - return ( - - {this.renderExpander()} - {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()} - - ) - } private renderSourceEdge() { const name = this.props.name || (this.props.treeNode.sourceEdge && this.props.treeNode.sourceEdge.name) @@ -57,6 +45,18 @@ class TreeNodeTitle extends React.Component { const messages = this.props.treeNode.leafMessageCount() return ({this.props.treeNode.childTopicCount()} topics, {messages} messages) } + public render() { + const { classes, treeNode, style, className } = this.props + return ( + + {this.renderExpander()} + {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()} + + ) + } } const styles = (theme: Theme) => ({ diff --git a/app/src/components/helper/DateFormatter.tsx b/app/src/components/helper/DateFormatter.tsx index fda2b4e..12d91c8 100644 --- a/app/src/components/helper/DateFormatter.tsx +++ b/app/src/components/helper/DateFormatter.tsx @@ -13,13 +13,6 @@ const unitMapping = { } class DateFormatter extends React.Component { - public render() { - const locale = window.navigator.language - if (this.props.intervalSince) { - return {this.intervalSince(this.props.intervalSince)} - } - return {locale ? this.localizedDate(locale) : this.legacyDate()} - } private intervalSince(intervalSince: Date) { const interval = intervalSince.getTime() - this.props.date.getTime() @@ -49,6 +42,13 @@ class DateFormatter extends React.Component { return 's' } + public render() { + const locale = window.navigator.language + if (this.props.intervalSince) { + return {this.intervalSince(this.props.intervalSince)} + } + return {locale ? this.localizedDate(locale) : this.legacyDate()} + } } export default DateFormatter diff --git a/app/src/index.tsx b/app/src/index.tsx index c5d8339..96ededc 100644 --- a/app/src/index.tsx +++ b/app/src/index.tsx @@ -26,9 +26,9 @@ const store = createStore( composeEnhancers( applyMiddleware( reduxThunk, - batchDispatchMiddleware, - ), - ), + batchDispatchMiddleware + ) + ) ) function createTheme(type: 'light' | 'dark') { @@ -77,5 +77,5 @@ ReactDOM.render( , - document.getElementById('app'), + document.getElementById('app') ) diff --git a/app/src/reducers/ConnectionManager.ts b/app/src/reducers/ConnectionManager.ts index 71a38c6..82cf597 100644 --- a/app/src/reducers/ConnectionManager.ts +++ b/app/src/reducers/ConnectionManager.ts @@ -3,7 +3,7 @@ import { ConnectionOptions } from '../model/ConnectionOptions' import { createReducer } from './lib' export interface ConnectionManagerState { - connections: {[s:string]: ConnectionOptions}, + connections: {[s: string]: ConnectionOptions}, selected?: string showAdvancedSettings: boolean } @@ -29,7 +29,7 @@ export enum ActionTypes { export interface SetConnections { type: ActionTypes.CONNECTION_MANAGER_SET_CONNECTIONS - connections: {[s:string]: ConnectionOptions} + connections: {[s: string]: ConnectionOptions} } export interface SelectConnection { diff --git a/app/src/reducers/index.ts b/app/src/reducers/index.ts index befbe73..e392772 100644 --- a/app/src/reducers/index.ts +++ b/app/src/reducers/index.ts @@ -48,35 +48,35 @@ const globalState: Reducer = (state = ini trackEvent(action.type) console.log(action.type) switch (action.type) { - case ActionTypes.showUpdateNotification: - return { + case ActionTypes.showUpdateNotification: + return { ...state, showUpdateNotification: action.showUpdateNotification, } - case ActionTypes.showError: - return { + case ActionTypes.showError: + return { ...state, error: action.error, } - case ActionTypes.didLaunch: - return { + case ActionTypes.didLaunch: + return { ...state, launching: false, } - case ActionTypes.showUpdateDetails: - if (action.showUpdateDetails === undefined) { + case ActionTypes.showUpdateDetails: + if (action.showUpdateDetails === undefined) { return state } - return { + return { ...state, showUpdateDetails: action.showUpdateDetails, } - default: - return state + default: + return state } } diff --git a/backend/src/ConfigStorage.ts b/backend/src/ConfigStorage.ts index 41c6efb..5ea262f 100644 --- a/backend/src/ConfigStorage.ts +++ b/backend/src/ConfigStorage.ts @@ -6,7 +6,7 @@ import { storageClearEvent, storageLoadEvent, storageStoreEvent, - makeStorageAcknowledgementEvent, + makeStorageAcknowledgementEvent } from '../../events/StorageEvents' export default class ConfigStorage { diff --git a/backend/src/DataSource/DataSource.ts b/backend/src/DataSource/DataSource.ts index d8a8a53..971adb5 100644 --- a/backend/src/DataSource/DataSource.ts +++ b/backend/src/DataSource/DataSource.ts @@ -5,12 +5,12 @@ type MessageCallback = (topic: string, payload: Buffer) => void // A DataSource should automatically reconnect if connection was broken interface DataSource { + topicSeparator: string + stateMachine: DataSourceStateMachine connect(options: DataSourceOptions): DataSourceStateMachine disconnect(): void onMessage(messageCallback: MessageCallback): void publish(msg: MqttMessage): void - topicSeparator: string - stateMachine: DataSourceStateMachine } export { DataSource, MessageCallback } diff --git a/backend/src/Model/RingBuffer.ts b/backend/src/Model/RingBuffer.ts index 1f74806..f15e4d7 100644 --- a/backend/src/Model/RingBuffer.ts +++ b/backend/src/Model/RingBuffer.ts @@ -21,22 +21,6 @@ export class RingBuffer { } } - public clone(): RingBuffer { - return new RingBuffer(this.capacity, this.maxItems, this) - } - - public toArray() { - return this.items.slice(this.start, this.end) - } - - public add(item: T) { - const size = item.length - this.enforceCapacityConstraints(size) - this.usage += size - this.items[this.end] = item - this.end += 1 - } - private enforceCapacityConstraints(addedItemSize: number) { const remainingSize = this.capacity - (this.usage + addedItemSize) if (remainingSize < 0) { @@ -69,4 +53,20 @@ export class RingBuffer { const freedSpace = firstItem.length this.usage -= freedSpace } + + public clone(): RingBuffer { + return new RingBuffer(this.capacity, this.maxItems, this) + } + + public toArray() { + return this.items.slice(this.start, this.end) + } + + public add(item: T) { + const size = item.length + this.enforceCapacityConstraints(size) + this.usage += size + this.items[this.end] = item + this.end += 1 + } } diff --git a/backend/src/Model/Tree.ts b/backend/src/Model/Tree.ts index 0a852ab..fe340d4 100644 --- a/backend/src/Model/Tree.ts +++ b/backend/src/Model/Tree.ts @@ -53,7 +53,12 @@ export class Tree extends TreeNode { super(undefined, undefined) } - public updateWithConnection(emitter: EventBusInterface, connectionId: string, nodeFilter?:(node: TreeNode) => boolean) { + private handleNewData = (msg: MqttMessage) => { + this.unmergedMessages.push(msg) + this.didReceive.dispatch() + } + + public updateWithConnection(emitter: EventBusInterface, connectionId: string, nodeFilter?: (node: TreeNode) => boolean) { this.updateSource = emitter this.connectionId = connectionId this.nodeFilter = nodeFilter @@ -82,11 +87,6 @@ export class Tree extends TreeNode { return this.unmergedMessages } - private handleNewData = (msg: MqttMessage) => { - this.unmergedMessages.push(msg) - this.didReceive.dispatch() - } - public stopUpdating() { if (this.subscriptionEvent && this.updateSource) { this.updateSource.unsubscribe(this.subscriptionEvent, this.handleNewData) diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts index 85ea752..7e55e40 100644 --- a/backend/src/Model/TreeNode.ts +++ b/backend/src/Model/TreeNode.ts @@ -8,7 +8,7 @@ export class TreeNode { public messageHistory: RingBuffer = new RingBuffer(3000, 100) public viewModel?: ViewModel public edges: {[s: string]: Edge} = {} - public edgeArray: Edge[] = [] + public edgeArray: Array> = [] public collapsed = false public messages: number = 0 public lastUpdate: number = Date.now() @@ -18,21 +18,10 @@ export class TreeNode { public isTree = false private cachedPath?: string - private cachedChildTopics?: TreeNode[] + private cachedChildTopics?: Array> private cachedLeafMessageCount?: number private cachedChildTopicCount?: number - public unconnectedClone() { - const node = new TreeNode() - node.message = this.message - node.mqttMessage = this.mqttMessage - node.messageHistory = this.messageHistory.clone() - node.messages = this.messages - node.lastUpdate = this.lastUpdate - - return node - } - constructor(sourceEdge?: Edge, message?: Message) { if (sourceEdge) { this.sourceEdge = sourceEdge @@ -57,6 +46,70 @@ export class TreeNode { }) } + private previous(): TreeNode | undefined { + return this.sourceEdge ? this.sourceEdge.source || undefined : undefined + } + + private isTopicEmptyLeaf() { + const hasNoMessage = (!this.message || !this.message.value) + return hasNoMessage && this.isLeaf() + } + + private isLeaf() { + return this.edgeArray.length === 0 + } + + private removeFromParent() { + const previous = this.previous() + if (!previous || !this.sourceEdge) { + return + } + previous.removeEdge(this.sourceEdge) + } + + private findChild(edges: string[]): TreeNode | undefined { + if (edges.length === 0) { + return this + } + + const nextEdge = this.edges[edges[0]] + if (!nextEdge) { + return undefined + } + + return nextEdge.target.findChild(edges.slice(1)) + } + + private mergeEdges(node: TreeNode) { + const edgeKeys = Object.keys(node.edges) + let edgesDidUpdate = false + + for (const edgeKey of edgeKeys) { + const matchingEdge = this.edges[edgeKey] + if (matchingEdge) { + matchingEdge.target.updateWithNode(node.edges[edgeKey].target) + } else { + this.addEdge(node.edges[edgeKey], false) + edgesDidUpdate = true + } + } + + if (edgesDidUpdate) { + this.onEdgesChange.dispatch() + } + } + + public unconnectedClone() { + const node = new TreeNode() + node.message = this.message + node.mqttMessage = this.mqttMessage + node.messageHistory = this.messageHistory.clone() + node.messages = this.messages + node.lastUpdate = this.lastUpdate + + return node + } + public setMessage(message: Message) { this.messageHistory.add(message) this.message = message @@ -82,10 +135,6 @@ export class TreeNode { return this.cachedPath } - private previous(): TreeNode | undefined { - return this.sourceEdge ? this.sourceEdge.source || undefined : undefined - } - public addEdge(edge: Edge, emitUpdate: boolean = false) { this.edges[edge.name] = edge this.edgeArray.push(edge) @@ -96,7 +145,7 @@ export class TreeNode { } } - public branch(): TreeNode[] { + public branch(): Array> { const previous = this.previous() if (!previous) { return [this] @@ -105,23 +154,6 @@ export class TreeNode { return previous.branch().concat([this]) } - private isTopicEmptyLeaf() { - const hasNoMessage = (!this.message || !this.message.value) - return hasNoMessage && this.isLeaf() - } - - private isLeaf() { - return this.edgeArray.length === 0 - } - - private removeFromParent() { - const previous = this.previous() - if (!previous || !this.sourceEdge) { - return - } - previous.removeEdge(this.sourceEdge) - } - public removeEdge(edge: Edge) { delete this.edges[edge.name] this.edgeArray = Object.values(this.edges) @@ -171,7 +203,7 @@ export class TreeNode { return this.edgeArray.length } - public childTopics(): TreeNode[] { + public childTopics(): Array> { if (this.cachedChildTopics === undefined) { const initialValue = this.message && this.message.value ? [this] : [] @@ -180,44 +212,12 @@ export class TreeNode { .reduce((a, b) => a.concat(b), initialValue) } - return this.cachedChildTopics as TreeNode[] + return this.cachedChildTopics as Array> } - public findNode (path: String): TreeNode | undefined { + public findNode(path: String): TreeNode | undefined { const topics = path.split('/') return this.findChild(topics) } - - private findChild(edges: string[]): TreeNode | undefined { - if (edges.length === 0) { - return this - } - - const nextEdge = this.edges[edges[0]] - if (!nextEdge) { - return undefined - } - - return nextEdge.target.findChild(edges.slice(1)) - } - - private mergeEdges(node: TreeNode) { - const edgeKeys = Object.keys(node.edges) - let edgesDidUpdate = false - - for (const edgeKey of edgeKeys) { - const matchingEdge = this.edges[edgeKey] - if (matchingEdge) { - matchingEdge.target.updateWithNode(node.edges[edgeKey].target) - } else { - this.addEdge(node.edges[edgeKey], false) - edgesDidUpdate = true - } - } - - if (edgesDidUpdate) { - this.onEdgesChange.dispatch() - } - } } diff --git a/backend/src/index.ts b/backend/src/index.ts index 04eb832..7af125e 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -12,19 +12,12 @@ import { makeConnectionStateEvent, makePublishEvent, removeConnection, - updateAvailable, + updateAvailable } from '../../events' export class ConnectionManager { private connections: {[s: string]: DataSource} = {} - public manageConnections() { - backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest) - backendEvents.subscribe(removeConnection, (connectionId: string) => { - this.removeConnection(connectionId) - }) - } - private handleConnectionRequest = (event: AddMqttConnection) => { const connectionId = event.id @@ -61,6 +54,13 @@ export class ConnectionManager { }) } + public manageConnections() { + backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest) + backendEvents.subscribe(removeConnection, (connectionId: string) => { + this.removeConnection(connectionId) + }) + } + public removeConnection(conenctionId: string) { const connection = this.connections[conenctionId] if (connection) { diff --git a/events/EventBus.ts b/events/EventBus.ts index ec5dafc..3b0d4ed 100644 --- a/events/EventBus.ts +++ b/events/EventBus.ts @@ -3,7 +3,7 @@ import { IpcMain, IpcRenderer, ipcMain, ipcRenderer } from 'electron' import { Event } from './Events' export interface EventBusInterface { - subscribe(event: Event, callback:(msg: MessageType) => void): void + subscribe(event: Event, callback: (msg: MessageType) => void): void unsubscribeAll(event: Event): void emit(event: Event, msg: MessageType): void unsubscribe(event: Event, callback: any): void @@ -21,7 +21,7 @@ class IpcMainEventBus implements EventBusInterface { this.ipc = ipc } - public subscribe(subscribeEvent: Event, callback:(msg: MessageType) => void) { + public subscribe(subscribeEvent: Event, callback: (msg: MessageType) => void) { console.log('subscribing', subscribeEvent.topic) this.ipc.on(subscribeEvent.topic, (event: any, arg: any) => { this.client = event.sender @@ -53,7 +53,7 @@ class IpcRendererEventBus implements EventBusInterface { this.ipc = ipc } - public subscribe(event: Event, callback:(msg: MessageType) => void) { + public subscribe(event: Event, callback: (msg: MessageType) => void) { const wrappedCallback = (_event: any, arg: any) => { callback(arg) } diff --git a/package.json b/package.json index 4edc0cf..caf8246 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "author": "Thomas Nordquist", "email": "xxnerowingerxx@gmail.com", "homepage": "https://github.com", - "license": "ISC", + "license": "-", "devDependencies": { "@types/chai": "^4.1.7", "@types/fs-extra": "^5.0.5", @@ -78,9 +78,10 @@ "source-map-support": "^0.5.9", "spectron": "^5.0.0", "ts-node": "^7.0.1", - "tslint": "^5.12.0", + "tslint": "^5.15.0", "tslint-config-airbnb": "^5.11.1", "tslint-react": "^3.6.0", + "tslint-react-recommended": "^1.0.15", "tslint-strict-null-checks": "^1.0.1", "typescript": "^3.2.2", "webdriverio": "5.4" diff --git a/scripts/afterAllArtifactBuild.ts b/scripts/afterAllArtifactBuild.ts index caca8c0..4fdae75 100644 --- a/scripts/afterAllArtifactBuild.ts +++ b/scripts/afterAllArtifactBuild.ts @@ -3,7 +3,7 @@ import * as path from 'path' import { chdir } from 'process' import { exec } from './util' -export default async function (info: any) { +export default async function(info: any) { for (const snapFile of info.artifactPaths) { if (/\.snap$/.test(snapFile)) { const originalDir = __dirname diff --git a/scripts/uploadVideoAsset.ts b/scripts/uploadVideoAsset.ts index 42f939c..3a649fb 100755 --- a/scripts/uploadVideoAsset.ts +++ b/scripts/uploadVideoAsset.ts @@ -73,7 +73,7 @@ async function uploadFile(uploadUrl: string, file: string) { const data = fs.readFileSync(file) const mimeType = mime.getType(path.extname(file)) - return await axios({ + return axios({ data, method: 'post', url: `${uploadUrl}?name=${path.basename(file)}&access_token=${githubToken}`, diff --git a/src/spec/mock-mqtt.ts b/src/spec/mock-mqtt.ts index 39d8a6b..c3a383b 100644 --- a/src/spec/mock-mqtt.ts +++ b/src/spec/mock-mqtt.ts @@ -88,7 +88,7 @@ function generateData(client: mqtt.MqttClient) { intervals.push(setInterval(() => { state = !state const js = { - tags:{ + tags: { entityId: 33512, entityType: 'person', host: 'd44ad81e10f9', @@ -100,7 +100,7 @@ function generateData(client: mqtt.MqttClient) { client.publish( 'actuality/showcase', JSON.stringify(js), - { retain: true, qos: 0 }, + { retain: true, qos: 0 } ) }, 2102)) } diff --git a/src/spec/scenarios/showJsonFormatting.ts b/src/spec/scenarios/showJsonFormatting.ts index 235e5c5..350d961 100644 --- a/src/spec/scenarios/showJsonFormatting.ts +++ b/src/spec/scenarios/showJsonFormatting.ts @@ -1,7 +1,7 @@ import { Browser } from 'webdriverio' import { clickOn, - sleep, + sleep } from '../util' export async function showJsonFormatting(browser: Browser) { diff --git a/src/spec/util/index.ts b/src/spec/util/index.ts index 7361ca1..477903d 100644 --- a/src/spec/util/index.ts +++ b/src/spec/util/index.ts @@ -26,7 +26,7 @@ export async function delteTextWithBackspaces(element: Element, browser: B } } -export async function writeTextToInput(name: string, text: string, browser: Browser, wait: boolean = true) { +export async function writeTextToInput(name: string, text: string, browser: Browser, wait: boolean = true) { const input = await browser.$(`//label[contains(text(), "${name}")]/..//input`) await clickOn(input, browser, 1) wait && await sleep(500) @@ -70,13 +70,13 @@ export async function createFakeMousePointer(browser: Browser) { await browser.execute(js) } -export async function showText(text: string, duration: number = 0, browser: Browser, location: 'top' | 'bottom' | 'middle' = 'bottom', keys = []) { +export async function showText(text: string, duration: number = 0, browser: Browser, location: 'top' | 'bottom' | 'middle' = 'bottom', keys = []) { const js = `window.demo.showMessage('${text}', '${location}', ${duration});` browser.execute(js) } -export async function showKeys(text: string, duration: number = 0, browser: Browser, location: 'top' | 'bottom' | 'middle' = 'bottom', keys: string[] = []) { +export async function showKeys(text: string, duration: number = 0, browser: Browser, location: 'top' | 'bottom' | 'middle' = 'bottom', keys: string[] = []) { const js = `window.demo.showMessage('${text}', '${location}', ${duration}, ${JSON.stringify(keys)});` browser.execute(js) diff --git a/src/spec/webdriverio.ts b/src/spec/webdriverio.ts index 8f36e3e..05febd4 100644 --- a/src/spec/webdriverio.ts +++ b/src/spec/webdriverio.ts @@ -20,7 +20,7 @@ import { createFakeMousePointer, hideText, showText, - sleep, + sleep } from './util' process.on('unhandledRejection', (error: Error) => { diff --git a/tslint.json b/tslint.json index 8365357..2931707 100644 --- a/tslint.json +++ b/tslint.json @@ -1,14 +1,26 @@ { - "extends": ["tslint-config-airbnb", "tslint-react"], + "extends": ["tslint-config-airbnb", "tslint-react", "tslint-react-recommended"], "rules": { "semicolon": [true, "never"], "max-line-length": [true, 200], "member-access": true, "no-else-after-return": false, "align": false, - "variable-name": false, "jsx-no-lambda": false, "indent": [true, "spaces", 2], - "import-name": false + "import-name": false, + "variable-name": [true, "ban-keywords", "check-format", "allow-pascal-case"], + "trailing-comma": [ + true, + { + "multiline": { + "objects": "always", + "arrays": "always", + "functions": "never", + "typeLiterals": "ignore" + }, + "esSpecCompliant": true + } + ] } } diff --git a/yarn.lock b/yarn.lock index cc27b88..9336965 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2110,7 +2110,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.7.0: +js-yaml@^3.12.0, js-yaml@^3.12.1: version "3.12.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA== @@ -2118,6 +2118,14 @@ js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.7.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e" + integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -3736,6 +3744,11 @@ tslint-microsoft-contrib@~5.2.1: dependencies: tsutils "^2.27.2 <2.29.0" +tslint-react-recommended@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/tslint-react-recommended/-/tslint-react-recommended-1.0.15.tgz#4166dc7d87b57280110673c99315a35ac5a76a7e" + integrity sha1-QWbcfYe1coARBnPJkxWjWsWnan4= + tslint-react@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1" @@ -3748,10 +3761,10 @@ tslint-strict-null-checks@^1.0.1: resolved "https://registry.yarnpkg.com/tslint-strict-null-checks/-/tslint-strict-null-checks-1.0.1.tgz#29ad44ed353185f5d7af66a76e29a1bee74d944b" integrity sha512-W7SzlPqOv7E/UnqrqcbUFXeE5M/YU41GpkHY5nkAyhBW12UJ3Xhh9rLAizw57xFLng4Y400h06udmgDe2cNBCg== -tslint@^5.12.0: - version "5.12.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1" - integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw== +tslint@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3" + integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA== dependencies: babel-code-frame "^6.22.0" builtin-modules "^1.1.1" @@ -3759,14 +3772,15 @@ tslint@^5.12.0: commander "^2.12.1" diff "^3.2.0" glob "^7.1.1" - js-yaml "^3.7.0" + js-yaml "^3.13.0" minimatch "^3.0.4" + mkdirp "^0.5.1" resolve "^1.3.2" semver "^5.3.0" tslib "^1.8.0" - tsutils "^2.27.2" + tsutils "^2.29.0" -tsutils@^2.13.1, tsutils@^2.27.2, tsutils@^2.29.0: +tsutils@^2.13.1, tsutils@^2.29.0: version "2.29.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==