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

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

Changelog.md

@@ -0,0 +1,12 @@
+# 0.2.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.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,41 +1,66 @@
-# MQTT-Explorer
-[![Downloads](https://github-basic-badges.herokuapp.com/release/thomasnordquist/MQTT-Explorer.svg)](https://travis-ci.org/thomasnordquist/MQTT-Explorer/releases)
+# [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://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 0.1.0
-See the whole picture of your message queue.
-The perfect tool to integrate new services, IoT devices in your network.
-This application subscribes to all topics on your MQTT-Server and displays your message queue hierarchy, allowing you to drill-down to the topics that are of interest.
+|   |   |   |
+|:---:|:---:|:---:|
+|[![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)|
 
-## Download
-The app is prebuilt for Windows ([portable](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.1.0/MQTT-Explorer-0.1.0.exe), [installer](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.1.0/MQTT-Explorer-Setup-0.1.0.exe)), Linux ([AppImage](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.1.0/MQTT-Explorer-0.1.0-x86_64.AppImage)) and Mac ([dmg](https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v0.1.0/MQTT-Explorer-0.1.0.dmg)).
+# 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.
 
-<center>
+This page is dedicated to its development.
+Pull-Requests and error reports are welcome.
 
-| | | | 
-|:----------|:-------------:|:------:|
-| ![windows](https://user-images.githubusercontent.com/7721625/51445407-b4172080-1d04-11e9-8c70-d8413d1d6d8b.png) | Windows | [portable](https:&#x2F;&#x2F;github.com&#x2F;thomasnordquist&#x2F;MQTT-Explorer&#x2F;releases&#x2F;download&#x2F;v0.1.0&#x2F;MQTT-Explorer-0.1.0.exe), [installer](https:&#x2F;&#x2F;github.com&#x2F;thomasnordquist&#x2F;MQTT-Explorer&#x2F;releases&#x2F;download&#x2F;v0.1.0&#x2F;MQTT-Explorer-Setup-0.1.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.1.0&#x2F;MQTT-Explorer-0.1.0-x86_64.AppImage)<br>*Run AppImage:<br>Make it executable and double-click it.* | 
-| ![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.1.0&#x2F;MQTT-Explorer-0.1.0.dmg) | 
-
-</center>
-
-More architectures and package types: [Downloads](https://github.com/thomasnordquist/MQTT-Explorer/releases)
-
-![screen1](https://user-images.githubusercontent.com/7721625/51441563-41418180-1cd3-11e9-893b-c22f6a6c3695.png)
-
-![screen2](https://user-images.githubusercontent.com/7721625/51441470-59fd6780-1cd2-11e9-925f-bc491027300c.png)
+## Run from sources
 
+```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, `src` contains all the electron bindings. [mqttjs](https://github.com/mqttjs/MQTT.js) is used to facilitate communication to MQTT brokers.
 
-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 regularly on travis.
+
+  - Data model
+  - MQTT integration
+  - UI-Tests (The demo is a recorded ui test)
+
+## Run UI-tests
+A [mosquitto](https://mosquitto.org/) MQTT broker is required to run the ui-tests.
+
+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
-Not yet decided which license exactly, but the basic idea is: "You may do whatever you want with this tool, except sell it."
+
+![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,41 +0,0 @@
-# MQTT-Explorer
-[![Downloads](https://github-basic-badges.herokuapp.com/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)
-
-### Version {{ version }}
-See the whole picture of your message queue.
-The perfect tool to integrate new services, IoT devices in your network.
-This application subscribes to all topics on your MQTT-Server and displays your message queue hierarchy, allowing you to drill-down to the topics that are of interest.
-
-## Download
-The app is prebuilt for Windows ({{windowsTargets}}), Linux ({{linuxTargets}}) and Mac ({{macTargets}}).
-
-<center>
-
-| | | | 
-|:----------|:-------------:|:------:|
-| ![windows](https://user-images.githubusercontent.com/7721625/51445407-b4172080-1d04-11e9-8c70-d8413d1d6d8b.png) | Windows | {{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.* | 
-| ![mac](https://user-images.githubusercontent.com/7721625/51445390-921d9e00-1d04-11e9-8339-351469ef20ae.png) | Mac | {{macTargets}} | 
-
-</center>
-
-More architectures and package types: [Downloads](https://github.com/thomasnordquist/MQTT-Explorer/releases)
-
-![screen1](https://user-images.githubusercontent.com/7721625/51441563-41418180-1cd3-11e9-893b-c22f6a6c3695.png)
-
-![screen2](https://user-images.githubusercontent.com/7721625/51441470-59fd6780-1cd2-11e9-925f-bc491027300c.png)
-
-
-## 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.
-
-## License
-Not yet decided which license exactly, but the basic idea is: "You may do whatever you want with this tool, except sell it."

app/index.html

@@ -1,120 +1,111 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <meta charset="UTF-8" />
-        <title>MQTT-Explorer</title>
-        <script src="./build/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,53 +4,71 @@
   "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",
+  "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",
+    "diff": "^4.0.1",
+    "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
+    "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",
+    "react": "16.8",
+    "react-ace": "^6.3.2",
+    "react-dom": "^16.7.0",
+    "react-redux": "^6.0.0",
+    "react-resize-detector": "^3.4.0",
+    "react-split-pane": "^0.1.85",
+    "react-vis": "^1.11.6",
+    "redux": "^4.0.1",
+    "redux-batched-actions": "^0.4.1",
+    "redux-thunk": "^2.3.0",
+    "sha1": "^1.1.1",
+    "socket.io-client": "^2.2.0",
+    "uuid": "^3.3.2"
+  },
   "devDependencies": {
-    "@material-ui/icons": "^3.0.1",
+    "@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",
-    "css-loader": "^2.1.0",
-    "electron-nucleus": "^1.11.0",
-    "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git",
-    "html-webpack-plugin": "^4.0.0-beta.5",
-    "number-abbreviate": "^2.0.0",
-    "react": "^16.8.0-alpha.1",
-    "react-dom": "^16.7.0",
-    "react-redux": "^6.0.0",
-    "react-vis": "^1.11.6",
-    "redux": "^4.0.1",
-    "style-loader": "^0.23.1",
-    "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-livereload-plugin": "^2.2.0"
-  },
-  "dependencies": {
-    "@material-ui/core": "^3.9.0",
-    "@material-ui/styles": "^3.0.0-alpha.8",
-    "@types/node": "^10.12.18",
     "@types/react-resize-detector": "^3.1.0",
-    "@types/react-split-pane": "^0.1.67",
     "@types/sha1": "^1.1.1",
     "@types/socket.io-client": "^1.4.32",
+    "@types/uuid": "^3.4.4",
     "@types/vis": "^4.21.9",
     "awesome-typescript-loader": "^5.2.1",
-    "copy-text-to-clipboard": "^1.0.4",
-    "jquery": "^3.3.1",
-    "lodash.throttle": "^4.1.1",
-    "moving-average": "^1.0.0",
-    "react-ace": "^6.3.2",
-    "react-json-view": "^1.19.1",
-    "react-resize-detector": "^3.4.0",
-    "react-split-pane": "^0.1.85",
-    "redux-batched-actions": "^0.4.1",
-    "sha1": "^1.1.1",
-    "socket.io-client": "^2.2.0",
+    "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",
     "webpack": "^4.28.2",
+    "webpack-bundle-analyzer": "^3.0.3",
     "webpack-cli": "^3.1.2",
     "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/App.tsx

@@ -1,123 +0,0 @@
-import * as React from 'react'
-import * as q from '../../backend/src/Model'
-
-import { Theme, withStyles } from '@material-ui/core/styles'
-
-import { AppState } from './reducers'
-import Connection from './components/ConnectionSetup/Connection'
-import CssBaseline from '@material-ui/core/CssBaseline'
-const Settings = React.lazy(() => import('./components/Settings'))
-import Sidebar from './components/Sidebar/Sidebar'
-import TitleBar from './components/TitleBar'
-import Tree from './components/Tree/Tree'
-import UpdateNotifier from './UpdateNotifier'
-import { connect } from 'react-redux'
-import ErrorBoundary from './ErrorBoundary'
-import { default as SplitPane } from 'react-split-pane'
-
-interface Props {
-  name: string
-  connectionId: string
-  classes: any
-  settingsVisible: boolean
-}
-
-class App extends React.PureComponent<Props, {}> {
-  constructor(props: any) {
-    super(props)
-    this.state = { }
-  }
-
-  public render() {
-    const { settingsVisible } = this.props
-    const { content, contentShift, centerContent, paneDefaults, heightProperty } = this.props.classes
-
-    return (
-      <div className={centerContent}>
-        <CssBaseline />
-        <ErrorBoundary>
-          <React.Suspense fallback={<div>Loading...</div>}>
-            <Settings />
-          </React.Suspense>
-          <div className={centerContent}>
-            <div className={`${settingsVisible ? contentShift : content}`}>
-                <TitleBar />
-            </div>
-            <div>
-              <SplitPane
-                step={48}
-                primary="second"
-                className={`${settingsVisible ? contentShift : content} ${heightProperty}`}
-                split="vertical"
-                minSize={250}
-                defaultSize={500}
-                allowResize={true}
-                pane1Style={{ overflow: 'hidden' }}
-              >
-                <div className={paneDefaults}>
-                  <Tree />
-                </div>
-                <div className={paneDefaults}>
-                  <Sidebar connectionId={this.props.connectionId} />
-                </div>
-              </SplitPane>
-            </div>
-          </div>
-          <UpdateNotifier />
-          <Connection />
-        </ErrorBoundary>
-      </div >
-    )
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    settingsVisible: state.settings.visible,
-    connectionId: state.connection.connectionId,
-  }
-}
-
-const styles = (theme: Theme) => {
-  const drawerWidth = 300
-  return {
-    heightProperty: {
-      height: 'calc(100vh - 64px) !important',
-    },
-    paneDefaults: {
-      backgroundColor: theme.palette.background.default,
-      color: theme.palette.text.primary,
-      overflowY: 'scroll' as 'scroll',
-      overflowX: 'hidden' as 'hidden',
-      display: 'block' as 'block',
-      height: 'calc(100vh - 64px)',
-    },
-    centerContent: {
-      width: '100vw',
-      overflow: 'hidden' as 'hidden',
-    },
-    content: {
-      width: '100vw',
-      overflowX: 'hidden',
-      backgroundColor: theme.palette.background.default,
-      transition: theme.transitions.create('transform', {
-        easing: theme.transitions.easing.sharp,
-        duration: theme.transitions.duration.leavingScreen,
-      }),
-      transform: 'translateX(0px)',
-    },
-    contentShift: {
-      overflowX: 'hidden',
-      width: '100vw',
-      padding: 0,
-      backgroundColor: theme.palette.background.default,
-      transition: theme.transitions.create('transform', {
-        easing: theme.transitions.easing.easeOut,
-        duration: theme.transitions.duration.enteringScreen,
-      }),
-      transform: `translateX(${drawerWidth}px)`,
-    },
-  }
-}
-
-export default withStyles(styles)(connect(mapStateToProps)(App))

app/src/actions/Connection.ts

@@ -1,12 +1,20 @@
-import { ActionTypes, Action, ConnectionState } from '../reducers/Connection'
-import { MqttOptions } from '../../../backend/src/DataSource'
-import { Dispatch } from 'redux'
-import { rendererEvents, addMqttConnectionEvent, makeConnectionStateEvent, removeConnection } from '../../../events'
-import { AppState } from '../reducers'
 import * as q from '../../../backend/src/Model'
-import { showTree } from './Tree'
 import * as url from 'url'
-import { TopicViewModel } from '../TopicViewModel'
+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'
 
 export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
   dispatch(connecting(connectionId))
@@ -15,41 +23,72 @@ export const connect = (options: MqttOptions, connectionId: string) => (dispatch
   const host = url.parse(options.url).hostname
 
   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())
     }
+    dispatch(updateHealth(dataSourceState))
   })
 }
 
-export const connected: (tree: q.Tree<TopicViewModel>, host: string) => Action = (tree: q.Tree<TopicViewModel>, host: string)  => ({
+const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  let state
+  if (dataSourceState.connecting) {
+    state = 'connecting'
+  } else if (!dataSourceState.connected) {
+    state = 'offline'
+    dispatch(globalActions.showError('Disconnected from server'))
+  } else if (dataSourceState.connected) {
+    state = 'online'
+  } else {
+    state = undefined
+  }
+
+  dispatch({
+    type: ActionTypes.CONNECTION_SET_HEALTH,
+    health: state,
+  })
+}
+
+export const connected: (tree: q.Tree<TopicViewModel>, host: string) => Action = (tree: q.Tree<TopicViewModel>, host: string) => ({
   tree,
   host,
   type: ActionTypes.CONNECTION_SET_CONNECTED,
 })
 
-export const connecting: (connectionId: string) => Action = (connectionId: string)  => ({
+export const connecting: (connectionId: string) => Action = (connectionId: string) => ({
   connectionId,
   type: ActionTypes.CONNECTION_SET_CONNECTING,
 })
 
-export const showError = (error?: string) => ({
-  error,
-  type: ActionTypes.CONNECTION_SET_SHOW_ERROR,
-})
-
-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

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

app/src/actions/Global.ts

@@ -0,0 +1,22 @@
+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,34 +1,99 @@
-import { Action, ActionTypes, TopicOrder } from '../reducers/Settings'
-import { ActionTypes as TreeActionTypes } from '../reducers/Tree'
-import { Dispatch } from 'redux'
-import { showTree } from './Tree'
-import { AppState } from '../reducers'
 import * as q from '../../../backend/src/Model'
+import { AppState } from '../reducers'
+import { autoExpandLimitSet } from '../components/SettingsDrawer/Settings'
 import { batchActions } from 'redux-batched-actions'
-import { autoExpandLimitSet } from '../components/Settings'
-import { TopicViewModel } from '../TopicViewModel'
+import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
+import { Dispatch } from 'redux'
+import { showError } from './Global'
+import { showTree } from './Tree'
+import { TopicViewModel } from '../model/TopicViewModel'
+import {
+  ActionTypes,
+  SettingsState,
+  TopicOrder,
+} from '../reducers/Settings'
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { globalActions } from '.'
 
-export const setAutoExpandLimit = (autoExpandLimit: number = 0): Action => {
-  return {
+const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
+  id: 'Settings',
+}
+
+export const loadSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState) => {
+  try {
+    const settings = await persistentStorage.load(settingsIdentifier) || {}
+    dispatch({
+      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) => {
+  const settings = {
+    ...getState().settings.toJS(),
+    autoExpandLimit: undefined,
+    topicFilter: undefined,
+    visible: undefined,
+  }
+
+  try {
+    await persistentStorage.store(settingsIdentifier, settings)
+  } catch (error) {
+    dispatch(showError(error))
+  }
+}
+
+export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>) => {
+  dispatch({
     autoExpandLimit,
     type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
-  }
+  })
 }
 
-export const toggleSettingsVisibility = (): Action => {
-  return {
-    type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY,
-  }
+export const setTimeLocale = (timeLocale: string) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    timeLocale,
+    type: ActionTypes.SETTINGS_SET_TIME_LOCALE,
+  })
+  dispatch(storeSettings())
 }
 
-export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none): Action => {
-  return {
+export const selectTopicWithMouseOver = (doSelect: boolean) => (dispatch: Dispatch<any>) => {
+  dispatch({
+    selectTopicWithMouseOver: doSelect,
+    type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER,
+  })
+  dispatch(storeSettings())
+}
+
+export const setValueDisplayMode = (valueRendererDisplayMode: 'diff' | 'raw') => (dispatch: Dispatch<any>) => {
+  dispatch({
+    valueRendererDisplayMode,
+    type: ActionTypes.SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE,
+  })
+  dispatch(storeSettings())
+}
+
+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>) => {
+  dispatch({
     topicOrder,
     type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
-  }
+  })
+  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({
@@ -36,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
   }
@@ -49,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)
   }
 
@@ -87,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,21 +1,53 @@
-import { Dispatch, Action } from 'redux'
+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<Action>, getState: () => AppState)  => {
-  const { selectedTopic } = getState().tree
-  const { connectionId } = getState().connection
+export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+  const selectedTopic = getState().tree.get('selectedTopic')
+  if (!selectedTopic) {
+    return
+  }
 
-  if (!selectedTopic || !connectionId) {
+  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) {
     return
   }
 
   const publishEvent = makePublishEvent(connectionId)
   const mqttMessage = {
-    topic: selectedTopic.path(),
+    topic: topic.path(),
     payload: null,
     retain: true,
     qos: 0 as 0,
   }
   rendererEvents.emit(publishEvent, mqttMessage)
+
+  if (recursive) {
+    topic.childTopics()
+      .filter(topic => Boolean(topic.message && topic.message.value))
+      .slice(0, subtopicClearLimit)
+      .forEach((topic) => {
+        console.log('deleting', topic.path())
+        const mqttMessage = {
+          topic: topic.path(),
+          payload: null,
+          retain: true,
+          qos: 0 as 0,
+        }
+        rendererEvents.emit(publishEvent, mqttMessage)
+      })
+  }
 }

app/src/actions/Tree.ts

@@ -1,25 +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)  => {
-  const { selectedTopic } = getState().tree
-  if (selectedTopic === topic) {
+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 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) {
@@ -31,24 +41,65 @@ export const selectTopic = (topic: q.TreeNode<TopicViewModel>) => (dispatch: Dis
     type: ActionTypes.TREE_SELECT_TOPIC,
   }
 
+  dispatch({
+    type: SidebarActionTypes.SIDEBAR_SET_COMPARE_MESSAGE,
+    message: undefined,
+  })
+
   if (setTopicDispatch) {
     dispatch(batchActions([selectTreeTopicDispatch, setTopicDispatch]))
   } else {
     dispatch(selectTreeTopicDispatch)
   }
-}
+}, 70)
 
-export const showTree = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatch<any>, getState: () => AppState): AnyAction  => {
-  const visibleTree = getState().tree.tree
-  const connectionTree = getState().connection.tree
+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,8 +1,10 @@
-import * as settingsActions from './Settings'
+import * as connectionActions from './Connection'
+import * as connectionManagerActions from './ConnectionManager'
+import * as globalActions from './Global'
 import * as publishActions from './Publish'
+import * as settingsActions from './Settings'
+import * as sidebarActions from './Sidebar'
 import * as treeActions from './Tree'
 import * as updateNotifierActions from './UpdateNotifier'
-import * as connectionActions from './Connection'
-import * as sidebarActons from './Sidebar'
 
-export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons }
+export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActions, connectionManagerActions, globalActions }

app/src/components/App.tsx

@@ -0,0 +1,152 @@
+import * as React from 'react'
+import ConnectionSetup from './ConnectionSetup/ConnectionSetup'
+import CssBaseline from '@material-ui/core/CssBaseline'
+import ErrorBoundary from './ErrorBoundary'
+import Notification from './Layout/Notification'
+import TitleBar from './Layout/TitleBar'
+import UpdateNotifier from './UpdateNotifier'
+import { AppState } from '../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { globalActions, settingsActions } from '../actions'
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+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, {}> {
+  constructor(props: any) {
+    super(props)
+    this.state = { }
+  }
+
+  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={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.renderNotification()}
+          <React.Suspense fallback={<div></div>}>
+            <Settings />
+          </React.Suspense>
+          <div className={centerContent}>
+            <div className={`${settingsVisible ? contentShift : content}`}>
+              <TitleBar />
+            </div>
+            <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>
+    )
+  }
+}
+
+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',
+    },
+    paneDefaults: {
+      backgroundColor: theme.palette.background.default,
+      color: theme.palette.text.primary,
+      overflowY: 'scroll' as 'scroll',
+      overflowX: 'hidden' as 'hidden',
+      display: 'block' as 'block',
+      height: 'calc(100vh - 64px)',
+    },
+    centerContent: {
+      width: '100vw',
+      overflow: 'hidden' as 'hidden',
+    },
+    content: {
+      ...contentBaseStyle,
+      transition: theme.transitions.create('transform', {
+        easing: theme.transitions.easing.sharp,
+        duration: theme.transitions.duration.leavingScreen,
+      }),
+      transform: 'translateX(0px)',
+    },
+    contentShift: {
+      ...contentBaseStyle,
+      backgroundColor: theme.palette.background.default,
+      transition: theme.transitions.create('transform', {
+        easing: theme.transitions.easing.easeOut,
+        duration: theme.transitions.duration.enteringScreen,
+      }),
+      transform: `translateX(${drawerWidth}px)`,
+    },
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(globalActions, dispatch),
+    settingsActions: bindActionCreators(settingsActions, dispatch),
+  }
+}
+
+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/ConnectionSetup/AddButton.tsx

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

app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx

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

app/src/components/ConnectionSetup/Connection.tsx

@@ -1,395 +0,0 @@
-import * as React from 'react'
-
-import {
-  Button,
-  CircularProgress,
-  FormControl,
-  FormControlLabel,
-  Grid,
-  IconButton,
-  Input,
-  InputAdornment,
-  InputLabel,
-  MenuItem,
-  Modal,
-  Paper,
-  Switch,
-  TextField,
-  Toolbar,
-  Typography,
-} from '@material-ui/core'
-import { connect } from 'react-redux'
-import { MqttOptions } from '../../../../backend/src/DataSource'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
-import Notification from './Notification'
-import Visibility from '@material-ui/icons/Visibility'
-import VisibilityOff from '@material-ui/icons/VisibilityOff'
-
-const sha1 = require('sha1')
-import { AppState } from '../../reducers'
-import { bindActionCreators } from 'redux'
-import { connectionActions } from '../../actions'
-
-interface Props {
-  classes: {[s: string]: string}
-  actions: typeof connectionActions,
-  visible: boolean
-  connected: boolean
-  connecting: boolean
-  error?: string
-}
-
-const protocols = [
-  'mqtt://',
-  'ws://',
-]
-
-interface State {
-  showPassword: boolean
-  connectionSettings: ConnectionSettings
-}
-
-interface ConnectionSettings {
-  host: string
-  protocol: string
-  port: number
-  tls: boolean
-  certValidation: boolean
-  clientId: string
-  connectionId?: string
-  username: string
-  password: string
-}
-
-declare var window: any
-
-class Connection extends React.Component<Props, State> {
-  private randomClientId: string
-  private defaultConnectionSettings: ConnectionSettings = {
-    host: 'iot.eclipse.org',
-    protocol: protocols[0],
-    port: 1883,
-    tls: false,
-    certValidation: true,
-    clientId: '',
-    username: '',
-    password: '',
-    connectionId: undefined,
-  }
-
-  constructor(props: any) {
-    super(props)
-
-    const clientIdSha = sha1(`${Math.random()}`).slice(0, 8)
-    this.randomClientId = `mqtt-explorer-${clientIdSha}`
-    this.state = {
-      connectionSettings: this.loadConnectionSettings(),
-      showPassword: false,
-    }
-  }
-
-  private loadConnectionSettings(): ConnectionSettings {
-    let storedSettings: ConnectionSettings | undefined
-
-    const storedSettingsString = window.localStorage.getItem('connectionSettings')
-    try {
-      storedSettings = storedSettingsString ? JSON.parse(storedSettingsString) : undefined
-    } catch {
-      window.localStorage.setItem('connectionSettings', undefined)
-    }
-
-    return storedSettings || this.defaultConnectionSettings
-  }
-
-  private saveConnectionSettings() {
-    window.localStorage.setItem('connectionSettings', JSON.stringify(this.state.connectionSettings))
-  }
-
-  private handleClickShowPassword = () => {
-    this.setState({ showPassword: !this.state.showPassword })
-  }
-
-  private optionsFromState(): MqttOptions {
-    const protocol = this.state.connectionSettings.protocol === 'tcp://' ? 'mqtt://' : this.state.connectionSettings.protocol
-    const url = `${protocol}${this.state.connectionSettings.host}:${this.state.connectionSettings.port}`
-
-    return {
-      url,
-      username: this.state.connectionSettings.username || undefined,
-      password: this.state.connectionSettings.password || undefined,
-      clientId: this.state.connectionSettings.clientId || this.randomClientId,
-      tls: this.state.connectionSettings.tls,
-      certValidation: this.state.connectionSettings.certValidation,
-    }
-  }
-
-  public static styles: StyleRulesCallback<string> = (theme: Theme) => {
-    return {
-      root: {
-        minWidth: 550,
-        maxWidth: 650,
-        backgroundColor: theme.palette.background.default,
-        margin: '14vh auto auto auto',
-        padding: `${2 * theme.spacing.unit}px`,
-        outline: 'none',
-      },
-      title: {
-        color: theme.palette.text.primary,
-      },
-      paper: {
-        padding: theme.spacing.unit * 2,
-        textAlign: 'center',
-        color: theme.palette.text.secondary,
-      },
-      textField: {
-        width: '100%',
-      },
-      switch: {
-        marginTop: `${1 * theme.spacing.unit}px`,
-      },
-      button: {
-        margin: theme.spacing.unit,
-      },
-      inputFormControl: {
-        marginTop: '16px',
-      },
-    }
-  }
-
-  private handleChange = (name: string) => (event: any) => {
-    this.setState({
-      connectionSettings: {
-        ...this.state.connectionSettings,
-        [name]: event.target.value,
-      },
-    })
-  }
-
-  public render() {
-    const { classes } = this.props
-
-    const passwordVisibilityButton = (
-      <InputAdornment position="end">
-        <IconButton
-          aria-label="Toggle password visibility"
-          onClick={this.handleClickShowPassword}
-        >
-          {this.state.showPassword ? <Visibility /> : <VisibilityOff />}
-        </IconButton>
-      </InputAdornment>
-    )
-
-    let renderError = null
-    if (this.props.error) {
-      renderError = (
-        <Notification
-          message={this.props.error}
-          onClose={() => { this.props.actions.showError(undefined) }}
-        />
-      )
-    }
-
-    return (
-      <div>
-        {renderError}
-        <Modal open={this.props.visible} disableAutoFocus={true}>
-            <Paper className={classes.root}>
-              <Toolbar>
-                <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
-              </Toolbar>
-              <form className={classes.container} noValidate={true} autoComplete="off">
-                <Grid container={true} spacing={24}>
-                  <Grid item={true} xs={2}>
-                    {this.renderProtocols()}
-                  </Grid>
-                  <Grid item={true} xs={7}>
-                    <TextField
-                      label="Host"
-                      className={classes.textField}
-                      value={this.state.connectionSettings.host}
-                      onChange={this.handleChange('host')}
-                      margin="normal"
-                    />
-                  </Grid>
-                  <Grid item={true} xs={3}>
-                    <TextField
-                      label="Port"
-                      className={classes.textField}
-                      value={this.state.connectionSettings.port}
-                      onChange={this.handleChange('port')}
-                      margin="normal"
-                    />
-                  </Grid>
-                  <Grid item={true} xs={5}>
-                    <TextField
-                      label="Username"
-                      className={classes.textField}
-                      value={this.state.connectionSettings.username}
-                      onChange={this.handleChange('username')}
-                      margin="normal"
-                    />
-                  </Grid>
-                  <Grid item={true} xs={5}>
-                    <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
-                      <InputLabel htmlFor="adornment-password">Password</InputLabel>
-                      <Input
-                        id="adornment-password"
-                        type={this.state.showPassword ? 'text' : 'password'}
-                        value={this.state.connectionSettings.password}
-                        onChange={this.handleChange('password')}
-                        endAdornment={passwordVisibilityButton}
-                      />
-                    </FormControl>
-                  </Grid>
-                  <Grid item={true} xs={5}>
-                    <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
-                      <InputLabel htmlFor="client-id">Client ID</InputLabel>
-                      <Input
-                        placeholder={this.randomClientId}
-                        className={classes.textField}
-                        value={this.state.connectionSettings.clientId || ''}
-                        onChange={this.handleChange('clientId')}
-                        startAdornment={<span />}
-                      />
-                    </FormControl>
-                  </Grid>
-                  <Grid item={true} xs={4}>
-                    {this.renderCertValidationSwitch()}
-                  </Grid>
-                  <Grid item={true} xs={3}>
-                    {this.renderTlsSwitch()}
-                  </Grid>
-                </Grid>
-                <br />
-                <div style={{ textAlign: 'right' }}>
-                  <Button variant="contained" color="secondary" className={classes.button} onClick={() => this.saveConnectionSettings()}>
-                    Save
-                  </Button>
-                  {this.renderConnectButton()}
-                </div>
-              </form>
-            </Paper>
-        </Modal>
-      </div>
-    )
-  }
-
-  private renderProtocols() {
-    const { classes } = this.props
-    const protocolItems = protocols.map((value: string) => (
-      <MenuItem key={value} value={value}>
-        {value}
-      </MenuItem>
-    ))
-
-    return (
-      <TextField
-        select={true}
-        label="Protocol"
-        className={classes.textField}
-        value={this.state.connectionSettings.protocol}
-        onChange={this.handleChange('protocol')}
-        margin="normal"
-      >
-        {protocolItems}
-      </TextField>
-    )
-  }
-
-  private renderCertValidationSwitch() {
-    const { classes } = this.props
-    const certSwitch = (
-      <Switch
-        checked={this.state.connectionSettings.certValidation}
-        onChange={this.toggleCertValidation}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={certSwitch}
-          label="Validate certificate"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleCertValidation = () => this.setState({
-    connectionSettings: {
-      ...this.state.connectionSettings,
-      certValidation: !this.state.connectionSettings.certValidation,
-    },
-  })
-
-  private renderTlsSwitch() {
-    const { classes } = this.props
-    const tlsSwitch = (
-      <Switch
-        checked={this.state.connectionSettings.tls}
-        onChange={this.toggleTls}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={tlsSwitch}
-          label="Encryption (tls)"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleTls = () => this.setState({
-    connectionSettings: {
-      ...this.state.connectionSettings,
-      tls: !this.state.connectionSettings.tls,
-    },
-  })
-
-  private renderConnectButton() {
-    const { classes, actions } = this.props
-
-    if (this.props.connecting) {
-      return (
-        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
-          <CircularProgress size={22} style={{ marginRight: '10px' }} color="secondary" /> Abort
-        </Button>
-      )
-    }
-    return (
-       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
-        Connect
-      </Button>
-    )
-  }
-
-  private onClickConnect = () => {
-    const connectionId = String(sha1(String(Math.random())).slice(0, 8))
-    const options = this.optionsFromState()
-    this.props.actions.connect(options, connectionId)
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    visible: !state.connection.connected,
-    connected: state.connection.connected,
-    connecting: state.connection.connecting,
-    error: state.connection.error,
-  }
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(connectionActions, dispatch),
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(Connection.styles)(Connection))

app/src/components/ConnectionSetup/ConnectionSettings.tsx

@@ -0,0 +1,341 @@
+import * as React from 'react'
+import Delete from '@material-ui/icons/Delete'
+import Settings from '@material-ui/icons/Settings'
+import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
+import Save from '@material-ui/icons/Save'
+import Visibility from '@material-ui/icons/Visibility'
+import VisibilityOff from '@material-ui/icons/VisibilityOff'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { connectionActions, connectionManagerActions } from '../../actions'
+import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
+import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+
+import {
+  Button,
+  FormControl,
+  FormControlLabel,
+  Grid,
+  IconButton,
+  Input,
+  InputAdornment,
+  InputLabel,
+  MenuItem,
+  Switch,
+  TextField,
+} from '@material-ui/core'
+import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'
+
+interface Props {
+  connection: ConnectionOptions
+  classes: {[s: string]: string}
+  actions: typeof connectionActions,
+  managerActions: typeof connectionManagerActions
+  connected: boolean
+  connecting: boolean
+}
+
+const protocols = [
+  'mqtt',
+  'ws',
+]
+
+interface State {
+  showPassword: boolean
+}
+
+class ConnectionSettings extends React.Component<Props, State> {
+  constructor(props: any) {
+    super(props)
+
+    this.state = {
+      showPassword: false,
+    }
+  }
+
+  private handleClickShowPassword = () => {
+    this.setState({ showPassword: !this.state.showPassword })
+  }
+
+  private requiresBasePath() {
+    return this.props.connection.protocol !== 'mqtt'
+  }
+
+  private renderBasePathInput() {
+    return (
+      <Grid item={true} xs={4}>
+        <TextField
+          label="Basepath"
+          className={this.props.classes.textField}
+          value={this.props.connection.basePath}
+          onChange={this.handleChange('basePath')}
+          margin="normal"
+        />
+      </Grid>
+    )
+  }
+
+  private handleChange = (name: string) => (event: any) => {
+    if (!this.props.connection) {
+      return
+    }
+
+    this.updateConnection(name, event.target.value)
+  }
+
+  private updateConnection(name: string, value: any) {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      [name]: value,
+    })
+  }
+
+  private renderProtocols() {
+    const { classes, connection } = this.props
+
+    const protocolItems = protocols.map((value: string) => (
+      <MenuItem key={value} value={value}>
+        {value}://
+      </MenuItem>
+    ))
+
+    return (
+      <TextField
+        select={true}
+        label="Protocol"
+        className={classes.textField}
+        value={connection.protocol}
+        onChange={this.updateProtocol}
+        margin="normal"
+      >
+        {protocolItems}
+      </TextField>
+    )
+  }
+
+  private updateProtocol = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.target.value
+    this.updateConnection('protocol', value)
+    if (event.target.value === 'mqtt') {
+      this.updateConnection('basePath', undefined)
+    } else {
+      this.updateConnection('basePath', 'ws')
+    }
+  }
+
+  private renderCertValidationSwitch() {
+    const { classes, connection } = this.props
+
+    const certSwitch = (
+      <Switch
+        checked={connection.certValidation}
+        onChange={this.toggleCertValidation}
+        color="primary"
+      />
+    )
+
+    return (
+      <div className={classes.switch}>
+        <FormControlLabel
+          control={certSwitch}
+          label="Validate certificate"
+          labelPlacement="bottom"
+        />
+      </div>
+    )
+  }
+
+  private toggleCertValidation = () => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      certValidation: !this.props.connection.certValidation,
+    })
+  }
+
+  private renderTlsSwitch() {
+    const { classes, connection } = this.props
+
+    const tlsSwitch = (
+      <Switch
+        checked={connection.encryption}
+        onChange={this.toggleTls}
+        color="primary"
+      />
+    )
+
+    return (
+      <div className={classes.switch}>
+        <FormControlLabel
+          control={tlsSwitch}
+          label="Encryption (tls)"
+          labelPlacement="bottom"
+        />
+      </div>
+    )
+  }
+
+  private toggleTls = () => {
+    this.props.managerActions.updateConnection(this.props.connection.id, {
+      encryption: !this.props.connection.encryption,
+    })
+  }
+
+  private renderConnectButton() {
+    const { classes, actions } = this.props
+
+    if (this.props.connecting) {
+      return (
+        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
+          <ConnectionHealthIndicator />&nbsp;&nbsp;Abort
+        </Button>
+      )
+    }
+    return (
+       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
+        <PowerSettingsNew /> Connect
+      </Button>
+    )
+  }
+
+  private onClickConnect = () => {
+    if (!this.props.connection) {
+      return
+    }
+
+    const mqttOptions = toMqttConnection(this.props.connection)
+    if (mqttOptions) {
+      this.props.actions.connect(mqttOptions, this.props.connection.id)
+    }
+  }
+
+  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) => {
+  return {
+    connected: state.connection.connected,
+    connecting: state.connection.connecting,
+  }
+}
+
+const mapDispatchToProps = (dispatch: any) => {
+  return {
+    actions: bindActionCreators(connectionActions, dispatch),
+    managerActions: bindActionCreators(connectionManagerActions, dispatch),
+  }
+}
+
+const styles: StyleRulesCallback<string> = (theme: Theme) => {
+  return {
+    textField: {
+      width: '100%',
+    },
+    switch: {
+      marginTop: 0,
+    },
+    button: {
+      margin: theme.spacing(1),
+    },
+    inputFormControl: {
+      marginTop: '16px',
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))

app/src/components/ConnectionSetup/ConnectionSetup.tsx

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

app/src/components/ConnectionSetup/ProfileList.tsx

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

app/src/components/Copy.tsx

@@ -1,70 +0,0 @@
-import * as React from 'react'
-import { Snackbar, SnackbarContent } from '@material-ui/core'
-import FileCopy from '@material-ui/icons/FileCopy'
-import Check from '@material-ui/icons/Check'
-import green from '@material-ui/core/colors/green'
-import { withStyles, Theme } from '@material-ui/core/styles'
-
-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" style={{ cursor: 'pointer' }} onClick={this.handleClick} />
-      : <Check fontSize="inherit" style={{ cursor: 'default' }} />
-
-    return <span>
-      <span style={{ fontSize: '16px' }}>{icon}</span>
-      <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/Key.tsx

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

app/src/components/Demo/Mouse.tsx

@@ -0,0 +1,84 @@
+import * as React from 'react'
+import { Theme, withStyles } from '@material-ui/core'
+const cursor = require('./cursor.png')
+
+interface State {
+  enabled: boolean
+  target: {x: number, y: number}
+  position: {x: number, y: number}
+  stepSizeX: number,
+  stepSizeY: number,
+}
+
+class Demo extends React.Component<{classes: any}, State> {
+  private timer: any
+  private frameInterval = 20
+
+  constructor(props: any) {
+    super(props)
+    this.state = { enabled: false, target: { x: 0, y: 0 }, position: { x: 0, y: 0 }, stepSizeX: 1, stepSizeY: 1 }
+  }
+
+  private moveCloser(steps: number = 0) {
+    const steSizeX = Math.min(this.state.stepSizeX, Math.abs(this.state.position.x - this.state.target.x))
+    const steSizeY = Math.min(this.state.stepSizeY, Math.abs(this.state.position.y - this.state.target.y))
+    const dirX = this.state.position.x > this.state.target.x ? -1 : 1
+    const dirY = this.state.position.y > this.state.target.y ? -1 : 1
+
+    if (steSizeX <= 0.1 && steSizeY <= 0.1) {
+      this.timer && clearTimeout(this.timer)
+      return
+    }
+
+    this.setState({
+      position: {
+        x: this.state.position.x + (dirX * steSizeX),
+        y: this.state.position.y + (dirY * steSizeY),
+      },
+    })
+
+    this.timer = setTimeout(() => {
+      this.moveCloser(steps + 1)
+    }, this.frameInterval)
+  }
+
+  public 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 cursorStyle = {
+      left: this.state.position.x + 2,
+      top: this.state.position.y + 2,
+    }
+
+    return (
+      <img src={cursor} style={cursorStyle} className={this.props.classes.cursor} />
+    )
+  }
+}
+
+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

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

app/src/components/Demo/index.tsx

@@ -0,0 +1,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,9 @@
 import * as React from 'react'
+import PersistentStorage from '../utils/PersistentStorage'
+import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
+import Warning from '@material-ui/icons/Warning'
 import { electronRendererTelementry } from 'electron-telemetry'
+import { Theme, withStyles } from '@material-ui/core/styles'
 import {
   Button,
   Modal,
@@ -8,11 +12,6 @@ import {
   Typography,
 } from '@material-ui/core'
 
-import Warning from '@material-ui/icons/Warning'
-import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
-
-import { Theme, withStyles } from '@material-ui/core/styles'
-
 interface State {
   error?: Error
 }
@@ -22,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 = () => {
-    localStorage.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
@@ -89,7 +88,7 @@ const styles = (theme: Theme) => ({
     maxWidth: 650,
     backgroundColor: theme.palette.background.default,
     margin: '10vh auto auto auto',
-    padding: `${2 * theme.spacing.unit}px`,
+    padding: theme.spacing(2),
     outline: 'none',
   },
   title: {
@@ -105,7 +104,7 @@ const styles = (theme: Theme) => ({
   },
   buttonPositioning: {
     textAlign: 'center' as 'center',
-    marginTop: `${theme.spacing.unit * 2}px`,
+    marginTop: theme.spacing(2),
   },
 })
 

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,24 +1,32 @@
 import * as React from 'react'
-
-import { AppBar, Button, IconButton, InputBase, Toolbar, Typography } from '@material-ui/core'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-
+import ClearAdornment from '../helper/ClearAdornment'
 import CloudOff from '@material-ui/icons/CloudOff'
+import ConnectionHealthIndicator from '../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 { settingsActions, connectionActions } from '../actions'
-import { AppState } from '../reducers'
-import ClearAdornment from './helper/ClearAdornment'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import {
+  AppBar,
+  Button,
+  IconButton,
+  InputBase,
+  Toolbar,
+  Typography,
+} from '@material-ui/core'
+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',
@@ -27,16 +35,31 @@ const styles: StyleRulesCallback = theme => ({
     '&:hover': {
       backgroundColor: fade(theme.palette.common.white, 0.25),
     },
-    marginRight: theme.spacing.unit * 2,
+    marginRight: theme.spacing(2),
     marginLeft: 0,
-    width: '100%',
-    [theme.breakpoints.up('sm')]: {
-      marginLeft: theme.spacing.unit * 3,
+    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.unit * 8,
+    width: theme.spacing(6),
     height: '100%',
     position: 'absolute',
     pointerEvents: 'none',
@@ -49,20 +72,21 @@ const styles: StyleRulesCallback = theme => ({
     width: '100%',
   },
   inputInput: {
-    paddingTop: theme.spacing.unit,
-    paddingRight: theme.spacing.unit,
-    paddingBottom: theme.spacing.unit,
-    paddingLeft: theme.spacing.unit * 10,
+    paddingTop: theme.spacing(1),
+    paddingRight: theme.spacing(1),
+    paddingBottom: theme.spacing(1),
+    paddingLeft: theme.spacing(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 {
@@ -70,6 +94,7 @@ interface Props {
   actions: {
     settings: typeof settingsActions,
     connection: typeof connectionActions,
+    global: typeof globalActions,
   }
   topicFilter?: string
 }
@@ -80,25 +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>
-        </Toolbar>
-      </AppBar>
-    )
-  }
-
   private renderSearch() {
     const { classes, topicFilter } = this.props
 
@@ -111,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>
@@ -125,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'),
   }
 }
 
@@ -137,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,9 +23,8 @@ const styles: StyleRulesCallback = theme => ({
   container: {
     width: '100%',
     height: '224px',
-    backgroundColor: 'rebeccapurple',
+    backgroundColor: theme.palette.type === 'dark' ? 'rebeccapurple' : '#ebebeb',
     marginBottom: 0,
-    marginTop: 'auto',
     padding: '8px',
   },
 })
@@ -40,9 +40,18 @@ 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) {
+    if (!tree || !tree.findNode('$SYS/broker/clients/total')) {
       return null
     }
 
@@ -96,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,6 +1,15 @@
 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 { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { globalActions, settingsActions } from '../../actions'
+import { shell } from 'electron'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+import { TopicOrder } from '../../reducers/Settings'
 
-import { AppState } from '../reducers'
 import {
   Divider,
   Drawer,
@@ -10,15 +19,9 @@ import {
   MenuItem,
   Select,
   Typography,
+  Tooltip,
 } from '@material-ui/core'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-
-import ChevronRight from '@material-ui/icons/ChevronRight'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { settingsActions, treeActions } from '../actions'
-import { TopicOrder } from '../reducers/Settings'
-import BrokerStatistics from './BrokerStatistics'
+import TimeLocale from './TimeLocale';
 
 export const autoExpandLimitSet = [{
   limit: 0,
@@ -27,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,
@@ -41,28 +47,40 @@ const styles: StyleRulesCallback = theme => ({
   drawer: {
     backgroundColor: theme.palette.background.default,
     flexShrink: 0,
+    userSelect: 'none' as 'none',
   },
   paper: {
     width: '300px',
   },
   title: {
     color: theme.palette.text.primary,
-    paddingTop: `${theme.spacing.unit}px`,
+    paddingTop: theme.spacing(1),
     ...theme.mixins.toolbar,
   },
   input: {
     minWidth: '150px',
-    margin: `auto ${theme.spacing.unit}px auto ${2 * theme.spacing.unit}px`,
+    margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
+  },
+  author: {
+    margin: 'auto 8px 8px auto',
+    color: theme.palette.text.hint,
+    cursor: 'pointer' as 'pointer',
   },
 })
 
 interface Props {
+  actions: {
+    settings: typeof settingsActions,
+    global: typeof globalActions,
+  }
   autoExpandLimit: number
-  visible: boolean
+  classes: any
+  highlightTopicUpdates: boolean
+  selectTopicWithMouseOver: boolean
   store?: any
   topicOrder: TopicOrder
-  classes: any
-  actions: typeof settingsActions
+  visible: boolean
+  theme: 'light' | 'dark'
 }
 
 class Settings extends React.Component<Props, {}> {
@@ -71,51 +89,43 @@ 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"
-        >
+  private openGithubPage = () => {
+    shell.openExternal('https://github.com/thomasnordquist')
+  }
 
-          <Typography className={classes.title} variant="h6" color="inherit">
-            <IconButton onClick={actions.toggleSettingsVisibility}>
-              <ChevronRight />
-            </IconButton>
-            Settings
-          </Typography>
-          <Divider />
+  private renderHighlightTopicUpdates() {
+    const { highlightTopicUpdates, actions } = this.props
 
-          {this.renderAutoExpand()}
-          {this.renderNodeOrder()}
-        </div>
-        <BrokerStatistics />
-      </Drawer>
-    )
+    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.settings.selectTopicWithMouseOver(!selectTopicWithMouseOver)
+
+    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>
@@ -124,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() {
@@ -132,7 +142,7 @@ class Settings extends React.Component<Props, {}> {
 
     return (
       <div style={{ padding: '8px', display: 'flex' }}>
-        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Topic order</InputLabel>
+        <InputLabel htmlFor="auto-expand" style={{ flex: '1', marginTop: '8px' }}>Topic Order</InputLabel>
         <Select
           value={topicOrder}
           onChange={this.onChangeSorting}
@@ -151,21 +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,
+    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,25 +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 {
-  title: string
+  key: string
+  title: JSX.Element | string
   value: string
+  selected?: boolean
 }
 
 interface Props {
-  items: HistoryItem[]
+  items: Array<HistoryItem>
   onClick?: (index: number, element: EventTarget) => void
   classes: any
-  contentTypeIndicator?: String
+  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 = {
@@ -27,20 +30,27 @@ class MessageHistory extends React.Component<Props, State> {
     }
   }
 
+  private toggle = () => {
+    this.setState({ collapsed: !this.state.collapsed })
+  }
+
+  private handleCtrlA = selectTextWithCtrlA({targetSelector: 'pre'})
+
   public renderHistory() {
-    const style = {
-      backgroundColor: 'rgba(80, 80, 80, 0.6)',
+    const style = (element: HistoryItem) => ({
+      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',
-    }
+    })
 
     const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
     const elements = this.props.items.map((element, index) => (
       <div
-        key={index}
-        style={style}
+        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}>
@@ -52,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}
@@ -64,7 +74,7 @@ class MessageHistory extends React.Component<Props, State> {
             badgeContent={this.props.items.length}
             color="primary"
           >
-            {this.state.collapsed ? '▶' : '▼'} History
+            {this.state.collapsed ? '▶ History' : '▼ History'}
           </Badge>
           <div style={{ float: 'right' }}>{this.state.collapsed ? this.props.contentTypeIndicator : null}</div>
         </Typography>
@@ -85,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,
@@ -19,37 +30,35 @@ import {
   Checkbox,
   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 Clear from '@material-ui/icons/Clear'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { publishActions } from '../../../actions'
-import ClearAdornment from '../../helper/ClearAdornment'
-import { TopicViewModel } from '../../../TopicViewModel'
+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: [] }
@@ -82,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('')
   }
@@ -132,11 +131,6 @@ class Publish extends React.Component<Props, State> {
     }
   }
 
-  private editorOptions = {
-    showLineNumbers: false,
-    tabSize: 2,
-  }
-
   private publishButton() {
     return (
       <Button
@@ -144,17 +138,44 @@ class Publish extends React.Component<Props, State> {
         size="small"
         color="primary"
         onClick={this.publish}
+        id="publish-button"
       >
         <Navigation style={{ marginRight: '8px' }} /> Publish
       </Button>
     )
   }
 
+  private formatJson = () => {
+    if (this.props.payload) {
+      try {
+        const str = JSON.stringify(JSON.parse(this.props.payload), undefined, '  ')
+        this.updatePayload(str)
+      } catch (error) {
+        this.props.globalActions.showError(`Format error: ${error.message}`)
+      }
+    }
+  }
+
+  private renderFormatJson() {
+    if (this.props.editorMode !== 'json') {
+      return null
+    }
+
+    return (
+      <Tooltip title="Format JSON">
+        <Fab style={{ width: '36px', height: '36px', marginLeft: '8px' }} onClick={this.formatJson} id="sidebar-publish-format-json">
+          <FormatAlignLeft style={{ fontSize: '20px' }} />
+        </Fab>
+      </Tooltip>
+    )
+  }
+
   private editorMode() {
     return (
       <div style={{ marginTop: '16px' }}>
         <div style={{ width: '100%', lineHeight: '64px' }}>
           {this.renderEditorModeSelection()}
+          {this.renderFormatJson()}
           <div style={{ float: 'right', marginRight: '16px' }}>
             {this.publishButton()}
           </div>
@@ -199,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
     }
 
@@ -254,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} />
   }
 
@@ -281,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"
@@ -293,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),
   }
 }
 
@@ -311,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,73 +1,54 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
+import * as React from 'react'
+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 NodeStats from './NodeStats'
+import Topic from './Topic'
+import ValuePanel from './ValueRenderer/ValuePanel'
+import { AppState } from '../../reducers'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { settingsActions, sidebarActions } from '../../actions'
+import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
+import { TopicViewModel } from '../../model/TopicViewModel'
 
 import {
-  Button,
   ExpansionPanel,
   ExpansionPanelDetails,
   ExpansionPanelSummary,
-  Fade,
-  Paper,
-  Popper,
   Typography,
-  Tooltip,
+  Badge,
 } from '@material-ui/core'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
-import { sidebarActons } from '../../actions'
-
-import { AppState } from '../../reducers'
-import Copy from '../Copy'
-import DateFormatter from '../helper/DateFormatter'
-import ExpandMore from '@material-ui/icons/ExpandMore'
-import Clear from '@material-ui/icons/Clear'
-import MessageHistory from './MessageHistory'
-import NodeStats from './NodeStats'
-const Publish = React.lazy(() => import('./Publish/Publish'))
-import Topic from './Topic'
-const ValueRenderer = React.lazy(() => import('./ValueRenderer'))
-import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
-import { TopicViewModel } from '../../TopicViewModel'
 
 const throttle = require('lodash.throttle')
 
+const Publish = React.lazy(() => import('./Publish/Publish'))
+
 interface Props {
-  node?: q.TreeNode<TopicViewModel>,
-  actions: typeof sidebarActons,
-  classes: any,
-  connectionId?: string,
+  node?: q.TreeNode<TopicViewModel>
+  actions: typeof sidebarActions
+  settingsActions: typeof settingsActions
+  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() }
-  }
-
-  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>) {
@@ -80,61 +61,76 @@ class Sidebar extends React.Component<Props, State> {
     node.onMessage.unsubscribe(this.updateNode)
   }
 
-  public render() {
+  private renderTopicDeleteButton() {
+    if (!this.props.node || (!this.props.node.message || !this.props.node.message.value)) {
+      return null
+    }
+
     return (
-      <div className={this.props.classes.drawer}>
-        {this.renderNode()}
-      </div>
+      <CustomIconButton onClick={() => this.deleteTopic(this.props.node)} tooltip="Clear this topic">
+        <Delete style={{ marginTop: '-3px' }} />
+      </CustomIconButton>
     )
   }
 
-  private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }
+  private renderRecursiveTopicDeleteButton() {
+    const deleteLimit = 50
+    const topicCount = this.props.node ? this.props.node.childTopicCount() : 0
+    if ((!this.props.node || topicCount === 0) || (this.props.node.message && topicCount === 1)) {
+      return null
+    }
+
+    return (
+      <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>
+    )
+  }
+
+  private deleteTopic = (topic?: q.TreeNode<TopicViewModel>, recursive: boolean = false, maxCount = 50) => {
+    if (!topic) {
+      return
+    }
+
+    this.props.actions.clearTopic(topic, recursive, maxCount)
+  }
 
   private renderNode() {
     const { classes, node } = this.props
 
     const copyTopic = node ? <Copy value={node.path()} /> : null
-    const copyValue = node && node.message ? <Copy value={node.message.value} /> : null
-    const summeryStyle = { minHeight: '0' }
+    const deleteTopic = this.renderTopicDeleteButton()
+    const deleteRecursiveTopic = this.renderRecursiveTopicDeleteButton()
+    const summaryStyle = { minHeight: '0' }
     return (
       <div>
         <ExpansionPanel key="topic" defaultExpanded={true} disabled={!Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
-            <Typography className={classes.heading}>Topic {copyTopic}</Typography>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
+            <Typography className={classes.heading}>Topic {copyTopic} {deleteTopic} {deleteRecursiveTopic}</Typography>
           </ExpansionPanelSummary>
           <ExpansionPanelDetails style={this.detailsStyle}>
             <Topic node={this.props.node} didSelectNode={this.updateNode} />
           </ExpansionPanelDetails>
         </ExpansionPanel>
-        <ExpansionPanel key="value" defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
-            <Typography className={classes.heading}>Value {copyValue}</Typography>
-          </ExpansionPanelSummary>
-          <ExpansionPanelDetails style={this.detailsStyle}>
-            {this.messageMetaInfo()}
-            <div ref={this.valueRef}>
-            <React.Suspense fallback={<div>Loading...</div>}>
-              <ValueRenderer message={this.props.node && this.props.node.message} />
-            </React.Suspense>
-            </div>
-            <div><MessageHistory onSelect={this.handleMessageHistorySelect} node={this.props.node} /></div>
-            <Popper open={Boolean(this.state.compareMessage)} anchorEl={this.valueRef.current} placement="left" transition={true}>
-              {this.showValueComparison}
-            </Popper>
-          </ExpansionPanelDetails>
-        </ExpansionPanel>
+        <ValuePanel lastUpdate={this.props.node ? this.props.node.lastUpdate : 0} />
         <ExpansionPanel defaultExpanded={true}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
+          <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>
         <ExpansionPanel defaultExpanded={Boolean(this.props.node)}>
-          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
+          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summaryStyle}>
             <Typography className={classes.heading}>Stats</Typography>
           </ExpansionPanelSummary>
           {this.renderNodeStats()}
@@ -143,53 +139,6 @@ class Sidebar extends React.Component<Props, State> {
     )
   }
 
-  private showValueComparison = (a: any) => (
-    <Fade {...a.TransitionProps} timeout={350}>
-      <Paper>
-        <ValueRenderer message={this.state.compareMessage} />
-      </Paper>
-    </Fade>
-  )
-
-  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"
-          mini={true}
-          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' }}>
-        <div style={{ flex: 6 }}><Typography>QoS: {this.props.node.mqttMessage.qos}</Typography></div>
-        <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
@@ -201,17 +150,39 @@ 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,
+    node: state.tree.get('selectedTopic'),
   }
 }
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    actions: bindActionCreators(sidebarActons, dispatch),
+    actions: bindActionCreators(sidebarActions, dispatch),
+    settingsActions: bindActionCreators(settingsActions, dispatch),
   }
 }
 
@@ -221,8 +192,12 @@ const styles: StyleRulesCallback<string> = (theme: Theme) => {
       display: 'block',
       height: '100%',
     },
+    badge: {
+      top: '3px',
+      right: '3px',
+    },
     valuePaper: {
-      margin: `${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px`,
+      margin: theme.spacing(1),
     },
     heading: {
       fontSize: theme.typography.pxToRem(15),

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.tsx

@@ -1,66 +0,0 @@
-import * as React from 'react'
-import * as q from '../../../../backend/src/Model'
-
-import { Theme, withTheme } from '@material-ui/core/styles'
-
-import { default as ReactJson } from 'react-json-view'
-
-interface Props {
-  message?: q.Message
-  theme: Theme
-}
-
-class ValueRenderer extends React.Component<Props, {}> {
-  public render() {
-    return <div>{this.renderValue()}</div>
-  }
-
-  public renderValue() {
-    const { message } = this.props
-    if (!message) {
-      return null
-    }
-
-    let json
-    try {
-      json = JSON.parse(message.value)
-    } catch (error) {
-      return this.renderRawValue(message.value)
-    }
-
-    if (typeof json === 'string') {
-      return this.renderRawValue(message.value)
-    } else if (typeof json === 'number') {
-      return this.renderRawValue(message.value)
-    } else if (typeof json === 'boolean') {
-      return this.renderRawValue(message.value)
-    } else {
-      const theme = (this.props.theme.palette.type === 'dark') ? 'monokai' : 'bright:inverted'
-      return (
-        <ReactJson
-          style={{ width: '100%' }}
-          src={json}
-          name={null}
-          theme={theme}
-        />
-      )
-    }
-  }
-
-  private renderRawValue(value: string) {
-    const style: React.CSSProperties = {
-      backgroundColor: 'rgba(80, 80, 80, 0.6)',
-      wordBreak: 'break-all',
-      width: '100%',
-      overflow: 'auto hidden',
-      display: 'block',
-      lineHeight: '1.2em',
-      padding: '12px 5px 12px 5px',
-      color: this.props.theme.palette.text.primary,
-    }
-
-    return <pre style={style}><code>{value}</code></pre>
-  }
-}
-
-export default withTheme()(ValueRenderer)

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

@@ -1,16 +1,19 @@
+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')
 
 interface Props {
   node?: q.TreeNode<TopicViewModel>
+  selected?: q.Message
   onSelect: (message: q.Message) => void
 }
 
@@ -20,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)
@@ -49,19 +59,35 @@ 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,
-    }))
+    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 (
       <div>
         <History
           items={historyElements}
-          contentTypeIndicator={showPlot ? <BarChart /> : null}
+          contentTypeIndicator={showPlot ? <BarChart /> : undefined}
           onClick={this.displayMessage}
         >
           {showPlot ? this.renderPlot(numericMessages) : null}
@@ -70,18 +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()[index]
-    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

@@ -0,0 +1,112 @@
+import * as q from '../../../../../backend/src/Model'
+import * as React from 'react'
+import CodeDiff from '../CodeDiff'
+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'
+
+interface Props {
+  message: q.Message
+  messageHistory: q.RingBuffer<q.Message>
+  compareWith?: q.Message
+  renderMode: ValueRendererDisplayMode
+}
+
+interface State {
+  width: number
+}
+
+class ValueRenderer extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { width: 0 }
+  }
+
+  private renderDiff(current: string = '', previous: string = '', language?: 'json') {
+    return (
+      <CodeDiff
+        previous={previous}
+        current={current}
+        language={language}
+        nameOfCompareMessage={this.props.compareWith ? 'selected' : 'previous'}
+      />
+    )
+  }
+
+  private messageToPrettyJson(str: string): string | undefined {
+    try {
+      const json = JSON.parse(str)
+      return JSON.stringify(json, undefined, '  ')
+    } catch {
+      return undefined
+    }
+  }
+
+  private updateWidth = (width: number) => {
+    if (width !== this.state.width) {
+      this.setState({ width })
+    }
+  }
+
+  private renderRawValue(value: string, compare: string) {
+    return this.renderDiff(value, compare)
+  }
+
+  public render() {
+    return (
+      <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.get('valueRendererDisplayMode'),
+  }
+}
+
+export default connect(mapStateToProps)(ValueRenderer)

app/src/components/Tree/Tree.tsx

@@ -1,13 +1,13 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { AppState } from '../../reducers'
+import * as React from 'react'
 import TreeNode from './TreeNode'
-import { connect } from 'react-redux'
-import { TopicOrder } from '../../reducers/Settings'
-import { TopicViewModel } from '../../TopicViewModel'
-import { treeActions } from '../../actions'
+import { AppState } from '../../reducers'
 import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { Record } from 'immutable'
+import { SettingsState } from '../../reducers/Settings'
+import { TopicViewModel } from '../../model/TopicViewModel'
+import { treeActions } from '../../actions'
 
 const MovingAverage = require('moving-average')
 
@@ -22,16 +22,15 @@ interface Props {
   tree?: q.Tree<TopicViewModel>
   filter: string
   host?: string
-
-  topicOrder: TopicOrder
-  autoExpandLimit: number
+  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,33 +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}
         />
       </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,
+    settings: state.settings,
   }
 }
 
@@ -137,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

@@ -1,12 +1,12 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { Theme, withStyles } from '@material-ui/core/styles'
-
+import * as React from 'react'
 import TreeNodeSubnodes from './TreeNodeSubnodes'
 import TreeNodeTitle from './TreeNodeTitle'
-import { TopicOrder } from '../../reducers/Settings'
-import { TopicViewModel } from '../../TopicViewModel'
+import { Record } from 'immutable'
+import { SettingsState } from '../../reducers/Settings'
+import { Theme, withStyles } from '@material-ui/core/styles'
+import { TopicViewModel } from '../../model/TopicViewModel'
+
 const debounce = require('lodash.debounce')
 
 declare var performance: any
@@ -29,17 +29,28 @@ const styles = (theme: Theme) => {
       cursor: 'pointer',
       marginTop: '-1px',
     },
+    subnodes: {
+      marginLeft: theme.spacing(1.5),
+    },
     selected: {
-      backgroundColor: 'rgba(120, 120, 120, 0.55)',
+      backgroundColor: theme.palette.type === 'dark' ? 'rgba(170, 170, 170, 0.55)' : 'rgba(170, 170, 170, 0.55)',
     },
     hover: {
-      backgroundColor: 'rgba(80, 80, 80, 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
@@ -47,10 +58,10 @@ interface Props {
   performanceCallback?: ((ms: number) => void) | undefined
   classes: any
   className?: string
-  topicOrder: TopicOrder
-  autoExpandLimit: number
   lastUpdate: number
   didSelectTopic: any
+  theme: Theme
+  settings: Record<SettingsState>
 }
 
 interface State {
@@ -59,30 +70,17 @@ 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 lastRenderTime = 0
 
   private cssAnimationWasSetAt?: number
 
   private willUpdateTime: number = performance.now()
-  private titleRef?: React.RefObject<HTMLDivElement> = React.createRef<HTMLDivElement>()
   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)
@@ -94,77 +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.titleRef = undefined
-    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() })
   }
@@ -174,48 +121,25 @@ 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
-    const animation = shouldStartAnimation ? { willChange: 'auto', translateZ: 0, animation: 'example 0.5s' } : {}
-    this.animationDirty = shouldStartAnimation
-
-    const highlightClass = this.state.selected ? this.props.classes.selected : (this.state.mouseOver ? this.props.classes.hover : '')
-    return (
-      <div
-        key={this.props.treeNode.hash()}
-        className={`${classes.node} ${this.props.className} ${highlightClass}`}
-        onClick={this.didClickNode}
-        onMouseOver={this.mouseOver}
-        onMouseOut={this.mouseOut}
-        ref={this.nodeRef}
-      >
-        <span ref={this.titleRef} style={animation}>
-          <TreeNodeTitle
-            collapsed={this.collapsed()}
-            treeNode={this.props.treeNode}
-            name={this.props.name}
-            didSelectNode={this.didSelectTopic}
-          />
-        </span>
-        {this.renderNodes()}
-      </div>
-    )
+    return this.props.treeNode.edgeCount() > this.props.settings.get('autoExpandLimit')
   }
 
   private didSelectTopic = () => {
     this.props.didSelectTopic(this.props.treeNode)
   }
 
+  private didClickTitle = (event: React.MouseEvent) => {
+    event.preventDefault()
+    this.props.didSelectTopic(this.props.treeNode)
+    this.toggle()
+  }
+
   private mouseOver = (event: React.MouseEvent) => {
     event.stopPropagation()
     this.setHover(true)
+    if (this.props.settings.get('selectTopicWithMouseOver') && this.props.treeNode && this.props.treeNode.message && this.props.treeNode.message.value) {
+      this.props.didSelectTopic(this.props.treeNode)
+    }
   }
 
   private mouseOut = (event: React.MouseEvent) => {
@@ -223,29 +147,93 @@ class TreeNode extends React.Component<Props, State> {
     this.setHover(false)
   }
 
-  private setHover = debounce((hover: boolean) => {
-    this.setState({ mouseOver: hover })
-  }, 5)
-
-  private didClickNode = (event: React.MouseEvent) => {
+  private toggleCollapsed = (event: React.MouseEvent) => {
     event.stopPropagation()
     this.toggle()
-    this.didSelectTopic()
   }
 
   private renderNodes() {
+    if (this.collapsed()) {
+      return null
+    }
+
     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}
+        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,27 +1,20 @@
-import * as React from 'react'
 import * as q from '../../../../backend/src/Model'
-
-import { AppState } from '../../reducers'
-
+import * as React from 'react'
 import TreeNode from './TreeNode'
-import { connect } from 'react-redux'
-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
+  settings: Record<SettingsState>
 }
 
 interface State {
@@ -35,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) {
@@ -55,13 +49,13 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
   }
 
   private renderMore() {
-    this.renderMoreAnimationFrame = window.requestAnimationFrame(() => {
+    this.renderMoreAnimationFrame = (window as any).requestIdleCallback(() => {
       this.setState({ ...this.state, alreadyAdded: this.state.alreadyAdded * 1.5 })
-    })
+    }, { timeout: 500 })
   }
 
   public componentWillUnmount() {
-    window.cancelAnimationFrame(this.renderMoreAnimationFrame)
+    (window as any).cancelIdleCallback(this.renderMoreAnimationFrame)
   }
 
   public render() {
@@ -71,7 +65,6 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
     }
 
     if (this.state.alreadyAdded < edges.length) {
-      const delta = Math.min(this.state.alreadyAdded, edges.length - this.state.alreadyAdded)
       this.renderMore()
     }
 
@@ -80,13 +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}
+          settings={this.props.settings}
         />
       )
     })
@@ -103,9 +94,7 @@ const styles = (theme: Theme) => ({
   list: {
     display: 'block' as 'block',
     clear: 'both' as 'both',
-  },
-  listItem: {
-    padding: '3px 0px 0px 8px',
+    marginLeft: theme.spacing(1.5),
   },
 })
 

app/src/components/Tree/TreeNodeTitle.tsx

@@ -1,47 +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, {}> {
-  private mouseOver = (event: React.MouseEvent) => {
-    event.preventDefault()
-    this.selectTopic()
-  }
-
-  private selectTopic = debounce(() => {
-    if (this.props.treeNode.message) {
-      this.props.didSelectNode(this.props.treeNode)
-    }
-  }, 5)
-
-  public render() {
-    return (
-      <span className={this.props.classes.title} onMouseOver={this.props.treeNode.message ? this.mouseOver : undefined}>
-        {this.renderExpander()} {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
   }
 
@@ -50,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(),
+    ])
   }
 }
 
@@ -69,20 +60,20 @@ const styles = (theme: Theme) => ({
     overflow: 'hidden' as 'hidden',
     textOverflow: 'ellipsis' as 'ellipsis',
     padding: '0',
-    marginLeft: '5px',
-    display: 'inline-block' as 'inline-block',
   },
   sourceEdge: {
     fontWeight: 'bold' as 'bold',
     overflow: 'hidden' as 'hidden',
-    display: 'inline-block' as 'inline-block',
   },
-  title: {
-    lineHeight: '1em',
-    whiteSpace: 'nowrap' as 'nowrap',
+  expander: {
+    color: theme.palette.type === 'light' ? '#222' : '#eee',
+    cursor: 'pointer' as 'pointer',
+    paddingRight: theme.spacing(0.25),
+    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,17 +21,6 @@ import {
    SnackbarContent,
    Typography,
 } from '@material-ui/core'
-import { Theme, withStyles } from '@material-ui/core/styles'
-import { UpdateInfo, checkForUpdates, rendererEvents, updateAvailable } from '../../events'
-import { green, red } from '@material-ui/core/colors'
-
-import { AppState } from './reducers'
-import Close from '@material-ui/icons/Close'
-import CloudDownload from '@material-ui/icons/CloudDownload'
-import { UpdateFileInfo } from 'builder-util-runtime'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { updateNotifierActions } from './actions'
 
 interface Props {
   showUpdateNotification: boolean
@@ -28,35 +29,62 @@ interface Props {
   actions: any
 }
 
-class UpdateNotifier extends React.Component<Props, {}> {
-  private updateInfo?: UpdateInfo
+interface GithubRelease {
+  url: string,
+  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 {
+  id: number
+  node_id: string
+  url: string
+  name: string
+  label: string
+}
+
+interface State {
+  newerVersions: Array<GithubRelease>
+}
+
+class UpdateNotifier extends React.Component<Props, State> {
   constructor(props: any) {
     super(props)
-    this.state = {
-      selectedNode: undefined,
-    }
+    this.state = { newerVersions: [] }
+
+    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))
+
+      if (newerVersions.length > 0) {
+        this.setState({ newerVersions })
+        this.props.actions.showUpdateNotification(true)
+      }
+    })
   }
 
-  public componentDidMount() {
-    rendererEvents.emit(checkForUpdates, undefined)
-    rendererEvents.subscribe(updateAvailable, this.handleUpdate)
+  private allowPrereleaseIfOwnVersionIsBeta(release: GithubRelease, ownVersion: string) {
+    const ownVersionIsBeta = !/alpha|beta/.test(ownVersion)
+
+    return ownVersionIsBeta || !release.prerelease
   }
 
-  public componentWillUnmount() {
-    rendererEvents.unsubscribeAll(updateAvailable)
-  }
+  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',
+      },
+    })
 
-  private fixUrl(url: string, version: string) {
-    if (!/^http/.test(url)) {
-      return `https://github.com/thomasnordquist/MQTT-Explorer/releases/download/v${version}/${url}`
-    }
-
-    return url
-  }
-
-  private handleUpdate = (updateInfo: UpdateInfo) => {
-    this.updateInfo = updateInfo
-    this.props.actions.showUpdateNotification(true)
+    return res.data as Array<GithubRelease>
   }
 
   private onCloseNotification = (event: React.SyntheticEvent<any>, reason: string) => {
@@ -79,15 +107,6 @@ class UpdateNotifier extends React.Component<Props, {}> {
     this.props.actions.showUpdateDetails(false)
   }
 
-  public render() {
-    return (
-      <div>
-        {this.renderUpdateNotification()}
-        {this.renderUpdateDetails()}
-      </div>
-    )
-  }
-
   private renderUpdateNotification() {
     const snackbarAnchor: any = {
       vertical: 'top',
@@ -98,12 +117,12 @@ class UpdateNotifier extends React.Component<Props, {}> {
       <Snackbar
         anchorOrigin={snackbarAnchor}
         open={this.props.showUpdateNotification}
-        autoHideDuration={7000}
+        autoHideDuration={12000}
         onClose={this.onCloseNotification}
       >
         <SnackbarContent
           className={this.props.classes.success}
-          message="Update available"
+          message={`${this.state.newerVersions.length} Update(s) available`}
           action={this.notificationActions()}
         />
       </Snackbar>
@@ -113,7 +132,7 @@ class UpdateNotifier extends React.Component<Props, {}> {
   private notificationActions() {
     return [(
         <Button key="undo" size="small" onClick={this.showDetails}>
-          Download
+          Details
         </Button>
       ), (
         <IconButton
@@ -130,10 +149,14 @@ class UpdateNotifier extends React.Component<Props, {}> {
   }
 
   private renderUpdateDetails() {
-    if (!this.updateInfo) {
+    const latestUpdate = this.state.newerVersions[0]
+    if (!latestUpdate) {
       return null
     }
-    const releaseNotes = (this.updateInfo.releaseNotes as string) || ''
+    const releaseNotes = this.state.newerVersions
+      .map(release => `<p><h3>${release.tag_name}</h3><p/><p>${release.body_html}</p>`)
+      .join('<hr />')
+
     return (
       <Modal
         open={this.props.showUpdateDetails}
@@ -141,35 +164,71 @@ class UpdateNotifier extends React.Component<Props, {}> {
         onClose={this.hideDetails}
       >
         <Paper className={this.props.classes.root}>
-          <Typography variant="h6" className={this.props.classes.title}>Version {this.updateInfo.version}</Typography>
+          <Typography variant="h6" className={this.props.classes.title}>Version {latestUpdate.tag_name}</Typography>
           <Typography className={this.props.classes.title}>Changelog</Typography>
           <div className={this.props.classes.releaseNotes} dangerouslySetInnerHTML={{ __html: releaseNotes }} />
-          {this.renderDownloads(this.updateInfo)}
+          {this.renderDownloads()}
+          <Button
+            className={this.props.classes.download}
+            onClick={this.openGithub}
+          >
+            Github Page
+          </Button>
           <Button className={this.props.classes.closeButton} color="secondary" onClick={this.hideDetails}>Close</Button>
         </Paper>
       </Modal>
     )
   }
 
-  private urlToFilename(url: string) {
-    const parts = url.split('/')
-
-    return parts[parts.length - 1]
+  private openGithub = () => {
+    this.openUrl('https://github.com/thomasnordquist/MQTT-Explorer')
   }
 
-  private renderDownloads(updateInfo: UpdateInfo) {
-    return updateInfo.files
-      .map((file: UpdateFileInfo, index: number) => (
-        <div key={index}>
+  private openUrl = (url: string) => {
+    electron.shell.openExternal(url)
+  }
+
+  private assetForCurrentPlatform(asset: GithubAsset) {
+    let regex: RegExp
+    if (os.platform() === 'darwin') {
+      regex = /\.dmg$/
+    } else if (os.platform() === 'darwin') {
+      regex = /\.exe$/
+    } else {
+      regex = /\.AppImage$/
+    }
+
+    return regex.test(asset.name)
+  }
+
+  private renderDownloads() {
+    const latestUpdate = this.state.newerVersions[0]
+    if (!latestUpdate || !latestUpdate.assets) {
+      return null
+    }
+
+    return latestUpdate.assets
+      .filter(this.assetForCurrentPlatform)
+      .map(asset => (
+        <div>
           <Button
             className={this.props.classes.download}
-            href={this.fixUrl(file.url, updateInfo.version)}
+            onClick={() => this.openUrl(asset.url)}
           >
-            <IconButton><CloudDownload /></IconButton>{this.urlToFilename(file.url)}
+            <CloudDownload />&nbsp;{asset.name}
           </Button>
         </div>
       ))
   }
+
+  public render() {
+    return (
+      <div>
+        {this.renderUpdateNotification()}
+        {this.renderUpdateDetails()}
+      </div>
+    )
+  }
 }
 
 const styles = (theme: Theme) => ({
@@ -178,14 +237,14 @@ const styles = (theme: Theme) => ({
     color: theme.typography.button.color,
   },
   close: {
-    padding: theme.spacing.unit / 2,
+    padding: '4px',
   },
   root: {
     minWidth: '350px',
     maxWidth: '500px',
     backgroundColor: theme.palette.background.default,
     margin: '20vh auto auto auto',
-    padding: `${2 * theme.spacing.unit}px`,
+    padding: theme.spacing(2),
     outline: 'none',
   },
   title: {
@@ -198,7 +257,7 @@ const styles = (theme: Theme) => ({
     maxHeight: '28vh',
   },
   paper: {
-    padding: `${theme.spacing.unit * 2}px`,
+    padding: theme.spacing(2),
     color: theme.palette.text.secondary,
   },
   download: {
@@ -212,8 +271,8 @@ const styles = (theme: Theme) => ({
 
 const mapStateToProps = (state: AppState) => {
   return {
-    showUpdateNotification: state.tooBigReducer.showUpdateNotification,
-    showUpdateDetails: state.tooBigReducer.showUpdateDetails,
+    showUpdateNotification: state.globalState.get('showUpdateNotification'),
+    showUpdateDetails: state.globalState.get('showUpdateDetails'),
   }
 }
 

app/src/components/helper/ClearAdornment.tsx

@@ -1,25 +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
 }
 
-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>
-      )
-    }
-
+/**
+ * Clear button for text input fields
+ */
+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

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

app/src/components/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

@@ -0,0 +1,41 @@
+import * as React from 'react'
+import { IconButton, Tooltip } from '@material-ui/core'
+import { Theme, withStyles } from '@material-ui/core/styles'
+
+interface Props {
+  onClick: any
+  tooltip: string
+  classes: any
+}
+
+const styles = (theme: Theme) => ({
+  button: {
+    padding: '6px',
+    fontSize: '1.2em',
+    width: '32px',
+    height: '32px',
+  },
+})
+
+class CustomIconButton extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props)
+  }
+
+  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,48 +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'
-
-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',
-  },
-  typography: { useNextVariants: true },
-})
+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 name="" />
-      </Provider>
-    </MuiThemeProvider>,
-    document.getElementById('app'),
+  <Provider store={store}>
+    <Application />
+  </Provider>,
+  document.getElementById('app')
 )

app/src/model/ConnectionOptions.ts

@@ -0,0 +1,81 @@
+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
+  host: string
+  protocol: 'mqtt' | 'ws'
+  basePath?: string
+  port: number
+  name: string
+  username?: string
+  password?: string
+  encryption: boolean
+  certValidation: boolean
+  selfSignedCertificate?: CertificateParameters
+  clientId?: string
+  subscriptions: Array<string>
+}
+
+export function toMqttConnection(options: ConnectionOptions): MqttOptions | undefined {
+  if (options.type !== 'mqtt') {
+    return
+  }
+
+  return {
+    url: `${options.protocol}://${options.host}:${options.port}/${options.basePath || ''}`,
+    username: options.username,
+    password: options.password,
+    tls: options.encryption,
+    clientId: options.clientId,
+    certValidation: options.certValidation,
+    subscriptions: options.subscriptions,
+    certificateAuthority: options.selfSignedCertificate ? options.selfSignedCertificate.data : undefined,
+  }
+}
+
+function generateClientId() {
+  const clientIdSha = sha1(`${Math.random()}`).slice(0, 8)
+  return `mqtt-explorer-${clientIdSha}`
+}
+
+export function createEmptyConnection(): ConnectionOptions {
+  return {
+    certValidation: true,
+    clientId: generateClientId(),
+    id: v4() as string,
+    name: 'new connection',
+    encryption: false,
+    password: undefined,
+    username: undefined,
+    subscriptions: ['#', '$SYS/#'],
+    type: 'mqtt',
+    host: '',
+    port: 1883,
+    protocol: 'mqtt',
+  }
+}
+
+export function makeDefaultConnections() {
+  return {
+    'iot.eclipse.org': {
+      ...createEmptyConnection(),
+      id: 'iot.eclipse.org',
+      name: 'iot.eclipse.org',
+      host: 'iot.eclipse.org',
+    },
+    'test.mosquitto.org': {
+      ...createEmptyConnection(),
+      id: 'test.mosquitto.org',
+      name: 'test.mosquitto.org',
+      host: 'test.mosquitto.org',
+    },
+  }
+}

app/src/model/LegacyConnectionSettings.ts

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

app/src/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,9 +1,10 @@
+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 {
   host?: string
   tree?: q.Tree<TopicViewModel>
@@ -12,6 +13,7 @@ export interface ConnectionState {
   error?: string
   connected: boolean
   connecting: boolean
+  health?: ConnectionHealth
 }
 
 export type Action = SetConnecting | SetConnected | SetDisconnected | ShowError
@@ -21,6 +23,7 @@ export enum ActionTypes {
   CONNECTION_SET_CONNECTED = 'CONNECTION_SET_CONNECTED',
   CONNECTION_SET_DISCONNECTED = 'CONNECTION_SET_DISCONNECTED',
   CONNECTION_SET_SHOW_ERROR = 'CONNECTION_SET_SHOW_ERROR',
+  CONNECTION_SET_HEALTH = 'CONNECTION_SET_HEALTH',
 }
 
 export interface SetConnecting {
@@ -38,6 +41,11 @@ export interface SetDisconnected {
   type: ActionTypes.CONNECTION_SET_DISCONNECTED
 }
 
+export interface SetHealth {
+  health: ConnectionHealth
+  type: ActionTypes.CONNECTION_SET_DISCONNECTED
+}
+
 export interface ShowError {
   type: ActionTypes.CONNECTION_SET_SHOW_ERROR
   error?: Error
@@ -46,6 +54,7 @@ export interface ShowError {
 const initialState: ConnectionState = {
   connected: false,
   connecting: false,
+  health: undefined,
 }
 
 export const connectionReducer = createReducer(initialState, {
@@ -53,6 +62,7 @@ export const connectionReducer = createReducer(initialState, {
   CONNECTION_SET_CONNECTED: setConnected,
   CONNECTION_SET_DISCONNECTED: setDisconnected,
   CONNECTION_SET_SHOW_ERROR: showError,
+  CONNECTION_SET_HEALTH: setHealth,
 })
 
 function setConnecting(state: ConnectionState, action: SetConnecting): ConnectionState {
@@ -64,6 +74,13 @@ function setConnecting(state: ConnectionState, action: SetConnecting): Connectio
   }
 }
 
+function setHealth(state: ConnectionState, action: SetHealth): ConnectionState {
+  return {
+    ...state,
+    health: action.health,
+  }
+}
+
 function setConnected(state: ConnectionState, action: SetConnected): ConnectionState {
   return {
     ...state,

app/src/reducers/ConnectionManager.ts

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

app/src/reducers/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/Publish.ts

@@ -44,7 +44,7 @@ export interface ToggleRetain {
 }
 
 const initialState: PublishState = {
-  editorMode: 'text',
+  editorMode: 'json',
   retain: false,
   qos: 0,
 }

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',
@@ -8,77 +9,145 @@ export enum TopicOrder {
   topics = '#topics',
 }
 
+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
+
+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,
-}
-
-export const settingsReducer = createReducer(initialState, {
-  SETTINGS_SET_AUTO_EXPAND_LIMIT: setAutoExpandLimit,
-  SETTINGS_TOGGLE_VISIBILITY: toggleVisibility,
-  SETTINGS_SET_TOPIC_ORDER: setTopicOrder,
-  SETTINGS_FILTER_TOPICS: filterTopics,
+  highlightTopicUpdates: true,
+  valueRendererDisplayMode: 'diff',
+  selectTopicWithMouseOver: false,
+  theme: 'light',
+  topicFilter: undefined,
 })
 
-function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
-  return {
-    ...state,
-    autoExpandLimit: action.autoExpandLimit,
-  }
+const setTheme = (theme: 'light' | 'dark') => (state: Record<SettingsState>) => {
+  return state.set('theme', theme)
 }
 
-export interface SetAutoExpandLimit {
+const reducerActions: {[s: string]: (state: Record<SettingsState>, action: Actions) => Record<SettingsState>} = {
+  SETTINGS_SET_AUTO_EXPAND_LIMIT: setAutoExpandLimit,
+  SETTINGS_SET_TOPIC_ORDER: setTopicOrder,
+  SETTINGS_FILTER_TOPICS: filterTopics,
+  SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY: toggleHighlightTopicUpdates,
+  SETTINGS_DID_LOAD_SETTINGS: didLoadSettings,
+  SETTINGS_SET_VALUE_RENDERER_DISPLAY_MODE: setValueRendererDisplayMode,
+  SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER: setSelectTopicWithMouseOver,
+  SETTINGS_SET_THEME_LIGHT: setTheme('light'),
+  SETTINGS_SET_THEME_DARK: setTheme('dark'),
+  SETTINGS_SET_TIME_LOCALE: setTimeLocale,
+}
+
+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: Record<SettingsState>, action: DidLoadSettingsAction) {
+  return state.merge(action.settings)
+}
+
+export interface SetSelectTopicWithMouseOverAction {
+  type: ActionTypes.SETTINGS_SET_SELECT_TOPIC_WITH_MOUSE_OVER
+  selectTopicWithMouseOver: boolean
+}
+
+export function setSelectTopicWithMouseOver(state: Record<SettingsState>, action: SetSelectTopicWithMouseOverAction) {
+  return state.set('selectTopicWithMouseOver', !state.get('selectTopicWithMouseOver'))
+}
+
+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: Record<SettingsState>, action: SetValueRendererDisplayModeAction) {
+  return state.set('valueRendererDisplayMode', action.valueRendererDisplayMode)
+}
+
+export interface SetAutoExpandLimitAction {
   type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
   autoExpandLimit: number
 }
 
-function toggleVisibility(state: SettingsState, action: ToggleVisibility) {
-  return {
-    ...state,
-    visible: !state.visible,
-  }
+function setAutoExpandLimit(state: Record<SettingsState>, action: SetAutoExpandLimitAction) {
+  return state.set('autoExpandLimit', action.autoExpandLimit)
 }
 
-export interface ToggleVisibility {
-  type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY
+export interface ToggleHighlightTopicUpdatesAction {
+  type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY
 }
 
-function setTopicOrder(state: SettingsState, action: SetTopicOrder) {
-  return {
-    ...state,
-    topicOrder: action.topicOrder,
-  }
+function toggleHighlightTopicUpdates(state: Record<SettingsState>, action: ToggleHighlightTopicUpdatesAction) {
+  return state.set('highlightTopicUpdates', !state.get('highlightTopicUpdates'))
 }
 
-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/Theme.ts

@@ -1,11 +0,0 @@
-import { createReducer } from './lib'
-import { createMuiTheme, Theme } from '@material-ui/core'
-
-const initialState: Theme = createMuiTheme({
-  palette: {
-    type: 'dark',
-  },
-  typography: { useNextVariants: true },
-})
-
-export const theme = createReducer(initialState, {})

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,74 +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 { theme } from './theme'
-
-export enum ActionTypes {
-  showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
-  showUpdateDetails = 'SHOW_UPDATE_DETAILS',
-}
-
-export interface CustomAction extends Action {
-  type: ActionTypes,
-  showUpdateNotification?: boolean
-  showUpdateDetails?: boolean
-}
+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 {
-  tooBigReducer: TooBigOfState
+  globalState: GlobalState
   tree: TreeState
-  settings: SettingsState,
+  settings: Record<SettingsState>,
   publish: PublishState
+  sidebar: SidebarState,
   connection: ConnectionState
+  connectionManager: ConnectionManagerState
 }
 
-export interface TooBigOfState {
-  showUpdateNotification?: boolean
-  showUpdateDetails: boolean
-}
-
-const initialBigState: TooBigOfState = {
-  showUpdateDetails: false,
-}
-
-const tooBigReducer: Reducer<TooBigOfState | 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.showUpdateDetails:
-      if (action.showUpdateDetails === undefined) {
-        return state
-      }
-      return {
-        ...state,
-        showUpdateDetails: action.showUpdateDetails,
-      }
-
-    default:
-      return state
-  }
-}
-
-const reducer = combineReducers({
-  theme,
-  tooBigReducer,
+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,24 +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() })
-  } catch (error) {
-    console.error(error)
-  }
-}, 30 * 1000)
-
-export function trackEvent(name: string) {
-  if (name.match(/^@@redux/)) {
-    return
-  }
-  electronRendererTelementry.trackEvent(name)
-}

app/src/utils/PersistentStorage.ts

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

app/src/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

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

backend/package.json

@@ -9,10 +9,10 @@
     "test-inspect": "mocha --inspect-brk",
     "coverage": "nyc mocha",
     "debug": "ts-node --inspect ./src/index.ts",
-    "postinstall": "npm run build"
+    "postinstall": "yarn build"
   },
   "author": "",
-  "license": "ISC",
+  "license": "CC-BY-ND-4.0",
   "nyc": {
     "include": [
       "src/**/*.ts",

backend/src/ConfigStorage.ts

@@ -0,0 +1,73 @@
+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
+  } from '../../events/StorageEvents'
+
+export default class ConfigStorage {
+  private file: string
+  private database: any
+  constructor(file: string) {
+    this.file = file
+  }
+
+  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)
+    }
+
+    return this.database
+  }
+
+  public async init() {
+    backendEvents.subscribe(storageStoreEvent, async (event) => {
+      const ack = makeStorageAcknowledgementEvent(event.transactionId)
+      try {
+        const db = await this.getDb()
+        await db.set(event.store, event.data).write()
+        backendEvents.emit(ack, undefined)
+      } catch (error) {
+        backendEvents.emit(ack, { error, transactionId: event.transactionId, store: event.store })
+        throw error
+      }
+    })
+
+    backendEvents.subscribe(storageLoadEvent, async (event) => {
+      const responseEvent = makeStorageResponseEvent(event.transactionId)
+      try {
+        const db = await this.getDb()
+        const data = await db.get(event.store).value()
+        backendEvents.emit(responseEvent, { data, transactionId: event.transactionId, store: event.store })
+      } catch (error) {
+        backendEvents.emit(responseEvent, { error, transactionId: event.transactionId, store: event.store })
+        throw error
+      }
+    })
+
+    backendEvents.subscribe(storageClearEvent, async (event) => {
+      try {
+        const db = await this.getDb()
+        const keys = await db.keys().value()
+        for (const key of keys) {
+          await db.unset(key).write()
+        }
+        backendEvents.emit(makeStorageAcknowledgementEvent(event.transactionId), undefined)
+      } catch (error) {
+        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,
@@ -25,16 +25,17 @@ export class DataSourceStateMachine {
 
   public setError(error: Error) {
     this.state = {
+      ...this.state,
       error: error.message,
-      connected: false,
-      connecting: false,
+      // connected: false,
+      // connecting: false,
     }
     this.onUpdate.dispatch(this.state)
   }
 
   public setConnecting() {
     this.state = {
-      error: undefined,
+      ...this.state,
       connected: false,
       connecting: true,
     }

backend/src/DataSource/MqttSource.ts

@@ -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,13 +12,14 @@ export interface MqttOptions {
   tls: boolean
   certValidation: boolean
   clientId?: string
+  subscriptions: Array<string>
+  certificateAuthority?: string
 }
 
 export class MqttSource implements DataSource<MqttOptions> {
   public stateMachine: DataSourceStateMachine = new DataSourceStateMachine()
   private client: Client | undefined
   private messageCallback?: (topic: string, message: Buffer, packet: any) => void
-  private rootSubscription = '#'
   public topicSeparator = '/'
 
   public onMessage(messageCallback: (topic: string, message: Buffer, packet: any) => void) {
@@ -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
@@ -55,21 +58,22 @@ export class MqttSource implements DataSource<MqttOptions> {
       this.stateMachine.setConnected(false)
     })
 
+    client.on('end', () => {
+      this.stateMachine.setConnected(false)
+    })
+
     client.on('reconnect', () => {
       this.stateMachine.setConnecting()
     })
 
     client.on('connect', () => {
       this.stateMachine.setConnected(true)
-      client.subscribe(this.rootSubscription, (err: Error) => {
-        if (err) {
-          throw new Error('mqtt subscription failed')
-        }
-      })
-      client.subscribe('$SYS/#', (err: Error) => {
-        if (err) {
-          throw new Error('mqtt subscription failed')
-        }
+      options.subscriptions.forEach((subscription) => {
+        client.subscribe(subscription, (err: Error) => {
+          if (err) {
+            this.stateMachine.setError(err)
+          }
+        })
       })
     })
 
@@ -81,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: (any)[] = []
+  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
@@ -47,6 +36,9 @@ export class TreeNode<ViewModel> {
       this.lastUpdate = Date.now()
     })
     this.onEdgesChange.subscribe(() => {
+      this.cachedChildTopics = undefined
+      this.cachedChildTopicCount = undefined
+      this.cachedLeafMessageCount = undefined
       this.lastUpdate = Date.now()
     })
     this.onMessage.subscribe(() => {
@@ -54,108 +46,28 @@ export class TreeNode<ViewModel> {
     })
   }
 
-  public setMessage(message: Message) {
-    this.messageHistory.add(message)
-    this.message = message
-    this.messages += 1
-  }
-
-  public hash(): string {
-    return `N${(this.sourceEdge ? this.sourceEdge.hash() : '')}`
-  }
-
-  public firstNode(): TreeNode<ViewModel> {
-    return this.sourceEdge && this.sourceEdge.source ? this.sourceEdge.source.firstNode() : this
-  }
-
-  public path(): string {
-    if (!this.cachedPath) {
-      return this.branch()
-        .map(node => (node.sourceEdge && node.sourceEdge.name))
-        .filter(name => name !== undefined)
-        .join('/')
-    }
-
-    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)
-    edge.source = this
-
-    if (emitUpdate) {
-      this.onEdgesChange.dispatch()
-    }
+  private isTopicEmptyLeaf() {
+    const hasNoMessage = (!this.message || !this.message.value || this.message.value.length === 0)
+    return hasNoMessage && this.isLeaf()
   }
 
-  public branch(): TreeNode<ViewModel>[] {
+  private isLeaf() {
+    return this.edgeArray.length === 0
+  }
+
+  private removeFromParent() {
     const previous = this.previous()
-    if (!previous) {
-      return [this]
+    if (!previous || !this.sourceEdge) {
+      return
     }
-
-    return previous.branch().concat([this])
+    previous.removeEdge(this.sourceEdge)
   }
 
-  public updateWithNode(node: TreeNode<ViewModel>) {
-    if (node.message) {
-      this.setMessage(node.message)
-      this.onMessage.dispatch(node.message)
-      this.mqttMessage = node.mqttMessage
-    }
-
-    this.mergeEdges(node)
-    this.onMerge.dispatch()
-  }
-
-  public leafMessageCount(): number {
-    if (this.cachedLeafMessageCount === undefined) {
-      this.cachedLeafMessageCount = this.edgeArray
-        .map(edge => edge.target.leafMessageCount())
-        .reduce((a, b) => a + b, 0) + this.messages
-    }
-
-    return this.cachedLeafMessageCount as number
-  }
-
-  public childTopicCount(): number {
-    if (this.cachedChildTopicCount === undefined) {
-      this.cachedChildTopicCount = this.edgeArray
-        .map(e => e.target.childTopicCount())
-        .reduce((a, b) => a + b, this.edgeArray.length === 0 ? 1 : 0)
-    }
-
-    return this.cachedChildTopicCount as number
-  }
-
-  public edgeCount(): number {
-    return this.edgeArray.length
-  }
-
-  public childTopics(): TreeNode<ViewModel>[] {
-    if (this.cachedChildTopics === undefined) {
-      const initialValue = this.message && this.message.value ? [this] : []
-
-      this.cachedChildTopics = this.edgeArray
-        .map(e => e.target.childTopics())
-        .reduce((a, b) => a.concat(b), initialValue)
-    }
-
-    return this.cachedChildTopics as TreeNode<ViewModel>[]
-  }
-
-  public findNode (path: String): TreeNode<ViewModel> | undefined {
-    const topics = path.split('/')
-
-    return this.findChild(topics)
-  }
-
-  private findChild(edges: string[]): TreeNode<ViewModel> | undefined {
+  private findChild(edges: Array<string>): TreeNode<ViewModel> | undefined {
     if (edges.length === 0) {
       return this
     }
@@ -186,4 +98,141 @@ export class TreeNode<ViewModel> {
       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
+    this.messages += 1
+  }
+
+  public hash(): string {
+    return `N${(this.sourceEdge ? this.sourceEdge.hash() : '')}`
+  }
+
+  public firstNode(): TreeNode<ViewModel> {
+    return this.sourceEdge && this.sourceEdge.source ? this.sourceEdge.source.firstNode() : this
+  }
+
+  public path(): string {
+    if (!this.cachedPath) {
+      return this.branch()
+        .map(node => (node.sourceEdge && node.sourceEdge.name))
+        .filter(name => name !== undefined)
+        .join('/')
+    }
+
+    return this.cachedPath
+  }
+
+  public addEdge(edge: Edge<ViewModel>, emitUpdate: boolean = false) {
+    this.edges[edge.name] = edge
+    this.edgeArray.push(edge)
+    edge.source = this
+
+    if (emitUpdate) {
+      this.onEdgesChange.dispatch()
+    }
+  }
+
+  public branch(): Array<TreeNode<ViewModel>> {
+    const previous = this.previous()
+    if (!previous) {
+      return [this]
+    }
+
+    return previous.branch().concat([this])
+  }
+
+  public removeEdge(edge: Edge<any>) {
+    delete this.edges[edge.name]
+    this.edgeArray = Object.values(this.edges)
+    this.onMerge.dispatch()
+
+    if (this.isTopicEmptyLeaf()) {
+      this.removeFromParent()
+    }
+  }
+
+  public updateWithNode(node: TreeNode<ViewModel>) {
+    if (node.message) {
+      this.setMessage(node.message)
+      this.onMessage.dispatch(node.message)
+      this.mqttMessage = node.mqttMessage
+    }
+
+    if (this.isTopicEmptyLeaf()) {
+      this.removeFromParent()
+    }
+
+    this.mergeEdges(node)
+    this.onMerge.dispatch()
+  }
+
+  public leafMessageCount(): number {
+    if (this.cachedLeafMessageCount === undefined) {
+      this.cachedLeafMessageCount = this.edgeArray
+        .map(edge => edge.target.leafMessageCount())
+        .reduce((a, b) => a + b, 0) + this.messages
+    }
+
+    return this.cachedLeafMessageCount as number
+  }
+
+  public childTopicCount(): number {
+    if (this.cachedChildTopicCount === undefined) {
+      this.cachedChildTopicCount = this.edgeArray
+        .map(e => e.target.childTopicCount())
+        .reduce((a, b) => a + b, this.edgeArray.length === 0 ? 1 : 0)
+    }
+
+    return this.cachedChildTopicCount as number
+  }
+
+  public edgeCount(): number {
+    return this.edgeArray.length
+  }
+
+  public childTopics(): Array<TreeNode<ViewModel>> {
+    if (this.cachedChildTopics === undefined) {
+      const initialValue = this.message && this.message.value ? [this] : []
+
+      this.cachedChildTopics = this.edgeArray
+        .map(e => e.target.childTopics())
+        .reduce((a, b) => a.concat(b), initialValue)
+    }
+
+    return this.cachedChildTopics as Array<TreeNode<ViewModel>>
+  }
+
+  public findNode(path: String): TreeNode<ViewModel> | undefined {
+    const topics = path.split('/')
+
+    return this.findChild(topics)
+  }
 }

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)