Modify appx after it was packed

AppStore review failed, updated entitlements

.gitignore

@@ -2,6 +2,7 @@ node_modules
 backend/coverage
 backend/.nyc_output
 build
+/dist
 .DS_Store
 test.dot
 test.png

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
 
+services:
+  - xvfb
+
 cache:
   directories:
   - node_modules
@@ -14,13 +17,22 @@ os:
   - linux
   - osx
 
+dist: xenial
+
+services:
+  - docker
+
 install:
-  - npm install
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install snapd && sudo snap install snapcraft --classic; fi
+  - yarn install
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get -y install snap squashfs-tools && sudo snap install snapcraft --classic; fi;
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build docker --tag uitest; fi;
 
 script:
-  - npm run build
-  - npm run prepare-release
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run package -- linux; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run package -- mac; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run package -- win; fi
+  - yarn run build
+  - yarn test
+  - export TRAVIS_BUILD_NUMBER="" # Override travis build number since it is uses for tagging the binary version https://github.com/electron-userland/electron-builder/issues/3730
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -e GH_TOKEN=$GH_TOKEN -e GIT_TAG=$TRAVIS_TAG --rm -v `pwd`:/app uitest sh -c "cd app && docker/testMounted.sh"; fi
+  - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package linux; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- mac; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- win; fi

Changelog.md

@@ -0,0 +1,12 @@
+# 0.2.1
+
+- Highlight differences in the last received message with a "diff" view
+- Magnify app content with "Ctrl +", "Ctrl -", "Ctrl 0"
+- Make user interactions more predictable by removing "select topic on mouse over"
+- Add "Quick Preview" setting, to enable topic selection on mouse over
+- Add JSON formatter
+- Show error when connection to the mqtt broker is lost
+- Fix bug where mqtt explorer resets the tree after a reconnect
+- Fix MQTT-Client id
+
+# 0.2.0

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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
+<https://www.gnu.org/licenses/>.

Readme.md

