@knowlearning/agents 0.1.6 → 0.2.0

package/agents/browser/agent.js

@@ -0,0 +1,13 @@
+import RootAgent from './root.js'
+import EmbeddedAgent from './embedded.js'
+import embed from './embed.js'
+
+export default function() {
+  let embedded
+
+  try { embedded = window.self !== window.top }
+  catch (e) { embedded = true }
+
+  window.Agent = embedded ? EmbeddedAgent() : RootAgent()
+  Agent.embed = embed
+}

package/agents/browser/{experience.js → embed.js}

@@ -4,7 +4,7 @@ const copy = x => JSON.parse(JSON.stringify(x))
 
 const watchers = {}
 
-export default function Experience(environment, iframe) {
+export default function embed(environment, iframe) {
   const postMessageQueue = []
   let frameLoaded = false
   let embeddedAgentInitialized = false
@@ -24,10 +24,6 @@ export default function Experience(environment, iframe) {
     }
   }
 
-  this.remove = () => {
-    if (iframe.parentNode) iframe.parentNode.removeChild(iframe)
-  }
-
   const handleMessage = async message => {
     const { requestId, type } = message
 
@@ -122,5 +118,11 @@ export default function Experience(environment, iframe) {
       }
     })
 
-  return this
+  function remove () {
+    if (iframe.parentNode) iframe.parentNode.removeChild(iframe)
+  }
+
+  return {
+    remove
+  }
 }

package/agents/browser/embedded.js

@@ -1,6 +1,5 @@
 import { v1 as uuid } from 'uuid'
 import MutableProxy from '../../persistence/json.js'
