Work in progress

2026-09-11 17:13:53 +00:00 · 2019-02-14 14:14:29 +01:00
63 changed files with 1011 additions and 2144 deletions
@@ -2,7 +2,6 @@
 [![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)](https://travis-ci.org/thomasnordquist/MQTT-Explorer)
-![](https://img.shields.io/github/commits-since/thomasnordquist/mqtt-explorer/latest.svg?style=flat)

 ### Version {{ version }}

@@ -2,7 +2,7 @@
 <html>
    <head>
        <meta charset="UTF-8" />
-        <title>MQTT Explorer</title>
+        <title>MQTT-Explorer</title>
        <script src="./bugtracking.bundle.js"></script>

        <style>
@@ -13,7 +13,7 @@

          @keyframes example {
            0%   {background-color: none;}
-            25%  {background-color: #3f51b5 ;}
+            25%  {background-color: #3f51b5;}
            50%  {background-color: #3f51b5;}
            100% {background-color: none;}
          }
@@ -28,11 +28,11 @@
          }

          ::-webkit-scrollbar-track {
-            -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
+              -webkit-box-shadow: inset 0 0 6px rgba(30,30,30,0.3);
          }

          ::-webkit-scrollbar-thumb {
-            background-color: rgba(140,140,140,0.8);
+              background-color: rgba(140,140,140,0.8);
          }
        </style>
        <style>
@@ -9,7 +9,7 @@
  "author": "",
  "license": "ISC",
  "devDependencies": {
-    "@material-ui/core": "^4.0.0-alpha.0",
+    "@material-ui/core": "^3.9.0",
    "@material-ui/icons": "^3.0.1",
    "@material-ui/styles": "^3.0.0-alpha.8",
    "@types/node": "^10.12.18",
@@ -19,8 +19,8 @@
    "@types/react-resize-detector": "^3.1.0",
    "@types/react-split-pane": "^0.1.67",
    "@types/sha1": "^1.1.1",
+    "@types/socket.io": "^2.1.2",
    "@types/socket.io-client": "^1.4.32",
-    "@types/uuid": "^3.4.4",
    "@types/vis": "^4.21.9",
    "awesome-typescript-loader": "^5.2.1",
    "compare-versions": "^3.4.0",
@@ -34,7 +34,7 @@
    "lodash.throttle": "^4.1.1",
    "moving-average": "^1.0.0",
    "number-abbreviate": "^2.0.0",
-    "react": "16.8",
+    "react": "^16.8.0-alpha.1",
    "react-ace": "^6.3.2",
    "react-dom": "^16.7.0",
    "react-json-view": "^1.19.1",
@@ -49,11 +49,13 @@
    "source-map-loader": "^0.2.4",
    "style-loader": "^0.23.1",
    "typescript": "^3.2.2",
-    "uuid": "^3.3.2",
    "webpack": "^4.28.2",
    "webpack-bundle-analyzer": "^3.0.3",
    "webpack-cli": "^3.1.2",
    "webpack-dev-server": "^3.1.14",
    "webpack-livereload-plugin": "^2.2.0"
+  },
+  "dependencies": {
+    "socket.io": "^2.2.0"
  }
 }
@@ -1,29 +1,25 @@
 import * as React from 'react'
-import ConnectionSetup from './components/ConnectionSetup/ConnectionSetup'
+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'
-import ErrorBoundary from './ErrorBoundary'
-import Notification from './components/Notification'
+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 { AppState } from './reducers'
-import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
+import ErrorBoundary from './ErrorBoundary'
 import { default as SplitPane } from 'react-split-pane'
-import { globalActions, settingsActions } from './actions'
-import { Theme, withStyles } from '@material-ui/core/styles'
-
-const Settings = React.lazy(() => import('./components/Settings'))

 interface Props {
  name: string
  connectionId: string
  classes: any
  settingsVisible: boolean
-  error?: string
-  actions: typeof globalActions
-  settingsActions: typeof settingsActions
 }

 class App extends React.PureComponent<Props, {}> {
@@ -32,22 +28,6 @@ class App extends React.PureComponent<Props, {}> {
    this.state = { }
  }

-  public componentDidMount() {
-    this.props.settingsActions.loadSettings()
-  }
-
-  private renderError() {
-    if (this.props.error) {
-      const error = typeof this.props.error === 'string' ? this.props.error : JSON.stringify(this.props.error)
-      return (
-        <Notification
-          message={error}
-          onClose={() => { this.props.actions.showError(undefined) }}
-        />
-      )
-    }
-  }
-
  public render() {
    const { settingsVisible } = this.props
    const { content, contentShift, centerContent, paneDefaults, heightProperty } = this.props.classes
@@ -56,7 +36,6 @@ class App extends React.PureComponent<Props, {}> {
      <div className={centerContent}>
        <CssBaseline />
        <ErrorBoundary>
-          {this.renderError()}
          <React.Suspense fallback={<div>Loading...</div>}>
            <Settings />
          </React.Suspense>
@@ -87,7 +66,7 @@ class App extends React.PureComponent<Props, {}> {
            </div>
          </div>
          <UpdateNotifier />
-          <ConnectionSetup />
+          <Connection />
        </ErrorBoundary>
      </div >
    )
@@ -98,8 +77,6 @@ const mapStateToProps = (state: AppState) => {
  return {
    settingsVisible: state.settings.visible,
    connectionId: state.connection.connectionId,
-    error: state.globalState.error,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
  }
 }

@@ -145,11 +122,4 @@ const styles = (theme: Theme) => {
  }
 }

-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(globalActions, dispatch),
-    settingsActions: bindActionCreators(settingsActions, dispatch),
-  }
-}
-
-export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(App))
+export default withStyles(styles)(connect(mapStateToProps)(App))
@@ -1,9 +1,5 @@
 import * as React from 'react'
-import PersistantStorage from './PersistantStorage'
-import SentimentDissatisfied from '@material-ui/icons/SentimentDissatisfied'
-import Warning from '@material-ui/icons/Warning'
 import { electronRendererTelementry } from 'electron-telemetry'
-import { Theme, withStyles } from '@material-ui/core/styles'
 import {
  Button,
  Modal,
@@ -12,6 +8,11 @@ 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
 }
@@ -40,7 +41,7 @@ class ErrorBoundary extends React.Component<Props, State> {
  }

  private clearStorage = () => {
-    PersistantStorage.clear()
+    localStorage.clear()
    window.location = window.location
  }

@@ -88,7 +89,7 @@ const styles = (theme: Theme) => ({
    maxWidth: 650,
    backgroundColor: theme.palette.background.default,
    margin: '10vh auto auto auto',
-    padding: theme.spacing(2),
+    padding: `${2 * theme.spacing.unit}px`,
    outline: 'none',
  },
  title: {
@@ -104,7 +105,7 @@ const styles = (theme: Theme) => ({
  },
  buttonPositioning: {
    textAlign: 'center' as 'center',
-    marginTop: theme.spacing(2),
+    marginTop: `${theme.spacing.unit * 2}px`,
  },
 })

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

    return (
      <Snackbar
@@ -231,14 +232,14 @@ const styles = (theme: Theme) => ({
    color: theme.typography.button.color,
  },
  close: {
-    padding: '4px',
+    padding: theme.spacing.unit / 2,
  },
  root: {
    minWidth: '350px',
    maxWidth: '500px',
    backgroundColor: theme.palette.background.default,
    margin: '20vh auto auto auto',
-    padding: theme.spacing(2),
+    padding: `${2 * theme.spacing.unit}px`,
    outline: 'none',
  },
  title: {
@@ -251,7 +252,7 @@ const styles = (theme: Theme) => ({
    maxHeight: '28vh',
  },
  paper: {
-    padding: theme.spacing(2),
+    padding: `${theme.spacing.unit * 2}px`,
    color: theme.palette.text.secondary,
  },
  download: {
@@ -265,8 +266,8 @@ const styles = (theme: Theme) => ({

 const mapStateToProps = (state: AppState) => {
  return {
-    showUpdateNotification: state.globalState.showUpdateNotification,
-    showUpdateDetails: state.globalState.showUpdateDetails,
+    showUpdateNotification: state.tooBigReducer.showUpdateNotification,
+    showUpdateDetails: state.tooBigReducer.showUpdateDetails,
  }
 }

@@ -1,27 +1,24 @@
-import * as q from '../../../backend/src/Model'
-import * as url from 'url'
-import { Action, ActionTypes } from '../reducers/Connection'
-import {
-  addMqttConnectionEvent,
-  makeConnectionStateEvent,
-  removeConnection,
-  rendererEvents,
-} from '../../../events'
-import { AppState } from '../reducers'
+import { ActionTypes, Action, ConnectionState } from '../reducers/Connection'
+import { MqttOptions } from '../../../backend/src/DataSource'
 import { Dispatch } from 'redux'
-import { MqttOptions, DataSourceState } from '../../../backend/src/DataSource'
+import { 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 { showError } from './Global'
+import { getRendererEvents } from '../communication'

-export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const connect = (options: MqttOptions, connectionId: string) => async (dispatch: Dispatch<any>, getState: () => AppState) => {
  dispatch(connecting(connectionId))
+
+  const rendererEvents = await getRendererEvents()
  rendererEvents.emit(addMqttConnectionEvent, { options, id: connectionId })
+
  const event = makeConnectionStateEvent(connectionId)
  const host = url.parse(options.url).hostname

  rendererEvents.subscribe(event, (dataSourceState) => {
-    console.log(dataSourceState)
    if (dataSourceState.connected) {
      const tree = new q.Tree<TopicViewModel>()
      tree.updateWithConnection(rendererEvents, connectionId)
@@ -31,27 +28,6 @@ export const connect = (options: MqttOptions, connectionId: string) => (dispatch
      dispatch(showError(dataSourceState.error))
      dispatch(disconnect())
    }
-    dispatch(updateHealth(dataSourceState))
-  })
-}
-
-const updateHealth = (dataSourceState: DataSourceState) => (dispatch: Dispatch<any>, getState: () => AppState) => {
-  let state
-  if (dataSourceState.connecting) {
-    state = 'connecting'
-  } else if (!dataSourceState.connected) {
-    state = 'offline'
-  } else if (dataSourceState.connected) {
-    state = 'online'
-  } else {
-    state = undefined
-  }
-
-  console.log(state)
-
-  dispatch({
-    type: ActionTypes.CONNECTION_SET_HEALTH,
-    health: state,
  })
 }

@@ -66,9 +42,14 @@ export const connecting: (connectionId: string) => Action = (connectionId: strin
  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)  => {
  const { connectionId, tree } = getState().connection
-  rendererEvents.emit(removeConnection, connectionId)
+  getRendererEvents().then(rendererEvents => rendererEvents.emit(removeConnection, connectionId))
  tree && tree.stopUpdating()

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

 export const setTopic = (topic?: string): Action  => {
  return {
@@ -46,7 +47,8 @@ export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, ge
    retain: state.publish.retain,
    qos: state.publish.qos,
  }
-  rendererEvents.emit(publishEvent, mqttMessage)
+
+  getRendererEvents().then(rendererEvents => rendererEvents.emit(publishEvent, mqttMessage))
 }

 export const toggleRetain = (): Action => {
@@ -1,76 +1,31 @@
-import * as q from '../../../backend/src/Model'
-import { AppState } from '../reducers'
-import { autoExpandLimitSet } from '../components/Settings'
-import { batchActions } from 'redux-batched-actions'
-import { default as persistantStorage, StorageIdentifier } from '../PersistantStorage'
+import { Action, ActionTypes, TopicOrder } from '../reducers/Settings'
+import { ActionTypes as TreeActionTypes } from '../reducers/Tree'
 import { Dispatch } from 'redux'
-import { showError } from './Global'
 import { showTree } from './Tree'
+import { AppState } from '../reducers'
+import * as q from '../../../backend/src/Model'
+import { batchActions } from 'redux-batched-actions'
+import { autoExpandLimitSet } from '../components/Settings'
 import { TopicViewModel } from '../TopicViewModel'
-import {
-  ActionTypes,
-  SettingsState,
-  TopicOrder,
-} from '../reducers/Settings'

-const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
-  id: 'Settings',
-}
-
-export const loadSettings = () => async (dispatch: Dispatch<any>, _getState: () => AppState)  => {
-  try {
-    const settings = await persistantStorage.load(settingsIdentifier)
-    dispatch({
-      settings,
-      type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS,
-    })
-  } catch (error) {
-    dispatch(showError(error))
-  }
-}
-
-export const storeSettings = () => async (dispatch: Dispatch<any>, getState: () => AppState)  => {
-  const settings = {
-    ...getState().settings,
-    topicFilter: undefined,
-    visible: undefined,
-  }
-
-  try {
-    await persistantStorage.store(settingsIdentifier, settings)
-  } catch (error) {
-    dispatch(showError(error))
-  }
-}
-
-export const setAutoExpandLimit = (autoExpandLimit: number = 0) => (dispatch: Dispatch<any>, getState: () => AppState) => {
-  dispatch({
+export const setAutoExpandLimit = (autoExpandLimit: number = 0): Action => {
+  return {
    autoExpandLimit,
    type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT,
-  })
-  dispatch(storeSettings())
+  }
 }

-export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>, _getState: () => AppState) => {
-  dispatch({
+export const toggleSettingsVisibility = (): Action => {
+  return {
    type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY,
-  })
-  dispatch(storeSettings())
+  }
 }

-export const togglehighlightTopicUpdates = () => (dispatch: Dispatch<any>, _getState: () => AppState) => {
-  dispatch({
-    type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY,
-  })
-  dispatch(storeSettings())
-}
-
-export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none) => (dispatch: Dispatch<any>, _getState: () => AppState) => {
-  dispatch({
+export const setTopicOrder = (topicOrder: TopicOrder = TopicOrder.none): Action => {
+  return {
    topicOrder,
    type: ActionTypes.SETTINGS_SET_TOPIC_ORDER,
-  })
-  dispatch(storeSettings())
+  }
 }

 export const filterTopics = (filterStr: string) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
@@ -1,46 +1,23 @@
 import { Dispatch, Action } from 'redux'
 import { AppState } from '../reducers'
-import { makePublishEvent, rendererEvents } from '../../../events'
-import * as q from '../../../backend/src/Model'
+import { makePublishEvent } from '../../../events'
+import { getRendererEvents } from '../communication'

-export const clearRetainedTopic = () => (dispatch: Dispatch<any>, getState: () => AppState) => {
+export const clearRetainedTopic = () => (dispatch: Dispatch<Action>, getState: () => AppState)  => {
  const { selectedTopic } = getState().tree
-  if (!selectedTopic) {
-    return
-  }
-
-  dispatch(clearTopic(selectedTopic, false))
-}
-
-export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean, subtopicClearLimit = 50) => (dispatch: Dispatch<any>, getState: () => AppState)  => {
  const { connectionId } = getState().connection
-  if (!connectionId) {
+
+  if (!selectedTopic || !connectionId) {
    return
  }

  const publishEvent = makePublishEvent(connectionId)
  const mqttMessage = {
-    topic: topic.path(),
+    topic: selectedTopic.path(),
    payload: null,
    retain: true,
    qos: 0 as 0,
  }
-  console.log('deleting', topic.path())
-  rendererEvents.emit(publishEvent, mqttMessage)

-  if (recursive) {
-    topic.childTopics()
-      .filter(topic => Boolean(topic.message && topic.message.value))
-      .slice(0, subtopicClearLimit)
-      .forEach((topic) => {
-        console.log('deleting', topic.path())
-        const mqttMessage = {
-          topic: topic.path(),
-          payload: null,
-          retain: true,
-          qos: 0 as 0,
-        }
-        rendererEvents.emit(publishEvent, mqttMessage)
-      })
-  }
+  getRendererEvents().then(rendererEvents => rendererEvents.emit(publishEvent, mqttMessage))
 }
@@ -4,7 +4,5 @@ import * as treeActions from './Tree'
 import * as updateNotifierActions from './UpdateNotifier'
 import * as connectionActions from './Connection'
 import * as sidebarActons from './Sidebar'
-import * as connectionManagerActions from './ConnectionManager'
-import * as globalActions from './Global'

-export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons, connectionManagerActions, globalActions }
+export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons }
@@ -0,0 +1,28 @@
+import * as io from 'socket.io-client'
+
+import { EventBusInterface, Event } from '../../../events'
+
+class SocketIoClient implements EventBusInterface {
+  private client?: any
+  constructor(url = 'http://localhost:3000') {
+    this.client = io(url)
+  }
+
+  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
+    this.client.on(event.topic, callback)
+  }
+
+  public unsubscribeAll<MessageType>(event: Event<MessageType>) {
+    this.client.removeAllListeners()
+  }
+
+  public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
+    this.client.removeListener(event.topic, callback)
+  }
+
+  public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
+    this.client.emit(event.topic, msg)
+  }
+}
+
+export const rendererEvents = new SocketIoClient()
@@ -0,0 +1,3 @@
+export async function getRendererEvents() {
+  return (await import('./SocketIO')).rendererEvents
+}
@@ -24,6 +24,7 @@ const styles: StyleRulesCallback = theme => ({
    height: '224px',
    backgroundColor: 'rebeccapurple',
    marginBottom: 0,
+    marginTop: 'auto',
    padding: '8px',
  },
 })
@@ -41,7 +42,7 @@ class BrokerStatistics extends React.Component<Props, {}> {

  public render() {
    const { tree, classes } = this.props
-    if (!tree || !tree.findNode('$SYS/broker/clients/total')) {
+    if (!tree || !tree.findNode('$SYS')) {
      return null
    }

@@ -1,54 +0,0 @@
-import * as React from 'react'
-import DeviceHubOutlined from '@material-ui/icons/DeviceHubOutlined'
-import { AppState } from '../reducers'
-import { connect } from 'react-redux'
-import { ConnectionHealth } from '../reducers/Connection'
-import { green, orange, red } from '@material-ui/core/colors'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import { Tooltip } from '@material-ui/core'
-
-const styles: StyleRulesCallback = theme => ({
-  offline: {
-    color: red[700],
-  },
-  online: {
-    color: green[500],
-  },
-  connecting: {
-    color: orange[600],
-  },
-})
-
-interface Props {
-  classes: any
-  connected: boolean
-  health?: ConnectionHealth
-}
-
-class ConnectionHealthIndicator extends React.Component<Props, {}> {
-  constructor(props: any) {
-    super(props)
-  }
-
-  public render() {
-    const { classes, health, connected } = this.props
-    if (!health || !connected) {
-      return null
-    }
-
-    return (
-      <Tooltip title={`Connection health "${health}"`}>
-        <DeviceHubOutlined className={classes[health]} />
-      </Tooltip>
-    )
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    health: state.connection.health,
-    connected: state.connection.connected || state.connection.connecting,
-  }
-}
-
-export default connect(mapStateToProps)(withStyles(styles)(ConnectionHealthIndicator))
@@ -1,32 +0,0 @@
-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>
-  )
-})
@@ -1,154 +0,0 @@
-import * as React from 'react'
-import Add from '@material-ui/icons/Add'
-import Delete from '@material-ui/icons/Delete'
-import Undo from '@material-ui/icons/Undo'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { connectionManagerActions } from '../../actions'
-import { ConnectionOptions } from '../../model/ConnectionOptions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
-import {
-  Button,
-  Grid,
-  IconButton,
-  TextField,
-  List,
-  ListItem,
-  ListItemText,
-} from '@material-ui/core'
-
-interface Props {
-  connection: ConnectionOptions
-  classes: any
-  managerActions: typeof connectionManagerActions
-}
-
-interface State {
-  subscription: string
-}
-
-class ConnectionSettings extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-    this.state = { subscription: '' }
-  }
-
-  private handleChange = (name: string) => (event: any) => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      [name]: event.target.value,
-    })
-  }
-
-  public render() {
-    const { classes } = this.props
-    return (
-      <div>
-        <form className={classes.container} noValidate={true} autoComplete="off">
-          <Grid container={true} spacing={3}>
-            <Grid item={true} xs={10} className={classes.gridPadding}>
-              <TextField
-                className={classes.fullWidth}
-                label="Subscription"
-                margin="normal"
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => this.setState({ subscription: event.target.value })}
-              />
-            </Grid>
-            <Grid item={true} xs={2} className={classes.gridPadding}>
-              <Button
-                className={classes.button}
-                color="secondary"
-                onClick={() => this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)}
-                variant="contained"
-              >
-                <Add /> Add
-              </Button>
-            </Grid>
-            <Grid item={true} xs={12} style={{ padding: 0 }}>
-              <List
-                className={classes.topicList}
-                component="nav"
-              >
-                <div className={this.props.classes.list}>
-                  {this.renderSubscriptions()}
-                </div>
-              </List>
-            </Grid>
-            <Grid item={true} xs={9} className={classes.gridPadding}>
-              <TextField
-                className={classes.fullWidth}
-                label="MQTT Client ID"
-                margin="normal"
-                onChange={this.handleChange('clientId')}
-              />
-            </Grid>
-            <Grid item={true} xs={3} className={classes.gridPadding}>
-              <Button
-                variant="contained"
-                className={classes.button}
-                onClick={this.props.managerActions.toggleAdvancedSettings}
-              >
-                <Undo /> Back
-              </Button>
-            </Grid>
-          </Grid>
-        </form>
-      </div>
-    )
-  }
-
-  private renderSubscriptions() {
-    const connection = this.props.connection
-    return connection.subscriptions.map(subscription => (
-      <Subscription
-        deleteAction={() => this.props.managerActions.deleteSubscription(subscription, connection.id)}
-        subscription={subscription}
-        key={subscription}
-      />
-    ))
-  }
-}
-
-const Subscription = (props: {
-  subscription: string,
-  deleteAction: any,
-}) => {
-  return (
-    <ListItem style={{ padding: '0 0 0 8px' }}>
-      <ListItemText>
-        <IconButton onClick={props.deleteAction} style={{ padding: '6px' }}>
-          <Delete />
-        </IconButton>
-        {props.subscription}</ListItemText>
-    </ListItem>
-  )
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    managerActions: bindActionCreators(connectionManagerActions, dispatch),
-  }
-}
-
-const styles: StyleRulesCallback<string> = (theme: Theme) => {
-  return {
-    fullWidth: {
-      width: '100%',
-    },
-    gridPadding: {
-      padding: '0 12px !important',
-    },
-    topicList: {
-      height: '180px',
-      overflowY: 'scroll' as 'scroll',
-      margin: '8px 16px',
-      backgroundColor: theme.palette.background.default,
-    },
-    button: {
-      marginTop: theme.spacing(3),
-      float: 'right',
-    },
-  }
-}
-
-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
@@ -0,0 +1,395 @@
+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))
@@ -1,341 +0,0 @@
-import * as React from 'react'
-import Delete from '@material-ui/icons/Delete'
-import Settings from '@material-ui/icons/Settings'
-import PowerSettingsNew from '@material-ui/icons/PowerSettingsNew'
-import Save from '@material-ui/icons/Save'
-import Visibility from '@material-ui/icons/Visibility'
-import VisibilityOff from '@material-ui/icons/VisibilityOff'
-import { AppState } from '../../reducers'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { connectionActions, connectionManagerActions } from '../../actions'
-import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-
-import {
-  Button,
-  FormControl,
-  FormControlLabel,
-  Grid,
-  IconButton,
-  Input,
-  InputAdornment,
-  InputLabel,
-  MenuItem,
-  Switch,
-  TextField,
-} from '@material-ui/core'
-import ConnectionHealthIndicator from '../ConnectionHealthIndicator'
-
-interface Props {
-  connection: ConnectionOptions
-  classes: {[s: string]: string}
-  actions: typeof connectionActions,
-  managerActions: typeof connectionManagerActions
-  connected: boolean
-  connecting: boolean
-}
-
-const protocols = [
-  'mqtt',
-  'ws',
-]
-
-interface State {
-  showPassword: boolean
-}
-
-class ConnectionSettings extends React.Component<Props, State> {
-  constructor(props: any) {
-    super(props)
-
-    this.state = {
-      showPassword: false,
-    }
-  }
-
-  private handleClickShowPassword = () => {
-    this.setState({ showPassword: !this.state.showPassword })
-  }
-
-  private requiresBasePath() {
-    return this.props.connection.protocol !== 'mqtt'
-  }
-
-  private renderBasePathInput() {
-    return (
-      <Grid item={true} xs={4}>
-        <TextField
-          label="Basepath"
-          className={this.props.classes.textField}
-          value={this.props.connection.basePath}
-          onChange={this.handleChange('basePath')}
-          margin="normal"
-        />
-      </Grid>
-    )
-  }
-
-  private handleChange = (name: string) => (event: any) => {
-    if (!this.props.connection) {
-      return
-    }
-
-    this.updateConnection(name, event.target.value)
-  }
-
-  private updateConnection(name: string, value: any) {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      [name]: value,
-    })
-  }
-
-  public render() {
-    const { classes, connection } = this.props
-
-    const passwordVisibilityButton = (
-      <InputAdornment position="end">
-        <IconButton
-          aria-label="Toggle password visibility"
-          onClick={this.handleClickShowPassword}
-        >
-          {this.state.showPassword ? <Visibility /> : <VisibilityOff />}
-        </IconButton>
-      </InputAdornment>
-    )
-
-    return (
-      <div>
-        <form className={classes.container} noValidate={true} autoComplete="off">
-          <Grid container={true} spacing={3}>
-            <Grid item={true} xs={5}>
-              <TextField
-                label="Name"
-                className={classes.textField}
-                value={connection.name}
-                onChange={this.handleChange('name')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={4}>
-              {this.renderCertValidationSwitch()}
-            </Grid>
-            <Grid item={true} xs={3}>
-              {this.renderTlsSwitch()}
-            </Grid>
-            <Grid item={true} xs={2}>
-              {this.renderProtocols()}
-            </Grid>
-            <Grid item={true} xs={7}>
-              <TextField
-                label="Host"
-                className={classes.textField}
-                value={connection.host}
-                onChange={this.handleChange('host')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={3}>
-              <TextField
-                label="Port"
-                className={classes.textField}
-                value={connection.port}
-                onChange={this.handleChange('port')}
-                margin="normal"
-              />
-            </Grid>
-            {this.requiresBasePath() ? this.renderBasePathInput() : null}
-            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
-              <TextField
-                label="Username"
-                className={classes.textField}
-                value={connection.username}
-                onChange={this.handleChange('username')}
-                margin="normal"
-              />
-            </Grid>
-            <Grid item={true} xs={this.requiresBasePath() ? 4 : 6}>
-              <FormControl className={`${classes.textField} ${classes.inputFormControl}`}>
-                <InputLabel htmlFor="adornment-password">Password</InputLabel>
-                <Input
-                  id="adornment-password"
-                  type={this.state.showPassword ? 'text' : 'password'}
-                  value={connection.password}
-                  onChange={this.handleChange('password')}
-                  endAdornment={passwordVisibilityButton}
-                />
-              </FormControl>
-            </Grid>
-          </Grid>
-          <br />
-          <div>
-            <div style={{ float: 'left' }}>
-              <Button variant="contained" className={classes.button} onClick={() => this.props.managerActions.deleteConnection(this.props.connection.id)}>
-                Delete <Delete />
-              </Button>
-              <Button variant="contained" className={classes.button} onClick={this.props.managerActions.toggleAdvancedSettings}>
-                <Settings /> Advanced
-              </Button>
-            </div>
-            <div style={{ float : 'right' }}>
-              <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.managerActions.saveConnectionSettings}>
-                <Save /> Save
-              </Button>
-              {this.renderConnectButton()}
-            </div>
-          </div>
-        </form>
-      </div>
-    )
-  }
-
-  private renderProtocols() {
-    const { classes, connection } = this.props
-
-    const protocolItems = protocols.map((value: string) => (
-      <MenuItem key={value} value={value}>
-        {value}://
-      </MenuItem>
-    ))
-
-    return (
-      <TextField
-        select={true}
-        label="Protocol"
-        className={classes.textField}
-        value={connection.protocol}
-        onChange={this.updateProtocol}
-        margin="normal"
-      >
-        {protocolItems}
-      </TextField>
-    )
-  }
-
-  private updateProtocol = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.target.value
-    this.updateConnection('protocol', value)
-    if (event.target.value === 'mqtt') {
-      this.updateConnection('basePath', undefined)
-    } else {
-      this.updateConnection('basePath', 'ws')
-    }
-  }
-
-  private renderCertValidationSwitch() {
-    const { classes, connection } = this.props
-
-    const certSwitch = (
-      <Switch
-        checked={connection.certValidation}
-        onChange={this.toggleCertValidation}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={certSwitch}
-          label="Validate certificate"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleCertValidation = () => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      certValidation: !this.props.connection.certValidation,
-    })
-  }
-
-  private renderTlsSwitch() {
-    const { classes, connection } = this.props
-
-    const tlsSwitch = (
-      <Switch
-        checked={connection.encryption}
-        onChange={this.toggleTls}
-        color="primary"
-      />
-    )
-
-    return (
-      <div className={classes.switch}>
-        <FormControlLabel
-          control={tlsSwitch}
-          label="Encryption (tls)"
-          labelPlacement="bottom"
-        />
-      </div>
-    )
-  }
-
-  private toggleTls = () => {
-    this.props.managerActions.updateConnection(this.props.connection.id, {
-      encryption: !this.props.connection.encryption,
-    })
-  }
-
-  private renderConnectButton() {
-    const { classes, actions } = this.props
-
-    if (this.props.connecting) {
-      return (
-        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
-          <ConnectionHealthIndicator />&nbsp;&nbsp;Abort
-        </Button>
-      )
-    }
-    return (
-       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
-        <PowerSettingsNew /> Connect
-      </Button>
-    )
-  }
-
-  private onClickConnect = () => {
-    if (!this.props.connection) {
-      return
-    }
-
-    const mqttOptions = toMqttConnection(this.props.connection)
-    if (mqttOptions) {
-      this.props.actions.connect(mqttOptions, this.props.connection.id)
-    }
-  }
-}
-
-const mapStateToProps = (state: AppState) => {
-  return {
-    connected: state.connection.connected,
-    connecting: state.connection.connecting,
-  }
-}
-
-const mapDispatchToProps = (dispatch: any) => {
-  return {
-    actions: bindActionCreators(connectionActions, dispatch),
-    managerActions: bindActionCreators(connectionManagerActions, dispatch),
-  }
-}
-
-const styles: StyleRulesCallback<string> = (theme: Theme) => {
-  return {
-    textField: {
-      width: '100%',
-    },
-    switch: {
-      marginTop: 0,
-    },
-    button: {
-      margin: theme.spacing(1),
-    },
-    inputFormControl: {
-      marginTop: '16px',
-    },
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
@@ -1,127 +0,0 @@
-import * as React from 'react'
-import ConnectionSettings from './ConnectionSettings'
-import ProfileList from './ProfileList'
-import { AppState } from '../../reducers'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { connectionManagerActions } from '../../actions'
-import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
-import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  Modal,
-  Paper,
-  Toolbar,
-  Typography,
-  Collapse,
-} from '@material-ui/core'
-import AdvancedConnectionSettings from './AdvancedConnectionSettings'
-
-interface Props {
-  actions: any
-  classes: any
-  connection?: ConnectionOptions
-  visible: boolean
-  showAdvancedSettings: boolean
-}
-
-class ConnectionSetup extends React.Component<Props, {}> {
-  constructor(props: Props) {
-    super(props)
-  }
-
-  public componentDidMount() {
-    this.props.actions.loadConnectionSettings()
-  }
-
-  public render() {
-    const { classes, visible, connection } = this.props
-    const mqttConnection = connection && toMqttConnection(connection)
-    return (
-      <div>
-        <Modal open={visible} disableAutoFocus={true}>
-          <Paper className={classes.root}>
-            <div className={classes.left}><ProfileList /></div>
-            <div className={classes.right} key={connection && connection.id}>
-              <Toolbar>
-                <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
-                <Typography className={classes.connectionUri}>
-                  {mqttConnection && mqttConnection.url}
-                </Typography>
-              </Toolbar>
-              {this.renderSettings()}
-            </div>
-          </Paper>
-        </Modal>
-      </div>
-    )
-  }
-
-  private renderSettings() {
-    const { connection, showAdvancedSettings } = this.props
-    if (!connection) {
-      return null
-    }
-
-    return (
-      <div>
-        <Collapse in={!showAdvancedSettings}><ConnectionSettings connection={connection} /></Collapse>
-        <Collapse in={showAdvancedSettings}><AdvancedConnectionSettings connection={connection} /></Collapse>
-      </div>
-    )
-  }
-}
-
-const styles = (theme: Theme) => ({
-  title: {
-    color: theme.palette.text.primary,
-    whiteSpace: 'nowrap' as 'nowrap',
-  },
-  root: {
-    margin: '13vw auto 0 auto',
-    minWidth: '800px',
-    maxWidth: '850px',
-    height: '440px',
-    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))
@@ -1,113 +0,0 @@
-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))
@@ -1,10 +1,9 @@
 import * as React from 'react'
