Merge pull request #11 from codeforequity-at/develop

feat: attachment upload to directline

Author: Botium

index.js

@@ -3,6 +3,10 @@ const mime = require('mime-types')
 const _ = require('lodash')
 const { DirectLine, ConnectionStatus } = require('botframework-directlinejs')
 const debug = require('debug')('botium-connector-directline3')
+const FormData = require('form-data')
+const fetch = require('node-fetch')
+const fs = require('fs')
+const path = require('path')
 
 global.XMLHttpRequest = require('xhr2')
 
@@ -191,7 +195,7 @@ class BotiumConnectorDirectline3 {
 
   UserSays (msg) {
     debug('UserSays called')
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       const activity = {
         from: { id: this.me }
       }
@@ -207,21 +211,64 @@ class BotiumConnectorDirectline3 {
         activity.type = 'message'
         activity.text = msg.messageText
       }
+
       if (msg.media && msg.media.length > 0) {
-        return reject(new Error(`Media Attachments currently not possible.`))
-      }
-      debug('Posting activity ', JSON.stringify(activity, null, 2))
+        debug('Posting activity with attachments ', JSON.stringify(activity, null, 2))
+        const formData = new FormData()
 
-      this.directLine.postActivity(activity).subscribe(
-        id => {
-          debug('Posted activity, assigned ID ', id)
-          resolve()
-        },
-        err => {
+        formData.append('activity', Buffer.from(JSON.stringify(activity)), {
+          contentType: 'application/vnd.microsoft.activity',
+          filename: 'blob'
+        })
+
+        for (let i = 0; i < msg.media.length; i++) {
+          const attachment = msg.media[i]
+          const attachmentName = path.basename(attachment.mediaUri)
+
+          if (attachment.mediaUri.startsWith('file://')) {
+            const filepath = attachment.mediaUri.split('file://')[1]
+            formData.append('file', fs.createReadStream(filepath), {
+              filename: attachmentName
+            })
+          } else {
+            const { body } = await fetch(attachment.mediaUri)
+
+            formData.append('file', body, {
+              filename: attachmentName
+            })
+          }
+        }
+
+        // Ensure directline is connected!
+        await this.directLine.checkConnection(true)
+        fetch(`${this.directLine.domain}/conversations/${this.directLine.conversationId}/upload?userId=${activity.from.id}`, {
+          method: 'POST',
+          headers: {
+            'Authorization': `Bearer ${this.directLine.token}`
+          },
+          body: formData
+        }).catch(err => {
           debug('Error posting activity', err)
           reject(new Error(`Error posting activity: ${err}`))
-        }
-      )
+        }).then(async (res) => {
+          const json = await res.json()
+          debug('Posted activity, assigned ID:', json.id)
+          resolve()
+        })
+      } else {
+        debug('Posting activity ', JSON.stringify(activity, null, 2))
+
+        this.directLine.postActivity(activity).subscribe(
+          id => {
+            debug('Posted activity, assigned ID:', id)
+            resolve()
+          },
+          err => {
+            debug('Error posting activity', err)
+            reject(new Error(`Error posting activity: ${err}`))
+          }
+        )
+      }
     })
   }
 

package.json

@@ -19,23 +19,30 @@
   },
   "homepage": "https://github.com/codeforequity-at/botium-connector-directline3#readme",
   "devDependencies": {
+    "@babel/core": "^7.2.2",
+    "@babel/node": "^7.2.2",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.2.3",
     "eslint": "^5.12.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "rollup": "^0.58.2",
-    "rollup-plugin-buble": "^0.19.2",
+    "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-json": "^2.3.0",
     "rollup-plugin-node-resolve": "^3.3.0"
   },
   "dependencies": {
+    "@babel/runtime": "^7.2.0",
     "botframework-directlinejs": "^0.9.17",
     "debug": "^3.1.0",
+    "form-data": "^2.3.3",
     "lodash": "^4.17.11",
     "mime-types": "^2.1.20",
+    "node-fetch": "^2.3.0",
     "uuid": "^3.3.2",
     "xhr2": "^0.1.4"
   }

rollup.config.js

@@ -1,6 +1,6 @@
-import buble from 'rollup-plugin-buble';
-import commonjs from 'rollup-plugin-commonjs';
-import json from 'rollup-plugin-json';
+import babel from 'rollup-plugin-babel'
+import commonjs from 'rollup-plugin-commonjs'
+import json from 'rollup-plugin-json'
 
 export default {
   input: 'index.js',
@@ -20,7 +20,10 @@ export default {
     commonjs({
       exclude: 'node_modules/**'
     }),
-    buble(),
+    babel({
+      exclude: 'node_modules/**',
+      runtimeHelpers: true
+    }),
     json()
   ]
-};
+}