@knowlearning/agents 0.9.47 → 0.9.49

package/agents/browser/embedded.js

@@ -147,7 +147,7 @@ export default function EmbeddedAgent() {
     const promise = new Promise(async (resolve, reject) => {
       const url = await send({ type: 'download', id })
 
-      await new Promise(r => setTimeout(r))
+//      await new Promise(r => setTimeout(r))
       if (mode === 'url') resolve(url)
       else if (mode === 'fetch') {
         const response = await fetch(url)

package/agents/generic/index.js

@@ -31,6 +31,12 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     environment
   ] = messageQueue({ token, protocol, host, WebSocket, watchers, states, applyPatch, log, login, interact })
 
+  // initialize session
+  environment()
+    .then(({ session }) => {
+      interact('sessions', [{ op: 'add', path: [session], value: { queries: {}, subscriptions: {} } }])
+    })
+
   const internalReferences = {
     keyToSubscriptionId,
     watchers,
@@ -49,15 +55,6 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
 
   const [ watch, removeWatcher ] = watchImplementation(internalReferences)
 
-  const sessionPromise = new Promise(async resolve => {
-    const { session } = await environment()
-    const sessions = await state('sessions')
-    sessions[session] = {
-      queries: {}
-    }
-    resolve(sessions[session])
-  })
-
   function state(scope, user, domain) { return stateImplementation(scope, user, domain, internalReferences) }
 
   function download(id) { return downloadImplementation(id, internalReferences) }
@@ -177,14 +174,29 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
   }
 
   async function query(query, params, domain) {
-    const session = await sessionPromise
     const id = uuid()
     const requested = Date.now()
-    await new Promise(r => setTimeout(r)) //  ensure next interaction gets sent on its own
-    session.queries[id] = { query, params, domain }
+    const { session } = await environment()
+//    await new Promise(r => setTimeout(r, 1)) //  ensure next interaction gets sent on its own
+    interact('sessions', [
+      {
+        op: 'add',
+        path: ['active', session, 'queries', id],
+        value: { query, params, domain }
+      }
+    ])
     const { rows } = await lastMessageResponse()
-    session.queries[id].agent_latency = Date.now() - requested
-    delete session.queries[id]
+    interact('sessions', [
+      {
+        op: 'add',
+        path: ['active', session, 'queries', id, 'agent_latency'],
+        value: Date.now() - requested
+      },
+      {
+        op: 'remove',
+        path: ['active', session, 'queries', id]
+      }
+    ])
     return rows
   }
 

package/agents/generic/state.js

@@ -1,8 +1,6 @@
 import { v4 as uuid, validate as isUUID } from 'uuid'
 import MutableProxy from '../../persistence/json.js'
 
-const SUBSCRIPTION_TYPE = 'application/json;type=subscription'
-
 export default function(scope='[]', user, domain, { keyToSubscriptionId, watchers, states, create, environment, lastMessageResponse, lastInteractionResponse, tagIfNotYetTaggedInSession, interact }) {
   let resolveMetadataPromise
   let metadataPromise = new Promise(resolve => resolveMetadataPromise = resolve)
@@ -16,20 +14,19 @@ export default function(scope='[]', user, domain, { keyToSubscriptionId, watcher
       watchers[qualifiedScope] = []
       states[qualifiedScope] = new Promise(async (resolve, reject) => {
         const { session } = await environment()
-        create({
-          id,
-          active_type: SUBSCRIPTION_TYPE,
-          active: { session, scope, user, domain, ii: null, initialized: Date.now() },
-        })
-
+        await new Promise(r => setTimeout(r))
+        interact('sessions', [{
+          op: 'add',
+          path: ['active', session, 'subscriptions', id],
+          value: { session, scope, user, domain, ii: null }
+        }])
         try {
           const state = await lastMessageResponse()
-          tagIfNotYetTaggedInSession('subscribed', state.id)
-          interact(id, [
-            { op: 'add', path: ['active', 'ii'], value: state.ii }, // TODO: use state.ii when is coming down properly...
-            { op: 'add', path: ['active', 'synced'], value: Date.now() }
-          ])
-
+          interact('sessions', [{
+            op: 'add',
+            path: ['active', session, 'subscriptions', id, 'ii'],
+            value: state.ii
+          }])
           resolve(state)
         }
         catch (error) { reject(error) }

package/package.json

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