@knowlearning/agents 0.9.57 → 0.9.59

package/agents/browser/embedded.js

@@ -131,8 +131,10 @@ export default function EmbeddedAgent() {
     return send({ type: 'interact', scope, patch })
   }
 
-  async function upload(name, type, data, id=uuid()) {
-    const url = await send({ type: 'upload', name, contentType: type, id })
+  async function upload(info) {
+    let { name, type, data, id=uuid() } = info || {}
+
+    const url = await send({ type: 'upload', info: { name, type, id } })
 
     if (data === undefined) return url
     else {

package/agents/browser/initialize.js

@@ -1,6 +1,7 @@
 import RootAgent from './root.js'
 import EmbeddedAgent from './embedded.js'
 import { v1 as uuid, validate as validateUUID } from 'uuid'
+import selectFile from './select-file.js'
 
 let Agent
 
@@ -15,6 +16,20 @@ export default function browserAgent(options={}) {
   const newAgent = embedded && !options.root ? EmbeddedAgent() : RootAgent(options)
   newAgent.embed = embed
 
+  const originalUpload = newAgent.upload
+  newAgent.upload = async info => {
+    if (info.browser) {
+      const file = await selectFile()
+      if (!file) return
+
+      info.data = await file.arrayBuffer()
+      if (!info.name) info.name = file.name
+      if (!info.type) info.type = file.type
+    }
+
+    return originalUpload(info)
+  }
+
   if (!Agent) Agent = newAgent
 
   return newAgent
@@ -108,8 +123,8 @@ function embed(environment, iframe) {
         .catch(error => sendDown(null, error.error))
     }
     else if (type === 'upload') {
-      const { name, contentType, id } = message
-      sendDown(await Agent.upload(name, contentType, undefined, id))
+      const { info } = message
+      sendDown(await Agent.upload(info))
     }
     else if (type === 'download') {
       sendDown(await Agent.download(message.id).url())

package/agents/browser/select-file.js

@@ -0,0 +1,15 @@
+export default async function selectFile() {
+  return new Promise((resolve, reject) => {
+    const input = document.createElement('input')
+    input.type = 'file'
+
+    input.addEventListener('change', async (event) => {
+      const file = event.target.files[0]
+
+      if (file) resolve(file)
+      else resolve(null)
+    })
+
+    input.click()
+  })
+}

package/agents/generic/index.js

@@ -69,6 +69,8 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
       { op: 'add', path: ['active_type'], value: active_type },
       { op: 'add', path: ['active'], value: active }
     ]
+    if (name) patch.push({ op: 'add', path: ['name'], value: name })
+
     interact(id, patch, false)
     return id
   }
@@ -88,12 +90,11 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     await tag(tag_type, target)
   }
 
-  //  TODO: if no data, set up streaming upload
-  async function upload(name, type, data, id=uuid()) {
-    //  TODO: include data size info...
+  async function upload({ name, type, data, id=uuid() }) {
     create({
       active_type: UPLOAD_TYPE,
-      active: { id, type }
+      active: { id, type, name },
+      name
     })
     const { url } = await lastMessageResponse()
 
@@ -122,7 +123,6 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
 
       const resolveAndUnwatch = async (update) => {
         const { ii } = await response
-        console.log('RESOLVE LAST INTERACTION....', ii, update, scope)
         if (update.ii === ii) {
           resolve(ii)
           removeWatcher(qualifiedScope, resolveAndUnwatch)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowlearning/agents",
-  "version": "0.9.57",
+  "version": "0.9.59",
   "description": "API for embedding applications in KnowLearning systems.",
   "main": "node.js",
   "browser": "browser.js",