-import Experience from './experience.js'
 
 export default function EmbeddedAgent() {
   let messageIndex = 0
@@ -145,18 +144,17 @@ export default function EmbeddedAgent() {
   function reconnect() { return send({ type: 'reconnect' }) }
 
   return {
+    environment,
     login,
     logout,
-    environment,
     state,
-    mutate,
-    patch,
-    interact,
-    metadata,
     upload,
     download,
+    interact,
+    patch,
+    mutate,
+    metadata,
     disconnect,
-    reconnect,
-    Experience
+    reconnect
   }
 }

package/agents/browser/firebase-auth.js

@@ -1,4 +1,4 @@
-import { initializeApp } from 'npm/unscoped/firebase/9.12.1/app'
+import { initializeApp } from 'firebase/app'
 import {
   getAuth,
   signOut as firebaseSignOut,
@@ -8,7 +8,7 @@ import {
   signInWithRedirect,
   signInWithEmailAndPassword,
   signInAnonymously
-} from 'npm/unscoped/firebase/9.12.1/auth'
+} from 'firebase/auth'
 
 initializeApp({
   "apiKey": "AIzaSyAxjYuF-2JmXxlXnGgNu2CO4Q41EAtUgrY",

package/agents/browser/root.js

@@ -1,22 +1,17 @@
-import { v1 as uuid } from 'npm/unscoped/uuid/9.0.0'
-import { applyPatch } from 'npm/unscoped/fast-json-patch/3.1.1'
+import { v1 as uuid } from 'uuid'
+import { applyPatch } from 'fast-json-patch'
 import { onAuth, login, logout } from './firebase-auth.js'
 import GenericAgent from '../generic.js'
-import Experience from './experience.js'
 
-const Agent = new GenericAgent({
-    host: window.location.host,
-    protocol: window.location.protocol === 'https:' ? 'wss' : 'ws',
-    token: new Promise(r => onAuth(({ getIdToken: g }) => r(g()))),
-    WebSocket,
-    uuid,
-    fetch,
-    applyPatch,
-    login,
-    logout,
-    reboot: () => window.location.reload()
+export default () => GenericAgent({
+  host: window.location.host,
+  protocol: window.location.protocol === 'https:' ? 'wss' : 'ws',
+  token: new Promise(r => onAuth(({ getIdToken: g }) => r(g()))),
+  WebSocket,
+  uuid,
+  fetch,
+  applyPatch,
+  login,
+  logout,
+  reboot: () => window.location.reload()
 })
-
-Agent.Experience = Experience
-
-export default Agent

package/agents/generic.js

@@ -28,7 +28,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
   let resolveEnvironment
   let disconnected = false
   let failedConnections = 0
-  const environment = new Promise(r => resolveEnvironment = r)
+  const environmentPromise = new Promise(r => resolveEnvironment = r)
 
   const sessionData = new MutableProxy({}, patch => queueMessage({scope: 'sessions', patch}))
 
@@ -45,21 +45,6 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     else console.warn('TRIED TO REMOVE WATCHER THAT DOES NOT EXIST')
   }
 
-  this.environment = function () { return environment }
-
-  this.state = state
-  this.upload = upload
-  this.download = download
-  this.interact = interact
-  this.patch = patch
-  this.mutate = mutate
-  this.metadata = metadata
-
-  this.login = login
-  this.logout = logout
-  this.disconnect = disconnect
-  this.reconnect = reconnect
-
   console.log('INITIALIZING AGENT CONNECTION')
   initWS()
 
@@ -168,13 +153,15 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     }
   }
 
+  function environment() { return environmentPromise }
+
   function state(scope, u, d) {
     let watchFn
     let resolveKey
     const key = new Promise(r => resolveKey = r)
 
     const promise = new Promise(async resolveState => {
-      await environment // environment not set until first connection
+      await environmentPromise // environment not set until first connection
 
       if (!u) u = user
       if (!d) d = domain
@@ -267,7 +254,7 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     queueMessage({scope, patch})
     const response = lastMessageResponse()
 
-    await environment
+    await environmentPromise
 
     const key = `${domain}/${user}/${scope}`
 
@@ -315,5 +302,18 @@ export default function Agent({ host, token, WebSocket, protocol='ws', uuid, fet
     initWS()
   }
 
-  return this
+  return {
+    environment,
+    login,
+    logout,
+    state,
+    upload,
+    download,
+    interact,
+    patch,
+    mutate,
+    metadata,
+    disconnect,
+    reconnect
+  }
 }

package/package/browser.js

@@ -1,5 +1,5 @@
 //  TODO: export browser, node, deno, and generic agents
-export { default as BrowserAgent } from '../agents/browser/embedded.js'
+export { default as BrowserAgent } from '../agents/browser/root.js'
 export { default as GenericAgent } from '../agents/generic.js'
 export { default as vuePersistentStore } from '../persistence/vuex.js'
 export { default as vueContentComponent } from '../vue/3/content.vue'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@knowlearning/agents",
-    "version": "0.1.6",
+    "version": "0.2.0",
     "description": "API for embedding applications in KnowLearning systems.",
     "main": "package/node.js",
     "browser": "package/browser.js",
@@ -25,7 +25,8 @@
     "dependencies": {
       "fast-json-patch": "^3.1.1",
       "node-fetch": "^3.3.1",
-      "uuid": "^8.3.2"
+      "uuid": "^8.3.2",
+      "firebase": "^9.12.1"
     }
   }
   

package/persistence/json.js

@@ -32,14 +32,6 @@ export default function MutableProxy(state, interact, ephemeralPaths={}, parentP
 
   const traps = {
     set(target, prop, value) {
-      const path = [...parentPath, prop]
-      const serializedPath = serializePath(path)
-
-      if (ephemeralPaths[serializedPath]) {
-        target[prop] = value
-        return true
-      }
-
       if (isArray) {
         if (!/^\d+$/.test(prop)) {
           target[prop] = value
@@ -48,6 +40,14 @@ export default function MutableProxy(state, interact, ephemeralPaths={}, parentP
         else prop = parseInt(prop)
       }
 
+      const path = [...parentPath, prop]
+      const serializedPath = serializePath(path)
+
+      if (ephemeralPaths[serializedPath]) {
+        target[prop] = value
+        return true
+      }
+
       if (value === undefined) {
         console.log('EXTRA ERROR INFO. target, prop, value', target, prop, value)
         throw new Error(`Setting properties to undefined is not supported. Please use a delete statement. Attempted to set ${serializedPath}`)

package/vue/3/content.vue

@@ -19,7 +19,7 @@ export default {
     }
   },
   unmounted() {
-    if (this.experience) this.experience.remove()
+    if (this.embedding) this.embedding.remove()
   },
   methods: {
     setup(iframe) {
@@ -27,10 +27,10 @@ export default {
 
       const { id, scope } = this
       this.iframe = iframe
-      this.experience = new Agent.Experience({ content: id, scope }, iframe)
+      this.embedding = new Agent.embed({ content: id, scope }, iframe)
 
 /*
-      const { handle } = this.experience
+      const { handle } = this.embedding
       //  if save or edit are listened to, attach handler
       if (this.$attrs.onSave) {
         handle('save', () => new Promise((resolve, reject) => this.$emit('save', { resolve, reject })))