@knowlearning/agents 0.7.3 → 0.7.5

package/agents/browser/embed.js

@@ -75,7 +75,7 @@ export default function embed(environment, iframe) {
       sendDown(await Agent.upload(name, contentType, false, id))
     }
     else if (type === 'download') {
-      sendDown(await Agent.download(message.id, true))
+      sendDown(await Agent.download(message.id).url())
     }
     else if (type === 'login') {
       const { provider, username, password } = message

package/agents/browser/embedded.js

@@ -133,9 +133,46 @@ export default function EmbeddedAgent() {
     }
   }
 
-  async function download(id, passthrough=false) {
-    const url = await send({ type: 'download', id })
-    return passthrough ? url : fetch(url)
+  function download(id) {
+    const mode = 'fetch'
+    const promise = new Promise(async (resolve, reject) => {
+      const url = await send({ type: 'download', id })
+
+      await new Promise(r => setTimeout(r))
+      if (mode === 'url') resolve(url)
+      else if (mode === 'fetch') {
+        const response = await fetch(url)
+        const { ok, statusText } = response
+
+        if (ok) resolve(response)
+        else reject(statusText)
+      }
+      else if (mode === 'direct') {
+        //  TODO: use browser progress UX instead of downloading all into memory first
+        const res = await download(id)
+        const { name } = await metadata(id)
+        const type = res.headers.get('Content-Type')
+        const blob = new Blob([ await res.blob() ], { type }) 
+        const url = window.URL.createObjectURL(blob)
+        const a = document.createElement('a')
+        a.style.display = 'none'
+        a.href = url
+        a.download = name
+        document.body.appendChild(a)
+        a.click()
+        window.URL.revokeObjectURL(url)
+        resolve()
+      }
+    })
+    promise.direct = () => {
+      mode = 'direct'
+      return promise
+    }
+    promise.url = () => {
+      mode = 'url'
+      return promise
+    }
+    return promise
   }
 
   function metadata(id) {

package/agents/download.js

@@ -0,0 +1,54 @@
+export default function download (id, { uuid, initialize, lastMessageResponse, fetch, metadata }) {
+  // TODO: initialize size info
+  const downloadId = uuid()
+  initialize(
+    downloadId,
+    'application/json;type=download',
+    { id }
+  )
+
+  let mode = 'fetch'
+
+  const promise = new Promise(async (resolve, reject) => {
+    const { url } = await lastMessageResponse()
+    await new Promise(r => setTimeout(r))
+
+    if (mode === 'url') resolve(url)
+    else if (mode === 'fetch') {
+      const response = await fetch(url)
+      const { ok, statusText } = response
+
+      if (ok) resolve(response)
+      else reject(statusText)
+    }
+    else if (mode === 'direct') {
+      //  TODO: throw meaningful error if not in browser context
+      //        (following block assumes browser context)
+      //  TODO: use browser progress UX instead of downloading all into memory first
+      const res = await download(id, { uuid, initialize, lastMessageResponse, fetch, metadata })
+      const { name } = await metadata(id)
+      const type = res.headers.get('Content-Type')
+      const blob = new Blob([ await res.blob() ], { type }) 
+      const url = window.URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.style.display = 'none'
+      a.href = url
+      a.download = name
+      document.body.appendChild(a)
+      a.click()
+      window.URL.revokeObjectURL(url)
+      resolve()
+    }
+  })
+
+  promise.direct = () => {
+    mode = 'direct'
+    return promise
+  }
+  promise.url = () => {
+    mode = 'url'
+    return promise
+  }
+
+  return promise
+}

package/agents/generic.js

@@ -1,4 +1,5 @@
 import MutableProxy from '../persistence/json.js'
+import download from './download.js'
 
 const HEARTBEAT_TIMEOUT = 10000
 
@@ -181,7 +182,11 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
 
               if (states[message.scope].active === undefined) states[message.scope].active = {}
               applyPatch(states[message.scope], standardJSONPatch(message.patch.slice(lastResetPatchIndex + 1)))
-              watchers[message.scope].forEach(fn => fn({ ...message, state: states[message.scope].active }))
+              watchers[message.scope]
+                .forEach(fn => {
+                  const state = structuredClone(states[message.scope].active)
+                  fn({ ...message, state })
+                })
               if (sub) sub.ii = message.ii
             }
           }
@@ -351,26 +356,6 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     }
   }
 
-   async function download(id, passthrough=false) {
-    // TODO: initialize size info
-    const downloadId = uuid()
-    initialize(
-      downloadId,
-      'application/json;type=download',
-      { id }
-    )
-    const { url } = await lastMessageResponse()
-
-    if (passthrough) return url
-    else {
-      const response = await fetch(url)
-      const { ok, statusText } = response
-
-      if (ok) return response
-      else throw new Error(statusText)
-    }
-  }
-
   async function patch(root, scopes) {
     patches[uuid()] = { root, scopes }
     const { swaps } = await lastMessageResponse()
@@ -470,7 +455,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     state,
     watch,
     upload,
-    download,
+    download: id => download(id, { uuid, initialize, lastMessageResponse, fetch, download, metadata }),
     interact,
     patch,
     claim,

package/package.json

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