Do not record raw

Fixes #106

.eslintrc.json

@@ -0,0 +1,17 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+    }
+}

.travis.yml

@@ -24,13 +24,14 @@ services:
 
 install:
   - yarn install
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build docker --tag uitest; fi;
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get -y install snap squashfs-tools && sudo snap install snapcraft --classic; fi;
 
 script:
   - yarn run build
   - yarn test
-  - 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
+  - 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 thomasnordquist/ui-test-recording-env 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" == "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

@@ -1,6 +1,12 @@
-# next release
-- Magnify app content with "Ctrl +", "Ctrl -", "Ctrl 0"
-- Add message diff view
-- Make user interactions more predictable
+# 0.2.3
+
+  - 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

@@ -1,661 +0,0 @@
-                    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/>.

LICENSE.md

@@ -0,0 +1,158 @@
+## creative commons
+
+# Attribution-NoDerivatives 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+### Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
+
+* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
+
+## Creative Commons Attribution-NoDerivatives 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+c. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+d. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+e. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+f. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+g. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
+
+h. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+i. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+j. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+   1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+       A. reproduce and Share the Licensed Material, in whole or in part; and
+
+       B. produce and reproduce, but not Share, Adapted Material.
+
+   2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+   3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+   4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+   5. __Downstream recipients.__
+
+       A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+       B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+   6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+   1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+   2. Patent and trademark rights are not licensed under this Public License.
+
+   3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. ___Attribution.___
+
+   1. If You Share the Licensed Material, You must:
+
+       A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+         i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+         ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+         v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+       B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+       C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+       For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+
+   2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+   3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+   1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+   2. upon express reinstatement by the Licensor.
+
+   For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+>
+> Creative Commons may be contacted at creativecommons.org
+

Readme.md

