Clean up & Add connection setup

backend/src/DataSource/DataSource.ts

@@ -8,6 +8,7 @@ interface DataSource<DataSourceOptions> {
   disconnect(): void
   onMessage(messageCallback: MessageCallback): void
   topicSeparator: string
+  stateMachine: DataSourceStateMachine
 }
 
 export { DataSource, MessageCallback }

backend/src/DataSource/DataSourceState.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventDispatcher } from '../../../events'
 
 export interface DataSourceState {
   connecting: boolean
@@ -6,7 +6,8 @@ export interface DataSourceState {
   error?: Error
 }
 
-export class DataSourceStateMachine extends EventEmitter {
+export class DataSourceStateMachine {
+  public onUpdate = new EventDispatcher<DataSourceState, DataSourceStateMachine>(this)
   private state: DataSourceState = {
     error: undefined,
     connected: false,
@@ -19,6 +20,7 @@ export class DataSourceStateMachine extends EventEmitter {
       error: undefined,
       connecting: false,
     }
+    this.onUpdate.dispatch(this.state)
   }
 
   public setError(error: Error) {
@@ -27,6 +29,7 @@ export class DataSourceStateMachine extends EventEmitter {
       connected: false,
       connecting: false,
     }
+    this.onUpdate.dispatch(this.state)
   }
 
   public setConnecting() {
@@ -35,6 +38,7 @@ export class DataSourceStateMachine extends EventEmitter {
       connected: false,
       connecting: true,
     }
+    this.onUpdate.dispatch(this.state)
   }
 
   public toJSON() {

backend/src/DataSource/MqttSource.ts

@@ -3,9 +3,14 @@ import { DataSource, DataSourceStateMachine } from './'
 
 export interface MqttOptions {
   url: string
+  username?: string
+  password?: string
+  ssl: boolean
+  sslValidation: boolean
 }
 
 export class MqttSource implements DataSource<MqttOptions> {
+  public stateMachine: DataSourceStateMachine = new DataSourceStateMachine()
   private client: Client | undefined
   private messageCallback?: (topic: string, message: Buffer) => void
   private rootSubscription = '#'
@@ -16,8 +21,7 @@ export class MqttSource implements DataSource<MqttOptions> {
   }
 
   public connect(options: MqttOptions): DataSourceStateMachine {
-    const state = new DataSourceStateMachine()
-
+    this.stateMachine.setConnecting()
     const client = mqttConnect(options.url, {
       resubscribe: false,
     })
@@ -25,19 +29,19 @@ export class MqttSource implements DataSource<MqttOptions> {
     this.client = client
 
     client.on('error', (error: Error) => {
-      state.setError(error)
+      this.stateMachine.setError(error)
     })
 
     client.on('close', () => {
-      state.setConnected(false)
+      this.stateMachine.setConnected(false)
     })
 
     client.on('reconnect', () => {
-      state.setConnecting()
+      this.stateMachine.setConnecting()
     })
 
     client.on('connect', () => {
-      state.setConnected(true)
+      this.stateMachine.setConnected(true)
       client.subscribe(this.rootSubscription, (err: Error) => {
         if (err) {
           throw new Error('mqtt subscription failed')
@@ -49,7 +53,7 @@ export class MqttSource implements DataSource<MqttOptions> {
       this.messageCallback && this.messageCallback(topic, message)
     })
 
-    return state
+    return this.stateMachine
   }
 
   public disconnect() {