-import { Snackbar, SnackbarContent, Tooltip } from '@material-ui/core'
+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'
-import CustomIconButton from './CustomIconButton';

 const copy = require('copy-text-to-clipboard')

@@ -33,36 +32,28 @@ class Copy extends React.Component<Props, State> {

  public render() {
    const icon = !this.state.didCopy
-      ? <FileCopy fontSize="inherit" />
+      ? <FileCopy fontSize="inherit" style={{ cursor: 'pointer' }} onClick={this.handleClick} />
      : <Check fontSize="inherit" style={{ cursor: 'default' }} />

-    return (
+    return <span>
+      <span style={{ fontSize: '16px' }}>{icon}</span>
      <span>
-        <Tooltip placement="top" title="Copy to clipboard">
-          <span style={{ fontSize: '16px' }}>
-          <CustomIconButton onClick={this.handleClick} >
-            {icon}
-          </CustomIconButton>
-          </span>
-        </Tooltip>
-        <span>
-          <Snackbar
-            anchorOrigin={{
-              vertical: 'bottom',
-              horizontal: 'left',
-            }}
-            open={this.state.snackBarOpen}
-            autoHideDuration={2000}
-            onClose={() => { this.setState({ snackBarOpen: false }) }}
-          >
-            <SnackbarContent
-              className={this.props.classes.snackbar}
-              message="Copied to clipboard"
-            />
-          </Snackbar>
-        </span>
+        <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) => {
@@ -1,34 +0,0 @@
-import * as React from 'react'
-import { IconButton } from '@material-ui/core'
-import { withStyles, Theme } from '@material-ui/core/styles'
-
-interface Props {
-  onClick: any,
-  classes: any
-}
-
-const styles = (theme: Theme) => ({
-  button: {
-    padding: '6px',
-    fontSize: '1.2em',
-  },
-})
-
-class CustomIconButton extends React.Component<Props, {}> {
-  constructor(props: Props) {
-    super(props)
-  }
-
-  public render() {
-    return (
-      <IconButton className={this.props.classes.button} onClick={this.onClick}>{this.props.children}</IconButton>
-    )
-  }
-
-  private onClick = (event: React.MouseEvent) => {
-    event.stopPropagation()
-    this.props.onClick(event)
-  }
-}
-
-export default withStyles(styles)(CustomIconButton)
@@ -10,18 +10,15 @@ import {
  MenuItem,
  Select,
  Typography,
-  Switch,
-  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 } from '../actions'
+import { settingsActions, treeActions } from '../actions'
 import { TopicOrder } from '../reducers/Settings'
 import BrokerStatistics from './BrokerStatistics'
-import { shell } from 'electron';

 export const autoExpandLimitSet = [{
  limit: 0,
@@ -50,23 +47,17 @@ const styles: StyleRulesCallback = theme => ({
  },
  title: {
    color: theme.palette.text.primary,
-    paddingTop: theme.spacing(1),
+    paddingTop: `${theme.spacing.unit}px`,
    ...theme.mixins.toolbar,
  },
  input: {
    minWidth: '150px',
-    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',
+    margin: `auto ${theme.spacing.unit}px auto ${2 * theme.spacing.unit}px`,
  },
 })

 interface Props {
  autoExpandLimit: number
-  highlightTopicUpdates: boolean
  visible: boolean
  store?: any
  topicOrder: TopicOrder
@@ -105,38 +96,12 @@ class Settings extends React.Component<Props, {}> {

          {this.renderAutoExpand()}
          {this.renderNodeOrder()}
-          {this.renderhighlightTopicUpdates()}
        </div>
-        <Tooltip placement="top" title="App Author">
-          <Typography className={classes.author} onClick={this.openGithubPage}>
-            by Thomas Nordquist
-          </Typography>
-        </Tooltip>
        <BrokerStatistics />
      </Drawer>
    )
  }

-  private openGithubPage = () => {
-    shell.openExternal('https://github.com/thomasnordquist')
-  }
-
-  private renderhighlightTopicUpdates() {
-    const { highlightTopicUpdates, actions } = this.props
-
-    return (
-      <div style={{ padding: '8px', display: 'flex' }}>
-        <InputLabel htmlFor="toggle-highlight-activity" style={{ flex: '1', marginTop: '8px' }}>Show Activity</InputLabel>
-        <Switch
-          name="toggle-highlight-activity"
-          checked={highlightTopicUpdates}
-          onChange={actions.togglehighlightTopicUpdates}
-          color="primary"
-        />
-      </div>
-    )
-  }
-
  private renderAutoExpand() {
    const { classes, autoExpandLimit } = this.props

@@ -167,7 +132,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}
@@ -195,7 +160,6 @@ const mapStateToProps = (state: AppState) => {
    autoExpandLimit: state.settings.autoExpandLimit,
    topicOrder: state.settings.topicOrder,
    visible: state.settings.visible,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
  }
 }

@@ -4,15 +4,15 @@ import { Badge, Typography } from '@material-ui/core'
 import { Theme, withStyles } from '@material-ui/core/styles'

 interface HistoryItem {
-  title: JSX.Element | string
-  value: string | any
+  title: string
+  value: string
 }

 interface Props {
  items: HistoryItem[]
  onClick?: (index: number, element: EventTarget) => void
  classes: any
-  contentTypeIndicator?: JSX.Element
+  contentTypeIndicator?: String
 }

 interface State {
@@ -61,7 +61,7 @@ class MessageHistory extends React.Component<Props, State> {
      <div>
        <History
          items={historyElements}
-          contentTypeIndicator={showPlot ? <BarChart /> : undefined}
+          contentTypeIndicator={showPlot ? <BarChart /> : null}
          onClick={this.displayMessage}
        >
          {showPlot ? this.renderPlot(numericMessages) : null}
@@ -1,22 +1,5 @@
-import * as q from '../../../../backend/src/Model'
 import * as React from 'react'
-import Clear from '@material-ui/icons/Clear'
-import Copy from '../Copy'
-import CustomIconButton from '../CustomIconButton'
-import DateFormatter from '../helper/DateFormatter'
-import Delete from '@material-ui/icons/Delete'
-import DeleteForever from '@material-ui/icons/DeleteForever'
-import ExpandMore from '@material-ui/icons/ExpandMore'
-import MessageHistory from './MessageHistory'
-import NodeStats from './NodeStats'
-import Topic from './Topic'
-import { AppState } from '../../reducers'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-import { default as ReactResizeDetector } from 'react-resize-detector'
-import { sidebarActons } from '../../actions'
-import { StyleRulesCallback, Theme, withStyles } from '@material-ui/core/styles'
-import { TopicViewModel } from '../../TopicViewModel'
+import * as q from '../../../../backend/src/Model'

 import {
  Button,
@@ -28,9 +11,23 @@ import {
  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'
+import Topic from './Topic'
+import { connect } from 'react-redux'
+import { bindActionCreators } from 'redux'
+import { TopicViewModel } from '../../TopicViewModel'
+import { default as ReactResizeDetector } from 'react-resize-detector'
 const throttle = require('lodash.throttle')

 const Publish = React.lazy(() => import('./Publish/Publish'))
@@ -95,63 +92,17 @@ class Sidebar extends React.Component<Props, State> {

  private detailsStyle = { padding: '0px 16px 8px 8px', display: 'block' }

-  private renderTopicDeleteButton() {
-    if (!this.props.node) {
-      return null
-    }
-
-    return (
-      <CustomIconButton onClick={() => this.deleteTopic(this.props.node)}>
-        <Tooltip title="Clear this topic">
-          <Delete />
-        </Tooltip>
-      </CustomIconButton>
-    )
-  }
-
-  private renderRecursiveTopicDeleteButton() {
-    const deleteLimit = 50
-    const topicCount = this.props.node ? this.props.node.childTopicCount() : 0
-    if (!this.props.node || topicCount === 0) {
-      return null
-    }
-
-    return (
-      <CustomIconButton onClick={() => this.deleteTopic(this.props.node, true, deleteLimit)}>
-        <Tooltip title={`Deletes up to ${deleteLimit} sub-topics with a single click`}>
-          <Badge
-            classes={{ badge: this.props.classes.badge }}
-            badgeContent={<span style={{ whiteSpace: 'nowrap' }}>{topicCount >= deleteLimit ? '50+' : topicCount}</span>}
-            color="secondary"
-          >
-            <DeleteForever color="action" />
-          </Badge>
-        </Tooltip>
-      </CustomIconButton>
-    )
-  }
-
-  private deleteTopic = (topic?: q.TreeNode<TopicViewModel>, recursive: boolean = false, maxCount = 50) => {
-    if (!topic) {
-      return
-    }
-
-    this.props.actions.clearTopic(topic, recursive, maxCount)
-  }
-
  private renderNode() {
    const { classes, node } = this.props

    const copyTopic = node ? <Copy value={node.path()} /> : null
-    const deleteTopic = this.renderTopicDeleteButton()
-    const deleteRecursiveTopic = this.renderRecursiveTopicDeleteButton()
    const copyValue = node && node.message ? <Copy value={node.message.value} /> : null
    const summeryStyle = { minHeight: '0' }
    return (
      <div>
        <ExpansionPanel key="topic" defaultExpanded={true} disabled={!Boolean(this.props.node)}>
          <ExpansionPanelSummary expandIcon={<ExpandMore />} style={summeryStyle}>
-            <Typography className={classes.heading}>Topic {copyTopic} {deleteTopic} {deleteRecursiveTopic}</Typography>
+            <Typography className={classes.heading}>Topic {copyTopic}</Typography>
          </ExpansionPanelSummary>
          <ExpansionPanelDetails style={this.detailsStyle}>
            <Topic node={this.props.node} didSelectNode={this.updateNode} />
@@ -196,6 +147,7 @@ class Sidebar extends React.Component<Props, State> {
  }

  private valueRenderWidthChange = (width: number) => {
+    console.log(width)
    this.setState({ valueRenderWidth: width })
  }

@@ -218,6 +170,7 @@ class Sidebar extends React.Component<Props, State> {
          size="small"
          color="secondary"
          variant="contained"
+          mini={true}
          style={{ marginTop: '-3px', padding: '0px 4px', minHeight: '24px' }}
          onClick={this.props.actions.clearRetainedTopic}
        >
@@ -277,7 +230,7 @@ const styles: StyleRulesCallback<string> = (theme: Theme) => {
      height: '100%',
    },
    valuePaper: {
-      margin: theme.spacing(1),
+      margin: `${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px ${theme.spacing.unit}px`,
    },
    heading: {
      fontSize: theme.typography.pxToRem(15),
@@ -1,23 +1,17 @@
 import * as React from 'react'
-import ClearAdornment from './helper/ClearAdornment'
+
+import { AppBar, Button, IconButton, InputBase, Toolbar, Typography } from '@material-ui/core'
+import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
+
 import CloudOff from '@material-ui/icons/CloudOff'
 import Menu from '@material-ui/icons/Menu'
 import Search from '@material-ui/icons/Search'
-import {
-  AppBar,
-  Button,
-  IconButton,
-  InputBase,
-  Toolbar,
-  Typography,
-} from '@material-ui/core'
-import { AppState } from '../reducers'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
-import { connectionActions, settingsActions } from '../actions'
 import { fade } from '@material-ui/core/styles/colorManipulator'
-import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import ConnectionHealthIndicator from './ConnectionHealthIndicator';
+import { settingsActions, connectionActions } from '../actions'
+import { AppState } from '../reducers'
+import ClearAdornment from './helper/ClearAdornment'

 const styles: StyleRulesCallback = theme => ({
  title: {
@@ -33,16 +27,16 @@ const styles: StyleRulesCallback = theme => ({
    '&:hover': {
      backgroundColor: fade(theme.palette.common.white, 0.25),
    },
-    marginRight: theme.spacing(2),
+    marginRight: theme.spacing.unit * 2,
    marginLeft: 0,
    width: '100%',
    [theme.breakpoints.up('sm')]: {
-      marginLeft: theme.spacing(3),
+      marginLeft: theme.spacing.unit * 3,
      width: 'auto',
    },
  },
  searchIcon: {
-    width: theme.spacing(8),
+    width: theme.spacing.unit * 8,
    height: '100%',
    position: 'absolute',
    pointerEvents: 'none',
@@ -55,10 +49,10 @@ const styles: StyleRulesCallback = theme => ({
    width: '100%',
  },
  inputInput: {
-    paddingTop: theme.spacing(1),
-    paddingRight: theme.spacing(1),
-    paddingBottom: theme.spacing(1),
-    paddingLeft: theme.spacing(10),
+    paddingTop: theme.spacing.unit,
+    paddingRight: theme.spacing.unit,
+    paddingBottom: theme.spacing.unit,
+    paddingLeft: theme.spacing.unit * 10,
    transition: theme.transitions.create('width'),
    width: '100%',
    [theme.breakpoints.up('md')]: {
@@ -95,12 +89,11 @@ class TitleBar extends React.Component<Props, {}> {
          <IconButton className={classes.menuButton} color="inherit" aria-label="Menu" onClick={actions.settings.toggleSettingsVisibility}>
            <Menu />
          </IconButton>
-          <Typography className={classes.title} variant="h6" color="inherit">MQTT Explorer</Typography>
+          <Typography className={classes.title} variant="h6" color="inherit">MQTT-Explorer</Typography>
          {this.renderSearch()}
          <Button style={{ margin: 'auto 8px auto auto' }} onClick={actions.connection.disconnect}>
            Disconnect <CloudOff style={{ marginRight: '8px', paddingLeft: '8px' }}/>
          </Button>
-          <ConnectionHealthIndicator />
        </Toolbar>
      </AppBar>
    )
@@ -22,9 +22,9 @@ interface Props {
  tree?: q.Tree<TopicViewModel>
  filter: string
  host?: string
+
  topicOrder: TopicOrder
  autoExpandLimit: number
-  highlightTopicUpdates: boolean
 }

 interface State {
@@ -111,7 +111,6 @@ class Tree extends React.PureComponent<Props, State> {
          topicOrder={this.props.topicOrder}
          lastUpdate={tree.lastUpdate}
          didSelectTopic={this.props.actions.selectTopic}
-          highlightTopicUpdates={this.props.highlightTopicUpdates}
        />
      </div>
    )
@@ -129,7 +128,6 @@ const mapStateToProps = (state: AppState) => {
    host: state.connection.host,
    autoExpandLimit: state.settings.autoExpandLimit,
    topicOrder: state.settings.topicOrder,
-    highlightTopicUpdates: state.settings.highlightTopicUpdates,
  }
 }

@@ -30,10 +30,10 @@ const styles = (theme: Theme) => {
      marginTop: '-1px',
    },
    selected: {
-      backgroundColor: 'rgba(170, 170, 170, 0.55)',
+      backgroundColor: 'rgba(120, 120, 120, 0.55)',
    },
    hover: {
-      backgroundColor: 'rgba(100, 100, 100, 0.55)',
+      backgroundColor: 'rgba(80, 80, 80, 0.55)',
    },
  }
 }
@@ -51,7 +51,6 @@ interface Props {
  autoExpandLimit: number
  lastUpdate: number
  didSelectTopic: any
-  highlightTopicUpdates: boolean
 }

 interface State {
@@ -65,10 +64,12 @@ class TreeNode extends React.Component<Props, State> {
  private dirtyEdges: boolean = true
  private dirtyMessage: boolean = true
  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 = () => {
@@ -128,6 +129,7 @@ class TreeNode extends React.Component<Props, State> {
  public componentWillUnmount() {
    const { treeNode } = this.props
    this.removeSubscriber(treeNode)
+    this.titleRef = undefined
    this.nodeRef = undefined
  }

@@ -180,29 +182,28 @@ class TreeNode extends React.Component<Props, State> {
    const isDirty = this.dirtyEdges || this.dirtyMessage || this.dirtySubnodes
    this.dirtyEdges = this.dirtyMessage = this.dirtySubnodes = false

-    const shouldStartAnimation = (isDirty && !this.animationDirty) && !this.props.isRoot && this.props.highlightTopicUpdates
+    const 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}`}
+        className={`${classes.node} ${this.props.className} ${highlightClass}`}
        onClick={this.didClickNode}
        onMouseOver={this.mouseOver}
        onMouseOut={this.mouseOut}
        ref={this.nodeRef}
      >
-        <TreeNodeTitle
-          style={animation}
-          collapsed={this.collapsed()}
-          treeNode={this.props.treeNode}
-          name={this.props.name}
-          didSelectNode={this.didSelectTopic}
-          className={highlightClass}
-        />
+        <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>
    )
@@ -233,10 +234,6 @@ class TreeNode extends React.Component<Props, State> {
  }

  private renderNodes() {
-    if (this.collapsed()) {
-      return null
-    }
-
    return (
      <TreeNodeSubnodes
        animateChanges={this.props.animateChages}
@@ -246,7 +243,6 @@ class TreeNode extends React.Component<Props, State> {
        topicOrder={this.props.topicOrder}
        lastUpdate={this.props.treeNode.lastUpdate}
        didSelectTopic={this.props.didSelectTopic}
-        highlightTopicUpdates={this.props.highlightTopicUpdates}
      />
    )
  }
@@ -1,7 +1,10 @@
 import * as React from 'react'
 import * as q from '../../../../backend/src/Model'

+import { AppState } from '../../reducers'
+
 import TreeNode from './TreeNode'
+import { connect } from 'react-redux'
 import { TopicOrder } from '../../reducers/Settings'
 import { Theme, withStyles } from '@material-ui/core'
 import { TopicViewModel } from '../../TopicViewModel'
@@ -12,12 +15,13 @@ export interface Props {
  filter?: string
  collapsed?: boolean | undefined
  classes: any
+
  lastUpdate: number
+
  topicOrder: TopicOrder
  selectedTopic?: q.TreeNode<TopicViewModel>
  autoExpandLimit: number
  didSelectTopic: any
-  highlightTopicUpdates: boolean
 }

 interface State {
@@ -51,13 +55,13 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
  }

  private renderMore() {
-    this.renderMoreAnimationFrame = window.requestIdleCallback(() => {
+    this.renderMoreAnimationFrame = window.requestAnimationFrame(() => {
      this.setState({ ...this.state, alreadyAdded: this.state.alreadyAdded * 1.5 })
-    }, { timeout: 500 })
+    })
  }

  public componentWillUnmount() {
-    window.cancelIdleCallback(this.renderMoreAnimationFrame)
+    window.cancelAnimationFrame(this.renderMoreAnimationFrame)
  }

  public render() {
@@ -67,6 +71,7 @@ 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()
    }

@@ -82,7 +87,6 @@ class TreeNodeSubnodes extends React.Component<Props, State> {
          autoExpandLimit={this.props.autoExpandLimit}
          lastUpdate={node.lastUpdate}
          didSelectTopic={this.props.didSelectTopic}
-          highlightTopicUpdates={this.props.highlightTopicUpdates}
        />
      )
    })
@@ -101,7 +105,7 @@ const styles = (theme: Theme) => ({
    clear: 'both' as 'both',
  },
  listItem: {
-    padding: `0px 0px 0px ${theme.spacing(1)}`,
+    padding: '3px 0px 0px 8px',
  },
 })

@@ -26,14 +26,9 @@ class TreeNodeTitle extends React.Component<TreeNodeProps, {}> {
  }, 5)

  public render() {
-    const { classes, treeNode, style, className } = this.props
    return (
-      <span
-        className={`${classes.title} ${className}`}
-        onMouseOver={treeNode.message ? this.mouseOver : undefined}
-        style={style}
-      >
-        <span className={classes.expander}>{this.renderExpander()}</span> {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()}
+      <span className={this.props.classes.title} onMouseOver={this.props.treeNode.message ? this.mouseOver : undefined}>
+        {this.renderExpander()} {this.renderSourceEdge()} {this.renderCollapsedSubnodes()} {this.renderValue()}
      </span>
    )
  }
@@ -74,22 +69,17 @@ 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',
-  },
-  expander: {
-    color: theme.palette.type === 'light' ? '#222' : '#eee',
+    display: 'inline-block' as 'inline-block',
  },
  title: {
-    borderRadius: '4px',
    lineHeight: '1em',
-    display: 'inline-block' as 'inline-block',
    whiteSpace: 'nowrap' as 'nowrap',
-    padding: '1px 4px 0px 4px',
-    height: '16px',
-    margin: '1px 0px 2px 0px',
  },
  collapsedSubnodes: {
    color: theme.palette.text.secondary,
@@ -8,9 +8,6 @@ interface Props {
  style?: React.CSSProperties
 }

-/**
- * Clear button for text input fields
- */
 class ClearAdornment extends React.Component<Props, {}> {
  public render() {
    if (this.props.value) {
@@ -1,73 +0,0 @@
-import { MqttOptions } from '../../../backend/src/DataSource'
-import { v4 } from 'uuid'
-const sha1 = require('sha1')
-
-export interface ConnectionOptions {
-  type: 'mqtt'
-  id: string
-  host: string
-  protocol: 'mqtt' | 'ws'
-  basePath?: string
-  port: number
-  name: string
-  username?: string
-  password?: string
-  encryption: boolean
-  certValidation: boolean
-  clientId?: string
-  subscriptions: string[]
-}
-
-export function toMqttConnection(options: ConnectionOptions): MqttOptions | undefined {
-  if (options.type !== 'mqtt') {
-    return
-  }
-
-  return {
-    url: `${options.protocol}://${options.host}:${options.port}/${options.basePath || ''}`,
-    username: options.username,
-    password: options.password,
-    tls: options.encryption,
-    certValidation: options.certValidation,
-    subscriptions: options.subscriptions,
-  }
-}
-
-export function generateClienId() {
-  const clientIdSha = sha1(`${Math.random()}`).slice(0, 8)
-  return `mqtt-explorer-${clientIdSha}`
-}
-
-export function createEmptyConnection(): ConnectionOptions {
-  return {
-    certValidation: true,
-    clientId: generateClienId(),
-    id: v4() as string,
-    name: 'new connection',
-    encryption: false,
-    password: undefined,
-    username: undefined,
-    subscriptions: ['#', '$SYS/#'],
-    type: 'mqtt',
-    host: '',
-    port: 1883,
-    protocol: 'mqtt',
-  }
-}
-
-export function makeDefaultConnections() {
-  return {
-    'iot.eclipse.org': {
-      ...createEmptyConnection(),
-      id: 'iot.eclipse.org',
-      name: 'iot.eclipse.org',
-      host: 'iot.eclipse.org',
-    },
-    'test.mosquitto.org': {
-      ...createEmptyConnection(),
-      id: 'test.mosquitto.org',
-      name: 'test.mosquitto.org',
-      host: 'test.mosquitto.org',
-    },
-  }
-}
@@ -1,59 +0,0 @@
-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,
-    },
-  }
-}
@@ -4,7 +4,6 @@ import * as q from '../../../backend/src/Model'
 import { MqttOptions } from '../../../backend/src/DataSource'
 import { TopicViewModel } from '../TopicViewModel'

-export type ConnectionHealth = 'offline' | 'online' | 'connecting'
 export interface ConnectionState {
  host?: string
  tree?: q.Tree<TopicViewModel>
@@ -13,7 +12,6 @@ export interface ConnectionState {
  error?: string
  connected: boolean
  connecting: boolean
-  health?: ConnectionHealth
 }

 export type Action = SetConnecting | SetConnected | SetDisconnected | ShowError
@@ -23,7 +21,6 @@ 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 {
@@ -41,11 +38,6 @@ 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
@@ -54,7 +46,6 @@ export interface ShowError {
 const initialState: ConnectionState = {
  connected: false,
  connecting: false,
-  health: undefined,
 }

 export const connectionReducer = createReducer(initialState, {
@@ -62,7 +53,6 @@ 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 {
@@ -74,13 +64,6 @@ 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,
@@ -1,174 +0,0 @@
-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,
-    },
-  }
-}
@@ -13,24 +13,20 @@ export interface SettingsState {
  visible: boolean
  topicOrder: TopicOrder
  topicFilter?: string
-  highlightTopicUpdates: boolean
 }
-export type Action = SetAutoExpandLimit | ToggleVisibility | SetTopicOrder | FilterTopics | TogglehighlightTopicUpdates
+export type Action = SetAutoExpandLimit | ToggleVisibility | SetTopicOrder | FilterTopics

 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',
 }

 const initialState: SettingsState = {
  autoExpandLimit: 0,
  topicOrder: TopicOrder.none,
  visible: false,
-  highlightTopicUpdates: true,
 }

 export const settingsReducer = createReducer(initialState, {
@@ -38,27 +34,8 @@ export const settingsReducer = createReducer(initialState, {
  SETTINGS_TOGGLE_VISIBILITY: toggleVisibility,
  SETTINGS_SET_TOPIC_ORDER: setTopicOrder,
  SETTINGS_FILTER_TOPICS: filterTopics,
-  SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY: togglehighlightTopicUpdates,
-  SETTINGS_DID_LOAD_SETTINGS: didLoadSettings,
 })

-export interface DidLoadSettings {
-  type: ActionTypes.SETTINGS_DID_LOAD_SETTINGS
-  settings: Partial<SettingsState>
-}
-
-function didLoadSettings(state: SettingsState, action: DidLoadSettings) {
-  return {
-    ...state,
-    ...action.settings,
-  }
-}
-
-export interface SetAutoExpandLimit {
-  type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
-  autoExpandLimit: number
-}
-
 function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
  return {
    ...state,
@@ -66,19 +43,9 @@ function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
  }
 }

-export interface TogglehighlightTopicUpdates {
-  type: ActionTypes.SETTINGS_TOGGLE_HIGHLIGHT_ACTIVITY
-}
-
-function togglehighlightTopicUpdates(state: SettingsState, _action: TogglehighlightTopicUpdates) {
-  return {
-    ...state,
-    highlightTopicUpdates: !state.highlightTopicUpdates,
-  }
-}
-
-export interface ToggleVisibility {
-  type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY
+export interface SetAutoExpandLimit {
+  type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
+  autoExpandLimit: number
 }

 function toggleVisibility(state: SettingsState, action: ToggleVisibility) {
@@ -88,6 +55,10 @@ function toggleVisibility(state: SettingsState, action: ToggleVisibility) {
  }
 }

+export interface ToggleVisibility {
+  type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY
+}
+
 function setTopicOrder(state: SettingsState, action: SetTopicOrder) {
  return {
    ...state,
@@ -5,41 +5,36 @@ import { PublishState, publishReducer } from './Publish'
 import { ConnectionState, connectionReducer } from './Connection'
 import { SettingsState, settingsReducer } from './Settings'
 import { TreeState, treeReducer } from './Tree'
-import { ConnectionManagerState, connectionManagerReducer } from './ConnectionManager'

 export enum ActionTypes {
  showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
  showUpdateDetails = 'SHOW_UPDATE_DETAILS',
-  showError = 'SHOW_ERROR',
 }

 export interface CustomAction extends Action {
  type: ActionTypes,
  showUpdateNotification?: boolean
  showUpdateDetails?: boolean
-  error?: string
 }

 export interface AppState {
-  globalState: GlobalState
+  tooBigReducer: TooBigOfState
  tree: TreeState
  settings: SettingsState,
  publish: PublishState
  connection: ConnectionState
-  connectionManager: ConnectionManagerState
 }

-export interface GlobalState {
+export interface TooBigOfState {
  showUpdateNotification?: boolean
  showUpdateDetails: boolean
-  error?: string
 }

-const initialBigState: GlobalState = {
+const initialBigState: TooBigOfState = {
  showUpdateDetails: false,
 }

-const globalState: Reducer<GlobalState | undefined, CustomAction> = (state = initialBigState, action) => {
+const tooBigReducer: Reducer<TooBigOfState | undefined, CustomAction> = (state = initialBigState, action) => {
  if (!state) {
    throw Error('No initial state')
  }
@@ -52,12 +47,6 @@ const globalState: Reducer<GlobalState | undefined, CustomAction> = (state = ini
        showUpdateNotification: action.showUpdateNotification,
      }

-    case ActionTypes.showError:
-      return {
-        ...state,
-        error: action.error,
-      }
-
    case ActionTypes.showUpdateDetails:
      if (action.showUpdateDetails === undefined) {
        return state
@@ -73,12 +62,11 @@ const globalState: Reducer<GlobalState | undefined, CustomAction> = (state = ini
 }

 const reducer = combineReducers({
-  globalState,
+  tooBigReducer,
  publish: publishReducer,
  connection: connectionReducer,
  settings: settingsReducer,
  tree: treeReducer,
-  connectionManager: connectionManagerReducer,
 })

 export default reducer
@@ -21,18 +21,18 @@
  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53"
  integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA==

-"@material-ui/core@^4.0.0-alpha.0":
-  version "4.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.0.0-alpha.0.tgz#7342e6c672d2351a7657af9b92fe7a5411b7dd00"
-  integrity sha512-2bg325ZdSLRHbHMluoXvUzrnLu6WwMyiSfQhDZtwlpaFgWRZSwGskWQLGxNp/O9Lwu/SMYA2A0YHJtaMbvKqFw==
+"@material-ui/core@^3.9.0":
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.9.1.tgz#994fa54f0936092556d231d1055b8f76b12be06e"
+  integrity sha512-26GtjuwxPPfSsUnYrTOC8zuCuhWPVhc4SsUSFTZq0n1QvpGi9UEZRFe8yp6FykQE+PmqyyY+eWdrfiXKSUKZ0w==
  dependencies:
    "@babel/runtime" "^7.2.0"
-    "@material-ui/system" "^4.0.0-alpha.0"
-    "@material-ui/utils" "^4.0.0-alpha.0"
+    "@material-ui/system" "^3.0.0-alpha.0"
+    "@material-ui/utils" "^3.0.0-alpha.2"
    "@types/jss" "^9.5.6"
    "@types/react-transition-group" "^2.0.8"
    brcast "^3.0.1"
-    clsx "^1.0.2"
+    classnames "^2.2.5"
    csstype "^2.5.2"
    debounce "^1.1.0"
    deepmerge "^3.0.0"
@@ -51,6 +51,7 @@
    prop-types "^15.6.0"
    react-event-listener "^0.6.2"
    react-transition-group "^2.2.1"
+    recompose "0.28.0 - 0.30.0"
    warning "^4.0.1"

 "@material-ui/icons@^3.0.1":
@@ -83,10 +84,10 @@
    prop-types "^15.6.0"
    warning "^4.0.1"

-"@material-ui/system@^4.0.0-alpha.0":
-  version "4.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.0.0-alpha.0.tgz#9972a797f04e1b96b84ad462243086fe89038f73"
-  integrity sha512-qJLLx+rBmj1AsnuOLja9eN0x/ajZWM6FgCUVV08ecQ2FHEb+TT5QK6b+Lcw5TNnHxakGC8wkmUkIYafwcqGA5g==
+"@material-ui/system@^3.0.0-alpha.0":
+  version "3.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-3.0.0-alpha.2.tgz#096e80c8bb0f70aea435b9e38ea7749ee77b4e46"
+  integrity sha512-odmxQ0peKpP7RQBQ8koly06YhsPzcoVib1vByVPBH4QhwqBXuYoqlCjt02846fYspAqkrWzjxnWUD311EBbxOA==
  dependencies:
    "@babel/runtime" "^7.2.0"
    deepmerge "^3.0.0"
@@ -102,15 +103,6 @@
    prop-types "^15.6.0"
    react-is "^16.6.3"

-"@material-ui/utils@^4.0.0-alpha.0":
-  version "4.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.0.0-alpha.0.tgz#b8ed6953ae07d36856a5867ffe759bc0e08147b4"
-  integrity sha512-w8zSXDuAyS0J5Z8mnU0+HgFf+GP3vGno8wecHT011DM7P3ZoS/2ngU2SqJGwRxuNk7N65tWX1h8NKvoevDPUyQ==
-  dependencies:
-    "@babel/runtime" "^7.2.0"
-    prop-types "^15.6.0"
-    react-is "^16.8.0"
-
 "@types/jss@^9.5.6":
  version "9.5.7"
  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.7.tgz#fa57a6d0b38a3abef8a425e3eb6a53495cb9d5a0"
@@ -185,10 +177,10 @@
  resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
  integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==

-"@types/uuid@^3.4.4":
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz#7af69360fa65ef0decb41fd150bf4ca5c0cefdf5"
-  integrity sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==
+"@types/socket.io@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-2.1.2.tgz#7165c2587cc3b86b44aa78e2a0060140551de211"
+  integrity sha512-Ind+4qMNfQ62llyB4IMs1D8znMEBsMKohZBPqfBUIXqLQ9bdtWIbNTBWwtdcBWJKnokMZGcmWOOKslatni5vtA==
  dependencies:
    "@types/node" "*"

@@ -627,6 +619,11 @@ base64-js@^1.0.2:
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==

+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+
 base@^0.11.1:
  version "0.11.2"
  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1032,11 +1029,6 @@ cliui@^4.0.0:
    strip-ansi "^4.0.0"
    wrap-ansi "^2.0.0"

-clsx@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.0.2.tgz#2e0d63a900d7fe33218d7a53dee9e3a0c7300e1d"
-  integrity sha512-NQZV7ri2Gfufu9q1P9JDV4MHhdJvUukOadjAoN12pK37P12nrYp/mC05BSoekv0KX/5hGHAe2WQeOlhaWhXC5Q==
-
 code-point-at@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1509,7 +1501,7 @@ debug@^3.1.0, debug@^3.2.5:
  dependencies:
    ms "^2.1.1"

-debug@^4.1.0:
+debug@^4.1.0, debug@~4.1.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -1857,7 +1849,7 @@ engine.io-client@~3.3.1:
    xmlhttprequest-ssl "~1.5.4"
    yeast "0.1.2"

-engine.io-parser@~2.1.1:
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
@@ -1868,6 +1860,18 @@ engine.io-parser@~2.1.1:
    blob "0.0.5"
    has-binary2 "~1.0.2"

+engine.io@~3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.3.2.tgz#18cbc8b6f36e9461c5c0f81df2b830de16058a59"
+  integrity sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~6.1.0"
+
 enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
@@ -4505,11 +4509,6 @@ react-is@^16.6.3, react-is@^16.7.0:
  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa"
  integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==

-react-is@^16.8.0:
-  version "16.8.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.2.tgz#09891d324cad1cb0c1f2d91f70a71a4bee34df0f"
-  integrity sha512-D+NxhSR2HUCjYky1q1DwpNUD44cDpUXzSmmFyC3ug1bClcU/iDNy0YNn1iwme28fn+NFhpA13IndOd42CrFb+Q==
-
 react-json-view@^1.19.1:
  version "1.19.1"
  resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.19.1.tgz#95d8e59e024f08a25e5dc8f076ae304eed97cf5c"
@@ -4615,16 +4614,6 @@ react-vis@^1.11.6:
    prop-types "^15.5.8"
    react-motion "^0.5.2"

-react@16.8:
-  version "16.8.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.2.tgz#83064596feaa98d9c2857c4deae1848b542c9c0c"
-  integrity sha512-aB2ctx9uQ9vo09HVknqv3DGRpI7OIGJhCx3Bt0QqoRluEjHSaObJl+nG12GDdYH6sTgE7YiPJ6ZUyMx9kICdXw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.13.2"
-
 react@^16.6.3:
  version "16.7.0"
  resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381"
@@ -4635,6 +4624,16 @@ react@^16.6.3:
    prop-types "^15.6.2"
    scheduler "^0.12.0"

+react@^16.8.0-alpha.1:
+  version "16.8.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.0-alpha.1.tgz#c2b32689f3b466d3ce85a634dd9035f789d2cd97"
+  integrity sha512-vLwwnhM2dXrCsiQmcSxF2UdZVV5xsiXjK5Yetmy8dVqngJhQ3aw3YJhZN/YmyonxwdimH40wVqFQfsl4gSu2RA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.0-alpha.1"
+
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
  version "2.3.6"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -4904,10 +4903,10 @@ scheduler@^0.12.0:
    loose-envify "^1.1.0"
    object-assign "^4.1.1"

-scheduler@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.2.tgz#969eaee2764a51d2e97b20a60963b2546beff8fa"
-  integrity sha512-qK5P8tHS7vdEMCW5IPyt8v9MJOHqTrOUgPXib7tqm9vh834ibBX5BNhwkplX/0iOzHW5sXyluehYfS9yrkz9+w==
+scheduler@^0.13.0-alpha.1:
+  version "0.13.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.0-alpha.1.tgz#753977fb4fb35d8cdd559868a11e46b640955556"
+  integrity sha512-W0sH0848sVuPKg+I18vTYQyzVtA4X1lrVgSeXK6KnOPUltFdJcY5nkbTkjGUeS/E0x+eBsNYfSdhJtGjT95njw==
  dependencies:
    loose-envify "^1.1.0"
    object-assign "^4.1.1"
@@ -5091,7 +5090,12 @@ snapdragon@^0.8.1:
    source-map-resolve "^0.5.0"
    use "^3.1.0"

-socket.io-client@^2.2.0:
+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
+
+socket.io-client@2.2.0, socket.io-client@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.2.0.tgz#84e73ee3c43d5020ccc1a258faeeb9aec2723af7"
  integrity sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==
@@ -5120,6 +5124,18 @@ socket.io-parser@~3.3.0:
    debug "~3.1.0"
    isarray "2.0.1"

+socket.io@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.2.0.tgz#f0f633161ef6712c972b307598ecd08c9b1b4d5b"
+  integrity sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.3.1"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.2.0"
+    socket.io-parser "~3.3.0"
+
 sockjs-client@1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
@@ -1,67 +0,0 @@
-import * as FileAsync from 'lowdb/adapters/FileAsync'
-import * as lowdb from 'lowdb'
-import { backendEvents } from '../../events'
-import {
-  makeStorageResponseEvent,
-  storageClearEvent,
-  storageLoadEvent,
-  storageStoreEvent,
-  makeStorageAcknoledgementEvent,
-} from '../../events/StorageEvents'
-
-export default class ConfigStorage {
-  private file: string
-  private database: any
-  constructor(file: string) {
-    this.file = file
-  }
-
-  private async getDb() {
-    const adapter = new FileAsync(this.file)
-    if (!this.database) {
-      this.database = await lowdb(adapter)
-    }
-
-    return this.database
-  }
-
-  public async init() {
-    backendEvents.subscribe(storageStoreEvent, async (event) => {
-      const ack = makeStorageAcknoledgementEvent(event.transactionId)
-      try {
-        const db = await this.getDb()
-        await db.set(event.store, event.data).write()
-        backendEvents.emit(ack, undefined)
-      } catch (error) {
-        backendEvents.emit(ack, { error, transactionId: event.transactionId, store: event.store })
-        throw error
-      }
-    })
-
-    backendEvents.subscribe(storageLoadEvent, async (event) => {
-      const responseEvent = makeStorageResponseEvent(event.transactionId)
-      try {
-        const db = await this.getDb()
-        const data = await db.get(event.store).value()
-        backendEvents.emit(responseEvent, { data, transactionId: event.transactionId, store: event.store })
-      } catch (error) {
-        backendEvents.emit(responseEvent, { error, transactionId: event.transactionId, store: event.store })
-        throw error
-      }
-    })
-
-    backendEvents.subscribe(storageClearEvent, async (event) => {
-      try {
-        const db = await this.getDb()
-        const keys = await db.keys().value()
-        for (const key of keys) {
-          await db.unset(key).write()
-        }
-        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), undefined)
-      } catch (error) {
-        backendEvents.emit(makeStorageAcknoledgementEvent(event.transactionId), { error, transactionId: event.transactionId })
-        throw error
-      }
-    })
-  }
-}
@@ -25,17 +25,16 @@ 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 = {
-      ...this.state,
+      error: undefined,
      connected: false,
      connecting: true,
    }
@@ -11,13 +11,13 @@ export interface MqttOptions {
  tls: boolean
  certValidation: boolean
  clientId?: string
-  subscriptions: string[]
 }

 export class MqttSource implements DataSource<MqttOptions> {
  public stateMachine: DataSourceStateMachine = new DataSourceStateMachine()
  private client: Client | undefined
  private messageCallback?: (topic: string, message: Buffer, packet: any) => void
+  private rootSubscription = '#'
  public topicSeparator = '/'

  public onMessage(messageCallback: (topic: string, message: Buffer, packet: any) => void) {
@@ -55,22 +55,21 @@ 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)
-      options.subscriptions.forEach((subscription) => {
-        client.subscribe(subscription, (err: Error) => {
-          if (err) {
-            this.stateMachine.setError(err)
-          }
-        })
+      client.subscribe(this.rootSubscription, (err: Error) => {
+        if (err) {
+          this.stateMachine.setError(err)
+        }
+      })
+      client.subscribe('$SYS/#', (err: Error) => {
+        if (err) {
+          console.error('failed to subscribe to sys topic', err)
+        }
      })
    })

@@ -47,9 +47,6 @@ 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(() => {
@@ -105,34 +102,6 @@ export class TreeNode<ViewModel> {
    return previous.branch().concat([this])
  }

-  private isTopicEmptyLeaf() {
-    const hasNoMessage = (!this.message || !this.message.value)
-    return hasNoMessage && this.isLeaf()
-  }
-
-  private isLeaf() {
-    return this.edgeArray.length === 0
-  }
-
-  private removeFromParent() {
-    const previous = this.previous()
-    if (!previous || !this.sourceEdge) {
-      return
-    }
-    previous.removeEdge(this.sourceEdge)
-  }
-
-  public removeEdge(edge: Edge<any>) {
-    delete this.edges[edge.name]
-    this.edgeArray = Object.values(this.edges)
-    this.onMerge.dispatch()
-
-    if (this.isTopicEmptyLeaf()) {
-      debugger
-      this.removeFromParent()
-    }
-  }
-
  public updateWithNode(node: TreeNode<ViewModel>) {
    if (node.message) {
      this.setMessage(node.message)
@@ -140,10 +109,6 @@ export class TreeNode<ViewModel> {
      this.mqttMessage = node.mqttMessage
    }

-    if (this.isTopicEmptyLeaf()) {
-      this.removeFromParent()
-    }
-
    this.mergeEdges(node)
    this.onMerge.dispatch()
  }
@@ -43,10 +43,10 @@ describe('TreeNode', () => {

  it('updateWithNode should add nodes to the tree', () => {
    const topics1 = 'foo/bar'.split('/')
-    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, 'foo')
+    const leaf1 = TreeNodeFactory.fromEdgesAndValue(topics1, undefined)

    const topics2 = 'foo/bar/baz'.split('/')
-    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, 'bar')
+    const leaf2 = TreeNodeFactory.fromEdgesAndValue(topics2, undefined)

    leaf1.firstNode().updateWithNode(leaf2.firstNode())

@@ -0,0 +1,39 @@
+import * as SocketIo from 'socket.io'
+import { EventBusInterface, Event } from '../../../events'
+import * as http from 'http'
+
+class SocketIoServerEventBus implements EventBusInterface {
+  private httpServer: any
+  private socketIo: SocketIo.Server
+  constructor(serverPort = 3000) {
+    this.httpServer = http.createServer()
+    this.socketIo = SocketIo(this.httpServer)
+    this.httpServer.listen(serverPort)
+  }
+
+  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
+    console.log('subscribing', event.topic)
+
+    Object.keys(this.socketIo.sockets.sockets).forEach((key) => {
+      const socket = this.socketIo.sockets.sockets[key]
+      socket.on(event.topic, callback)
+    })
+  }
+
+  public unsubscribeAll<MessageType>(event: Event<MessageType>) {
+    Object.keys(this.socketIo.sockets.sockets).forEach((key) => {
+      const socket = this.socketIo.sockets.sockets[key]
+      socket.removeAllListeners()
+    })
+  }
+
+  public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
+    throw new Error('Not implemented') // Todo: implement
+  }
+
+  public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
+    this.socketIo.emit(event.topic, msg)
+  }
+}
+
+export const backendEvents = new SocketIoServerEventBus()
@@ -3,7 +3,6 @@ import {
  EventDispatcher,
  MqttMessage,
  addMqttConnectionEvent,
-  backendEvents,
  checkForUpdates,
  makeConnectionMessageEvent,
  makeConnectionStateEvent,
@@ -12,7 +11,8 @@ import {
  updateAvailable,
 } from '../../events'
 import { DataSource, MqttSource } from './DataSource'
-import ConfigStorage from './ConfigStorage'
+import { backendEvents } from './communication/SocketIo'
+
 import { UpdateInfo } from 'builder-util-runtime'

 export class ConnectionManager {
@@ -20,10 +20,7 @@ export class ConnectionManager {

  public manageConnections() {
    backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest)
-    backendEvents.subscribe(removeConnection, (connectionId: string) => {
-      backendEvents.unsubscribeAll(makePublishEvent(connectionId))
-      this.removeConnection(connectionId)
-    })
+    backendEvents.subscribe(removeConnection, (connectionId: string) => this.removeConnection(connectionId))
  }

  private handleConnectionRequest = (event: AddMqttConnection) => {
@@ -61,7 +58,6 @@ export class ConnectionManager {
    if (connection) {
      connection.disconnect()
      delete this.connections[hash]
-      connection.stateMachine.onUpdate.removeAllListeners()
    }
  }

@@ -21,16 +21,15 @@ class IpcMainEventBus implements EventBusInterface {
    this.ipc = ipc
  }

-  public subscribe<MessageType>(subscribeEvent: Event<MessageType>, callback:(msg: MessageType) => void) {
-    console.log('subscribing', subscribeEvent.topic)
-    this.ipc.on(subscribeEvent.topic, (event: any, arg: any) => {
+  public subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void) {
+    console.log('subscribing', event.topic)
+    this.ipc.on(event.topic, (event: any, arg: any) => {
      this.client = event.sender
      callback(arg)
    })
  }

  public unsubscribeAll<MessageType>(event: Event<MessageType>) {
-    console.log('unsubscribeAll', event.topic)
    this.ipc.removeAllListeners(event.topic)
  }

@@ -0,0 +1,8 @@
+import { Event } from './Events'
+
+export interface EventBusInterface {
+  subscribe<MessageType>(event: Event<MessageType>, callback:(msg: MessageType) => void): void
+  unsubscribeAll<MessageType>(event: Event<MessageType>): void
+  emit<MessageType>(event: Event<MessageType>, msg: MessageType): void
+  unsubscribe<MessageType>(event: Event<MessageType>, callback: any): void
+}
@@ -1,39 +0,0 @@
-import { Event } from './'
-
-interface StorageEvent {
-  transactionId: string
-}
-
-export interface StoreCommand extends StorageEvent {
-  store?: string,
-  data?: any
-  error?: any
-}
-
-export interface LoadCommand extends StorageEvent {
-  store: string,
-}
-
-export const storageStoreEvent: Event<StoreCommand> = {
-  topic: 'storage/store',
-}
-
-export const storageLoadEvent: Event<LoadCommand> = {
-  topic: 'storage/load',
-}
-
-export function makeStorageAcknoledgementEvent(transactionId: string): Event<StoreCommand> {
-  return {
-    topic: `storage/ack/${transactionId}`,
-  }
-}
-
-export function makeStorageResponseEvent(transactionId: string): Event<StoreCommand> {
-  return {
-    topic: `storage/response/${transactionId}`,
-  }
-}
-
-export const storageClearEvent: Event<StorageEvent> = {
-  topic: 'storage/clear',
-}
@@ -1,3 +1,3 @@
 export * from './Events'
 export * from './EventDispatcher'
-export * from './EventBus'
+export * from './EventBusInterface'
@@ -1,6 +1,6 @@
 {
  "name": "MQTT-Explorer",
-  "version": "0.2.0-alpha",
+  "version": "0.1.3",
  "description": "Explore your message queues",
  "main": "dist/src/electron.js",
  "scripts": {
@@ -44,13 +44,14 @@
  "license": "ISC",
  "devDependencies": {
    "@types/chai": "^4.1.7",
-    "@types/lowdb": "^1.0.6",
    "@types/mime": "^2.0.0",
    "@types/mocha": "^5.2.5",
    "@types/mustache": "^0.8.32",
    "@types/node": "^10.12.18",
    "@types/semver": "^5.5.0",
    "@types/sha1": "^1.1.1",
+    "@types/socket.io": "^2.1.2",
+    "@types/socket.io-client": "^1.4.32",
    "axios": "^0.18.0",
    "chai": "^4.2.0",
    "electron": "^4.0.2",
@@ -71,14 +72,14 @@
    "webdriverio": "5.4"
  },
  "dependencies": {
-    "about-window": "^1.12.1",
    "electron-debug": "^2.0.0",
    "electron-is-dev": "^1.0.1",
    "electron-log": "^2.2.17",
    "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
    "electron-updater": "^4.0.6",
-    "lowdb": "^1.0.0",
    "mqtt": "^2.18.8",
-    "sha1": "^1.1.1"
+    "sha1": "^1.1.1",
+    "socket.io": "^2.2.0",
+    "socket.io-client": "^2.2.0"
  }
 }
@@ -1,24 +1,21 @@
 #!/bin/bash
-ffmpeg -s:v 1024x700 -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv app2.mp4
-
+cp app.mp4 original.mp4
 # The video starts with a few blank frames, we want to know when the stop
-ffprobe -f lavfi -i "movie=app2.mp4,blackdetect[out0]" -show_entries tags=lavfi.black_start,lavfi.black_end -of default=nw=1 -v quiet > ffmpeg_info
+ffprobe -f lavfi -i "movie=app.mp4,blackdetect[out0]" -show_entries tags=lavfi.black_start,lavfi.black_end -of default=nw=1 -v quiet > ffmpeg_info
 END_OF_BLACK=`cat ffmpeg_info | grep end | head -n1 | cut -d'=' -f2`

-# Remove grey frames at the beginning (app start and splash screen)
-END_OF_BLACK=`awk "BEGIN {print $END_OF_BLACK+0.8; exit}"`
-
 # Trim black frames at start
-ffmpeg -s:v 1024x700 -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -ss $END_OF_BLACK  app.mp4
+ffmpeg -ss $END_OF_BLACK -i app.mp4 app2.mp4
+mv app2.mp4 app.mp4

 # Generate gif palette
-ffmpeg -y -s:v 1024x700 -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -vf fps=10,scale=1024:-1:flags=lanczos,palettegen palette1024.png
+ffmpeg -y -i app.mp4 -vf fps=10,scale=720:-1:flags=lanczos,palettegen palette.png

 # Create gif
-ffmpeg -s:v 1024x700 -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -i palette1024.png -ss $END_OF_BLACK -filter_complex "fps=10,scale=1024:-1:flags=lanczos[x];[x][1:v]paletteuse" app1024.gif
+ffmpeg -i app.mp4 -i palette.png -filter_complex "fps=10,scale=720:-1:flags=lanczos[x];[x][1:v]paletteuse" app.gif

 # Clean up
-rm ffmpeg_info palette*.png qrawvideorgb24.yuv
+rm ffmpeg_info palette.png

 mv app.mp4 ui-test.mp4
-mv app1024.gif ui-test.gif
+mv app.gif ui-test.gif
@@ -17,7 +17,7 @@ export PID_XVFB=$!
 sleep 2

 # Debug with VNC
-while [ "$TEST_EXIT_CODE" = "" ]; do x11vnc -localhost -passwd "bierbier" -display :$SCR; done &
+while [ "$TEST_EXIT_CODE" = "" ]; do x11vnc -passwd "bierbier" -display :$SCR; done &
 export PID_VNC=$!

 # Start mqtt broker
@@ -32,8 +32,7 @@ sleep 2
 rm ./app.mp4 || echo no need to delete ./app.mp4

 # Start recoring in tmux
-#tmux new-session -d -s record ffmpeg -f x11grab -draw_mouse 0 -video_size $DIMENSIONS -i :$SCR -codec:v libx264 -r 20 ./app.mp4
-tmux new-session -d -s record ffmpeg -f x11grab -draw_mouse 0 -video_size $DIMENSIONS -i :$SCR -r 20 -vcodec rawvideo -pix_fmt yuv420p qrawvideorgb24.yuv
+tmux new-session -d -s record ffmpeg -f x11grab -draw_mouse 0 -video_size $DIMENSIONS -i :$SCR -codec:v libx264 -r 20 ./app.mp4

 # Start tests
 node dist/src/spec/webdriverio.js
@@ -1,22 +1,11 @@
 import { Menu, app, BrowserWindow, webContents } from 'electron'
-import openAboutWindow from 'about-window'
-import * as path from 'path'

 const applicationMenu = {
  label: 'Application',
  submenu: [
    {
      label: 'About Application',
-      click: () => {
-        console.log(path.join(__dirname, 'icon.png'))
-        openAboutWindow({
-          icon_path: path.join(__dirname, '..', '..', 'icon.png'),
-          license: 'AGPL-3.0',
-          homepage: 'https://thomasnordquist.github.io/MQTT-Explorer/',
-          bug_report_url: 'https://github.com/thomasnordquist/MQTT-Explorer/issues',
-          description: 'Author: Thomas Nordquist',
-        })
-      },
+      selector: 'orderFrontStandardAboutPanel:',
    },
    {
      type: 'separator' as 'separator',
@@ -1,12 +1,11 @@
-import * as log from 'electron-log'
+import { UpdateInfo } from '../events'
+import { BrowserWindow, app, Menu } from 'electron'
 import * as path from 'path'
-import ConfigStorage from '../backend/src/ConfigStorage'
-import { app, BrowserWindow, Menu } from 'electron'
+import { menuTemplate } from './MenuTemplate'
 import { autoUpdater } from 'electron-updater'
+import * as log from 'electron-log'
 import { ConnectionManager, updateNotifier } from '../backend/src/index'
 import { electronTelemetryFactory } from 'electron-telemetry'
-import { menuTemplate } from './MenuTemplate'
-import { UpdateInfo } from '../events'
 const isDev = require('electron-is-dev')

 let electronTelemetry: any
@@ -25,9 +24,6 @@ log.info('App starting...')
 const connectionManager = new ConnectionManager()
 connectionManager.manageConnections()

-const configStorage = new ConfigStorage(path.join(app.getPath('appData'), app.getName(), 'settings.json'))
-configStorage.init()
-
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow: BrowserWindow | undefined
@@ -24,6 +24,6 @@ async function topicMatches(topics: string[], browser: Browser<void>) {
 }

 function topicSelector(topics: string[]) {
-  const suffix = topics.map(topic => `*[contains(text(), "${topic}")]`).join('/../..//')
+  const suffix = topics.map(topic => `*[contains(text(), "${topic}")]`).join('/../../..//')
  return `//${suffix}`
 }
@@ -6,6 +6,7 @@
    "outDir": "./dist",
    "strict": true,
    "module": "commonjs",
+    "target": "es5",
    "moduleResolution": "node",
    "sourceRoot": "src/",
    "lib": ["es2017", "dom"],
@@ -119,18 +119,6 @@
  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
  integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==

-"@types/lodash@*":
-  version "4.14.121"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.121.tgz#9327e20d49b95fc2bf983fc2f045b2c6effc80b9"
-  integrity sha512-ORj7IBWj13iYufXt/VXrCNMbUuCTJfhzme5kx9U/UtcIPdJYuvPDUAlHlbNhz/8lKCLy9XGIZnGrqXOtQbPGoQ==
-
-"@types/lowdb@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/lowdb/-/lowdb-1.0.6.tgz#0e7adecb87cd79c1e97d50043d9835b65d59023f"
-  integrity sha512-C/p2p3ud6buHPUaj5QTN3gGera9Pi39aCQoQ1ngRZ2hsWeoqok4aCF/Jjj8FDsnSOTaQHrKI92/KHGt6S+Oy+Q==
-  dependencies:
-    "@types/lodash" "*"
-
 "@types/mime@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
@@ -163,6 +151,18 @@
  dependencies:
    "@types/node" "*"

+"@types/socket.io-client@^1.4.32":
+  version "1.4.32"
+  resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
+  integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==
+
+"@types/socket.io@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-2.1.2.tgz#7165c2587cc3b86b44aa78e2a0060140551de211"
+  integrity sha512-Ind+4qMNfQ62llyB4IMs1D8znMEBsMKohZBPqfBUIXqLQ9bdtWIbNTBWwtdcBWJKnokMZGcmWOOKslatni5vtA==
+  dependencies:
+    "@types/node" "*"
+
 "@wdio/config@^5.4.6":
  version "5.4.6"
  resolved "https://registry.yarnpkg.com/@wdio/config/-/config-5.4.6.tgz#0fed728bb6e57121e3e50df5943e9cbe74843a57"
@@ -189,10 +189,18 @@
  dependencies:
    "@wdio/config" "^5.4.6"

-about-window@^1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/about-window/-/about-window-1.12.1.tgz#b81c10f6de58d38bce2aa5f31f61a82e6c3d6c2b"
-  integrity sha512-P/fJACq7RBFpv5Ql0kIqpOYgFqQ8WdoZoB7wrKmDvwTSKVOMbUZMYnQYtnOW6dHmMCYuNrmQFf+MxvuhE+KrzQ==
+accepts@~1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=

 ajv-keywords@^3.2.0:
  version "3.2.0"
@@ -328,6 +336,11 @@ array-find-index@^1.0.1:
  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=

+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
 arrify@^1.0.0, arrify@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -412,16 +425,31 @@ babel-runtime@^6.26.0:
    core-js "^2.4.0"
    regenerator-runtime "^0.11.0"

+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
 balanced-match@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
 base64-js@^1.0.2, base64-js@^1.2.3:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==

+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+
 bcrypt-pbkdf@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
@@ -429,6 +457,13 @@ bcrypt-pbkdf@^1.0.0:
  dependencies:
    tweetnacl "^0.14.3"

+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
 bl@^1.0.0, bl@^1.2.1:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
@@ -437,6 +472,11 @@ bl@^1.0.0, bl@^1.2.1:
    readable-stream "^2.3.5"
    safe-buffer "^5.1.1"

+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
 bluebird-lst@^1.0.6:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.6.tgz#89bc4de0a357373605c8781f293f7b06d454f869"
@@ -562,6 +602,11 @@ callback-stream@^1.0.2:
    inherits "^2.0.1"
    readable-stream "> 1.0.0 < 3.0.0"

+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
 camelcase-keys@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -745,6 +790,21 @@ compare-version@^0.1.2:
  resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
  integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=

+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
 compress-commons@^1.2.0:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
@@ -789,6 +849,11 @@ convert-source-map@^1.6.0:
  dependencies:
    safe-buffer "~5.1.1"

+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
 core-js@^2.4.0:
  version "2.6.3"
  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.3.tgz#4b70938bdffdaf64931e66e2db158f0892289c49"
@@ -914,7 +979,7 @@ debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
  dependencies:
    ms "2.0.0"

-debug@3.1.0, debug@=3.1.0:
+debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -928,7 +993,7 @@ debug@^3.0.0, debug@^3.1.0:
  dependencies:
    ms "^2.1.1"

-debug@^4.1.0, debug@^4.1.1:
+debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -1205,6 +1270,46 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
  dependencies:
    once "^1.4.0"

+engine.io-client@~3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.2.tgz#04e068798d75beda14375a264bb3d742d7bc33aa"
+  integrity sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.3.2.tgz#18cbc8b6f36e9461c5c0f81df2b830de16058a59"
+  integrity sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~6.1.0"
+
 env-paths@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
@@ -1606,7 +1711,7 @@ got@^6.7.1:
    unzip-response "^2.0.1"
    url-parse-lax "^1.0.0"

-graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6:
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
  version "4.1.15"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -1652,6 +1757,18 @@ has-ansi@^2.0.0:
  dependencies:
    ansi-regex "^2.0.0"

+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
 has-flag@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -1720,6 +1837,11 @@ indent-string@^2.1.0:
  dependencies:
    repeating "^2.0.0"

+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
 inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1927,6 +2049,11 @@ isarray@0.0.1:
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=

+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
 isarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2188,7 +2315,7 @@ lodash.zip@^4.2.0:
  resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
  integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=

-lodash@4, lodash@^4.17.10, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10:
+lodash@^4.17.10, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10:
  version "4.17.11"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -2211,17 +2338,6 @@ loud-rejection@^1.0.0:
    currently-unhandled "^0.4.1"
    signal-exit "^3.0.0"

-lowdb@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064"
-  integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ==
-  dependencies:
-    graceful-fs "^4.1.3"
-    is-promise "^2.1.0"
-    lodash "4"
-    pify "^3.0.0"
-    steno "^0.4.1"
-
 lowercase-keys@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -2315,7 +2431,7 @@ mime-db@~1.37.0:
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==

-mime-types@^2.1.12, mime-types@~2.1.19:
+mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
  version "2.1.21"
  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
@@ -2428,6 +2544,11 @@ mute-stream@0.0.7:
  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=

+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+
 next-tick@1:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -2526,6 +2647,11 @@ object-assign@^4.0.1:
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
 object-keys@~0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
@@ -2688,6 +2814,20 @@ parse-json@^4.0.0:
    error-ex "^1.3.1"
    json-parse-better-errors "^1.0.1"

+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
 path-dirname@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -3197,6 +3337,52 @@ single-line-log@^1.1.2:
  dependencies:
    string-width "^1.0.1"

+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
+
+socket.io-client@2.2.0, socket.io-client@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.2.0.tgz#84e73ee3c43d5020ccc1a258faeeb9aec2723af7"
+  integrity sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    engine.io-client "~3.3.1"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.2.0.tgz#f0f633161ef6712c972b307598ecd08c9b1b4d5b"
+  integrity sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.3.1"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.2.0"
+    socket.io-parser "~3.3.0"
+
 source-map-resolve@^0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
@@ -3324,13 +3510,6 @@ stat-mode@^0.2.2:
  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=

-steno@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/steno/-/steno-0.4.4.tgz#071105bdfc286e6615c0403c27e9d7b5dcb855cb"
-  integrity sha1-BxEFvfwobmYVwEA8J+nXtdy4Vcs=
-  dependencies:
-    graceful-fs "^4.1.3"
-
 stream-shift@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -3534,6 +3713,11 @@ to-absolute-glob@^2.0.0:
    is-absolute "^1.0.0"
    is-negated-glob "^1.0.0"

+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
 to-buffer@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
@@ -3950,6 +4134,13 @@ ws@^3.2.0:
    safe-buffer "~5.1.0"
    ultron "~1.1.0"

+ws@~6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
+  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
+  dependencies:
+    async-limiter "~1.0.0"
+
 xdg-basedir@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
@@ -3965,6 +4156,11 @@ xmldom@0.1.x:
  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=

+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -4050,6 +4246,11 @@ yauzl@2.4.1:
  dependencies:
    fd-slicer "~1.0.1"

+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
 yn@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"