clean unneeded stuff

client/src/AdriftClient.ts

@@ -5,8 +5,8 @@ import {
   GetRequestHeadersCallback,
   MetaCallback,
   ReadyStateCallback,
+  WebSocketFields,
   WebSocketImpl,
-  WebSocketFields
 } from "bare-client-custom";
 import { Connection } from "./Connection";
 
@@ -67,6 +67,7 @@ export class AdriftBareClient extends Client {
       headers,
     }) as BareResponse;
   }
+
   connect(
     remote: URL,
     protocols: string[],
@@ -75,34 +76,36 @@ export class AdriftBareClient extends Client {
     onReadyState: ReadyStateCallback,
     webSocketImpl: WebSocketImpl
   ): WebSocket {
-    const ws = new WebSocket("ws:null");
+    const ws = new webSocketImpl("ws:null", protocols);
     // this will error. that's okay
 
+    let send = this.connection.wsconnect(
+      remote,
+      () => {
+        onReadyState(WebSocketFields.OPEN);
+        ws.dispatchEvent(new Event("open"));
+      },
+      () => {
+        onReadyState(WebSocketFields.CLOSED);
+        ws.dispatchEvent(new Event("close"));
 
-    let send = this.connection.wsconnect(remote, () => {
+        // what do i do for WebSocketFields.closing?
-      onReadyState(WebSocketFields.OPEN);
+      },
-      ws.dispatchEvent(new Event('open'));
+      (data) => {
+        ws.dispatchEvent(
+          new MessageEvent("message", {
+            data,
+          })
+        );
+      }
+    );
 
-    }, () => {
-      onReadyState(WebSocketFields.CLOSED);
-      ws.dispatchEvent(new Event('close'));
-
-      // what do i do for WebSocketFields.closing?
-    }, (data) => {
-      ws.dispatchEvent(new MessageEvent("message", {
-        data,
-        // might be other shit here idk
-      }));
-    });
 
     (ws as any).__defineGetter__("send", () => (data: any) => {
       send(data);
     });
     (ws as any).__defineSetter__("send", () => { });
 
-
-
-
     return ws;
   }
 }

server/src/main.ts

@@ -4,10 +4,10 @@ import expressWs from "express-ws";
 
 import { signInWithEmailAndPassword } from "firebase/auth";
 import wrtc from "wrtc";
-import { Client } from "./client";
 
 import { auth } from "firebase-config";
 import { getDatabase, onValue, ref, set } from "firebase/database";
+import { AdriftServer } from "./server";
 
 const configuration = {
   iceServers: [
@@ -98,20 +98,20 @@ async function answerRtc(data: any, onrespond: (answer: any) => void) {
       }
     });
 
-    let client: Client;
+    let server: AdriftServer;
 
     dataChannel.onopen = () => {
       console.log("opened");
-      client = new Client((msg) => dataChannel.send(msg));
+      server = new AdriftServer((msg) => dataChannel.send(msg));
     };
     dataChannel.onclose = () => {
       console.log("closed");
-      client.onClose();
+      server.onClose();
     };
     dataChannel.onmessage = (event) => {
       console.log("messaged");
       if (event.data instanceof Buffer) {
-        client.onMsg(bufferToArrayBuffer(event.data));
+        server.onMsg(bufferToArrayBuffer(event.data));
       }
       throw new Error("Unexpected datachannel message type");
     };
@@ -127,7 +127,7 @@ app.post("/connect", (req, res) => {
 
 app.ws("/dev-ws", (ws, _req) => {
   console.log("ws connect");
-  const client = new Client((msg) => ws.send(msg));
+  const client = new AdriftServer((msg) => ws.send(msg));
 
   ws.on("message", (msg) => {
     if (typeof msg === "string") {

server/src/server.ts

@@ -12,7 +12,21 @@ import {
 import { Readable } from "stream";
 import { BareError, bareFetch, options } from "./http";
 
-export class Client {
+function bareErrorToResponse(e: BareError): {
+  payload: HTTPResponsePayload;
+  body: AsyncIterable<ArrayBuffer>;
+} {
+  return {
+    payload: {
+      status: e.status,
+      statusText: STATUS_CODES[e.status] || "",
+      headers: {},
+    },
+    body: Readable.from(JSON.stringify(e.body)),
+  };
+}
+
+export class AdriftServer {
   send: (msg: ArrayBuffer) => void;
   events: EventEmitter;
 
@@ -58,20 +72,6 @@ export class Client {
     return payload;
   }
 
-  static bareErrorToResponse(e: BareError): {
-    payload: HTTPResponsePayload;
-    body: AsyncIterable<ArrayBuffer>;
-  } {
-    return {
-      payload: {
-        status: e.status,
-        statusText: STATUS_CODES[e.status] || "",
-        headers: {},
-      },
-      body: Readable.from(JSON.stringify(e.body)),
-    };
-  }
-
   async handleHTTPRequest(payload: HTTPRequestPayload): Promise<{
     payload: HTTPResponsePayload;
     body: AsyncIterable<ArrayBuffer>;
@@ -93,7 +93,7 @@ export class Client {
       );
     } catch (e) {
       if (e instanceof BareError) {
-        return Client.bareErrorToResponse(e);
+        return bareErrorToResponse(e);
       }
       this.events.off("close", onClose);
       throw e;
@@ -149,7 +149,7 @@ export class Client {
   }
 
   async onMsg(msg: ArrayBuffer) {
-    const init = Client.parseMsgInit(msg);
+    const init = AdriftServer.parseMsgInit(msg);
     if (!init) return;
     const { cursor, seq, op } = init;
     switch (op) {
@@ -158,7 +158,7 @@ export class Client {
           payload: HTTPResponsePayload;
           body: AsyncIterable<ArrayBuffer>;
         };
-        const reqPayload = Client.parseHttpReqPayload(msg.slice(cursor));
+        const reqPayload = AdriftServer.parseHttpReqPayload(msg.slice(cursor));
         if (!reqPayload) return;
         try {
           resp = await this.handleHTTPRequest(reqPayload);
@@ -184,7 +184,7 @@ export class Client {
             });
           }
 
-          resp = Client.bareErrorToResponse(bareError);
+          resp = bareErrorToResponse(bareError);
         }
 
         const { payload, body } = resp;