@knowlearning/agents 0.9.171 → 0.9.172

package/agents/browser/embedded.js

@@ -91,21 +91,6 @@ export default function EmbeddedAgent() {
     return id
   }
 
-  const tagTypeToTargetCache = {}
-  async function tagIfNotYetTaggedInSession(tag_type, target) {
-    const targetCache = tagTypeToTargetCache[tag_type]
-    if (targetCache && targetCache[target]) return
-
-    //  always use absolute referene when tagging
-    if (!isUUID(target)) target = (await metadata(target)).id
-
-    if (!tagTypeToTargetCache[tag_type]) tagTypeToTargetCache[tag_type] = {}
-    if (tagTypeToTargetCache[tag_type][target]) return
-
-    tagTypeToTargetCache[tag_type][target] = true
-    await tag(tag_type, target)
-  }
-
   async function patch(root, scopes) {
     //  TODO: consider watch function added to return to receive progress
     return send({ type: 'patch', root, scopes })
@@ -116,7 +101,6 @@ export default function EmbeddedAgent() {
       const { context } = await environment()
       scope = JSON.stringify(context)
     }
-    tagIfNotYetTaggedInSession('subscribed', scope)
     const startState = await send({ type: 'state', scope, user, domain })
     return new PatchProxy(startState, patch => {
       //  TODO: reject updates if user is not owner
@@ -130,10 +114,8 @@ export default function EmbeddedAgent() {
     return interact(scope, [{ op: 'add', path:['active'], value: null }])
   }
 
-  //  TODO: better approach than exposing addTag
-  function interact(scope, patch, addTag=true) {
-    if (addTag) tagIfNotYetTaggedInSession('mutated', scope)
-    return send({ type: 'interact', scope, patch })
+  function interact(scope, patch, _, context) {
+    return send({ type: 'interact', scope, patch, context })
   }
 
   async function upload(info) {
@@ -213,10 +195,6 @@ export default function EmbeddedAgent() {
     })
   }
 
-  function tag(tag_type, target, context=[]) {
-    return send({ type: 'tag', tag_type, target, context })
-  }
-
   function login(provider, username, password) {
     return send({ type: 'login', provider, username, password })
   }
@@ -247,7 +225,6 @@ export default function EmbeddedAgent() {
     reconnect,
     synced,
     close,
-    query,
-    tag
+    query
   }
 }

package/agents/browser/initialize.js

@@ -99,12 +99,11 @@ function embed(environment, iframe) {
       })
     }
     else if (type === 'interact') {
-      let { scope, patch } = message
+      let { scope, patch, context=[] } = message
       const namespacedScope = getNamespacedScope(environment.namespace, scope)
       let before, after
       if (listeners.mutate) before = copy(await Agent.state(namespacedScope))
-      await Agent.interact(namespacedScope, patch, false)
-      if (listeners.mutate) after = copy(await Agent.state(namespacedScope))
+      await Agent.interact(namespacedScope, patch, true, [environment.id, ...context])
       if (listeners.mutate) {
         const patchCopy = copy(patch)
         patchCopy.forEach(op => op.path.shift()) //  remove "active" path prefix
@@ -112,7 +111,7 @@ function embed(environment, iframe) {
           .mutate({
             scope: namespacedScope,
             before,
-            after,
+            after: copy(await Agent.state(namespacedScope)),
             patch: patchCopy
           })
       }
@@ -124,11 +123,6 @@ function embed(environment, iframe) {
 
       sendDown(await Agent.metadata(namespacedScope, user, domain))
     }
-    else if (type === 'tag') {
-      const { tag_type, target, context } = message
-      const prependedContext = [environment.id, ...context]
-      sendDown(await Agent.tag(tag_type, target, prependedContext))
-    }
     else if (type === 'state') {
       const { scope, user, domain } = message
       const namespacedScope = getNamespacedScope(environment.namespace, scope)

package/agents/generic/index.js

@@ -9,7 +9,6 @@ import downloadImplementation from '../download.js'
 //       for resoling default scope in context
 const DEFAULT_SCOPE_NAME = '[]'
 const UPLOAD_TYPE = 'application/json;type=upload'
-const TAG_TYPE = 'application/json;type=tag'
 const DOMAIN_CLAIM_TYPE = 'application/json;type=domain-claim'
 
 export default function Agent({ Connection, domain, token, sid, uuid, fetch, applyPatch, login, logout, reboot, handleDomainMessage, log:passedLog=console.log, variables={} }) {
@@ -17,7 +16,6 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
   const watchers = {}
   const keyToSubscriptionId = {}
   const lastInteractionResponse = {}
-  const tagTypeToTargetCache = {}
 
   log('INITIALIZING AGENT CONNECTION')
   const [
@@ -32,7 +30,7 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
   // initialize session
   environment()
     .then(({ session }) => {
-      interact('sessions', [{ op: 'add', path: ['active', session], value: { queries: {}, subscriptions: {} } }], false, false)
+      interact('sessions', [{ op: 'add', path: ['active', session], value: { queries: {}, subscriptions: {} } }], false)
     })
 
   const internalReferences = {
@@ -44,7 +42,6 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
     environment,
     lastInteractionResponse,
     lastMessageResponse,
-    tagIfNotYetTaggedInSession,
     interact,
     fetch,
     synced,
@@ -71,25 +68,10 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
     ]
     if (name) patch.push({ op: 'add', path: ['name'], value: name })
 
-    interact(id, patch, false)
+    interact(id, patch)
     return id
   }
 
-  async function tagIfNotYetTaggedInSession(tag_type, target) {
-    const targetCache = tagTypeToTargetCache[tag_type]
-    if (targetCache && targetCache[target]) return
-
-    if (!targetCache) tagTypeToTargetCache[tag_type] = {}
-    if (tagTypeToTargetCache[tag_type][target]) return
-
-    tagTypeToTargetCache[tag_type][target] = true
-
-    //  always use absolute referene when tagging
-    if (!isUUID(target)) target = (await metadata(target)).id
-
-    await tag(tag_type, target)
-  }
-
   async function upload(info) {
     const { name, type, data, id=uuid() } = info || {}
     create({
@@ -110,11 +92,9 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
     }
   }
 
-  //  TODO: addTag option should probably not be exposed
-  async function interact(scope=DEFAULT_SCOPE_NAME, patch, addTag=true, manageLocalState=true) {
-    if (addTag) tagIfNotYetTaggedInSession('mutated', scope)
+  async function interact(scope=DEFAULT_SCOPE_NAME, patch, manageLocalState=true, context=[]) {
     //  TODO: ensure user is owner of scope
-    const response = queueMessage({scope, patch})
+    const response = queueMessage({scope, patch, context})
 
     //  if we are watching this scope, we want to keep track of last interaction we fired
     const qualifiedScope = isUUID(scope) ? scope : `//${scope}`
@@ -174,7 +154,7 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
         path: ['active', session, 'queries', id],
         value: { query, params, domain, context }
       }
-    ], false, false)
+    ], false)
     try {
       const response = await lastMessageResponse()
       const { rows } = response
@@ -189,7 +169,7 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
           op: 'remove',
           path: ['active', session, 'queries', id]
         }
-      ], false, false)
+      ], false)
       return rows
     }
     catch (error) {
@@ -197,13 +177,6 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
     }
   }
 
