update

Author: LeiCraft

server/agent-control-service/agent.ts

@@ -1,22 +1,29 @@
 import { EncodingUtils } from "@/shared/encoding";
-import WebSocket from "crossws/websocket";
 import { AgentCMDRegistry } from "./commands/registry";
 import { AgentCommand } from "./commands/message";
 import { AgentControlService } from ".";
 
 export type AgentID = number;
 export type AgentsDB = Map<AgentID, ControllableAgent>;
 
+type Socket = {
+    websocket: {
+        readyState?: number | undefined;
+    }
+    send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void;
+    close(): void;
+}
+
 type ControllableOnlineAgent = ControllableAgent & {
     peerID: string;
-    socket: WebSocket;
+    socket: Socket;
 }
 
 
 export class ControllableAgent implements ControllableAgent.IConfig {
 
     public peerID: string | null = null;
-    public socket: WebSocket | null = null;
+    public socket: Socket | null = null;
 
     public onMessage: ((data: string) => void) | null = null;
 
@@ -33,7 +40,7 @@ export class ControllableAgent implements ControllableAgent.IConfig {
     }
 
     public isOnline(): this is ControllableOnlineAgent {
-        return this.socket !== null && this.peerID !== null && this.socket.readyState === WebSocket.OPEN;
+        return this.socket !== null && this.peerID !== null && this.socket.websocket.readyState === WebSocket.OPEN;
     }
 
     async sendCommand<C extends AgentCMDRegistry.Commands>(command: C, payload: AgentCMDRegistry.Payload<C>, withResponse?: true): Promise<AgentCMDRegistry.Response<C> | null>;

server/agent-control-service/server.ts

@@ -58,8 +58,7 @@ function ControlServiceServerHandlerFactory(clients: Map<string, ControllableAge
             }
 
             agent.peerID = peer.id;
-            agent.socket = peer.websocket as WebSocket;
-            console.log(peer.send("Welcome Agent"));
+            agent.socket = peer;
             clients.set(peer.id, agent);
             Logger.log(`Agent '${agent.id}' connected`);
         },