@knowlearning/agents 0.4.0 → 0.4.2

package/agents/browser/root.js

@@ -8,13 +8,15 @@ const REMOTE_HOST = 'api.knowlearning.systems'
 
 function isLocal() { return localStorage.getItem('api') === 'local' }
 
+const getIdTokenPromise = new Promise(r => onAuth(({ getIdToken }) => r(getIdToken)))
+
 export default () => {
   const { host, protocol } = window.location
 
   const agent = GenericAgent({
     host: isLocal() ? DEVELOPMENT_HOST : REMOTE_HOST,
     protocol: protocol === 'https:' ? 'wss' : 'ws',
-    token: () => new Promise(r => onAuth(({ getIdToken: g }) => r(g()))),
+    token: () => getIdTokenPromise.then(f => f(true)),
     WebSocket,
     uuid,
     fetch,

package/agents/generic.js

@@ -88,23 +88,25 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     )
   }
 
+  let restarting = false
   async function restartConnection() {
-    if (authed) log(`CLOSED DOMAIN ${domain} USER ${user} SESSION ${session} CONNECTION TO SERVER ${server}`)
+    if (restarting) return
+
+    restarting = true
     authed = false
     ws.onmessage = () => {} // needs to be a no-op since a closing ws can still get messages
     if (!disconnected) {
       await new Promise(r => setTimeout(r, Math.min(1000, failedConnections * 100)))
       failedConnections += 1
       initWS() // TODO: don't do this if we are purposefully unloading...
+      restarting = false
     }
   }
 
   function initWS() {
     ws = new WebSocket(`${protocol}://${host}`)
 
-    let opened = false
     ws.onopen = async () => {
-      opened = true
       log('AUTHORIZING NEWLY OPENED WS FOR SESSION:', session)
       failedConnections = 0
       ws.send(JSON.stringify({ token: await token(), session }))
@@ -177,12 +179,11 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     }
 
     ws.onerror = async error => {
-      log('WS CONNECTION ERROR', error.message, opened)
-      if (!opened) restartConnection() // onclose won't trigger if never opened
+      log('WS CONNECTION ERROR', error.message)
     }
 
     ws.onclose = async error => {
-      log('WS CLOSURE', error.message, opened)
+      log('WS CLOSURE', error.message)
       restartConnection()
     }
 

package/package.json

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