@knowlearning/agents 0.9.139 → 0.9.141

package/agents/browser/root.js

@@ -11,14 +11,35 @@ function isLocal() { return localStorage.getItem('api') === 'local' }
 
 const API_HOST = isLocal() ? DEVELOPMENT_HOST : REMOTE_HOST
 
-//  TODO: remove this hack when we can set sid cookie through websocket handshake
-fetch(`http${ SECURE ? 's' : '' }://${API_HOST}/_sid-check`, { method: 'GET', credentials: 'include' })
-  .then(response => response.status === 201 && location.reload())
+//  TODO: remove this hack when we can set partitioned sid cookie through websocket handshake
+//        deno is partly in the way on teh set side, and browser support is in the way for
+//        the client side.
+async function ensureSidEstablished() {
+  const response = await fetch(`http${ SECURE ? 's' : '' }://${API_HOST}/_sid-check`, { method: 'GET', credentials: 'include' })
+  const hasLocalStorageSID = !!localStorage.getItem('sid')
+  if (response.status === 201) {
+    if (!hasLocalStorageSID) {
+      const sentSid = await response.text()
+      localStorage.setItem('sid', sentSid)
+      location.reload()
+    }
+  }
+  else if (response.status === 200) {
+    //  if we reach here, assumably the server has seen an sid cookie
+    if (hasLocalStorageSID) {
+      localStorage.removeItem('sid')
+      location.reload()
+    }
+  }
+  else {
+    console.warn('Issue Connecting To the API Server')
+  }
+}
 
 export default options => {
-  const { host } = window.location
-
+  ensureSidEstablished()
   const Connection = function () {
+
     const ws = new WebSocket(`ws${ SECURE ? 's' : '' }://${API_HOST}`)
 
     this.send = message => ws.send(JSON.stringify(message))
@@ -37,6 +58,7 @@ export default options => {
 
   const agent = GenericAgent({
     token: options.getToken || getToken,
+    sid: () => localStorage.getItem('sid'),
     domain: window.location.host,
     Connection,
     uuid,

package/agents/generic/index.js

@@ -9,11 +9,10 @@ import downloadImplementation from '../download.js'
 //       for resoling default scope in context
 const DEFAULT_SCOPE_NAME = '[]'
 const UPLOAD_TYPE = 'application/json;type=upload'
-const POSTGRES_QUERY_TYPE = 'application/json;type=postgres-query'
 const TAG_TYPE = 'application/json;type=tag'
 const DOMAIN_CLAIM_TYPE = 'application/json;type=domain-claim'
 
-export default function Agent({ Connection, domain, token, uuid, fetch, applyPatch, login, logout, reboot, handleDomainMessage, log:passedLog=console.log }) {
+export default function Agent({ Connection, domain, token, sid, uuid, fetch, applyPatch, login, logout, reboot, handleDomainMessage, log:passedLog=console.log }) {
   const states = {}
   const watchers = {}
   const keyToSubscriptionId = {}
@@ -29,7 +28,7 @@ export default function Agent({ Connection, domain, token, uuid, fetch, applyPat
     reconnect,
     synced,
     environment
-  ] = messageQueue({ token, domain, Connection, watchers, states, applyPatch, log, login, interact, reboot, trigger, handleDomainMessage })
+  ] = messageQueue({ token, sid, domain, Connection, watchers, states, applyPatch, log, login, interact, reboot, trigger, handleDomainMessage })
 
   // initialize session
   environment()

package/agents/generic/message-queue.js

@@ -8,7 +8,7 @@ function activePatch(patch) {
   return structuredClone(patch).filter(({ path }) => 'active' === path.shift())
 }
 
-export default function messageQueue({ token, domain, Connection, watchers, states, applyPatch, log, login, reboot, handleDomainMessage, trigger }) {
+export default function messageQueue({ token, sid, domain, Connection, watchers, states, applyPatch, log, login, reboot, handleDomainMessage, trigger }) {
   let connection
   let user
   let authed = false
@@ -115,7 +115,7 @@ export default function messageQueue({ token, domain, Connection, watchers, stat
       if (!sessionMetrics.connected) sessionMetrics.connected = Date.now()
       log('AUTHORIZING NEWLY OPENED CONNECTION FOR SESSION:', session)
       failedConnections = 0
-      connection.send({ token: await token(), session, domain })
+      connection.send({ token: await token(), sid: await sid?.(), session, domain })
     }
 
     connection.onmessage = async message => {

package/package.json

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