directline cleanup subscriptions

Author: ftreml

index.js

@@ -18,6 +18,7 @@ class BotiumConnectorDirectline3 {
 
   Build () {
     debug('Build called')
+    this._stopSubscription()
     this.directLine = new DirectLine({
       secret: this.caps['DIRECTLINE3_SECRET'],
       webSocket: this.caps['DIRECTLINE3_WEBSOCKET'],
@@ -28,13 +29,21 @@ class BotiumConnectorDirectline3 {
 
   Start () {
     debug('Start called')
+    this._stopSubscription()
+    
+    this.receivedMessageIds = {}
     this.subscription = this.directLine.activity$
       .filter(activity => activity.type === 'message' && activity.from.id !== 'me')
       .subscribe(
         message => {
-          debug('received message ', message)
-          const botMsg = { sender: 'bot', sourceData: message, messageText: message.text }
-          this.queueBotSays(botMsg)
+          if (this.receivedMessageIds[message.id]) {
+            debug('ignore already received message ', message)
+          } else {
+            debug('received message ', message)
+            this.receivedMessageIds[message.id] = true
+            const botMsg = { sender: 'bot', sourceData: message, messageText: message.text }
+            this.queueBotSays(botMsg)
+          }
         }
       )
     return Promise.resolve()
@@ -62,18 +71,23 @@ class BotiumConnectorDirectline3 {
 
   Stop () {
     debug('Stop called')
-    if (this.subscription) {
-      this.subscription.unsubscribe()
-      this.subscription = null
-    }
-
+    this._stopSubscription()
     return Promise.resolve()
   }
 
   Clean () {
     debug('Clean called')
+    this._stopSubscription()
     return Promise.resolve()
   }
+
+  _stopSubscription() {
+    if (this.subscription) {
+      debug('unsubscribing from directline subscription')
+      this.subscription.unsubscribe()
+      this.subscription = null
+    }
+  }
 }
 
 module.exports = {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "botium-connector-directline3",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Botium Connector for Bot Framework Direct Line 3 API",
   "main": "dist/botium-connector-directline3-cjs.js",
   "module": "dist/botium-connector-directline3-es.js",

package.json

@@ -3,7 +3,7 @@
     "Capabilities": {
       "PROJECTNAME": "Directline3 Plugin Sample",
       "CONTAINERMODE": "directline3",
-      "DIRECTLINE3_SECRET": "<MY_SECRET>",
+      "DIRECTLINE3_SECRET": "",
       "DIRECTLINE3_WEBSOCKET": true,
       "DIRECTLINE3_POLLINGINTERVAL": 1000
     }

samples/botium.json

@@ -1,13 +1,12 @@
 const BotDriver = require('botium-core').BotDriver
 
 const driver = new BotDriver()
-
-driver.BuildFluent()
+  
+ driver.BuildFluent()
   .Start()
+  .UserSaysText('Start')
   .WaitBotSaysText(console.log)
-  .UserSaysText('Show me a hero card')
-  .WaitBotSaysText(console.log)
-  .UserSaysText('Hello echo!')
+  .UserSaysText('Hallo')
   .WaitBotSaysText(console.log)
   .Stop()
   .Clean()
@@ -17,4 +16,4 @@ driver.BuildFluent()
   })
   .catch((err) => {
     console.log('ERROR: ', err)
-  })
+  })