@@ -1,88 +1,66 @@
-# [MQTT Explorer](https://thomasnordquist.github.io/MQTT-Explorer/)
+# [MQTT Explorer](https://mqtt-explorer.com)
+
 [![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)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/47b26e03fce543ceac7914214482334a)](https://app.codacy.com/app/thomasnordquist/MQTT-Explorer?utm_source=github.com&utm_medium=referral&utm_content=thomasnordquist/MQTT-Explorer&utm_campaign=Badge_Grade_Dashboard)
 
-### Version 
+|   |   |   |
+|:---:|:---:|:---:|
+|[![screen1_small](https://user-images.githubusercontent.com/7721625/53954800-84b34c00-40d7-11e9-842d-bf655c569600.jpg)](https://user-images.githubusercontent.com/7721625/53954364-52551f00-40d6-11e9-93cf-d5a9601897ea.png)|[![screen2_small](https://user-images.githubusercontent.com/7721625/53954801-84b34c00-40d7-11e9-913a-42572e675620.jpg)](https://user-images.githubusercontent.com/7721625/53954365-52551f00-40d6-11e9-823f-afd66f19ed01.png)|[![screen3_small](https://user-images.githubusercontent.com/7721625/53954802-854be280-40d7-11e9-973c-08f23c8dbf89.jpg)](https://user-images.githubusercontent.com/7721625/53954366-52551f00-40d6-11e9-9738-74db830d03ac.png)|
 
-A MQTT Tool to get a quick overview of your MQTT topics and integrate new devices/services more efficiently.
+# The App has moved to [mqtt-explorer.com](https://mqtt-explorer.com)
+MQTT Explorer is a comprehensive and easy-to-use MQTT Client.  
+Downloads can be found at the link above.
 
-- 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
+This page is dedicated to its development.
+Pull-Requests and error reports are welcome.
 
-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.
+## Run from sources
 
-## Download
-
-| 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 least hundreds of thousands messages per minute.
-So don't worry if you got >=30k topics and >=100.000 messages per minute.
-
-One can also subscribe to custom topics insted of the "root wildcard #", therefore limiting the amount of messages.
+```bash
+yarn
+yarn build
+yarn start
+```
 
 ## Develop
-PRs and issues are welcome
 
-Install with `npm run install`, build with `npm run build`
+Launch Application
+```bash
+yarn
+yarn dev
+```
 
-Start with `npm run start`
-
-The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management.
+The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management, `src` contains all the electron bindings. [mqttjs](https://github.com/mqttjs/MQTT.js) is used to facilitate communication to MQTT brokers.
 
 ## 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
-The App sends telemetry and error reports, this enables me to quickly react on bugs/errors I produced.
-This is a difficutlt task since this App runs on three different operating systems and architectures.
+To achieve a reliable product automated tests run regularly on travis.
 
-It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.
+  - Data model
+  - MQTT integration
+  - UI-Tests (The demo is a recorded ui test)
 
-This greatly helps to improve the software quality and reliability.
-No data about you or your data is send or stored.
-Even thoug the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52)
+## Run UI-tests
+A [mosquitto](https://mosquitto.org/) MQTT broker is required to run the ui-tests.
 
-Example telemetry:
-```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' }
+Run tests with
+```bash
+# Run chromedriver in a separate terminal session
+./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515 --verbose
+```
+
+Compile and execute tests
+```bash
+npm run build
+node dist/src/spec/webdriverio.js
 ```
 
 ## License
-[AGPL 3](./LICENSE)
+
+![CC-BY-ND 4.0](https://img.shields.io/badge/License-CC%20BY--ND%204.0-blue.svg)  
+[CC-BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0/)
+
+The license is a little restrictive to distributing derived work, this may change in the future if the interest arises or more people work on this project.

Readme.tpl.md

@@ -1,88 +0,0 @@
-# [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 least hundreds of thousands messages per minute.
-So don't worry if you got >=30k topics and >=100.000 messages per minute.
-
-One can also subscribe to custom topics insted of the "root wildcard #", therefore limiting the amount of messages.
-
-## 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
-The App sends telemetry and error reports, this enables me to quickly react on bugs/errors I produced.
-This is a difficutlt task since this App runs on three different operating systems and architectures.
-
-It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.
-
-This greatly helps to improve the software quality and reliability.
-No data about you or your data is send or stored.
-Even thoug the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52)
-
-Example telemetry:
-```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' }
-```
-
-## License
-[AGPL 3](./LICENSE)

_config.yml

@@ -1,11 +0,0 @@
-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

_layouts/_default.html

@@ -1,6 +0,0 @@
-<html>
-  <head>
-    {% include head.html %}
-    {% seo %}
-  </head>
-</html>

app/index.html

@@ -1,120 +1,111 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <meta charset="UTF-8" />
-        <title>MQTT Explorer</title>
-        <script src="./bugtracking.bundle.js"></script>
+      <meta charset="UTF-8" />
+      <meta
+        name="viewport"
+        content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
+      >
+      <title>MQTT Explorer</title>
+      <script src="./bugtracking.bundle.js"></script>
 
-        <style>
-          body, html {
-            margin: 0;
-            padding: 0;
-          }
+      <style>
+        body, html {
+          margin: 0;
+          padding: 0;
+        }
 
-          @keyframes example {
-            0%   {background-color: none;}
-            25%  {background-color: #3f51b5 ;}
-            50%  {background-color: #3f51b5;}
-            100% {background-color: none;}
-          }
+        [tabindex] {
+          outline: none;
+        }
 
-          ::-webkit-scrollbar {
-            width: 8px;
-            height: 8px;
-          }
+        @keyframes updateDark {
+          0%   {background-color: none;}
+          25%  {background-color: #3f51b5;}
+          50%  {background-color: #3f51b5;}
+          100% {background-color: none;}
+        }
 
-          ::-webkit-scrollbar-corner {
-            background-color: rgba(0, 0, 0, 0.0);
-          }
+        @keyframes updateLight {
+          0%   {background-color: none; color: inherit}
+          25%  {background-color: #bfc9c8; color: #000}
+          50%  {background-color: #bfc9c8; color: #000}
+          100% {background-color: none; color: inherit}
+        }
 
-          ::-webkit-scrollbar-track {
-            -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
-          }
+        ::-webkit-scrollbar {
+          width: 8px;
+          height: 8px;
+        }
 
-          ::-webkit-scrollbar-thumb {
-            background-color: rgba(140,140,140,0.8);
-          }
-        </style>
-        <style>
-          #splash {
-            z-index: 1000000;
-            background-color: #303030;
-            display: block;
-            width: 100vw;
-            height: 100vh;
-            position: fixed;
-            opacity: 1;
-          }
-          #splash1 {
-            margin: 37vh auto 0 auto;
-            height: 25vh;
-            width: 25vh;
-            /* background-image:url('../rings.svg'); */
-            background-size: cover;
-          }
-          #splash2 {
-            margin: 0 auto;
-          }
-          @keyframes unsplash {
-            0%   {opacity: 1;}
-            100% {opacity: 0;}
-          }
+        ::-webkit-scrollbar-corner {
+          background-color: rgba(0, 0, 0, 0.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;
-          }
+        ::-webkit-scrollbar-track {
+          -webkit-box-shadow: inset 0 0 6px rgba(60,60,60,0.5);
+          background-color: rgba(140,140,140,0.1);
+        }
 
-          .Resizer:hover {
-              -webkit-transition: all 0.3s ease-out;
-              transition: all 0.3s ease-out;
-          }
+        ::-webkit-scrollbar-thumb {
+          background-color: rgba(140,140,140,0.8);
+        }
+      </style>
+      <style>
+        .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.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:hover {
+            -webkit-transition: all 0.3s ease-out;
+            transition: all 0.3s ease-out;
+        }
 
-          .Resizer.horizontal:hover {
-              border-top: 5px solid rgba(0, 0, 0, 0.5);
-              border-bottom: 5px solid rgba(0, 0, 0, 0.5);
-          }
+        .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.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.horizontal:hover {
+            border-top: 5px solid rgba(120, 120, 120, 0.5);
+            border-bottom: 5px solid rgba(120, 120, 120, 0.5);
+        }
 
-          .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;
-          }
+        .Resizer.vertical {
+            width: 2px;
+            margin: 0px -8px 0px 0px;
+            border-left: 4px solid rgba(128, 128, 128, 0);
+            border-right: 4px solid rgba(128, 128, 128, 0);
+            cursor: col-resize;
+        }
 
-        </style>
-        <script src="http://localhost:35729/livereload.js"></script>
+        .Resizer.vertical:hover {
+            border-left: 4px solid rgba(130, 130, 130, 1);
+            border-right: 4px solid rgba(140, 140, 140, 1);
+        }
+
+        .Resizer.disabled {
+          cursor: not-allowed;
+        }
+        .Resizer.disabled:hover {
+          border-color: transparent;
+        }
+
+      </style>
     </head>
     <body>
-        <div id="splash"><div id="splash1"></div></div>
         <div id="app" style="font:-webkit-control"></div>
         <script>
             function loadScript(path) {

app/package.json

@@ -4,38 +4,30 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "webpack --mode production"
+    "build": "yarn rebuild && webpack --mode production",
+    "dev": "node_modules/.bin/webpack-dev-server --mode development --progress",
+    "rebuild": "cd node_modules/heapdump && node-gyp rebuild --target=5.0.0 --arch=x64 --dist-url=https://atom.io/download/electron || echo Could not build heapdump; cd -"
   },
   "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@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",
-    "@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",
+  "license": "CC-BY-ND-4.0",
+  "dependencies": {
+    "@material-ui/core": "^4.0.0-alpha.6",
+    "@material-ui/icons": "^4.0.0-alpha.1",
+    "@material-ui/lab": "^4.0.0-alpha.6",
+    "@material-ui/styles": "^4.0.0-alpha.6",
+    "brace": "^0.11.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",
+    "file-loader": "^3.0.1",
+    "get-value": "^3.0.1",
+    "immutable": "^4.0.0-rc.12",
+    "js-base64": "^2.5.1",
+    "json-to-ast": "^2.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
+    "moment": "^2.24.0",
     "moving-average": "^1.0.0",
     "number-abbreviate": "^2.0.0",
     "prismjs": "^1.15.0",
@@ -51,14 +43,33 @@
     "redux-thunk": "^2.3.0",
     "sha1": "^1.1.1",
     "socket.io-client": "^2.2.0",
+    "uuid": "^3.3.2"
+  },
+  "devDependencies": {
+    "@types/diff": "^4.0.1",
+    "@types/get-value": "^3.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",
+    "@types/react-resize-detector": "^3.1.0",
+    "@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",
+    "css-loader": "^2.1.0",
+    "hard-source-webpack-plugin": "^0.13.1",
+    "heapdump": "^0.3.12",
+    "html-webpack-plugin": "^4.0.0-beta.5",
+    "node-loader": "^0.6.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-livereload-plugin": "^2.2.0"
+    "webpack-dev-server": "^3.1.14"
   }
 }

app/rings.svg

@@ -1,42 +0,0 @@
-<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
-<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
-    <g fill="none" fill-rule="evenodd" transform="translate(1 1)" stroke-width="2">
-        <circle cx="22" cy="22" r="6" stroke-opacity="0">
-            <animate attributeName="r"
-                 begin="1.5s" dur="3s"
-                 values="6;22"
-                 calcMode="linear"
-                 repeatCount="indefinite" />
-            <animate attributeName="stroke-opacity"
-                 begin="1.5s" dur="3s"
-                 values="1;0" calcMode="linear"
-                 repeatCount="indefinite" />
-            <animate attributeName="stroke-width"
-                 begin="1.5s" dur="3s"
-                 values="2;0" calcMode="linear"
-                 repeatCount="indefinite" />
-        </circle>
-        <circle cx="22" cy="22" r="6" stroke-opacity="0">
-            <animate attributeName="r"
-                 begin="3s" dur="3s"
-                 values="6;22"
-                 calcMode="linear"
-                 repeatCount="indefinite" />
-            <animate attributeName="stroke-opacity"
-                 begin="3s" dur="3s"
-                 values="1;0" calcMode="linear"
-                 repeatCount="indefinite" />
-            <animate attributeName="stroke-width"
-                 begin="3s" dur="3s"
-                 values="2;0" calcMode="linear"
-                 repeatCount="indefinite" />
-        </circle>
-        <circle cx="22" cy="22" r="8">
-            <animate attributeName="r"
-                 begin="0s" dur="1.5s"
-                 values="6;1;2;3;4;5;6"
-                 calcMode="linear"
-                 repeatCount="indefinite" />
-        </circle>
-    </g>
-</svg>

app/src/actions/Connection.ts

@@ -1,18 +1,20 @@
 import * as q from '../../../backend/src/Model'
 import * as url from 'url'
 import { Action, ActionTypes } from '../reducers/Connection'
+import { ActionTypes as SettingsActionTypes } from '../reducers/Settings'
+import { AppState } from '../reducers'
+import { DataSourceState, MqttOptions } from '../../../backend/src/DataSource'
+import { Dispatch } from 'redux'
+import { globalActions } from '.'
+import { resetStore as resetTreeStore, showTree } from './Tree'
+import { showError } from './Global'
+import { TopicViewModel } from '../model/TopicViewModel'
 import {
   addMqttConnectionEvent,
   makeConnectionStateEvent,
   removeConnection,
   rendererEvents,
 } from '../../../events'
-import { AppState } from '../reducers'
-import { Dispatch } from 'redux'
-import { MqttOptions, DataSourceState } from '../../../backend/src/DataSource'
-import { showTree } from './Tree'
-import { TopicViewModel } from '../TopicViewModel'
-import { showError } from './Global'
 
 export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   dispatch(connecting(connectionId))
@@ -23,10 +25,13 @@ export const connect = (options: MqttOptions, connectionId: string) => (dispatch
   rendererEvents.subscribe(event, (dataSourceState) => {
     console.log(dataSourceState)
     if (dataSourceState.connected) {
-      const tree = new q.Tree<TopicViewModel>()
-      tree.updateWithConnection(rendererEvents, connectionId)
-      dispatch(connected(tree, host!))
-      dispatch(showTree(tree))
+      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())
@@ -41,38 +46,49 @@ const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<a
     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)  => ({
+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)  => ({
+export const connecting: (connectionId: string) => Action = (connectionId: string) => ({
   connectionId,
   type: ActionTypes.CONNECTION_SET_CONNECTING,
 })
 
-export const disconnect = () => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+export const disconnect = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const { connectionId, tree } = getState().connection
-  rendererEvents.emit(removeConnection, connectionId)
-  tree && tree.stopUpdating()
+  if (connectionId) {
+    rendererEvents.emit(removeConnection, connectionId)
+    rendererEvents.unsubscribeAll(makeConnectionStateEvent(connectionId))
+  }
 
-  dispatch(showTree(undefined))
+  tree && tree.stopUpdating()
+  tree && tree.destroy()
+
+  // Clear topic filter
+  dispatch({
+    topicFilter: '',
+    type: SettingsActionTypes.SETTINGS_FILTER_TOPICS,
+  })
+
+  dispatch(resetTreeStore())
   dispatch({
     type: ActionTypes.CONNECTION_SET_DISCONNECTED,
   })
+  dispatch(showTree(undefined))
 }

app/src/actions/ConnectionManager.ts

@@ -1,9 +1,13 @@
 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 { ConnectionOptions, createEmptyConnection, makeDefaultConnections, CertificateParameters } from '../model/ConnectionOptions'
+import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
 import { showError } from './Global'
+import { remote } from 'electron'
+import * as fs from 'fs'
+import * as path from 'path'
+
 import {
   ActionTypes,
   Action,
@@ -17,7 +21,7 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
   let connections
   try {
     await ensureConnectionsHaveBeenInitialized()
-    connections = await persistantStorage.load(storedConnectionsIdentifier)
+    connections = await persistentStorage.load(storedConnectionsIdentifier)
   } catch (error) {
     dispatch(showError(error))
   }
@@ -33,16 +37,63 @@ export const loadConnectionSettings = () => async (dispatch: Dispatch<any>, getS
   }
 }
 
+export const selectCertificate = (connectionId: string) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  try {
+    const certificate = await openCertificate()
+    console.log(certificate)
+    dispatch(updateConnection(connectionId, {
+      selfSignedCertificate: certificate,
+    }))
+  } catch (error) {
+    console.log(error)
+    dispatch(showError(error))
+  }
+}
+
+async function openCertificate(): Promise<CertificateParameters> {
+  const rejectReasons = {
+    noCertificateSelected: 'No certificate selected',
+    certificateSizeDoesNotMatch: 'Certificate size larger/smaller then expected.',
+  }
+
+  return new Promise((resolve, reject) => {
+    remote.dialog.showOpenDialog({ properties: ['openFile'], securityScopedBookmarks: true }, (filePaths?: Array<string>) => {
+      const selectedFile = filePaths && filePaths[0]
+      if (!selectedFile) {
+        reject(rejectReasons.noCertificateSelected)
+        return
+      }
+
+      fs.readFile(selectedFile, (error, data) => {
+        if (error) {
+          reject(error)
+          return
+        }
+
+        if (data.length > 16_384 || data.length < 128) {
+          reject(rejectReasons.certificateSizeDoesNotMatch)
+          return
+        }
+
+        resolve({
+          data: data.toString('base64'),
+          name: path.basename(selectedFile),
+        })
+      })
+    })
+  })
+}
+
 export const saveConnectionSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
   try {
     console.log('store settings')
-    await persistantStorage.store(storedConnectionsIdentifier, getState().connectionManager.connections)
+    await persistentStorage.store(storedConnectionsIdentifier, getState().connectionManager.connections)
   } catch (error) {
     dispatch(showError(error))
   }
 }
 
-export const updateConnection = (connectionId: string, changeSet: any): Action => ({
+export const updateConnection = (connectionId: string, changeSet: Partial<ConnectionOptions>): Action => ({
   connectionId,
   changeSet,
   type: ActionTypes.CONNECTION_MANAGER_UPDATE_CONNECTION,
@@ -60,7 +111,7 @@ export const deleteSubscription = (subscription: string, connectionId: string):
   type: ActionTypes.CONNECTION_MANAGER_DELETE_SUBSCRIPTION,
 })
 
-export const createConnection = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const createConnection = () => (dispatch: Dispatch<any>) => {
   const newConnection = createEmptyConnection()
   dispatch(addConnection(newConnection))
   dispatch(selectConnection(newConnection.id))
@@ -104,12 +155,12 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<an
 }
 
 async function ensureConnectionsHaveBeenInitialized() {
-  const connections = await persistantStorage.load(storedConnectionsIdentifier)
+  const connections = await persistentStorage.load(storedConnectionsIdentifier)
   const requiresInitialization = !connections
   if (requiresInitialization) {
     const migratedConnection = loadLegacyConnectionOptions()
     const defaultConnections = makeDefaultConnections()
-    persistantStorage.store(storedConnectionsIdentifier, {
+    persistentStorage.store(storedConnectionsIdentifier, {
       ...migratedConnection,
       ...defaultConnections,
     })

app/src/actions/Global.ts

@@ -1,6 +1,22 @@
-import { ActionTypes } from '../reducers'
+import { ActionTypes } from '../reducers/Global'
+import { Dispatch } from 'redux'
 
 export const showError = (error?: string) => ({
   error,
   type: ActionTypes.showError,
 })
+
+export const showNotification = (notification?: string) => ({
+  notification,
+  type: ActionTypes.showNotification,
+})
+
+export const didLaunch = () => ({
+  type: ActionTypes.didLaunch,
+})
+
+export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>) => {
+  dispatch({
+    type: ActionTypes.toggleSettingsVisibility,
+  })
+}

app/src/actions/Publish.ts

@@ -1,9 +1,10 @@
-import { ActionTypes, Action } from '../reducers/Publish'
+import { Action, ActionTypes } from '../reducers/Publish'
 import { AppState } from '../reducers'
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
 import { Dispatch } from 'redux'
-import { rendererEvents, makePublishEvent } from '../../../events'
+import { makePublishEvent, rendererEvents } from '../../../events'
 
-export const setTopic = (topic?: string): Action  => {
+export const setTopic = (topic?: string): Action => {
   return {
     topic,
     type: ActionTypes.PUBLISH_SET_TOPIC,
@@ -42,7 +43,7 @@ export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, ge
   const publishEvent = makePublishEvent(connectionId)
   const mqttMessage = {
     topic,
-    payload: state.publish.payload,
+    payload: state.publish.payload ? Base64Message.fromString(state.publish.payload) : null,
     retain: state.publish.retain,
     qos: state.publish.qos,
   }

app/src/actions/Settings.ts

@@ -1,65 +1,76 @@
 import * as q from '../../../backend/src/Model'
 import { AppState } from '../reducers'
-import { autoExpandLimitSet } from '../components/Settings'
+import { autoExpandLimitSet } from '../components/SettingsDrawer/Settings'
 import { batchActions } from 'redux-batched-actions'
-import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage'
+import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
 import { Dispatch } from 'redux'
 import { showError } from './Global'
 import { showTree } from './Tree'
-import { TopicViewModel } from '../TopicViewModel'
+import { TopicViewModel } from '../model/TopicViewModel'
 import {
   ActionTypes,
   SettingsState,
   TopicOrder,
 } from '../reducers/Settings'
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { globalActions } from '.'
 
 const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
   id: 'Settings',
 }
 
-export const loadSettings = () => async (dispatch: Dispatch<any>, _getState: () => AppState)  => {
+export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
   try {
-    const settings = await persistantStorage.load(settingsIdentifier)
+    const settings = await persistentStorage.load(settingsIdentifier) || {}
     dispatch({
-      settings,
+      settings: getState().settings.merge(settings),
       type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS,
     })
   } catch (error) {
     dispatch(showError(error))
   }
+  dispatch(globalActions.didLaunch())
 }
 
-export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState)  => {
+export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
   const settings = {
-    ...getState().settings,
+    ...getState().settings.toJS(),
+    autoExpandLimit: undefined,
     topicFilter: undefined,
     visible: undefined,
   }
 
   try {
-    await persistantStorage.store(settingsIdentifier, settings)
+    await persistentStorage.store(settingsIdentifier, settings)
   } catch (error) {
     dispatch(showError(error))
   }
 }
 
-export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>) => {
   dispatch({
     autoExpandLimit,
     type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
   })
+}
+
+export const setTimeLocale = (timeLocale: string) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    timeLocale,
+    type: ActionTypes.SETTINGS_SET_TIME_LOCALE,
+  })
   dispatch(storeSettings())
 }
 
-export const selectTopicWithMouseOver = (selectTopicWithMouseOver: boolean) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const selectTopicWithMouseOver = (doSelect: boolean) => (dispatch: Dispatch<any>) => {
   dispatch({
-    selectTopicWithMouseOver,
+    selectTopicWithMouseOver: doSelect,
     type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER,
   })
   dispatch(storeSettings())
 }
 
-export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch<any>) => {
   dispatch({
     valueRendererDisplayMode,
     type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE,
@@ -67,21 +78,14 @@ export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') =
   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) => {
+export const toggleHighlightTopicUpdates = () => (dispatch: Dispatch<any>) => {
   dispatch({
     type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY,
   })
   dispatch(storeSettings())
 }
 
-export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (dispatch: Dispatch<any>, _getState: () => AppState) => {
+export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (dispatch: Dispatch<any>) => {
   dispatch({
     topicOrder,
     type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
@@ -89,7 +93,7 @@ export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (disp
   dispatch(storeSettings())
 }
 
-export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   const { tree } = getState().connection
 
   dispatch({
@@ -97,7 +101,7 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
     type: ActionTypes.SETTINGS_FILTER_TOPICS,
   })
 
-  if (!filterStr || !tree) {
+  if (!filterStr || !tree) {
     dispatch(batchActions([setAutoExpandLimit(0), (showTree(tree) as any)]))
     return
   }
@@ -110,7 +114,10 @@ export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, get
       return true
     }
 
-    const messageMatches = (node.message && typeof node.message.value === 'string' && node.message.value.toLowerCase().indexOf(filterStr) !== -1)
+    const messageMatches = node.message
+      && node.message.value
+      && Base64Message.toUnicodeString(node.message.value).toLowerCase().indexOf(filterStr) !== -1
+
     return Boolean(messageMatches)
   }
 
@@ -148,3 +155,10 @@ function autoExpandLimitForTree(tree: q.Tree<TopicViewModel>) {
 
   return closestExistingLimit(calculatedLimit)
 }
+
+export const toggleTheme = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  dispatch({
+    type: getState().settings.get('theme') === 'light' ? ActionTypes.SETTINGS_SET_THEME_DARK : ActionTypes.SETTINGS_SET_THEME_LIGHT,
+  })
+  dispatch(storeSettings())
+}

app/src/actions/Sidebar.ts

@@ -1,10 +1,11 @@
-import { Dispatch, Action } from 'redux'
-import { AppState } from '../reducers'
-import { makePublishEvent, rendererEvents } from '../../../events'
 import * as q from '../../../backend/src/Model'
+import { ActionTypes } from '../reducers/Sidebar'
+import { AppState } from '../reducers'
+import { Dispatch } from 'redux'
+import { makePublishEvent, rendererEvents } from '../../../events'
 
 export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
-  const { selectedTopic } = getState().tree
+  const selectedTopic = getState().tree.get('selectedTopic')
   if (!selectedTopic) {
     return
   }
@@ -12,6 +13,13 @@ export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () =
   dispatch(clearTopic(selectedTopic, false))
 }
 
+export const setCompareMessage = (message?: q.Message) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    message,
+    type: ActionTypes.SIDEBAR_SET_COMPARE_MESSAGE,
+  })
+}
+
 export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean, subtopicClearLimit = 50) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
   const { connectionId } = getState().connection
   if (!connectionId) {
@@ -25,7 +33,6 @@ export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean, subtopicC
     retain: true,
     qos: 0 as 0,
   }
-  console.log('deleting', topic.path())
   rendererEvents.emit(publishEvent, mqttMessage)
 
   if (recursive) {

app/src/actions/Tree.ts

@@ -1,30 +1,35 @@
-import { AppState } from '../reducers'
-import { ActionTypes } from '../reducers/Tree'
 import * as q from '../../../backend/src/Model'
-import { Dispatch, AnyAction } from 'redux'
-import { setTopic } from './Publish'
-import { TopicViewModel } from '../TopicViewModel'
+import { ActionTypes } from '../reducers/Tree'
+import { ActionTypes as SidebarActionTypes } from '../reducers/Sidebar'
+import { AnyAction, Dispatch } from 'redux'
+import { AppState } from '../reducers'
 import { batchActions } from 'redux-batched-actions'
+import { setTopic } from './Publish'
+import { TopicViewModel } from '../model/TopicViewModel'
+import { globalActions } from '.'
 const debounce = require('lodash.debounce')
 
-export const selectTopic = (topic: q.TreeNode<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
+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) {
+const debouncedSelectTopic = debounce((topic: q.TreeNode<TopicViewModel>, dispatch: Dispatch<any>, getState: () => AppState) => {
+  const previouslySelectedTopic = getState().tree.get('selectedTopic')
+
+  if (previouslySelectedTopic === topic) {
     return
   }
 
   // Update publish topic
   let setTopicDispatch: any | undefined
-  if (selectedTopic && (selectedTopic.path() === getState().publish.topic || !getState().publish.topic)) {
+  if (!getState().publish.topic) {
+    setTopicDispatch = setTopic(topic.path())
+  } else if (previouslySelectedTopic && (previouslySelectedTopic.path() === getState().publish.topic)) {
     setTopicDispatch = setTopic(topic.path())
   }
 
-  if (selectedTopic && selectedTopic.viewModel) {
-    selectedTopic.viewModel.setSelected(false)
+  if (previouslySelectedTopic && previouslySelectedTopic.viewModel) {
+    previouslySelectedTopic.viewModel.setSelected(false)
   }
 
   if (topic.viewModel) {
@@ -36,6 +41,11 @@ const debouncedSelectTopic = debounce((topic: q.TreeNode<TopicViewModel>, dispat
     type: ActionTypes.TREE_SELECT_TOPIC,
   }
 
+  dispatch({
+    type: SidebarActionTypes.SIDEBAR_SET_COMPARE_MESSAGE,
+    message: undefined,
+  })
+
   if (setTopicDispatch) {
     dispatch(batchActions([selectTreeTopicDispatch, setTopicDispatch]))
   } else {
@@ -43,17 +53,53 @@ const debouncedSelectTopic = debounce((topic: q.TreeNode<TopicViewModel>, dispat
   }
 }, 70)
 
-export const showTree = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction  => {
-  const visibleTree = getState().tree.tree
-  const connectionTree = getState().connection.tree
+function destroyUnreferencedTree(state: AppState) {
+  const visibleTree = state.tree.get('tree')
+  const connectionTree = state.connection.tree
 
   // Stop updates of old tree
-  if (visibleTree !== connectionTree && visibleTree) {
+  if (visibleTree && visibleTree !== connectionTree) {
+    console.warn('destroy')
     visibleTree.stopUpdating()
+    visibleTree.destroy()
   }
+}
+
+export const resetStore = () => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
+  destroyUnreferencedTree(getState())
+
+  return dispatch({
+    type: ActionTypes.TREE_RESET_STORE,
+  })
+}
+
+export const showTree = (tree: q.Tree<TopicViewModel> | undefined) => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction => {
+  destroyUnreferencedTree(getState())
 
   return dispatch({
     tree,
     type: ActionTypes.TREE_SHOW_TREE,
   })
 }
+
+export const togglePause = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const paused = getState().tree.get('paused')
+  const tree = getState().tree.get('tree')
+  const changes = tree ? tree.unmergedChanges().length : 0
+
+  if (paused && changes > 0) {
+    dispatch(globalActions.showNotification('Applying recorded changes.'))
+  }
+
+  // Allow for notification to be displayed
+  setTimeout(() => {
+    tree && tree.applyUnmergedChanges()
+    if (paused && changes > 0) {
+      dispatch(globalActions.showNotification(`Sucessfully applied ${changes} changes.`))
+    }
+  }, 50)
+
+  dispatch({
+    type: paused ? ActionTypes.TREE_RESUME_UPDATES : ActionTypes.TREE_PAUSE_UPDATES,
+  })
+}

app/src/actions/UpdateNotifier.ts

@@ -1,13 +1,13 @@
-import { ActionTypes, CustomAction } from '../reducers'
+import { ActionTypes, GlobalAction } from '../reducers/Global'
 
-export const showUpdateNotification = (show: boolean): CustomAction => {
+export const showUpdateNotification = (show: boolean): GlobalAction => {
   return {
     type: ActionTypes.showUpdateNotification,
     showUpdateNotification: show,
   }
 }
 
-export const showUpdateDetails = (show: boolean): CustomAction => {
+export const showUpdateDetails = (show: boolean): GlobalAction => {
   return {
     type: ActionTypes.showUpdateDetails,
     showUpdateDetails: show,

app/src/actions/index.ts

@@ -1,10 +1,10 @@
-import * as settingsActions from './Settings'
-import * as publishActions from './Publish'
-import * as treeActions from './Tree'
-import * as updateNotifierActions from './UpdateNotifier'
 import * as connectionActions from './Connection'
-import * as sidebarActons from './Sidebar'
 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 treeActions from './Tree'
+import * as updateNotifierActions from './UpdateNotifier'
 
-export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons, connectionManagerActions, globalActions }
+export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActions, connectionManagerActions, globalActions }

app/src/components/App.tsx

@@ -1,29 +1,28 @@
 import * as React from 'react'
-import CodeDiff from './components/CodeDiff'
-import ConnectionSetup from './components/ConnectionSetup/ConnectionSetup'
+import ConnectionSetup from './ConnectionSetup/ConnectionSetup'
 import CssBaseline from '@material-ui/core/CssBaseline'
 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 Notification from './Layout/Notification'
+import TitleBar from './Layout/TitleBar'
 import UpdateNotifier from './UpdateNotifier'
-import { AppState } from './reducers'
+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 { globalActions, settingsActions } from '../actions'
 import { Theme, withStyles } from '@material-ui/core/styles'
 
-const Settings = React.lazy(() => import('./components/Settings'))
+const Settings = React.lazy(() => import('./SettingsDrawer/Settings'))
+const ContentView = React.lazy(() => import('./Layout/ContentView'))
 
 interface Props {
   connectionId: string
   classes: any
   settingsVisible: boolean
   error?: string
+  notification?: string
   actions: typeof globalActions
   settingsActions: typeof settingsActions
+  launching: boolean
 }
 
 class App extends React.PureComponent<Props, {}> {
@@ -32,79 +31,70 @@ class App extends React.PureComponent<Props, {}> {
     this.state = { }
   }
 
-  public componentDidMount() {
-    this.props.settingsActions.loadSettings()
-  }
-
-  private renderError() {
-    if (this.props.error) {
-      const error = typeof this.props.error === 'string' ? this.props.error : JSON.stringify(this.props.error)
+  private renderNotification() {
+    const message = this.props.error || this.props.notification
+    const isError = message === this.props.error
+    if (message) {
+      // Guard in case someone ever calls showError with an error instead of a string
+      const str = typeof message === 'string' ? message : JSON.stringify(message)
       return (
         <Notification
-          message={error}
-          onClose={() => { this.props.actions.showError(undefined) }}
+          message={str}
+          type={isError ? 'error' : 'notification'}
+          onClose={() => { isError ? this.props.actions.showError(undefined) : this.props.actions.showNotification(undefined) }}
         />
       )
     }
+
+    return null
+  }
+
+  public componentDidMount() {
+    this.props.settingsActions.loadSettings()
   }
 
   public render() {
     const { settingsVisible } = this.props
     const { content, contentShift, centerContent, paneDefaults, heightProperty } = this.props.classes
 
+    if (this.props.launching) {
+      return null
+    }
+
     return (
       <div className={centerContent}>
         <CssBaseline />
         <ErrorBoundary>
-          {this.renderError()}
-          <React.Suspense fallback={<div>Loading...</div>}>
+        {this.renderNotification()}
+          <React.Suspense fallback={<div></div>}>
             <Settings />
           </React.Suspense>
           <div className={centerContent}>
             <div className={`${settingsVisible ? contentShift : content}`}>
-                <TitleBar />
+              <TitleBar />
             </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 className={settingsVisible ? contentShift : content}>
+              <React.Suspense fallback={<div></div>}>
+                <ContentView heightProperty={heightProperty} connectionId={this.props.connectionId} paneDefaults={paneDefaults} />
+              </React.Suspense>
             </div>
           </div>
           <UpdateNotifier />
           <ConnectionSetup />
         </ErrorBoundary>
-      </div >
+      </div>
     )
   }
 }
 
-const mapStateToProps = (state: AppState) => {
-  return {
-    settingsVisible: state.settings.visible,
-    connectionId: state.connection.connectionId,
-    error: state.globalState.error,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
-  }
-}
-
 const styles = (theme: Theme) => {
   const drawerWidth = 300
+  const contentBaseStyle = {
+    width: '100vw',
+    overflow: 'hidden' as 'hidden',
+    backgroundColor: theme.palette.background.default,
+  }
+
   return {
     heightProperty: {
       height: 'calc(100vh - 64px) !important',
@@ -122,9 +112,7 @@ const styles = (theme: Theme) => {
       overflow: 'hidden' as 'hidden',
     },
     content: {
-      width: '100vw',
-      overflowX: 'hidden' as 'hidden',
-      backgroundColor: theme.palette.background.default,
+      ...contentBaseStyle,
       transition: theme.transitions.create('transform', {
         easing: theme.transitions.easing.sharp,
         duration: theme.transitions.duration.leavingScreen,
@@ -132,9 +120,7 @@ const styles = (theme: Theme) => {
       transform: 'translateX(0px)',
     },
     contentShift: {
-      overflowX: 'hidden' as 'hidden',
-      width: '100vw',
-      padding: 0,
+      ...contentBaseStyle,
       backgroundColor: theme.palette.background.default,
       transition: theme.transitions.create('transform', {
         easing: theme.transitions.easing.easeOut,
@@ -152,4 +138,15 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
+const mapStateToProps = (state: AppState) => {
+  return {
+    settingsVisible: state.globalState.get('settingsVisible'),
+    connectionId: state.connection.connectionId,
+    error: state.globalState.get('error'),
+    notification: state.globalState.get('notification'),
+    highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
+    launching: state.globalState.get('launching'),
+  }
+}
+
 export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(App))

app/src/components/CodeDiff.tsx

@@ -1,144 +0,0 @@
-import * as diff from 'diff'
-import * as Prism from 'prismjs'
-import * as React from 'react'
-import { Theme, withStyles, Badge } from '@material-ui/core'
-import 'prismjs/components/prism-json'
-import 'prismjs/themes/prism-tomorrow.css'
-
-interface Props {
-  previous: string
-  current: 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', textAlign: 'right' }}>
-        Diff: <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>
-    )
-  }
-
-  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/ConnectionSetup/AdvancedConnectionSettings.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react'
 import Add from '@material-ui/icons/Add'
+import ClearAdornment from '../helper/ClearAdornment'
 import Delete from '@material-ui/icons/Delete'
+import Lock from '@material-ui/icons/Lock'
 import Undo from '@material-ui/icons/Undo'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
@@ -16,6 +18,8 @@ import {
   List,
   ListItem,
   ListItemText,
+  Tooltip,
+  Typography,
 } from '@material-ui/core'
 
 interface Props {
@@ -40,6 +44,40 @@ class ConnectionSettings extends React.Component<Props, State> {
     })
   }
 
+  private renderCertificateInfo() {
+    if (!this.props.connection.selfSignedCertificate) {
+      return null
+    }
+
+    return (
+      <span>
+        <Tooltip title={this.props.connection.selfSignedCertificate.name}>
+          <Typography className={this.props.classes.certificateName}>
+            <ClearAdornment action={this.clearCertificate} value={this.props.connection.selfSignedCertificate.name} />
+            {this.props.connection.selfSignedCertificate.name}
+          </Typography>
+      </Tooltip>
+     </span>
+    )
+  }
+
+  private clearCertificate = () => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      selfSignedCertificate: undefined,
+    })
+  }
+
+  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}
+      />
+    ))
+  }
+
   public render() {
     const { classes } = this.props
     return (
@@ -66,7 +104,7 @@ class ConnectionSettings extends React.Component<Props, State> {
             </Grid>
             <Grid item={true} xs={12} style={{ padding: 0 }}>
               <List
-                className={classes.topicList}
+                className={`${classes.topicList} advanced-connection-settings-topic-list`}
                 component="nav"
               >
                 <div className={classes.list}>
@@ -74,7 +112,7 @@ class ConnectionSettings extends React.Component<Props, State> {
                 </div>
               </List>
             </Grid>
-            <Grid item={true} xs={9} className={classes.gridPadding}>
+            <Grid item={true} xs={7} className={classes.gridPadding}>
               <TextField
                 className={classes.fullWidth}
                 label="MQTT Client ID"
@@ -84,6 +122,20 @@ class ConnectionSettings extends React.Component<Props, State> {
               />
             </Grid>
             <Grid item={true} xs={3} className={classes.gridPadding}>
+              <div>
+                <Tooltip title="Select certificate to verify authenticity of a self-signed certificate" placement="top">
+                  <Button
+                    variant="contained"
+                    className={classes.button}
+                    onClick={() => this.props.managerActions.selectCertificate(this.props.connection.id)}
+                  >
+                    <Lock /> Certificate
+                  </Button>
+                </Tooltip>
+                {this.renderCertificateInfo()}
+              </div>
+            </Grid>
+            <Grid item={true} xs={2} className={classes.gridPadding}>
               <Button
                 variant="contained"
                 className={classes.button}
@@ -97,17 +149,6 @@ class ConnectionSettings extends React.Component<Props, State> {
       </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: {
@@ -149,6 +190,14 @@ const styles: StyleRulesCallback<string> = (theme: Theme) => {
       marginTop: theme.spacing(3),
       float: 'right',
     },
+    certificateName: {
+      width: '100%',
+      height: 'calc(1em + 4px)',
+      overflow: 'hidden' as 'hidden',
+      whiteSpace: 'nowrap' as 'nowrap',
+      textOverflow: 'ellipsis' as 'ellipsis',
+      color: theme.palette.text.hint,
+    },
   }
 }
 

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -25,7 +25,7 @@ import {
   Switch,
   TextField,
 } from '@material-ui/core'
-import ConnectionHealthIndicator from '../ConnectionHealthIndicator'
+import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
 
 interface Props {
   connection: ConnectionOptions
@@ -90,105 +90,6 @@ class ConnectionSettings extends React.Component<Props, State> {
     })
   }
 
-  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
 
@@ -305,6 +206,105 @@ class ConnectionSettings extends React.Component<Props, State> {
       this.props.actions.connect(mqttOptions, this.props.connection.id)
     }
   }
+
+  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>
+    )
+  }
 }
 
 const mapStateToProps = (state: AppState) => {

app/src/components/ConnectionSetup/ConnectionSetup.tsx

@@ -29,6 +29,20 @@ class ConnectionSetup extends React.Component<Props, {}> {
     super(props)
   }
 
+  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>
+    )
+  }
+
   public componentDidMount() {
     this.props.actions.loadConnectionSettings()
   }
@@ -55,20 +69,6 @@ class ConnectionSetup extends React.Component<Props, {}> {
       </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'

app/src/components/ConnectionSetup/ProfileList.tsx

@@ -92,7 +92,7 @@ const connectionItemRenderer = withStyles(connectionItemStyle)((props: Connectio
       onClick={() => props.actions.selectConnection(props.connection.id)}
     >
       <Typography className={props.classes.name}>
-        {props.connection.name || 'mqtt broker'}
+        {props.connection.name || 'mqtt broker'}
       </Typography>
       <Typography className={props.classes.details}>
         {connection && connection.url}

app/src/components/Copy.tsx

@@ -1,79 +0,0 @@
-import * as React from 'react'
-import { Snackbar, SnackbarContent, Tooltip } from '@material-ui/core'
-import FileCopy from '@material-ui/icons/FileCopy'
-import Check from '@material-ui/icons/Check'
-import green from '@material-ui/core/colors/green'
-import { withStyles, Theme } from '@material-ui/core/styles'
-import CustomIconButton from './CustomIconButton';
-
-const copy = require('copy-text-to-clipboard')
-
-interface Props {
-  value: string
-  classes: any
-}
-
-interface State {
-  didCopy: boolean
-  snackBarOpen: boolean
-}
-
-const styles = (theme: Theme) => ({
-  snackbar: {
-    backgroundColor: green[600],
-    color: theme.typography.button.color,
-  },
-})
-
-class Copy extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props)
-    this.state = { didCopy: false, snackBarOpen: false }
-  }
-
-  public render() {
-    const icon = !this.state.didCopy
-      ? <FileCopy fontSize="inherit" />
-      : <Check fontSize="inherit" style={{ cursor: 'default' }} />
-
-    return (
-      <span>
-        <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>
-    )
-  }
-
-  private handleClick = (event: React.MouseEvent) => {
-    event.stopPropagation()
-
-    copy(this.props.value)
-    this.setState({ didCopy: true, snackBarOpen: true })
-    setTimeout(() => {
-      this.setState({ didCopy: false })
-    }, 1500)
-  }
-}
-
-export default withStyles(styles)(Copy)

app/src/components/Demo/Mouse.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
+const cursor = require('./cursor.png')
 
 interface State {
   enabled: boolean
@@ -9,7 +10,7 @@ interface State {
   stepSizeY: number,
 }
 
-class Demo extends React.Component<{}, State> {
+class Demo extends React.Component<{classes: any}, State> {
   private timer: any
   private frameInterval = 20
 
@@ -18,18 +19,6 @@ class Demo extends React.Component<{}, State> {
     this.state = { enabled: false, target: { x: 0, y: 0 }, position: { x: 0, y: 0 }, stepSizeX: 1, stepSizeY: 1 }
   }
 
-  public componentDidMount() {
-    (window as any).demo.enableMouse = () => {
-      this.setState({ enabled: true })
-    }
-    (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
-      const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
-      const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
-      this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })
-      this.moveCloser()
-    }
-  }
-
   private moveCloser(steps: number = 0) {
     const steSizeX = Math.min(this.state.stepSizeX, Math.abs(this.state.position.x - this.state.target.x))
     const steSizeY = Math.min(this.state.stepSizeY, Math.abs(this.state.position.y - this.state.target.y))
@@ -53,26 +42,43 @@ class Demo extends React.Component<{}, State> {
     }, this.frameInterval)
   }
 
+  public componentDidMount() {
+    (window as any).demo.enableMouse = () => {
+      this.setState({ enabled: true })
+    }
+    (window as any).demo.moveMouse = (x: number, y: number, animationTime: number) => {
+      const stepSizeX = Math.abs(this.state.position.x - x) / (animationTime / this.frameInterval)
+      const stepSizeY = Math.abs(this.state.position.y - y) / (animationTime / this.frameInterval)
+      this.setState({ stepSizeX, stepSizeY, enabled: true, target: { x, y } })
+      this.moveCloser()
+    }
+  }
+
   public render() {
     if (!this.state.enabled) {
       return null
     }
-    const style = {
-      width: '32px',
-      height: '32px',
-      position: 'fixed' as 'fixed',
-      zIndex: 1000000,
-      filter: 'invert(100%)',
+
+    const cursorStyle = {
       left: this.state.position.x + 2,
       top: this.state.position.y + 2,
     }
 
     return (
-      <img src="../cursor.png" style={style} />
+      <img src={cursor} style={cursorStyle} className={this.props.classes.cursor} />
     )
   }
 }
 
-const style = (theme: Theme) => {}
+const style = (theme: Theme) => ({
+  cursor: {
+    width: '32px',
+    height: '32px',
+    position: 'fixed' as 'fixed',
+    zIndex: 1000000,
+    filter: theme.palette.type === 'light' ? undefined : 'invert(100%)',
+    pointerEvents: 'none' as 'none',
+  },
+})
 
 export default withStyles(style)(Demo)

app/src/components/Demo/ShowText.tsx

@@ -1,15 +1,13 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
-import Key from './Key';
+import Key from './Key'
 
 interface State {
   message?: string
-  keys: string[]
+  keys: Array<string>
   location: string
 }
 
-
-
 class Demo extends React.Component<{classes: any}, State> {
   private timer: any
   constructor(props: any) {
@@ -22,7 +20,7 @@ class Demo extends React.Component<{classes: any}, State> {
   }
 
   public componentDidMount() {
-    (window as any).demo.showMessage = (message: string, location: string, duration: number, keys: string[] = []) => {
+    (window as any).demo.showMessage = (message: string, location: string, duration: number, keys: Array<string> = []) => {
       this.clearTimer()
       this.setState({ message, location, keys })
       this.timer = setTimeout(() => this.setState({ message: undefined }), duration)
@@ -61,7 +59,7 @@ class Demo extends React.Component<{classes: any}, State> {
       return null
     }
 
-    let keys: any[] = []
+    let keys: Array<any> = []
     if (this.state.keys.length > 0) {
       keys = this.state.keys.map(key => [<Key key={key} keyboardKey={key} />])
         .reduce((prev, current) => {

app/src/components/Demo/index.tsx

@@ -0,0 +1,26 @@
+import * as React from 'react'
+import ShowText from './ShowText'
+import Mouse from './Mouse'
+let heapdump: any
+
+function writeHeapdump(path?: string) {
+  if (!heapdump) {
+    heapdump = require('heapdump')
+  }
+
+  heapdump.writeSnapshot(path || `${Date.now()}.heapsnapshot`)
+  return path
+}
+
+(window as any).demo = {
+  writeHeapdump,
+}
+
+export default function render(props: any) {
+  return (
+    <span>
+      <ShowText />
+      <Mouse />
+    </span>
+  )
+}

app/src/components/ErrorBoundary.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import PersistantStorage from './PersistantStorage'
+import PersistentStorage from '../utils/PersistentStorage'
 import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
 import Warning from '@material-ui/icons/Warning'
 import { electronRendererTelementry } from 'electron-telemetry'
@@ -21,29 +21,29 @@ interface Props {
 }
 
 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 }
   }
+  constructor(props: Props) {
+    super(props)
+    this.state = {}
+  }
 
   private restart = () => {
     window.location = window.location
   }
 
   private clearStorage = () => {
-    PersistantStorage.clear()
+    PersistentStorage.clear()
     window.location = window.location
   }
 
+  public componentDidCatch(error: Error, errorInfo: any) {
+    electronRendererTelementry.trackError(error)
+    console.log('did catch', error)
+  }
+
   public render() {
     if (!this.state.error) {
       return this.props.children

app/src/components/Layout/ContentView.tsx

@@ -0,0 +1,27 @@
+import * as React from 'react'
+import ReactSplitPane from 'react-split-pane'
+import { Sidebar } from '../Sidebar'
+import Tree from '../Tree/Tree'
+
+export default function ContentView(props: {heightProperty: any, paneDefaults: any, connectionId: any}) {
+  return (
+    <ReactSplitPane
+      step={20}
+      primary="second"
+      className={props.heightProperty}
+      split="vertical"
+      minSize={250}
+      defaultSize={500}
+      allowResize={true}
+      style={{ position: 'relative' }}
+      pane1Style={{ overflow: 'hidden' }}
+    >
+      <div className={props.paneDefaults}>
+        <Tree />
+      </div>
+      <div className={props.paneDefaults}>
+        <Sidebar connectionId={props.connectionId} />
+      </div>
+    </ReactSplitPane>
+  )
+}

app/src/components/Layout/Notification.tsx

@@ -6,6 +6,7 @@ import { green, red } from '@material-ui/core/colors'
 
 interface Props {
   message?: string
+  type: 'error' | 'notification'
   onClose: () => void
   classes: any
 }
@@ -16,12 +17,12 @@ class Notification extends React.Component<Props, {}> {
   }
 
   public static styles = (theme: Theme) => ({
-    success: {
+    notification: {
       backgroundColor: green[600],
       color: theme.typography.button.color,
     },
     error: {
-      backgroundColor: red[600],
+      backgroundColor: theme.palette.error.main,
       color: theme.typography.button.color,
     },
   })
@@ -36,11 +37,11 @@ class Notification extends React.Component<Props, {}> {
       <Snackbar
         anchorOrigin={snackbarAnchor}
         open={Boolean(this.props.message)}
-        autoHideDuration={10000}
+        autoHideDuration={this.props.type === 'error' ? 10000 : 2000}
         onClose={this.props.onClose}
       >
         <SnackbarContent
-          className={this.props.classes.error}
+          className={this.props.type === 'error' ? this.props.classes.error : this.props.classes.notification}
           message={this.props.message}
         />
       </Snackbar>

app/src/components/Layout/PauseButton.tsx

@@ -0,0 +1,99 @@
+import * as React from 'react'
+import * as q from '../../../../backend/src/Model'
+import CustomIconButton from '../helper/CustomIconButton'
+import Pause from '@material-ui/icons/PauseCircleFilled'
+import Resume from '@material-ui/icons/PlayCircleFilled'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { treeActions } from '../../actions'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { Tooltip } from '@material-ui/core'
+
+const styles: StyleRulesCallback = theme => ({
+  icon: {
+    color: theme.palette.primary.contrastText,
+    verticalAlign: 'middle' as 'middle',
+  },
+  bufferStats: {
+    minWidth: '8em',
+  },
+})
+
+interface Props {
+  classes: any
+  actions: {
+    tree: typeof treeActions,
+  }
+  paused: boolean
+  tree?: q.Tree<any>
+}
+
+class PauseButton extends React.Component<Props, {changes: number}> {
+  private timer?: any
+  constructor(props: Props) {
+    super(props)
+    this.state = { changes: 0 }
+  }
+
+  private renderBufferStats() {
+    if (!this.props.tree) {
+      return
+    }
+
+    return (
+      <span className={this.props.classes.bufferStats}>
+        {this.state.changes} changes<br />
+        buffer at {Math.round(this.props.tree.unmergedChanges().fillState() * 10000) / 100}%
+      </span>
+    )
+  }
+
+  public componentDidMount() {
+    this.timer = setInterval(() => {
+      if (!this.props.paused || !this.props.tree) {
+        return
+      }
+
+      const changes = this.props.tree.unmergedChanges()
+      if (this.state.changes !== changes.length) {
+        this.setState({ changes: changes.length })
+      }
+    }, 300)
+  }
+
+  public componentWillUnmount() {
+    this.timer && clearInterval(this.timer)
+  }
+
+  public render() {
+    const message = this.props.paused ? 'Resumes updating the tree, after applying all recorded changes' : 'Stops all updates, records changes until the buffer is full.'
+    return (
+      <div style={{ display: 'inline-flex' }}>
+        <span>
+          <CustomIconButton onClick={this.props.actions.tree.togglePause} tooltip={message}>
+            {this.props.paused ? <Resume className={this.props.classes.icon} /> : <Pause className={this.props.classes.icon} />}
+          </CustomIconButton>
+        </span>
+        {this.props.paused ? this.renderBufferStats() : null}
+      </div>
+    )
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    paused: state.tree.get('paused'),
+    tree: state.tree.get('tree'),
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      tree: bindActionCreators(treeActions, dispatch),
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(PauseButton))

app/src/components/Layout/TitleBar.tsx

@@ -1,8 +1,15 @@
 import * as React from 'react'
-import ClearAdornment from './helper/ClearAdornment'
+import ClearAdornment from '../helper/ClearAdornment'
 import CloudOff from '@material-ui/icons/CloudOff'
+import ConnectionHealthIndicator from '../helper/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, globalActions } from '../../actions'
+import { fade } from '@material-ui/core/styles/colorManipulator'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
 import {
   AppBar,
   Button,
@@ -11,20 +18,15 @@ import {
   Toolbar,
   Typography,
 } from '@material-ui/core'
-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 { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import ConnectionHealthIndicator from './ConnectionHealthIndicator';
+import PauseButton from './PauseButton'
 
 const styles: StyleRulesCallback = theme => ({
   title: {
     display: 'none',
-    [theme.breakpoints.up('sm')]: {
+    [theme.breakpoints.up(750)]: {
       display: 'block',
     },
+    whiteSpace: 'nowrap' as 'nowrap',
   },
   search: {
     position: 'relative',
@@ -35,14 +37,29 @@ const styles: StyleRulesCallback = theme => ({
     },
     marginRight: theme.spacing(2),
     marginLeft: 0,
-    width: '100%',
-    [theme.breakpoints.up('sm')]: {
-      marginLeft: theme.spacing(3),
+    flexGrow: 1,
+    maxWidth: '60%',
+
+    [theme.breakpoints.up('md')]: {
+      maxWidth: '30%',
+
+      marginLeft: theme.spacing(4),
+      width: 'auto',
+    },
+    [theme.breakpoints.up(750)]: {
+      marginLeft: theme.spacing(4),
       width: 'auto',
     },
   },
+  disconnectIcon: {
+    [theme.breakpoints.down('xs')]: {
+      display: 'none' as 'none',
+    },
+    marginRight: '8px',
+    paddingLeft: '8px',
+  },
   searchIcon: {
-    width: theme.spacing(8),
+    width: theme.spacing(6),
     height: '100%',
     position: 'absolute',
     pointerEvents: 'none',
@@ -58,17 +75,18 @@ const styles: StyleRulesCallback = theme => ({
     paddingTop: theme.spacing(1),
     paddingRight: theme.spacing(1),
     paddingBottom: theme.spacing(1),
-    paddingLeft: theme.spacing(10),
+    paddingLeft: theme.spacing(6),
     transition: theme.transitions.create('width'),
     width: '100%',
-    [theme.breakpoints.up('md')]: {
-      width: 200,
-    },
   },
   menuButton: {
     marginLeft: -12,
     marginRight: 20,
   },
+  disconnect: {
+    margin: 'auto 8px auto auto',
+    color: theme.palette.primary.contrastText,
+  },
 })
 
 interface Props {
@@ -76,6 +94,7 @@ interface Props {
   actions: {
     settings: typeof settingsActions,
     connection: typeof connectionActions,
+    global: typeof globalActions,
   }
   topicFilter?: string
 }
@@ -86,26 +105,6 @@ class TitleBar extends React.Component<Props, {}> {
     this.state = { }
   }
 
-  public render() {
-    const { actions, classes } = this.props
-
-    return (
-      <AppBar position="static">
-        <Toolbar>
-          <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>
-          {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, topicFilter } = this.props
 
@@ -118,7 +117,7 @@ class TitleBar extends React.Component<Props, {}> {
           value={topicFilter}
           onChange={this.onFilterChange}
           placeholder="Search…"
-          endAdornment={<div style={{ width: '24px', paddingRight: '8px' }}><ClearAdornment action={this.clearFilter} value={topicFilter} /></div>}
+          endAdornment={<div style={{ width: '24px', paddingRight: '8px' }}><ClearAdornment variant="primary" action={this.clearFilter} value={topicFilter} /></div>}
           classes={{ root: classes.inputRoot, input: classes.inputInput }}
         />
       </div>
@@ -132,11 +131,32 @@ class TitleBar extends React.Component<Props, {}> {
   private onFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     this.props.actions.settings.filterTopics(event.target.value)
   }
+
+  public render() {
+    const { actions, classes } = this.props
+
+    return (
+      <AppBar position="static">
+        <Toolbar>
+          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={actions.global.toggleSettingsVisibility}>
+            <Menu />
+          </IconButton>
+          <Typography className={classes.title} variant="h6" color="inherit">MQTT Explorer</Typography>
+          {this.renderSearch()}
+          <PauseButton />
+          <Button className={classes.disconnect} onClick={actions.connection.disconnect}>
+            Disconnect <CloudOff className={classes.disconnectIcon} />
+          </Button>
+          <ConnectionHealthIndicator withBackground={true} />
+        </Toolbar>
+      </AppBar>
+    )
+  }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
-    topicFilter: state.settings.topicFilter,
+    topicFilter: state.settings.get('topicFilter'),
   }
 }
 
@@ -144,6 +164,7 @@ const mapDispatchToProps = (dispatch: any) => {
   return {
     actions: {
       settings: bindActionCreators(settingsActions, dispatch),
+      global: bindActionCreators(globalActions, dispatch),
       connection: bindActionCreators(connectionActions, dispatch),
     },
   }

app/src/components/SettingsDrawer/BooleanSwitch.tsx

@@ -0,0 +1,54 @@
+import * as React from 'react'
+import {
+  InputLabel,
+  Switch,
+  Theme,
+  Tooltip
+  } from '@material-ui/core'
+import { withStyles } from '@material-ui/styles'
+const sha1 = require('sha1')
+
+function BooleanSwitch(props: {title: string, value: boolean, tooltip: string, action: () => void, classes: any}) {
+  const { tooltip, value, action, title, classes } = 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}
+          className={classes.label}
+        >
+          {title}
+        </InputLabel>
+      </Tooltip>
+      <Tooltip title={tooltip}>
+        <Switch
+          name={`toggle-${sha1(title)}`}
+          checked={value}
+          onChange={action}
+          color="primary"
+          classes={{ switchBase: classes.switchBase }}
+        />
+      </Tooltip>
+    </div>
+  )
+}
+
+const styles = (theme: Theme) => ({
+  switchBase: {
+    height: theme.spacing(4),
+  },
+  label: {
+    flex: '1',
+    paddingTop: '8px',
+  },
+})
+
+export default withStyles(styles)(BooleanSwitch)

app/src/components/SettingsDrawer/BrokerStatistics.tsx

@@ -1,12 +1,13 @@
+import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
-import * as q from '../../../backend/src/Model'
-
-import { AppState } from '../reducers'
-import { Typography } from '@material-ui/core'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-
+import { AppState } from '../../reducers'
 import { connect } from 'react-redux'
-import { TopicViewModel } from '../TopicViewModel'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { TopicViewModel } from '../../model/TopicViewModel'
+import { Typography } from '@material-ui/core'
+import { Base64Message } from '../../../../backend/src/Model/Base64Message'
+import teal from '@material-ui/core/colors/teal'
+
 const abbreviate = require('number-abbreviate')
 
 interface Stats {
@@ -22,7 +23,7 @@ const styles: StyleRulesCallback = theme => ({
   container: {
     width: '100%',
     height: '224px',
-    backgroundColor: 'rebeccapurple',
+    backgroundColor: theme.palette.type === 'dark' ? 'rebeccapurple' : '#ebebeb',
     marginBottom: 0,
     padding: '8px',
   },
@@ -39,6 +40,15 @@ class BrokerStatistics extends React.Component<Props, {}> {
     this.state = {}
   }
 
+  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 render() {
     const { tree, classes } = this.props
     if (!tree || !tree.findNode('$SYS/broker/clients/total')) {
@@ -95,23 +105,15 @@ class BrokerStatistics extends React.Component<Props, {}> {
     )
   }
 
-  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) {
+    if (!node || !node.message) {
       return null
     }
 
-    let value = node.message && node.message.value
-    value = !isNaN(value) ? abbreviate(value) : value
+    const str = node.message.value ? Base64Message.toUnicodeString(node.message.value) : ''
+    let value = (node.message && node.message.value) ? parseFloat(str) : NaN
+    value = !isNaN(value) ? abbreviate(value) : str
 
     return (
       <div key={stat.title}>

app/src/components/SettingsDrawer/Settings.tsx

@@ -1,13 +1,14 @@
 import * as React from 'react'
+import BooleanSwitch from './BooleanSwitch'
 import BrokerStatistics from './BrokerStatistics'
 import ChevronRight from '@material-ui/icons/ChevronRight'
-import { AppState } from '../reducers'
+import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { settingsActions } from '../actions'
+import { globalActions, settingsActions } from '../../actions'
 import { shell } from 'electron'
 import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import { TopicOrder } from '../reducers/Settings'
+import { TopicOrder } from '../../reducers/Settings'
 
 import {
   Divider,
@@ -18,10 +19,9 @@ import {
   MenuItem,
   Select,
   Typography,
-  Switch,
   Tooltip,
 } from '@material-ui/core'
-const sha1 = require('sha1')
+import TimeLocale from './TimeLocale';
 
 export const autoExpandLimitSet = [{
   limit: 0,
@@ -30,10 +30,13 @@ export const autoExpandLimitSet = [{
   limit: 2,
   name: 'Few',
 }, {
-  limit: 3,
+  limit: 5,
   name: 'Some',
 }, {
-  limit: 10,
+  limit: 15,
+  name: 'Most',
+}, {
+  limit: 30,
   name: 'Most',
 }, {
   limit: 1E6,
@@ -63,13 +66,13 @@ const styles: StyleRulesCallback = theme => ({
     color: theme.palette.text.hint,
     cursor: 'pointer' as 'pointer',
   },
-  switchBase: {
-    height: theme.spacing(4),
-  },
 })
 
 interface Props {
-  actions: typeof settingsActions
+  actions: {
+    settings: typeof settingsActions,
+    global: typeof globalActions,
+  }
   autoExpandLimit: number
   classes: any
   highlightTopicUpdates: boolean
@@ -77,6 +80,7 @@ interface Props {
   store?: any
   topicOrder: TopicOrder
   visible: boolean
+  theme: 'light' | 'dark'
 }
 
 class Settings extends React.Component<Props, {}> {
@@ -85,44 +89,6 @@ class Settings extends React.Component<Props, {}> {
     this.state = {}
   }
 
-  public render() {
-    const { classes, actions, visible } = this.props
-    return (
-      <Drawer
-        anchor="left"
-        className={classes.drawer}
-        open={visible}
-        variant="persistent"
-      >
-        <div
-          className={classes.paper}
-          tabIndex={0}
-          role="button"
-        >
-
-          <Typography className={classes.title} variant="h6" color="inherit">
-            <IconButton onClick={actions.toggleSettingsVisibility}>
-              <ChevronRight />
-            </IconButton>
-            Settings
-          </Typography>
-          <Divider />
-
-          {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')
   }
@@ -130,63 +96,36 @@ class Settings extends React.Component<Props, {}> {
   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>
-    )
+    return <BooleanSwitch title="Show Activity" tooltip="Topics blink when a new message arrives" value={highlightTopicUpdates} action={actions.settings.toggleHighlightTopicUpdates}/>
   }
 
   private selectTopicsOnMouseOver() {
     const { actions, selectTopicWithMouseOver } = this.props
-    const toggle = () => actions.selectTopicWithMouseOver(!selectTopicWithMouseOver)
+    const toggle = () => actions.settings.selectTopicWithMouseOver(!selectTopicWithMouseOver)
 
-    return this.renderSwitch('Quick Preview', selectTopicWithMouseOver, toggle, 'Select topics on mouse over')
+    return <BooleanSwitch title="Quick Preview" tooltip="Select topics on mouse over" value={selectTopicWithMouseOver} action={toggle} />
+  }
+
+  private toggleTheme() {
+    const { actions, theme } = this.props
+
+    return <BooleanSwitch title="Dark Mode" tooltip="Enable dark theme" value={theme === 'dark'} action={actions.settings.toggleTheme} />
   }
 
   private renderAutoExpand() {
     const { classes, autoExpandLimit } = this.props
 
-    const limits = autoExpandLimitSet.map(limit => <MenuItem key={limit.limit} value={limit.limit}>{limit.name}</MenuItem>)
+    const limits = autoExpandLimitSet.map(limit => <MenuItem key={limit.limit} value={limit.limit}>{limit.limit < 10000 && limit.limit > 0 ? `≤ ${limit.limit} topics` : limit.name}</MenuItem>)
     return (
       <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' }}
+          value={autoExpandLimit}
+          onChange={this.onChangeAutoExpand}
+          input={<Input name="auto-expand" id="auto-expand-label-placeholder" />}
+          name="auto-expand"
+          className={classes.input}
+          style={{ flex: '1' }}
         >
           {limits}
         </Select>
@@ -195,7 +134,7 @@ class Settings extends React.Component<Props, {}> {
   }
 
   private onChangeAutoExpand = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setAutoExpandLimit(parseInt(e.target.value, 10))
+    this.props.actions.settings.setAutoExpandLimit(parseInt(e.target.value, 10))
   }
 
   private renderNodeOrder() {
@@ -222,23 +161,67 @@ class Settings extends React.Component<Props, {}> {
   }
 
   private onChangeSorting = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    this.props.actions.setTopicOrder(e.target.value as TopicOrder)
+    this.props.actions.settings.setTopicOrder(e.target.value as TopicOrder)
+  }
+
+  public render() {
+    const { classes, actions, visible } = this.props
+    return (
+      <Drawer
+        anchor="left"
+        className={classes.drawer}
+        open={visible}
+        variant="persistent"
+      >
+        <div
+          className={classes.paper}
+          tabIndex={0}
+          role="button"
+        >
+          <Typography className={classes.title} variant="h6" color="inherit">
+            <IconButton onClick={actions.global.toggleSettingsVisibility}>
+              <ChevronRight />
+            </IconButton>
+            Settings
+          </Typography>
+          <Divider style={{ userSelect: 'none' }} />
+        </div>
+        <div>
+          {this.renderAutoExpand()}
+          {this.renderNodeOrder()}
+          <TimeLocale />
+          {this.renderHighlightTopicUpdates()}
+          {this.selectTopicsOnMouseOver()}
+          {this.toggleTheme()}
+        </div>
+        <Tooltip placement="top" title="App Author">
+          <Typography className={classes.author} onClick={this.openGithubPage}>
+            by Thomas Nordquist
+          </Typography>
+        </Tooltip>
+        <BrokerStatistics />
+      </Drawer>
+    )
   }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
-    autoExpandLimit: state.settings.autoExpandLimit,
-    topicOrder: state.settings.topicOrder,
-    visible: state.settings.visible,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
-    selectTopicWithMouseOver: state.settings.selectTopicWithMouseOver,
+    autoExpandLimit: state.settings.get('autoExpandLimit'),
+    topicOrder: state.settings.get('topicOrder'),
+    visible: state.globalState.get('settingsVisible'),
+    highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
+    selectTopicWithMouseOver: state.settings.get('selectTopicWithMouseOver'),
+    theme: state.settings.get('theme'),
   }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(settingsActions, dispatch),
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+      global: bindActionCreators(globalActions, dispatch),
+    },
   }
 }
 

app/src/components/SettingsDrawer/TimeLocale.tsx

@@ -0,0 +1,79 @@
+import * as React from 'react'
+import DateFormatter from '../helper/DateFormatter'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import {
+  Input,
+  InputLabel,
+  MenuItem,
+  Select,
+  StyleRulesCallback
+  } from '@material-ui/core'
+import { settingsActions } from '../../actions'
+import { withStyles } from '@material-ui/styles'
+const moment = require('moment/min/moment-with-locales')
+
+interface Props {
+  actions: {
+    settings: typeof settingsActions
+  },
+  timeLocale: string
+  classes: any
+}
+
+function TimeLocaleSettings(props: Props) {
+  const { classes, timeLocale, actions } = props
+  const locales = moment.locales()
+  const date = new Date()
+  const localeMenuItems = locales.map((l: string) => (
+    <MenuItem key={l} value={l}>
+      <div>Locale: <b>{l}</b>, Format: <b><DateFormatter date={date} overrideLocale={l} /></b></div>
+    </MenuItem>
+  ))
+
+  return (
+    <div style={{ padding: '8px', display: 'flex' }}>
+      <InputLabel htmlFor="time-locale" style={{ flex: '1', marginTop: '8px' }}>Time Locale</InputLabel>
+      <Select
+          value={timeLocale}
+          onChange={e => actions.settings.setTimeLocale(e.target.value)}
+          input={<Input name="time-locale" id="time-locale-label-placeholder" />}
+          name="time-locale"
+          className={classes.input}
+          renderValue={(v) => <span>{v}</span>}
+          style={{ flex: '1' }}
+      >
+        {localeMenuItems}
+      </Select>
+    </div>
+  )
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    timeLocale: state.settings.get('timeLocale'),
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      settings: bindActionCreators(settingsActions, dispatch),
+    },
+  }
+}
+
+const styles: StyleRulesCallback = theme => ({
+  input: {
+    minWidth: '150px',
+    margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
+  },
+  selected: {
+    '& div': {
+      display: 'none'
+    }
+  }
+})
+
+export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(TimeLocaleSettings))

app/src/components/Sidebar/CodeBlockColors.ts

@@ -0,0 +1,19 @@
+export enum CodeBlockColors {
+  text = '#080808',
+  background = '#F9F9F9',
+  numeric = '#811F24',
+  boolean = '#811F24',
+  string = '#0B6125',
+  variable = '#234A97',
+  gutters = '#ebebeb',
+}
+
+export enum CodeBlockColorsBraceMonokai {
+  text = '#F8F8F2',
+  background = '#272822',
+  numeric = '#AE81FF',
+  boolean = '#AE81FF',
+  string = '#E6DB74',
+  variable = '#A6E22E',
+  gutters = '#2F3129',
+}

app/src/components/Sidebar/CodeDiff.tsx

@@ -0,0 +1,199 @@
+import * as diff from 'diff'
+import * as Prism from 'prismjs'
+import * as React from 'react'
+import { CodeBlockColors, CodeBlockColorsBraceMonokai } from './CodeBlockColors'
+import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
+import { Theme, withStyles } from '@material-ui/core'
+import 'prismjs/components/prism-json'
+
+interface Props {
+  previous: string
+  current: string
+  nameOfCompareMessage: string
+  language?: 'json'
+  classes: any
+}
+
+class CodeDiff extends React.Component<Props, {}> {
+  private handleCtrlA = selectTextWithCtrlA({ targetSelector: 'pre ~ pre' })
+
+  constructor(props: Props) {
+    super(props)
+  }
+
+  private renderChangeAmount(changes: Array<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
+  }
+
+  public render() {
+    const changes = diff.diffLines(this.props.previous, this.props.current)
+    const styledLines = Prism.highlight(this.props.current, Prism.languages.json, '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((html: string, idx: number) => {
+          return <div key={`${key}-${idx}`} className={`${this.props.classes.line} ${this.cssClassForChange(change)}`}><span dangerouslySetInnerHTML={{ __html: html }} /></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} ${this.cssClassForChange(change)}`}><span>{line}</span></div>
+        })
+    })
+
+    const gutters = changes.map((change, key) => {
+      return this.trimNewlineRight(change.value)
+        .split('\n')
+        .map((_, idx) => (
+          <div key={`${key}-${idx}`} className={`${this.cssClassForChange(change)} ${this.props.classes.gutterLine}`}>
+            {change.added ? '+' : null}{change.removed ? '-' : null}{!change.added && !change.removed ? ' ' : null}
+          </div>
+        ))
+    })
+
+    return (
+      <div>
+        <div tabIndex={0} onKeyDown={this.handleCtrlA} className={this.props.classes.codeWrapper}>
+          <pre className={this.props.classes.gutters}>{gutters}</pre>
+          <pre className={this.props.classes.codeBlock}>{code}</pre>
+        </div>
+        {this.renderChangeAmount(changes)}
+      </div>
+    )
+  }
+}
+
+const style = (theme: Theme) => {
+  const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
+  const gutterBaseStyle = {
+    width: '100%',
+  }
+
+  const codeBaseStyle = {
+    font: "12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace",
+    display: 'inline-grid' as 'inline-grid',
+    margin: '0',
+    padding: '1px 0 2px 0',
+  }
+
+  return {
+    additions: {
+      color: 'rgb(10, 255, 10)',
+    },
+    deletions: {
+      color: 'rgb(255, 10, 10)',
+    },
+    line: {
+      lineHeight: 'normal' as 'normal',
+      paddingLeft: '4px',
+    },
+    gutterLine: {
+      textAlign: 'right' as 'right',
+      paddingRight: theme.spacing(0.5),
+    },
+    codeWrapper: {
+      maxHeight: '15em',
+      overflow: 'auto',
+      backgroundColor: `${codeBlockColors.background}`,
+      margin: '8px 0 0 0',
+    },
+    gutters: {
+      ...codeBaseStyle,
+      width: '33px',
+      backgroundColor: codeBlockColors.gutters,
+      userSelect: 'none' as 'none',
+    },
+    codeBlock: {
+      ...codeBaseStyle,
+      width: 'calc(100% - 33px)',
+      backgroundColor: 'inherit !important',
+      '& span': {
+        color: codeBlockColors.text,
+      },
+      '& .token.number': {
+        color: codeBlockColors.numeric,
+      },
+      '& .token.boolean': {
+        color: codeBlockColors.numeric,
+      },
+      '& .token.property': {
+        color: codeBlockColors.variable,
+      },
+      '& .token.string': {
+        color: codeBlockColors.string,
+      },
+      '& .token': {
+        color: codeBlockColors.text,
+      },
+      '& .token.operator': {
+        color: codeBlockColors.text,
+      },
+      '& .token.punctuation': {
+        color: codeBlockColors.text,
+      },
+    },
+    noChange: {
+      ...gutterBaseStyle,
+    },
+    deletion: {
+      ...gutterBaseStyle,
+      backgroundColor: 'rgba(255, 10, 10, 0.3)',
+      // '&:hover': {
+      //   backgroundColor: 'rgba(255, 10, 10, 0.3)',
+      // },
+    },
+    addition: {
+      ...gutterBaseStyle,
+      backgroundColor: 'rgba(10, 255, 10, 0.3)',
+      // '&:hover': {
+      //   backgroundColor: 'rgba(10, 255, 10, 0.5)',
+      // },
+    },
+  }
+}
+
+export default withStyles(style)(CodeDiff)

