@knowlearning/agents 0.4.2 → 0.4.4

package/agents/generic.js

@@ -29,6 +29,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
   const states = {}
   const responses = {}
   const watchers = {}
+  const keyToSubscriptionId = {}
   const lastInteractionUpdateForWatchedScope = {}
   const messageQueue = []
   let resolveEnvironment
@@ -48,6 +49,10 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
   log('INITIALIZING AGENT CONNECTION')
   initWS()
 
+  function subscription(key) {
+    return subscriptions[keyToSubscriptionId[key]]
+  }
+
   function log() {
     if (mode === 'debug') console.log(...arguments)
   }
@@ -155,11 +160,12 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
           }
           else {
             const key = `${message.domain}/${message.user}/${message.scope}`
+            const sub = subscription(key)
             if (watchers[key]) {
-              if (subscriptions[key] + 1 !== message.ii) {
+              if (sub.ii + 1 !== message.ii) {
                 //  TODO: this seems to be an error that happens with decent regularity (an answer with a given si was skipped/failed)
                 //        we should be wary of out-of-order ii being passed down (maybe need to wait for older ones???)
-                console.warn('UNEXPECTED UPDATE INTERACTION INDEX!!!!!!!!!!! last index in session', subscriptions[key], ' passed index ', message.ii)
+                console.warn('UNEXPECTED UPDATE INTERACTION INDEX!!!!!!!!!!! last index in session', sub, ' passed index ', message.ii)
               }
               states[key] = await states[key] || {}
 
@@ -168,7 +174,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
 
               applyPatch(states[key], standardJSONPatch(message.patch.slice(lastResetPatchIndex + 1)))
               watchers[key].forEach(fn => fn({ ...message, state: states[key] }))
-              subscriptions[key] = message.ii
+              sub.ii = message.ii
             }
           }
         }
@@ -206,18 +212,25 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
       const k = `${d || domain}/${u || user}/${scope}`
       resolveKey(k)
 
-      if (states[k] === undefined) {
+      if (!keyToSubscriptionId[k]) {
+        const id = uuid()
+
+        keyToSubscriptionId[k] = id
         watchers[k] = []
         states[k] = new Promise(async resolve => {
-          subscriptions[k] = null
+          subscriptions[id] = { scope, ii: null, session }
+
+          if (d !== domain) subscriptions[id].domain = d
+          if (u !== user) subscriptions[id].user = u
+
           const { ii, state } = await lastMessageResponse()
-          subscriptions[k] = ii
+          subscriptions[id].ii = ii
           resolve(state)
           if (ii === -1) {
             // -1 indicates the result is a computed scope, so
             // ii does not apply (we clear out the subscription to not cache value)
             delete states[k]
-            delete subscriptions[k]
+            delete subscriptions[id]
           }
         })
       }
@@ -247,7 +260,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
       const k = await key
       removeWatcher(k, watchFn)
       if (watchers[k].length === 0) {
-        delete subscriptions[k]
+        delete subscriptions[keyToSubscriptionId[k]]
         delete watchers[k]
       }
     }
@@ -353,7 +366,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
   function reconnect() {
     log('RECONNECTED AGENT!!!!!!!!!!!!!!!')
     disconnected = false
-    initWS()
+    restartConnection()
   }
 
   function debug() {

package/package.json

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