@knowlearning/agents 0.9.180 → 0.9.182

package/agents/browser/root.js

@@ -2,19 +2,22 @@ import { v1 as uuid } from 'uuid'
 import { applyPatch } from 'fast-json-patch'
 import { getToken, login, logout } from './auth.js'
 import GenericAgent from '../generic/index.js'
+import { io } from 'socket.io-client'
 
 const TEST_DOMAIN = 'tests.knowlearning.systems'
 const LANGUAGES = [...navigator.languages]
 
-const API_HOST = localStorage.getItem('API_HOST') || 'api.knowlearning.systems'
-//  const API_HOST = 'api-test.knowlearning.systems'
-//const API_HOST = 'localhost:8765'
+const API_HOST = localStorage.getItem('API_HOST') || 'socket-io.knowlearning.systems'
+// const API_HOST = 'api-test.knowlearning.systems'
+// const API_HOST = 'localhost:8765'
 
-//  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.
+// TODO: remove sid hack when partitioned cookies via WS handshakes are supported
 async function ensureSidEstablished() {
-  const response = await fetch(`https://${API_HOST}/_sid-check`, { method: 'GET', credentials: 'include' })
+  const response = await fetch(`https://${API_HOST}/_sid-check`, {
+    method: 'GET',
+    credentials: 'include'
+  })
+
   const hasLocalStorageSID = !!localStorage.getItem('sid')
   if (response.status === 201) {
     if (!hasLocalStorageSID) {
@@ -24,7 +27,6 @@ async function ensureSidEstablished() {
     }
   }
   else if (response.status === 200) {
-    //  if we reach here, assumably the server has seen an sid cookie
     if (hasLocalStorageSID) {
       localStorage.removeItem('sid')
       location.reload()
@@ -37,20 +39,44 @@ async function ensureSidEstablished() {
 
 export default options => {
   ensureSidEstablished()
+
   const Connection = function () {
+    const sid = localStorage.getItem('sid')
+
+    // socket.io client connection
+    const socket = io(`https://${API_HOST}`, {
+      withCredentials: true,
+      extraHeaders: sid ? { sid } : {}
+    })
 
-    const ws = new WebSocket(`wss://${API_HOST}`)
+    this.send = message => {
+      try {
+        socket.emit('message', message)
+      } catch (err) {
+        console.warn('Error sending via socket.io', err)
+      }
+    }
 
-    this.send = message => ws.send(JSON.stringify(message))
     this.close = info => {
       this.send({ type: 'close', info })
-      ws.close()
+      socket.disconnect()
     }
 
-    ws.onopen = () => this.onopen()
-    ws.onmessage = ({ data }) => this.onmessage(data.length === 0 ? null : JSON.parse(data))
-    ws.onerror = error => this.onerror && this.onerror(error)
-    ws.onclose = error => this.onclose && this.onclose(error)
+    socket.on('connect', () => {
+      if (this.onopen) this.onopen()
+    })
+
+    socket.on('message', (data) => {
+      if (this.onmessage) this.onmessage(data)
+    })
+
+    socket.on('error', (err) => {
+      if (this.onerror) this.onerror(err)
+    })
+
+    socket.on('disconnect', (reason) => {
+      if (this.onclose) this.onclose(reason)
+    })
 
     return this
   }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@knowlearning/agents",
-  "version": "0.9.180",
+  "version": "0.9.182",
   "description": "API for embedding applications in KnowLearning systems.",
   "main": "node.js",
   "browser": "browser.js",
   "type": "module",
+  "types": "types.d.ts",
   "directories": {
     "example": "examples",
     "test": "test"
@@ -25,6 +26,7 @@
   "dependencies": {
     "@knowlearning/patch-proxy": "^1.3.4",
     "fast-json-patch": "^3.1.1",
+    "socket.io-client": "^4.8.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

package/{browser.d.ts → types.d.ts}

@@ -19,12 +19,12 @@ export interface AgentEnvironment {
 }
 
 export interface AgentUploadInfo {
-  name?: string,
-  type?: string,
-  data?: string | ArrayBuffer,
-  id?: string,
-  browser?: boolean,
-  accept?: string,
+  name?: string;
+  type?: string;
+  data?: string | ArrayBuffer;
+  id?: string;
+  browser?: boolean;
+  accept?: string;
 }
 
 export interface Agent {