refactorings

Author: Septias

backend/message.test.ts

@@ -62,22 +62,20 @@ test("Send realtime", () => {
   const client0Heard: string[] = [];
   const client1Heard: string[] = [];
 
-  /* const rt0 = client0.joinRealtimeChannel()
-  const rt1 = client1.joinRealtimeChannel()
-
   const decoder = new TextDecoder()
-  rt0.setListener((data) => { client0Heard.push(decoder.decode(data)) })
-  rt1.setListener((data) => { client1Heard.push(decoder.decode(data)) })
+  client0.connectRealtime((data) => { client0Heard.push(decoder.decode(data)); return true })
+  client1.connectRealtime((data) => { client1Heard.push(decoder.decode(data)); return true })
 
   const encoder = new TextEncoder()
 
-  rt0.send(new Uint8Array(encoder.encode("hi")))
+  client0.sendRealtimeData(new Uint8Array(encoder.encode("hi")))
 
   expect(client1Heard).toMatchObject([
     "hi"
   ])
-  expect(client0Heard).toMatchObject([]) */
+  expect(client0Heard).toMatchObject([])
 });
+
 test("distribute to self and other", () => {
   const [getMessages, onMessage] = track();
   const processor = createProcessor(onMessage);

backend/message.ts

@@ -11,7 +11,7 @@ type UpdateListenerMulti = (updates: ReceivedStatusUpdate<any>[]) => boolean;
 
 type ClearListener = () => boolean;
 type DeleteListener = () => boolean;
-type RealtimeListenerListener = (data: Uint8Array) => boolean;
+type RTListener = (data: Uint8Array) => boolean;
 
 type Connect = (
   updateListener: UpdateListenerMulti,
@@ -22,7 +22,7 @@ type Connect = (
 
 export type WebXdcMulti = {
   connect: Connect;
-  connectRealtime: (listener: RealtimeListenerListener) => void;
+  connectRealtime: (listener: RTListener) => void;
   sendUpdate: Webxdc<any>["sendUpdate"];
   sendRealtimeData: (data: Uint8Array) => void;
 };
@@ -37,51 +37,9 @@ export interface IProcessor {
   removeClient(id: string): void;
 }
 
-export class RealtimeListener implements WebxdcRealtimeListener {
-  private trashed = false;
-  private listener: (data: Uint8Array) => void = () => {};
-
-  constructor(
-    public sendHook: (data: Uint8Array) => void = () => {},
-    public setListenerHook: () => void = () => {},
-    private leaveHook: () => void = () => {},
-  ) {}
-
-  is_trashed(): boolean {
-    return this.trashed;
-  }
-
-  receive(data: Uint8Array) {
-    if (this.trashed) {
-      throw new Error("realtime listener is trashed and can no longer be used");
-    }
-    if (this.listener) {
-      this.listener(data);
-    }
-  }
-
-  setListener(listener: (data: Uint8Array) => void) {
-    this.setListenerHook();
-    this.listener = listener;
-  }
-
-  send(data: Uint8Array) {
-    if (!(data instanceof Uint8Array)) {
-      throw new Error("realtime listener data must be a Uint8Array");
-    }
-    this.sendHook(data);
-  }
-
-  leave() {
-    this.leaveHook();
-    this.trashed = true;
-  }
-}
-
 class Client implements WebXdcMulti {
   updateListener: UpdateListenerMulti | null = null;
-  realtimeListener: RealtimeListenerListener | null = null;
-  realtime: RealtimeListener | null = null;
+  realtimeListener: RTListener | null = null;
   clearListener: ClearListener | null = null;
   updateSerial: number | null = null;
   deleteListener: DeleteListener | null = null;
@@ -95,11 +53,11 @@ class Client implements WebXdcMulti {
     this.processor.distribute(this.id, update);
   }
 
-  sendRealtimeData(data: Uint8Array): void {
+  sendRealtimeData(data: Uint8Array){
     this.processor.distributeRealtime(this.id, data);
   }
 
-  connectRealtime(listener: RealtimeListenerListener) {
+  connectRealtime(listener: RTListener) {
     this.processor.onMessage({
       type: "connect-realtime",
       instanceId: this.id,

sim/create.ts

@@ -1,12 +1,11 @@
-import { Webxdc, ReceivedStatusUpdate } from "@webxdc/types";
-import { RealtimeListener as RTL } from "../backend/message";
+import { Webxdc, ReceivedStatusUpdate, RealtimeListener as WebxdcRealtimeListener } from "@webxdc/types";
 type UpdatesMessage = {
   type: "updates";
   updates: ReceivedStatusUpdate<any>[];
 };
 
-type SendRealtimeMessage = {
-  type: "sendRealtime";
+type RealtimeMessage = {
+  type: "realtime";
   data: Uint8Array;
 };
 
@@ -33,7 +32,7 @@ type Message =
   | ClearMessage
   | InfoMessage
   | DeleteMessage
-  | SendRealtimeMessage;
+  | RealtimeMessage;
 
 export type TransportMessageCallback = (message: Message) => void;
 
@@ -52,12 +51,54 @@ export type Transport = {
 
 type Log = (...args: any[]) => void;
 
+export class RealtimeListener implements WebxdcRealtimeListener {
+  private trashed = false;
+  private listener: (data: Uint8Array) => void = () => {};
+
+  constructor(
+    public sendHook: (data: Uint8Array) => void = () => {},
+    public setListenerHook: () => void = () => {},
+    private leaveHook: () => void = () => {},
+  ) {}
+
+  is_trashed(): boolean {
+    return this.trashed;
+  }
+
+  receive(data: Uint8Array) {
+    if (this.trashed) {
+      throw new Error("realtime listener is trashed and can no longer be used");
+    }
+    if (this.listener) {
+      this.listener(data);
+    }
+  }
+
+  setListener(listener: (data: Uint8Array) => void) {
+    this.setListenerHook();
+    this.listener = listener;
+  }
+
+  send(data: Uint8Array) {
+    if (!(data instanceof Uint8Array)) {
+      throw new Error("realtime listener data must be a Uint8Array");
+    }
+    this.sendHook(data);
+  }
+
+  leave() {
+    this.leaveHook();
+    this.trashed = true;
+  }
+}
+
 export function createWebXdc(
   transport: Transport,
   log: Log = () => {},
 ): Webxdc<any> {
   let resolveUpdateListenerPromise: (() => void) | null = null;
-  let realtime: RTL | null = null;
+  let realtime: RealtimeListener | null = null;
+  
   const webXdc: Webxdc<any> = {
     sendUpdate: (update) => {
       transport.send({ type: "sendUpdate", update });
@@ -208,7 +249,7 @@ export function createWebXdc(
     },
 
     joinRealtimeChannel: () => {
-      realtime = new RTL(
+      realtime = new RealtimeListener(
         () => {},
         () => {
           transport.send({ type: "setRealtimeListener" });
@@ -219,7 +260,7 @@ export function createWebXdc(
       );
       transport.onConnect(() => {
         realtime!.sendHook = (data) => {
-          transport.send({ type: "sendRealtime", data } as SendRealtimeMessage);
+          transport.send({ type: "realtime", data } as RealtimeMessage);
           log("send realtime", { data });
         };
       });
@@ -241,8 +282,8 @@ function isUpdatesMessage(data: Message): data is UpdatesMessage {
   return data.type === "updates";
 }
 
-function isRealtimeMessage(data: Message): data is SendRealtimeMessage {
-  return data.type === "sendRealtime";
+function isRealtimeMessage(data: Message): data is RealtimeMessage {
+  return data.type === "realtime";
 }
 
 function isClearMessage(data: Message): data is ClearMessage {