-  function tag(tag_type, target, context=[]) {
-    return create({
-      active_type: TAG_TYPE,
-      active: { tag_type, target, context }
-    })
-  }
-
   const reactions = { child: [] }
 
   function on(event, reaction) {
@@ -234,7 +207,6 @@ export default function Agent({ Connection, domain, token, sid, uuid, fetch, app
     synced,
     disconnect,
     reconnect,
-    tag,
     debug,
     on
   }

package/agents/generic/message-queue.js

@@ -38,7 +38,7 @@ export default function messageQueue({ token, sid, domain, Connection, watchers,
 
   async function environment() { return { variables, ...(await environmentPromise), context: [] } }
 
-  function queueMessage({ scope, patch }) {
+  function queueMessage({ scope, patch, context }) {
     if (lastSynchronousScopePatched === scope) {
       const i = messageQueue.length - 1
       messageQueue[i].patch = [...messageQueue[i].patch, ...patch]
@@ -46,7 +46,7 @@ export default function messageQueue({ token, sid, domain, Connection, watchers,
     else {
       si += 1
       lastSynchronousScopePatchPromise = new Promise((resolve, reject) => responses[si] = [[resolve, reject]])
-      messageQueue.push({ scope, patch, si, ts: Date.now()})
+      messageQueue.push({ scope, patch, context, si, ts: Date.now()})
       lastSynchronousScopePatched = scope
       flushMessageQueue()
     }

package/agents/generic/state.js

@@ -1,7 +1,7 @@
 import { v4 as uuid, validate as isUUID } from 'uuid'
 import PatchProxy from '@knowlearning/patch-proxy'
 
-export default function(scope='[]', user, domain, { keyToSubscriptionId, watchers, states, create, environment, lastMessageResponse, lastInteractionResponse, tagIfNotYetTaggedInSession, interact, log }) {
+export default function(scope='[]', user, domain, { keyToSubscriptionId, watchers, states, create, environment, lastMessageResponse, lastInteractionResponse, interact, log }) {
   let resolveMetadataPromise
   let metadataPromise = new Promise(resolve => resolveMetadataPromise = resolve)
 
@@ -20,7 +20,7 @@ export default function(scope='[]', user, domain, { keyToSubscriptionId, watcher
           op: 'add',
           path: ['active', session, 'subscriptions', id],
           value: { scope, user, domain, ii: null }
-        }], false, false)
+        }], false)
         try {
           resolve(await lastMessageResponse())
         }

package/deno.js

@@ -51,7 +51,7 @@ function getAgent(domain, forceNew) {
         value = `ERROR: error occurred logging arguments ${error} ${arguments}`
       }
 
-      agent.interact('sessions', [{ op: 'add', path: ['active', session, 'log'], value }], false, false)
+      agent.interact('sessions', [{ op: 'add', path: ['active', session, 'log'], value }], false)
     },
     fetch,
     applyPatch: fastJSONPatch.applyPatch,