app/src/components/Sidebar/HistoryDrawer.tsx

@@ -1,26 +1,28 @@
 import * as React from 'react'
-
 import { Badge, Typography } from '@material-ui/core'
+import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
 import { Theme, withStyles } from '@material-ui/core/styles'
 
 interface HistoryItem {
+  key: string
   title: JSX.Element | string
-  value: string | any
+  value: string
   selected?: boolean
 }
 
 interface Props {
-  items: HistoryItem[]
+  items: Array<HistoryItem>
   onClick?: (index: number, element: EventTarget) => void
   classes: any
   contentTypeIndicator?: JSX.Element
+  theme: Theme
 }
 
 interface State {
   collapsed: boolean
 }
 
-class MessageHistory extends React.Component<Props, State> {
+class HistoryDrawer extends React.Component<Props, State> {
   constructor(props: any) {
     super(props)
     this.state = {
@@ -28,9 +30,15 @@ class MessageHistory extends React.Component<Props, State> {
     }
   }
 
+  private toggle = () => {
+    this.setState({ collapsed: !this.state.collapsed })
+  }
+
+  private handleCtrlA = selectTextWithCtrlA({targetSelector: 'pre'})
+
   public renderHistory() {
     const style = (element: HistoryItem) => ({
-      backgroundColor: element.selected ? 'rgba(120, 120, 120, 0.6)' : 'rgba(80, 80, 80, 0.6)',
+      backgroundColor: element.selected ? this.props.theme.palette.action.selected : this.props.theme.palette.action.hover,
       margin: '8px',
       padding: '8px 8px 0 8px',
       cursor: this.props.onClick ? 'pointer' : 'inherit',
@@ -39,9 +47,10 @@ class MessageHistory extends React.Component<Props, State> {
     const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
     const elements = this.props.items.map((element, index) => (
       <div
-        key={index}
+        key={element.key}
         style={style(element)}
         onClick={(event: React.MouseEvent) => this.props.onClick && this.props.onClick(index, event.target)}
+        tabIndex={0} onKeyDown={this.handleCtrlA}
       >
         <div><i>{element.title}</i></div>
         <div style={messageStyle}>
@@ -53,7 +62,7 @@ class MessageHistory extends React.Component<Props, State> {
     const visible = this.props.items.length > 0 && this.state.collapsed
 
     return (
-      <div style={{ backgroundColor: 'rgba(60, 60, 60, 0.6)', marginTop: '16px' }}>
+      <div className={this.props.classes.main}>
         <Typography
           component={'span'}
           onClick={this.toggle}
@@ -86,14 +95,14 @@ class MessageHistory extends React.Component<Props, State> {
       </div>
     )
   }
-
-  private toggle = () => {
-    this.setState({ collapsed: !this.state.collapsed })
-  }
 }
 
 const styles = (theme: Theme) => ({
-  badge: { right:'-25px' },
+  main: {
+    backgroundColor: 'rgba(170, 170, 170, 0.2)',
+    marginTop: '16px',
+  },
+  badge: { right: '-25px' },
 })
 
-export default withStyles(styles)(MessageHistory)
+export default withStyles(styles, { withTheme: true })(HistoryDrawer)

app/src/components/Sidebar/NodeStats.tsx

@@ -1,8 +1,7 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
+import * as React from 'react'
+import { TopicViewModel } from '../../model/TopicViewModel'
 import { Typography } from '@material-ui/core'
-import { TopicViewModel } from '../../TopicViewModel'
 
 interface Props {
   node: q.TreeNode<TopicViewModel>

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

@@ -1,11 +1,22 @@
-import 'react-ace'
-import 'brace/mode/json'
-import 'brace/mode/text'
-import 'brace/mode/xml'
-import 'brace/theme/monokai'
-
-import * as React from 'react'
 import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import ClearAdornment from '../../helper/ClearAdornment'
+import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
+import History from '../HistoryDrawer'
+import Message from './Model/Message'
+import Navigation from '@material-ui/icons/Navigation'
+import { AppState } from '../../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { default as AceEditor } from 'react-ace'
+import { globalActions, publishActions } from '../../../actions'
+import { TopicViewModel } from '../../../model/TopicViewModel'
+import 'brace/mode/json'
+import 'brace/theme/dawn'
+import 'brace/theme/monokai'
+import 'brace/mode/xml'
+import 'brace/mode/text'
+import 'react-ace'
 
 import {
   Button,
@@ -20,38 +31,34 @@ import {
   MenuItem,
   Tooltip,
   Fab,
+  Theme,
+  withTheme,
 } from '@material-ui/core'
 
-// 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 { publishActions } from '../../../actions'
-import ClearAdornment from '../../helper/ClearAdornment'
-import { TopicViewModel } from '../../../TopicViewModel'
-import CustomIconButton from '../../CustomIconButton';
+const sha1 = require('sha1')
 
 interface Props {
-  node?: q.TreeNode<TopicViewModel>
   connectionId?: string
   topic?: string
   payload?: string
   actions: typeof publishActions
+  globalActions: typeof globalActions
   retain: boolean
   editorMode: string
   qos: 0 | 1 | 2
+  theme: Theme
 }
 
 interface State {
-  history: Message[]
+  history: Array<Message>
 }
 
 class Publish extends React.Component<Props, State> {
+
+  private editorOptions = {
+    showLineNumbers: false,
+    tabSize: 2,
+  }
   constructor(props: any) {
     super(props)
     this.state = { history: [] }
@@ -84,24 +91,14 @@ class Publish extends React.Component<Props, State> {
     }
   }
 
-  private addMessageToHistory(topic: string, payload?: string) {
+  private addMessageToHistory(topic: string, payload?: string) {
     // Remove duplicates
     let filteredHistory = this.state.history.filter(e => e.payload !== payload || e.topic !== topic)
     filteredHistory = filteredHistory.slice(-7)
-    const history: Message[] = [...filteredHistory, { topic, payload, sent: new Date() }]
+    const history: Array<Message> = [...filteredHistory, { topic, payload, sent: new Date() }]
     this.setState({ history })
   }
 
-  public render() {
-    return (
-      <div style={{ flexGrow: 1, marginLeft: '8px' }}>
-        {this.topic()}
-        {this.editor()}
-        {this.history()}
-      </div>
-    )
-  }
-
   private clearTopic = () => {
     this.props.actions.setTopic('')
   }
@@ -134,11 +131,6 @@ class Publish extends React.Component<Props, State> {
     }
   }
 
-  private editorOptions = {
-    showLineNumbers: false,
-    tabSize: 2,
-  }
-
   private publishButton() {
     return (
       <Button
@@ -158,7 +150,9 @@ class Publish extends React.Component<Props, State> {
       try {
         const str = JSON.stringify(JSON.parse(this.props.payload), undefined, '  ')
         this.updatePayload(str)
-      } catch { }
+      } catch (error) {
+        this.props.globalActions.showError(`Format error: ${error.message}`)
+      }
     }
   }
 
@@ -226,7 +220,7 @@ class Publish extends React.Component<Props, State> {
 
   private onChangeQoS = (event: React.ChangeEvent<HTMLInputElement>) => {
     const value = parseInt(event.target.value, 10)
-    if (value !== 0 && value !== 1 && value !== 2) {
+    if (value !== 0 && value !== 1 && value !== 2) {
       return
     }
 
@@ -281,10 +275,10 @@ class Publish extends React.Component<Props, State> {
 
   private history() {
     const items = this.state.history.reverse().map(message => ({
+      key: sha1(message.topic + message.payload),
       title: message.topic,
-      value: message.payload,
+      value: message.payload || '',
     }))
-
     return <History items={items} onClick={this.didSelectHistoryEntry} />
   }
 
@@ -308,7 +302,7 @@ class Publish extends React.Component<Props, State> {
     return (
       <AceEditor
         mode={this.props.editorMode}
-        theme="monokai"
+        theme={this.props.theme.palette.type === 'dark' ? 'monokai' : 'dawn'}
         name="UNIQUE_ID_OF_DIV"
         width="100%"
         height="200px"
@@ -320,11 +314,22 @@ class Publish extends React.Component<Props, State> {
       />
     )
   }
+
+  public render() {
+    return (
+      <div style={{ flexGrow: 1, marginLeft: '8px' }}>
+        {this.topic()}
+        {this.editor()}
+        {this.history()}
+      </div>
+    )
+  }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
     actions: bindActionCreators(publishActions, dispatch),
+    globalActions: bindActionCreators(globalActions, dispatch),
   }
 }
 
@@ -338,4 +343,4 @@ const mapStateToProps = (state: AppState) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Publish)
+export default connect(mapStateToProps, mapDispatchToProps)(withTheme(Publish))

app/src/components/Sidebar/Sidebar.tsx

@@ -1,80 +1,54 @@
 import * as q from '../../../../backend/src/Model'
 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 Copy from '../helper/Copy'
+import CustomIconButton from '../helper/CustomIconButton'
 import Delete from '@material-ui/icons/Delete'
 import ExpandMore from '@material-ui/icons/ExpandMore'
-import MessageHistory from './MessageHistory'
 import NodeStats from './NodeStats'
-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 ValuePanel from './ValueRenderer/ValuePanel'
 import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { settingsActions, sidebarActons } from '../../actions'
+import { settingsActions, sidebarActions } from '../../actions'
 import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-import { TopicViewModel } from '../../TopicViewModel'
-import { ValueRendererDisplayMode } from '../../reducers/Settings'
+import { TopicViewModel } from '../../model/TopicViewModel'
 
 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<TopicViewModel>
-  actions: typeof sidebarActons
+  actions: typeof sidebarActions
   settingsActions: typeof settingsActions
-  valueRendererDisplayMode: ValueRendererDisplayMode
   classes: any
   connectionId?: string
 }
 
 interface State {
-  node: q.TreeNode<TopicViewModel>
   compareMessage?: q.Message
   valueRenderWidth: number
 }
 
 class Sidebar extends React.Component<Props, State> {
-  private valueRef: any = React.createRef<HTMLDivElement>()
   private updateNode = throttle(() => {
     this.setState(this.state)
   }, 300)
 
+  private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }
+
   constructor(props: any) {
     super(props)
-    console.error('Find and fix me #state')
-    this.state = { node: new q.Tree(), valueRenderWidth: 300 }
-  }
-
-  public componentWillReceiveProps(nextProps: Props) {
-    this.props.node && this.removeUpdateListener(this.props.node)
-    nextProps.node && this.registerUpdateListener(nextProps.node)
-    this.props.node && this.setState({ node: this.props.node })
-
-    if (this.props.node !== nextProps.node) {
-      this.setState({ compareMessage: undefined })
-    }
-  }
-
-  public componentWillUnmount() {
-    this.props.node && this.removeUpdateListener(this.props.node)
+    this.state = { valueRenderWidth: 300 }
   }
 
   private registerUpdateListener(node: q.TreeNode<TopicViewModel>) {
@@ -87,26 +61,14 @@ class Sidebar extends React.Component<Props, State> {
     node.onMessage.unsubscribe(this.updateNode)
   }
 
-  public render() {
-    return (
-      <div className={this.props.classes.drawer}>
-        {this.renderNode()}
-      </div>
-    )
-  }
-
-  private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }
-
   private renderTopicDeleteButton() {
-    if (!this.props.node || (!this.props.node.message || !this.props.node.message.value)) {
+    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 onClick={() => this.deleteTopic(this.props.node)} tooltip="Clear this topic">
+        <Delete style={{ marginTop: '-3px' }} />
       </CustomIconButton>
     )
   }
@@ -119,17 +81,15 @@ class Sidebar extends React.Component<Props, State> {
     }
 
     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>
+      <Badge
+        classes={{ badge: this.props.classes.badge }}
+        badgeContent={<span style={{ whiteSpace: 'nowrap' }}>{topicCount >= deleteLimit ? '50+' : topicCount}</span>}
+        color="secondary"
+      >
+        <CustomIconButton onClick={() => this.deleteTopic(this.props.node, true, deleteLimit)} tooltip={`Deletes up to ${deleteLimit} sub-topics with a single click`}>
+          <Delete style={{ marginTop: '-3px' }} color="action" />
+        </CustomIconButton>
+      </Badge>
     )
   }
 
@@ -141,34 +101,12 @@ class Sidebar extends React.Component<Props, State> {
     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 summaryStyle = { minHeight: '0' }
     return (
       <div>
@@ -180,27 +118,14 @@ class Sidebar extends React.Component<Props, State> {
             <Topic node={this.props.node} didSelectNode={this.updateNode} />
           </ExpansionPanelDetails>
         </ExpansionPanel>
-        <ExpansionPanel key="value" defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
-            <Typography className={classes.heading}>Value {copyValue}</Typography>
-          </ExpansionPanelSummary>
-          <ExpansionPanelDetails style={this.detailsStyle}>
-            {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>
+        <ValuePanel lastUpdate={this.props.node ? this.props.node.lastUpdate : 0} />
         <ExpansionPanel defaultExpanded={true}>
           <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
             <Typography className={classes.heading}>Publish</Typography>
           </ExpansionPanelSummary>
           <ExpansionPanelDetails style={this.detailsStyle}>
             <React.Suspense fallback={<div>Loading...</div>}>
-              <Publish node={this.props.node} connectionId={this.props.connectionId} />
+              <Publish connectionId={this.props.connectionId} />
             </React.Suspense>
           </ExpansionPanelDetails>
         </ExpansionPanel>
@@ -214,59 +139,6 @@ 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 })
-    } else {
-      this.setState({ compareMessage: undefined })
-    }
-  }
-
   private renderNodeStats() {
     if (!this.props.node) {
       return null
@@ -278,18 +150,38 @@ class Sidebar extends React.Component<Props, State> {
       </ExpansionPanelDetails>
     )
   }
+
+  public componentWillReceiveProps(nextProps: Props) {
+    this.props.node && this.removeUpdateListener(this.props.node)
+    nextProps.node && this.registerUpdateListener(nextProps.node)
+
+    if (this.props.node !== nextProps.node) {
+      this.setState({ compareMessage: undefined })
+    }
+  }
+
+  public componentWillUnmount() {
+    this.props.node && this.removeUpdateListener(this.props.node)
+  }
+
+  public render() {
+    return (
+      <div id="Sidebar" className={this.props.classes.drawer}>
+        {this.renderNode()}
+      </div>
+    )
+  }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
-    node: state.tree.selectedTopic,
-    valueRendererDisplayMode: state.settings.valueRendererDisplayMode,
+    node: state.tree.get('selectedTopic'),
   }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(sidebarActons, dispatch),
+    actions: bindActionCreators(sidebarActions, dispatch),
     settingsActions: bindActionCreators(settingsActions, dispatch),
   }
 }
@@ -300,6 +192,10 @@ const styles: StyleRulesCallback<string> = (theme: Theme) => {
       display: 'block',
       height: '100%',
     },
+    badge: {
+      top: '3px',
+      right: '3px',
+    },
     valuePaper: {
       margin: theme.spacing(1),
     },

app/src/components/Sidebar/Topic.tsx

@@ -5,7 +5,7 @@ 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'
+import { TopicViewModel } from '../../model/TopicViewModel'
 
 interface Props {
   classes: any
@@ -26,7 +26,7 @@ const styles: StyleRulesCallback<string> = (theme: Theme) => ({
 
 class Topic extends React.Component<Props, {}> {
   public render() {
-    const { node } = this.props
+    const { node, theme } = this.props
     if (!node) {
       return null
     }
@@ -40,13 +40,14 @@ class Topic extends React.Component<Props, {}> {
           <Button
             onClick={() => this.props.actions.selectTopic(edge!.target)}
             size="small"
-            color="secondary"
+            variant={theme.palette.type === 'light' ? 'contained' : undefined}
+            color={theme.palette.type === 'light' ? 'primary' : 'secondary'}
             className={this.props.classes.button}
             key={edge!.hash()}
           >
             {edge!.name}
           </Button>
-        )],
+        )]
       )
 
     if (breadCrumps.length === 0) {
@@ -54,7 +55,7 @@ class Topic extends React.Component<Props, {}> {
     }
 
     const joinedBreadCrumps = breadCrumps.reduce((prev, current) =>
-      prev.concat([<span key={key += 1}>/</span>]).concat(current),
+      prev.concat([<span key={key += 1}> / </span>]).concat(current)
     )
 
     return <span style={{ lineHeight: '2.2em' }}>{joinedBreadCrumps}</span>

app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx

@@ -1,10 +1,12 @@
+import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import * as q from '../../../../backend/src/Model'
-
 import BarChart from '@material-ui/icons/BarChart'
-import DateFormatter from '../helper/DateFormatter'
-import History from './History'
-import { TopicViewModel } from '../../TopicViewModel'
+import Copy from '../../helper/Copy'
+import DateFormatter from '../../helper/DateFormatter'
+import History from '../HistoryDrawer'
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
+import { TopicViewModel } from '../../../model/TopicViewModel'
+
 const PlotHistory = React.lazy(() => import('./PlotHistory'))
 
 const throttle = require('lodash.throttle')
@@ -21,15 +23,22 @@ interface State {
 }
 
 class MessageHistory extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-    this.state = { }
-  }
-
   private updateNode = throttle(() => {
     this.setState(this.state)
   }, 300)
 
+  constructor(props: any) {
+    super(props)
+    this.state = {}
+  }
+
+  private displayMessage = (index: number, eventTarget: EventTarget) => {
+    const message = this.props.node && this.props.node.messageHistory.toArray().reverse()[index]
+    if (message) {
+      this.props.onSelect(message)
+    }
+  }
+
   public componentWillReceiveProps(nextProps: Props) {
     this.props.node && this.props.node.onMessage.unsubscribe(this.updateNode)
     nextProps.node && nextProps.node.onMessage.subscribe(this.updateNode)
@@ -50,13 +59,28 @@ class MessageHistory extends React.Component<Props, State> {
     }
 
     const history = node.messageHistory.toArray()
-    const historyElements = history.reverse().map(message => ({
-      title: <DateFormatter date={message.received} />,
-      value: message.value,
-      selected: message && message === this.props.selected,
-    }))
+    let previousMessage: q.Message | undefined = node.message
+    const historyElements = history.reverse().map((message, idx) => {
+      const value = message.value ? Base64Message.toUnicodeString(message.value) : ''
+      const element = {
+        value,
+        key: `${message.messageNumber}-${message.received}`,
+        title: (<span>
+          <DateFormatter date={message.received} />
+          {previousMessage ? <i>(-<DateFormatter date={message.received} intervalSince={previousMessage.received} />)</i> : null}
+          <div style={{ float: 'right' }}><Copy value={value} /></div>
+        </span>),
+        selected: message && message === this.props.selected,
+      }
+      previousMessage = message
+      return element
+    })
 
-    const numericMessages = history.filter(message => !isNaN(parseFloat(message.value)))
+    const numericMessages = history
+      .map((message: q.Message) => {
+        const value = message.value ? parseFloat(Base64Message.toUnicodeString(message.value)) : NaN
+        return { x: message.received.getTime(), y: value  }
+      }).filter(data => !isNaN(data.y))
     const showPlot = numericMessages.length >= 2
 
     return (
@@ -72,20 +96,13 @@ class MessageHistory extends React.Component<Props, State> {
     )
   }
 
-  public renderPlot(numericMessages: q.Message[]) {
+  public renderPlot(data: Array<{x: number, y: number}>) {
     return (
       <React.Suspense fallback={<div>Loading...</div>}>
-        <PlotHistory messages={numericMessages} />
+        <PlotHistory data={data} />
       </React.Suspense>
     )
   }
-
-  private displayMessage = (index: number, eventTarget: EventTarget) => {
-    const message = this.props.node && this.props.node.messageHistory.toArray().reverse()[index]
-    if (message) {
-      this.props.onSelect(message)
-    }
-  }
 }
 
 export default MessageHistory

app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx

@@ -1,13 +1,14 @@
-const { XYPlot, XAxis, LineMarkSeries, Hint, YAxis, HorizontalGridLines, LineSeries } = require('react-vis')
-import { default as ReactResizeDetector } from 'react-resize-detector'
-
-import DateFormatter from '../helper/DateFormatter'
+import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
-import * as q from '../../../../backend/src/Model'
+import DateFormatter from '../../helper/DateFormatter'
+import { default as ReactResizeDetector } from 'react-resize-detector'
 import 'react-vis/dist/style.css'
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
+const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('react-vis')
+const abbreviate = require('number-abbreviate')
 
 interface Props {
-  messages: q.Message[]
+  data: Array<{x: number, y: number}>
 }
 
 interface Stats {
@@ -25,33 +26,6 @@ class PlotHistory extends React.Component<Props, Stats> {
     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)} /> },
@@ -68,6 +42,31 @@ class PlotHistory extends React.Component<Props, Stats> {
   private _rememberValue = (value: any) => {
     this.setState({ value })
   }
+
+  public render() {
+    const data = this.props.data
+
+    return (
+      <div>
+        <XYPlot width={this.state.width} height={150}>
+          <HorizontalGridLines />
+          <YAxis
+            width={45}
+            tickFormat={(num: number) => abbreviate(num)}
+          />
+          <LineMarkSeries
+            onValueMouseOver={this._rememberValue}
+            onValueMouseOut={this._forgetValue}
+            size={3}
+            data={data}
+            curve={data.length < 50 ? 'curveCardinal' : undefined}
+          />
+          {this.state.value ? <Hint format={this.hintFormatter} value={this.state.value} /> : null}
+        </XYPlot>
+        <ReactResizeDetector handleWidth={true} onResize={this.resize} />
+      </div>
+    )
+  }
 }
 
 export default PlotHistory

app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx

@@ -0,0 +1,202 @@
+import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import Clear from '@material-ui/icons/Clear'
+import Code from '@material-ui/icons/Code'
+import Copy from '../../helper/Copy'
+import DateFormatter from '../../helper/DateFormatter'
+import ExpandMore from '@material-ui/icons/ExpandMore'
+import MessageHistory from './MessageHistory'
+import Reorder from '@material-ui/icons/Reorder'
+import ToggleButton from '@material-ui/lab/ToggleButton'
+import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'
+import ValueRenderer from './ValueRenderer'
+import { AppState } from '../../../reducers'
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { settingsActions, sidebarActions } from '../../../actions'
+import { ValueRendererDisplayMode } from '../../../reducers/Settings'
+
+import {
+  Button,
+  ExpansionPanel,
+  ExpansionPanelDetails,
+  ExpansionPanelSummary,
+  Tooltip,
+  Typography,
+  StyleRulesCallback,
+  withStyles,
+  Theme,
+} from '@material-ui/core'
+
+interface Props {
+  node?: q.TreeNode<any>
+  valueRendererDisplayMode: ValueRendererDisplayMode
+  sidebarActions: typeof sidebarActions
+  settingsActions: typeof settingsActions
+  classes: any
+  lastUpdate: number
+  compareMessage?: q.Message
+}
+
+interface State {}
+
+class ValuePanel extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { }
+  }
+
+  private renderValue() {
+    const node = this.props.node
+    if (!node || !node.message) {
+      return null
+    }
+
+    return (
+      <ValueRenderer
+        message={node.message}
+        messageHistory={node.messageHistory}
+        compareWith={this.props.compareMessage}
+      />
+    )
+  }
+
+  private renderViewOptions() {
+    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: '11px', padding: '0px 4px', minHeight: '24px' }}
+          onClick={this.props.sidebarActions.clearRetainedTopic}
+        >
+          retained <Clear style={{ fontSize: '16px', marginLeft: '2px' }} />
+        </Button>
+      </Tooltip>
+    )
+
+    return (
+      <div style={{ width: '100%', display: 'flex', paddingLeft: '8px' }}>
+        <span style={{ marginTop: '2px', flexGrow: 1 }}>{this.renderActionButtons()}</span>
+        <div style={{ flex: 6, textAlign: 'right' }}>
+          {this.props.node.mqttMessage.retain ? retainedButton : null}
+        </div>
+        {this.messageMetaInfo()}
+      </div>
+    )
+  }
+
+  private messageMetaInfo() {
+    if (!this.props.node || !this.props.node.message || !this.props.node.mqttMessage) {
+      return null
+    }
+
+    return (
+      <span style={{ width: '100%', paddingLeft: '8px', flex: 6 }}>
+        <Typography style={{ textAlign: 'right' }}>QoS: {this.props.node.mqttMessage.qos}</Typography>
+        <Typography style={{ textAlign: 'right' }}><i><DateFormatter date={this.props.node.message.received} /></i></Typography>
+      </span>
+    )
+  }
+
+  private renderActionButtons() {
+    const handleValue = (mouseEvent: React.MouseEvent, value: any) => {
+      if (value === null) {
+        return
+      }
+      this.props.settingsActions.setValueDisplayMode(value)
+    }
+
+    return (
+      <ToggleButtonGroup id="valueRendererDisplayMode" value={this.props.valueRendererDisplayMode} exclusive={true} onChange={handleValue}>
+        <ToggleButton className={this.props.classes.toggleButton} value="diff" id="valueRendererDisplayMode-diff">
+          <Tooltip title="Show difference between the current and the last message">
+            <span><Code className={this.props.classes.toggleButtonIcon} /></span>
+          </Tooltip>
+        </ToggleButton>
+        <ToggleButton className={this.props.classes.toggleButton} value="raw" id="valueRendererDisplayMode-raw">
+          <Tooltip title="Raw value">
+            <span><Reorder className={this.props.classes.toggleButtonIcon} /></span>
+          </Tooltip>
+        </ToggleButton>
+      </ToggleButtonGroup>
+    )
+  }
+
+  private panelStyle() {
+    return {
+      detailsStyle: { padding: '0px 16px 8px 8px', display: 'block' },
+      summaryStyle: { minHeight: '0' },
+    }
+  }
+
+  private handleMessageHistorySelect = (message: q.Message) => {
+    if (message !== this.props.compareMessage) {
+      this.props.sidebarActions.setCompareMessage(message)
+    } else {
+      this.props.sidebarActions.setCompareMessage(undefined)
+    }
+  }
+
+  public render() {
+    const { node, classes } = this.props
+    const { detailsStyle, summaryStyle } = this.panelStyle()
+
+    const copyValue = (node && node.message && node.message.value) ? <Copy value={Base64Message.toUnicodeString(node.message.value)} /> : null
+
+    return (
+      <ExpansionPanel key="value" defaultExpanded={true}>
+        <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
+          <Typography className={classes.heading}>Value {copyValue}</Typography>
+        </ExpansionPanelSummary>
+        <ExpansionPanelDetails style={detailsStyle}>
+          {this.renderViewOptions()}
+          <div>
+            <React.Suspense fallback={<div>Loading...</div>}>
+              {this.renderValue()}
+            </React.Suspense>
+          </div>
+          <div><MessageHistory onSelect={this.handleMessageHistorySelect} selected={this.props.compareMessage} node={this.props.node} /></div>
+        </ExpansionPanelDetails>
+      </ExpansionPanel>
+    )
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    sidebarActions: bindActionCreators(sidebarActions, dispatch),
+    settingsActions: bindActionCreators(settingsActions, dispatch),
+  }
+}
+
+const mapStateToProps = (state: AppState) => {
+  return {
+    valueRendererDisplayMode: state.settings.get('valueRendererDisplayMode'),
+    node: state.tree.get('selectedTopic'),
+    compareMessage: state.sidebar.get('compareMessage'),
+  }
+}
+
+const styles: StyleRulesCallback<string> = (theme: Theme) => {
+  return {
+    heading: {
+      fontSize: theme.typography.pxToRem(15),
+      fontWeight: theme.typography.fontWeightRegular,
+    },
+    toggleButton: {
+      height: '36px',
+    },
+    toggleButtonIcon: {
+      verticalAlign: 'middle',
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ValuePanel))

app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx

@@ -1,10 +1,11 @@
-import * as q from '../../../../backend/src/Model'
+import * as q from '../../../../../backend/src/Model'
 import * as React from 'react'
 import CodeDiff from '../CodeDiff'
-import { AppState } from '../../reducers'
+import { AppState } from '../../../reducers'
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
 import { connect } from 'react-redux'
 import { default as ReactResizeDetector } from 'react-resize-detector'
-import { ValueRendererDisplayMode } from '../../reducers/Settings'
+import { ValueRendererDisplayMode } from '../../../reducers/Settings'
 
 interface Props {
   message: q.Message
@@ -23,64 +24,20 @@ class ValueRenderer extends React.Component<Props, State> {
     this.state = { width: 0 }
   }
 
-  public render() {
-    return (
-      <div style={{ padding: '8px 0px 8px 8px' }}>
-        <ReactResizeDetector handleWidth={true} onResize={this.updateWidth} />
-        {this.renderValue()}
-      </div>
-    )
-  }
-
-  public renderValue() {
-    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, compareMessage.value)
-    }
-
-    if (typeof json === 'string') {
-      return this.renderRawValue(message.value, compareMessage.value)
-    } else if (typeof json === 'number') {
-      return this.renderRawValue(message.value, compareMessage.value)
-    } else if (typeof json === 'boolean') {
-      return this.renderRawValue(message.value, compareMessage.value)
-    } else {
-      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 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
-    }
-
+  private messageToPrettyJson(str: string): string | undefined {
     try {
-      const json = JSON.parse(message.value)
+      const json = JSON.parse(str)
       return JSON.stringify(json, undefined, '  ')
     } catch {
       return undefined
@@ -96,11 +53,59 @@ class ValueRenderer extends React.Component<Props, State> {
   private renderRawValue(value: string, compare: string) {
     return this.renderDiff(value, compare)
   }
+
+  public render() {
+    return (
+      <div style={{ padding: '0px 0px 8px 8px' }}>
+        <ReactResizeDetector handleWidth={true} onResize={this.updateWidth} />
+        {this.renderValue()}
+      </div>
+    )
+  }
+
+  public renderValue() {
+    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
+    }
+    if (!message.value) {
+      return null
+    }
+
+    const compareValue = compareMessage.value || message.value
+    const str = Base64Message.toUnicodeString(message.value)
+    const compareStr = Base64Message.toUnicodeString(compareValue)
+
+    let json
+    try {
+      json = JSON.parse(str)
+    } catch (error) {
+      return this.renderRawValue(str, compareStr)
+    }
+
+    if (typeof json === 'string') {
+      return this.renderRawValue(str, compareStr)
+    } else if (typeof json === 'number') {
+      return this.renderRawValue(str, compareStr)
+    } else if (typeof json === 'boolean') {
+      return this.renderRawValue(str, compareStr)
+    } else {
+      const current = this.messageToPrettyJson(str) || str
+      const compare = this.messageToPrettyJson(compareStr) || compareStr
+      const language = current && compare ? 'json' : undefined
+
+      return this.renderDiff(current, compare, language)
+    }
+  }
 }
 
 const mapStateToProps = (state: AppState) => {
   return {
-    renderMode: state.settings.valueRendererDisplayMode,
+    renderMode: state.settings.get('valueRendererDisplayMode'),
   }
 }
 

app/src/components/Tree/Tree.tsx

@@ -4,8 +4,9 @@ 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 { Record } from 'immutable'
+import { SettingsState } from '../../reducers/Settings'
+import { TopicViewModel } from '../../model/TopicViewModel'
 import { treeActions } from '../../actions'
 
 const MovingAverage = require('moving-average')
@@ -21,17 +22,15 @@ interface Props {
   tree?: q.Tree<TopicViewModel>
   filter: string
   host?: string
-  topicOrder: TopicOrder
-  autoExpandLimit: number
-  highlightTopicUpdates: boolean
-  selectTopicWithMouseOver: boolean
+  paused: boolean
+  settings: Record<SettingsState>
 }
 
 interface State {
   lastUpdate: number
 }
 
-class Tree extends React.PureComponent<Props, State> {
+class TreeComponent extends React.PureComponent<Props, State> {
   private updateTimer?: any
   private perf: number = 0
   private renderTime = 0
@@ -41,6 +40,10 @@ class Tree extends React.PureComponent<Props, State> {
     this.state = { lastUpdate: 0 }
   }
 
+  private performanceCallback = (ms: number) => {
+    average.push(Date.now(), ms)
+  }
+
   public time(): number {
     const time = performance.now() - this.perf
     this.perf = performance.now()
@@ -78,7 +81,10 @@ class Tree extends React.PureComponent<Props, State> {
         this.updateTimer && clearTimeout(this.updateTimer)
         this.updateTimer = undefined
         this.renderTime = performance.now()
-        this.props.tree && this.props.tree.applyUnmergedChanges()
+
+        if (!this.props.paused) {
+          this.props.tree && this.props.tree.applyUnmergedChanges()
+        }
         window.requestIdleCallback(() => {
           this.setState({ lastUpdate: this.renderTime })
         }, { timeout: 100 })
@@ -101,37 +107,27 @@ class Tree extends React.PureComponent<Props, State> {
       <div style={style}>
         <TreeNode
           key={tree.hash()}
-          animateChages={true}
           isRoot={true}
           treeNode={tree}
           name={this.props.host}
           collapsed={false}
           performanceCallback={this.performanceCallback}
-          autoExpandLimit={this.props.autoExpandLimit}
-          topicOrder={this.props.topicOrder}
+          settings={this.props.settings}
           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,
+    tree: state.tree.get('tree'),
+    paused: state.tree.get('paused'),
+    filter: state.tree.get('filter'),
     host: state.connection.host,
-    autoExpandLimit: state.settings.autoExpandLimit,
-    topicOrder: state.settings.topicOrder,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
-    selectTopicWithMouseOver: state.settings.selectTopicWithMouseOver,
+    settings: state.settings,
   }
 }
 
@@ -141,4 +137,4 @@ const mapDispatchToProps = (dispatch: any) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Tree)
+export default connect(mapStateToProps, mapDispatchToProps)(TreeComponent)

app/src/components/Tree/TreeNode.tsx

@@ -2,9 +2,10 @@ import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
 import TreeNodeSubnodes from './TreeNodeSubnodes'
 import TreeNodeTitle from './TreeNodeTitle'
+import { Record } from 'immutable'
+import { SettingsState } from '../../reducers/Settings'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import { TopicOrder } from '../../reducers/Settings'
-import { TopicViewModel } from '../../TopicViewModel'
+import { TopicViewModel } from '../../model/TopicViewModel'
 
 const debounce = require('lodash.debounce')
 
@@ -32,16 +33,24 @@ const styles = (theme: Theme) => {
       marginLeft: theme.spacing(1.5),
     },
     selected: {
-      backgroundColor: 'rgba(170, 170, 170, 0.55)',
+      backgroundColor: theme.palette.type === 'dark' ? 'rgba(170, 170, 170, 0.55)' : 'rgba(170, 170, 170, 0.55)',
     },
     hover: {
-      backgroundColor: 'rgba(100, 100, 100, 0.55)',
+      backgroundColor: theme.palette.type === 'dark' ? 'rgba(100, 100, 100, 0.55)' : 'rgba(200, 200, 200, 0.55)',
+    },
+    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',
     },
   }
 }
 
 interface Props {
-  animateChages: boolean
   isRoot?: boolean
   treeNode: q.TreeNode<TopicViewModel>
   name?: string | undefined
@@ -49,12 +58,10 @@ interface Props {
   performanceCallback?: ((ms: number) => void) | undefined
   classes: any
   className?: string
-  topicOrder: TopicOrder
-  autoExpandLimit: number
   lastUpdate: number
   didSelectTopic: any
-  highlightTopicUpdates: boolean
-  selectTopicWithMouseOver: boolean
+  theme: Theme
+  settings: Record<SettingsState>
 }
 
 interface State {
@@ -63,10 +70,7 @@ interface State {
   selected: boolean
 }
 
-class TreeNode extends React.Component<Props, State> {
-  private dirtySubnodes: boolean = true
-  private dirtyEdges: boolean = true
-  private dirtyMessage: boolean = true
+class TreeNodeComponent extends React.Component<Props, State> {
   private animationDirty: boolean = false
 
   private cssAnimationWasSetAt?: number
@@ -74,17 +78,9 @@ class TreeNode extends React.Component<Props, State> {
   private willUpdateTime: number = performance.now()
   private nodeRef?: React.RefObject<HTMLDivElement> = React.createRef<HTMLDivElement>()
 
-  private subnodesDidchange = () => {
-    this.dirtySubnodes = true
-  }
-
-  private messageDidChange = () => {
-    this.dirtyMessage = true
-  }
-
-  private edgesDidChange = () => {
-    this.dirtyMessage = true
-  }
+  private setHover = debounce((hover: boolean) => {
+    this.setState({ mouseOver: hover })
+  }, 45)
 
   constructor(props: Props) {
     super(props)
@@ -96,76 +92,26 @@ class TreeNode extends React.Component<Props, State> {
     }
   }
 
-  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)
   }
 
-  private viewStateHasChanged = (msg: void, viewModel: TopicViewModel) => {
-    this.setState({ selected: viewModel.isSelected() })
+  private viewStateHasChanged = (msg: void) => {
+    this.setState({ selected: this.props.treeNode.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
+    return this.state.collapsedOverride !== newState.collapsedOverride
+      || this.state.mouseOver !== newState.mouseOver
       || this.state.selected !== newState.selected
   }
 
-  private propsHasChanged(newProps: Props) {
-    return this.props.autoExpandLimit !== newProps.autoExpandLimit
-  }
-
-  public shouldComponentUpdate(nextProps: Props, nextState: State) {
-    const shouldRenderToRemoveCssAnimation = this.cssAnimationWasSetAt !== undefined
-    return this.stateHasChanged(nextState)
-      || this.propsHasChanged(nextProps)
-      || (this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes)
-      || this.animationDirty
-      || shouldRenderToRemoveCssAnimation
-  }
-
-  public componentDidUpdate() {
-    if (this.props.performanceCallback) {
-      const renderTime = performance.now() - this.willUpdateTime
-      this.props.performanceCallback(renderTime)
-    }
-  }
-
-  public componentWillUpdate() {
-    if (this.props.performanceCallback) {
-      this.willUpdateTime = performance.now()
-    }
-  }
-
   private toggle() {
     this.setState({ collapsedOverride: !this.collapsed() })
   }
@@ -175,45 +121,7 @@ class TreeNode extends React.Component<Props, State> {
       return this.state.collapsedOverride
     }
 
-    return this.props.treeNode.edgeCount() > this.props.autoExpandLimit
-  }
-
-  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 && 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>
-        <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}
-            className={highlightClass}
-          />
-        </div>
-        <div className={classes.subnodes}>
-          {this.renderNodes()}
-        </div>
-      </div>
-    )
+    return this.props.treeNode.edgeCount() > this.props.settings.get('autoExpandLimit')
   }
 
   private didSelectTopic = () => {
@@ -229,7 +137,7 @@ class TreeNode extends React.Component<Props, State> {
   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) {
+    if (this.props.settings.get('selectTopicWithMouseOver') && this.props.treeNode && this.props.treeNode.message && this.props.treeNode.message.value) {
       this.props.didSelectTopic(this.props.treeNode)
     }
   }
@@ -239,10 +147,6 @@ class TreeNode extends React.Component<Props, State> {
     this.setHover(false)
   }
 
-  private setHover = debounce((hover: boolean) => {
-    this.setState({ mouseOver: hover })
-  }, 45)
-
   private toggleCollapsed = (event: React.MouseEvent) => {
     event.stopPropagation()
     this.toggle()
@@ -255,18 +159,81 @@ class TreeNode extends React.Component<Props, State> {
 
     return (
       <TreeNodeSubnodes
-        animateChanges={this.props.animateChages}
         collapsed={this.collapsed()}
         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}
+        settings={this.props.settings}
       />
     )
   }
+
+  public componentDidMount() {
+    const { treeNode } = this.props
+    this.addSubscriber(treeNode)
+  }
+
+  public componentWillUnmount() {
+    const { treeNode } = this.props
+    this.removeSubscriber(treeNode)
+    this.nodeRef = undefined
+  }
+
+  public shouldComponentUpdate(nextProps: Props, nextState: State) {
+    const shouldRenderToRemoveCssAnimation = this.cssAnimationWasSetAt !== undefined
+    return this.stateHasChanged(nextState)
+      || this.props.settings !== nextProps.settings
+      || (this.props.lastUpdate !== nextProps.lastUpdate)
+      || this.animationDirty
+      || shouldRenderToRemoveCssAnimation
+  }
+
+  public componentDidUpdate() {
+    if (this.props.performanceCallback) {
+      const renderTime = performance.now() - this.willUpdateTime
+      this.props.performanceCallback(renderTime)
+    }
+  }
+
+  public componentWillUpdate() {
+    if (this.props.performanceCallback) {
+      this.willUpdateTime = performance.now()
+    }
+  }
+
+  public render() {
+    const { classes } = this.props
+
+    const shouldStartAnimation = (!this.animationDirty) && !this.props.isRoot && this.props.settings.get('highlightTopicUpdates')
+    const animationName = this.props.theme.palette.type === 'light' ? 'updateLight' : 'updateDark'
+    const animation = shouldStartAnimation ? { willChange: 'auto', translateZ: 0, animation: `${animationName} 0.5s` } : {}
+    this.animationDirty = shouldStartAnimation
+
+    const highlightClass = this.state.selected ? this.props.classes.selected : (this.state.mouseOver ? this.props.classes.hover : '')
+
+    return (
+      <div>
+        <div
+          key={this.props.treeNode.hash()}
+          className={`${classes.node} ${this.props.className} ${highlightClass} ${classes.title}`}
+          style={animation}
+          onMouseOver={this.mouseOver}
+          onMouseOut={this.mouseOut}
+          onClick={this.didClickTitle}
+          ref={this.nodeRef}
+        >
+          <TreeNodeTitle
+            toggleCollapsed={this.toggleCollapsed}
+            didSelectNode={this.didSelectTopic}
+            collapsed={this.collapsed()}
+            treeNode={this.props.treeNode}
+            name={this.props.name}
+          />
+        </div>
+        {this.renderNodes()}
+      </div>
+    )
+  }
 }
 
-export default withStyles(styles)(TreeNode)
+export default withStyles(styles, { withTheme: true })(TreeNodeComponent)

app/src/components/Tree/TreeNodeSubnodes.tsx

@@ -1,24 +1,20 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
+import * as React from 'react'
 import TreeNode from './TreeNode'
-import { TopicOrder } from '../../reducers/Settings'
+import { Record } from 'immutable'
+import { SettingsState, TopicOrder } from '../../reducers/Settings'
 import { Theme, withStyles } from '@material-ui/core'
-import { TopicViewModel } from '../../TopicViewModel'
+import { TopicViewModel } from '../../model/TopicViewModel'
 
 export interface Props {
-  animateChanges: boolean
   treeNode: q.TreeNode<TopicViewModel>
   filter?: string
   collapsed?: boolean | undefined
   classes: any
   lastUpdate: number
-  topicOrder: TopicOrder
   selectedTopic?: q.TreeNode<TopicViewModel>
-  autoExpandLimit: number
   didSelectTopic: any
-  highlightTopicUpdates: boolean
-  selectTopicWithMouseOver: boolean
+  settings: Record<SettingsState>
 }
 
 interface State {
@@ -32,8 +28,9 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
     this.state = { alreadyAdded: 10 }
   }
 
-  private sortedNodes(): q.TreeNode<TopicViewModel>[] {
-    const { topicOrder, treeNode } = this.props
+  private sortedNodes(): Array<q.TreeNode<TopicViewModel>> {
+    const { settings, treeNode } = this.props
+    const topicOrder = settings.get('topicOrder')
 
     let edges = treeNode.edgeArray
     if (topicOrder === TopicOrder.abc) {
@@ -76,15 +73,11 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
       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}
+          settings={this.props.settings}
         />
       )
     })
@@ -101,9 +94,7 @@ const styles = (theme: Theme) => ({
   list: {
     display: 'block' as 'block',
     clear: 'both' as 'both',
-  },
-  listItem: {
-    padding: `0px 0px 0px ${theme.spacing(1)}`,
+    marginLeft: theme.spacing(1.5),
   },
 })
 

app/src/components/Tree/TreeNodeTitle.tsx

@@ -1,42 +1,29 @@
 import * as React from 'react'
-import { connect } from 'react-redux'
 import * as q from '../../../../backend/src/Model'
 import { withStyles, Theme } from '@material-ui/core'
-import { TopicViewModel } from '../../TopicViewModel'
-const debounce = require('lodash.debounce')
+import { TopicViewModel } from '../../model/TopicViewModel'
+import { Base64Message } from '../../../../backend/src/Model/Base64Message'
 
 export interface TreeNodeProps extends React.HTMLAttributes<HTMLElement> {
   treeNode: q.TreeNode<TopicViewModel>
   name?: string | undefined
   collapsed?: boolean | undefined
-  classes: any
   didSelectNode: any
   toggleCollapsed: any
+  classes: any
 }
 
 class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
-  public render() {
-    const { classes, treeNode, style, className } = this.props
-    return (
-      <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 name = this.props.name || (this.props.treeNode.sourceEdge && this.props.treeNode.sourceEdge.name)
 
-    return <span className={this.props.classes.sourceEdge}>{name}</span>
+    return <span key="edge" className={this.props.classes.sourceEdge}>{name}</span>
   }
 
   private renderValue() {
-    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>
+    return this.props.treeNode.message && this.props.treeNode.message.value && this.props.treeNode.message.length > 0
+      ? <span key="value" className={this.props.classes.value}> = {Base64Message.toUnicodeString(this.props.treeNode.message.value).slice(0, 120)}</span>
       : null
   }
 
@@ -45,16 +32,25 @@ class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
       return null
     }
 
-    return this.props.collapsed ? '▶' : '▼'
+    return <span key="expander" className={this.props.classes.expander} onClick={this.props.toggleCollapsed}>{this.props.collapsed ? '▶' : '▼'}</span>
   }
 
-  private renderCollapsedSubnodes() {
+  private renderMetadata() {
     if (this.props.treeNode.edgeCount() === 0 || !this.props.collapsed) {
       return null
     }
 
     const messages = this.props.treeNode.leafMessageCount()
-    return <span className={this.props.classes.collapsedSubnodes}>({this.props.treeNode.childTopicCount()} topics, {messages} messages)</span>
+    return <span key="metadata" className={this.props.classes.collapsedSubnodes}>{`(${this.props.treeNode.childTopicCount()} topics, ${messages} messages)`}</span>
+  }
+
+  public render() {
+    return ([
+      this.renderExpander(),
+      this.renderSourceEdge(),
+      this.renderMetadata(),
+      this.renderValue(),
+    ])
   }
 }
 
@@ -73,18 +69,11 @@ const styles = (theme: Theme) => ({
     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',
+    userSelect: 'none' as 'none',
   },
   collapsedSubnodes: {
     color: theme.palette.text.secondary,
+    userSelect: 'none' as 'none',
   },
 })
 

app/src/components/UpdateNotifier.tsx

@@ -1,4 +1,16 @@
+import * as compareVersions from 'compare-versions'
+import * as electron from 'electron'
+import * as os from 'os'
 import * as React from 'react'
+import axios from 'axios'
+import Close from '@material-ui/icons/Close'
+import CloudDownload from '@material-ui/icons/CloudDownload'
+import { AppState } from '../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { green } from '@material-ui/core/colors'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { updateNotifierActions } from '../actions'
 
 import {
    Button,
@@ -9,19 +21,6 @@ import {
    SnackbarContent,
    Typography,
 } from '@material-ui/core'
-import { Theme, withStyles } from '@material-ui/core/styles'
-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 { 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
@@ -32,12 +31,13 @@ interface Props {
 
 interface GithubRelease {
   url: string,
-  assets?: GithubAsset[]
+  assets?: Array<GithubAsset>
   published_at: string // "2019-01-25T20:14:39Z"
   body_html: string
   body: string
   body_text: string
   tag_name: string
+  prerelease: boolean
 }
 
 interface GithubAsset {
@@ -49,7 +49,7 @@ interface GithubAsset {
 }
 
 interface State {
-  newerVersions: GithubRelease[]
+  newerVersions: Array<GithubRelease>
 }
 
 class UpdateNotifier extends React.Component<Props, State> {
@@ -57,10 +57,10 @@ class UpdateNotifier extends React.Component<Props, State> {
     super(props)
     this.state = { newerVersions: [] }
 
-    // window.compare = compareVersions
     const ownVersion = electron.remote.app.getVersion()
     this.fetchReleases().then((releases) => {
       const newerVersions = releases
+        .filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))
         .filter(release => compareVersions(release.tag_name, ownVersion) > 0)
         .sort((a, b) => compareVersions(b.tag_name, a.tag_name))
 
@@ -71,14 +71,20 @@ class UpdateNotifier extends React.Component<Props, State> {
     })
   }
 
-  private fetchReleases(): Promise<GithubRelease[]> {
-    return axios.get('https://api.github.com/repos/thomasnordquist/mqtt-explorer/releases', {
+  private allowPrereleaseIfOwnVersionIsBeta(release: GithubRelease, ownVersion: string) {
+    const ownVersionIsBeta = !/alpha|beta/.test(ownVersion)
+
+    return ownVersionIsBeta || !release.prerelease
+  }
+
+  private async fetchReleases(): Promise<Array<GithubRelease>> {
+    const res = await axios.get('https://api.github.com/repos/thomasnordquist/mqtt-explorer/releases', {
       headers: {
         accept: 'application/vnd.github.v3.full+json',
       },
-    }).then((res) => {
-      return res.data
     })
+
+    return res.data as Array<GithubRelease>
   }
 
   private onCloseNotification = (event: React.SyntheticEvent<any>, reason: string) => {
@@ -101,15 +107,6 @@ class UpdateNotifier extends React.Component<Props, State> {
     this.props.actions.showUpdateDetails(false)
   }
 
-  public render() {
-    return (
-      <div>
-        {this.renderUpdateNotification()}
-        {this.renderUpdateDetails()}
-      </div>
-    )
-  }
-
   private renderUpdateNotification() {
     const snackbarAnchor: any = {
       vertical: 'top',
@@ -206,7 +203,7 @@ class UpdateNotifier extends React.Component<Props, State> {
 
   private renderDownloads() {
     const latestUpdate = this.state.newerVersions[0]
-    if (!latestUpdate || !latestUpdate.assets) {
+    if (!latestUpdate || !latestUpdate.assets) {
       return null
     }
 
@@ -223,6 +220,15 @@ class UpdateNotifier extends React.Component<Props, State> {
         </div>
       ))
   }
+
+  public render() {
+    return (
+      <div>
+        {this.renderUpdateNotification()}
+        {this.renderUpdateDetails()}
+      </div>
+    )
+  }
 }
 
 const styles = (theme: Theme) => ({
@@ -265,8 +271,8 @@ const styles = (theme: Theme) => ({
 
 const mapStateToProps = (state: AppState) => {
   return {
-    showUpdateNotification: state.globalState.showUpdateNotification,
-    showUpdateDetails: state.globalState.showUpdateDetails,
+    showUpdateNotification: state.globalState.get('showUpdateNotification'),
+    showUpdateDetails: state.globalState.get('showUpdateDetails'),
   }
 }
 

app/src/components/demo/index.tsx

@@ -1,14 +0,0 @@
-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

@@ -1,28 +1,30 @@
 import * as React from 'react'
-import { IconButton } from '@material-ui/core'
 import Clear from '@material-ui/icons/Clear'
+import { IconButton, Theme } from '@material-ui/core'
+import { withTheme } from '@material-ui/core/styles'
 
 interface Props {
   value?: string
   action: any
   style?: React.CSSProperties
+  variant?: 'primary'
+  theme: Theme
 }
 
 /**
  * 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>
-      )
-    }
-
+function ClearAdornment(props: Props) {
+  if (!props.value) {
     return null
   }
+
+  const color = props.variant === 'primary' ? props.theme.palette.primary.contrastText : undefined
+  return (
+    <IconButton style={{ ...props.style, padding: '1px' }} onClick={props.action}>
+      <Clear style={{ color, fontSize: '16px' }} />
+    </IconButton>
+  )
 }
 
-export default ClearAdornment
+export default withTheme(ClearAdornment)

app/src/components/helper/ConnectionHealthIndicator.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react'
 import DeviceHubOutlined from '@material-ui/icons/DeviceHubOutlined'
-import { AppState } from '../reducers'
+import { AppState } from '../../reducers'
 import { connect } from 'react-redux'
-import { ConnectionHealth } from '../reducers/Connection'
+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'
@@ -12,17 +12,26 @@ const styles: StyleRulesCallback = theme => ({
     color: red[700],
   },
   online: {
-    color: green[500],
+    color: green[400],
   },
   connecting: {
     color: orange[600],
   },
+  icon: {
+    boxShadow: theme.shadows[2].split('),').map(s => `inset ${s}`).join('),'),
+    padding: '6px',
+    borderRadius: '50%',
+    backgroundColor: '#eee',
+    width: '35px',
+    height: '35px',
+  },
 })
 
 interface Props {
   classes: any
   connected: boolean
   health?: ConnectionHealth
+  withBackground?: boolean
 }
 
 class ConnectionHealthIndicator extends React.Component<Props, {}> {
@@ -32,13 +41,15 @@ class ConnectionHealthIndicator extends React.Component<Props, {}> {
 
   public render() {
     const { classes, health, connected } = this.props
-    if (!health || !connected) {
+    if (!health || !connected) {
       return null
     }
 
     return (
       <Tooltip title={`Connection health "${health}"`}>
-        <DeviceHubOutlined className={classes[health]} />
+        <div>
+          <DeviceHubOutlined className={`${[classes[health]]} ${this.props.withBackground ? classes.icon : ''}`} />
+        </div>
       </Tooltip>
     )
   }
@@ -47,7 +58,7 @@ class ConnectionHealthIndicator extends React.Component<Props, {}> {
 const mapStateToProps = (state: AppState) => {
   return {
     health: state.connection.health,
-    connected: state.connection.connected || state.connection.connecting,
+    connected: state.connection.connected || state.connection.connecting,
   }
 }
 

app/src/components/helper/Copy.tsx

@@ -0,0 +1,64 @@
+import * as React from 'react'
+import Check from '@material-ui/icons/Check'
+import CustomIconButton from './CustomIconButton'
+import FileCopy from '@material-ui/icons/FileCopy'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { globalActions } from '../../actions'
+
+const copy = require('copy-text-to-clipboard')
+
+interface Props {
+  value: string
+  actions: {
+    global: typeof globalActions
+  }
+}
+
+interface State {
+  didCopy: boolean
+}
+
+class Copy extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { didCopy: false }
+  }
+
+  private handleClick = (event: React.MouseEvent) => {
+    event.stopPropagation()
+
+    copy(this.props.value)
+    this.props.actions.global.showNotification('Copied to clipboard')
+    this.setState({ didCopy: true })
+    setTimeout(() => {
+      this.setState({ didCopy: false })
+    }, 1500)
+  }
+
+  public render() {
+    const icon = !this.state.didCopy
+      ? <FileCopy fontSize="inherit" />
+      : <Check fontSize="inherit" style={{ cursor: 'default' }} />
+
+    return (
+      <span>
+        <span style={{ fontSize: '16px' }}>
+          <CustomIconButton onClick={this.handleClick} tooltip="Copy to clipboard">
+            {icon}
+          </CustomIconButton>
+        </span>
+      </span>
+    )
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: {
+      global: bindActionCreators(globalActions, dispatch),
+    },
+  }
+}
+
+export default connect(undefined, mapDispatchToProps)(Copy)

app/src/components/helper/CustomIconButton.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react'
-import { IconButton } from '@material-ui/core'
-import { withStyles, Theme } from '@material-ui/core/styles'
+import { IconButton, Tooltip } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
 
 interface Props {
-  onClick: any,
+  onClick: any
+  tooltip: string
   classes: any
 }
 
@@ -11,6 +12,8 @@ const styles = (theme: Theme) => ({
   button: {
     padding: '6px',
     fontSize: '1.2em',
+    width: '32px',
+    height: '32px',
   },
 })
 
@@ -19,16 +22,20 @@ class CustomIconButton extends React.Component<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)
   }
+
+  public render() {
+    return (
+      <IconButton className={this.props.classes.button} onClick={this.onClick}>
+        <Tooltip title={this.props.tooltip}>
+          <span>{this.props.children}</span>
+        </Tooltip>
+      </IconButton>
+    )
+  }
 }
 
 export default withStyles(styles)(CustomIconButton)

app/src/components/helper/DateFormatter.tsx

@@ -1,14 +1,64 @@
+import * as moment from 'moment'
 import * as React from 'react'
+import { AppState } from '../../reducers'
+import { connect } from 'react-redux'
 
 interface Props {
   date: Date
+  overrideLocale?: string
+  locale?: string
+  intervalSince?: Date
+}
+
+const unitMapping = {
+  s: 'seconds',
+  m: 'minutes',
+  h: 'hours',
 }
 
 class DateFormatter extends React.Component<Props, {}> {
+  private intervalSince(intervalSince: Date) {
+    const interval = intervalSince.getTime() - this.props.date.getTime()
+    const unit = this.unitForInterval(interval)
+    return `${moment.duration(interval).as(unit)} ${unitMapping[unit]}`
+  }
+
+  private legacyDate() {
+    return `${this.props.date.toLocaleDateString()} ${this.props.date.toLocaleTimeString()}`
+  }
+
+  private localizedDate(locale: string) {
+    return moment(this.props.date).locale(locale).format('L LTS')
+  }
+
+  private unitForInterval(milliseconds: number) {
+    const oneMinute = 1000 * 60
+    const oneHour = oneMinute * 60
+
+    if (milliseconds > oneHour * 2) {
+      return 'h'
+    }
+
+    if (milliseconds > oneMinute * 2) {
+      return 'm'
+    }
+
+    return 's'
+  }
 
   public render() {
-    return <span>{this.props.date.toLocaleDateString()} {this.props.date.toLocaleTimeString()}</span>
+    const locale = this.props.overrideLocale || this.props.locale
+    if (this.props.intervalSince) {
+      return <span>{this.intervalSince(this.props.intervalSince)}</span>
+    }
+    return <span>{locale ? this.localizedDate(locale) : this.legacyDate()}</span>
   }
 }
 
-export default DateFormatter
+const mapStateToProps = (state: AppState) => {
+  return {
+    locale: state.settings.get('timeLocale'),
+  }
+}
+
+export default connect(mapStateToProps)(DateFormatter)

app/src/components/helper/isElementInViewport.ts

@@ -4,9 +4,9 @@ declare const document: any
 export function isElementInViewport(el: any) {
   const rect = el.getBoundingClientRect()
   return (
-        rect.top >= 0 &&
-        rect.left >= 0 &&
-        rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */
-        rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
+    rect.top >= 0 &&
+    rect.left >= 0 &&
+    rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */
+    rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
   )
 }

app/src/index.tsx

@@ -1,49 +1,47 @@
-import './tracking'
-
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
+import App from './components/App'
+import Demo from './components/Demo'
+import reducers, { AppState } from './reducers'
 import reduxThunk from 'redux-thunk'
+import { applyMiddleware, compose, createStore } from 'redux'
 import { batchDispatchMiddleware } from 'redux-batched-actions'
+import { connect, Provider } from 'react-redux'
+import { ThemeProvider } from '@material-ui/styles'
+import './utils/tracking'
+import { themes } from './theme'
 
-import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'
-import reducers from './reducers'
-
-import App from './App'
-import { Provider } from 'react-redux'
-import { createStore, applyMiddleware, compose } from 'redux'
-import Demo from './components/demo'
-
-const composeEnhancers = /*(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || */ compose
+const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
 const store = createStore(
   reducers,
   composeEnhancers(
     applyMiddleware(
       reduxThunk,
-      batchDispatchMiddleware,
-    ),
-  ),
+      batchDispatchMiddleware
+    )
+  )
 )
 
-const theme = createMuiTheme({
-  palette: {
-    type: 'dark',
-  },
-})
+function ApplicationRenderer(props: {theme: 'light' | 'dark'}) {
+  return (
+    <ThemeProvider theme={props.theme === 'light' ? themes.lightTheme : themes.darkTheme}>
+      <App />
+      <Demo />
+    </ThemeProvider>
+  )
+}
 
-setTimeout(() => {
-  const splash = document.getElementById('splash')
-  if (splash) {
-    splash.style.animation = 'unsplash 0.5s ease-in 0s 1 normal forwards'
-    setTimeout(() => splash.remove(), 600)
+const mapStateToProps = (state: AppState) => {
+  return {
+    theme: state.settings.get('theme'),
   }
-}, 300)
+}
+
+const Application = connect(mapStateToProps)(ApplicationRenderer)
 
 ReactDOM.render(
-    <MuiThemeProvider theme={theme}>
-      <Provider store={store}>
-        <App />
-        <Demo />
-      </Provider>
-    </MuiThemeProvider>,
-    document.getElementById('app'),
+  <Provider store={store}>
+    <Application />
+  </Provider>,
+  document.getElementById('app')
 )

app/src/model/ConnectionOptions.ts

@@ -2,6 +2,11 @@ import { MqttOptions } from '../../../backend/src/DataSource'
 import { v4 } from 'uuid'
 const sha1 = require('sha1')
 
+export interface CertificateParameters {
+  name: string
+  /** @property data base64 encoded data */
+  data: string
+}
 export interface ConnectionOptions {
   type: 'mqtt'
   id: string
@@ -14,8 +19,9 @@ export interface ConnectionOptions {
   password?: string
   encryption: boolean
   certValidation: boolean
+  selfSignedCertificate?: CertificateParameters
   clientId?: string
-  subscriptions: string[]
+  subscriptions: Array<string>
 }
 
 export function toMqttConnection(options: ConnectionOptions): MqttOptions | undefined {
@@ -28,12 +34,14 @@ export function toMqttConnection(options: ConnectionOptions): MqttOptions | unde
     username: options.username,
     password: options.password,
     tls: options.encryption,
+    clientId: options.clientId,
     certValidation: options.certValidation,
     subscriptions: options.subscriptions,
+    certificateAuthority: options.selfSignedCertificate ? options.selfSignedCertificate.data : undefined,
   }
 }
 
-export function generateClienId() {
+function generateClientId() {
   const clientIdSha = sha1(`${Math.random()}`).slice(0, 8)
   return `mqtt-explorer-${clientIdSha}`
 }
@@ -41,7 +49,7 @@ export function generateClienId() {
 export function createEmptyConnection(): ConnectionOptions {
   return {
     certValidation: true,
-    clientId: generateClienId(),
+    clientId: generateClientId(),
     id: v4() as string,
     name: 'new connection',
     encryption: false,

app/src/model/TopicViewModel.ts

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

app/src/reducers/Connection.ts

@@ -1,8 +1,8 @@
+import * as q from '../../../backend/src/Model'
 import { Action } from 'redux'
 import { createReducer } from './lib'
-import * as q from '../../../backend/src/Model'
 import { MqttOptions } from '../../../backend/src/DataSource'
-import { TopicViewModel } from '../TopicViewModel'
+import { TopicViewModel } from '../model/TopicViewModel'
 
 export type ConnectionHealth = 'offline' | 'online' | 'connecting'
 export interface ConnectionState {

app/src/reducers/ConnectionManager.ts

@@ -3,7 +3,7 @@ import { ConnectionOptions } from '../model/ConnectionOptions'
 import { createReducer } from './lib'
 
 export interface ConnectionManagerState {
-  connections: {[s:string]: ConnectionOptions},
+  connections: {[s: string]: ConnectionOptions},
   selected?: string
   showAdvancedSettings: boolean
 }
@@ -29,7 +29,7 @@ export enum ActionTypes {
 
 export interface SetConnections {
   type: ActionTypes.CONNECTION_MANAGER_SET_CONNECTIONS
-  connections: {[s:string]: ConnectionOptions}
+  connections: {[s: string]: ConnectionOptions}
 }
 
 export interface SelectConnection {

app/src/reducers/Global.ts

@@ -0,0 +1,71 @@
+import { Action, Reducer } from 'redux'
+import { Record } from 'immutable'
+import { trackEvent } from '../utils/tracking'
+
+export enum ActionTypes {
+  showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
+  showUpdateDetails = 'SHOW_UPDATE_DETAILS',
+  showError = 'SHOW_ERROR',
+  showNotification = 'SHOW_NOTIFICATION',
+  didLaunch = 'DID_LAUNCH',
+  toggleSettingsVisibility = 'TOGGLE_SETTINGS_VISIBILITY',
+}
+
+export interface GlobalAction extends Action {
+  type: ActionTypes,
+  showUpdateNotification?: boolean
+  showUpdateDetails?: boolean
+  error?: string
+  notification?: string
+}
+
+interface GlobalStateInterface {
+  showUpdateNotification?: boolean
+  showUpdateDetails: boolean
+  error?: string
+  notification?: string
+  launching: boolean
+  settingsVisible: boolean
+}
+
+export type GlobalState = Record<GlobalStateInterface>
+
+const initialStateFactory = Record<GlobalStateInterface>({
+  showUpdateNotification: false,
+  showUpdateDetails: false,
+  error: undefined,
+  notification: undefined,
+  launching: true,
+  settingsVisible: false,
+})
+
+export const globalState: Reducer<Record<GlobalStateInterface>, GlobalAction> = (state = initialStateFactory(), action): GlobalState => {
+  trackEvent(action.type)
+  console.log(action.type)
+
+  switch (action.type) {
+  case ActionTypes.showUpdateNotification:
+    return state.set('showUpdateNotification', action.showUpdateNotification)
+
+  case ActionTypes.toggleSettingsVisibility:
+    return state.set('settingsVisible', !state.get('settingsVisible'))
+
+  case ActionTypes.showError:
+    return state.set('error', action.error)
+
+  case ActionTypes.showNotification:
+    return state.set('notification', action.notification)
+
+  case ActionTypes.didLaunch:
+    return state.set('launching', false)
+
+  case ActionTypes.showUpdateDetails:
+    if (action.showUpdateDetails === undefined) {
+      return state
+    }
+    return state.set('showUpdateDetails', action.showUpdateDetails)
+
+  default:
+    return state
+  }
+}

app/src/reducers/Settings.ts

@@ -1,5 +1,6 @@
-import { Action } from 'redux'
+import * as moment from 'moment'
 import { createReducer } from './lib'
+import { Record } from 'immutable'
 
 export enum TopicOrder {
   none = 'none',
@@ -12,138 +13,141 @@ export type ValueRendererDisplayMode = 'diff' | 'raw'
 
 export interface SettingsState {
   autoExpandLimit: number
-  visible: boolean
+  timeLocale: string
   topicOrder: TopicOrder
   topicFilter?: string
   highlightTopicUpdates: boolean
   valueRendererDisplayMode: ValueRendererDisplayMode
   selectTopicWithMouseOver: boolean
+  theme: 'light' | 'dark'
 }
 
-export type Action = SetAutoExpandLimit | ToggleVisibility | SetTopicOrder | FilterTopics | TogglehighlightTopicUpdates | SetValueRendererDisplayMode
+export type Actions = SetAutoExpandLimitAction
+  & DidLoadSettingsAction
+  & SetTopicOrderAction
+  & FilterTopicsAction
+  & ToggleHighlightTopicUpdatesAction
+  & SetValueRendererDisplayModeAction
+  & SetTheme
+  & SetSelectTopicWithMouseOverAction
+  & SetTimeLocale
 
 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',
-
+  SETTINGS_SET_THEME_LIGHT = 'SETTINGS_SET_THEME_LIGHT',
+  SETTINGS_SET_THEME_DARK = 'SETTINGS_SET_THEME_DARK',
+  SETTINGS_SET_TIME_LOCALE = 'SETTINGS_SET_TIME_LOCALE',
 }
 
-const initialState: SettingsState = {
+const initialState = Record<SettingsState>({
+  timeLocale: window.navigator.language,
   autoExpandLimit: 0,
   topicOrder: TopicOrder.none,
-  visible: false,
   highlightTopicUpdates: true,
   valueRendererDisplayMode: 'diff',
   selectTopicWithMouseOver: false,
+  theme: 'light',
+  topicFilter: undefined,
+})
+
+const setTheme = (theme: 'light' | 'dark') => (state: Record<SettingsState>) => {
+  return state.set('theme', theme)
 }
 
-export const settingsReducer = createReducer(initialState, {
+const reducerActions: {[s: string]: (state: Record<SettingsState>, action: Actions) => Record<SettingsState>} = {
   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_TOGGLE_HIGHLIGHT_ACTIVITY: toggleHighlightTopicUpdates,
   SETTINGS_DID_LOAD_SETTINGS: didLoadSettings,
   SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE: setValueRendererDisplayMode,
   SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER: setSelectTopicWithMouseOver,
-})
+  SETTINGS_SET_THEME_LIGHT: setTheme('light'),
+  SETTINGS_SET_THEME_DARK: setTheme('dark'),
+  SETTINGS_SET_TIME_LOCALE: setTimeLocale,
+}
 
-export interface DidLoadSettings {
+export const settingsReducer = createReducer(initialState(), reducerActions)
+
+export interface SetTheme {
+  type: ActionTypes.SETTINGS_SET_THEME_LIGHT | ActionTypes.SETTINGS_SET_THEME_DARK
+  theme: 'light' | 'dark'
+}
+
+export interface DidLoadSettingsAction {
   type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS
   settings: Partial<SettingsState>
 }
 
-function didLoadSettings(state: SettingsState, action: DidLoadSettings) {
-  return {
-    ...state,
-    ...action.settings,
-  }
+function didLoadSettings(state: Record<SettingsState>, action: DidLoadSettingsAction) {
+  return state.merge(action.settings)
 }
 
-export interface SetSelectTopicWithMouseOver {
+export interface SetSelectTopicWithMouseOverAction {
   type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER
   selectTopicWithMouseOver: boolean
 }
 
-export function setSelectTopicWithMouseOver(state: SettingsState, action: SetSelectTopicWithMouseOver) {
-  return {
-    ...state,
-    selectTopicWithMouseOver: action.selectTopicWithMouseOver,
-  }
+export function setSelectTopicWithMouseOver(state: Record<SettingsState>, action: SetSelectTopicWithMouseOverAction) {
+  return state.set('selectTopicWithMouseOver', !state.get('selectTopicWithMouseOver'))
 }
 
-export interface SetValueRendererDisplayMode {
+export interface SetTimeLocale {
+  type: ActionTypes.SETTINGS_SET_TIME_LOCALE
+  timeLocale: string
+}
+
+export function setTimeLocale(state: Record<SettingsState>, action: SetTimeLocale): Record<SettingsState> {
+  return state.set('timeLocale', action.timeLocale)
+}
+
+export interface SetValueRendererDisplayModeAction {
   type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE
   valueRendererDisplayMode: ValueRendererDisplayMode
 }
 
-export function setValueRendererDisplayMode(state: SettingsState, action: SetValueRendererDisplayMode) {
-  return {
-    ...state,
-    valueRendererDisplayMode: action.valueRendererDisplayMode,
-  }
+export function setValueRendererDisplayMode(state: Record<SettingsState>, action: SetValueRendererDisplayModeAction) {
+  return state.set('valueRendererDisplayMode', action.valueRendererDisplayMode)
 }
 
-export interface SetAutoExpandLimit {
+export interface SetAutoExpandLimitAction {
   type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
   autoExpandLimit: number
 }
 
-function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
-  return {
-    ...state,
-    autoExpandLimit: action.autoExpandLimit,
-  }
+function setAutoExpandLimit(state: Record<SettingsState>, action: SetAutoExpandLimitAction) {
+  return state.set('autoExpandLimit', action.autoExpandLimit)
 }
 
-export interface TogglehighlightTopicUpdates {
+export interface ToggleHighlightTopicUpdatesAction {
   type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY
 }
 
-function togglehighlightTopicUpdates(state: SettingsState, _action: TogglehighlightTopicUpdates) {
-  return {
-    ...state,
-    highlightTopicUpdates: !state.highlightTopicUpdates,
-  }
+function toggleHighlightTopicUpdates(state: Record<SettingsState>, action: ToggleHighlightTopicUpdatesAction) {
+  return state.set('highlightTopicUpdates', !state.get('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 {
+export interface SetTopicOrderAction {
   type: ActionTypes.SETTINGS_SET_TOPIC_ORDER
-  topicOrder: string
+  topicOrder: TopicOrder
 }
 
-function filterTopics(state: SettingsState, action: FilterTopics) {
-  return {
-    ...state,
-    topicFilter: action.topicFilter,
-  }
+function setTopicOrder(state: Record<SettingsState>, action: SetTopicOrderAction) {
+  return state.set('topicOrder', action.topicOrder)
 }
 
-export interface FilterTopics {
+export interface FilterTopicsAction {
   type: ActionTypes.SETTINGS_FILTER_TOPICS
   topicFilter: string
 }
+
+// @Todo: move to tree reducer, should not be persisted / is no application setting
+function filterTopics(state: Record<SettingsState>, action: FilterTopicsAction) {
+  return state.set('topicFilter', action.topicFilter)
+}

app/src/reducers/Sidebar.ts

@@ -0,0 +1,44 @@
+import * as q from '../../../backend/src/Model'
+import { Action } from 'redux'
+import { createReducer } from './lib'
+import { Record } from 'immutable'
+
+interface SidebarModel {
+  compareMessage?: q.Message
+}
+
+const initialStateFactory = Record<SidebarModel>({
+  compareMessage: undefined,
+})
+
+export type Action = SetCompareMessage
+export enum ActionTypes {
+  SIDEBAR_SET_COMPARE_MESSAGE = 'SIDEBAR_SET_COMPARE_MESSAGE',
+  SIDEBAR_RESET_STORE = 'SIDEBAR_RESET_STORE',
+}
+
+export type SidebarState = Record<SidebarModel>
+
+const actions: {[s: string]: (state: SidebarState, action: Action) => SidebarState} = {
+  SIDEBAR_SET_COMPARE_MESSAGE: setCompareMessage,
+  SIDEBAR_RESET_STORE: resetStore,
+}
+
+export const sidebarReducer = createReducer(initialStateFactory(), actions)
+
+export interface SetCompareMessage {
+  type: ActionTypes.SIDEBAR_SET_COMPARE_MESSAGE
+  message?: q.Message
+}
+
+function setCompareMessage(state: SidebarState, action: SetCompareMessage): SidebarState {
+  return state.set('compareMessage', action.message)
+}
+
+export interface ResetStore {
+  type: ActionTypes.SIDEBAR_RESET_STORE
+}
+
+function resetStore(): SidebarState {
+  return initialStateFactory()
+}

app/src/reducers/Tree.ts

@@ -1,19 +1,26 @@
 import * as q from '../../../backend/src/Model'
 import { Action } from 'redux'
 import { createReducer } from './lib'
-import { TopicViewModel } from '../TopicViewModel'
+import { Record } from 'immutable'
+import { TopicViewModel } from '../model/TopicViewModel'
 
-export interface TreeState {
+interface TreeStateModel {
   tree?: q.Tree<TopicViewModel>
   selectedTopic?: q.TreeNode<TopicViewModel>
   filter?: string
+  paused: boolean
 }
 
-export type Action = ShowTree | SelectTopic
+export type TreeState = Record<TreeStateModel>
+
+export type Action = ShowTree | SelectTopic | ResetStore
 
 export enum ActionTypes {
   TREE_SHOW_TREE = 'TREE_SHOW_TREE',
   TREE_SELECT_TOPIC = 'TREE_SELECT_TOPIC',
+  TREE_RESUME_UPDATES = 'TREE_RESUME_UPDATES',
+  TREE_PAUSE_UPDATES = 'TREE_PAUSE_UPDATES',
+  TREE_RESET_STORE = 'TREE_RESET_STORE',
 }
 
 export interface ShowTree {
@@ -27,24 +34,46 @@ export interface SelectTopic {
   selectedTopic?: q.TreeNode<TopicViewModel>
 }
 
-const initialState: TreeState = { }
+export interface SetPause {
+  type: ActionTypes.TREE_PAUSE_UPDATES | ActionTypes.TREE_RESUME_UPDATES
+}
 
-export const treeReducer = createReducer(initialState, {
-  TREE_SHOW_TREE: showTree,
-  TREE_SELECT_TOPIC: selectTopic,
+const initialStateFactory = Record<TreeStateModel>({
+  paused: false,
+  tree: undefined,
+  selectedTopic: undefined,
+  filter: undefined,
 })
 
-function showTree(state: TreeState, action: ShowTree) {
-  return {
-    ...state,
-    tree: action.tree,
-    filter: action.filter,
-  }
+const setPaused = (pause: boolean) => (state: TreeState, action: ShowTree): TreeState => {
+  return state.set('paused', pause)
 }
 
-function selectTopic(state: TreeState, action: SelectTopic) {
-  return {
-    ...state,
-    selectedTopic: action.selectedTopic,
-  }
+const actions: {[s: string]: (state: TreeState, action: Action) => TreeState} = {
+  TREE_SHOW_TREE: showTree,
+  TREE_SELECT_TOPIC: selectTopic,
+  TREE_PAUSE_UPDATES: setPaused(true),
+  TREE_RESUME_UPDATES: setPaused(false),
+  TREE_RESET_STORE: resetStore,
+}
+
+export const treeReducer = createReducer(initialStateFactory(), actions)
+
+function showTree(state: TreeState, action: ShowTree): TreeState {
+  return state.merge({
+    tree: action.tree,
+    filter: action.filter,
+  })
+}
+
+function selectTopic(state: TreeState, action: SelectTopic): TreeState {
+  return state.set('selectedTopic', action.selectedTopic)
+}
+
+export interface ResetStore {
+  type: ActionTypes.TREE_RESET_STORE
+}
+
+function resetStore(state: TreeState, action: ResetStore): TreeState {
+  return initialStateFactory()
 }

app/src/reducers/index.ts

@@ -1,84 +1,29 @@
-import { Action, Reducer, combineReducers } from 'redux'
-
-import { trackEvent } from '../tracking'
-import { PublishState, publishReducer } from './Publish'
-import { ConnectionState, connectionReducer } from './Connection'
-import { SettingsState, settingsReducer } from './Settings'
-import { TreeState, treeReducer } from './Tree'
-import { ConnectionManagerState, connectionManagerReducer } from './ConnectionManager'
-
-export enum ActionTypes {
-  showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
-  showUpdateDetails = 'SHOW_UPDATE_DETAILS',
-  showError = 'SHOW_ERROR',
-}
-
-export interface CustomAction extends Action {
-  type: ActionTypes,
-  showUpdateNotification?: boolean
-  showUpdateDetails?: boolean
-  error?: string
-}
+import { combineReducers } from 'redux'
+import { connectionManagerReducer, ConnectionManagerState } from './ConnectionManager'
+import { connectionReducer, ConnectionState } from './Connection'
+import { GlobalState, globalState } from './Global'
+import { publishReducer, PublishState } from './Publish'
+import { Record } from 'immutable'
+import { settingsReducer, SettingsState } from './Settings'
+import { sidebarReducer, SidebarState } from './Sidebar'
+import { treeReducer, TreeState } from './Tree'
 
 export interface AppState {
   globalState: GlobalState
   tree: TreeState
-  settings: SettingsState,
+  settings: Record<SettingsState>,
   publish: PublishState
+  sidebar: SidebarState,
   connection: ConnectionState
   connectionManager: ConnectionManagerState
 }
 
-export interface GlobalState {
-  showUpdateNotification?: boolean
-  showUpdateDetails: boolean
-  error?: string
-}
-
-const initialBigState: GlobalState = {
-  showUpdateDetails: false,
-}
-
-const globalState: Reducer<GlobalState | undefined, CustomAction> = (state = initialBigState, action) => {
-  if (!state) {
-    throw Error('No initial state')
-  }
-  trackEvent(action.type)
-
-  switch (action.type) {
-    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
-      }
-      return {
-        ...state,
-        showUpdateDetails: action.showUpdateDetails,
-      }
-
-    default:
-      return state
-  }
-}
-
-const reducer = combineReducers({
+export default combineReducers({
   globalState,
   publish: publishReducer,
+  sidebar: sidebarReducer,
   connection: connectionReducer,
   settings: settingsReducer,
   tree: treeReducer,
   connectionManager: connectionManagerReducer,
 })
-
-export default reducer

app/src/theme.ts

@@ -0,0 +1,56 @@
+import { createMuiTheme } from '@material-ui/core'
+import { amber } from '@material-ui/core/colors'
+
+const baseTheme = {
+  typography: {
+    allVariants: {
+      userSelect: 'none',
+    },
+    body1: {
+      fontSize: '0.9rem',
+    },
+  },
+}
+
+const darkTheme = createMuiTheme({
+  ...(baseTheme as any),
+  palette: {
+    type: 'dark',
+  },
+})
+
+const lightTheme = createMuiTheme({
+  ...(baseTheme as any),
+  palette: {
+    type: 'light',
+    background: {
+      default: '#fafafa',
+    },
+    primary: {
+      // main: '#931e2e',
+      // main: '#172A3A',
+      // main: '#004346',
+      // main: '#7D4F50',
+      // main: '#C14953',
+      // main: '#4C4C47',
+      // main: '#2D2D2A',
+      // main: '#37000A',
+      // main: '#56000F',
+      // main: '#89023E',
+      // main: '#30343F',
+      main: '#335C67', // ⭐️
+    },
+    secondary: amber,
+    // secondary: {
+    //   main: '#E09F3E',
+    // },
+    action: {
+      disabledBackground: '#fafafa',
+    },
+  },
+})
+
+export const themes = {
+  lightTheme,
+  darkTheme,
+}

app/src/tracking.ts

@@ -1,25 +0,0 @@
-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)
-}
-
-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
-  }
-  electronRendererTelementry.trackEvent(name)
-}

app/src/utils/PersistentStorage.ts

@@ -1,4 +1,4 @@
-import { rendererEvents } from '../../events'
+import { rendererEvents } from '../../../events'
 import { v4 } from 'uuid'
 
 import {
@@ -6,20 +6,20 @@ import {
   makeStorageResponseEvent,
   storageLoadEvent,
   storageClearEvent,
-  makeStorageAcknoledgementEvent,
-} from '../../events/StorageEvents'
+  makeStorageAcknowledgementEvent,
+} from '../../../events/StorageEvents'
 
 export interface StorageIdentifier<Model> {
   id: string
 }
 
-export interface PersistantStorage {
+export interface PersistentStorage {
   store<Model>(identifier: StorageIdentifier<Model>, data: Model): Promise<void>
   load<Model>(identifier: StorageIdentifier<Model>): Promise<Model | undefined>
   clear(): Promise<void>
 }
 
-class RemoteStorage implements PersistantStorage {
+class RemoteStorage implements PersistentStorage {
   private timeoutCallback(event: any, callback: any, reject: any) {
     setTimeout(() => {
       reject('remote storage timeout')
@@ -28,7 +28,7 @@ class RemoteStorage implements PersistantStorage {
   }
 
   private expectAck(transactionId: string): Promise<void> {
-    const ack = makeStorageAcknoledgementEvent(transactionId)
+    const ack = makeStorageAcknowledgementEvent(transactionId)
     return new Promise<void>((resolve, reject) => {
       const callback = (msg: any) => {
         if (msg && msg.error) {

app/src/utils/bugtracking.ts

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

app/src/utils/handleTextSelectWithCtrlA.ts

@@ -0,0 +1,22 @@
+export const selectTextWithCtrlA = (options?: {targetSelector: string}) => (e: React.KeyboardEvent<HTMLDivElement>) => {
+  const isCtrlA = (e.metaKey || e.ctrlKey) && e.key === 'a'
+
+  if (isCtrlA && window.getSelection) {
+    e.persist()
+    e.preventDefault()
+    e.stopPropagation()
+    const selection = window.getSelection()
+    const range = document.createRange()
+    const eventTarget = (e.target as HTMLElement)
+    const target: HTMLElement | null = (options) ? eventTarget.querySelector(options.targetSelector) : eventTarget
+
+    if (!target) {
+      console.error('Could not find matching target for Ctrl+A Event')
+    }
+    if (selection && target) {
+      range.selectNodeContents(target)
+      selection.removeAllRanges()
+      selection.addRange(range)
+    }
+  }
+}

app/src/utils/tracking.ts

@@ -0,0 +1,23 @@
+import { electronRendererTelementry } from 'electron-telemetry'
+
+// Used to determine long-time-stability and memory leaks
+function trackProcessStatistics() {
+  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)
+}
+trackProcessStatistics()
+
+// Log reducer event names to determine what functionality is used and how to reproduce reported errors
+export function trackEvent(name: string) {
+  if (name.match(/^@@redux/)) {
+    return
+  }
+  electronRendererTelementry.trackEvent(name)
+}

app/webpack.config.js

@@ -1,80 +1,112 @@
-const LiveReloadPlugin = require('webpack-livereload-plugin');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const HtmlWebpackPlugin = require('html-webpack-plugin')
+// const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const webpack = require('webpack');
+const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 
 module.exports = {
-    entry: {
-        app: "./src/index.tsx",
-        bugtracking: "./src/bugtracking.ts",
+  entry: {
+    app: './src/index.tsx',
+    bugtracking: './src/utils/bugtracking.ts',
+  },
+  output: {
+    chunkFilename: '[name].bundle.js',
+    filename: '[name].bundle.js',
+    path: `${__dirname}/build`,
+  },
+  optimization: {
+    minimize: false,
+    splitChunks: {
+      chunks: 'all',
+      minSize: 30000,
+      maxSize: 0,
+      minChunks: 1,
+      maxAsyncRequests: 5,
+      maxInitialRequests: 3,
+      automaticNameDelimiter: '~',
+      name: true,
+      cacheGroups: {
+        vendors: {
+          test: /[\\/]node_modules[\\/](react|react-dom|@material-ui|popper\.js|react|react-redux|prop-types|jss|redux|scheduler|react-transition-group)[\\/]/,
+          name: 'vendors',
+          chunks: 'all',
+          priority: -10,
+        },
+        default: {
+          minChunks: 2,
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+      },
     },
-    output: {
-        chunkFilename: '[name].bundle.js',
-        filename: "[name].bundle.js",
-        path: __dirname + "/build"
-    },
-    optimization: {
-        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
-              }
-            }
+  },
+  devServer: {
+    // contentBase: './dist', // content not from webpack
+    hot: true,
+  },
+  target: 'electron-renderer',
+  mode: 'production',
+  devtool: 'source-map',
+  resolve: {
+    // Add '.ts' and '.tsx' as resolvable extensions.
+    extensions: ['.ts', '.tsx', '.js', '.json', '.node'],
+  },
+  module: {
+    rules: [
+      // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
+      {
+        test: /\.tsx?$/,
+        loader: 'awesome-typescript-loader',
+        options: {
+          reportFiles: [
+            "src/**/*.{ts,tsx}",
+            "../backend/src/**/*.{ts,tsx}"
+          ]
+        }
+      },
+      // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
+      { enforce: 'pre', test: /\.js$/, loader: 'source-map-loader' },
+      {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader'],
+      },
+      {
+        test: /\.(png|jpg|gif)$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {},
+          },
+        ],
+      },
+      {
+        test: /\.node$/,
+        use: {
+          loader: 'node-loader',
+          options: {
+            modules: true,
           }
-    },
-
-    target: 'electron-renderer',
-
-    mode: 'production',
-
-    // Enable sourcemaps for debugging webpack's output.
-    devtool: "source-map",
-
-    resolve: {
-        // Add '.ts' and '.tsx' as resolvable extensions.
-        extensions: [".ts", ".tsx", ".js", ".json"]
-    },
-
-    module: {
-        rules: [
-            // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
-            { 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" },
-
-            {
-                test: /\.css$/,
-                use: ['style-loader', 'css-loader'],
-            },
-        ]
-    },
-
-    plugins: [
-      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
-    // assume a corresponding global variable exists and use that instead.
-    // This is important because it allows us to avoid bundling all of our
-    // dependencies, which allows browsers to cache those libraries between builds.
-    externals: {
-        // "react": "React",
-        // "react-dom": "ReactDOM"
-    }
+  plugins: [
+    new HtmlWebpackPlugin({ template: './index.html', file: './build/index.html', inject: false }),
+    // new BundleAnalyzerPlugin(),
+    new HardSourceWebpackPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.IgnorePlugin({
+      resourceRegExp: /\.\/build\/Debug\/addon/,
+      contextRegExp: /heapdump$/
+    }),
+  ],
+
+  // When importing a module whose path matches one of the following, just
+  // assume a corresponding global variable exists and use that instead.
+  // This is important because it allows us to avoid bundling all of our
+  // dependencies, which allows browsers to cache those libraries between builds.
+  externals: {
+    // "react": "React",
+    // "react-dom": "ReactDOM"
+  },
 };

appveyor.yml

@@ -19,5 +19,5 @@ test_script:
   - yarn test
 
 artifacts:
-  - path: 'build\clean\build\MQTT-Explorer*.appx'
+  - path: 'build\clean\build\*.appx'
 

backend/package.json

@@ -12,7 +12,7 @@
     "postinstall": "yarn build"
   },
   "author": "",
-  "license": "ISC",
+  "license": "CC-BY-ND-4.0",
   "nyc": {
     "include": [
       "src/**/*.ts",

backend/src/ConfigStorage.ts

@@ -1,13 +1,15 @@
 import * as FileAsync from 'lowdb/adapters/FileAsync'
+import * as fs from 'fs-extra'
 import * as lowdb from 'lowdb'
+import * as path from 'path'
 import { backendEvents } from '../../events'
 import {
+  makeStorageAcknowledgementEvent,
   makeStorageResponseEvent,
   storageClearEvent,
   storageLoadEvent,
-  storageStoreEvent,
-  makeStorageAcknoledgementEvent,
-} from '../../events/StorageEvents'
+  storageStoreEvent
+  } from '../../events/StorageEvents'
 
 export default class ConfigStorage {
   private file: string
@@ -17,6 +19,10 @@ export default class ConfigStorage {
   }
 
   private async getDb() {
+    const pathInfo = path.parse(this.file)
+
+    // Ensure that Settings dir exists
+    await fs.mkdirp(pathInfo.dir)
     const adapter = new FileAsync(this.file)
     if (!this.database) {
       this.database = await lowdb(adapter)
@@ -27,7 +33,7 @@ export default class ConfigStorage {
 
   public async init() {
     backendEvents.subscribe(storageStoreEvent, async (event) => {
-      const ack = makeStorageAcknoledgementEvent(event.transactionId)
+      const ack = makeStorageAcknowledgementEvent(event.transactionId)
       try {
         const db = await this.getDb()
         await db.set(event.store, event.data).write()
@@ -57,9 +63,9 @@ export default class ConfigStorage {
         for (const key of keys) {
           await db.unset(key).write()
         }
-        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), undefined)
+        backendEvents.emit(makeStorageAcknowledgementEvent(event.transactionId), undefined)
       } catch (error) {
-        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), { error, transactionId: event.transactionId })
+        backendEvents.emit(makeStorageAcknowledgementEvent(event.transactionId), { error, transactionId: event.transactionId })
         throw error
       }
     })

backend/src/DataSource/DataSource.ts

@@ -5,12 +5,12 @@ type MessageCallback = (topic: string, payload: Buffer) => void
 
 // A DataSource should automatically reconnect if connection was broken
 interface DataSource<DataSourceOptions> {
+  topicSeparator: string
+  stateMachine: DataSourceStateMachine
   connect(options: DataSourceOptions): DataSourceStateMachine
   disconnect(): void
   onMessage(messageCallback: MessageCallback): void
   publish(msg: MqttMessage): void
-  topicSeparator: string
-  stateMachine: DataSourceStateMachine
 }
 
 export { DataSource, MessageCallback }

backend/src/DataSource/DataSourceState.ts

@@ -7,7 +7,7 @@ export interface DataSourceState {
 }
 
 export class DataSourceStateMachine {
-  public onUpdate = new EventDispatcher<DataSourceState, DataSourceStateMachine>(this)
+  public onUpdate = new EventDispatcher<DataSourceState, DataSourceStateMachine>()
   private state: DataSourceState = {
     error: undefined,
     connected: false,

backend/src/DataSource/MqttSource.ts

@@ -3,6 +3,7 @@ import * as Url from 'url'
 import { Client, connect as mqttConnect } from 'mqtt'
 import { DataSource, DataSourceStateMachine } from './'
 import { MqttMessage } from '../../../events'
+import { Base64Message } from '../Model/Base64Message'
 
 export interface MqttOptions {
   url: string
@@ -11,7 +12,8 @@ export interface MqttOptions {
   tls: boolean
   certValidation: boolean
   clientId?: string
-  subscriptions: string[]
+  subscriptions: Array<string>
+  certificateAuthority?: string
 }
 
 export class MqttSource implements DataSource<MqttOptions> {
@@ -42,6 +44,7 @@ export class MqttSource implements DataSource<MqttOptions> {
       username: options.username,
       password: options.password,
       clientId: options.clientId,
+      ca: options.certificateAuthority ? Buffer.from(options.certificateAuthority, 'base64') : undefined,
     })
 
     this.client = client
@@ -82,7 +85,12 @@ export class MqttSource implements DataSource<MqttOptions> {
   }
 
   public publish(msg: MqttMessage) {
-    this.client && this.client.publish(msg.topic, msg.payload, { qos: msg.qos, retain: msg.retain })
+    if (this.client) {
+      this.client.publish(
+        msg.topic,
+        msg.payload ? Base64Message.toUnicodeString(msg.payload) : '',
+        { qos: msg.qos, retain: msg.retain })
+    }
   }
 
   public disconnect() {

backend/src/Model/Base64Message.ts

@@ -0,0 +1,30 @@
+const { Base64 } = require('js-base64')
+
+export class Base64Message {
+  private base64Message: string
+  private unicodeValue: string
+
+  public length: number
+
+  private constructor(base64Str: string) {
+    this.base64Message = base64Str
+    this.unicodeValue = Base64.decode(base64Str)
+    this.length = base64Str.length
+  }
+
+  public static toUnicodeString(message: Base64Message) {
+    return message.unicodeValue || ''
+  }
+
+  public static fromBuffer(buffer: Buffer) {
+    return new Base64Message(buffer.toString('base64'))
+  }
+
+  public static fromString(str: string) {
+    return new Base64Message(Base64.encode(str))
+  }
+
+  public static toDataUri(message: Base64Message, mimeType: string) {
+    return `data:${mimeType};base64,${message.base64Message}`
+  }
+}

backend/src/Model/ChangeBuffer.ts

@@ -0,0 +1,38 @@
+import { MqttMessage } from '../../../events'
+
+export class ChangeBuffer {
+  private buffer: Array<MqttMessage> = []
+  private size = 0
+  private maxSize = 100_000_000 // ~100MB
+  public length = 0
+  public estimatedMessageOverhead = 24
+
+  public push(val: MqttMessage) {
+    if (!this.isFull()) {
+      this.buffer.push(val)
+      this.size += this.estimatedMessageOverhead + (val.payload ? val.payload.length : 0)
+      this.length += 1
+    }
+  }
+
+  public getSize() {
+    return this.size
+  }
+
+  public isFull() {
+    return this.size >= this.maxSize
+  }
+
+  public fillState() {
+    return this.size / this.maxSize
+  }
+
+  public popAll(): Array<MqttMessage> {
+    const tmpBuffer = this.buffer
+    this.buffer = []
+    this.size = 0
+    this.length = 0
+
+    return tmpBuffer
+  }
+}

backend/src/Model/Edge.ts

@@ -12,7 +12,7 @@ export class Edge<ViewModel> implements Hashable {
     this.name = name
   }
 
-  public edges() {
+  public edges(): Array<Edge<ViewModel>> {
     return this.target ? this.target.edgeArray : []
   }
 

backend/src/Model/Message.ts

@@ -1,5 +1,8 @@
+import { Base64Message } from './Base64Message'
+
 export interface Message {
-  value?: any | undefined
+  value?: Base64Message
   length: number
   received: Date
+  messageNumber: number
 }

backend/src/Model/RingBuffer.ts

@@ -6,7 +6,7 @@ export class RingBuffer<T extends Lengthwise> {
   private capacity: number
   private maxItems: number
   private usage: number = 0
-  private items: T[] = []
+  private items: Array<T> = []
   private start: number = 0
   private end: number = 0
 
@@ -17,26 +17,10 @@ export class RingBuffer<T extends Lengthwise> {
     if (ringBuffer) {
       this.items = ringBuffer.toArray()
       this.end = this.items.length
-      this.usage = this.items.length
+      this.usage = ringBuffer.usage
     }
   }
 
-  public clone(): RingBuffer<T> {
-    return new RingBuffer(this.capacity, this.maxItems, this)
-  }
-
-  public toArray() {
-    return this.items.slice(this.start, this.end)
-  }
-
-  public add(item: T) {
-    const size = item.length
-    this.enforceCapacityConstraints(size)
-    this.usage += size
-    this.items[this.end] = item
-    this.end += 1
-  }
-
   private enforceCapacityConstraints(addedItemSize: number) {
     const remainingSize = this.capacity - (this.usage + addedItemSize)
     if (remainingSize < 0) {
@@ -62,9 +46,27 @@ export class RingBuffer<T extends Lengthwise> {
   }
 
   private dropFirst() {
-    const freedSpace = this.items[this.start].length
-    this.usage -= freedSpace
+    const firstItem = this.items[this.start]
     delete this.items[this.start]
     this.start += 1
+
+    const freedSpace = firstItem.length
+    this.usage -= freedSpace
+  }
+
+  public clone(): RingBuffer<T> {
+    return new RingBuffer(this.capacity, this.maxItems, this)
+  }
+
+  public toArray() {
+    return this.items.slice(this.start, this.end)
+  }
+
+  public add(item: T) {
+    const size = item.length
+    this.enforceCapacityConstraints(size)
+    this.usage += size
+    this.items[this.end] = item
+    this.end += 1
   }
 }

backend/src/Model/Tree.ts

@@ -1,5 +1,11 @@
+import { ChangeBuffer } from './ChangeBuffer'
+import {
+  EventBusInterface,
+  EventDispatcher,
+  makeConnectionMessageEvent,
+  MqttMessage
+} from '../../../events'
 import { TreeNode } from './'
-import { EventBusInterface, makeConnectionMessageEvent, MqttMessage, EventDispatcher } from '../../../events'
 import { TreeNodeFactory } from './TreeNodeFactory'
 
 export class Tree<ViewModel> extends TreeNode<ViewModel> {
@@ -9,14 +15,26 @@ export class Tree<ViewModel> extends TreeNode<ViewModel> {
   private subscriptionEvent?: any
   public isTree = true
   private cachedHash = `${Math.random()}`
-  private unmergedMessages: MqttMessage[] = []
-  public didReceive = new EventDispatcher<void, Tree<ViewModel>>(this)
+  private unmergedMessages: ChangeBuffer = new ChangeBuffer()
+  public didReceive = new EventDispatcher<void, Tree<ViewModel>>()
 
   constructor() {
     super(undefined, undefined)
   }
 
-  public updateWithConnection(emitter: EventBusInterface, connectionId: string, nodeFilter?:(node: TreeNode<ViewModel>) => boolean) {
+  private handleNewData = (msg: MqttMessage) => {
+    this.unmergedMessages.push(msg)
+    this.didReceive.dispatch()
+  }
+
+  public destroy() {
+    super.destroy()
+    this.updateSource && this.updateSource.unsubscribe(this.subscriptionEvent, this.handleNewData)
+    this.updateSource = undefined
+    this.didReceive.removeAllListeners()
+  }
+
+  public updateWithConnection(emitter: EventBusInterface, connectionId: string, nodeFilter?: (node: TreeNode<ViewModel>) => boolean) {
     this.updateSource = emitter
     this.connectionId = connectionId
     this.nodeFilter = nodeFilter
@@ -30,21 +48,19 @@ export class Tree<ViewModel> extends TreeNode<ViewModel> {
   }
 
   public applyUnmergedChanges() {
-    this.unmergedMessages.forEach((msg) => {
+    this.unmergedMessages.popAll().forEach((msg) => {
       const edges = msg.topic.split('/')
-      const node = TreeNodeFactory.fromEdgesAndValue<ViewModel, any>(edges, msg.payload)
+      const node = TreeNodeFactory.fromEdgesAndValue<ViewModel>(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 unmergedChanges(): ChangeBuffer {
+    return this.unmergedMessages
   }
 
   public stopUpdating() {

backend/src/Model/TreeNode.ts

@@ -5,34 +5,23 @@ export class TreeNode<ViewModel> {
   public sourceEdge?: Edge<ViewModel>
   public message?: Message
   public mqttMessage?: MqttMessage
-  public messageHistory: RingBuffer<Message> = new RingBuffer<Message>(3000, 100)
+  public messageHistory: RingBuffer<Message> = new RingBuffer<Message>(20000, 100)
   public viewModel?: ViewModel
   public edges: {[s: string]: Edge<ViewModel>} = {}
-  public edgeArray: Edge<ViewModel>[] = []
+  public edgeArray: Array<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 onMerge = new EventDispatcher<void, TreeNode<ViewModel>>()
+  public onEdgesChange = new EventDispatcher<void, TreeNode<ViewModel>>()
+  public onMessage = new EventDispatcher<Message, TreeNode<ViewModel>>()
   public isTree = false
 
   private cachedPath?: string
-  private cachedChildTopics?: TreeNode<ViewModel>[]
+  private cachedChildTopics?: Array<TreeNode<ViewModel>>
   private cachedLeafMessageCount?: number
   private cachedChildTopicCount?: number
 
-  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
@@ -57,6 +46,85 @@ export class TreeNode<ViewModel> {
     })
   }
 
+  private previous(): TreeNode<ViewModel> | undefined {
+    return this.sourceEdge ? this.sourceEdge.source || undefined : undefined
+  }
+
+  private isTopicEmptyLeaf() {
+    const hasNoMessage = (!this.message || !this.message.value || this.message.value.length === 0)
+    return hasNoMessage && this.isLeaf()
+  }
+
+  private isLeaf() {
+    return this.edgeArray.length === 0
+  }
+
+  private removeFromParent() {
+    const previous = this.previous()
+    if (!previous || !this.sourceEdge) {
+      return
+    }
+    previous.removeEdge(this.sourceEdge)
+  }
+
+  private findChild(edges: Array<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
+
+    for (const edgeKey of edgeKeys) {
+      const matchingEdge = this.edges[edgeKey]
+      if (matchingEdge) {
+        matchingEdge.target.updateWithNode(node.edges[edgeKey].target)
+      } else {
+        this.addEdge(node.edges[edgeKey], false)
+        edgesDidUpdate = true
+      }
+    }
+
+    if (edgesDidUpdate) {
+      this.onEdgesChange.dispatch()
+    }
+  }
+
+  public destroy() {
+    for (const edge of this.edgeArray) {
+      edge.target.destroy()
+    }
+    this.edgeArray = []
+    this.edges = {}
+    this.cachedChildTopics = []
+    this.sourceEdge = undefined
+    this.onMerge.removeAllListeners()
+    this.onEdgesChange.removeAllListeners()
+    this.onMessage.removeAllListeners()
+    this.messageHistory = new RingBuffer<Message>(1, 1)
+    this.message = undefined
+  }
+
+  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
+  }
+
   public setMessage(message: Message) {
     this.messageHistory.add(message)
     this.message = message
@@ -82,10 +150,6 @@ export class TreeNode<ViewModel> {
     return this.cachedPath
   }
 
-  private previous(): TreeNode<ViewModel> | undefined {
-    return this.sourceEdge ? this.sourceEdge.source || undefined : undefined
-  }
-
   public addEdge(edge: Edge<ViewModel>, emitUpdate: boolean = false) {
     this.edges[edge.name] = edge
     this.edgeArray.push(edge)
@@ -96,7 +160,7 @@ export class TreeNode<ViewModel> {
     }
   }
 
-  public branch(): TreeNode<ViewModel>[] {
+  public branch(): Array<TreeNode<ViewModel>> {
     const previous = this.previous()
     if (!previous) {
       return [this]
@@ -105,30 +169,12 @@ export class TreeNode<ViewModel> {
     return previous.branch().concat([this])
   }
 
-  private isTopicEmptyLeaf() {
-    const hasNoMessage = (!this.message || !this.message.value)
-    return hasNoMessage && this.isLeaf()
-  }
-
-  private isLeaf() {
-    return this.edgeArray.length === 0
-  }
-
-  private removeFromParent() {
-    const previous = this.previous()
-    if (!previous || !this.sourceEdge) {
-      return
-    }
-    previous.removeEdge(this.sourceEdge)
-  }
-
   public removeEdge(edge: Edge<any>) {
     delete this.edges[edge.name]
     this.edgeArray = Object.values(this.edges)
     this.onMerge.dispatch()
 
     if (this.isTopicEmptyLeaf()) {
-      debugger
       this.removeFromParent()
     }
   }
@@ -172,7 +218,7 @@ export class TreeNode<ViewModel> {
     return this.edgeArray.length
   }
 
-  public childTopics(): TreeNode<ViewModel>[] {
+  public childTopics(): Array<TreeNode<ViewModel>> {
     if (this.cachedChildTopics === undefined) {
       const initialValue = this.message && this.message.value ? [this] : []
 
@@ -181,44 +227,12 @@ export class TreeNode<ViewModel> {
         .reduce((a, b) => a.concat(b), initialValue)
     }
 
-    return this.cachedChildTopics as TreeNode<ViewModel>[]
+    return this.cachedChildTopics as Array<TreeNode<ViewModel>>
   }
 
-  public findNode (path: String): TreeNode<ViewModel> | undefined {
+  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
-
-    for (const edgeKey of edgeKeys) {
-      const matchingEdge = this.edges[edgeKey]
-      if (matchingEdge) {
-        matchingEdge.target.updateWithNode(node.edges[edgeKey].target)
-      } else {
-        this.addEdge(node.edges[edgeKey], false)
-        edgesDidUpdate = true
-      }
-    }
-
-    if (edgesDidUpdate) {
-      this.onEdgesChange.dispatch()
-    }
-  }
 }

backend/src/Model/TreeNodeFactory.ts

@@ -1,11 +1,9 @@
+import { Base64Message } from './Base64Message'
 import { Edge, Tree, TreeNode } from './'
 
-interface HasLength {
-  length: number
-}
-
 export abstract class TreeNodeFactory {
-  public static insertNodeAtPosition<ViewModel>(edgeNames: string[], node: TreeNode<ViewModel>) {
+  private static messageCounter = 0
+  public static insertNodeAtPosition<ViewModel>(edgeNames: Array<string>, node: TreeNode<ViewModel>) {
     let currentNode: TreeNode<ViewModel> = new Tree()
     let edge
     for (const edgeName of edgeNames) {
@@ -18,13 +16,15 @@ export abstract class TreeNodeFactory {
     node.sourceEdge!.target = node
   }
 
-  public static fromEdgesAndValue<ViewModel, T extends HasLength>(edgeNames: string[], value?: T): TreeNode<ViewModel> {
+  public static fromEdgesAndValue<ViewModel>(edgeNames: Array<string>, value?: Base64Message | null): TreeNode<ViewModel> {
     const node = new TreeNode<ViewModel>()
     node.setMessage({
-      value,
+      value: value || undefined,
       length: value ? value.length : 0,
       received: new Date(),
+      messageNumber: this.messageCounter,
     })
+    this.messageCounter += 1
 
     this.insertNodeAtPosition<ViewModel>(edgeNames, node)
 

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

@@ -1,11 +1,10 @@
-import 'mocha'
 import { EventDispatcher } from '../../../../events'
-
 import { expect } from 'chai'
+import 'mocha'
 
 describe('EventDispatcher', async () => {
-  it('should dispatch', async function () {
-    const dispatcher = new EventDispatcher<string, string>('me')
+  it('should dispatch', async function() {
+    const dispatcher = new EventDispatcher<string, string>()
     this.timeout(300)
 
     setTimeout(() => dispatcher.dispatch('hello'), 5)
@@ -18,8 +17,8 @@ describe('EventDispatcher', async () => {
     expect(response).to.eq('hello')
   })
 
-  it('should unsubscribe', async function () {
-    const dispatcher = new EventDispatcher<string, string>('me')
+  it('should unsubscribe', async function() {
+    const dispatcher = new EventDispatcher<string, string>()
     this.timeout(300)
     let incrementee = 0
     const callback = (msg: any) => {

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

@@ -2,8 +2,11 @@ import 'mocha'
 
 import { TreeNodeFactory } from  '../'
 import { expect } from 'chai'
+import { Base64Message } from '../Base64Message';
 
 describe('TreeNode', () => {
+  const number3 = Base64Message.fromString("3")
+  const number5 = Base64Message.fromString("5")
   it('firstNode should retrieve first node', () => {
     const topics = 'foo/bar'.split('/')
     const leaf = TreeNodeFactory.fromEdgesAndValue(topics, undefined)
@@ -13,40 +16,40 @@ describe('TreeNode', () => {
 
   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, Base64Message.fromString('3'))
+    expect(Base64Message.toUnicodeString(leaf.message!.value!)).to.eq('3')
+    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics, Base64Message.fromString('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(Base64Message.toUnicodeString(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, Base64Message.fromString('3'))
+    expect(Base64Message.toUnicodeString(leaf.message!.value!)).to.eq('3')
 
     const topics2 = 'foo/bar'.split('/')
-    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics2, '5')
+    const updateLeave = TreeNodeFactory.fromEdgesAndValue(topics2, Base64Message.fromString('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(Base64Message.toUnicodeString(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(Base64Message.toUnicodeString(leaf.message!.value!)).to.eq('3')
   })
 
   it('updateWithNode should add nodes to the tree', () => {
     const topics1 = 'foo/bar'.split('/')
-    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, 'foo')
+    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, Base64Message.fromString('foo'))
 
     const topics2 = 'foo/bar/baz'.split('/')
-    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, 'bar')
+    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, Base64Message.fromString('bar'))
 
     leaf1.firstNode().updateWithNode(leaf2.firstNode())
 

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

@@ -2,6 +2,7 @@ import 'mocha'
 
 import { TreeNodeFactory } from '../'
 import { expect } from 'chai'
+import { Base64Message } from '../Base64Message';
 
 describe('TreeNodeFactory', () => {
   it('root node must not have a sourceEdge', () => {
@@ -15,7 +16,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, Base64Message.fromString('5'))
 
     if (!node.sourceEdge || !node.sourceEdge.source || !node.message) {
       expect.fail('should not happen')
@@ -24,7 +25,7 @@ describe('TreeNodeFactory', () => {
 
     expect(node).to.not.eq(undefined)
     expect(node.sourceEdge.name).to.eq('bar')
-    expect(node.message.value).to.eq('5')
+    expect(Base64Message.toUnicodeString(node.message.value!)).to.eq('5')
 
     const foo = node.firstNode().findNode('foo')
     expect(foo && foo.sourceEdge && foo.sourceEdge.name).to.eq('foo')
@@ -33,14 +34,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, Base64Message.fromString('5'))
 
     if (!node.sourceEdge || !node.sourceEdge.source || !node.message) {
       expect.fail('should not happen')
       return
     }
 
-    expect(node.message.value).to.eq('5')
+    expect(Base64Message.toUnicodeString(node.message.value!)).to.eq('5')
     expect(node.sourceEdge.name).to.eq('baz')
 
     const barNode = node.sourceEdge.source