@knowlearning/agents 0.9.140 → 0.9.142

package/agents/browser/initialize.js

@@ -5,6 +5,12 @@ import selectFile from './select-file.js'
 
 let Agent
 
+function getNamespacedScope(namespace, scope) {
+  const allow = namespace?.allow || []
+  const prefix = typeof namespace === 'string' ? namespace : namespace?.prefix
+  return prefix && !validateUUID(scope) && !allow.some(allowPrefix => scope.startsWith(allowPrefix)) ? `${prefix}/${scope}` : scope
+}
+
 export default function browserAgent(options={}) {
   if (Agent && !options.unique) return Agent
 
@@ -80,16 +86,14 @@ function embed(environment, iframe) {
     }
     else if (type === 'interact') {
       let { scope, patch } = message
-      if (environment.namespace && !validateUUID(scope)) scope = environment.namespace + '/' + scope
-      //  TODO: should use a better approach to instruct agent
-      //        not to generate a tag from this interaction
-      await Agent.interact(scope, patch, false)
-      if (listeners.mutate) listeners.mutate({ scope })
+      const namespacedScope = getNamespacedScope(environment.namespace, scope)
+      await Agent.interact(namespacedScope, patch, false)
+      if (listeners.mutate) listeners.mutate({ scope: namespacedScope })
       sendDown({}) // TODO: might want to send down the interaction index
     }
     else if (type === 'metadata') {
       const { scope, user, domain } = message
-      const namespacedScope = environment.namespace && !validateUUID(scope) ? `${environment.namespace}/${scope}` : scope
+      const namespacedScope = getNamespacedScope(environment.namespace, scope)
 
       sendDown(await Agent.metadata(namespacedScope, user, domain))
     }
@@ -100,7 +104,7 @@ function embed(environment, iframe) {
     }
     else if (type === 'state') {
       const { scope, user, domain } = message
-      const namespacedScope = environment.namespace && !validateUUID(scope) ? `${environment.namespace}/${scope}` : scope
+      const namespacedScope = getNamespacedScope(environment.namespace, scope)
 
       const statePromise = Agent.state(namespacedScope, user, domain)
 

package/agents/browser/root.js

@@ -14,30 +14,32 @@ const API_HOST = isLocal() ? DEVELOPMENT_HOST : REMOTE_HOST
 //  TODO: remove this hack when we can set partitioned sid cookie through websocket handshake
 //        deno is partly in the way on teh set side, and browser support is in the way for
 //        the client side.
-fetch(`http${ SECURE ? 's' : '' }://${API_HOST}/_sid-check`, { method: 'GET', credentials: 'include' })
-  .then(async response => {
-    const hasLocalStorageSID = !!localStorage.getItem('sid')
-    if (response.status === 201) {
-      if (!hasLocalStorageSID) {
-        const sentSid = await response.text()
-        localStorage.setItem('sid', sentSid)
-        location.reload()
-      }
+async function ensureSidEstablished() {
+  const response = await fetch(`http${ SECURE ? 's' : '' }://${API_HOST}/_sid-check`, { method: 'GET', credentials: 'include' })
+  const hasLocalStorageSID = !!localStorage.getItem('sid')
+  if (response.status === 201) {
+    if (!hasLocalStorageSID) {
+      const sentSid = await response.text()
+      localStorage.setItem('sid', sentSid)
+      location.reload()
     }
-    else if (response.status === 200) {
-      //  if we reach here, assumably the server has seen an sid cookie
-      if (hasLocalStorageSID) {
-        localStorage.removeItem('sid')
-        location.reload()
-      }
-    }
-    else {
-      console.warn('Issue Connecting To the API Server')
+  }
+  else if (response.status === 200) {
+    //  if we reach here, assumably the server has seen an sid cookie
+    if (hasLocalStorageSID) {
+      localStorage.removeItem('sid')
+      location.reload()
     }
-  })
+  }
+  else {
+    console.warn('Issue Connecting To the API Server')
+  }
+}
 
 export default options => {
+  ensureSidEstablished()
   const Connection = function () {
+
     const ws = new WebSocket(`ws${ SECURE ? 's' : '' }://${API_HOST}`)
 
     this.send = message => ws.send(JSON.stringify(message))

package/package.json

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