@@ -1,16 +1,52 @@
-# MQTT-Explorer
+# [MQTT Explorer](https://thomasnordquist.github.io/MQTT-Explorer/)
+[![Downloads](https://img.shields.io/github/release/thomasnordquist/mqtt-explorer.svg)](https://travis-ci.org/thomasnordquist/MQTT-Explorer/releases)
+[![Downloads](https://img.shields.io/github/downloads/thomasnordquist/mqtt-explorer/total.svg)](https://travis-ci.org/thomasnordquist/MQTT-Explorer/releases)
+[![Build_Status](https://travis-ci.org/thomasnordquist/MQTT-Explorer.svg?branch=master)](https://travis-ci.org/thomasnordquist/MQTT-Explorer)
+[![Build status](https://ci.appveyor.com/api/projects/status/c35tkm29rm4m5364/branch/master?svg=true)](https://ci.appveyor.com/project/thomasnordquist/mqtt-explorer/branch/master)
 
-See the whole picture of your message queue.
+### Version 
+
+A MQTT Tool to get a quick overview of your MQTT topics and integrate new devices/services more efficiently.
+
+- Visualize topics and topic activity
+- Delete retained topics
+- Search/filter topics
+- Delete topic recursively
+- Publish topics
+- Plot numeric topics
+- Keep a history of each topic
+
+MQTT-Explorer strives to be THE swiss-army-knife tool.
 The perfect tool to integrate new services, IoT devices in your network.
-This application subscribes to all topics on your MQTT-Server and displays your message queue hierarchy, allowing you to drill-down to the topics that are of interest.
+The hierarchical view allows for a quick understanding what is going on on your broker.
 
 ## Download
-The app is prebuilt for Windows, Linux and Mac. [Downloads](https://github.com/thomasnordquist/MQTT-Explorer/releases)
 
-![screenshot](https://user-images.githubusercontent.com/7721625/51086078-340c1c00-1742-11e9-83a9-07f932055467.png)
+| Platform | | Downloads |
+|:----------:|:-------------:|:------:|
+| ![windows](https://user-images.githubusercontent.com/7721625/51445407-b4172080-1d04-11e9-8c70-d8413d1d6d8b.png) | Windows | [portable](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.2.0/MQTT-Explorer-0.2.0.exe), [installer](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.2.0/MQTT-Explorer-Setup-0.2.0.exe) |
+| ![linux](https://user-images.githubusercontent.com/7721625/51445392-947ff800-1d04-11e9-8c7f-a30efb755651.png) | Linux | [AppImage](https:&#x2F;&#x2F;github.com&#x2F;thomasnordquist&#x2F;MQTT-Explorer&#x2F;releases&#x2F;download&#x2F;v0.2.0&#x2F;MQTT-Explorer-0.2.0-x86_64.AppImage)<br>*Run AppImage:<br>Make it executable and double-click it.* |
+| ![ubuntu](https://user-images.githubusercontent.com/7721625/51445401-a5306e00-1d04-11e9-9b9b-20e196b82142.png) | Ubuntu | [![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/mqtt-explorer)<br>[Ubuntu Store](snap://mqtt-explorer) |
+| ![mac](https://user-images.githubusercontent.com/7721625/51445390-921d9e00-1d04-11e9-8339-351469ef20ae.png) | Mac | [dmg](https:&#x2F;&#x2F;github.com&#x2F;thomasnordquist&#x2F;MQTT-Explorer&#x2F;releases&#x2F;download&#x2F;v0.2.0&#x2F;MQTT-Explorer-0.2.0.dmg) |
 
+[More Downloads](https://github.com/thomasnordquist/MQTT-Explorer/releases)
+
+## Screenshots
+![screen1](https://user-images.githubusercontent.com/7721625/51770198-6c6a0d80-20e5-11e9-94d5-a0174634253c.png)
+
+## Demo
+![screencast](https://user-images.githubusercontent.com/7721625/52979302-3f073b80-33d5-11e9-9953-b70ebb349439.gif)
+
+## Performance
+
+This App is optimized to handle thousands of topics and at hundreds of thousands messages per minute.
+
+In very large productive environments brokers may handle an exteme load of topics.
+Subscribing with a wildcard topic is in this scenario not adviced.
+To avoid a scenario where the MQTT-Explorer would have to handle millions of updates, one can set up custom subscriptions in the "Advanced" connection settings.
 
 ## Develop
+
 PRs and issues are welcome
 
 Install with `npm run install`, build with `npm run build`
@@ -19,6 +55,46 @@ Start with `npm run start`
 
 The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management.
 
-## License
-Not yet decided which licens exactly, but the basic idea is: "You may do whatever you want with this tool, except sell it."
+## Automated Tests
 
+To achieve a reliable product automated tests run regulary on travis.
+
+- Data model
+- MQTT integration
+- UI-Tests (The demo is a recorded ui test)
+
+## Telemetry
+
+No personal data is processed, sent or stored.
+
+The app sends telemetry and error reports, this enables me to quickly react on bugs/errors and understand what's going on.
+The app runs on winows, linux and mac and has thousands of users. Responding quickly to bugs is essential.
+This greatly helps to improve the software quality and reliability.
+
+It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.
+
+<details>
+<summary><p>Example telemetry</p>
+</summary>
+
+```javascript
+{ system: { arch: 'x64', platform: 'darwin' },
+  appVersion: '0.0.7',
+  events: { HELLO_EVENT: [ 1547714886134 ] },
+  now: 1547714886135,
+  transactionId: '1767d251-f492-4f2c-aa62-88add3acc26b' }
+{ errors:
+   [ { time: 1547714887921,
+       message: 'He\'s dead Jim!',
+       stack:
+        'Error: He\'s dead Jim!\n    at ./src/tracking.ts.exports.default (./mqtt-explorer/app/build/bundle.js:142765:11)\n    at new Promise (<anonymous>)\n    at Object../src/tracking.ts (./mqtt-explorer/app/build/bundle.js:142764:1)\n    at __webpack_require__ (./mqtt-explorer/app/build/bundle.js:20:30)\n    at Object../src/index.tsx (./mqtt-explorer/app/build/bundle.js:142618:1)\n    at __webpack_require__ (./mqtt-explorer/app/build/bundle.js:20:30)\n    at ../backend/node_modules/charenc/charenc.js.charenc.utf8.stringToBytes (./mqtt-explorer/app/build/bundle.js:84:18)\n    at ./mqtt-explorer/app/build/bundle.js:87:10' } ],
+  now: 1547714887921,
+  transactionId: '53bf9aac-e695-40cc-9a81-b1cf3398843d' }
+```
+
+</details>
+
+Even thoug 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)

Readme.tpl.md

@@ -0,0 +1,100 @@
+# [MQTT Explorer](https://thomasnordquist.github.io/MQTT-Explorer/)
+[![Downloads](https://img.shields.io/github/release/thomasnordquist/mqtt-explorer.svg)](https://travis-ci.org/thomasnordquist/MQTT-Explorer/releases)
+[![Downloads](https://img.shields.io/github/downloads/thomasnordquist/mqtt-explorer/total.svg)](https://travis-ci.org/thomasnordquist/MQTT-Explorer/releases)
+[![Build_Status](https://travis-ci.org/thomasnordquist/MQTT-Explorer.svg?branch=master)](https://travis-ci.org/thomasnordquist/MQTT-Explorer)
+[![Build status](https://ci.appveyor.com/api/projects/status/c35tkm29rm4m5364/branch/master?svg=true)](https://ci.appveyor.com/project/thomasnordquist/mqtt-explorer/branch/master)
+
+### Version {{ version }}
+
+A MQTT Tool to get a quick overview of your MQTT topics and integrate new devices/services more efficiently.
+
+- Visualize topics and topic activity
+- Delete retained topics
+- Search/filter topics
+- Delete topic recursively
+- Publish topics
+- Plot numeric topics
+- Keep a history of each topic
+
+MQTT-Explorer strives to be THE swiss-army-knife tool.
+The perfect tool to integrate new services, IoT devices in your network.
+The hierarchical view allows for a quick understanding what is going on on your broker.
+
+## Download
+
+| Platform | | Downloads |
+|:----------:|:-------------:|:------:|
+| ![windows](https://user-images.githubusercontent.com/7721625/51445407-b4172080-1d04-11e9-8c70-d8413d1d6d8b.png) | Windows | <a href="https://www.microsoft.com/store/apps/9PP8SFM082WD?ocid=badge"><img src="https://assets.windowsphone.com/85864462-9c82-451e-9355-a3d5f874397a/English_get-it-from-MS_InvariantCulture_Default.png" width="150" /></a><br/>{{windowsTargets}} |
+| ![linux](https://user-images.githubusercontent.com/7721625/51445392-947ff800-1d04-11e9-8c7f-a30efb755651.png) | Linux | {{linuxTargets}}<br>*Run AppImage:<br>Make it executable and double-click it.* |
+| ![ubuntu](https://user-images.githubusercontent.com/7721625/51445401-a5306e00-1d04-11e9-9b9b-20e196b82142.png) | Ubuntu | <a href="https://snapcraft.io/mqtt-explorer" title="Get it from the Snap Store"><img src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" width="150" /><br/>[Ubuntu Store](snap://mqtt-explorer) |
+| ![mac](https://user-images.githubusercontent.com/7721625/51445390-921d9e00-1d04-11e9-8339-351469ef20ae.png) | Mac | {{macTargets}} |
+
+[More Downloads](https://github.com/thomasnordquist/MQTT-Explorer/releases)
+
+## Screenshots
+![screen1](https://user-images.githubusercontent.com/7721625/51770198-6c6a0d80-20e5-11e9-94d5-a0174634253c.png)
+
+## Demo
+![screencast](https://user-images.githubusercontent.com/7721625/52979302-3f073b80-33d5-11e9-9953-b70ebb349439.gif)
+
+## Performance
+
+This App is optimized to handle thousands of topics and at hundreds of thousands messages per minute.
+
+In very large productive environments brokers may handle an exteme load of topics.
+Subscribing with a wildcard topic is in this scenario not adviced.
+To avoid a scenario where the MQTT-Explorer would have to handle millions of updates, one can set up custom subscriptions in the "Advanced" connection settings.
+
+## Develop
+
+PRs and issues are welcome
+
+Install with `npm run install`, build with `npm run build`
+
+Start with `npm run start`
+
+The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management.
+
+## Automated Tests
+
+To achieve a reliable product automated tests run regulary on travis.
+
+- Data model
+- MQTT integration
+- UI-Tests (The demo is a recorded ui test)
+
+## Telemetry
+
+No personal data is processed, sent or stored.
+
+The app sends telemetry and error reports, this enables me to quickly react on bugs/errors and understand what's going on.
+The app runs on winows, linux and mac and has thousands of users. Responding quickly to bugs is essential.
+This greatly helps to improve the software quality and reliability.
+
+It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.
+
+<details>
+<summary><p>Example telemetry</p>
+</summary>
+
+```javascript
+{ system: { arch: 'x64', platform: 'darwin' },
+  appVersion: '0.0.7',
+  events: { HELLO_EVENT: [ 1547714886134 ] },
+  now: 1547714886135,
+  transactionId: '1767d251-f492-4f2c-aa62-88add3acc26b' }
+{ errors:
+   [ { time: 1547714887921,
+       message: 'He\'s dead Jim!',
+       stack:
+        'Error: He\'s dead Jim!\n    at ./src/tracking.ts.exports.default (./mqtt-explorer/app/build/bundle.js:142765:11)\n    at new Promise (<anonymous>)\n    at Object../src/tracking.ts (./mqtt-explorer/app/build/bundle.js:142764:1)\n    at __webpack_require__ (./mqtt-explorer/app/build/bundle.js:20:30)\n    at Object../src/index.tsx (./mqtt-explorer/app/build/bundle.js:142618:1)\n    at __webpack_require__ (./mqtt-explorer/app/build/bundle.js:20:30)\n    at ../backend/node_modules/charenc/charenc.js.charenc.utf8.stringToBytes (./mqtt-explorer/app/build/bundle.js:84:18)\n    at ./mqtt-explorer/app/build/bundle.js:87:10' } ],
+  now: 1547714887921,
+  transactionId: '53bf9aac-e695-40cc-9a81-b1cf3398843d' }
+```
+
+</details>
+
+Even thoug 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)

_config.yml

@@ -0,0 +1,15 @@
+theme: jekyll-theme-architect
+title: MQTT Explorer
+description: Tool to visualize your MQTT topics, a MQTT swiss-army knife
+author:
+  name: Thomas Nordquist
+  picture: https://avatars1.githubusercontent.com/u/7721625?s=460&v=4 
+github_username: thomasnordquist
+logo: https://user-images.githubusercontent.com/7721625/52227945-5280b580-28b1-11e9-804c-75a842537393.png
+plugins:
+  - jekyll-seo-tag
+google_analytics: UA-133696837-1
+
+markdown: kramdown
+kramdown:
+  parse_block_html: true

_layouts/default.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="{{ site.lang | default: "en-US" }}">
+  <head>
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen" type="text/css">
+    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
+
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <![endif]-->
+
+    {% seo %}
+  </head>
+
+  <body>
+    <header>
+      <div class="inner">
+        <a href="{{ '/' | absolute_url }}">
+          <h1 style="display: inline">
+            <img src="./icon.png" style="
+              height: 1em;
+              display: inline;
+              vertical-align: top;
+              margin-top: -0.04em;
+            "></img>
+            {{ site.title | default: site.github.repository_name }}
+          </h1>
+        </a>
+        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
+        {% if site.github.is_project_page %}
+          <a href="{{ site.github.repository_url }}" class="button"><small>View project on</small> GitHub</a>
+        {% endif %}
+        {% if site.github.is_user_page %}
+          <a href="{{ site.github.owner_url }}" class="button"><small>Follow me on</small> GitHub</a>
+        {% endif %}
+      </div>
+    </header>
+
+    <div id="content-wrapper">
+      <div class="inner clearfix">
+        <section id="main-content">
+          {{ content }}
+        </section>
+
+        <aside id="sidebar">
+          {% if site.show_downloads %}
+            <a href="{{ site.github.zip_url }}" class="button">
+              <small>Download</small>
+              .zip file
+            </a>
+            <a href="{{ site.github.tar_url }}" class="button">
+              <small>Download</small>
+              .tar.gz file
+            </a>
+          {% endif %}
+
+          {% if site.github.is_project_page %}
+            <p class="repo-owner"><a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a> is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</p>
+          {% endif %}
+
+          <p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</p>
+        </aside>
+      </div>
+    </div>
+
+    {% if site.google_analytics %}
+      <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', '{{ site.google_analytics }}', 'auto');
+        ga('send', 'pageview');
+      </script>
+    {% endif %}
+  </body>
+</html>

app/index.html

@@ -2,21 +2,25 @@
 <html>
     <head>
         <meta charset="UTF-8" />
-        <title>MQTT-Explorer</title>
+        <title>MQTT Explorer</title>
+        <script src="./bugtracking.bundle.js"></script>
+
         <style>
           body, html {
             margin: 0;
             padding: 0;
           }
+
           @keyframes example {
-            0%   {background-color: inherit;}
-            25%  {background-color: #3f51b5;}
+            0%   {background-color: none;}
+            25%  {background-color: #3f51b5 ;}
             50%  {background-color: #3f51b5;}
-            100% {background-color: inherit;}
+            100% {background-color: none;}
           }
 
           ::-webkit-scrollbar {
             width: 8px;
+            height: 8px;
           }
 
           ::-webkit-scrollbar-corner {
@@ -24,12 +28,11 @@
           }
 
           ::-webkit-scrollbar-track {
-              -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
+            -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
           }
 
           ::-webkit-scrollbar-thumb {
-              background-color: rgba(140,140,140,0.8);
-              #-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.8);
+            background-color: rgba(140,140,140,0.8);
           }
         </style>
         <style>
@@ -46,7 +49,7 @@
             margin: 37vh auto 0 auto;
             height: 25vh;
             width: 25vh;
-            background-image:url('./rings.svg');
+            /* background-image:url('../rings.svg'); */
             background-size: cover;
           }
           #splash2 {
@@ -56,19 +59,76 @@
             0%   {opacity: 1;}
             100% {opacity: 0;}
           }
+
+          .Resizer {
+              background: #eee;
+              opacity: .2;
+              z-index: 1;
+              -moz-box-sizing: border-box;
+              -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+              -moz-background-clip: padding;
+              -webkit-background-clip: padding;
+              background-clip: padding-box;
+          }
+
+          .Resizer:hover {
+              -webkit-transition: all 0.3s ease-out;
+              transition: all 0.3s ease-out;
+          }
+
+          .Resizer.horizontal {
+              height: 11px;
+              margin: -5px 0;
+              border-top: 5px solid rgba(255, 255, 255, 0);
+              border-bottom: 5px solid rgba(255, 255, 255, 0);
+              cursor: row-resize;
+              width: 100%;
+          }
+
+          .Resizer.horizontal:hover {
+              border-top: 5px solid rgba(0, 0, 0, 0.5);
+              border-bottom: 5px solid rgba(0, 0, 0, 0.5);
+          }
+
+          .Resizer.vertical {
+              width: 11px;
+              margin: 0 -5px;
+              border-left: 5px solid rgba(255, 255, 255, 0);
+              border-right: 5px solid rgba(255, 255, 255, 0);
+              cursor: col-resize;
+          }
+
+          .Resizer.vertical:hover {
+              border-left: 5px solid rgba(255, 255, 255, 0.5);
+              border-right: 5px solid rgba(255, 255, 255, 0.5);
+          }
+          .Resizer.disabled {
+            cursor: not-allowed;
+          }
+          .Resizer.disabled:hover {
+            border-color: transparent;
+          }
+
         </style>
         <script src="http://localhost:35729/livereload.js"></script>
     </head>
     <body>
-        <div id="splash"><div id="splash1"></div>
-          <!-- <div id="splash1">
-            <div id="splash2" style="color: #ddd" class="la-square-jelly-box la-3x">
-              <div>a</div>
-              <div>ads</div>
-            </div> -->
-          </div>
-        </div>
+        <div id="splash"><div id="splash1"></div></div>
         <div id="app" style="font:-webkit-control"></div>
-        <script src="./build/bundle.js"></script>
+        <script>
+            function loadScript(path) {
+              var script = document.createElement("script");
+              script.src = path
+              document.head.appendChild(script);
+            }
+    
+            document.addEventListener('DOMContentLoaded', onLoad(), false);
+            function onLoad() {
+              // <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %>loadScript("<%- file %>");<% }); %>
+              // loadScript("<%= JSON.stringify(htmlWebpackPlugin) %>")
+            }
+          </script>
+          <% _.forEach(htmlWebpackPlugin.files.js, function(file) { %><script src="<%- file %>"></script><% }); %>
     </body>
 </html>

app/package.json

@@ -9,37 +9,56 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@material-ui/icons": "^3.0.1",
-    "@material-ui/lab": "^3.0.0-alpha.27",
+    "@material-ui/core": "^4.0.0-alpha.1",
+    "@material-ui/icons": "^3.0.2",
+    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/styles": "^3.0.0-alpha.10",
+    "@types/diff": "^4.0.1",
+    "@types/node": "^10.12.18",
+    "@types/prismjs": "^1.9.1",
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.11",
     "@types/react-redux": "^6.0.12",
-    "electron-nucleus": "^1.11.0",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0",
-    "react-redux": "^6.0.0",
-    "redux": "^4.0.1",
-    "webpack-livereload-plugin": "^2.2.0"
-  },
-  "dependencies": {
-    "@material-ui/core": "^3.7.1",
-    "@types/node": "^10.12.18",
+    "@types/react-resize-detector": "^3.1.0",
+    "@types/react-split-pane": "^0.1.67",
     "@types/sha1": "^1.1.1",
     "@types/socket.io-client": "^1.4.32",
+    "@types/uuid": "^3.4.4",
     "@types/vis": "^4.21.9",
     "awesome-typescript-loader": "^5.2.1",
+    "compare-versions": "^3.4.0",
     "copy-text-to-clipboard": "^1.0.4",
+    "css-loader": "^2.1.0",
+    "diff": "^4.0.1",
+    "electron-nucleus": "^1.11.0",
+    "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
+    "html-webpack-plugin": "^4.0.0-beta.5",
     "jquery": "^3.3.1",
+    "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "moving-average": "^1.0.0",
+    "number-abbreviate": "^2.0.0",
+    "prismjs": "^1.15.0",
+    "react": "16.8",
     "react-ace": "^6.3.2",
-    "react-json-view": "^1.19.1",
+    "react-dom": "^16.7.0",
+    "react-redux": "^6.0.0",
+    "react-resize-detector": "^3.4.0",
+    "react-split-pane": "^0.1.85",
+    "react-vis": "^1.11.6",
+    "redux": "^4.0.1",
+    "redux-batched-actions": "^0.4.1",
+    "redux-thunk": "^2.3.0",
     "sha1": "^1.1.1",
     "socket.io-client": "^2.2.0",
     "source-map-loader": "^0.2.4",
+    "style-loader": "^0.23.1",
     "typescript": "^3.2.2",
+    "uuid": "^3.3.2",
     "webpack": "^4.28.2",
+    "webpack-bundle-analyzer": "^3.0.3",
     "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.14"
+    "webpack-dev-server": "^3.1.14",
+    "webpack-livereload-plugin": "^2.2.0"
   }
 }

app/src/App.tsx

@@ -1,107 +1,94 @@
 import * as React from 'react'
-import * as q from '../../backend/src/Model'
-
-import { Theme, withStyles } from '@material-ui/core/styles'
-
-import { AppState } from './reducers'
-import Connection from './components/ConnectionSetup/Connection'
+import ConnectionSetup from './components/ConnectionSetup/ConnectionSetup'
 import CssBaseline from '@material-ui/core/CssBaseline'
-import Settings from './components/Settings'
+import ErrorBoundary from './ErrorBoundary'
+import Notification from './components/Notification'
 import Sidebar from './components/Sidebar/Sidebar'
 import TitleBar from './components/TitleBar'
 import Tree from './components/Tree/Tree'
 import UpdateNotifier from './UpdateNotifier'
+import { AppState } from './reducers'
+import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import { default as SplitPane } from 'react-split-pane'
+import { globalActions, settingsActions } from './actions'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
-interface State {
-  selectedNode?: q.TreeNode,
-  connectionId?: string
-}
+const Settings = React.lazy(() => import('./components/Settings'))
 
 interface Props {
-  name: string
-  theme: Theme
+  connectionId: string
+  classes: any
   settingsVisible: boolean
+  error?: string
+  actions: typeof globalActions
+  settingsActions: typeof settingsActions
 }
 
-class App extends React.Component<Props, State> {
+class App extends React.PureComponent<Props, {}> {
   constructor(props: any) {
     super(props)
-    this.state = {
-      selectedNode: undefined,
-    }
+    this.state = { }
   }
 
-  private getStyles(): {[s: string]: React.CSSProperties} {
-    const { theme } = this.props
-    const drawerWidth = 300
-    return {
-      left: {
-        backgroundColor: theme.palette.background.default,
-        color: theme.palette.text.primary,
-        height: 'calc(100vh - 64px)',
-        float: 'left',
-        overflowY: 'scroll',
-        overflowX: 'hidden',
-        display: 'block',
-        width: '60vw',
-      },
-      right: {
-        height: 'calc(100vh - 64px)',
-        color: theme.palette.text.primary,
-        float: 'left',
-        width: '40vw',
-        overflowY: 'scroll',
-        overflowX: 'hidden',
-        display: 'block',
-      },
-      centerContent: {
-        width: '100vw',
-        overflow: 'hidden',
-      },
-      content: {
-        backgroundColor: theme.palette.background.default,
-        transition: theme.transitions.create('margin', {
-          easing: theme.transitions.easing.sharp,
-          duration: theme.transitions.duration.leavingScreen,
-        }),
-        marginLeft: 0,
-      },
-      contentShift: {
-        padding: 0,
-        backgroundColor: theme.palette.background.default,
-        transition: theme.transitions.create('margin', {
-          easing: theme.transitions.easing.easeOut,
-          duration: theme.transitions.duration.enteringScreen,
-        }),
-        marginLeft: drawerWidth,
-      },
+  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)
+      return (
+        <Notification
+          message={error}
+          onClose={() => { this.props.actions.showError(undefined) }}
+        />
+      )
     }
   }
 
   public render() {
     const { settingsVisible } = this.props
-    const { content, contentShift, centerContent } = this.getStyles()
+    const { content, contentShift, centerContent, paneDefaults, heightProperty } = this.props.classes
+
     return (
-      <div style={centerContent}>
+      <div className={centerContent}>
         <CssBaseline />
-        <Settings />
-        <div style={settingsVisible ? contentShift : content}>
-            <TitleBar />
-            <div style={centerContent}>
-              <div style={this.getStyles().left}>
-                <Tree connectionId={this.state.connectionId} didSelectNode={(node: q.TreeNode) => {
-                  this.setState({ selectedNode: node })
-                }} />
-              </div>
-              <div style={this.getStyles().right}>
-                <Sidebar connectionId={this.state.connectionId} />
-              </div>
+        <ErrorBoundary>
+          {this.renderError()}
+          <React.Suspense fallback={<div>Loading...</div>}>
+            <Settings />
+          </React.Suspense>
+          <div className={centerContent}>
+            <div className={`${settingsVisible ? contentShift : content}`}>
+                <TitleBar />
             </div>
-        </div>
-        <UpdateNotifier />
-        <Connection onConnection={(connectionId: string) => this.setState({ connectionId })}/>
-      </div >
+            <div>
+              <SplitPane
+                step={20}
+                primary="second"
+                className={`${settingsVisible ? contentShift : content} ${heightProperty}`}
+                split="vertical"
+                minSize={250}
+                defaultSize={500}
+                resizerStyle={{ width: '2px', margin: '0 -10px 0 0px' }}
+                allowResize={true}
+                style={{ position: 'relative' }}
+                pane1Style={{ overflow: 'hidden' }}
+              >
+                <div className={paneDefaults}>
+                  <Tree />
+                </div>
+                <div className={paneDefaults}>
+                  <Sidebar connectionId={this.props.connectionId} />
+                </div>
+              </SplitPane>
+            </div>
+          </div>
+          <UpdateNotifier />
+          <ConnectionSetup />
+        </ErrorBoundary>
+      </div>
     )
   }
 }
@@ -109,7 +96,59 @@ class App extends React.Component<Props, State> {
 const mapStateToProps = (state: AppState) => {
   return {
     settingsVisible: state.settings.visible,
+    connectionId: state.connection.connectionId,
+    error: state.globalState.error,
+    highlightTopicUpdates: state.settings.highlightTopicUpdates,
   }
 }
 
-export default withStyles({}, { withTheme: true })(connect(mapStateToProps)(App))
+const styles = (theme: Theme) => {
+  const drawerWidth = 300
+  return {
+    heightProperty: {
+      height: 'calc(100vh - 64px) !important',
+    },
+    paneDefaults: {
+      backgroundColor: theme.palette.background.default,
+      color: theme.palette.text.primary,
+      overflowY: 'scroll' as 'scroll',
+      overflowX: 'hidden' as 'hidden',
+      display: 'block' as 'block',
+      height: 'calc(100vh - 64px)',
+    },
+    centerContent: {
+      width: '100vw',
+      overflow: 'hidden' as 'hidden',
+    },
+    content: {
+      width: '100vw',
+      overflowX: 'hidden' as 'hidden',
+      backgroundColor: theme.palette.background.default,
+      transition: theme.transitions.create('transform', {
+        easing: theme.transitions.easing.sharp,
+        duration: theme.transitions.duration.leavingScreen,
+      }),
+      transform: 'translateX(0px)',
+    },
+    contentShift: {
+      overflowX: 'hidden' as 'hidden',
+      width: '100vw',
+      padding: 0,
+      backgroundColor: theme.palette.background.default,
+      transition: theme.transitions.create('transform', {
+        easing: theme.transitions.easing.easeOut,
+        duration: theme.transitions.duration.enteringScreen,
+      }),
+      transform: `translateX(${drawerWidth}px)`,
+    },
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(globalActions, dispatch),
+    settingsActions: bindActionCreators(settingsActions, dispatch),
+  }
+}
+
+export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(App))

app/src/ErrorBoundary.tsx

@@ -0,0 +1,111 @@
+import * as React from 'react'
+import PersistantStorage from './PersistantStorage'
+import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
+import Warning from '@material-ui/icons/Warning'
+import { electronRendererTelementry } from 'electron-telemetry'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import {
+  Button,
+  Modal,
+  Paper,
+  Toolbar,
+  Typography,
+} from '@material-ui/core'
+
+interface State {
+  error?: Error
+}
+
+interface Props {
+  classes: any
+}
+
+class ErrorBoundary extends React.Component<Props, State> {
+  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 }
+  }
+
+  private restart = () => {
+    window.location = window.location
+  }
+
+  private clearStorage = () => {
+    PersistantStorage.clear()
+    window.location = window.location
+  }
+
+  public render() {
+    if (!this.state.error) {
+      return this.props.children
+    }
+
+    const { classes } = this.props
+    return (
+      <Modal open={true} disableAutoFocus={true}>
+        <Paper className={classes.root}>
+          <Toolbar style={{ padding: '0' }}>
+            <Typography className={classes.title} variant="h6" color="inherit"><Warning /> Oooooops!</Typography>
+          </Toolbar>
+          <Typography className={classes.centered}>I hoped that you would never see this window, but MQTT-Explorer had an unexpected error.</Typography>
+          <Typography className={classes.centered}><SentimentDissatisfied /></Typography>
+          <pre className={classes.textColor} style={{ maxHeight: '35vh', overflow: 'scroll' }}>
+            <code className={classes.textColor}>
+              {this.state.error.stack}
+            </code>
+          </pre>
+          <Typography>
+            Please report this issue with a short description of what happened to
+            <span> <a className={classes.textColor} href="https://github.com/thomasnordquist/MQTT-Explorer/issues">https://github.com/thomasnordquist/MQTT-Explorer/issues</a></span>
+          </Typography>
+          <div>
+            <div className={classes.buttonPositioning}>
+              <Button className={classes.button} variant="contained" color="secondary" onClick={this.clearStorage}>Start Fresh</Button>
+              <Button className={classes.button} variant="contained" color="primary" onClick={this.restart}>Restart</Button>
+            </div>
+          </div>
+        </Paper>
+      </Modal>
+    )
+  }
+}
+
+const styles = (theme: Theme) => ({
+  button: {
+    margin: '0 8px 0 8px',
+  },
+  root: {
+    minWidth: 550,
+    maxWidth: 650,
+    backgroundColor: theme.palette.background.default,
+    margin: '10vh auto auto auto',
+    padding: theme.spacing(2),
+    outline: 'none',
+  },
+  title: {
+    color: theme.palette.text.primary,
+    margin: '0',
+    textAlign: 'center' as 'center',
+  },
+  textColor: {
+    color: theme.palette.text.primary,
+  },
+  centered: {
+    textAlign: 'center' as 'center',
+  },
+  buttonPositioning: {
+    textAlign: 'center' as 'center',
+    marginTop: theme.spacing(2),
+  },
+})
+
+export default withStyles(styles)(ErrorBoundary)

app/src/PersistantStorage.ts

@@ -0,0 +1,87 @@
+import { rendererEvents } from '../../events'
+import { v4 } from 'uuid'
+
+import {
+  storageStoreEvent,
+  makeStorageResponseEvent,
+  storageLoadEvent,
+  storageClearEvent,
+  makeStorageAcknoledgementEvent,
+} from '../../events/StorageEvents'
+
+export interface StorageIdentifier<Model> {
+  id: string
+}
+
+export interface PersistantStorage {
+  store<Model>(identifier: StorageIdentifier<Model>, data: Model): Promise<void>
+  load<Model>(identifier: StorageIdentifier<Model>): Promise<Model | undefined>
+  clear(): Promise<void>
+}
+
+class RemoteStorage implements PersistantStorage {
+  private timeoutCallback(event: any, callback: any, reject: any) {
+    setTimeout(() => {
+      reject('remote storage timeout')
+      rendererEvents.unsubscribe(event, callback)
+    }, 10000)
+  }
+
+  private expectAck(transactionId: string): Promise<void> {
+    const ack = makeStorageAcknoledgementEvent(transactionId)
+    return new Promise<void>((resolve, reject) => {
+      const callback = (msg: any) => {
+        if (msg && msg.error) {
+          reject(msg.error)
+        } else {
+          resolve()
+        }
+        rendererEvents.unsubscribe(ack, callback)
+      }
+      rendererEvents.subscribe(ack, callback)
+      this.timeoutCallback(ack, callback, reject)
+    })
+  }
+
+  public store<Model>(identifier: StorageIdentifier<Model>, data: Model): Promise<void> {
+    const transactionId = v4()
+    const expectation = this.expectAck(transactionId)
+    rendererEvents.emit(storageStoreEvent, { data, transactionId, store: identifier.id })
+    return expectation
+  }
+
+  public load<Model>(identifier: StorageIdentifier<Model>): Promise<Model | undefined> {
+    const transactionId = v4()
+    const responseEvent = makeStorageResponseEvent(transactionId)
+
+    const promise = new Promise<Model>((resolve, reject) => {
+      const callback = (msg: any) => {
+        if (msg.error) {
+          reject(msg.error)
+        } else {
+          resolve(msg.data)
+        }
+        rendererEvents.unsubscribe(responseEvent, callback)
+      }
+      rendererEvents.subscribe(responseEvent, callback)
+      this.timeoutCallback(responseEvent, callback, reject)
+    })
+
+    rendererEvents.emit(storageLoadEvent, {
+      transactionId,
+      store: identifier.id,
+    })
+
+    return promise
+  }
+
+  public clear(): Promise<void> {
+    const transactionId = v4()
+    const expectation = this.expectAck(transactionId)
+
+    rendererEvents.emit(storageClearEvent, { transactionId })
+    return expectation
+  }
+}
+
+export default new RemoteStorage()

app/src/TopicViewModel.ts

@@ -0,0 +1,19 @@
+import { EventDispatcher } from '../../events'
+
+export class TopicViewModel {
+  private selected: boolean
+  public change = new EventDispatcher<void, TopicViewModel>(this)
+
+  public constructor() {
+    this.selected = false
+  }
+
+  public isSelected() {
+    return this.selected
+  }
+
+  public setSelected(selected: boolean) {
+    this.selected = selected
+    this.change.dispatch()
+  }
+}

app/src/UpdateNotifier.tsx

@@ -10,16 +10,18 @@ import {
    Typography,
 } from '@material-ui/core'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import { UpdateInfo, checkForUpdates, rendererEvents, updateAvailable } from '../../events'
-import { green, red } from '@material-ui/core/colors'
+import { green } from '@material-ui/core/colors'
 
 import { AppState } from './reducers'
 import Close from '@material-ui/icons/Close'
 import CloudDownload from '@material-ui/icons/CloudDownload'
-import { UpdateFileInfo } from 'builder-util-runtime'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { updateNotifierActions } from './actions'
+import axios from 'axios'
+import * as compareVersions from 'compare-versions'
+import * as electron from 'electron'
+import * as os from 'os'
 
 interface Props {
   showUpdateNotification: boolean
@@ -28,27 +30,55 @@ interface Props {
   actions: any
 }
 
-class UpdateNotifier extends React.Component<Props, {}> {
-  private updateInfo?: UpdateInfo
+interface GithubRelease {
+  url: string,
+  assets?: GithubAsset[]
+  published_at: string // "2019-01-25T20:14:39Z"
+  body_html: string
+  body: string
+  body_text: string
+  tag_name: string
+}
+
+interface GithubAsset {
+  id: number
+  node_id: string
+  url: string
+  name: string
+  label: string
+}
+
+interface State {
+  newerVersions: GithubRelease[]
+}
+
+class UpdateNotifier extends React.Component<Props, State> {
   constructor(props: any) {
     super(props)
-    this.state = {
-      selectedNode: undefined,
-    }
+    this.state = { newerVersions: [] }
+
+    // window.compare = compareVersions
+    const ownVersion = electron.remote.app.getVersion()
+    this.fetchReleases().then((releases) => {
+      const newerVersions = releases
+        .filter(release => compareVersions(release.tag_name, ownVersion) > 0)
+        .sort((a, b) => compareVersions(b.tag_name, a.tag_name))
+
+      if (newerVersions.length > 0) {
+        this.setState({ newerVersions })
+        this.props.actions.showUpdateNotification(true)
+      }
+    })
   }
 
-  public componentDidMount() {
-    rendererEvents.emit(checkForUpdates, undefined)
-    rendererEvents.subscribe(updateAvailable, this.handleUpdate)
-  }
-
-  public componentWillUnmount() {
-    rendererEvents.unsubscribeAll(updateAvailable)
-  }
-
-  private handleUpdate = (updateInfo: UpdateInfo) => {
-    this.updateInfo = updateInfo
-    this.props.actions.showUpdateNotification(true)
+  private fetchReleases(): Promise<GithubRelease[]> {
+    return axios.get('https://api.github.com/repos/thomasnordquist/mqtt-explorer/releases', {
+      headers: {
+        accept: 'application/vnd.github.v3.full+json',
+      },
+    }).then((res) => {
+      return res.data
+    })
   }
 
   private onCloseNotification = (event: React.SyntheticEvent<any>, reason: string) => {
@@ -90,12 +120,12 @@ class UpdateNotifier extends React.Component<Props, {}> {
       <Snackbar
         anchorOrigin={snackbarAnchor}
         open={this.props.showUpdateNotification}
-        autoHideDuration={7000}
+        autoHideDuration={12000}
         onClose={this.onCloseNotification}
       >
         <SnackbarContent
           className={this.props.classes.success}
-          message="Update available"
+          message={`${this.state.newerVersions.length} Update(s) available`}
           action={this.notificationActions()}
         />
       </Snackbar>
@@ -105,7 +135,7 @@ class UpdateNotifier extends React.Component<Props, {}> {
   private notificationActions() {
     return [(
         <Button key="undo" size="small" onClick={this.showDetails}>
-          Download
+          Details
         </Button>
       ), (
         <IconButton
@@ -122,10 +152,14 @@ class UpdateNotifier extends React.Component<Props, {}> {
   }
 
   private renderUpdateDetails() {
-    if (!this.updateInfo) {
+    const latestUpdate = this.state.newerVersions[0]
+    if (!latestUpdate) {
       return null
     }
-    const releaseNotes = (this.updateInfo.releaseNotes as string) || ''
+    const releaseNotes = this.state.newerVersions
+      .map(release => `<p><h3>${release.tag_name}</h3><p/><p>${release.body_html}</p>`)
+      .join('<hr />')
+
     return (
       <Modal
         open={this.props.showUpdateDetails}
@@ -133,32 +167,58 @@ class UpdateNotifier extends React.Component<Props, {}> {
         onClose={this.hideDetails}
       >
         <Paper className={this.props.classes.root}>
-          <Typography variant="h6" className={this.props.classes.title}>Version {this.updateInfo.version}</Typography>
+          <Typography variant="h6" className={this.props.classes.title}>Version {latestUpdate.tag_name}</Typography>
           <Typography className={this.props.classes.title}>Changelog</Typography>
           <div className={this.props.classes.releaseNotes} dangerouslySetInnerHTML={{ __html: releaseNotes }} />
-          {this.renderDownloads(this.updateInfo)}
+          {this.renderDownloads()}
+          <Button
+            className={this.props.classes.download}
+            onClick={this.openGithub}
+          >
+            Github Page
+          </Button>
           <Button className={this.props.classes.closeButton} color="secondary" onClick={this.hideDetails}>Close</Button>
         </Paper>
       </Modal>
     )
   }
 
-  private urlToFilename(url: string) {
-    const parts = url.split('/')
-
-    return parts[parts.length - 1]
+  private openGithub = () => {
+    this.openUrl('https://github.com/thomasnordquist/MQTT-Explorer')
   }
 
-  private renderDownloads(updateInfo: UpdateInfo) {
-    console.log(updateInfo)
-    return updateInfo.files
-      .map((file: UpdateFileInfo, index: number) => (
-        <div key={index}>
+  private openUrl = (url: string) => {
+    electron.shell.openExternal(url)
+  }
+
+  private assetForCurrentPlatform(asset: GithubAsset) {
+    let regex: RegExp
+    if (os.platform() === 'darwin') {
+      regex = /\.dmg$/
+    } else if (os.platform() === 'darwin') {
+      regex = /\.exe$/
+    } else {
+      regex = /\.AppImage$/
+    }
+
+    return regex.test(asset.name)
+  }
+
+  private renderDownloads() {
+    const latestUpdate = this.state.newerVersions[0]
+    if (!latestUpdate || !latestUpdate.assets) {
+      return null
+    }
+
+    return latestUpdate.assets
+      .filter(this.assetForCurrentPlatform)
+      .map(asset => (
+        <div>
           <Button
             className={this.props.classes.download}
-            href={file.url}
+            onClick={() => this.openUrl(asset.url)}
           >
-            <IconButton><CloudDownload /></IconButton>{this.urlToFilename(file.url)}
+            <CloudDownload />&nbsp;{asset.name}
           </Button>
         </div>
       ))
@@ -171,14 +231,14 @@ const styles = (theme: Theme) => ({
     color: theme.typography.button.color,
   },
   close: {
-    padding: theme.spacing.unit / 2,
+    padding: '4px',
   },
   root: {
     minWidth: '350px',
     maxWidth: '500px',
     backgroundColor: theme.palette.background.default,
     margin: '20vh auto auto auto',
-    padding: `${2 * theme.spacing.unit}px`,
+    padding: theme.spacing(2),
     outline: 'none',
   },
   title: {
@@ -191,7 +251,7 @@ const styles = (theme: Theme) => ({
     maxHeight: '28vh',
   },
   paper: {
-    padding: `${theme.spacing.unit * 2}px`,
+    padding: theme.spacing(2),
     color: theme.palette.text.secondary,
   },
   download: {
@@ -205,8 +265,8 @@ const styles = (theme: Theme) => ({
 
 const mapStateToProps = (state: AppState) => {
   return {
-    showUpdateNotification: state.showUpdateNotification,
-    showUpdateDetails: state.showUpdateDetails,
+    showUpdateNotification: state.globalState.showUpdateNotification,
+    showUpdateDetails: state.globalState.showUpdateDetails,
   }
 }
 
@@ -216,4 +276,4 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default withStyles(styles, { withTheme: true })(connect(mapStateToProps, mapDispatchToProps)(UpdateNotifier))
+export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(UpdateNotifier))

app/src/actions/Connection.ts

@@ -0,0 +1,87 @@
+import * as q from '../../../backend/src/Model'
+import * as url from 'url'
+import { Action, ActionTypes } from '../reducers/Connection'
+import { AppState } from '../reducers'
+import { DataSourceState, MqttOptions } from '../../../backend/src/DataSource'
+import { Dispatch } from 'redux'
+import { globalActions } from '.'
+import { showError } from './Global'
+import { showTree } from './Tree'
+import { TopicViewModel } from '../TopicViewModel'
+import {
+  addMqttConnectionEvent,
+  makeConnectionStateEvent,
+  removeConnection,
+  rendererEvents,
+} from '../../../events'
+
+export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  dispatch(connecting(connectionId))
+  rendererEvents.emit(addMqttConnectionEvent, { options, id: connectionId })
+  const event = makeConnectionStateEvent(connectionId)
+  const host = url.parse(options.url).hostname
+
+  rendererEvents.subscribe(event, (dataSourceState) => {
+    console.log(dataSourceState)
+    if (dataSourceState.connected) {
+      const didReconnect = Boolean(getState().connection.tree)
+      if (!didReconnect) {
+        const tree = new q.Tree<TopicViewModel>()
+        tree.updateWithConnection(rendererEvents, connectionId)
+        dispatch(showTree(tree))
+        dispatch(connected(tree, host!))
+      }
+    } else if (dataSourceState.error) {
+      dispatch(showError(dataSourceState.error))
+      dispatch(disconnect())
+    }
+    dispatch(updateHealth(dataSourceState))
+  })
+}
+
+const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  let state
+  if (dataSourceState.connecting) {
+    state = 'connecting'
+  } else if (!dataSourceState.connected) {
+    state = 'offline'
+    dispatch(globalActions.showError('Disconnected from server'))
+  } else if (dataSourceState.connected) {
+    state = 'online'
+  } else {
+    state = undefined
+  }
+
+  console.log(state)
+
+  dispatch({
+    type: ActionTypes.CONNECTION_SET_HEALTH,
+    health: state,
+  })
+}
+
+export const connected: (tree: q.Tree<TopicViewModel>, host: string) => Action = (tree: q.Tree<TopicViewModel>, host: string)  => ({
+  tree,
+  host,
+  type: ActionTypes.CONNECTION_SET_CONNECTED,
+})
+
+export const connecting: (connectionId: string) => Action = (connectionId: string)  => ({
+  connectionId,
+  type: ActionTypes.CONNECTION_SET_CONNECTING,
+})
+
+export const disconnect = () => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+  const { connectionId, tree } = getState().connection
+  if (connectionId) {
+    rendererEvents.emit(removeConnection, connectionId)
+    rendererEvents.unsubscribeAll(makeConnectionStateEvent(connectionId))
+  }
+
+  tree && tree.stopUpdating()
+
+  dispatch(showTree(undefined))
+  dispatch({
+    type: ActionTypes.CONNECTION_SET_DISCONNECTED,
+  })
+}

app/src/actions/ConnectionManager.ts

@@ -0,0 +1,119 @@
+import { AppState } from '../reducers'
+import { clearLegacyConnectionOptions, loadLegacyConnectionOptions } from '../model/LegacyConnectionSettings'
+import { ConnectionOptions, createEmptyConnection, makeDefaultConnections } from '../model/ConnectionOptions'
+import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage'
+import { Dispatch } from 'redux'
+import { showError } from './Global'
+import {
+  ActionTypes,
+  Action,
+} from '../reducers/ConnectionManager'
+
+const storedConnectionsIdentifier: StorageIdentifier<{[s: string]: ConnectionOptions}> = {
+  id: 'ConnectionManager_connections',
+}
+
+export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  let connections
+  try {
+    await ensureConnectionsHaveBeenInitialized()
+    connections = await persistantStorage.load(storedConnectionsIdentifier)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+
+  if (!connections) {
+    return
+  }
+
+  dispatch(setConnections(connections))
+  const firstKey = Object.keys(connections)[0]
+  if (firstKey) {
+    dispatch(selectConnection(firstKey))
+  }
+}
+
+export const saveConnectionSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  try {
+    console.log('store settings')
+    await persistantStorage.store(storedConnectionsIdentifier, getState().connectionManager.connections)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+}
+
+export const updateConnection = (connectionId: string, changeSet: any): Action => ({
+  connectionId,
+  changeSet,
+  type: ActionTypes.CONNECTION_MANAGER_UPDATE_CONNECTION,
+})
+
+export const addSubscription = (subscription: string, connectionId: string): Action => ({
+  connectionId,
+  subscription,
+  type: ActionTypes.CONNECTION_MANAGER_ADD_SUBSCRIPTION,
+})
+
+export const deleteSubscription = (subscription: string, connectionId: string): Action => ({
+  connectionId,
+  subscription,
+  type: ActionTypes.CONNECTION_MANAGER_DELETE_SUBSCRIPTION,
+})
+
+export const createConnection = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const newConnection = createEmptyConnection()
+  dispatch(addConnection(newConnection))
+  dispatch(selectConnection(newConnection.id))
+}
+
+export const setConnections = (connections: {[s: string]: ConnectionOptions}): Action => ({
+  connections,
+  type: ActionTypes.CONNECTION_MANAGER_SET_CONNECTIONS,
+})
+
+export const selectConnection = (connectionId: string): Action => ({
+  selected: connectionId,
+  type: ActionTypes.CONNECTION_MANAGER_SELECT_CONNECTION,
+})
+
+export const addConnection = (connection: ConnectionOptions): Action => ({
+  connection,
+  type: ActionTypes.CONNECTION_MANAGER_ADD_CONNECTION,
+})
+
+export const toggleAdvancedSettings = (): Action  => ({
+  type: ActionTypes.CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS,
+})
+
+export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const connectionIds = Object.keys(getState().connectionManager.connections)
+  const connectionIdLocation = connectionIds.indexOf(connectionId)
+
+  const remainingIds = connectionIds.filter(id => id !== connectionId)
+  const nextSelectedConnectionIndex = Math.min(remainingIds.length - 1, connectionIdLocation)
+  const nextSelectedConnection = remainingIds[nextSelectedConnectionIndex]
+
+  dispatch({
+    connectionId,
+    type: ActionTypes.CONNECTION_MANAGER_DELETE_CONNECTION,
+  })
+
+  if (nextSelectedConnection) {
+    dispatch(selectConnection(nextSelectedConnection))
+  }
+}
+
+async function ensureConnectionsHaveBeenInitialized() {
+  const connections = await persistantStorage.load(storedConnectionsIdentifier)
+  const requiresInitialization = !connections
+  if (requiresInitialization) {
+    const migratedConnection = loadLegacyConnectionOptions()
+    const defaultConnections = makeDefaultConnections()
+    persistantStorage.store(storedConnectionsIdentifier, {
+      ...migratedConnection,
+      ...defaultConnections,
+    })
+
+    clearLegacyConnectionOptions()
+  }
+}

app/src/actions/Global.ts

@@ -0,0 +1,6 @@
+import { ActionTypes } from '../reducers'
+
+export const showError = (error?: string) => ({
+  error,
+  type: ActionTypes.showError,
+})

app/src/actions/Publish.ts

@@ -0,0 +1,56 @@
+import { Action, ActionTypes } from '../reducers/Publish'
+import { AppState } from '../reducers'
+import { Dispatch } from 'redux'
+import { makePublishEvent, rendererEvents } from '../../../events'
+
+export const setTopic = (topic?: string): Action  => {
+  return {
+    topic,
+    type: ActionTypes.PUBLISH_SET_TOPIC,
+  }
+}
+
+export const setPayload = (payload?: string): Action => {
+  return {
+    payload,
+    type: ActionTypes.PUBLISH_SET_PAYLOAD,
+  }
+}
+
+export const setQoS = (qos: 0 | 1 | 2): Action => {
+  return {
+    qos,
+    type: ActionTypes.PUBLISH_SET_QOS,
+  }
+}
+
+export const setEditorMode = (editorMode: string): Action => {
+  return {
+    editorMode,
+    type: ActionTypes.PUBLISH_SET_EDITOR_MODE,
+  }
+}
+
+export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, getState: () => AppState)  => {
+  const state = getState()
+  const topic = state.publish.topic
+
+  if (!topic) {
+    return
+  }
+
+  const publishEvent = makePublishEvent(connectionId)
+  const mqttMessage = {
+    topic,
+    payload: state.publish.payload,
+    retain: state.publish.retain,
+    qos: state.publish.qos,
+  }
+  rendererEvents.emit(publishEvent, mqttMessage)
+}
+
+export const toggleRetain = (): Action => {
+  return {
+    type: ActionTypes.PUBLISH_TOGGLE_RETAIN,
+  }
+}

app/src/actions/Settings.ts

@@ -1,21 +1,150 @@
-import { ActionTypes, NodeOrder, CustomAction } from '../reducers'
+import * as q from '../../../backend/src/Model'
+import { AppState } from '../reducers'
+import { autoExpandLimitSet } from '../components/Settings'
+import { batchActions } from 'redux-batched-actions'
+import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage'
+import { Dispatch } from 'redux'
+import { showError } from './Global'
+import { showTree } from './Tree'
+import { TopicViewModel } from '../TopicViewModel'
+import {
+  ActionTypes,
+  SettingsState,
+  TopicOrder,
+} from '../reducers/Settings'
 
-export const setAutoExpandLimit = (autoExpandLimit: number = 0): CustomAction => {
-  return {
+const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
+  id: 'Settings',
+}
+
+export const loadSettings = () => async (dispatch: Dispatch<any>, _getState: () => AppState)  => {
+  try {
+    const settings = await persistantStorage.load(settingsIdentifier)
+    dispatch({
+      settings,
+      type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS,
+    })
+  } catch (error) {
+    dispatch(showError(error))
+  }
+}
+
+export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState)  => {
+  const settings = {
+    ...getState().settings,
+    topicFilter: undefined,
+    visible: undefined,
+  }
+
+  try {
+    await persistantStorage.store(settingsIdentifier, settings)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+}
+
+export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  dispatch({
     autoExpandLimit,
-    type: ActionTypes.setAutoExpandLimit,
-  }
+    type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
+  })
+  dispatch(storeSettings())
 }
 
-export const toggleSettingsVisibility = (): CustomAction => {
-  return {
-    type: ActionTypes.toggleSettingsVisibility,
-  }
+export const selectTopicWithMouseOver = (selectTopicWithMouseOver: boolean) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  dispatch({
+    selectTopicWithMouseOver,
+    type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER,
+  })
+  dispatch(storeSettings())
 }
 
-export const setNodeOrder = (nodeOrder: NodeOrder = NodeOrder.none): CustomAction => {
-  return {
-    nodeOrder,
-    type: ActionTypes.setNodeOrder,
+export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  dispatch({
+    valueRendererDisplayMode,
+    type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE,
+  })
+  dispatch(storeSettings())
+}
+
+export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>, _getState: () => AppState) => {
+  dispatch({
+    type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY,
+  })
+  dispatch(storeSettings())
+}
+
+export const togglehighlightTopicUpdates = () => (dispatch: Dispatch<any>, _getState: () => AppState) => {
+  dispatch({
+    type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY,
+  })
+  dispatch(storeSettings())
+}
+
+export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (dispatch: Dispatch<any>, _getState: () => AppState) => {
+  dispatch({
+    topicOrder,
+    type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
+  })
+  dispatch(storeSettings())
+}
+
+export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+  const { tree } = getState().connection
+
+  dispatch({
+    topicFilter: filterStr,
+    type: ActionTypes.SETTINGS_FILTER_TOPICS,
+  })
+
+  if (!filterStr || !tree) {
+    dispatch(batchActions([setAutoExpandLimit(0), (showTree(tree) as any)]))
+    return
   }
+
+  const topicFilter = filterStr.toLowerCase()
+
+  const nodeFilter = (node: q.TreeNode<TopicViewModel>): boolean => {
+    const topicMatches = node.path().toLowerCase().indexOf(topicFilter) !== -1
+    if (topicMatches) {
+      return true
+    }
+
+    const messageMatches = (node.message && typeof node.message.value === 'string' && node.message.value.toLowerCase().indexOf(filterStr) !== -1)
+    return Boolean(messageMatches)
+  }
+
+  const resultTree = tree.childTopics()
+    .filter(nodeFilter)
+    .map((node: q.TreeNode<TopicViewModel>) => {
+      const clone = node.unconnectedClone()
+      q.TreeNodeFactory.insertNodeAtPosition(node.path().split('/'), clone)
+      return clone.firstNode()
+    })
+    .reduce((a: q.TreeNode<TopicViewModel>, b: q.TreeNode<TopicViewModel>) => {
+      a.updateWithNode(b)
+      return a
+    }, new q.Tree<TopicViewModel>())
+
+  const nextTree: q.Tree<TopicViewModel> = resultTree as q.Tree<TopicViewModel>
+  if (tree.updateSource && tree.connectionId) {
+    nextTree.updateWithConnection(tree.updateSource, tree.connectionId, nodeFilter)
+  }
+
+  dispatch(batchActions([setAutoExpandLimit(autoExpandLimitForTree(nextTree)), (showTree(nextTree) as any)]))
+}
+
+function autoExpandLimitForTree(tree: q.Tree<TopicViewModel>) {
+  if (!tree) {
+    return 0
+  }
+  function closestExistingLimit(i: number): number {
+    const sorted = autoExpandLimitSet.sort((a, b) => Math.abs(a.limit - i) - Math.abs(b.limit - i))
+    return sorted[0]!.limit
+  }
+
+  const count = tree.childTopicCount()
+  const calculatedLimit = Math.max(7 - Math.log(count), 0) * 2
+
+  return closestExistingLimit(calculatedLimit)
 }

app/src/actions/Sidebar.ts

@@ -1,15 +1,46 @@
-import { ActionTypes, CustomAction } from '../reducers'
+import * as q from '../../../backend/src/Model'
+import { Action, Dispatch } from 'redux'
+import { AppState } from '../reducers'
+import { makePublishEvent, rendererEvents } from '../../../events'
 
-export const setPublishTopic = (topic: string): CustomAction  => {
-  return {
-    publishTopic: topic,
-    type: ActionTypes.setPublishTopic,
+export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const { selectedTopic } = getState().tree
+  if (!selectedTopic) {
+    return
   }
+
+  dispatch(clearTopic(selectedTopic, false))
 }
 
-export const setPublishPayload = (payload: string): CustomAction => {
-  return {
-    publishPayload: payload,
-    type: ActionTypes.setPublishPayload,
+export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean, subtopicClearLimit = 50) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+  const { connectionId } = getState().connection
+  if (!connectionId) {
+    return
+  }
+
+  const publishEvent = makePublishEvent(connectionId)
+  const mqttMessage = {
+    topic: topic.path(),
+    payload: null,
+    retain: true,
+    qos: 0 as 0,
+  }
+  console.log('deleting', topic.path())
+  rendererEvents.emit(publishEvent, mqttMessage)
+
+  if (recursive) {
+    topic.childTopics()
+      .filter(topic => Boolean(topic.message && topic.message.value))
+      .slice(0, subtopicClearLimit)
+      .forEach((topic) => {
+        console.log('deleting', topic.path())
+        const mqttMessage = {
+          topic: topic.path(),
+          payload: null,
+          retain: true,
+          qos: 0 as 0,
+        }
+        rendererEvents.emit(publishEvent, mqttMessage)
+      })
   }
 }

app/src/actions/Tree.ts

@@ -1,9 +1,59 @@
-import { ActionTypes, CustomAction } from '../reducers'
 import * as q from '../../../backend/src/Model'
+import { ActionTypes } from '../reducers/Tree'
+import { AnyAction, Dispatch } from 'redux'
+import { AppState } from '../reducers'
+import { batchActions } from 'redux-batched-actions'
+import { setTopic } from './Publish'
+import { TopicViewModel } from '../TopicViewModel'
+const debounce = require('lodash.debounce')
 
-export const selectTopic = (topic: q.TreeNode): CustomAction => {
-  return {
+export const selectTopic = (topic: q.TreeNode<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+  debouncedSelectTopic(topic, dispatch, getState)
+}
+
+const debouncedSelectTopic = debounce((topic: q.TreeNode<TopicViewModel>, dispatch: Dispatch<any>, getState: () => AppState)  => {
+  const { selectedTopic } = getState().tree
+  if (selectedTopic === topic) {
+    return
+  }
+
+  // Update publish topic
+  let setTopicDispatch: any | undefined
+  if (selectedTopic && (selectedTopic.path() === getState().publish.topic || !getState().publish.topic)) {
+    setTopicDispatch = setTopic(topic.path())
+  }
+
+  if (selectedTopic && selectedTopic.viewModel) {
+    selectedTopic.viewModel.setSelected(false)
+  }
+
+  if (topic.viewModel) {
+    topic.viewModel.setSelected(true)
+  }
+
+  const selectTreeTopicDispatch = {
     selectedTopic: topic,
-    type: ActionTypes.selectTopic,
+    type: ActionTypes.TREE_SELECT_TOPIC,
+  }
+
+  if (setTopicDispatch) {
+    dispatch(batchActions([selectTreeTopicDispatch, setTopicDispatch]))
+  } else {
+    dispatch(selectTreeTopicDispatch)
+  }
+}, 70)
+
+export const showTree = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction  => {
+  const visibleTree = getState().tree.tree
+  const connectionTree = getState().connection.tree
+
+  // Stop updates of old tree
+  if (visibleTree !== connectionTree && visibleTree) {
+    visibleTree.stopUpdating()
   }
+
+  return dispatch({
+    tree,
+    type: ActionTypes.TREE_SHOW_TREE,
+  })
 }

app/src/actions/index.ts

@@ -1,6 +1,10 @@
+import * as connectionActions from './Connection'
+import * as connectionManagerActions from './ConnectionManager'
+import * as globalActions from './Global'
+import * as publishActions from './Publish'
 import * as settingsActions from './Settings'
-import * as sidebarActions from './Sidebar'
+import * as sidebarActons from './Sidebar'
 import * as treeActions from './Tree'
 import * as updateNotifierActions from './UpdateNotifier'
 
-export { settingsActions, treeActions, sidebarActions, updateNotifierActions }
+export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons, connectionManagerActions, globalActions }

app/src/bugtracking.ts

@@ -0,0 +1,4 @@
+import { electronRendererTelementry } from 'electron-telemetry'
+
+const spareMeFromGc = electronRendererTelementry
+electronRendererTelementry.registerErrorHandler()

app/src/components/BrokerStatistics.tsx

@@ -0,0 +1,130 @@
+import * as q from '../../../backend/src/Model'
+import * as React from 'react'
+import { AppState } from '../reducers'
+import { connect } from 'react-redux'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { TopicViewModel } from '../TopicViewModel'
+import { Typography } from '@material-ui/core'
+
+const abbreviate = require('number-abbreviate')
+
+interface Stats {
+  topic: string
+  title: string
+}
+
+const styles: StyleRulesCallback = theme => ({
+  flex: {
+    display: 'flex',
+    width: '100%',
+  },
+  container: {
+    width: '100%',
+    height: '224px',
+    backgroundColor: 'rebeccapurple',
+    marginBottom: 0,
+    padding: '8px',
+  },
+})
+
+interface Props {
+  classes: any
+  tree?: q.Tree<TopicViewModel>
+}
+
+class BrokerStatistics extends React.Component<Props, {}> {
+  constructor(props: any) {
+    super(props)
+    this.state = {}
+  }
+
+  public render() {
+    const { tree, classes } = this.props
+    if (!tree || !tree.findNode('$SYS/broker/clients/total')) {
+      return null
+    }
+
+    const stats: any = {
+      broker: {
+        topic: '$SYS/broker/version',
+        title: 'Broker',
+      },
+      clients: {
+        topic: '$SYS/broker/clients/total',
+        title: 'Clients',
+      },
+      subscriptions: {
+        topic: '$SYS/broker/subscriptions/count',
+        title: 'Subscriptions',
+      },
+      received: {
+        topic: '$SYS/broker/messages/received',
+        title: 'Received',
+      },
+      sent: {
+        topic: '$SYS/broker/messages/sent',
+        title: 'Sent',
+      },
+      received5m: {
+        topic: '$SYS/broker/load/messages/received/5min',
+        title: 'Received last 5min',
+      },
+      sent5m: {
+        topic: '$SYS/broker/load/messages/sent/5min',
+        title: 'Sent 5m',
+      },
+      heap: {
+        topic: '$SYS/broker/heap/current',
+        title: 'Memory',
+      },
+      heapMax: {
+        topic: '$SYS/broker/heap/maximum',
+        title: 'Memory (max)',
+      },
+    }
+
+    return (
+      <div className={classes.container}>
+        {this.renderStat(tree, stats.broker)}
+        {this.renderPair(tree, stats.sent, stats.received)}
+        {this.renderPair(tree, stats.clients, stats.subscriptions)}
+        {this.renderPair(tree, stats.sent5m, stats.received5m)}
+        {this.renderPair(tree, stats.heap, stats.heapMax)}
+      </div>
+    )
+  }
+
+  private renderPair(tree: q.Tree<TopicViewModel>, a: Stats, b: Stats) {
+    return (
+      <div className={this.props.classes.flex}>
+        <div style={{ flex: 1 }}>{this.renderStat(tree, a)}</div>
+        <div style={{ flex: 1 }}>{this.renderStat(tree, b)}</div>
+      </div>
+    )
+  }
+
+  public renderStat(tree: q.Tree<TopicViewModel>, stat: Stats) {
+    const node = tree.findNode(stat.topic)
+    if (!node) {
+      return null
+    }
+
+    let value = node.message && node.message.value
+    value = !isNaN(value) ? abbreviate(value) : value
+
+    return (
+      <div key={stat.title}>
+        <Typography><b>{stat.title}</b></Typography>
+        <Typography style={{ paddingLeft: '8px' }}><i>{value}</i></Typography>
+      </div>
+    )
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    tree: state.connection.tree,
+  }
+}
+
+export default withStyles(styles)(connect(mapStateToProps)(BrokerStatistics))

app/src/components/CodeDiff.tsx

@@ -0,0 +1,149 @@
+import * as diff from 'diff'
+import * as Prism from 'prismjs'
+import * as React from 'react'
+import { Theme, withStyles } from '@material-ui/core'
+import 'prismjs/components/prism-json'
+import 'prismjs/themes/prism-tomorrow.css'
+
+interface Props {
+  previous: string
+  current: string
+  nameOfCompareMessage: string
+  language?: 'json'
+  classes: any
+}
+
+class CodeDiff extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    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 <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)} dangerouslySetInnerHTML={{ __html: l }} /></div>
+        })
+        lineNumber += changedLines
+
+        return <div key={key}>{lines}</div>
+      }
+
+      return this.trimNewlineRight(change.value)
+        .split('\n')
+        .map((line, idx) => {
+          return <div key={`${key}-${idx}`} className={this.props.classes.line}><span className={this.cssClassForChange(change)}>{line}</span></div>
+        })
+    })
+
+    return (
+      <div>
+        <pre className={`language-json ${this.props.classes.codeBlock}`}>
+          {code}
+        </pre>
+        {this.renderChangeAmount(changes)}
+      </div>
+    )
+  }
+
+  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)
+    if (additions === 0 && deletions === 0) {
+      return null
+    }
+
+    return (
+      <span style={{ display: 'block', marginBottom: '8px', float: 'right' }}>
+        <span>
+          Comparing with <b>{this.props.nameOfCompareMessage}</b> message:&nbsp;
+
+          <span className={this.props.classes.additions}>+ {additions} line{additions === 1 ? '' : 's'}</span>
+          , <span className={this.props.classes.deletions}>- {deletions} line{deletions === 1 ? '' : 's'}</span>
+        </span>
+      </span>
+    )
+  }
+
+  private trimNewlineRight(str: string) {
+    if (str.slice(-1) === '\n') {
+      return str.slice(0, -1)
+    }
+
+    return str
+  }
+
+  private cssClassForChange(change: diff.Change) {
+    if (change.added === true) {
+      return this.props.classes.addition
+    }
+
+    if (change.removed === true) {
+      return this.props.classes.deletion
+    }
+
+    return this.props.classes.noChange
+  }
+}
+
+const style = (theme: Theme) => {
+  const baseStyle = {
+    width: '100%',
+  }
+  const before = {
+    margin: '0 2px 0 -9px',
+  }
+  return {
+    additions: {
+      color: 'rgb(10, 255, 10)',
+    },
+    deletions: {
+      color: 'rgb(255, 10, 10)',
+    },
+    line: {
+      lineHeight: 'normal',
+    },
+    codeBlock: {
+      fontSize: '12px',
+      maxHeight: '200px',
+      marginLeft: '-16px',
+    },
+    noChange: {
+      ...baseStyle,
+      '&:before': {
+        ...before,
+      },
+    },
+    deletion: {
+      ...baseStyle,
+      backgroundColor: 'rgba(255, 10, 10, 0.3)',
+      '&:before': {
+        ...before,
+        content: "'-'",
+      },
+      '&:hover': {
+        backgroundColor: 'rgba(255, 10, 10, 0.6)',
+      },
+    },
+    addition: {
+      ...baseStyle,
+      backgroundColor: 'rgba(10, 255, 10, 0.3)',
+      '&:hover': {
+        backgroundColor: 'rgba(10, 255, 10, 0.5)',
+      },
+      '&:before': {
+        ...before,
+        content: "'+'",
+      },
+    },
+  }
+}
+
+export default withStyles(style)(CodeDiff)

app/src/components/ConnectionHealthIndicator.tsx

@@ -0,0 +1,54 @@
+import * as React from 'react'
+import DeviceHubOutlined from '@material-ui/icons/DeviceHubOutlined'
+import { AppState } from '../reducers'
+import { connect } from 'react-redux'
+import { ConnectionHealth } from '../reducers/Connection'
+import { green, orange, red } from '@material-ui/core/colors'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { Tooltip } from '@material-ui/core'
+
+const styles: StyleRulesCallback = theme => ({
+  offline: {
+    color: red[700],
+  },
+  online: {
+    color: green[500],
+  },
+  connecting: {
+    color: orange[600],
+  },
+})
+
+interface Props {
+  classes: any
+  connected: boolean
+  health?: ConnectionHealth
+}
+
+class ConnectionHealthIndicator extends React.Component<Props, {}> {
+  constructor(props: any) {
+    super(props)
+  }
+
+  public render() {
+    const { classes, health, connected } = this.props
+    if (!health || !connected) {
+      return null
+    }
+
+    return (
+      <Tooltip title={`Connection health "${health}"`}>
+        <DeviceHubOutlined className={classes[health]} />
+      </Tooltip>
+    )
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    health: state.connection.health,
+    connected: state.connection.connected || state.connection.connecting,
+  }
+}
+
+export default connect(mapStateToProps)(withStyles(styles)(ConnectionHealthIndicator))

app/src/components/ConnectionSetup/AddButton.tsx

@@ -0,0 +1,32 @@
+import * as React from 'react'
+import Add from '@material-ui/icons/Add'
+import { Fab } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+const styles = (theme: Theme) => ({
+  addButton: {
+    height: theme.spacing(4),
+    width: theme.spacing(4),
+    minHeight: '0',
+  },
+  addIcon: {
+    height: theme.spacing(2),
+  },
+})
+
+export const AddButton = withStyles(styles)((props: {
+  classes: any,
+  action: any,
+}) => {
+  return (
+    <Fab
+      size="small"
+      color="secondary"
+      aria-label="Add"
+      className={props.classes.addButton}
+      onClick={props.action}
+    >
+      <Add className={props.classes.addIcon} />
+    </Fab>
+  )
+})

app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx

@@ -0,0 +1,155 @@
+import * as React from 'react'
+import Add from '@material-ui/icons/Add'
+import Delete from '@material-ui/icons/Delete'
+import Undo from '@material-ui/icons/Undo'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../actions'
+import { ConnectionOptions } from '../../model/ConnectionOptions'
+import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+
+import {
+  Button,
+  Grid,
+  IconButton,
+  TextField,
+  List,
+  ListItem,
+  ListItemText,
+} from '@material-ui/core'
+
+interface Props {
+  connection: ConnectionOptions
+  classes: any
+  managerActions: typeof connectionManagerActions
+}
+
+interface State {
+  subscription: string
+}
+
+class ConnectionSettings extends React.Component<Props, State> {
+  constructor(props: any) {
+    super(props)
+    this.state = { subscription: '' }
+  }
+
+  private handleChange = (name: string) => (event: any) => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      [name]: event.target.value,
+    })
+  }
+
+  public render() {
+    const { classes } = this.props
+    return (
+      <div>
+        <form className={classes.container} noValidate={true} autoComplete="off">
+          <Grid container={true} spacing={3}>
+            <Grid item={true} xs={10} className={classes.gridPadding}>
+              <TextField
+                className={classes.fullWidth}
+                label="Subscription"
+                margin="normal"
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) => this.setState({ subscription: event.target.value })}
+              />
+            </Grid>
+            <Grid item={true} xs={2} className={classes.gridPadding}>
+              <Button
+                className={classes.button}
+                color="secondary"
+                onClick={() => this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)}
+                variant="contained"
+              >
+                <Add /> Add
+              </Button>
+            </Grid>
+            <Grid item={true} xs={12} style={{ padding: 0 }}>
+              <List
+                className={`${classes.topicList} advanced-connection-settings-topic-list`}
+                component="nav"
+              >
+                <div className={classes.list}>
+                  {this.renderSubscriptions()}
+                </div>
+              </List>
+            </Grid>
+            <Grid item={true} xs={9} className={classes.gridPadding}>
+              <TextField
+                className={classes.fullWidth}
+                label="MQTT Client ID"
+                margin="normal"
+                value={this.props.connection.clientId}
+                onChange={this.handleChange('clientId')}
+              />
+            </Grid>
+            <Grid item={true} xs={3} className={classes.gridPadding}>
+              <Button
+                variant="contained"
+                className={classes.button}
+                onClick={this.props.managerActions.toggleAdvancedSettings}
+              >
+                <Undo /> Back
+              </Button>
+            </Grid>
+          </Grid>
+        </form>
+      </div>
+    )
+  }
+
+  private renderSubscriptions() {
+    const connection = this.props.connection
+    return connection.subscriptions.map(subscription => (
+      <Subscription
+        deleteAction={() => this.props.managerActions.deleteSubscription(subscription, connection.id)}
+        subscription={subscription}
+        key={subscription}
+      />
+    ))
+  }
+}
+
+const Subscription = (props: {
+  subscription: string,
+  deleteAction: any,
+}) => {
+  return (
+    <ListItem style={{ padding: '0 0 0 8px' }}>
+      <ListItemText>
+        <IconButton onClick={props.deleteAction} style={{ padding: '6px' }}>
+          <Delete />
+        </IconButton>
+        {props.subscription}</ListItemText>
+    </ListItem>
+  )
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    managerActions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+const styles: StyleRulesCallback<string> = (theme: Theme) => {
+  return {
+    fullWidth: {
+      width: '100%',
+    },
+    gridPadding: {
+      padding: '0 12px !important',
+    },
+    topicList: {
+      height: '180px',
+      overflowY: 'scroll' as 'scroll',
+      margin: '8px 16px',
+      backgroundColor: theme.palette.background.default,
+    },
+    button: {
+      marginTop: theme.spacing(3),
+      float: 'right',
+    },
+  }
+}
+
+export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/Connection.tsx

@@ -1,292 +0,0 @@
-import * as React from 'react'
-
-import {
-  Button,
-  CircularProgress,
-  FormControlLabel,
-  Grid,
-  MenuItem,
-  Modal,
-  Paper,
-  Switch,
-  TextField,
-  Toolbar,
-  Typography,
-} from '@material-ui/core'
-import { DataSourceState, MqttOptions } from '../../../../backend/src/DataSource'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-import { addMqttConnectionEvent, makeConnectionStateEvent, removeConnection, rendererEvents } from '../../../../events'
-
-import sha1 = require('sha1')
-
-interface Props {
-  classes: {[s: string]: string}
-  theme: Theme
-  onAbort: () => void,
-  onConnection: (connectionId: string) => void
-}
-
-const protocols = [
-  'mqtt://',
-  'ws://',
-]
-
-interface State {
-  connecting: boolean
-  connectionId?: string
-  error?: Error
-  visible: boolean
-  host: string
-  protocol: string
-  port: number
-  tls: boolean
-  certValidation: boolean
-  clientId: string
-  username: string
-  password: string
-}
-
-declare var window: any
-
-class Connection extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-    const storedSettingsString = window.localStorage.getItem('connectionSettings')
-    let storedSettings
-    try {
-      storedSettings = storedSettingsString ? JSON.parse(storedSettingsString) : undefined
-    } catch {
-      window.localStorage.setItem('connectionSettings', undefined)
-    }
-
-    const defaultState = {
-      visible: true,
-      host: 'iot.eclipse.org',
-      protocol: protocols[0],
-      port: 1883,
-      tls: false,
-      certValidation: true,
-      clientId: '',
-      username: '',
-      password: '',
-      connecting: false,
-      connectionId: undefined,
-    }
-
-    this.state = Object.assign({}, defaultState, storedSettings)
-  }
-
-  private saveConnectionSettings() {
-    window.localStorage.setItem('connectionSettings', JSON.stringify(this.state))
-  }
-
-  private optionsFromState(): MqttOptions {
-    const protocol = this.state.protocol === 'tcp://' ? 'mqtt://' : this.state.protocol
-    const url = `${protocol}${this.state.host}:${this.state.port}`
-
-    return {
-      url,
-      username: this.state.username || undefined,
-      password: this.state.username || undefined,
-      tls: this.state.tls,
-      certValidation: this.state.certValidation,
-    }
-  }
-
-  private connect() {
-    this.setState({
-      connecting: true,
-    })
-
-    const options = this.optionsFromState()
-    const connectionId = (sha1(Math.random() + JSON.stringify(options)).slice(0, 8)) as string
-    this.setState({ connectionId })
-    rendererEvents.emit(addMqttConnectionEvent, { options, id: connectionId })
-    const event = makeConnectionStateEvent(connectionId)
-
-    rendererEvents.subscribe(event, (state: DataSourceState) => {
-      console.log(state)
-      if (state.connected) {
-        this.props.onConnection(connectionId)
-        this.setState({ visible: false })
-      } else if (state.error) {
-        console.log('error', state.error)
-        this.setState({ error: state.error })
-      }
-    })
-  }
-
-  private disconnect() {
-    this.setState({
-      connecting: false,
-    })
-    rendererEvents.emit(removeConnection, this.state.connectionId)
-  }
-
-  public static styles: StyleRulesCallback<string> = (theme: Theme) => {
-    return {
-      root: {
-        minWidth: 550,
-        maxWidth: 650,
-        backgroundColor: theme.palette.background.default,
-        margin: '14vh auto auto auto',
-        padding: `${2 * theme.spacing.unit}px`,
-        outline: 'none',
-      },
-      title: {
-        color: theme.palette.text.primary,
-      },
-      paper: {
-        padding: theme.spacing.unit * 2,
-        textAlign: 'center',
-        color: theme.palette.text.secondary,
-      },
-      textField: {
-        width: '100%',
-      },
-      switch: {
-        marginTop: `${1 * theme.spacing.unit}px`,
-      },
-      button: {
-        margin: theme.spacing.unit,
-      },
-    }
-  }
-
-  private handleChange = (name: string) => (event: any) => {
-    const state: any = {
-      [name]: event.target.value,
-    }
-    this.setState(state)
-  }
-
-  public render() {
-    const { classes } = this.props
-
-    return <Modal open={this.state.visible} disableAutoFocus={true} onClose={() => { console.log('close') }}>
-        <Paper className={classes.root}>
-          <Toolbar>
-            <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
-          </Toolbar>
-          <form className={classes.container} noValidate autoComplete="off">
-            <Grid container spacing={24}>
-              <Grid item xs={2}>
-                <TextField
-                  select
-                  label="Protocol"
-                  className={classes.textField}
-                  value={this.state.protocol}
-                  onChange={this.handleChange('protocol')}
-                  margin="normal"
-                >
-                  {protocols.map((value: string) => (
-                    <MenuItem key={value} value={value}>
-                      {value}
-                    </MenuItem>
-                  ))}
-                </TextField>
-              </Grid>
-              <Grid item xs={7}>
-                <TextField
-                  label="Host"
-                  className={classes.textField}
-                  value={this.state.host}
-                  onChange={this.handleChange('host')}
-                  margin="normal"
-                />
-              </Grid>
-              <Grid item xs={3}>
-                <TextField
-                  label="Port"
-                  className={classes.textField}
-                  value={this.state.port}
-                  onChange={this.handleChange('port')}
-                  margin="normal"
-                />
-              </Grid>
-              <Grid item xs={5}>
-                <TextField
-                  label="Username"
-                  className={classes.textField}
-                  value={this.state.username}
-                  onChange={this.handleChange('username')}
-                  margin="normal"
-                />
-              </Grid>
-              <Grid item xs={5}>
-                <TextField
-                  label="Password"
-                  type="type"
-                  className={classes.textField}
-                  value={this.state.password}
-                  onChange={this.handleChange('password')}
-                  margin="normal"
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <div className={classes.switch}>
-                  <FormControlLabel
-                    control={(
-                      <Switch
-                        checked={this.state.certValidation}
-                        onChange={() => this.setState({ certValidation: !this.state.certValidation })}
-                        color="primary"
-                      />
-                    )}
-                    label="Validate certificate"
-                    labelPlacement="bottom"
-                  />
-                </div>
-              </Grid>
-              <Grid item xs={4}>
-                <div className={classes.switch}>
-                  <FormControlLabel
-                    control={(
-                      <Switch
-                        checked={this.state.tls}
-                        onChange={() => this.setState({ tls: !this.state.tls })}
-                        color="primary"
-                      />
-                    )}
-                    label="Encryption (tls)"
-                    labelPlacement="bottom"
-                  />
-                </div>
-              </Grid>
-              <Grid item xs={4}></Grid>
-            </Grid>
-            <br />
-            <div style={{ textAlign: 'right' }}>
-              <Button variant="contained" color="secondary" className={classes.button} onClick={() => this.saveConnectionSettings()}>
-                Save
-              </Button>
-              { this.renderConnectButton() }
-            </div>
-          </form>
-        </Paper>
-    </Modal>
-  }
-
-  private renderConnectButton() {
-    const { classes } = this.props
-
-    if (this.state.connecting) {
-      return <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickAbort}>
-        <CircularProgress size={22} style={{ marginRight: '10px' }} color="secondary" /> Abort
-      </Button>
-    }
-    return <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
-      Connect
-    </Button>
-  }
-
-  private onClickConnect = () => {
-    this.connect()
-  }
-
-  private onClickAbort = () => {
-    this.disconnect()
-  }
-}
-
-export default withStyles(Connection.styles, { withTheme: true })(Connection)

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -0,0 +1,341 @@
+import * as React from 'react'
+import Delete from '@material-ui/icons/Delete'
+import Settings from '@material-ui/icons/Settings'
+import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
+import Save from '@material-ui/icons/Save'
+import Visibility from '@material-ui/icons/Visibility'
+import VisibilityOff from '@material-ui/icons/VisibilityOff'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionActions, connectionManagerActions } from '../../actions'
+import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
+import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+
+import {
+  Button,
+  FormControl,
+  FormControlLabel,
+  Grid,
+  IconButton,
+  Input,
+  InputAdornment,
+  InputLabel,
+  MenuItem,
+  Switch,
+  TextField,
+} from '@material-ui/core'
+import ConnectionHealthIndicator from '../ConnectionHealthIndicator'
+
+interface Props {
+  connection: ConnectionOptions
+  classes: {[s: string]: string}
+  actions: typeof connectionActions,
+  managerActions: typeof connectionManagerActions
+  connected: boolean
+  connecting: boolean
+}
+
+const protocols = [
+  'mqtt',
+  'ws',
+]
+
+interface State {
+  showPassword: boolean
+}
+
+class ConnectionSettings extends React.Component<Props, State> {
+  constructor(props: any) {
+    super(props)
+
+    this.state = {
+      showPassword: false,
+    }
+  }
+
+  private handleClickShowPassword = () => {
+    this.setState({ showPassword: !this.state.showPassword })
+  }
+
+  private requiresBasePath() {
+    return this.props.connection.protocol !== 'mqtt'
+  }
+
+  private renderBasePathInput() {
+    return (
+      <Grid item={true} xs={4}>
+        <TextField
+          label="Basepath"
+          className={this.props.classes.textField}
+          value={this.props.connection.basePath}
+          onChange={this.handleChange('basePath')}
+          margin="normal"
+        />
+      </Grid>
+    )
+  }
+
+  private handleChange = (name: string) => (event: any) => {
+    if (!this.props.connection) {
+      return
+    }
+
+    this.updateConnection(name, event.target.value)
+  }
+
+  private updateConnection(name: string, value: any) {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      [name]: value,
+    })
+  }
+
+  public render() {
+    const { classes, connection } = this.props
+
+    const passwordVisibilityButton = (
+      <InputAdornment position="end">
+        <IconButton
+          aria-label="Toggle password visibility"
+          onClick={this.handleClickShowPassword}
+        >
+          {this.state.showPassword ? <Visibility /> : <VisibilityOff />}
+        </IconButton>
+      </InputAdornment>
+    )
+
+    return (
+      <div>
+        <form className={classes.container} noValidate={true} autoComplete="off">
+          <Grid container={true} spacing={3}>
+            <Grid item={true} xs={5}>
+              <TextField
+                label="Name"
+                className={classes.textField}
+                value={connection.name}
+                onChange={this.handleChange('name')}
+                margin="normal"
+              />
+            </Grid>
+            <Grid item={true} xs={4}>
+              {this.renderCertValidationSwitch()}
+            </Grid>
+            <Grid item={true} xs={3}>
+              {this.renderTlsSwitch()}
+            </Grid>
+            <Grid item={true} xs={2}>
+              {this.renderProtocols()}
+            </Grid>
+            <Grid item={true} xs={7}>
+              <TextField
+                label="Host"
+                className={classes.textField}
+                value={connection.host}
+                onChange={this.handleChange('host')}
+                margin="normal"
+              />
+            </Grid>
+            <Grid item={true} xs={3}>
+              <TextField
+                label="Port"
+                className={classes.textField}
+                value={connection.port}
+                onChange={this.handleChange('port')}
+                margin="normal"
+              />
+            </Grid>
+            {this.requiresBasePath() ? this.renderBasePathInput() : null}
+            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
+              <TextField
+                label="Username"
+                className={classes.textField}
+                value={connection.username}
+                onChange={this.handleChange('username')}
+                margin="normal"
+              />
+            </Grid>
+            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
+              <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
+                <InputLabel htmlFor="adornment-password">Password</InputLabel>
+                <Input
+                  id="adornment-password"
+                  type={this.state.showPassword ? 'text' : 'password'}
+                  value={connection.password}
+                  onChange={this.handleChange('password')}
+                  endAdornment={passwordVisibilityButton}
+                />
+              </FormControl>
+            </Grid>
+          </Grid>
+          <br />
+          <div>
+            <div style={{ float: 'left' }}>
+              <Button variant="contained" className={classes.button} onClick={() => this.props.managerActions.deleteConnection(this.props.connection.id)}>
+                Delete <Delete />
+              </Button>
+              <Button variant="contained" className={classes.button} onClick={this.props.managerActions.toggleAdvancedSettings}>
+                <Settings /> Advanced
+              </Button>
+            </div>
+            <div style={{ float : 'right' }}>
+              <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.managerActions.saveConnectionSettings}>
+                <Save /> Save
+              </Button>
+              {this.renderConnectButton()}
+            </div>
+          </div>
+        </form>
+      </div>
+    )
+  }
+
+  private renderProtocols() {
+    const { classes, connection } = this.props
+
+    const protocolItems = protocols.map((value: string) => (
+      <MenuItem key={value} value={value}>
+        {value}://
+      </MenuItem>
+    ))
+
+    return (
+      <TextField
+        select={true}
+        label="Protocol"
+        className={classes.textField}
+        value={connection.protocol}
+        onChange={this.updateProtocol}
+        margin="normal"
+      >
+        {protocolItems}
+      </TextField>
+    )
+  }
+
+  private updateProtocol = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.target.value
+    this.updateConnection('protocol', value)
+    if (event.target.value === 'mqtt') {
+      this.updateConnection('basePath', undefined)
+    } else {
+      this.updateConnection('basePath', 'ws')
+    }
+  }
+
+  private renderCertValidationSwitch() {
+    const { classes, connection } = this.props
+
+    const certSwitch = (
+      <Switch
+        checked={connection.certValidation}
+        onChange={this.toggleCertValidation}
+        color="primary"
+      />
+    )
+
+    return (
+      <div className={classes.switch}>
+        <FormControlLabel
+          control={certSwitch}
+          label="Validate certificate"
+          labelPlacement="bottom"
+        />
+      </div>
+    )
+  }
+
+  private toggleCertValidation = () => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      certValidation: !this.props.connection.certValidation,
+    })
+  }
+
+  private renderTlsSwitch() {
+    const { classes, connection } = this.props
+
+    const tlsSwitch = (
+      <Switch
+        checked={connection.encryption}
+        onChange={this.toggleTls}
+        color="primary"
+      />
+    )
+
+    return (
+      <div className={classes.switch}>
+        <FormControlLabel
+          control={tlsSwitch}
+          label="Encryption (tls)"
+          labelPlacement="bottom"
+        />
+      </div>
+    )
+  }
+
+  private toggleTls = () => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      encryption: !this.props.connection.encryption,
+    })
+  }
+
+  private renderConnectButton() {
+    const { classes, actions } = this.props
+
+    if (this.props.connecting) {
+      return (
+        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
+          <ConnectionHealthIndicator />&nbsp;&nbsp;Abort
+        </Button>
+      )
+    }
+    return (
+       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
+        <PowerSettingsNew /> Connect
+      </Button>
+    )
+  }
+
+  private onClickConnect = () => {
+    if (!this.props.connection) {
+      return
+    }
+
+    const mqttOptions = toMqttConnection(this.props.connection)
+    if (mqttOptions) {
+      this.props.actions.connect(mqttOptions, this.props.connection.id)
+    }
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    connected: state.connection.connected,
+    connecting: state.connection.connecting,
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionActions, dispatch),
+    managerActions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+const styles: StyleRulesCallback<string> = (theme: Theme) => {
+  return {
+    textField: {
+      width: '100%',
+    },
+    switch: {
+      marginTop: 0,
+    },
+    button: {
+      margin: theme.spacing(1),
+    },
+    inputFormControl: {
+      marginTop: '16px',
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/ConnectionSetup.tsx

@@ -0,0 +1,128 @@
+import * as React from 'react'
+import ConnectionSettings from './ConnectionSettings'
+import ProfileList from './ProfileList'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../actions'
+import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import {
+  Modal,
+  Paper,
+  Toolbar,
+  Typography,
+  Collapse,
+} from '@material-ui/core'
+import AdvancedConnectionSettings from './AdvancedConnectionSettings'
+
+interface Props {
+  actions: any
+  classes: any
+  connection?: ConnectionOptions
+  visible: boolean
+  showAdvancedSettings: boolean
+}
+
+class ConnectionSetup extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  public componentDidMount() {
+    this.props.actions.loadConnectionSettings()
+  }
+
+  public render() {
+    const { classes, visible, connection } = this.props
+    const mqttConnection = connection && toMqttConnection(connection)
+    return (
+      <div>
+        <Modal open={visible} disableAutoFocus={true}>
+          <Paper className={classes.root}>
+            <div className={classes.left}><ProfileList /></div>
+            <div className={classes.right} key={connection && connection.id}>
+              <Toolbar>
+                <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
+                <Typography className={classes.connectionUri}>
+                  {mqttConnection && mqttConnection.url}
+                </Typography>
+              </Toolbar>
+              {this.renderSettings()}
+            </div>
+          </Paper>
+        </Modal>
+      </div>
+    )
+  }
+
+  private renderSettings() {
+    const { connection, showAdvancedSettings } = this.props
+    if (!connection) {
+      return null
+    }
+
+    return (
+      <div>
+        <Collapse in={!showAdvancedSettings}><ConnectionSettings connection={connection} /></Collapse>
+        <Collapse in={showAdvancedSettings}><AdvancedConnectionSettings connection={connection} /></Collapse>
+      </div>
+    )
+  }
+}
+
+const connectionHeight = '440px'
+const styles = (theme: Theme) => ({
+  title: {
+    color: theme.palette.text.primary,
+    whiteSpace: 'nowrap' as 'nowrap',
+  },
+  root: {
+    margin: `calc((100vh - ${connectionHeight}) / 2) auto 0 auto`,
+    minWidth: '800px',
+    maxWidth: '850px',
+    height: connectionHeight,
+    outline: 'none' as 'none',
+    display: 'flex' as 'flex',
+  },
+  left: {
+    borderRightStyle: 'dotted' as 'dotted',
+    borderRadius: `${theme.shape.borderRadius}px 0 0 ${theme.shape.borderRadius}px`,
+    paddingTop: theme.spacing(2),
+    flex: 3,
+    overflow: 'hidden',
+    backgroundColor: theme.palette.background.default,
+    color: theme.palette.text.primary,
+  },
+  right: {
+    borderRadius: `0 ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0`,
+    backgroundColor: theme.palette.background.paper,
+    padding: theme.spacing(2),
+    flex: 10,
+  },
+  connectionUri: {
+    width: '27em',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+    color: theme.palette.text.hint,
+    fontSize: '0.9em',
+    marginLeft: theme.spacing(4),
+  },
+})
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    visible: !state.connection.connected,
+    showAdvancedSettings: state.connectionManager.showAdvancedSettings,
+    connection: state.connectionManager.selected ? state.connectionManager.connections[state.connectionManager.selected] : undefined,
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSetup))

app/src/components/ConnectionSetup/ProfileList.tsx

@@ -0,0 +1,113 @@
+import * as React from 'react'
+import { AddButton } from './AddButton'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionManagerActions } from '../../actions'
+import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import {
+  List,
+  ListItem,
+  ListSubheader,
+  Typography,
+} from '@material-ui/core'
+
+interface Props {
+  classes: any
+  selected?: string
+  connections: {[s: string]: ConnectionOptions}
+  actions: any
+}
+
+class ProfileList extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  private addConnectionButton() {
+    return <span id="addProfileButton" style={{ marginRight: '12px' }}><AddButton action={this.props.actions.createConnection} /></span>
+  }
+
+  public render() {
+    return (
+      <List
+        style={{ height: '100%' }}
+        component="nav"
+        subheader={<ListSubheader component="div">{this.addConnectionButton()}Connections</ListSubheader>}
+      >
+        <div className={this.props.classes.list}>
+          {Object.values(this.props.connections).map(connection => <ConnectionItem connection={connection} key={connection.id} selected={this.props.selected === connection.id} />)}
+        </div>
+      </List>
+    )
+  }
+}
+
+const styles = (theme: Theme) => ({
+  list: {
+    marginTop: theme.spacing(1),
+    height: `calc(100% - ${theme.spacing(6)})`,
+    overflowY: 'auto' as 'auto',
+  },
+})
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+interface ConnectionItemProps {
+  connection: ConnectionOptions,
+  actions: any,
+  selected: boolean,
+  classes: any
+}
+
+const connectionItemStyle = (theme: Theme) => ({
+  name: {
+    width: '100%',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+  },
+  details: {
+    width: '100%',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+    color: theme.palette.text.hint,
+    fontSize: '0.7em',
+  },
+})
+
+const connectionItemRenderer = withStyles(connectionItemStyle)((props: ConnectionItemProps) => {
+  const connection = props.connection.host && toMqttConnection(props.connection)
+  return (
+    <ListItem
+      button={true}
+      selected={props.selected}
+      style={{ display: 'block' }}
+      onClick={() => props.actions.selectConnection(props.connection.id)}
+    >
+      <Typography className={props.classes.name}>
+        {props.connection.name || 'mqtt broker'}
+      </Typography>
+      <Typography className={props.classes.details}>
+        {connection && connection.url}
+      </Typography>
+    </ListItem>
+  )
+})
+
+const ConnectionItem = connect(null, mapDispatchToProps)(connectionItemRenderer)
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    connections: state.connectionManager.connections,
+    selected: state.connectionManager.selected,
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList))

app/src/components/Copy.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react'
-import { Snackbar, SnackbarContent } from '@material-ui/core'
-import FileCopy from '@material-ui/icons/FileCopy'
 import Check from '@material-ui/icons/Check'
+import CustomIconButton from './CustomIconButton'
+import FileCopy from '@material-ui/icons/FileCopy'
 import green from '@material-ui/core/colors/green'
-import { withStyles, Theme } from '@material-ui/core/styles'
+import { Snackbar, SnackbarContent, Tooltip } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 const copy = require('copy-text-to-clipboard')
 
@@ -32,28 +33,36 @@ class Copy extends React.Component<Props, State> {
 
   public render() {
     const icon = !this.state.didCopy
-      ? <FileCopy fontSize="inherit" style={{ cursor: 'pointer' }} onClick={this.handleClick} />
+      ? <FileCopy fontSize="inherit" />
       : <Check fontSize="inherit" style={{ cursor: 'default' }} />
 
-    return <span>
-      <span style={{ fontSize: '16px' }}>{icon}</span>
+    return (
       <span>
-        <Snackbar
-          anchorOrigin={{
-            vertical: 'bottom',
-            horizontal: 'left',
-          }}
-          open={this.state.snackBarOpen}
-          autoHideDuration={2000}
-          onClose={() => { this.setState({ snackBarOpen: false }) }}
-        >
-          <SnackbarContent
-            className={this.props.classes.snackbar}
-            message="Copied to clipboard"
-          />
-        </Snackbar>
+        <Tooltip placement="top" title="Copy to clipboard">
+          <span style={{ fontSize: '16px' }}>
+          <CustomIconButton onClick={this.handleClick} >
+            {icon}
+          </CustomIconButton>
+          </span>
+        </Tooltip>
+        <span>
+          <Snackbar
+            anchorOrigin={{
+              vertical: 'bottom',
+              horizontal: 'left',
+            }}
+            open={this.state.snackBarOpen}
+            autoHideDuration={2000}
+            onClose={() => { this.setState({ snackBarOpen: false }) }}
+          >
+            <SnackbarContent
+              className={this.props.classes.snackbar}
+              message="Copied to clipboard"
+            />
+          </Snackbar>
+        </span>
       </span>
-    </span>
+    )
   }
 
   private handleClick = (event: React.MouseEvent) => {

app/src/components/CustomIconButton.tsx

@@ -0,0 +1,34 @@
+import * as React from 'react'
+import { IconButton } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+interface Props {
+  onClick: any,
+  classes: any
+}
+
+const styles = (theme: Theme) => ({
+  button: {
+    padding: '6px',
+    fontSize: '1.2em',
+  },
+})
+
+class CustomIconButton extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  public render() {
+    return (
+      <IconButton className={this.props.classes.button} onClick={this.onClick}>{this.props.children}</IconButton>
+    )
+  }
+
+  private onClick = (event: React.MouseEvent) => {
+    event.stopPropagation()
+    this.props.onClick(event)
+  }
+}
+
+export default withStyles(styles)(CustomIconButton)

app/src/components/Notification.tsx

@@ -0,0 +1,51 @@
+import * as React from 'react'
+
+import { Snackbar, SnackbarContent } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { green, red } from '@material-ui/core/colors'
+
+interface Props {
+  message?: string
+  onClose: () => void
+  classes: any
+}
+
+class Notification extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  public static styles = (theme: Theme) => ({
+    success: {
+      backgroundColor: green[600],
+      color: theme.typography.button.color,
+    },
+    error: {
+      backgroundColor: red[600],
+      color: theme.typography.button.color,
+    },
+  })
+
+  public render() {
+    const snackbarAnchor = {
+      vertical: 'bottom' as 'bottom',
+      horizontal: 'left' as 'left',
+    }
+
+    return (
+      <Snackbar
+        anchorOrigin={snackbarAnchor}
+        open={Boolean(this.props.message)}
+        autoHideDuration={10000}
+        onClose={this.props.onClose}
+      >
+        <SnackbarContent
+          className={this.props.classes.error}
+          message={this.props.message}
+        />
+      </Snackbar>
+    )
+  }
+}
+
+export default withStyles(Notification.styles)(Notification)

app/src/components/Settings.tsx

@@ -1,7 +1,14 @@
 import * as React from 'react'
-import * as q from '../../../backend/src/Model'
+import BrokerStatistics from './BrokerStatistics'
+import ChevronRight from '@material-ui/icons/ChevronRight'
+import { AppState } from '../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { settingsActions } from '../actions'
+import { shell } from 'electron'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { TopicOrder } from '../reducers/Settings'
 
-import { AppState, NodeOrder } from '../reducers'
 import {
   Divider,
   Drawer,
@@ -11,40 +18,65 @@ import {
   MenuItem,
   Select,
   Typography,
+  Switch,
+  Tooltip,
 } from '@material-ui/core'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+const sha1 = require('sha1')
 
-import ChevronRight from '@material-ui/icons/ChevronRight'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { settingsActions } from '../actions'
+export const autoExpandLimitSet = [{
+  limit: 0,
+  name: 'Collapsed',
+}, {
+  limit: 2,
+  name: 'Few',
+}, {
+  limit: 3,
+  name: 'Some',
+}, {
+  limit: 10,
+  name: 'Most',
+}, {
+  limit: 1E6,
+  name: 'All',
+}]
 
 const styles: StyleRulesCallback = theme => ({
   drawer: {
     backgroundColor: theme.palette.background.default,
     flexShrink: 0,
+    userSelect: 'none' as 'none',
   },
   paper: {
     width: '300px',
   },
   title: {
     color: theme.palette.text.primary,
-    paddingTop: `${theme.spacing.unit}px`,
+    paddingTop: theme.spacing(1),
     ...theme.mixins.toolbar,
   },
   input: {
     minWidth: '150px',
-    margin: `auto ${theme.spacing.unit}px auto ${2 * theme.spacing.unit}px`,
+    margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
+  },
+  author: {
+    margin: 'auto 8px 8px auto',
+    color: theme.palette.text.hint,
+    cursor: 'pointer' as 'pointer',
+  },
+  switchBase: {
+    height: theme.spacing(4),
   },
 })
 
 interface Props {
-  actions?: any
+  actions: typeof settingsActions
   autoExpandLimit: number
-  visible: boolean
-  store?: any
   classes: any
-  nodeOrder: NodeOrder
+  highlightTopicUpdates: boolean
+  selectTopicWithMouseOver: boolean
+  store?: any
+  topicOrder: TopicOrder
+  visible: boolean
 }
 
 class Settings extends React.Component<Props, {}> {
@@ -78,69 +110,129 @@ class Settings extends React.Component<Props, {}> {
 
           {this.renderAutoExpand()}
           {this.renderNodeOrder()}
+          {this.renderHighlightTopicUpdates()}
+          {this.selectTopicsOnMouseOver()}
         </div>
+        <Tooltip placement="top" title="App Author">
+          <Typography className={classes.author} onClick={this.openGithubPage}>
+            by Thomas Nordquist
+          </Typography>
+        </Tooltip>
+        <BrokerStatistics />
       </Drawer>
     )
   }
 
+  private openGithubPage = () => {
+    shell.openExternal('https://github.com/thomasnordquist')
+  }
+
+  private renderHighlightTopicUpdates() {
+    const { highlightTopicUpdates, actions } = this.props
+
+    return this.renderSwitch('Show Activity', highlightTopicUpdates, actions.togglehighlightTopicUpdates, 'Topics blink when a new message arrives')
+  }
+
+  private renderSwitch(title: string, checked: boolean, action: any, tooltip: string) {
+    const { classes } = this.props
+
+    const clickHandler = (e: React.MouseEvent) => {
+      e.stopPropagation()
+      e.preventDefault()
+      action()
+    }
+
+    return (
+      <div style={{ padding: '8px', display: 'flex' }}>
+        <Tooltip title={tooltip}>
+          <InputLabel
+            htmlFor={`toggle-${sha1(title)}`}
+            onClick={clickHandler}
+            style={{ flex: '1', paddingTop: '8px' }}
+          >
+            {title}
+          </InputLabel>
+        </Tooltip>
+        <Tooltip title={tooltip}>
+          <Switch
+            name={`toggle-${sha1(title)}`}
+            checked={checked}
+            onChange={action}
+            color="primary"
+            classes={{ switchBase: classes.switchBase }}
+          />
+        </Tooltip>
+      </div>
+    )
+  }
+
+  private selectTopicsOnMouseOver() {
+    const { actions, selectTopicWithMouseOver } = this.props
+    const toggle = () => actions.selectTopicWithMouseOver(!selectTopicWithMouseOver)
+
+    return this.renderSwitch('Quick Preview', selectTopicWithMouseOver, toggle, 'Select topics on mouse over')
+  }
+
   private renderAutoExpand() {
     const { classes, autoExpandLimit } = this.props
+
+    const limits = autoExpandLimitSet.map(limit => <MenuItem key={limit.limit} value={limit.limit}>{limit.name}</MenuItem>)
     return (
-        <div style={{ padding: '8px' }}>
-        <InputLabel htmlFor="auto-expand">Auto Expand</InputLabel>
+      <div style={{ padding: '8px', display: 'flex' }}>
+        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Auto Expand</InputLabel>
         <Select
             value={autoExpandLimit}
             onChange={this.onChangeAutoExpand}
             input={<Input name="auto-expand" id="auto-expand-label-placeholder" />}
             name="auto-expand"
             className={classes.input}
+            style={{ flex: '1' }}
         >
-          <MenuItem value={0}><em>Collapsed</em></MenuItem>
-          <MenuItem value={2}>Few</MenuItem>
-          <MenuItem value={3}>Some</MenuItem>
-          <MenuItem value={10}>Most</MenuItem>
-          <MenuItem value={1E6}>All</MenuItem>
+          {limits}
         </Select>
       </div>
     )
   }
 
   private onChangeAutoExpand = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setAutoExpandLimit(e.target.value)
+    this.props.actions.setAutoExpandLimit(parseInt(e.target.value, 10))
   }
 
   private renderNodeOrder() {
-    const { classes, nodeOrder } = this.props
+    const { classes, topicOrder } = this.props
 
     return (
-      <div style={{ padding: '8px' }}>
-      <InputLabel htmlFor="auto-expand">Topic order</InputLabel>
-      <Select
-          value={nodeOrder}
+      <div style={{ padding: '8px', display: 'flex' }}>
+        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Topic Order</InputLabel>
+        <Select
+          value={topicOrder}
           onChange={this.onChangeSorting}
           input={<Input name="node-order" id="node-order-label-placeholder" />}
           displayEmpty={true}
           name="node-order"
           className={classes.input}
-      >
-        <MenuItem value={NodeOrder.none}><em>default</em></MenuItem>
-        <MenuItem value={NodeOrder.abc}>a-z</MenuItem>
-        <MenuItem value={NodeOrder.messages}>{NodeOrder.messages}</MenuItem>
-        <MenuItem value={NodeOrder.topics}>{NodeOrder.topics}</MenuItem>
-      </Select>
+          style={{ flex: '1' }}
+        >
+          <MenuItem value={TopicOrder.none}><em>default</em></MenuItem>
+          <MenuItem value={TopicOrder.abc}>a-z</MenuItem>
+          <MenuItem value={TopicOrder.messages}>{TopicOrder.messages}</MenuItem>
+          <MenuItem value={TopicOrder.topics}>{TopicOrder.topics}</MenuItem>
+        </Select>
     </div>)
   }
 
   private onChangeSorting = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setNodeOrder(e.target.value)
+    this.props.actions.setTopicOrder(e.target.value as TopicOrder)
   }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
     autoExpandLimit: state.settings.autoExpandLimit,
-    nodeOrder: state.settings.nodeOrder,
+    topicOrder: state.settings.topicOrder,
     visible: state.settings.visible,
+    highlightTopicUpdates: state.settings.highlightTopicUpdates,
+    selectTopicWithMouseOver: state.settings.selectTopicWithMouseOver,
   }
 }
 

app/src/components/Sidebar/History.tsx

@@ -1,18 +1,19 @@
 import * as React from 'react'
-import * as q from '../../../../backend/src/Model'
 
 import { Badge, Typography } from '@material-ui/core'
 import { Theme, withStyles } from '@material-ui/core/styles'
 
 interface HistoryItem {
-  title: string
-  value: string
+  title: JSX.Element | string
+  value: string | any
+  selected?: boolean
 }
 
 interface Props {
   items: HistoryItem[]
   onClick?: (index: number, element: EventTarget) => void
   classes: any
+  contentTypeIndicator?: JSX.Element
 }
 
 interface State {
@@ -28,16 +29,18 @@ class MessageHistory extends React.Component<Props, State> {
   }
 
   public renderHistory() {
+    const style = (element: HistoryItem) => ({
+      backgroundColor: element.selected ? 'rgba(120, 120, 120, 0.6)' : 'rgba(80, 80, 80, 0.6)',
+      margin: '8px',
+      padding: '8px 8px 0 8px',
+      cursor: this.props.onClick ? 'pointer' : 'inherit',
+    })
+
     const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
     const elements = this.props.items.map((element, index) => (
       <div
         key={index}
-        style={{
-          backgroundColor: 'rgba(80, 80, 80, 0.6)',
-          margin: '8px',
-          padding: '8px 8px 0 8px',
-          cursor: this.props.onClick ? 'pointer' : 'inherit',
-        }}
+        style={style(element)}
         onClick={(event: React.MouseEvent) => this.props.onClick && this.props.onClick(index, event.target)}
       >
         <div><i>{element.title}</i></div>
@@ -47,15 +50,27 @@ class MessageHistory extends React.Component<Props, State> {
       </div>
     ))
 
+    const visible = this.props.items.length > 0 && this.state.collapsed
+
     return (
       <div style={{ backgroundColor: 'rgba(60, 60, 60, 0.6)', marginTop: '16px' }}>
         <Typography
+          component={'span'}
           onClick={this.toggle}
           style={{ cursor: 'pointer' }}
         >
-          {this.state.collapsed ? '▶' : '▼'} History
+          <Badge
+            classes={{ badge: this.props.classes.badge }}
+            invisible={!visible}
+            badgeContent={this.props.items.length}
+            color="primary"
+          >
+            {this.state.collapsed ? '▶ History' : '▼ History'}
+          </Badge>
+          <div style={{ float: 'right' }}>{this.state.collapsed ? this.props.contentTypeIndicator : null}</div>
         </Typography>
         <div style={{ maxHeight: '230px', overflowY: 'scroll'  }}>
+          {this.state.collapsed ? null : this.props.children}
           {this.state.collapsed ? null : elements}
         </div>
       </div>
@@ -63,17 +78,12 @@ class MessageHistory extends React.Component<Props, State> {
   }
 
   public render() {
-    const visible = this.props.items.length > 0 && this.state.collapsed
     return (
-      <Badge
+      <div
         style={{ display: 'block', width: '100%' }}
-        invisible={!visible}
-        badgeContent={this.props.items.length}
-        color="primary"
-        classes={{ badge: this.props.classes.badge }}
       >
         {this.renderHistory()}
-      </Badge>
+      </div>
     )
   }
 
@@ -83,7 +93,7 @@ class MessageHistory extends React.Component<Props, State> {
 }
 
 const styles = (theme: Theme) => ({
-  badge: { top: '-8px', left:'64px' },
+  badge: { right:'-25px' },
 })
 
 export default withStyles(styles)(MessageHistory)

app/src/components/Sidebar/MessageHistory.tsx

@@ -1,17 +1,17 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { Theme, withTheme } from '@material-ui/core/styles'
-
-import Fade from '@material-ui/core/Fade'
+import * as React from 'react'
+import BarChart from '@material-ui/icons/BarChart'
+import DateFormatter from '../helper/DateFormatter'
 import History from './History'
-import Paper from '@material-ui/core/Paper'
-import Popper from '@material-ui/core/Popper'
-import ValueRenderer from './ValueRenderer'
+import { TopicViewModel } from '../../TopicViewModel'
+
+const PlotHistory = React.lazy(() => import('./PlotHistory'))
+
+const throttle = require('lodash.throttle')
 
 interface Props {
-  node?: q.TreeNode
-  theme: Theme
+  node?: q.TreeNode<TopicViewModel>
+  selected?: q.Message
   onSelect: (message: q.Message) => void
 }
 
@@ -26,16 +26,16 @@ class MessageHistory extends React.Component<Props, State> {
     this.state = { }
   }
 
-  private updateNode = () => {
+  private updateNode = throttle(() => {
     this.setState(this.state)
-  }
+  }, 300)
 
   public componentWillReceiveProps(nextProps: Props) {
     this.props.node && this.props.node.onMessage.unsubscribe(this.updateNode)
     nextProps.node && nextProps.node.onMessage.subscribe(this.updateNode)
   }
 
-  public componentWillMount() {
+  public componentDidMount() {
     this.props.node && this.props.node.onMessage.subscribe(this.updateNode)
   }
 
@@ -50,25 +50,42 @@ class MessageHistory extends React.Component<Props, State> {
     }
 
     const history = node.messageHistory.toArray()
-    const historyElements = history.map(message => ({
-      title: message.received.toGMTString(),
+    const historyElements = history.reverse().map(message => ({
+      title: <DateFormatter date={message.received} />,
       value: message.value,
+      selected: message && message === this.props.selected,
     }))
 
+    const numericMessages = history.filter(message => !isNaN(parseFloat(message.value)))
+    const showPlot = numericMessages.length >= 2
+
     return (
       <div>
         <History
           items={historyElements}
+          contentTypeIndicator={showPlot ? <BarChart /> : undefined}
           onClick={this.displayMessage}
-        />
+        >
+          {showPlot ? this.renderPlot(numericMessages) : null}
+        </History>
       </div>
     )
   }
 
+  public renderPlot(numericMessages: q.Message[]) {
+    return (
+      <React.Suspense fallback={<div>Loading...</div>}>
+        <PlotHistory messages={numericMessages} />
+      </React.Suspense>
+    )
+  }
+
   private displayMessage = (index: number, eventTarget: EventTarget) => {
-    const message = this.props.node && this.props.node.messageHistory.toArray()[index]
-    this.props.onSelect(message)
+    const message = this.props.node && this.props.node.messageHistory.toArray().reverse()[index]
+    if (message) {
+      this.props.onSelect(message)
+    }
   }
 }
 
-export default withTheme()(MessageHistory)
+export default MessageHistory

app/src/components/Sidebar/NodeStats.tsx

@@ -1,9 +1,10 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
+import * as React from 'react'
+import { TopicViewModel } from '../../TopicViewModel'
 import { Typography } from '@material-ui/core'
 
 interface Props {
-  node: q.TreeNode
+  node: q.TreeNode<TopicViewModel>
 }
 
 class NodeStats extends React.Component<Props, {}> {
@@ -17,7 +18,7 @@ class NodeStats extends React.Component<Props, {}> {
     return (
       <div>
         <Typography>Messages: #{node.messages}</Typography>
-        <Typography>Subtopics: {node.leafCount()}</Typography>
+        <Typography>Subtopics: {node.childTopicCount()}</Typography>
         <Typography>Messages Subtopics: #{node.leafMessageCount()}</Typography>
       </div>
     )

app/src/components/Sidebar/PlotHistory.tsx

@@ -0,0 +1,72 @@
+import * as q from '../../../../backend/src/Model'
+import * as React from 'react'
+import DateFormatter from '../helper/DateFormatter'
+import { default as ReactResizeDetector } from 'react-resize-detector'
+import 'react-vis/dist/style.css'
+const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('react-vis')
+
+interface Props {
+  messages: q.Message[]
+}
+
+interface Stats {
+  width: number
+  value?: any
+}
+
+class PlotHistory extends React.Component<Props, Stats> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { width: 300 }
+  }
+
+  private resize = (width: number, height: number) => {
+    this.setState({ width: width - 12 })
+  }
+
+  public render() {
+    const data = this.props.messages.map((message) => {
+      return {
+        x: message.received.getTime(),
+        y: parseFloat(message.value),
+      }
+    })
+
+    return (
+      <div>
+        <XYPlot width={this.state.width} height={150}>
+          <HorizontalGridLines />
+          <YAxis />
+          <LineMarkSeries
+            onValueMouseOver={this._rememberValue}
+            onValueMouseOut={this._forgetValue}
+            size={3}
+            data={data}
+            curve="curveCardinal"
+          />
+          {this.state.value ? <Hint format={this.hintFormatter} value={this.state.value} /> : null}
+        </XYPlot>
+        <ReactResizeDetector handleWidth={true} onResize={this.resize} />
+      </div>
+    )
+  }
+
+  private hintFormatter = (point: any) => {
+    return [
+      { title: <b>Time</b>, value: <DateFormatter date={new Date(point.x)} /> },
+      { title: <b>Value</b>, value: point.y },
+    ]
+  }
+
+  private _forgetValue = () => {
+    this.setState({
+      value: undefined,
+    })
+  }
+
+  private _rememberValue = (value: any) => {
+    this.setState({ value })
+  }
+}
+
+export default PlotHistory

app/src/components/Sidebar/Publish/Publish.tsx

@@ -1,4 +1,3 @@
-// tslint:disable-next-line
 import 'react-ace'
 import 'brace/mode/json'
 import 'brace/mode/text'
@@ -6,69 +5,81 @@ import 'brace/mode/xml'
 import 'brace/theme/monokai'
 
 import * as React from 'react'
-import * as brace from 'brace'
 import * as q from '../../../../../backend/src/Model'
 
 import {
   Button,
-  Fab,
   FormControlLabel,
-  InputAdornment,
   Radio,
   RadioGroup,
   TextField,
-  Typography,
+  FormControl,
+  InputLabel,
+  Input,
+  Checkbox,
+  MenuItem,
+  Tooltip,
+  Fab,
 } from '@material-ui/core'
-import { makePublishEvent, rendererEvents } from '../../../../../events'
 
+// tslint:disable-next-line
 import { default as AceEditor } from 'react-ace'
 import { AppState } from '../../../reducers'
 import History from '../History'
 import Message from './Model/Message'
 import Navigation from '@material-ui/icons/Navigation'
+import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { sidebarActions } from '../../../actions'
+import { publishActions, globalActions } from '../../../actions'
+import ClearAdornment from '../../helper/ClearAdornment'
+import { TopicViewModel } from '../../../TopicViewModel'
 
 interface Props {
-  node?: q.TreeNode
+  node?: q.TreeNode<TopicViewModel>
   connectionId?: string
   topic?: string
   payload?: string
-  actions: any
+  actions: typeof publishActions
+  globalActions: typeof globalActions
+  retain: boolean
+  editorMode: string
+  qos: 0 | 1 | 2
 }
 
 interface State {
-  mode: string
   history: Message[]
 }
 
 class Publish extends React.Component<Props, State> {
   constructor(props: any) {
     super(props)
-    this.state = { mode: 'json', history: [] }
+    this.state = { history: [] }
   }
 
-  private updatePayload = (value: string, event?: any) => {
-    this.props.actions.setPublishPayload(value)
+  private updatePayload = (payload: string, event?: any) => {
+    this.props.actions.setPayload(payload)
   }
 
   private updateTopic = (e: React.ChangeEvent<HTMLInputElement>) => {
-    console.log(e.target.value)
-    this.props.actions.setPublishTopic(e.target.value)
+    this.props.actions.setTopic(e.target.value)
   }
 
   private updateMode = (e: React.ChangeEvent<{}>, value: string) => {
-    this.setState({ mode: value })
+    this.props.actions.setEditorMode(value)
   }
 
   private publish = (e: React.MouseEvent) => {
     e.stopPropagation()
-    const topic = this.currentTopic() || ''
-    const payload = this.props.payload
+    if (!this.props.connectionId) {
+      return
+    }
 
+    this.props.actions.publish(this.props.connectionId)
+
+    const topic = this.props.topic || ''
+    const payload = this.props.payload
     if (this.props.connectionId && topic) {
-      rendererEvents.emit(makePublishEvent(this.props.connectionId), { topic, payload })
       this.addMessageToHistory(topic, payload)
     }
   }
@@ -91,35 +102,35 @@ class Publish extends React.Component<Props, State> {
     )
   }
 
-  private currentTopic(): string | undefined {
-    const { node, topic } = this.props
-    const selectedNodePath = (node ? node.path() : undefined)
-
-    return (topic !== undefined) ? topic : selectedNodePath
+  private clearTopic = () => {
+    this.props.actions.setTopic('')
   }
 
   private topic() {
-    const topicStr = this.currentTopic() || ''
+    const topicStr = this.props.topic || ''
 
     return (
       <div>
-        <Typography>Topic</Typography>
-        <TextField
-          placeholder="example/topic"
-          style={{ width: '100%' }}
-          margin="normal"
-          value={topicStr}
-          multiline={true}
-          onChange={this.updateTopic}
-          InputProps={{ onBlur: this.onTopicBlur }}
-        />
+        <FormControl style={{ width: '100%' }}>
+            <InputLabel htmlFor="publish-topic">Topic</InputLabel>
+            <Input
+              id="publish-topic"
+              value={topicStr}
+              startAdornment={<span/>}
+              endAdornment={<ClearAdornment action={this.clearTopic} value={topicStr} />}
+              onBlur={this.onTopicBlur}
+              onChange={this.updateTopic}
+              multiline={true}
+              placeholder="example/topic"
+            />
+          </FormControl>
       </div>
     )
   }
 
   private onTopicBlur = (e: React.FocusEvent<HTMLInputElement>) => {
     if (!e.target.value) {
-      this.props.actions.setPublishTopic(undefined)
+      this.props.actions.setTopic(undefined)
     }
   }
 
@@ -135,45 +146,44 @@ class Publish extends React.Component<Props, State> {
         size="small"
         color="primary"
         onClick={this.publish}
+        id="publish-button"
       >
         <Navigation style={{ marginRight: '8px' }} /> Publish
       </Button>
     )
   }
 
+  private formatJson = () => {
+    if (this.props.payload) {
+      try {
+        const str = JSON.stringify(JSON.parse(this.props.payload), undefined, '  ')
+        this.updatePayload(str)
+      } catch (error) {
+        this.props.globalActions.showError(`Format error: ${error.message}`)
+      }
+    }
+  }
+
+  private renderFormatJson() {
+    if (this.props.editorMode !== 'json') {
+      return null
+    }
+
+    return (
+      <Tooltip title="Format JSON">
+        <Fab style={{ width: '36px', height: '36px', marginLeft: '8px' }} onClick={this.formatJson} id="sidebar-publish-format-json">
+          <FormatAlignLeft style={{ fontSize: '20px' }} />
+        </Fab>
+      </Tooltip>
+    )
+  }
+
   private editorMode() {
-    const labelStyle = { margin: '0 8px 0 8px' }
     return (
       <div style={{ marginTop: '16px' }}>
         <div style={{ width: '100%', lineHeight: '64px' }}>
-          <RadioGroup
-            style={{ display: 'inline-block', float: 'left' }}
-            value={this.state.mode}
-            onChange={this.updateMode}
-            row={true}
-          >
-            <FormControlLabel
-              value="text"
-              style={labelStyle}
-              control={<Radio color="primary" />}
-              label="raw"
-              labelPlacement="top"
-            />
-            <FormControlLabel
-              value="xml"
-              style={labelStyle}
-              control={<Radio color="primary" />}
-              label="xml"
-              labelPlacement="top"
-            />
-            <FormControlLabel
-              value="json"
-              style={labelStyle}
-              control={<Radio color="primary" />}
-              label="json"
-              labelPlacement="top"
-            />
-          </RadioGroup>
+          {this.renderEditorModeSelection()}
+          {this.renderFormatJson()}
           <div style={{ float: 'right', marginRight: '16px' }}>
             {this.publishButton()}
           </div>
@@ -182,8 +192,97 @@ class Publish extends React.Component<Props, State> {
     )
   }
 
+  private renderEditorModeSelection() {
+    const labelStyle = { margin: '0 8px 0 8px' }
+    return (
+      <RadioGroup
+        style={{ display: 'inline-block', float: 'left' }}
+        value={this.props.editorMode}
+        onChange={this.updateMode}
+        row={true}
+      >
+        <FormControlLabel
+          value="text"
+          style={labelStyle}
+          control={<Radio color="primary" />}
+          label="raw"
+          labelPlacement="top"
+        />
+        <FormControlLabel
+          value="xml"
+          style={labelStyle}
+          control={<Radio color="primary" />}
+          label="xml"
+          labelPlacement="top"
+        />
+        <FormControlLabel
+          value="json"
+          style={labelStyle}
+          control={<Radio color="primary" />}
+          label="json"
+          labelPlacement="top"
+        />
+      </RadioGroup>
+    )
+  }
+
+  private onChangeQoS = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = parseInt(event.target.value, 10)
+    if (value !== 0 && value !== 1 && value !== 2) {
+      return
+    }
+
+    this.props.actions.setQoS(value)
+  }
+
+  private publishMode() {
+    const labelStyle = { margin: '0 8px 0 8px' }
+    const itemStyle = { padding: '0' }
+    const tooltipStyle = { textAlign: 'center' as 'center', width: '100%' }
+    const qosSelect = (
+      <TextField
+        select={true}
+        value={this.props.qos}
+        margin="normal"
+        style={{ margin: '8px 0 8px 8px' }}
+        onChange={this.onChangeQoS}
+      >
+        <MenuItem key={0} value={0} style={itemStyle}>
+          <Tooltip title="At most once"><div style={tooltipStyle}>0</div></Tooltip>
+        </MenuItem>
+        <MenuItem key={1} value={1} style={itemStyle}>
+          <Tooltip title="At least once"><div style={tooltipStyle}>1</div></Tooltip>
+        </MenuItem>
+        <MenuItem key={2} value={2} style={itemStyle}>
+          <Tooltip title="Exactly once"><div style={tooltipStyle}>2</div></Tooltip>
+        </MenuItem>
+      </TextField>
+    )
+    return (
+      <div style={{ marginTop: '8px', clear: 'both' }}>
+        <div style={{ width: '100%', textAlign: 'right' }}>
+          <FormControlLabel
+            style={labelStyle}
+            control={qosSelect}
+            label="QoS"
+            labelPlacement="start"
+          />
+          <Tooltip title="Retained messages only appear to be retained, when client subscribes after the initial publish." placement="top">
+            <FormControlLabel
+              value="retain"
+              style={labelStyle}
+              control={<Checkbox color="primary" checked={this.props.retain} onChange={this.props.actions.toggleRetain} />}
+              label="retain"
+              labelPlacement="end"
+            />
+          </Tooltip>
+        </div>
+      </div>
+    )
+  }
+
   private history() {
-    const items = this.state.history.map(message => ({
+    const items = this.state.history.reverse().map(message => ({
       title: message.topic,
       value: message.payload,
     }))
@@ -192,42 +291,53 @@ class Publish extends React.Component<Props, State> {
   }
 
   private didSelectHistoryEntry = (index: number) => {
-    let message = this.state.history[index]
-    this.props.actions.setPublishTopic(message.topic)
-    this.props.actions.setPublishPayload(message.payload)
+    const message = this.state.history[index]
+    this.props.actions.setTopic(message.topic)
+    this.props.actions.setPayload(message.payload)
   }
 
   private editor() {
     return (
       <div style={{ width: '100%', display: 'block' }}>
         {this.editorMode()}
-        <AceEditor
-          mode={this.state.mode}
-          theme="monokai"
-          name="UNIQUE_ID_OF_DIV"
-          width="100%"
-          height="200px"
-          showGutter={true}
-          value={this.props.payload}
-          onChange={this.updatePayload}
-          setOptions={this.editorOptions}
-          editorProps={{ $blockScrolling: true }}
-        />
+        {this.renderEditor()}
+        {this.publishMode()}
       </div>
     )
   }
+
+  private renderEditor() {
+    return (
+      <AceEditor
+        mode={this.props.editorMode}
+        theme="monokai"
+        name="UNIQUE_ID_OF_DIV"
+        width="100%"
+        height="200px"
+        showGutter={true}
+        value={this.props.payload}
+        onChange={this.updatePayload}
+        setOptions={this.editorOptions}
+        editorProps={{ $blockScrolling: true }}
+      />
+    )
+  }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(sidebarActions, dispatch),
+    actions: bindActionCreators(publishActions, dispatch),
+    globalActions: bindActionCreators(globalActions, dispatch),
   }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
-    topic: state.sidebar.publishTopic,
-    payload: state.sidebar.publishPayload,
+    topic: state.publish.topic,
+    payload: state.publish.payload,
+    editorMode: state.publish.editorMode,
+    retain: state.publish.retain,
+    qos: state.publish.qos,
   }
 }
 

app/src/components/Sidebar/Sidebar.tsx

@@ -1,65 +1,66 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
-  ExpansionPanelSummary,
-  Fade,
-  Paper,
-  Popper,
-  Typography,
-} from '@material-ui/core'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
-import { AppState } from '../../reducers'
+import * as React from 'react'
+import Clear from '@material-ui/icons/Clear'
+import Code from '@material-ui/icons/Code'
 import Copy from '../Copy'
+import CustomIconButton from '../CustomIconButton'
+import DateFormatter from '../helper/DateFormatter'
+import Delete from '@material-ui/icons/Delete'
 import ExpandMore from '@material-ui/icons/ExpandMore'
 import MessageHistory from './MessageHistory'
 import NodeStats from './NodeStats'
-import Publish from './Publish/Publish'
+import Reorder from '@material-ui/icons/Reorder'
+import ToggleButton from '@material-ui/lab/ToggleButton'
+import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'
 import Topic from './Topic'
-import ValueRenderer from './ValueRenderer'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import { settingsActions, sidebarActons } from '../../actions'
+import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+import { TopicViewModel } from '../../TopicViewModel'
+import { ValueRendererDisplayMode } from '../../reducers/Settings'
+
+import {
+  Button,
+  ExpansionPanel,
+  ExpansionPanelDetails,
+  ExpansionPanelSummary,
+  Typography,
+  Tooltip,
+  Badge,
+} from '@material-ui/core'
+
+const throttle = require('lodash.throttle')
+
+const Publish = React.lazy(() => import('./Publish/Publish'))
+const ValueRenderer = React.lazy(() => import('./ValueRenderer'))
 
 interface Props {
-  node?: q.TreeNode,
-  classes: any,
-  theme: Theme,
-  connectionId?: string,
+  node?: q.TreeNode<TopicViewModel>
+  actions: typeof sidebarActons
+  settingsActions: typeof settingsActions
+  valueRendererDisplayMode: ValueRendererDisplayMode
+  classes: any
+  connectionId?: string
 }
 
 interface State {
-  node: q.TreeNode,
+  node: q.TreeNode<TopicViewModel>
   compareMessage?: q.Message
+  valueRenderWidth: number
 }
 
 class Sidebar extends React.Component<Props, State> {
   private valueRef: any = React.createRef<HTMLDivElement>()
-  private updateNode = () => {
+  private updateNode = throttle(() => {
     this.setState(this.state)
-  }
+  }, 300)
 
   constructor(props: any) {
     super(props)
     console.error('Find and fix me #state')
-    this.state = { node: new q.Tree() }
-  }
-
-  public static styles: StyleRulesCallback<string> = (theme: Theme) => {
-    return {
-      drawer: {
-        display: 'block',
-        height: '100%',
-      },
-      valuePaper: {
-        margin: `${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px`,
-      },
-      heading: {
-        fontSize: theme.typography.pxToRem(15),
-        fontWeight: theme.typography.fontWeightRegular,
-      },
-    }
+    this.state = { node: new q.Tree(), valueRenderWidth: 300 }
   }
 
   public componentWillReceiveProps(nextProps: Props) {
@@ -72,19 +73,23 @@ class Sidebar extends React.Component<Props, State> {
     }
   }
 
-  private registerUpdateListener(node: q.TreeNode) {
+  public componentWillUnmount() {
+    this.props.node && this.removeUpdateListener(this.props.node)
+  }
+
+  private registerUpdateListener(node: q.TreeNode<TopicViewModel>) {
     node.onMerge.subscribe(this.updateNode)
     node.onMessage.subscribe(this.updateNode)
   }
 
-  private removeUpdateListener(node: q.TreeNode) {
+  private removeUpdateListener(node: q.TreeNode<TopicViewModel>) {
     node.onMerge.unsubscribe(this.updateNode)
     node.onMessage.unsubscribe(this.updateNode)
   }
 
   public render() {
     return (
-      <div className={this.props.classes.drawer}>
+      <div id="Sidebar" className={this.props.classes.drawer}>
         {this.renderNode()}
       </div>
     )
@@ -92,50 +97,115 @@ class Sidebar extends React.Component<Props, State> {
 
   private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }
 
+  private renderTopicDeleteButton() {
+    if (!this.props.node || (!this.props.node.message || !this.props.node.message.value)) {
+      return null
+    }
+
+    return (
+      <CustomIconButton onClick={() => this.deleteTopic(this.props.node)}>
+        <Tooltip title="Clear this topic">
+          <Delete />
+        </Tooltip>
+      </CustomIconButton>
+    )
+  }
+
+  private renderRecursiveTopicDeleteButton() {
+    const deleteLimit = 50
+    const topicCount = this.props.node ? this.props.node.childTopicCount() : 0
+    if ((!this.props.node || topicCount === 0) || (this.props.node.message && topicCount === 1)) {
+      return null
+    }
+
+    return (
+      <CustomIconButton onClick={() => this.deleteTopic(this.props.node, true, deleteLimit)}>
+        <Tooltip title={`Deletes up to ${deleteLimit} sub-topics with a single click`}>
+          <Badge
+            classes={{ badge: this.props.classes.badge }}
+            badgeContent={<span style={{ whiteSpace: 'nowrap' }}>{topicCount >= deleteLimit ? '50+' : topicCount}</span>}
+            color="secondary"
+          >
+            <Delete color="action" />
+          </Badge>
+        </Tooltip>
+      </CustomIconButton>
+    )
+  }
+
+  private deleteTopic = (topic?: q.TreeNode<TopicViewModel>, recursive: boolean = false, maxCount = 50) => {
+    if (!topic) {
+      return
+    }
+
+    this.props.actions.clearTopic(topic, recursive, maxCount)
+  }
+
+  private renderActionButtons() {
+    const handleValue = (_e: React.MouseEvent, value: any) => {
+      this.props.settingsActions.setValueDisplayMode(value)
+    }
+
+    return (
+      <ToggleButtonGroup id="valueRendererDisplayMode" value={this.props.valueRendererDisplayMode} exclusive={true} onChange={handleValue}>
+        <ToggleButton value="diff" id="valueRendererDisplayMode-diff">
+          <Tooltip title="Show difference between the current and the last message">
+            <Code />
+          </Tooltip>
+        </ToggleButton>
+        <ToggleButton value="raw" id="valueRendererDisplayMode-raw">
+          <Tooltip title="Raw value">
+            <Reorder />
+          </Tooltip>
+        </ToggleButton>
+      </ToggleButtonGroup>
+    )
+  }
+
   private renderNode() {
     const { classes, node } = this.props
 
     const copyTopic = node ? <Copy value={node.path()} /> : null
+    const deleteTopic = this.renderTopicDeleteButton()
+    const deleteRecursiveTopic = this.renderRecursiveTopicDeleteButton()
     const copyValue = node && node.message ? <Copy value={node.message.value} /> : null
-    const summeryStyle = { minHeight: '0' }
+    const summaryStyle = { minHeight: '0' }
     return (
       <div>
         <ExpansionPanel key="topic" defaultExpanded={true} disabled={!Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
-            <Typography className={classes.heading}>Topic {copyTopic}</Typography>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
+            <Typography className={classes.heading}>Topic {copyTopic} {deleteTopic} {deleteRecursiveTopic}</Typography>
           </ExpansionPanelSummary>
           <ExpansionPanelDetails style={this.detailsStyle}>
             <Topic node={this.props.node} didSelectNode={this.updateNode} />
           </ExpansionPanelDetails>
         </ExpansionPanel>
         <ExpansionPanel key="value" defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
             <Typography className={classes.heading}>Value {copyValue}</Typography>
           </ExpansionPanelSummary>
           <ExpansionPanelDetails style={this.detailsStyle}>
-            <div ref={this.valueRef}><ValueRenderer message={this.props.node && this.props.node.message} /></div>
-            <div><MessageHistory onSelect={this.handleMessageHistorySelect} node={this.props.node} /></div>
-            <Popper open={Boolean(this.state.compareMessage)} anchorEl={this.valueRef.current} placement="left" transition={true}>
-              {({ TransitionProps }) => (
-                <Fade {...TransitionProps} timeout={350}>
-                  <Paper>
-                    <ValueRenderer message={this.state.compareMessage} />
-                  </Paper>
-                </Fade>
-              )}
-            </Popper>
+            {this.messageMetaInfo()}
+            <div ref={this.valueRef}>
+              <React.Suspense fallback={<div>Loading...</div>}>
+                {this.renderValue()}
+              </React.Suspense>
+            </div>
+            <div><MessageHistory onSelect={this.handleMessageHistorySelect} selected={this.state.compareMessage} node={this.props.node} /></div>
           </ExpansionPanelDetails>
         </ExpansionPanel>
         <ExpansionPanel defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
             <Typography className={classes.heading}>Publish</Typography>
           </ExpansionPanelSummary>
           <ExpansionPanelDetails style={this.detailsStyle}>
-            <Publish node={this.props.node} connectionId={this.props.connectionId} />
+            <React.Suspense fallback={<div>Loading...</div>}>
+              <Publish node={this.props.node} connectionId={this.props.connectionId} />
+            </React.Suspense>
           </ExpansionPanelDetails>
         </ExpansionPanel>
         <ExpansionPanel defaultExpanded={Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
             <Typography className={classes.heading}>Stats</Typography>
           </ExpansionPanelSummary>
           {this.renderNodeStats()}
@@ -144,6 +214,51 @@ class Sidebar extends React.Component<Props, State> {
     )
   }
 
+  private renderValue() {
+    const node = this.props.node
+    if (!node || !node.message) {
+      return null
+    }
+
+    return (
+      <ValueRenderer
+        message={node.message}
+        messageHistory={node.messageHistory}
+        compareWith={this.state.compareMessage} />
+    )
+  }
+
+  private messageMetaInfo() {
+    if (!this.props.node || !this.props.node.message || !this.props.node.mqttMessage) {
+      return null
+    }
+
+    const retainedButton = (
+      <Tooltip title="Delete retained topic" placement="top">
+        <Button
+          size="small"
+          color="secondary"
+          variant="contained"
+          style={{ marginTop: '-3px', padding: '0px 4px', minHeight: '24px' }}
+          onClick={this.props.actions.clearRetainedTopic}
+        >
+          retained <Clear style={{ fontSize: '16px', marginLeft: '2px' }} />
+        </Button>
+      </Tooltip>
+    )
+
+    return (
+      <div style={{ width: '100%', display: 'flex', paddingLeft: '8px' }}>
+        <div style={{ flex: 6 }}><Typography>QoS: {this.props.node.mqttMessage.qos}</Typography></div>
+        <span style={{ marginTop: '-8px' }}>{this.renderActionButtons()}</span>
+        <div style={{ flex: 8, textAlign: 'center' }}>
+          {this.props.node.mqttMessage.retain ? retainedButton : null}
+        </div>
+        <div style={{ flex: 8, textAlign: 'right' }}><Typography><i><DateFormatter date={this.props.node.message.received} /></i></Typography></div>
+      </div>
+    )
+  }
+
   private handleMessageHistorySelect = (message: q.Message) => {
     if (message !== this.state.compareMessage) {
       this.setState({ compareMessage: message })
@@ -167,8 +282,32 @@ class Sidebar extends React.Component<Props, State> {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    node: state.selectedTopic,
+    node: state.tree.selectedTopic,
+    valueRendererDisplayMode: state.settings.valueRendererDisplayMode,
   }
 }
 
-export default withStyles(Sidebar.styles, { withTheme: true })(connect(mapStateToProps)(Sidebar))
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(sidebarActons, dispatch),
+    settingsActions: bindActionCreators(settingsActions, dispatch),
+  }
+}
+
+const styles: StyleRulesCallback<string> = (theme: Theme) => {
+  return {
+    drawer: {
+      display: 'block',
+      height: '100%',
+    },
+    valuePaper: {
+      margin: theme.spacing(1),
+    },
+    heading: {
+      fontSize: theme.typography.pxToRem(15),
+      fontWeight: theme.typography.fontWeightRegular,
+    },
+  }
+}
+
+export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Sidebar))

app/src/components/Sidebar/Topic.tsx

@@ -2,13 +2,18 @@ import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
 import Button from '@material-ui/core/Button'
 import { withStyles, Theme, StyleRulesCallback } from '@material-ui/core/styles'
+import { treeActions } from '../../actions'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { TopicViewModel } from '../../TopicViewModel'
 
 interface Props {
   classes: any
   theme: Theme
-  node?: q.TreeNode
-  selected?: q.TreeNode
-  didSelectNode: (node: q.TreeNode) => void
+  node?: q.TreeNode<TopicViewModel>
+  selected?: q.TreeNode<TopicViewModel>
+  actions: typeof treeActions
+  didSelectNode: (node: q.TreeNode<TopicViewModel>) => void
 }
 
 const styles: StyleRulesCallback<string> = (theme: Theme) => ({
@@ -33,7 +38,7 @@ class Topic extends React.Component<Props, {}> {
       .map(edge =>
         [(
           <Button
-            onClick={() => this.setState({ node: edge!.target })}
+            onClick={() => this.props.actions.selectTopic(edge!.target)}
             size="small"
             color="secondary"
             className={this.props.classes.button}
@@ -56,4 +61,10 @@ class Topic extends React.Component<Props, {}> {
   }
 }
 
-export default withStyles(styles, { withTheme: true })(Topic)
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(treeActions, dispatch),
+  }
+}
+
+export default connect(null, mapDispatchToProps)(withStyles(styles, { withTheme: true })(Topic))

app/src/components/Sidebar/ValueRenderer.tsx

@@ -1,67 +1,108 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { Theme, withTheme } from '@material-ui/core/styles'
-
-import { default as ReactJson } from 'react-json-view'
+import * as React from 'react'
+import CodeDiff from '../CodeDiff'
+import { AppState } from '../../reducers'
+import { connect } from 'react-redux'
+import { default as ReactResizeDetector } from 'react-resize-detector'
+import { ValueRendererDisplayMode } from '../../reducers/Settings'
 
 interface Props {
-  message?: q.Message
-  theme: Theme
+  message: q.Message
+  messageHistory: q.RingBuffer<q.Message>
+  compareWith?: q.Message
+  renderMode: ValueRendererDisplayMode
 }
 
-class ValueRenderer extends React.Component<Props, {}> {
+interface State {
+  width: number
+}
+
+class ValueRenderer extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { width: 0 }
+  }
+
   public render() {
-    return <div>{this.renderValue()}</div>
+    return (
+      <div style={{ padding: '8px 0px 8px 8px' }}>
+        <ReactResizeDetector handleWidth={true} onResize={this.updateWidth} />
+        {this.renderValue()}
+      </div>
+    )
   }
 
   public renderValue() {
-    const { message } = this.props
-    if (!message) {
-      return null
+    const { message, messageHistory, compareWith, renderMode } = this.props
+
+    const previousMessages = messageHistory.toArray()
+    const previousMessage = previousMessages[previousMessages.length - 2]
+    let compareMessage = compareWith || previousMessage || message
+    if (renderMode === 'raw') {
+      compareMessage = message
     }
 
     let json
     try {
       json = JSON.parse(message.value)
     } catch (error) {
-      return this.renderRawValue(message.value)
+      return this.renderRawValue(message.value, compareMessage.value)
     }
 
     if (typeof json === 'string') {
-      return this.renderRawValue(message.value)
+      return this.renderRawValue(message.value, compareMessage.value)
     } else if (typeof json === 'number') {
-      return this.renderRawValue(message.value)
+      return this.renderRawValue(message.value, compareMessage.value)
     } else if (typeof json === 'boolean') {
-      return this.renderRawValue(message.value)
+      return this.renderRawValue(message.value, compareMessage.value)
     } else {
-      const theme = (this.props.theme.palette.type === 'dark') ? 'monokai' : 'bright:inverted'
-      return (
-        <ReactJson
-          style={{ width: '100%' }}
-          src={json}
-          theme={theme}
-        />
-      )
+      const current = this.messageToPrettyJson(message) || message.value
+      const compare = this.messageToPrettyJson(compareMessage) || compareMessage.value
+      const language = current && compare ? 'json' : undefined
+
+      return this.renderDiff(current, compare, language)
     }
   }
 
-  private renderRawValue(value: string) {
-    const style: React.CSSProperties = {
-      backgroundColor: 'rgba(80, 80, 80, 0.6)',
-      wordBreak: 'break-all',
-      width: '100%',
-      overflowX: 'scroll',
-      overflowY: 'clip',
-      display: 'block',
-      lineHeight: '1.2em',
-      padding: '12px 5px 12px 5px',
-      maxWidth: '40vw',
-      color: this.props.theme.palette.text.primary,
+  private renderDiff(current: string = '', previous: string = '', language?: 'json') {
+    return (
+      <CodeDiff
+        previous={previous}
+        current={current}
+        language={language}
+        nameOfCompareMessage={this.props.compareWith ? 'selected' : 'previous'}
+      />
+    )
+  }
+
+  private messageToPrettyJson(message?: q.Message): string | undefined {
+    if (!message || !message.value) {
+      return undefined
     }
 
-    return <pre style={style}><code>{value}</code></pre>
+    try {
+      const json = JSON.parse(message.value)
+      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)
   }
 }
 
-export default withTheme()(ValueRenderer)
+const mapStateToProps = (state: AppState) => {
+  return {
+    renderMode: state.settings.valueRendererDisplayMode,
+  }
+}
+
+export default connect(mapStateToProps)(ValueRenderer)

app/src/components/TitleBar.tsx

@@ -1,15 +1,23 @@
 import * as React from 'react'
-import * as q from '../../../backend/src/Model'
-
-import { AppBar, IconButton, InputBase, Toolbar, Typography } from '@material-ui/core'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-
+import ClearAdornment from './helper/ClearAdornment'
+import CloudOff from '@material-ui/icons/CloudOff'
+import ConnectionHealthIndicator from './ConnectionHealthIndicator'
 import Menu from '@material-ui/icons/Menu'
 import Search from '@material-ui/icons/Search'
+import { AppState } from '../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import { connectionActions, settingsActions } from '../actions'
 import { fade } from '@material-ui/core/styles/colorManipulator'
-import { settingsActions } from '../actions'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import {
+  AppBar,
+  Button,
+  IconButton,
+  InputBase,
+  Toolbar,
+  Typography,
+} from '@material-ui/core'
 
 const styles: StyleRulesCallback = theme => ({
   title: {
@@ -25,16 +33,16 @@ const styles: StyleRulesCallback = theme => ({
     '&:hover': {
       backgroundColor: fade(theme.palette.common.white, 0.25),
     },
-    marginRight: theme.spacing.unit * 2,
+    marginRight: theme.spacing(2),
     marginLeft: 0,
     width: '100%',
     [theme.breakpoints.up('sm')]: {
-      marginLeft: theme.spacing.unit * 3,
+      marginLeft: theme.spacing(3),
       width: 'auto',
     },
   },
   searchIcon: {
-    width: theme.spacing.unit * 9,
+    width: theme.spacing(8),
     height: '100%',
     position: 'absolute',
     pointerEvents: 'none',
@@ -47,10 +55,10 @@ const styles: StyleRulesCallback = theme => ({
     width: '100%',
   },
   inputInput: {
-    paddingTop: theme.spacing.unit,
-    paddingRight: theme.spacing.unit,
-    paddingBottom: theme.spacing.unit,
-    paddingLeft: theme.spacing.unit * 10,
+    paddingTop: theme.spacing(1),
+    paddingRight: theme.spacing(1),
+    paddingBottom: theme.spacing(1),
+    paddingLeft: theme.spacing(10),
     transition: theme.transitions.create('width'),
     width: '100%',
     [theme.breakpoints.up('md')]: {
@@ -65,60 +73,80 @@ const styles: StyleRulesCallback = theme => ({
 
 interface Props {
   classes: any
-  actions: any
+  actions: {
+    settings: typeof settingsActions,
+    connection: typeof connectionActions,
+  }
+  topicFilter?: string
 }
 
-interface State {
-  selectedNode?: q.TreeNode
-  settingsVisible: boolean
-  autoExpandLimit: number
-}
-
-class TitleBar extends React.Component<Props, State> {
+class TitleBar extends React.Component<Props, {}> {
   constructor(props: any) {
     super(props)
-    this.state = {
-      selectedNode: undefined,
-      settingsVisible: false,
-      autoExpandLimit: 0,
-    }
+    this.state = { }
   }
 
   public render() {
-    const { classes } = this.props
+    const { actions, classes } = this.props
 
-    return <AppBar position="static">
+    return (
+      <AppBar position="static">
         <Toolbar>
-          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={this.props.actions.toggleSettingsVisibility}>
+          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={actions.settings.toggleSettingsVisibility}>
             <Menu />
           </IconButton>
-          <Typography className={classes.title} variant="h6" color="inherit">MQTT-Explorer</Typography>
+          <Typography className={classes.title} variant="h6" color="inherit">MQTT Explorer</Typography>
+          {this.renderSearch()}
+          <Button style={{ margin: 'auto 8px auto auto' }} onClick={actions.connection.disconnect}>
+            Disconnect <CloudOff style={{ marginRight: '8px', paddingLeft: '8px' }}/>
+          </Button>
+          <ConnectionHealthIndicator />
         </Toolbar>
       </AppBar>
+    )
   }
 
   private renderSearch() {
-    const { classes } = this.props
+    const { classes, topicFilter } = this.props
 
-    return <div className={classes.search}>
-      <div className={classes.searchIcon}>
-        <Search />
+    return (
+      <div className={classes.search}>
+        <div className={classes.searchIcon}>
+          <Search />
+        </div>
+        <InputBase
+          value={topicFilter}
+          onChange={this.onFilterChange}
+          placeholder="Search…"
+          endAdornment={<div style={{ width: '24px', paddingRight: '8px' }}><ClearAdornment action={this.clearFilter} value={topicFilter} /></div>}
+          classes={{ root: classes.inputRoot, input: classes.inputInput }}
+        />
       </div>
-      <InputBase
-        placeholder="Search…"
-        classes={{
-          root: classes.inputRoot,
-          input: classes.inputInput,
-        }}
-      />
-    </div>
+    )
+  }
+
+  private clearFilter = () => {
+    this.props.actions.settings.filterTopics('')
+  }
+
+  private onFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    this.props.actions.settings.filterTopics(event.target.value)
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    topicFilter: state.settings.topicFilter,
   }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(settingsActions, dispatch),
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+      connection: bindActionCreators(connectionActions, dispatch),
+    },
   }
 }
 
-export default withStyles(styles)(connect(null, mapDispatchToProps)(TitleBar))
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(TitleBar))

app/src/components/Tree/Tree.tsx

@@ -1,40 +1,44 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { makeConnectionMessageEvent, rendererEvents } from '../../../../events'
-
-import { AppState } from '../../reducers'
+import * as React from 'react'
 import TreeNode from './TreeNode'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import { TopicOrder } from '../../reducers/Settings'
+import { TopicViewModel } from '../../TopicViewModel'
+import { treeActions } from '../../actions'
 
 const MovingAverage = require('moving-average')
 
-declare const performance: any
-declare const window: any
+const averagingTimeInterval = 10 * 1000
+const average = MovingAverage(averagingTimeInterval)
 
-const timeInterval = 10 * 1000
-const average = MovingAverage(timeInterval)
+declare var window: any
 
 interface Props {
-  autoExpandLimit: number
-  didSelectNode?: (node: q.TreeNode) => void
+  actions: typeof treeActions
   connectionId?: string
+  tree?: q.Tree<TopicViewModel>
+  filter: string
+  host?: string
+  topicOrder: TopicOrder
+  autoExpandLimit: number
+  highlightTopicUpdates: boolean
+  selectTopicWithMouseOver: boolean
 }
 
-interface TreeState {
-  tree: q.Tree
-  msg: any
+interface State {
+  lastUpdate: number
 }
 
-class Tree extends React.Component<Props, TreeState> {
+class Tree extends React.PureComponent<Props, State> {
   private updateTimer?: any
-  private lastUpdate: number = 0
   private perf: number = 0
+  private renderTime = 0
 
   constructor(props: any) {
     super(props)
-    const tree = new q.Tree()
-    this.state = { tree, msg: {} }
+    this.state = { lastUpdate: 0 }
   }
 
   public time(): number {
@@ -44,92 +48,97 @@ class Tree extends React.Component<Props, TreeState> {
     return time
   }
 
-  public throttledStateUpdate(state: any) {
+  public componentWillReceiveProps(nextProps: Props) {
+    if (this.props.tree !== nextProps.tree) {
+      if (this.props.tree) {
+        this.props.tree.didReceive.unsubscribe(this.throttledTreeUpdate)
+      }
+      if (nextProps.tree) {
+        nextProps.tree.didReceive.subscribe(this.throttledTreeUpdate)
+      }
+      this.setState(this.state)
+    }
+  }
+
+  public componentWillUnmount() {
+    this.props.tree && this.props.tree.didReceive.unsubscribe(this.throttledTreeUpdate)
+  }
+
+  public throttledTreeUpdate = () => {
     if (this.updateTimer) {
       return
     }
 
     const expectedRenderTime = average.forecast()
-    const updateInterval = Math.max(expectedRenderTime * 20, 300)
-    const timeUntilNextUpdate = updateInterval - (performance.now() - this.lastUpdate)
+    const updateInterval = Math.max(expectedRenderTime * 7, 300)
+    const timeUntilNextUpdate = updateInterval - (performance.now() - this.renderTime)
 
     this.updateTimer = setTimeout(() => {
-      window.requestAnimationFrame(() => {
-        this.lastUpdate = performance.now()
+      window.requestIdleCallback(() => {
         this.updateTimer && clearTimeout(this.updateTimer)
         this.updateTimer = undefined
-        this.setState(state)
-      })
+        this.renderTime = performance.now()
+        this.props.tree && this.props.tree.applyUnmergedChanges()
+        window.requestIdleCallback(() => {
+          this.setState({ lastUpdate: this.renderTime })
+        }, { timeout: 100 })
+      }, { timeout: 500 })
     }, Math.max(0, timeUntilNextUpdate))
   }
 
-  public componentWillReceiveProps(nextProps: Props) {
-    if (this.props.connectionId) {
-      const event = makeConnectionMessageEvent(this.props.connectionId)
-      rendererEvents.unsubscribeAll(event)
-    }
-    if (nextProps.connectionId) {
-      const event = makeConnectionMessageEvent(nextProps.connectionId)
-      rendererEvents.subscribe(event, this.handleNewData)
-    }
-  }
-
-  public componentDidMount() {
-    if (this.props.connectionId) {
-      const event = makeConnectionMessageEvent(this.props.connectionId)
-      rendererEvents.subscribe(event, this.handleNewData)
-    }
-  }
-
-  public componentWillUnmount() {
-    if (this.props.connectionId) {
-      const event = makeConnectionMessageEvent(this.props.connectionId)
-      rendererEvents.unsubscribeAll(event)
-    }
-  }
-
-  private handleNewData = (msg: any) => {
-    const edges = msg.topic.split('/')
-    const node = q.TreeNodeFactory.fromEdgesAndValue(edges, Buffer.from(msg.payload, 'base64').toString())
-    this.state.tree.updateWithNode(node.firstNode())
-
-    this.throttledStateUpdate({ msg, tree: this.state.tree })
-  }
-
   public render() {
-    console.log('render called')
+    const { tree, filter } = this.props
+    if (!tree) {
+      return null
+    }
 
     const style: React.CSSProperties = {
       lineHeight: '1.1',
       cursor: 'default',
     }
 
-    const performanceCallback = (ms: number) => {
-      average.push(Date.now(), ms)
-    }
-
     return (
       <div style={style}>
         <TreeNode
+          key={tree.hash()}
           animateChages={true}
-          autoExpandLimit={this.props.autoExpandLimit}
           isRoot={true}
-          didSelectNode={this.props.didSelectNode}
-          treeNode={this.state.tree}
-          name="/"
+          treeNode={tree}
+          name={this.props.host}
           collapsed={false}
-          key="rootNode"
-          lastUpdate={this.state.tree.lastUpdate}
+          performanceCallback={this.performanceCallback}
+          autoExpandLimit={this.props.autoExpandLimit}
+          topicOrder={this.props.topicOrder}
+          lastUpdate={tree.lastUpdate}
+          didSelectTopic={this.props.actions.selectTopic}
+          highlightTopicUpdates={this.props.highlightTopicUpdates}
+          selectTopicWithMouseOver={this.props.selectTopicWithMouseOver}
         />
       </div>
     )
   }
+
+  private performanceCallback = (ms: number) => {
+    average.push(Date.now(), ms)
+  }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
+    tree: state.tree.tree,
+    filter: state.tree.filter,
+    host: state.connection.host,
     autoExpandLimit: state.settings.autoExpandLimit,
+    topicOrder: state.settings.topicOrder,
+    highlightTopicUpdates: state.settings.highlightTopicUpdates,
+    selectTopicWithMouseOver: state.settings.selectTopicWithMouseOver,
   }
 }
 
-export default connect(mapStateToProps)(Tree)
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(treeActions, dispatch),
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Tree)

app/src/components/Tree/TreeNode.tsx

@@ -1,13 +1,12 @@
-import * as React from 'react'
-import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
-import { treeActions } from '../../actions'
 import * as q from '../../../../backend/src/Model'
-import { withStyles, Theme } from '@material-ui/core/styles'
-
-import { isElementInViewport } from '../helper/isElementInViewport'
-import TreeNodeTitle from './TreeNodeTitle'
+import * as React from 'react'
 import TreeNodeSubnodes from './TreeNodeSubnodes'
+import TreeNodeTitle from './TreeNodeTitle'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { TopicOrder } from '../../reducers/Settings'
+import { TopicViewModel } from '../../TopicViewModel'
+
+const debounce = require('lodash.debounce')
 
 declare var performance: any
 
@@ -23,31 +22,45 @@ const styles = (theme: Theme) => {
       display: 'block',
       marginLeft: '10px',
     },
+    topicSelect: {
+      float: 'right' as 'right',
+      opacity: 0,
+      cursor: 'pointer',
+      marginTop: '-1px',
+    },
+    subnodes: {
+      marginLeft: theme.spacing(1.5),
+    },
+    selected: {
+      backgroundColor: 'rgba(170, 170, 170, 0.55)',
+    },
     hover: {
-      '&:hover': {
-        backgroundColor: 'rgba(80, 80, 80, 0.35)',
-      },
+      backgroundColor: 'rgba(100, 100, 100, 0.55)',
     },
   }
 }
 
 interface Props {
-  actions: any
-  lastUpdate: number
   animateChages: boolean
   isRoot?: boolean
-  treeNode: q.TreeNode
+  treeNode: q.TreeNode<TopicViewModel>
   name?: string | undefined
   collapsed?: boolean | undefined
   performanceCallback?: ((ms: number) => void) | undefined
-  didSelectNode?: (node: q.TreeNode) => void
   classes: any
+  className?: string
+  topicOrder: TopicOrder
   autoExpandLimit: number
-  style?: React.CSSProperties
+  lastUpdate: number
+  didSelectTopic: any
+  highlightTopicUpdates: boolean
+  selectTopicWithMouseOver: boolean
 }
 
 interface State {
   collapsedOverride: boolean | undefined
+  mouseOver: boolean
+  selected: boolean
 }
 
 class TreeNode extends React.Component<Props, State> {
@@ -59,7 +72,7 @@ class TreeNode extends React.Component<Props, State> {
   private cssAnimationWasSetAt?: number
 
   private willUpdateTime: number = performance.now()
-  private titleRef = React.createRef<HTMLDivElement>()
+  private nodeRef?: React.RefObject<HTMLDivElement> = React.createRef<HTMLDivElement>()
 
   private subnodesDidchange = () => {
     this.dirtySubnodes = true
@@ -78,25 +91,53 @@ class TreeNode extends React.Component<Props, State> {
 
     this.state = {
       collapsedOverride: props.collapsed,
+      mouseOver: false,
+      selected: false,
     }
   }
 
   public componentDidMount() {
     const { treeNode } = this.props
+    this.addSubscriber(treeNode)
+  }
+
+  private addSubscriber(treeNode: q.TreeNode<TopicViewModel>) {
+    treeNode.viewModel = new TopicViewModel()
+    treeNode.viewModel.change.subscribe(this.viewStateHasChanged)
     treeNode.onMerge.subscribe(this.subnodesDidchange)
     treeNode.onEdgesChange.subscribe(this.edgesDidChange)
     treeNode.onMessage.subscribe(this.messageDidChange)
   }
 
-  public componentWillUnmount() {
-    const { treeNode } = this.props
+  private viewStateHasChanged = (msg: void, viewModel: TopicViewModel) => {
+    this.setState({ selected: viewModel.isSelected() })
+  }
+
+  private removeSubscriber(treeNode: q.TreeNode<TopicViewModel>) {
+    treeNode.viewModel && treeNode.viewModel.change.unsubscribe(this.viewStateHasChanged)
+    treeNode.viewModel = undefined
     treeNode.onMerge.unsubscribe(this.subnodesDidchange)
     treeNode.onEdgesChange.unsubscribe(this.edgesDidChange)
     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
+      || this.state.selected !== newState.selected
   }
 
   private propsHasChanged(newProps: Props) {
@@ -107,9 +148,7 @@ class TreeNode extends React.Component<Props, State> {
     const shouldRenderToRemoveCssAnimation = this.cssAnimationWasSetAt !== undefined
     return this.stateHasChanged(nextState)
       || this.propsHasChanged(nextProps)
-      || this.dirtyEdges
-      || this.dirtyMessage
-      || this.dirtySubnodes
+      || (this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes)
       || this.animationDirty
       || shouldRenderToRemoveCssAnimation
   }
@@ -119,12 +158,6 @@ class TreeNode extends React.Component<Props, State> {
       const renderTime = performance.now() - this.willUpdateTime
       this.props.performanceCallback(renderTime)
     }
-    // setTimeout(() => {
-    //   this.setState(this.state)
-    // }, 500)
-    // this.addCssAnimation()
-    // setTimeout(this.removeCssAnimation, 500)
-
   }
 
   public componentWillUpdate() {
@@ -145,73 +178,95 @@ class TreeNode extends React.Component<Props, State> {
     return this.props.treeNode.edgeCount() > this.props.autoExpandLimit
   }
 
-  // private addCssAnimation = () => {
-  //   const element = this.titleRef.current
-  //   if ((this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes) && element && isElementInViewport(element)) {
-  //     element.style.animation = 'example 0.5s'
-  //   }
-  // }
-  //
-  // private removeCssAnimation = () => {
-  //   const element = this.titleRef.current
-  //   if (element && element.style.animation) {
-  //     element.style.animation = ''
-  //   }
-  // }
-
   public render() {
     const { classes } = this.props
     const isDirty = this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes
     this.dirtyEdges = this.dirtyMessage = this.dirtySubnodes = false
 
-    const shouldStartAnimation = (isDirty && !this.animationDirty) && !this.props.isRoot
-    const animation = shouldStartAnimation ? { animation: 'example 0.5s' } : {}
+    const shouldStartAnimation = (isDirty && !this.animationDirty) && !this.props.isRoot && this.props.highlightTopicUpdates
+    const animation = shouldStartAnimation ? { willChange: 'auto', translateZ: 0, animation: 'example 0.5s' } : {}
     this.animationDirty = shouldStartAnimation
 
+    const highlightClass = this.state.selected ? this.props.classes.selected : (this.state.mouseOver ? this.props.classes.hover : '')
+
     return (
-      <div
-        key={this.props.treeNode.hash()}
-        className={`${classes.node} ${!this.props.isRoot ? classes.hover : ''}`}
-        onClick={this.didClickNode}
-        style={this.props.style}
-      >
-        <span ref={this.titleRef} style={animation}>
+      <div>
+        <div
+          key={this.props.treeNode.hash()}
+          className={`${classes.node} ${this.props.className}`}
+          onMouseOver={this.mouseOver}
+          onMouseOut={this.mouseOut}
+          onClick={this.didClickTitle}
+          ref={this.nodeRef}
+        >
           <TreeNodeTitle
+            style={animation}
+            toggleCollapsed={this.toggleCollapsed}
+            didSelectNode={this.didSelectTopic}
             collapsed={this.collapsed()}
             treeNode={this.props.treeNode}
             name={this.props.name}
-            lastUpdate={this.props.treeNode.lastUpdate}
+            className={highlightClass}
           />
-        </span>
-        {this.renderNodes()}
+        </div>
+        <div className={classes.subnodes}>
+          {this.renderNodes()}
+        </div>
       </div>
     )
   }
 
-  private didClickNode = (event: React.MouseEvent) => {
+  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()
-    this.props.actions.selectTopic(this.props.treeNode)
   }
 
   private renderNodes() {
+    if (this.collapsed()) {
+      return null
+    }
+
     return (
       <TreeNodeSubnodes
         animateChanges={this.props.animateChages}
         collapsed={this.collapsed()}
-        autoExpandLimit={this.props.autoExpandLimit}
-        didSelectNode={this.props.didSelectNode}
         treeNode={this.props.treeNode}
+        autoExpandLimit={this.props.autoExpandLimit}
+        topicOrder={this.props.topicOrder}
         lastUpdate={this.props.treeNode.lastUpdate}
+        didSelectTopic={this.props.didSelectTopic}
+        highlightTopicUpdates={this.props.highlightTopicUpdates}
+        selectTopicWithMouseOver={this.props.selectTopicWithMouseOver}
       />
     )
   }
 }
 
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(treeActions, dispatch),
-  }
-}
-
-export default withStyles(styles)(connect(null, mapDispatchToProps)(TreeNode))
+export default withStyles(styles)(TreeNode)

app/src/components/Tree/TreeNodeSubnodes.tsx

@@ -1,79 +1,110 @@
 import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
 
-import { AppState, NodeOrder } from '../../reducers'
-import { Theme, withTheme } from '@material-ui/core/styles'
-
 import TreeNode from './TreeNode'
-import { connect } from 'react-redux'
+import { TopicOrder } from '../../reducers/Settings'
+import { Theme, withStyles } from '@material-ui/core'
+import { TopicViewModel } from '../../TopicViewModel'
 
 export interface Props {
-  lastUpdate: number
-  nodeOrder?: NodeOrder
   animateChanges: boolean
-  treeNode: q.TreeNode
-  autoExpandLimit: number
+  treeNode: q.TreeNode<TopicViewModel>
+  filter?: string
   collapsed?: boolean | undefined
-  didSelectNode?: (node: q.TreeNode) => void
-  theme: Theme
+  classes: any
+  lastUpdate: number
+  topicOrder: TopicOrder
+  selectedTopic?: q.TreeNode<TopicViewModel>
+  autoExpandLimit: number
+  didSelectTopic: any
+  highlightTopicUpdates: boolean
+  selectTopicWithMouseOver: boolean
 }
 
-class TreeNodeSubnodes extends React.Component<Props, {}> {
-  private sortedNodes(): q.TreeNode[] {
-    const { nodeOrder, treeNode } = this.props
+interface State {
+  alreadyAdded: number
+}
 
-    let edges = Object.values(treeNode.edges)
-    if (nodeOrder === NodeOrder.abc) {
+class TreeNodeSubnodes extends React.Component<Props, State> {
+  private renderMoreAnimationFrame?: any
+  constructor(props: Props) {
+    super(props)
+    this.state = { alreadyAdded: 10 }
+  }
+
+  private sortedNodes(): q.TreeNode<TopicViewModel>[] {
+    const { topicOrder, treeNode } = this.props
+
+    let edges = treeNode.edgeArray
+    if (topicOrder === TopicOrder.abc) {
       edges = edges.sort((a, b) => a.name.localeCompare(b.name))
     }
 
     let nodes = edges.map(edge => edge.target)
-    if (nodeOrder === NodeOrder.messages) {
+    if (topicOrder === TopicOrder.messages) {
       nodes = nodes.sort((a, b) => b.leafMessageCount() - a.leafMessageCount())
     }
-    if (nodeOrder === NodeOrder.topics) {
-      nodes = nodes.sort((a, b) => b.leafCount() - a.leafCount())
+    if (topicOrder === TopicOrder.topics) {
+      nodes = nodes.sort((a, b) => b.childTopicCount() - a.childTopicCount())
     }
 
     return nodes
   }
 
+  private renderMore() {
+    this.renderMoreAnimationFrame = (window as any).requestIdleCallback(() => {
+      this.setState({ ...this.state, alreadyAdded: this.state.alreadyAdded * 1.5 })
+    }, { timeout: 500 })
+  }
+
+  public componentWillUnmount() {
+    (window as any).cancelIdleCallback(this.renderMoreAnimationFrame)
+  }
+
   public render() {
-    const edges = Object.values(this.props.treeNode.edges)
+    const edges = this.props.treeNode.edgeArray
     if (edges.length === 0 || this.props.collapsed) {
       return null
     }
 
-    const listItemStyle = {
-      padding: '3px 0px 0px 8px',
+    if (this.state.alreadyAdded < edges.length) {
+      this.renderMore()
     }
 
-    const nodes = this.sortedNodes()
-    const listItems = nodes.map(node => (
-        <div key={node.hash()}>
-          <TreeNode
-            animateChages={this.props.animateChanges}
-            treeNode={node}
-            didSelectNode={this.props.didSelectNode}
-            autoExpandLimit={this.props.autoExpandLimit}
-            lastUpdate={node.lastUpdate}
-            style={listItemStyle}
-          />
-        </div>
-      ))
+    const nodes = this.sortedNodes().slice(0, this.state.alreadyAdded)
+    const listItems = nodes.map((node) => {
+      return (
+        <TreeNode
+          key={`${node.hash()}-${this.props.filter}`}
+          animateChages={this.props.animateChanges}
+          treeNode={node}
+          className={this.props.classes.listItem}
+          topicOrder={this.props.topicOrder}
+          autoExpandLimit={this.props.autoExpandLimit}
+          lastUpdate={node.lastUpdate}
+          didSelectTopic={this.props.didSelectTopic}
+          highlightTopicUpdates={this.props.highlightTopicUpdates}
+          selectTopicWithMouseOver={this.props.selectTopicWithMouseOver}
+        />
+      )
+    })
 
     return (
-      <span style={{ display: 'block', clear: 'both' }} >
+      <span className={this.props.classes.list}>
         {listItems}
       </span>
     )
   }
 }
 
-const mapStateToProps = (state: AppState) => {
-  return {
-    nodeOrder: state.settings.nodeOrder,
-  }
-}
+const styles = (theme: Theme) => ({
+  list: {
+    display: 'block' as 'block',
+    clear: 'both' as 'both',
+  },
+  listItem: {
+    padding: `0px 0px 0px ${theme.spacing(1)}`,
+  },
+})
 
-export default withTheme()(connect(mapStateToProps)(TreeNodeSubnodes))
+export default withStyles(styles)(TreeNodeSubnodes)

app/src/components/Tree/TreeNodeTitle.tsx

@@ -1,74 +1,42 @@
 import * as React from 'react'
 import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
-import { treeActions } from '../../actions'
 import * as q from '../../../../backend/src/Model'
-import { withTheme, Theme } from '@material-ui/core/styles'
+import { withStyles, Theme } from '@material-ui/core'
+import { TopicViewModel } from '../../TopicViewModel'
+const debounce = require('lodash.debounce')
 
 export interface TreeNodeProps extends React.HTMLAttributes<HTMLElement> {
-  treeNode: q.TreeNode
-  actions: any
+  treeNode: q.TreeNode<TopicViewModel>
   name?: string | undefined
   collapsed?: boolean | undefined
-  theme: Theme
-  lastUpdate: number
+  classes: any
+  didSelectNode: any
+  toggleCollapsed: any
 }
 
 class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
-  private getStyles() {
-    const { theme } = this.props
-    return {
-      collapsedSubnodes: {
-        color: theme.palette.text.secondary,
-      },
-      container: {
-        display: 'block',
-      },
-    }
-  }
-
-  private didSelectNode = (event: React.MouseEvent) => {
-    event.stopPropagation()
-    if (this.props.treeNode.message) {
-      this.props.actions.selectTopic(this.props.treeNode)
-    }
-  }
-
   public render() {
-    const style: React.CSSProperties = {
-      lineHeight: '1em',
-      whiteSpace: 'nowrap',
-    }
+    const { classes, treeNode, style, className } = this.props
     return (
-      <span style={style} onMouseOver={this.didSelectNode}>
-        {this.renderExpander()} {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()}
+      <span
+        className={`${classes.title} ${className}`}
+        style={style}
+      >
+        <span className={classes.expander} onClick={this.props.toggleCollapsed}>{this.renderExpander()}</span>
+        {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()}
       </span>
     )
   }
 
   private renderSourceEdge() {
-    const style: React.CSSProperties = {
-      fontWeight: 'bold',
-      overflow: 'hidden',
-      display: 'inline-block',
-    }
     const name = this.props.name || (this.props.treeNode.sourceEdge && this.props.treeNode.sourceEdge.name)
 
-    return <span style={style}>{name}</span>
+    return <span className={this.props.classes.sourceEdge}>{name}</span>
   }
 
   private renderValue() {
-    const style: React.CSSProperties = {
-      maxWidth: '15em',
-      whiteSpace: 'nowrap',
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      padding: '0',
-      marginLeft: '5px',
-      display: 'inline-block',
-    }
-    return this.props.treeNode.message
-      ? <span style={style}> = {this.props.treeNode.message.value.toString()}</span>
+    return this.props.treeNode.message && this.props.treeNode.message.length > 0
+      ? <span className={this.props.classes.value}> = {this.props.treeNode.message.value.toString().slice(0, 120)}</span>
       : null
   }
 
@@ -86,14 +54,38 @@ class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
     }
 
     const messages = this.props.treeNode.leafMessageCount()
-    return <span style={this.getStyles().collapsedSubnodes}>({this.props.treeNode.leafCount()} nodes, {messages} messages)</span>
+    return <span className={this.props.classes.collapsedSubnodes}>({this.props.treeNode.childTopicCount()} topics, {messages} messages)</span>
   }
 }
 
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(treeActions, dispatch),
-  }
-}
+const styles = (theme: Theme) => ({
+  value: {
+    whiteSpace: 'nowrap' as 'nowrap',
+    overflow: 'hidden' as 'hidden',
+    textOverflow: 'ellipsis' as 'ellipsis',
+    padding: '0',
+  },
+  sourceEdge: {
+    fontWeight: 'bold' as 'bold',
+    overflow: 'hidden' as 'hidden',
+  },
+  expander: {
+    color: theme.palette.type === 'light' ? '#222' : '#eee',
+    cursor: 'pointer' as 'pointer',
+    paddingRight: theme.spacing(0.25),
+  },
+  title: {
+    borderRadius: '4px',
+    lineHeight: '1em',
+    display: 'inline-block' as 'inline-block',
+    whiteSpace: 'nowrap' as 'nowrap',
+    padding: '1px 4px 0px 4px',
+    height: '14px',
+    margin: '1px 0px 2px 0px',
+  },
+  collapsedSubnodes: {
+    color: theme.palette.text.secondary,
+  },
+})
 
-export default withTheme()(connect(null, mapDispatchToProps)(TreeNodeTitle))
+export default withStyles(styles)(TreeNodeTitle)

app/src/components/demo/Key.tsx

@@ -0,0 +1,44 @@
+import * as React from 'react'
+import { Theme, withStyles } from '@material-ui/core'
+
+interface Props {
+  keyboardKey: string
+  classes: any
+}
+
+class Key extends React.Component<Props, {}> {
+  constructor(props: any) {
+    super(props)
+    this.state = { location: 'bottom' }
+  }
+
+  public render() {
+
+    return (
+      <div className={this.props.classes.keyStyle}>
+        <div className={this.props.classes.keyTextStyle}>{this.props.keyboardKey}</div>
+      </div>
+    )
+  }
+}
+
+const style = (theme: Theme) => ({
+  keyStyle: {
+    display: 'inline-block' as 'inline-block',
+    width: '1em',
+    height: '1em',
+    backgroundColor: '#bbb',
+    borderRadius: '10%',
+    verticalAlign: 'middle' as 'middle',
+    textAlign: 'center' as 'center',
+    textShadow: '1px 1px rgba(255,255,255,0.45)',
+    boxShadow: '0.08em 0.15em 0.01em 0px rgba(100,100,100,0.75)',
+  },
+  keyTextStyle: {
+    marginTop: '0.65em',
+    fontSize: '0.4em',
+    fontWeight: 'bold' as 'bold',
+  },
+})
+
+export default withStyles(style)(Key)

app/src/components/demo/Mouse.tsx

@@ -0,0 +1,78 @@
+import * as React from 'react'
+import { Theme, withStyles } from '@material-ui/core'
+
+interface State {
+  enabled: boolean
+  target: {x: number, y: number}
+  position: {x: number, y: number}
+  stepSizeX: number,
+  stepSizeY: number,
+}
+
+class Demo extends React.Component<{}, State> {
+  private timer: any
+  private frameInterval = 20
+
+  constructor(props: any) {
+    super(props)
+    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))
+    const dirX = this.state.position.x > this.state.target.x ? -1 : 1
+    const dirY = this.state.position.y > this.state.target.y ? -1 : 1
+
+    if (steSizeX <= 0.1 && steSizeY <= 0.1) {
+      this.timer && clearTimeout(this.timer)
+      return
+    }
+
+    this.setState({
+      position: {
+        x: this.state.position.x + (dirX * steSizeX),
+        y: this.state.position.y + (dirY * steSizeY),
+      },
+    })
+
+    this.timer = setTimeout(() => {
+      this.moveCloser(steps + 1)
+    }, this.frameInterval)
+  }
+
+  public render() {
+    if (!this.state.enabled) {
+      return null
+    }
+    const style = {
+      width: '32px',
+      height: '32px',
+      position: 'fixed' as 'fixed',
+      zIndex: 1000000,
+      filter: 'invert(100%)',
+      left: this.state.position.x + 2,
+      top: this.state.position.y + 2,
+    }
+
+    return (
+      <img src="../cursor.png" style={style} />
+    )
+  }
+}
+
+const style = (theme: Theme) => {}
+
+export default withStyles(style)(Demo)

app/src/components/demo/ShowText.tsx

@@ -0,0 +1,91 @@
+import * as React from 'react'
+import { Theme, withStyles } from '@material-ui/core'
+import Key from './Key';
+
+interface State {
+  message?: string
+  keys: string[]
+  location: string
+}
+
+
+
+class Demo extends React.Component<{classes: any}, State> {
+  private timer: any
+  constructor(props: any) {
+    super(props)
+    this.state = { location: 'bottom', keys: [] }
+  }
+
+  private clearTimer() {
+    this.timer && clearTimeout(this.timer)
+  }
+
+  public componentDidMount() {
+    (window as any).demo.showMessage = (message: string, location: string, duration: number, keys: string[] = []) => {
+      this.clearTimer()
+      this.setState({ message, location, keys })
+      this.timer = setTimeout(() => this.setState({ message: undefined }), duration)
+    }
+
+    (window as any).demo.hideMessage = () => {
+      this.clearTimer()
+      this.setState({ message: undefined })
+    }
+  }
+
+  public render() {
+    const positions: {[s: string]: number} = {
+      top: 0,
+      bottom: -65,
+      middle: -32,
+    }
+    const style = {
+      position: 'fixed' as 'fixed',
+      left: '5vw',
+      zIndex: 1000000,
+      margin: '30vw auto 50vw',
+      right: '5vw',
+      bottom: `${positions[this.state.location]}vh`,
+    }
+    const style2 = {
+      textAlign: 'center' as 'center',
+      fontSize: '4em',
+      color: 'white',
+      backgroundColor: 'rgba(0, 0, 0, 0.8)',
+      borderRadius: '16px',
+
+    }
+
+    if (!this.state.message) {
+      return null
+    }
+
+    let keys: any[] = []
+    if (this.state.keys.length > 0) {
+      keys = this.state.keys.map(key => [<Key key={key} keyboardKey={key} />])
+        .reduce((prev, current) => {
+          return [prev, '+' as any, current]
+        })
+    }
+
+    return (
+      <div style={style}>
+        <div style={style2}>
+          <span>{this.state.message}</span>
+          {keys.length > 0 ? <div className={this.props.classes.keysStyle}>{keys}</div> : null}
+        </div>
+      </div>
+    )
+  }
+}
+
+const style = (theme: Theme) => ({
+  keysStyle: {
+    fontSize: '1em',
+    display: 'inline-block' as 'inline-block',
+    transform: 'translateY(0.3em) translateX(0.8em)',
+  },
+})
+
+export default withStyles(style)(Demo)

app/src/components/demo/index.tsx

@@ -0,0 +1,14 @@
+import * as React from 'react'
+import ShowText from './ShowText'
+import Mouse from './Mouse';
+
+(window as any).demo = {}
+
+export default function render(props: any) {
+  return (
+    <span>
+      <ShowText />
+      <Mouse />
+    </span>
+  )
+}

app/src/components/helper/ClearAdornment.tsx

@@ -0,0 +1,28 @@
+import * as React from 'react'
+import Clear from '@material-ui/icons/Clear'
+import { IconButton } from '@material-ui/core'
+
+interface Props {
+  value?: string
+  action: any
+  style?: React.CSSProperties
+}
+
+/**
+ * Clear button for text input fields
+ */
+class ClearAdornment extends React.Component<Props, {}> {
+  public render() {
+    if (this.props.value) {
+      return (
+        <IconButton style={{ ...this.props.style, padding: '1px' }} onClick={this.props.action}>
+          <Clear style={{ fontSize: '16px' }} />
+        </IconButton>
+      )
+    }
+
+    return null
+  }
+}
+
+export default ClearAdornment

app/src/components/helper/DateFormatter.tsx

@@ -0,0 +1,14 @@
+import * as React from 'react'
+
+interface Props {
+  date: Date
+}
+
+class DateFormatter extends React.Component<Props, {}> {
+
+  public render() {
+    return <span>{this.props.date.toLocaleDateString()} {this.props.date.toLocaleTimeString()}</span>
+  }
+}
+
+export default DateFormatter

app/src/index.tsx

@@ -1,44 +1,48 @@
-import './tracking'
-
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
-
-import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'
-import reducers, { AppState, NodeOrder } from './reducers'
-
 import App from './App'
+import Demo from './components/demo'
+import reducers from './reducers'
+import reduxThunk from 'redux-thunk'
+import { applyMiddleware, compose, createStore } from 'redux'
+import { batchDispatchMiddleware } from 'redux-batched-actions'
+import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles'
 import { Provider } from 'react-redux'
-import { createStore } from 'redux'
+import './tracking'
 
-const initialAppState: AppState = {
-  settings: {
-    autoExpandLimit: 0,
-    nodeOrder: NodeOrder.none,
-    visible: false,
-  },
-  sidebar: {},
-  selectedTopic: undefined,
-  showUpdateDetails: false,
-}
-const store = createStore(reducers, initialAppState)
+
+
+
+const composeEnhancers = /*(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || */ compose
+const store = createStore(
+  reducers,
+  composeEnhancers(
+    applyMiddleware(
+      reduxThunk,
+      batchDispatchMiddleware,
+    ),
+  ),
+)
 
 const theme = createMuiTheme({
   palette: {
     type: 'dark',
   },
-  typography: { useNextVariants: true },
 })
 
-const splash = document.getElementById('splash')
-if (splash) {
-  splash.style.animation = 'unsplash 1s ease-out 0s 1 normal forwards'
-  setTimeout(() => splash.remove(), 1100)
-}
+setTimeout(() => {
+  const splash = document.getElementById('splash')
+  if (splash) {
+    splash.style.animation = 'unsplash 0.5s ease-in 0s 1 normal forwards'
+    setTimeout(() => splash.remove(), 600)
+  }
+}, 300)
 
 ReactDOM.render(
     <MuiThemeProvider theme={theme}>
       <Provider store={store}>
-        <App name="" />
+        <App />
+        <Demo />
       </Provider>
     </MuiThemeProvider>,
     document.getElementById('app'),

app/src/model/ConnectionOptions.ts

@@ -0,0 +1,73 @@
+import { MqttOptions } from '../../../backend/src/DataSource'
+import { v4 } from 'uuid'
+const sha1 = require('sha1')
+
+export interface ConnectionOptions {
+  type: 'mqtt'
+  id: string
+  host: string
+  protocol: 'mqtt' | 'ws'
+  basePath?: string
+  port: number
+  name: string
+  username?: string
+  password?: string
+  encryption: boolean
+  certValidation: boolean
+  clientId?: string
+  subscriptions: string[]
+}
+
+export function toMqttConnection(options: ConnectionOptions): MqttOptions | undefined {
+  if (options.type !== 'mqtt') {
+    return
+  }
+
+  return {
+    url: `${options.protocol}://${options.host}:${options.port}/${options.basePath || ''}`,
+    username: options.username,
+    password: options.password,
+    tls: options.encryption,
+    certValidation: options.certValidation,
+    subscriptions: options.subscriptions,
+  }
+}
+
+export function generateClienId() {
+  const clientIdSha = sha1(`${Math.random()}`).slice(0, 8)
+  return `mqtt-explorer-${clientIdSha}`
+}
+
+export function createEmptyConnection(): ConnectionOptions {
+  return {
+    certValidation: true,
+    clientId: generateClienId(),
+    id: v4() as string,
+    name: 'new connection',
+    encryption: false,
+    password: undefined,
+    username: undefined,
+    subscriptions: ['#', '$SYS/#'],
+    type: 'mqtt',
+    host: '',
+    port: 1883,
+    protocol: 'mqtt',
+  }
+}
+
+export function makeDefaultConnections() {
+  return {
+    'iot.eclipse.org': {
+      ...createEmptyConnection(),
+      id: 'iot.eclipse.org',
+      name: 'iot.eclipse.org',
+      host: 'iot.eclipse.org',
+    },
+    'test.mosquitto.org': {
+      ...createEmptyConnection(),
+      id: 'test.mosquitto.org',
+      name: 'test.mosquitto.org',
+      host: 'test.mosquitto.org',
+    },
+  }
+}

app/src/model/LegacyConnectionSettings.ts

@@ -0,0 +1,59 @@
+import { ConnectionOptions, createEmptyConnection } from './ConnectionOptions'
+import { v4 } from 'uuid'
+
+interface LegacyConnectionSettings {
+  host: string
+  protocol: string
+  port: number
+  tls: boolean
+  certValidation: boolean
+  clientId: string
+  connectionId?: string
+  username: string
+  password: string
+}
+
+export function clearLegacyConnectionOptions() {
+  window.localStorage.setItem('connectionSettings', '')
+}
+
+export function loadLegacyConnectionOptions(): {[s: string]: ConnectionOptions} | {} {
+  const legacySettingsString = window.localStorage.getItem('connectionSettings')
+  if (!legacySettingsString) {
+    return {}
+  }
+
+  let legacyConnection
+  try {
+    legacyConnection = JSON.parse(legacySettingsString) as LegacyConnectionSettings
+  } catch {
+    return {}
+  }
+
+  const protocolMap: {[s: string]: string} = {
+    'tcp://': 'mqtt',
+    'ws://': 'ws',
+    'mqtt://': 'mqtt',
+  }
+
+  const migratedOptions: Partial<ConnectionOptions> = {
+    certValidation: legacyConnection.certValidation,
+    host: legacyConnection.host,
+    name: legacyConnection.host,
+    protocol: protocolMap[legacyConnection.protocol] as any,
+    port: legacyConnection.port,
+    username: legacyConnection.username,
+    password: legacyConnection.password,
+    clientId: legacyConnection.clientId,
+    encryption: legacyConnection.tls,
+  }
+
+  const emptyConnection = createEmptyConnection()
+
+  return {
+    [emptyConnection.id]: {
+      ...emptyConnection,
+      ...migratedOptions,
+    },
+  }
+}

app/src/reducers/Connection.ts

@@ -0,0 +1,110 @@
+import * as q from '../../../backend/src/Model'
+import { Action } from 'redux'
+import { createReducer } from './lib'
+import { MqttOptions } from '../../../backend/src/DataSource'
+import { TopicViewModel } from '../TopicViewModel'
+
+export type ConnectionHealth = 'offline' | 'online' | 'connecting'
+export interface ConnectionState {
+  host?: string
+  tree?: q.Tree<TopicViewModel>
+  connectionOptions?: MqttOptions
+  connectionId?: string
+  error?: string
+  connected: boolean
+  connecting: boolean
+  health?: ConnectionHealth
+}
+
+export type Action = SetConnecting | SetConnected | SetDisconnected | ShowError
+
+export enum ActionTypes {
+  CONNECTION_SET_CONNECTING = 'CONNECTION_SET_CONNECTING',
+  CONNECTION_SET_CONNECTED = 'CONNECTION_SET_CONNECTED',
+  CONNECTION_SET_DISCONNECTED = 'CONNECTION_SET_DISCONNECTED',
+  CONNECTION_SET_SHOW_ERROR = 'CONNECTION_SET_SHOW_ERROR',
+  CONNECTION_SET_HEALTH = 'CONNECTION_SET_HEALTH',
+}
+
+export interface SetConnecting {
+  type: ActionTypes.CONNECTION_SET_CONNECTING,
+  connectionId: string
+}
+
+export interface SetConnected {
+  type: ActionTypes.CONNECTION_SET_CONNECTED
+  host: string
+  tree: q.Tree<TopicViewModel>
+}
+
+export interface SetDisconnected {
+  type: ActionTypes.CONNECTION_SET_DISCONNECTED
+}
+
+export interface SetHealth {
+  health: ConnectionHealth
+  type: ActionTypes.CONNECTION_SET_DISCONNECTED
+}
+
+export interface ShowError {
+  type: ActionTypes.CONNECTION_SET_SHOW_ERROR
+  error?: Error
+}
+
+const initialState: ConnectionState = {
+  connected: false,
+  connecting: false,
+  health: undefined,
+}
+
+export const connectionReducer = createReducer(initialState, {
+  CONNECTION_SET_CONNECTING: setConnecting,
+  CONNECTION_SET_CONNECTED: setConnected,
+  CONNECTION_SET_DISCONNECTED: setDisconnected,
+  CONNECTION_SET_SHOW_ERROR: showError,
+  CONNECTION_SET_HEALTH: setHealth,
+})
+
+function setConnecting(state: ConnectionState, action: SetConnecting): ConnectionState {
+  return {
+    ...state,
+    connecting: true,
+    connected: false,
+    connectionId: action.connectionId,
+  }
+}
+
+function setHealth(state: ConnectionState, action: SetHealth): ConnectionState {
+  return {
+    ...state,
+    health: action.health,
+  }
+}
+
+function setConnected(state: ConnectionState, action: SetConnected): ConnectionState {
+  return {
+    ...state,
+    host: action.host,
+    connecting: false,
+    connected: true,
+    tree: action.tree,
+  }
+}
+
+function setDisconnected(state: ConnectionState, action: SetDisconnected): ConnectionState {
+  return {
+    ...state,
+    host: undefined,
+    connecting: false,
+    connected: false,
+    connectionId: undefined,
+    tree: undefined,
+  }
+}
+
+function showError(state: ConnectionState, action: ShowError) {
+  return {
+    ...state,
+    error: action.error,
+  }
+}

app/src/reducers/ConnectionManager.ts

@@ -0,0 +1,174 @@
+import { Action } from 'redux'
+import { ConnectionOptions } from '../model/ConnectionOptions'
+import { createReducer } from './lib'
+
+export interface ConnectionManagerState {
+  connections: {[s:string]: ConnectionOptions},
+  selected?: string
+  showAdvancedSettings: boolean
+}
+
+const initialState: ConnectionManagerState = {
+  connections: {},
+  selected: undefined,
+  showAdvancedSettings: false,
+}
+
+export type Action = SetConnections | SelectConnection | UpdateConnection | AddConnection | DeleteConnection | ToggleAdvancedSettings | DeleteSubscription | AddSubscription
+
+export enum ActionTypes {
+  CONNECTION_MANAGER_SET_CONNECTIONS = 'CONNECTION_MANAGER_SET_CONNECTIONS',
+  CONNECTION_MANAGER_SELECT_CONNECTION = 'CONNECTION_MANAGER_SELECT_CONNECTION',
+  CONNECTION_MANAGER_UPDATE_CONNECTION = 'CONNECTION_MANAGER_UPDATE_CONNECTION',
+  CONNECTION_MANAGER_ADD_CONNECTION = 'CONNECTION_MANAGER_ADD_CONNECTION',
+  CONNECTION_MANAGER_DELETE_CONNECTION = 'CONNECTION_MANAGER_DELETE_CONNECTION',
+  CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS = 'CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS',
+  CONNECTION_MANAGER_ADD_SUBSCRIPTION = 'CONNECTION_MANAGER_ADD_SUBSCRIPTION',
+  CONNECTION_MANAGER_DELETE_SUBSCRIPTION = 'CONNECTION_MANAGER_DELETE_SUBSCRIPTION',
+}
+
+export interface SetConnections {
+  type: ActionTypes.CONNECTION_MANAGER_SET_CONNECTIONS
+  connections: {[s:string]: ConnectionOptions}
+}
+
+export interface SelectConnection {
+  type: ActionTypes.CONNECTION_MANAGER_SELECT_CONNECTION
+  selected: string
+}
+
+export interface AddSubscription {
+  type: ActionTypes.CONNECTION_MANAGER_ADD_SUBSCRIPTION
+  subscription: string
+  connectionId: string
+}
+
+export interface DeleteSubscription {
+  type: ActionTypes.CONNECTION_MANAGER_DELETE_SUBSCRIPTION
+  subscription: string
+  connectionId: string
+}
+
+export interface UpdateConnection {
+  type: ActionTypes.CONNECTION_MANAGER_UPDATE_CONNECTION
+  connectionId: string
+  changeSet: any
+}
+
+export interface AddConnection {
+  type: ActionTypes.CONNECTION_MANAGER_ADD_CONNECTION
+  connection: ConnectionOptions
+}
+
+export interface DeleteConnection {
+  type: ActionTypes.CONNECTION_MANAGER_DELETE_CONNECTION
+  connectionId: string
+}
+
+export interface ToggleAdvancedSettings {
+  type: ActionTypes.CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS
+}
+
+export const connectionManagerReducer = createReducer(initialState, {
+  CONNECTION_MANAGER_SET_CONNECTIONS: setConnections,
+  CONNECTION_MANAGER_SELECT_CONNECTION: selectConnection,
+  CONNECTION_MANAGER_UPDATE_CONNECTION: updateConnection,
+  CONNECTION_MANAGER_ADD_CONNECTION: addConnection,
+  CONNECTION_MANAGER_DELETE_CONNECTION: deleteConnection,
+  CONNECTION_MANAGER_TOGGLE_ADVANCED_SETTINGS: toggleAdvancedSettings,
+  CONNECTION_MANAGER_DELETE_SUBSCRIPTION: deleteSubscription,
+  CONNECTION_MANAGER_ADD_SUBSCRIPTION: addSubscription,
+})
+
+function setConnections(state: ConnectionManagerState, action: SetConnections): ConnectionManagerState {
+  return {
+    ...state,
+    connections: action.connections,
+  }
+}
+
+function selectConnection(state: ConnectionManagerState, action: SelectConnection): ConnectionManagerState {
+  return {
+    ...state,
+    selected: action.selected,
+  }
+}
+
+function toggleAdvancedSettings(state: ConnectionManagerState, action: ToggleAdvancedSettings): ConnectionManagerState {
+  return {
+    ...state,
+    showAdvancedSettings: !state.showAdvancedSettings,
+  }
+}
+
+function addConnection(state: ConnectionManagerState, action: AddConnection): ConnectionManagerState {
+  return {
+    ...state,
+    connections: {
+      ...state.connections,
+      [action.connection.id]: action.connection,
+    },
+  }
+}
+
+function addSubscription(state: ConnectionManagerState, action: AddSubscription): ConnectionManagerState {
+  const connection = state.connections[action.connectionId]
+  const alreadyExists = connection.subscriptions.indexOf(action.subscription) !== -1
+  if (alreadyExists) {
+    return state
+  }
+
+  const newSubscriptions = connection.subscriptions.slice()
+  newSubscriptions.push(action.subscription)
+  return {
+    ...state,
+    connections: {
+      ...state.connections,
+      [action.connectionId]: {
+        ...connection,
+        subscriptions: newSubscriptions,
+      },
+    },
+  }
+}
+
+function deleteSubscription(state: ConnectionManagerState, action: AddSubscription): ConnectionManagerState {
+  const connection = state.connections[action.connectionId]
+  const newSubscriptions = connection.subscriptions.filter(s => s !== action.subscription)
+
+  return {
+    ...state,
+    connections: {
+      ...state.connections,
+      [action.connectionId]: {
+        ...connection,
+        subscriptions: newSubscriptions,
+      },
+    },
+  }
+}
+
+function deleteConnection(state: ConnectionManagerState, action: DeleteConnection): ConnectionManagerState {
+  const connections = { ...state.connections }
+  delete connections[action.connectionId]
+
+  return {
+    ...state,
+    connections,
+  }
+}
+
+function updateConnection(state: ConnectionManagerState, action: UpdateConnection): ConnectionManagerState {
+  let connection = state.connections[action.connectionId]
+  connection = {
+    ...connection,
+    ...action.changeSet,
+  }
+  return {
+    ...state,
+    connections: {
+      ...state.connections,
+      [action.connectionId]: connection,
+    },
+  }
+}

app/src/reducers/Publish.ts

@@ -0,0 +1,93 @@
+import { Action } from 'redux'
+import { createReducer } from './lib'
+
+export interface PublishState {
+  topic?: string
+  payload?: string
+  retain: boolean
+  editorMode: string
+  qos: 0 | 1 | 2
+}
+
+export type Action = SetPayload | SetTopic | ToggleRetain | SetEditorMode | SetQoS
+
+export enum ActionTypes {
+  PUBLISH_SET_TOPIC = 'PUBLISH_SET_TOPIC',
+  PUBLISH_SET_PAYLOAD = 'PUBLISH_SET_PAYLOAD',
+  PUBLISH_TOGGLE_RETAIN = 'PUBLISH_TOGGLE_RETAIN',
+  PUBLISH_SET_EDITOR_MODE = 'PUBLISH_SET_EDITOR_MODE',
+  PUBLISH_SET_QOS = 'PUBLISH_SET_QOS',
+}
+
+export interface SetPayload {
+  type: ActionTypes.PUBLISH_SET_PAYLOAD
+  payload?: string
+}
+
+export interface SetTopic {
+  type: ActionTypes.PUBLISH_SET_TOPIC
+  topic?: string
+}
+
+export interface SetQoS {
+  type: ActionTypes.PUBLISH_SET_QOS
+  qos: 0 | 1 | 2
+}
+
+export interface SetEditorMode {
+  type: ActionTypes.PUBLISH_SET_EDITOR_MODE
+  editorMode: string
+}
+
+export interface ToggleRetain {
+  type: ActionTypes.PUBLISH_TOGGLE_RETAIN
+}
+
+const initialState: PublishState = {
+  editorMode: 'json',
+  retain: false,
+  qos: 0,
+}
+
+export const publishReducer = createReducer(initialState, {
+  PUBLISH_SET_TOPIC: setTopic,
+  PUBLISH_SET_PAYLOAD: setPayload,
+  PUBLISH_TOGGLE_RETAIN: toggleRetain,
+  PUBLISH_SET_EDITOR_MODE: setEditorMode,
+  PUBLISH_SET_QOS: setQoS,
+})
+
+function setTopic(state: PublishState, action: SetTopic) {
+  return {
+    ...state,
+    topic: action.topic,
+  }
+}
+
+function setPayload(state: PublishState, action: SetPayload) {
+  return {
+    ...state,
+    payload: action.payload,
+  }
+}
+
+function setQoS(state: PublishState, action: SetQoS) {
+  return {
+    ...state,
+    qos: action.qos,
+  }
+}
+
+function setEditorMode(state: PublishState, action: SetEditorMode) {
+  return {
+    ...state,
+    editorMode: action.editorMode,
+  }
+}
+
+function toggleRetain(state: PublishState) {
+  return {
+    ...state,
+    retain: !state.retain,
+  }
+}

app/src/reducers/Settings.ts

@@ -0,0 +1,149 @@
+import { Action } from 'redux'
+import { createReducer } from './lib'
+
+export enum TopicOrder {
+  none = 'none',
+  messages = '#messages',
+  abc = 'abc',
+  topics = '#topics',
+}
+
+export type ValueRendererDisplayMode = 'diff' | 'raw'
+
+export interface SettingsState {
+  autoExpandLimit: number
+  visible: boolean
+  topicOrder: TopicOrder
+  topicFilter?: string
+  highlightTopicUpdates: boolean
+  valueRendererDisplayMode: ValueRendererDisplayMode
+  selectTopicWithMouseOver: boolean
+}
+
+export type Action = SetAutoExpandLimit | ToggleVisibility | SetTopicOrder | FilterTopics | TogglehighlightTopicUpdates | SetValueRendererDisplayMode
+
+export enum ActionTypes {
+  SETTINGS_SET_AUTO_EXPAND_LIMIT = 'SETTINGS_SET_AUTO_EXPAND_LIMIT',
+  SETTINGS_TOGGLE_VISIBILITY = 'SETTINGS_TOGGLE_VISIBILITY',
+  SETTINGS_SET_TOPIC_ORDER = 'SETTINGS_SET_TOPIC_ORDER',
+  SETTINGS_FILTER_TOPICS = 'SETTINGS_FILTER_TOPICS',
+  SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY = 'SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY',
+  SETTINGS_DID_LOAD_SETTINGS = 'SETTINGS_DID_LOAD_SETTINGS',
+  SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE = 'SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE',
+  SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER = 'SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER',
+
+}
+
+const initialState: SettingsState = {
+  autoExpandLimit: 0,
+  topicOrder: TopicOrder.none,
+  visible: false,
+  highlightTopicUpdates: true,
+  valueRendererDisplayMode: 'diff',
+  selectTopicWithMouseOver: false,
+}
+
+export const settingsReducer = createReducer(initialState, {
+  SETTINGS_SET_AUTO_EXPAND_LIMIT: setAutoExpandLimit,
+  SETTINGS_TOGGLE_VISIBILITY: toggleVisibility,
+  SETTINGS_SET_TOPIC_ORDER: setTopicOrder,
+  SETTINGS_FILTER_TOPICS: filterTopics,
+  SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY: togglehighlightTopicUpdates,
+  SETTINGS_DID_LOAD_SETTINGS: didLoadSettings,
+  SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE: setValueRendererDisplayMode,
+  SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER: setSelectTopicWithMouseOver,
+})
+
+export interface DidLoadSettings {
+  type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS
+  settings: Partial<SettingsState>
+}
+
+function didLoadSettings(state: SettingsState, action: DidLoadSettings) {
+  return {
+    ...state,
+    ...action.settings,
+  }
+}
+
+export interface SetSelectTopicWithMouseOver {
+  type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER
+  selectTopicWithMouseOver: boolean
+}
+
+export function setSelectTopicWithMouseOver(state: SettingsState, action: SetSelectTopicWithMouseOver) {
+  return {
+    ...state,
+    selectTopicWithMouseOver: action.selectTopicWithMouseOver,
+  }
+}
+
+export interface SetValueRendererDisplayMode {
+  type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE
+  valueRendererDisplayMode: ValueRendererDisplayMode
+}
+
+export function setValueRendererDisplayMode(state: SettingsState, action: SetValueRendererDisplayMode) {
+  return {
+    ...state,
+    valueRendererDisplayMode: action.valueRendererDisplayMode,
+  }
+}
+
+export interface SetAutoExpandLimit {
+  type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
+  autoExpandLimit: number
+}
+
+function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
+  return {
+    ...state,
+    autoExpandLimit: action.autoExpandLimit,
+  }
+}
+
+export interface TogglehighlightTopicUpdates {
+  type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY
+}
+
+function togglehighlightTopicUpdates(state: SettingsState, _action: TogglehighlightTopicUpdates) {
+  return {
+    ...state,
+    highlightTopicUpdates: !state.highlightTopicUpdates,
+  }
+}
+
+export interface ToggleVisibility {
+  type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY
+}
+
+function toggleVisibility(state: SettingsState, action: ToggleVisibility) {
+  return {
+    ...state,
+    visible: !state.visible,
+  }
+}
+
+function setTopicOrder(state: SettingsState, action: SetTopicOrder) {
+  return {
+    ...state,
+    topicOrder: action.topicOrder,
+  }
+}
+
+export interface SetTopicOrder {
+  type: ActionTypes.SETTINGS_SET_TOPIC_ORDER
+  topicOrder: string
+}
+
+function filterTopics(state: SettingsState, action: FilterTopics) {
+  return {
+    ...state,
+    topicFilter: action.topicFilter,
+  }
+}
+
+export interface FilterTopics {
+  type: ActionTypes.SETTINGS_FILTER_TOPICS
+  topicFilter: string
+}

app/src/reducers/Tree.ts

@@ -0,0 +1,50 @@
+import * as q from '../../../backend/src/Model'
+import { Action } from 'redux'
+import { createReducer } from './lib'
+import { TopicViewModel } from '../TopicViewModel'
+
+export interface TreeState {
+  tree?: q.Tree<TopicViewModel>
+  selectedTopic?: q.TreeNode<TopicViewModel>
+  filter?: string
+}
+
+export type Action = ShowTree | SelectTopic
+
+export enum ActionTypes {
+  TREE_SHOW_TREE = 'TREE_SHOW_TREE',
+  TREE_SELECT_TOPIC = 'TREE_SELECT_TOPIC',
+}
+
+export interface ShowTree {
+  type: ActionTypes.TREE_SHOW_TREE
+  tree?: q.Tree<TopicViewModel>
+  filter?: string
+}
+
+export interface SelectTopic {
+  type: ActionTypes.TREE_SELECT_TOPIC
+  selectedTopic?: q.TreeNode<TopicViewModel>
+}
+
+const initialState: TreeState = { }
+
+export const treeReducer = createReducer(initialState, {
+  TREE_SHOW_TREE: showTree,
+  TREE_SELECT_TOPIC: selectTopic,
+})
+
+function showTree(state: TreeState, action: ShowTree) {
+  return {
+    ...state,
+    tree: action.tree,
+    filter: action.filter,
+  }
+}
+
+function selectTopic(state: TreeState, action: SelectTopic) {
+  return {
+    ...state,
+    selectedTopic: action.selectedTopic,
+  }
+}

app/src/reducers/index.ts

@@ -1,114 +1,63 @@
-import * as q from '../../../backend/src/Model'
-
-import { Action, Reducer } from 'redux'
-
+import { Action, combineReducers, Reducer } from 'redux'
+import { connectionManagerReducer, ConnectionManagerState } from './ConnectionManager'
+import { connectionReducer, ConnectionState } from './Connection'
+import { publishReducer, PublishState } from './Publish'
+import { settingsReducer, SettingsState } from './Settings'
 import { trackEvent } from '../tracking'
+import { treeReducer, TreeState } from './Tree'
+
 
 export enum ActionTypes {
-  setAutoExpandLimit = 'SET_AUTO_EXPAND_LIMIT',
-  toggleSettingsVisibility = 'TOGGLE_SETTINGS_VISIBILITY',
-  setNodeOrder = 'SET_NODE_ORDER',
-  selectTopic = 'SELECT_TOPIC',
-  setPublishTopic = 'SET_PUBLISH_TOPIC',
-  setPublishPayload = 'SET_PUBLISH_PAYLOAD',
   showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
   showUpdateDetails = 'SHOW_UPDATE_DETAILS',
+  showError = 'SHOW_ERROR',
 }
 
 export interface CustomAction extends Action {
   type: ActionTypes,
-  autoExpandLimit?: number
-  nodeOrder?: NodeOrder
-  selectedTopic?: q.TreeNode
-  publishTopic?: string
-  publishPayload?: string
   showUpdateNotification?: boolean
   showUpdateDetails?: boolean
-}
-
-export interface SidebarState {
-  publishTopic?: string
-  publishPayload?: string
+  error?: string
 }
 
 export interface AppState {
+  globalState: GlobalState
+  tree: TreeState
   settings: SettingsState,
-  selectedTopic?: q.TreeNode
-  sidebar: SidebarState
+  publish: PublishState
+  connection: ConnectionState
+  connectionManager: ConnectionManagerState
+}
+
+export interface GlobalState {
   showUpdateNotification?: boolean
   showUpdateDetails: boolean
+  error?: string
 }
 
-export interface SettingsState {
-  autoExpandLimit: number
-  visible: boolean
-  nodeOrder: NodeOrder
+const initialBigState: GlobalState = {
+  showUpdateDetails: false,
 }
 
-export enum NodeOrder {
-  none = 'none',
-  messages = '#messages',
-  abc = 'abc',
-  topics = '#topics',
-}
-
-const reducer: Reducer<AppState | undefined, CustomAction> = (state, action) => {
+const globalState: Reducer<GlobalState | undefined, CustomAction> = (state = initialBigState, action) => {
   if (!state) {
     throw Error('No initial state')
   }
   trackEvent(action.type)
-  console.log(action, state)
+
   switch (action.type) {
-    case ActionTypes.setAutoExpandLimit:
-      if (action.autoExpandLimit === undefined) {
-        return state
-      }
-      return {
-        ...state,
-        settings: {
-          ...state.settings,
-          autoExpandLimit: action.autoExpandLimit,
-        },
-      }
-    case ActionTypes.setPublishTopic:
-      return {
-        ...state,
-        sidebar: { ...state.sidebar, publishTopic: action.publishTopic },
-      }
-    case ActionTypes.setPublishPayload:
-      return {
-        ...state,
-        sidebar: { ...state.sidebar, publishPayload: action.publishPayload },
-      }
-    case ActionTypes.toggleSettingsVisibility:
-      return {
-        ...state,
-        settings: {
-          ...state.settings,
-          visible: !state.settings.visible,
-        },
-      }
-    case ActionTypes.selectTopic:
-      if (!action.selectedTopic) {
-        return state
-      }
-      return {
-        ...state,
-        selectedTopic: action.selectedTopic,
-      }
-    case ActionTypes.setNodeOrder:
-      if (!action.nodeOrder) {
-        return state
-      }
-      return {
-        ...state,
-        settings: { ...state.settings, nodeOrder: action.nodeOrder },
-      }
     case ActionTypes.showUpdateNotification:
       return {
         ...state,
         showUpdateNotification: action.showUpdateNotification,
       }
+
+    case ActionTypes.showError:
+      return {
+        ...state,
+        error: action.error,
+      }
+
     case ActionTypes.showUpdateDetails:
       if (action.showUpdateDetails === undefined) {
         return state
@@ -117,9 +66,19 @@ const reducer: Reducer<AppState | undefined, CustomAction> = (state, action) =>
         ...state,
         showUpdateDetails: action.showUpdateDetails,
       }
+
     default:
       return state
   }
 }
 
+const reducer = combineReducers({
+  globalState,
+  publish: publishReducer,
+  connection: connectionReducer,
+  settings: settingsReducer,
+  tree: treeReducer,
+  connectionManager: connectionManagerReducer,
+})
+
 export default reducer

app/src/reducers/lib.ts

@@ -0,0 +1,9 @@
+export const createReducer = (initialState: any, handlers: any) => {
+  return (state = initialState, action: any) => {
+    if (handlers.hasOwnProperty(action.type)) {
+      return handlers[action.type](state, action)
+    } else {
+      return state
+    }
+  }
+}

app/src/tracking.ts

@@ -1,21 +1,25 @@
 let userId = window.localStorage.getItem('userId')
 const sha1 = require('sha1')
+import { electronRendererTelementry } from 'electron-telemetry'
 
 if (!userId) {
   userId = sha1(sha1(Math.random()) + sha1(performance.now()) + sha1(Date.now())).slice(0, 8) as string
   window.localStorage.setItem('userId', userId)
 }
 
-const Nucleus = require('electron-nucleus')('5c3b3e0443b7cc00eec3782b', {
-  userId,
-  disableInDev: true,
-})
-
-export default Nucleus
+setInterval(() => {
+  try {
+    electronRendererTelementry.trackCustomEvent({ name: 'heapStatistics', payload: process.getHeapStatistics() })
+    electronRendererTelementry.trackCustomEvent({ name: 'cpuUsage', payload: process.getCPUUsage() })
+    electronRendererTelementry.trackCustomEvent({ name: 'runningSince', payload: performance.now() })
+  } catch (error) {
+    console.error(error)
+  }
+}, 60 * 1000)
 
 export function trackEvent(name: string) {
   if (name.match(/^@@redux/)) {
     return
   }
-  Nucleus.track(name)
+  electronRendererTelementry.trackEvent(name)
 }

app/tsconfig.json

@@ -5,10 +5,11 @@
     "strictNullChecks": true,
     "strict": true,
     "lib": ["es2017", "dom"],
+    "moduleResolution": "node",
     "outDir": "./build/",
     "sourceMap": true,
-    "module": "commonjs",
-    "target": "es5",
+    "module": "esnext",
+    "target": "es2017",
     "jsx": "react"
   },
   "include": [
@@ -18,8 +19,8 @@
     "**/*.d.ts"
   ],
   "awesomeTypescriptLoaderOptions": {
-        "useCache": true,
-        "transpileModule": true,
-        "errorsAsWarnings": true
-    }
+    "useCache": true,
+    "transpileModule": true,
+    "errorsAsWarnings": true
+  }
 }

app/webpack.config.js

@@ -1,15 +1,39 @@
-var LiveReloadPlugin = require('webpack-livereload-plugin');
+const LiveReloadPlugin = require('webpack-livereload-plugin');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+const HtmlWebpackPlugin = require('html-webpack-plugin')
 
 module.exports = {
-    entry: "./src/index.tsx",
+    entry: {
+        app: "./src/index.tsx",
+        bugtracking: "./src/bugtracking.ts",
+    },
     output: {
-        filename: "bundle.js",
+        chunkFilename: '[name].bundle.js',
+        filename: "[name].bundle.js",
         path: __dirname + "/build"
     },
     optimization: {
-      removeAvailableModules: false,
-      removeEmptyChunks: false,
-      splitChunks: false,
+        splitChunks: {
+            chunks: 'async',
+            minSize: 30000,
+            maxSize: 0,
+            minChunks: 1,
+            maxAsyncRequests: 5,
+            maxInitialRequests: 3,
+            automaticNameDelimiter: '~',
+            name: true,
+            cacheGroups: {
+              vendors: {
+                test: /[\\/]node_modules[\\/]/,
+                priority: -10
+              },
+              default: {
+                minChunks: 2,
+                priority: -20,
+                reuseExistingChunk: true
+              }
+            }
+          }
     },
 
     target: 'electron-renderer',
@@ -30,12 +54,19 @@ module.exports = {
             { test: /\.tsx?$/, loader: "awesome-typescript-loader" },
 
             // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
-            { enforce: "pre", test: /\.js$/, loader: "source-map-loader" }
+            { enforce: "pre", test: /\.js$/, loader: "source-map-loader" },
+
+            {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader'],
+            },
         ]
     },
 
     plugins: [
-      new LiveReloadPlugin({})
+      new LiveReloadPlugin({}),
+      new HtmlWebpackPlugin({ template: './index.html', file: './build/index.html', inject: false }),
+    //   new BundleAnalyzerPlugin(),
     ],
 
     // When importing a module whose path matches one of the following, just

appveyor.yml

@@ -0,0 +1,23 @@
+image: Visual Studio 2017
+platform: x64
+
+cache:
+  - node_modules
+  - '%LOCALAPPDATA%\electron\Cache'
+  - '%LOCALAPPDATA%\electron-builder\cache'
+
+install:
+  - ps: Install-Product node 10
+
+build_script:
+  - yarn
+  - yarn build
+  - yarn prepare-release
+  - yarn package appx
+
+test_script:
+  - yarn test
+
+artifacts:
+  - path: 'build\clean\build\MQTT-Explorer*.appx'
+

backend/package.json

@@ -9,7 +9,7 @@
     "test-inspect": "mocha --inspect-brk",
     "coverage": "nyc mocha",
     "debug": "ts-node --inspect ./src/index.ts",
-    "postinstall": "npm run build"
+    "postinstall": "yarn build"
   },
   "author": "",
   "license": "ISC",

backend/src/ConfigStorage.ts

@@ -0,0 +1,67 @@
+import * as FileAsync from 'lowdb/adapters/FileAsync'
+import * as lowdb from 'lowdb'
+import { backendEvents } from '../../events'
+import {
+  makeStorageResponseEvent,
+  storageClearEvent,
+  storageLoadEvent,
+  storageStoreEvent,
+  makeStorageAcknoledgementEvent,
+} from '../../events/StorageEvents'
+
+export default class ConfigStorage {
+  private file: string
+  private database: any
+  constructor(file: string) {
+    this.file = file
+  }
+
+  private async getDb() {
+    const adapter = new FileAsync(this.file)
+    if (!this.database) {
+      this.database = await lowdb(adapter)
+    }
+
+    return this.database
+  }
+
+  public async init() {
+    backendEvents.subscribe(storageStoreEvent, async (event) => {
+      const ack = makeStorageAcknoledgementEvent(event.transactionId)
+      try {
+        const db = await this.getDb()
+        await db.set(event.store, event.data).write()
+        backendEvents.emit(ack, undefined)
+      } catch (error) {
+        backendEvents.emit(ack, { error, transactionId: event.transactionId, store: event.store })
+        throw error
+      }
+    })
+
+    backendEvents.subscribe(storageLoadEvent, async (event) => {
+      const responseEvent = makeStorageResponseEvent(event.transactionId)
+      try {
+        const db = await this.getDb()
+        const data = await db.get(event.store).value()
+        backendEvents.emit(responseEvent, { data, transactionId: event.transactionId, store: event.store })
+      } catch (error) {
+        backendEvents.emit(responseEvent, { error, transactionId: event.transactionId, store: event.store })
+        throw error
+      }
+    })
+
+    backendEvents.subscribe(storageClearEvent, async (event) => {
+      try {
+        const db = await this.getDb()
+        const keys = await db.keys().value()
+        for (const key of keys) {
+          await db.unset(key).write()
+        }
+        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), undefined)
+      } catch (error) {
+        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), { error, transactionId: event.transactionId })
+        throw error
+      }
+    })
+  }
+}

backend/src/DataSource/DataSource.ts

@@ -1,4 +1,5 @@
 import { DataSourceStateMachine } from './'
+import { MqttMessage } from '../../../events'
 
 type MessageCallback = (topic: string, payload: Buffer) => void
 
@@ -7,7 +8,7 @@ interface DataSource<DataSourceOptions> {
   connect(options: DataSourceOptions): DataSourceStateMachine
   disconnect(): void
   onMessage(messageCallback: MessageCallback): void
-  publish(topic: string, payload: any): void
+  publish(msg: MqttMessage): void
   topicSeparator: string
   stateMachine: DataSourceStateMachine
 }

backend/src/DataSource/DataSourceState.ts

@@ -3,7 +3,7 @@ import { EventDispatcher } from '../../../events'
 export interface DataSourceState {
   connecting: boolean
   connected: boolean
-  error?: Error
+  error?: string
 }
 
 export class DataSourceStateMachine {
@@ -25,16 +25,17 @@ export class DataSourceStateMachine {
 
   public setError(error: Error) {
     this.state = {
-      error,
-      connected: false,
-      connecting: false,
+      ...this.state,
+      error: error.message,
+      // connected: false,
+      // connecting: false,
     }
     this.onUpdate.dispatch(this.state)
   }
 
   public setConnecting() {
     this.state = {
-      error: undefined,
+      ...this.state,
       connected: false,
       connecting: true,
     }

backend/src/DataSource/MqttSource.ts

@@ -1,6 +1,8 @@
+import * as Url from 'url'
+
 import { Client, connect as mqttConnect } from 'mqtt'
 import { DataSource, DataSourceStateMachine } from './'
-import * as Url from 'url'
+import { MqttMessage } from '../../../events'
 
 export interface MqttOptions {
   url: string
@@ -8,16 +10,17 @@ export interface MqttOptions {
   password?: string
   tls: boolean
   certValidation: boolean
+  clientId?: string
+  subscriptions: string[]
 }
 
 export class MqttSource implements DataSource<MqttOptions> {
   public stateMachine: DataSourceStateMachine = new DataSourceStateMachine()
   private client: Client | undefined
-  private messageCallback?: (topic: string, message: Buffer) => void
-  private rootSubscription = '#'
+  private messageCallback?: (topic: string, message: Buffer, packet: any) => void
   public topicSeparator = '/'
 
-  public onMessage(messageCallback: (topic: string, message: Buffer) => void) {
+  public onMessage(messageCallback: (topic: string, message: Buffer, packet: any) => void) {
     this.messageCallback = messageCallback
   }
 
@@ -35,7 +38,10 @@ export class MqttSource implements DataSource<MqttOptions> {
 
     const client = mqttConnect(url, {
       resubscribe: false,
-      rejectUnauthorized: !options.certValidation,
+      rejectUnauthorized: options.certValidation,
+      username: options.username,
+      password: options.password,
+      clientId: options.clientId,
     })
 
     this.client = client
@@ -49,28 +55,34 @@ export class MqttSource implements DataSource<MqttOptions> {
       this.stateMachine.setConnected(false)
     })
 
+    client.on('end', () => {
+      this.stateMachine.setConnected(false)
+    })
+
     client.on('reconnect', () => {
       this.stateMachine.setConnecting()
     })
 
     client.on('connect', () => {
       this.stateMachine.setConnected(true)
-      client.subscribe(this.rootSubscription, (err: Error) => {
-        if (err) {
-          throw new Error('mqtt subscription failed')
-        }
+      options.subscriptions.forEach((subscription) => {
+        client.subscribe(subscription, (err: Error) => {
+          if (err) {
+            this.stateMachine.setError(err)
+          }
+        })
       })
     })
 
-    client.on('message', (topic, message) => {
-      this.messageCallback && this.messageCallback(topic, message)
+    client.on('message', (topic, message, packet) => {
+      this.messageCallback && this.messageCallback(topic, message, packet)
     })
 
     return this.stateMachine
   }
 
-  public publish(topic: string, payload: any) {
-    this.client && this.client.publish(topic, payload)
+  public publish(msg: MqttMessage) {
+    this.client && this.client.publish(msg.topic, msg.payload, { qos: msg.qos, retain: msg.retain })
   }
 
   public disconnect() {

backend/src/Model/Edge.ts

@@ -1,11 +1,11 @@
 import { Hashable, TreeNode } from './'
 const sha1 = require('sha1')
 
-export class Edge implements Hashable {
+export class Edge<ViewModel> implements Hashable {
   public name: string
 
-  public target!: TreeNode
-  public source?: TreeNode | undefined
+  public target!: TreeNode<ViewModel>
+  public source?: TreeNode<ViewModel> | undefined
   private cachedHash?: string
 
   constructor(name: string) {
@@ -13,19 +13,26 @@ export class Edge implements Hashable {
   }
 
   public edges() {
-    return this.target ? Object.values(this.target.edges) : []
+    return this.target ? this.target.edgeArray : []
   }
 
   public hash(): string {
     if (!this.cachedHash) {
-      const previousHash = (this.source && this.source.sourceEdge) ? this.source.sourceEdge.hash() : ''
+      let previousHash
+      if (this.source && this.source.sourceEdge) {
+        previousHash = this.source.sourceEdge.hash()
+      } else {
+        // Use the tree hash to distinguish between different trees
+        previousHash = this.source && this.source.isTree ? (this.source as any).hash() : ''
+      }
+
       this.cachedHash = `H${sha1(previousHash + this.name)}`
     }
 
     return this.cachedHash
   }
 
-  public firstEdge(): Edge {
+  public firstEdge(): Edge<ViewModel> {
     if (this.source && this.source.sourceEdge) {
       return this.source.sourceEdge.firstEdge()
     }

backend/src/Model/RingBuffer.ts

@@ -6,13 +6,23 @@ export class RingBuffer<T extends Lengthwise> {
   private capacity: number
   private maxItems: number
   private usage: number = 0
-  private items: (any)[] = []
+  private items: T[] = []
   private start: number = 0
   private end: number = 0
 
-  constructor(capacity: number, maxItems = Infinity) {
+  constructor(capacity: number, maxItems = Infinity, ringBuffer?: RingBuffer<T>) {
     this.capacity = capacity
     this.maxItems = maxItems
+
+    if (ringBuffer) {
+      this.items = ringBuffer.toArray()
+      this.end = this.items.length
+      this.usage = this.items.length
+    }
+  }
+
+  public clone(): RingBuffer<T> {
+    return new RingBuffer(this.capacity, this.maxItems, this)
   }
 
   public toArray() {

backend/src/Model/Tree.ts

@@ -1,7 +1,55 @@
-import { Edge, TreeNode } from './'
+import { TreeNode } from './'
+import { EventBusInterface, makeConnectionMessageEvent, MqttMessage, EventDispatcher } from '../../../events'
+import { TreeNodeFactory } from './TreeNodeFactory'
+
+export class Tree<ViewModel> extends TreeNode<ViewModel> {
+  public connectionId?: string
+  public updateSource?: EventBusInterface
+  public nodeFilter?: (node: TreeNode<ViewModel>) => boolean
+  private subscriptionEvent?: any
+  public isTree = true
+  private cachedHash = `${Math.random()}`
+  private unmergedMessages: MqttMessage[] = []
+  public didReceive = new EventDispatcher<void, Tree<ViewModel>>(this)
 
-export class Tree extends TreeNode {
   constructor() {
     super(undefined, undefined)
   }
+
+  public updateWithConnection(emitter: EventBusInterface, connectionId: string, nodeFilter?:(node: TreeNode<ViewModel>) => boolean) {
+    this.updateSource = emitter
+    this.connectionId = connectionId
+    this.nodeFilter = nodeFilter
+
+    this.subscriptionEvent = makeConnectionMessageEvent(connectionId)
+    this.updateSource.subscribe(this.subscriptionEvent, this.handleNewData)
+  }
+
+  public hash() {
+    return this.cachedHash
+  }
+
+  public applyUnmergedChanges() {
+    this.unmergedMessages.forEach((msg) => {
+      const edges = msg.topic.split('/')
+      const node = TreeNodeFactory.fromEdgesAndValue<ViewModel, any>(edges, msg.payload)
+      node.mqttMessage = msg
+
+      if (!this.nodeFilter || this.nodeFilter(node)) {
+        this.updateWithNode(node.firstNode())
+      }
+    })
+    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)
+    }
+  }
 }

backend/src/Model/TreeNode.ts

@@ -1,22 +1,39 @@
 import { Edge, Message, RingBuffer } from './'
-import { EventDispatcher } from '../../../events'
+import { EventDispatcher, MqttMessage } from '../../../events'
 
-export class TreeNode {
-  public sourceEdge?: Edge
+export class TreeNode<ViewModel> {
+  public sourceEdge?: Edge<ViewModel>
   public message?: Message
+  public mqttMessage?: MqttMessage
   public messageHistory: RingBuffer<Message> = new RingBuffer<Message>(3000, 100)
-  public edges: {[s: string]: Edge} = {}
+  public viewModel?: ViewModel
+  public edges: {[s: string]: Edge<ViewModel>} = {}
+  public edgeArray: Edge<ViewModel>[] = []
   public collapsed = false
   public messages: number = 0
   public lastUpdate: number = Date.now()
+  public onMerge = new EventDispatcher<void, TreeNode<ViewModel>>(this)
+  public onEdgesChange = new EventDispatcher<void, TreeNode<ViewModel>>(this)
+  public onMessage = new EventDispatcher<Message, TreeNode<ViewModel>>(this)
+  public isTree = false
 
-  public onMerge = new EventDispatcher<void, TreeNode>(this)
-  public onEdgesChange = new EventDispatcher<void, TreeNode>(this)
-  public onMessage = new EventDispatcher<Message, TreeNode>(this)
-  private cachedLeafes?: TreeNode[]
+  private cachedPath?: string
+  private cachedChildTopics?: TreeNode<ViewModel>[]
   private cachedLeafMessageCount?: number
+  private cachedChildTopicCount?: number
 
-  constructor(sourceEdge?: Edge, message?: Message) {
+  public unconnectedClone() {
+    const node = new TreeNode<ViewModel>()
+    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<ViewModel>, message?: Message) {
     if (sourceEdge) {
       this.sourceEdge = sourceEdge
       sourceEdge.target = this
@@ -24,11 +41,15 @@ export class TreeNode {
 
     message && this.setMessage(message)
     this.onMerge.subscribe(() => {
-      this.cachedLeafes = undefined
+      this.cachedChildTopics = undefined
+      this.cachedChildTopicCount = undefined
       this.cachedLeafMessageCount = undefined
       this.lastUpdate = Date.now()
     })
     this.onEdgesChange.subscribe(() => {
+      this.cachedChildTopics = undefined
+      this.cachedChildTopicCount = undefined
+      this.cachedLeafMessageCount = undefined
       this.lastUpdate = Date.now()
     })
     this.onMessage.subscribe(() => {
@@ -46,23 +67,28 @@ export class TreeNode {
     return `N${(this.sourceEdge ? this.sourceEdge.hash() : '')}`
   }
 
-  public firstNode(): TreeNode {
+  public firstNode(): TreeNode<ViewModel> {
     return this.sourceEdge && this.sourceEdge.source ? this.sourceEdge.source.firstNode() : this
   }
 
   public path(): string {
-    return this.branch()
-      .map(node => (node.sourceEdge && node.sourceEdge.name))
-      .filter(name => name !== undefined)
-      .join('/')
+    if (!this.cachedPath) {
+      return this.branch()
+        .map(node => (node.sourceEdge && node.sourceEdge.name))
+        .filter(name => name !== undefined)
+        .join('/')
+    }
+
+    return this.cachedPath
   }
 
-  private previous(): TreeNode | undefined {
+  private previous(): TreeNode<ViewModel> | undefined {
     return this.sourceEdge ? this.sourceEdge.source || undefined : undefined
   }
 
-  public addEdge(edge: Edge, emitUpdate: boolean = false) {
+  public addEdge(edge: Edge<ViewModel>, emitUpdate: boolean = false) {
     this.edges[edge.name] = edge
+    this.edgeArray.push(edge)
     edge.source = this
 
     if (emitUpdate) {
@@ -70,7 +96,7 @@ export class TreeNode {
     }
   }
 
-  public branch(): TreeNode[] {
+  public branch(): TreeNode<ViewModel>[] {
     const previous = this.previous()
     if (!previous) {
       return [this]
@@ -79,49 +105,105 @@ export class TreeNode {
     return previous.branch().concat([this])
   }
 
-  public updateWithNode(node: TreeNode) {
+  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<any>) {
+    delete this.edges[edge.name]
+    this.edgeArray = Object.values(this.edges)
+    this.onMerge.dispatch()
+
+    if (this.isTopicEmptyLeaf()) {
+      debugger
+      this.removeFromParent()
+    }
+  }
+
+  public updateWithNode(node: TreeNode<ViewModel>) {
     if (node.message) {
       this.setMessage(node.message)
       this.onMessage.dispatch(node.message)
+      this.mqttMessage = node.mqttMessage
+    }
+
+    if (this.isTopicEmptyLeaf()) {
+      this.removeFromParent()
     }
 
     this.mergeEdges(node)
     this.onMerge.dispatch()
   }
 
-  public leafMessageCount() {
+  public leafMessageCount(): number {
     if (this.cachedLeafMessageCount === undefined) {
-      this.cachedLeafMessageCount = this.leafes()
-        .map(leaf => leaf.messages)
-        .reduce((a, b) => a + b)
+      this.cachedLeafMessageCount = this.edgeArray
+        .map(edge => edge.target.leafMessageCount())
+        .reduce((a, b) => a + b, 0) + this.messages
     }
 
-    return this.cachedLeafMessageCount
+    return this.cachedLeafMessageCount as number
   }
 
-  public leafCount(): number {
-    return this.leafes().length
+  public childTopicCount(): number {
+    if (this.cachedChildTopicCount === undefined) {
+      this.cachedChildTopicCount = this.edgeArray
+        .map(e => e.target.childTopicCount())
+        .reduce((a, b) => a + b, this.edgeArray.length === 0 ? 1 : 0)
+    }
+
+    return this.cachedChildTopicCount as number
   }
 
   public edgeCount(): number {
-    return Object.values(this.edges).length
+    return this.edgeArray.length
   }
 
-  public leafes(): TreeNode[] {
-    if (this.cachedLeafes === undefined) {
-      if (Object.values(this.edges).length === 0) {
-        return [this]
-      }
+  public childTopics(): TreeNode<ViewModel>[] {
+    if (this.cachedChildTopics === undefined) {
+      const initialValue = this.message && this.message.value ? [this] : []
 
-      this.cachedLeafes = Object.values(this.edges)
-        .map(e => e.target.leafes())
-        .reduce((a, b) => a.concat(b), [])
+      this.cachedChildTopics = this.edgeArray
+        .map(e => e.target.childTopics())
+        .reduce((a, b) => a.concat(b), initialValue)
     }
 
-    return this.cachedLeafes
+    return this.cachedChildTopics as TreeNode<ViewModel>[]
   }
 
-  private mergeEdges(node: TreeNode) {
+  public findNode (path: String): TreeNode<ViewModel> | undefined {
+    const topics = path.split('/')
+
+    return this.findChild(topics)
+  }
+
+  private findChild(edges: string[]): TreeNode<ViewModel> | 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<ViewModel>) {
     const edgeKeys = Object.keys(node.edges)
     let edgesDidUpdate = false
 

backend/src/Model/TreeNodeFactory.ts

@@ -5,21 +5,29 @@ interface HasLength {
 }
 
 export abstract class TreeNodeFactory {
-  public static fromEdgesAndValue<T extends HasLength>(edgeNames: string[], value: T): TreeNode {
-    let currentNode: TreeNode = new Tree()
+  public static insertNodeAtPosition<ViewModel>(edgeNames: string[], node: TreeNode<ViewModel>) {
+    let currentNode: TreeNode<ViewModel> = new Tree()
+    let edge
     for (const edgeName of edgeNames) {
-      const edge = new Edge(edgeName)
-      const newNode = new TreeNode(edge)
-      edge.target = newNode
+      edge = new Edge<ViewModel>(edgeName)
       currentNode.addEdge(edge)
-      currentNode = newNode
+      currentNode = new TreeNode(edge)
+      edge.target = currentNode
     }
+    node.sourceEdge = edge
+    node.sourceEdge!.target = node
+  }
 
-    currentNode.setMessage({
+  public static fromEdgesAndValue<ViewModel, T extends HasLength>(edgeNames: string[], value?: T): TreeNode<ViewModel> {
+    const node = new TreeNode<ViewModel>()
+    node.setMessage({
       value,
-      length: value.length,
+      length: value ? value.length : 0,
       received: new Date(),
     })
-    return currentNode
+
+    this.insertNodeAtPosition<ViewModel>(edgeNames, node)
+
+    return node
   }
 }

backend/src/Model/spec/Edge.spec.ts

@@ -1,7 +1,9 @@
-import { Edge, TreeNode, TreeNodeFactory } from '../'
-import { expect } from 'chai'
 import 'mocha'
 
+import { Edge, TreeNode, TreeNodeFactory } from '../'
+
+import { expect } from 'chai'
+
 describe('Edge', () => {
   it('should contain a name', () => {
     const e = new Edge('foo')
@@ -10,7 +12,7 @@ describe('Edge', () => {
 
   it('firstEdge should retireve the first edge', () => {
     const topics = 'foo/bar/baz'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, 5)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, undefined)
     const bazEdge = leaf.sourceEdge
 
     if (!bazEdge) {
@@ -35,10 +37,10 @@ describe('Edge', () => {
 
   it('hash should include change if parents are different', () => {
     const topics1 = 'foo/bar/baz'.split('/')
-    const bazEdge1 = TreeNodeFactory.fromEdgesAndValue(topics1, 5).sourceEdge
+    const bazEdge1 = TreeNodeFactory.fromEdgesAndValue(topics1, undefined).sourceEdge
 
     const topics2 = 'foo/foo/baz'.split('/')
-    const bazEdge2 = TreeNodeFactory.fromEdgesAndValue(topics2, 5).sourceEdge
+    const bazEdge2 = TreeNodeFactory.fromEdgesAndValue(topics2, undefined).sourceEdge
 
     if (!bazEdge1 || !bazEdge2) {
       throw Error('should not happen')

backend/src/Model/spec/EventDispatcher.spec.ts

@@ -0,0 +1,42 @@
+import 'mocha'
+import { EventDispatcher } from '../../../../events'
+
+import { expect } from 'chai'
+
+describe('EventDispatcher', async () => {
+  it('should dispatch', async function () {
+    const dispatcher = new EventDispatcher<string, string>('me')
+    this.timeout(300)
+
+    setTimeout(() => dispatcher.dispatch('hello'), 5)
+    const response = await new Promise((resolve) => {
+      dispatcher.subscribe((msg) => {
+        resolve(msg)
+      })
+    })
+
+    expect(response).to.eq('hello')
+  })
+
+  it('should unsubscribe', async function () {
+    const dispatcher = new EventDispatcher<string, string>('me')
+    this.timeout(300)
+    let incrementee = 0
+    const callback = (msg: any) => {
+      incrementee += 1
+    }
+
+    dispatcher.subscribe(callback)
+    dispatcher.subscribe(callback)
+    dispatcher.unsubscribe(callback)
+
+    // Should increment to 1
+    dispatcher.dispatch('hello')
+    dispatcher.unsubscribe(callback)
+
+    // should not cause any increment
+    dispatcher.dispatch('hello')
+
+    expect(incrementee).to.eq(1)
+  })
+})

backend/src/Model/spec/Tree.spec.ts

@@ -1,15 +1,15 @@
-import { Tree, TreeNodeFactory } from '../'
-import { expect } from 'chai'
 import 'mocha'
 
-import './TreeNode.findNode'
+import { Tree, TreeNodeFactory } from '../'
+
+import { expect } from 'chai'
 
 describe('Tree', () => {
   it('node can be merged into a tree', () => {
     const tree = new Tree()
 
     const topics = 'foo/bar'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, 3)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, undefined)
 
     tree.updateWithNode(leaf.firstNode())
     const expectedNode = tree.findNode('foo/bar')

backend/src/Model/spec/TreeNode.findNode.spec.ts

@@ -1,13 +1,12 @@
-import { TreeNodeFactory } from '../'
-import { expect } from 'chai'
 import 'mocha'
 
-import './TreeNode.findNode'
+import { TreeNodeFactory } from '../'
+import { expect } from 'chai'
 
 describe('TreeNode.findNode', () => {
   it('findNode should retrieve node', () => {
     const topics = 'foo/bar/baz'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, 5)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, undefined)
 
     const root = leaf.firstNode()
     expect(root.sourceEdge).to.eq(undefined)

backend/src/Model/spec/TreeNode.findNode.ts

@@ -1,19 +0,0 @@
-import { TreeNode } from  '../'
-declare module  '../' {
-    interface TreeNode {
-      findNode(path: String): TreeNode | undefined
-    }
-}
-
-TreeNode.prototype.findNode = function (path: String): TreeNode | undefined {
-  const topics = path.split('/')
-  const edge = this.edges[topics[0]]
-  const remainingTopics = topics.slice(1, topics.length)
-  if (edge && remainingTopics.length === 0) {
-    return edge.target
-  } else if (edge) {
-    return edge.target.findNode(remainingTopics.join('/'))
-  }
-
-  return undefined
-}

backend/src/Model/spec/TreeNode.spec.ts

@@ -1,52 +1,52 @@
-import { TreeNodeFactory } from  '../'
-import './TreeNode.findNode'
-import { expect } from 'chai'
 import 'mocha'
 
+import { TreeNodeFactory } from  '../'
+import { expect } from 'chai'
+
 describe('TreeNode', () => {
   it('firstNode should retrieve first node', () => {
     const topics = 'foo/bar'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, 3)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, undefined)
 
     expect(leaf.firstNode().edges['foo']).to.not.eq(undefined)
   })
 
   it('updateWithNode should update value', () => {
     const topics = 'foo/bar'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, 3)
-    expect(leaf.message && leaf.message.value).to.eq(3)
-    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics, 5)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics, '3')
+    expect(leaf.message && leaf.message.value).to.eq('3')
+    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics, '5')
 
     const root = leaf.firstNode()
     root.updateWithNode(updateLeave.firstNode())
 
     expect(root.sourceEdge).to.eq(undefined)
-    expect(leaf.message && leaf.message.value).to.eq(5)
+    expect(leaf.message && leaf.message.value).to.eq('5')
   })
 
   it('updateWithNode should update intermediate nodes', () => {
     const topics1 = 'foo/bar/baz'.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(topics1, 3)
-    expect(leaf.message && leaf.message.value).to.eq(3)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(topics1, '3')
+    expect(leaf.message && leaf.message.value).to.eq('3')
 
     const topics2 = 'foo/bar'.split('/')
-    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics2, 5)
+    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics2, '5')
     leaf.firstNode().updateWithNode(updateLeave.firstNode())
 
     const barNode = leaf.firstNode().findNode('foo/bar')
     expect(barNode && barNode.sourceEdge && barNode.sourceEdge.name).to.eq('bar')
-    expect(barNode && barNode.message && barNode.message.value).to.eq(5)
+    expect(barNode && barNode.message && barNode.message.value).to.eq('5')
 
     expect(leaf.sourceEdge && leaf.sourceEdge.name).to.eq('baz')
-    expect(leaf.message && leaf.message.value).to.eq(3)
+    expect(leaf.message && leaf.message.value).to.eq('3')
   })
 
   it('updateWithNode should add nodes to the tree', () => {
     const topics1 = 'foo/bar'.split('/')
-    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, 3)
+    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, 'foo')
 
     const topics2 = 'foo/bar/baz'.split('/')
-    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, 5)
+    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, 'bar')
 
     leaf1.firstNode().updateWithNode(leaf2.firstNode())
 

backend/src/Model/spec/TreeNodeFactory.spec.ts

@@ -1,13 +1,13 @@
+import 'mocha'
+
 import { TreeNodeFactory } from '../'
 import { expect } from 'chai'
-import 'mocha'
-import './TreeNode.findNode'
 
 describe('TreeNodeFactory', () => {
   it('root node must not have a sourceEdge', () => {
     const topic = 'foo/bar'
     const edges = topic.split('/')
-    const leaf = TreeNodeFactory.fromEdgesAndValue(edges, 5)
+    const leaf = TreeNodeFactory.fromEdgesAndValue(edges, undefined)
 
     expect(leaf.firstNode().sourceEdge).to.eq(undefined)
   })
@@ -15,7 +15,7 @@ describe('TreeNodeFactory', () => {
   it('should create node', () => {
     const topic = 'foo/bar'
     const edges = topic.split('/')
-    const node = TreeNodeFactory.fromEdgesAndValue(edges, 5)
+    const node = TreeNodeFactory.fromEdgesAndValue(edges, '5')
 
     if (!node.sourceEdge || !node.sourceEdge.source || !node.message) {
       expect.fail('should not happen')
@@ -24,7 +24,7 @@ describe('TreeNodeFactory', () => {
 
     expect(node).to.not.eq(undefined)
     expect(node.sourceEdge.name).to.eq('bar')
-    expect(node.message.value).to.eq(5)
+    expect(node.message.value).to.eq('5')
 
     const foo = node.firstNode().findNode('foo')
     expect(foo && foo.sourceEdge && foo.sourceEdge.name).to.eq('foo')
@@ -33,14 +33,14 @@ describe('TreeNodeFactory', () => {
   it('node should contain edges in order', () => {
     const topic = 'foo/bar/baz'
     const edges = topic.split('/')
-    const node = TreeNodeFactory.fromEdgesAndValue(edges, 5)
+    const node = TreeNodeFactory.fromEdgesAndValue(edges, '5')
 
     if (!node.sourceEdge || !node.sourceEdge.source || !node.message) {
       expect.fail('should not happen')
       return
     }
 
-    expect(node.message.value).to.eq(5)
+    expect(node.message.value).to.eq('5')
     expect(node.sourceEdge.name).to.eq('baz')
 
     const barNode = node.sourceEdge.source

backend/src/index.ts

@@ -1,7 +1,7 @@
 import {
   AddMqttConnection,
   EventDispatcher,
-  Message,
+  MqttMessage,
   addMqttConnectionEvent,
   backendEvents,
   checkForUpdates,
@@ -11,8 +11,8 @@ import {
   removeConnection,
   updateAvailable,
 } from '../../events'
-import { DataSource, MqttSource } from './DataSource'
 
+import { DataSource, MqttSource } from './DataSource'
 import { UpdateInfo } from 'builder-util-runtime'
 
 export class ConnectionManager {
@@ -20,11 +20,19 @@ export class ConnectionManager {
 
   public manageConnections() {
     backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest)
-    backendEvents.subscribe(removeConnection, (connectionId: string) => this.removeConnection(connectionId))
+    backendEvents.subscribe(removeConnection, (connectionId: string) => {
+      this.removeConnection(connectionId)
+    })
   }
 
   private handleConnectionRequest = (event: AddMqttConnection) => {
     const connectionId = event.id
+
+    // Prevent double connections when reloading
+    if (this.connections[connectionId]) {
+      this.removeConnection(connectionId)
+    }
+
     const options = event.options
     const connection = new MqttSource()
     this.connections[connectionId] = connection
@@ -36,26 +44,36 @@ export class ConnectionManager {
 
     connection.connect(options)
     this.handleNewMessagesForConnection(connectionId, connection)
-    backendEvents.subscribe(makePublishEvent(connectionId), (msg: Message) => {
-      this.connections[connectionId].publish(msg.topic, msg.payload)
+    backendEvents.subscribe(makePublishEvent(connectionId), (msg: MqttMessage) => {
+      this.connections[connectionId].publish(msg)
     })
   }
 
   private handleNewMessagesForConnection(connectionId: string, connection: MqttSource) {
     const messageEvent = makeConnectionMessageEvent(connectionId)
-    connection.onMessage((topic: string, payload: Buffer) => {
+    connection.onMessage((topic: string, payload: Buffer, packet: any) => {
       let buffer = payload
       if (buffer.length > 10000) {
         buffer = buffer.slice(0, 10000)
       }
-      backendEvents.emit(messageEvent, { topic, payload: buffer.toString('base64') })
+
+      backendEvents.emit(messageEvent, { topic, payload: buffer.toString(), qos: packet.qos, retain: packet.retain })
     })
   }
 
-  public removeConnection(hash: string) {
-    const connection = this.connections[hash]
-    connection.disconnect()
-    delete this.connections[hash]
+  public removeConnection(conenctionId: string) {
+    const connection = this.connections[conenctionId]
+    if (connection) {
+      backendEvents.unsubscribeAll(makePublishEvent(conenctionId))
+      connection.disconnect()
+      delete this.connections[conenctionId]
+      connection.stateMachine.onUpdate.removeAllListeners()
+    }
+  }
+
+  public closeAllConnections() {
+    Object.keys(this.connections)
+      .forEach(conenctionId => this.removeConnection(conenctionId))
   }
 }
 

docker/Dockerfile

@@ -0,0 +1,17 @@
+FROM node:11-stretch
+
+RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
+  && apt-get install -y --no-install-recommends nano ffmpeg xvfb git-core tmux locales mosquitto x11vnc
+RUN apt-get install -yq --no-install-recommends libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 libnss3
+
+# Generate locales for TMUX
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+CMD /bin/bash
+
+COPY cloneBuildAndTest.sh ./
+VOLUME /app
+EXPOSE 5900

docker/cloneBuildAndTest.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+git clone https://github.com/thomasnordquist/MQTT-Explorer.git /app
+cd /app
+git checkout travis-ui-tests
+
+yarn
+yarn build
+
+yarn ui-test
+yarn upload-video-artifacts

docker/testMounted.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+yarn ui-test
+yarn upload-video-artifacts

electron.js

@@ -1,87 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-const { autoUpdater } = require("electron-updater")
-const log = require('electron-log');
-const { ConnectionManager, updateNotifier } = require('./backend/build/backend/src/index.js')
-
-autoUpdater.logger = log;
-autoUpdater.logger.transports.file.level = 'info';
-log.info('App starting...');
-
-const connectionManager = new ConnectionManager()
-connectionManager.manageConnections()
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
-
-function createWindow () {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 1024,
-    height: 700,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('app/index.html')
-
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
-    app.quit()
-  })
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', () => {
-  createWindow()
-
-  let updateInfo
-  autoUpdater.on('update-available', (info) => {
-    updateInfo = info
-  })
-
-  autoUpdater.on('error', () => {
-    if (updateInfo) {
-      updateNotifier.notify(updateInfo)
-    }
-  })
-
-  updateNotifier.onCheckUpdateRequest.subscribe(() => {
-    try {
-      autoUpdater.checkForUpdatesAndNotify()
-    } catch (error) {
-      console.error(error)
-    }
-  })
-})
-
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On macOS it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', function () {
-  // On macOS it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
-})
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.

events/EventBus.ts

@@ -2,10 +2,16 @@ import { IpcMain, IpcRenderer, ipcMain, ipcRenderer } from 'electron'
 
 import { Event } from './Events'
 
-interface EventBusInterface {
+export interface EventBusInterface {
   subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void): void
   unsubscribeAll<MessageType>(event: Event<MessageType>): void
   emit<MessageType>(event: Event<MessageType>, msg: MessageType): void
+  unsubscribe<MessageType>(event: Event<MessageType>, callback: any): void
+}
+
+interface CallbackStore {
+  wrappedCallback: any
+  callback: any
 }
 
 class IpcMainEventBus implements EventBusInterface {
@@ -15,35 +21,63 @@ class IpcMainEventBus implements EventBusInterface {
     this.ipc = ipc
   }
 
-  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
-    console.log('subscribing', event.topic)
-    this.ipc.on(event.topic, (event: any, arg: any) => {
+  public subscribe<MessageType>(subscribeEvent: Event<MessageType>, callback:(msg: MessageType) => void) {
+    console.log('subscribing', subscribeEvent.topic)
+    this.ipc.on(subscribeEvent.topic, (event: any, arg: any) => {
       this.client = event.sender
       callback(arg)
     })
   }
 
+  public unsubscribeAll<MessageType>(event: Event<MessageType>) {
+    console.log('unsubscribeAll', event.topic)
+    this.ipc.removeAllListeners(event.topic)
+  }
+
+  public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
+    throw new Error('Not implemented') // Todo: implement
+  }
+
+  public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
+    if (!this.client.isDestroyed()) {
+      this.client.send(event.topic, msg)
+    }
+  }
+}
+
+class IpcRendererEventBus implements EventBusInterface {
+  private ipc: IpcRenderer
+  private callbacks: CallbackStore[] = []
+
+  constructor(ipc: IpcRenderer) {
+    this.ipc = ipc
+  }
+
+  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
+    const wrappedCallback = (_event: any, arg: any) => {
+      callback(arg)
+    }
+
+    this.ipc.on(event.topic, wrappedCallback)
+
+    this.callbacks.push({
+      callback,
+      wrappedCallback,
+    })
+  }
+
   public unsubscribeAll<MessageType>(event: Event<MessageType>) {
     this.ipc.removeAllListeners(event.topic)
   }
 
-  public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
-    this.client.send(event.topic, msg)
-  }
-}
+  public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
+    const item = this.callbacks.find(store => store.callback === callback)
+    if (!item) {
+      return
+    }
 
-class IpcRendererEventBus implements EventBusInterface {
-  private ipc: IpcRenderer
-  constructor(ipc: IpcRenderer) {
-    this.ipc = ipc
-  }
-
-  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
-    this.ipc.on(event.topic, (_event: any, arg: any) => callback(arg))
-  }
-
-  public unsubscribeAll<MessageType>(event: Event<MessageType>) {
-    this.ipc.removeAllListeners(event.topic)
+    this.ipc.removeListener(event.topic, item.wrappedCallback)
+    this.callbacks = this.callbacks.filter(a => a !== item)
   }
 
   public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {

events/Events.ts

@@ -35,18 +35,20 @@ export const updateAvailable: Event<UpdateInfo> = {
   topic: 'app/update/available',
 }
 
-export interface Message {
+export interface MqttMessage {
   topic: string,
-  payload: any
+  payload: any,
+  qos: 0 | 1 | 2,
+  retain: boolean
 }
 
-export function makePublishEvent(connectionId: string): Event<Message> {
+export function makePublishEvent(connectionId: string): Event<MqttMessage> {
   return {
     topic: `conn/publish/${connectionId}`,
   }
 }
 
-export function makeConnectionMessageEvent(connectionId: string): Event<Message> {
+export function makeConnectionMessageEvent(connectionId: string): Event<MqttMessage> {
   return {
     topic: `conn/${connectionId}`,
   }

events/StorageEvents.ts

@@ -0,0 +1,39 @@
+import { Event } from './'
+
+interface StorageEvent {
+  transactionId: string
+}
+
+export interface StoreCommand extends StorageEvent {
+  store?: string,
+  data?: any
+  error?: any
+}
+
+export interface LoadCommand extends StorageEvent {
+  store: string,
+}
+
+export const storageStoreEvent: Event<StoreCommand> = {
+  topic: 'storage/store',
+}
+
+export const storageLoadEvent: Event<LoadCommand> = {
+  topic: 'storage/load',
+}
+
+export function makeStorageAcknoledgementEvent(transactionId: string): Event<StoreCommand> {
+  return {
+    topic: `storage/ack/${transactionId}`,
+  }
+}
+
+export function makeStorageResponseEvent(transactionId: string): Event<StoreCommand> {
+  return {
+    topic: `storage/response/${transactionId}`,
+  }
+}
+
+export const storageClearEvent: Event<StorageEvent> = {
+  topic: 'storage/clear',
+}

events/test.js

@@ -1,9 +0,0 @@
-const { EventEmitter } = require('events');
-
-const a = new EventEmitter()
-a.on('test', () => console.log('test'))
-a.on('test2', () => console.log('test2'))
-a.removeAllListeners('test')
-
-a.emit('test')
-a.emit('test2')