@knowlearning/agents 0.9.27 → 0.9.28

package/agents/browser/embedded.js

@@ -7,6 +7,7 @@ export default function EmbeddedAgent() {
   const session = new Promise(r => resolveSession = r)
   const responses = {}
   const watchers = {}
+  const sentUpdates = {}
 
   function removeWatcher(key, fn) {
     const watcherIndex = watchers[key].findIndex(x => x === fn)
@@ -37,8 +38,13 @@ export default function EmbeddedAgent() {
     }
   }
 
+  let sessionResolved = false
   addEventListener('message', async ({ data }) => {
-    if (data.type === 'setup') resolveSession(data.session)
+    if (data.type === 'setup' && !sessionResolved) {
+      sessionResolved = true
+      resolveSession(data.session)
+    }
+    else if (!sessionResolved || data.session !== await session) return
     else if (responses[data.requestId]) {
       const { resolve, reject } = responses[data.requestId]
       if (data.error) reject(data.error)
@@ -50,7 +56,15 @@ export default function EmbeddedAgent() {
       const d = !domain || domain === rootDomain ? '' : domain
       const u = !user || auth.user === user ? '' : user
       const key = isUUID(scope) ? scope : `${d}/${u}/${scope}`
-      if (watchers[key]) watchers[key].forEach(fn => fn(data))
+      if (watchers[key]) {
+        if (sentUpdates[key] + 1 === data.ii) {
+          sentUpdates[key] = data.ii
+          watchers[key].forEach(fn => fn(data))
+        }
+        else if (data.ii !== sentUpdates[key]) {
+          console.warn('Out of order or repeated update for', key, data.ii, sentUpdates[key])
+        }
+      }
     }
   })
 
@@ -84,11 +98,24 @@ export default function EmbeddedAgent() {
 
   function watch(scope, fn, user, domain) {
     tagIfNotYetTaggedInSession('subscribed', scope)
-    const key = isUUID(scope) ? scope : `${ domain || ''}/${ user || ''}/${scope}`
-    if (!watchers[key]) watchers[key] = []
-    watchers[key].push(fn)
-    send({ type: 'state', scope, user, domain })
-    return () => removeWatcher(key, fn)
+
+    const key = (
+      environment()
+        .then(async ({ auth, domain:rootDomain }) => {
+          const d = !domain || domain === rootDomain ? '' : domain
+          const u = !user || auth.user === user ? '' : user
+          const key = isUUID(scope) ? scope : `${d}/${u}/${scope}`
+
+          const state = await send({ type: 'state', scope, user, domain })
+          const metadata = await send({ type: 'metadata', scope, user, domain })
+          fn({ state, patch: null, ii: metadata.ii })
+          sentUpdates[key] = metadata.ii
+          if (!watchers[key]) watchers[key] = []
+          watchers[key].push(fn)
+          return key
+        })
+    )
+    return async () => removeWatcher(await key, fn)
   }
 
   async function patch(root, scopes) {

package/agents/browser/initialize.js

@@ -12,10 +12,12 @@ export default function browserAgent(options={}) {
   try { embedded = window.self !== window.top }
   catch (e) { embedded = true }
 
-  Agent = embedded && !options.root ? EmbeddedAgent() : RootAgent(options)
-  Agent.embed = embed
+  const newAgent = embedded && !options.root ? EmbeddedAgent() : RootAgent(options)
+  newAgent.embed = embed
 
-  return Agent
+  if (!Agent) Agent = newAgent
+
+  return newAgent
 }
 
 const copy = x => JSON.parse(JSON.stringify(x))
@@ -57,10 +59,9 @@ function embed(environment, iframe) {
       if (listeners.close) listeners.close(message.info)
     }
     else if (type === 'environment') {
+      const { context } = message
       const env = await Agent.environment()
-      const context = [...env.context, environment.id]
-      Object.assign(env, { ...env, context })
-      sendDown(env)
+      sendDown({ ...env, context: [...env.context, environment.id] })
     }
     else if (type === 'interact') {
       const { scope, patch } = message
@@ -154,6 +155,7 @@ function embed(environment, iframe) {
     else iframe.src = id //  TODO: ensure is url
 
     while(!embeddedAgentInitialized) {
+      //  TODO: wait for any other agents that are initializing from other potential root agents
       postMessage({ type: 'setup', session })
       await new Promise(r => setTimeout(r, 100))
     }

package/agents/generic/index.js

@@ -44,6 +44,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     tagIfNotYetTaggedInSession,
     interact,
     fetch,
+    synced,
     metadata
   }
 

package/agents/generic/message-queue.js

@@ -18,7 +18,6 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
   let ws
   let user
   let authed = false
-  let isSynced = false
   let session
   let server
   let si = -1
@@ -30,7 +29,7 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
   let lastSynchronousScopePatchPromise = null
   let restarting = false
   let disconnected = false
-  const syncedPromiseResolutions = []
+  const outstandingSyncPromises = []
   const responses = {}
 
 
@@ -41,7 +40,6 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
   }
 
   function queueMessage({ scope, patch }) {
-    isSynced = false
     if (lastSynchronousScopePatched === scope) {
       const i = messageQueue.length - 1
       messageQueue[i].patch = [...messageQueue[i].patch, ...patch]
@@ -74,8 +72,10 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
   }
 
   function resolveSyncPromises() {
-    while (syncedPromiseResolutions.length) syncedPromiseResolutions.shift()()
-    isSynced = true
+    const lowestOutstandingResponseIndex = Object.keys(responses).map(parseInt).sort()[0] || Infinity
+    while (outstandingSyncPromises[0] && outstandingSyncPromises[0].si < lowestOutstandingResponseIndex) {
+      outstandingSyncPromises.shift().resolve()
+    }
   }
 
   function checkHeartbeat() {
@@ -162,7 +162,7 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
 
               delete responses[message.si]
               ws.send(JSON.stringify({ack: message.si})) //  acknowledgement that we have received the response for this message
-              if (Object.keys(responses).length === 0) resolveSyncPromises()
+              resolveSyncPromises()
             }
             else {
               //  TODO: consider what to do here... probably want to throw error if in dev env
@@ -208,7 +208,11 @@ export default function messageQueue(setEnvironment, { token, protocol, host, We
     checkHeartbeat()
   }
 
-  async function synced() { return isSynced ? null : new Promise(res => syncedPromiseResolutions.push(res)) }
+  async function synced() {
+    const syncPromise = new Promise(resolve => outstandingSyncPromises.push({ si: lastSentSI, resolve }))
+    resolveSyncPromises()
+    return syncPromise
+  }
 
   function lastMessageResponse() { return new Promise((res, rej) => responses[si].push([res, rej])) }
 

package/agents/generic/watch.js

@@ -1,23 +1,13 @@
 import { validate as isUUID } from 'uuid'
 
-export default function({ metadata, state, watchers }) {
+export default function({ metadata, state, watchers, synced }) {
 
   function watch(scope=DEFAULT_SCOPE_NAME, fn, user, domain) {
     if (Array.isArray(scope)) return watchResolution(scope, fn, user, domain)
 
-    let initialSent = false
-    const queue = []
-    function cb(update) {
-      if (initialSent) fn(update)
-      else queue.push(update)
-    }
-
     const statePromise = state(scope, user, domain)
     const qualifiedScope = isUUID(scope) ? scope : `${domain || ''}/${user || ''}/${scope}`
 
-    if (!watchers[qualifiedScope]) watchers[qualifiedScope] = []
-    watchers[qualifiedScope].push(cb)
-
     metadata(scope, user, domain)
       .then(async ({ ii }) => {
         fn({
@@ -28,11 +18,11 @@ export default function({ metadata, state, watchers }) {
           patch: null,
           ii
         })
-        initialSent = true
-        queue.forEach(fn)
+        if (!watchers[qualifiedScope]) watchers[qualifiedScope] = []
+        watchers[qualifiedScope].push(fn)
       })
 
-    return () => removeWatcher(qualifiedScope, cb)
+    return () => removeWatcher(qualifiedScope, fn)
   }
 
   function watchResolution(path, callback, user, domain) {

package/package.json

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