Merge pull request #171 from caleb-mabry/beginSender

Grouping Sending Functions

22 files changed, 231 insertions, 176 deletions

diff --git a/webAO/client.ts b/webAO/client.ts
index 62539ea..4d01cfd 100644
--- a/webAO/client.ts
+++ b/webAO/client.ts
@@ -7,6 +7,7 @@
 import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import vanilla_background_arr from "./constants/backgrounds.js";
 import vanilla_evidence_arr from "./constants/evidence.js";
+import {sender, ISender} from './client/sender/index'
 import iniParse from "./iniParse";
 import getCookie from "./utils/getCookie";
 import setCookie from "./utils/setCookie";
@@ -87,13 +88,18 @@ function isLowMemory() {
 }
 
 const fpPromise = FingerprintJS.load();
+const connect = (address: string) => {
 
+}
 fpPromise
   .then((fp) => fp.get())
   .then((result) => {
     hdid = result.visitorId;
     console.log("NEW CLIENT");
+
+    // Create the new client and connect it
     client = new Client(serverIP);
+    client.connect()
 
     isLowMemory();
     client.loadResources();
@@ -123,56 +129,51 @@ class Client extends EventEmitter {
   resources: any;
   selectedEmote: number;
   selectedEvidence: number;
+  sender: ISender;
   checkUpdater: any;
   _lastTimeICReceived: any;
   viewport: Viewport;
+  connect: () => void;
   constructor(address: string) {
     super();
-    if (mode !== "replay") {
-      this.serv = new WebSocket(`ws://${address}`);
-      // Assign the websocket events
-      this.serv.addEventListener("open", this.emit.bind(this, "open"));
-      this.serv.addEventListener("close", this.emit.bind(this, "close"));
-      this.serv.addEventListener("message", this.emit.bind(this, "message"));
-      this.serv.addEventListener("error", this.emit.bind(this, "error"));
-    } else {
-      this.joinServer();
-    }
 
-    this.on("open", this.onOpen.bind(this));
-    this.on("close", this.onClose.bind(this));
-    this.on("message", this.onMessage.bind(this));
-    this.on("error", this.onError.bind(this));
-
-    // Preset some of the variables
+    this.connect = () => {
+      this.on("open", this.onOpen.bind(this));
+      this.on("close", this.onClose.bind(this));
+      this.on("message", this.onMessage.bind(this));
+      this.on("error", this.onError.bind(this));
+      if (mode !== "replay") {
+        this.serv = new WebSocket(`ws://${address}`);
+        // Assign the websocket events
+        this.serv.addEventListener("open", this.emit.bind(this, "open"));
+        this.serv.addEventListener("close", this.emit.bind(this, "close"));
+        this.serv.addEventListener("message", this.emit.bind(this, "message"));
+        this.serv.addEventListener("error", this.emit.bind(this, "error"));
+      } else {
+        this.joinServer();
+      }
+    }
 
     this.hp = [0, 0];
-
     this.playerID = 1;
     this.charID = -1;
     this.char_list_length = 0;
     this.evidence_list_length = 0;
     this.music_list_length = 0;
     this.testimonyID = 0;
-
     this.chars = [];
     this.emotes = [];
     this.evidences = [];
     this.areas = [];
     this.musics = [];
-
     this.musics_time = false;
-
     this.callwords = [];
-
     this.resources = getResources(AO_HOST, THEME);
-
     this.selectedEmote = -1;
     this.selectedEvidence = 0;
-
     this.checkUpdater = null;
+    this.sender = sender
     this.viewport = masterViewport(this);
-
     this._lastTimeICReceived = new Date(0);
   }
 
@@ -199,13 +200,7 @@ class Client extends EventEmitter {
       : 0;
   }
 
-  /**
-   * Hook for sending messages to the server
-   * @param {string} message the message to send
-   */
-  sendServer(message: string) {
-    mode === "replay" ? this.sendSelf(message) : this.serv.send(message);
-  }
+
 
   /**
    * Hook for sending messages to the client
@@ -217,17 +212,6 @@ class Client extends EventEmitter {
   }
 
   /**
-   * Hook for sending messages to the client
-   * @param {string} message the message to send
-   */
-  sendSelf(message: string) {
-    (<HTMLInputElement>(
-      document.getElementById("client_ooclog")
-    )).value += `${message}\r\n`;
-    this.handleSelf(message);
-  }
-
-  /**
    * Sends an out-of-character chat message.
    * @param {string} message the message to send
    */
@@ -253,110 +237,11 @@ class Client extends EventEmitter {
         // Command Not Recognized
       }
     } else {
-      this.sendServer(`CT#${oocName}#${oocMessage}#%`);
+      this.sender.sendServer(`CT#${oocName}#${oocMessage}#%`);
     }
   }
 
-  /**
-   * Sends an in-character chat message.
-   * @param {number} deskmod controls the desk
-   * @param {string} speaking who is speaking
-   * @param {string} name the name of the current character
-   * @param {string} silent whether or not it's silent
-   * @param {string} message the message to be sent
-   * @param {string} side the name of the side in the background
-   * @param {string} sfx_name the name of the sound effect
-   * @param {number} emote_modifier whether or not to zoom
-   * @param {number} sfx_delay the delay (in milliseconds) to play the sound effect
-   * @param {number} objection_modifier the number of the shout to play
-   * @param {string} evidence the filename of evidence to show
-   * @param {boolean} flip change to 1 to reverse sprite for position changes
-   * @param {boolean} realization screen flash effect
-   * @param {number} text_color text color
-   * @param {string} showname custom name to be displayed (optional)
-   * @param {number} other_charid paired character (optional)
-   * @param {number} self_offset offset to paired character (optional)
-   * @param {number} noninterrupting_preanim play the full preanim (optional)
-   */
-  sendIC(
-    deskmod: number,
-    preanim: string,
-    name: string,
-    emote: string,
-    message: string,
-    side: string,
-    sfx_name: string,
-    emote_modifier: number,
-    sfx_delay: number,
-    objection_modifier: number,
-    evidence: number,
-    flip: boolean,
-    realization: boolean,
-    text_color: number,
-    showname: string,
-    other_charid: string,
-    self_hoffset: number,
-    self_yoffset: number,
-    noninterrupting_preanim: boolean,
-    looping_sfx: boolean,
-    screenshake: boolean,
-    frame_screenshake: string,
-    frame_realization: string,
-    frame_sfx: string,
-    additive: boolean,
-    effect: string
-  ) {
-    let extra_cccc = "";
-    let other_emote = "";
-    let other_offset = "";
-    let extra_27 = "";
-    let extra_28 = "";
-
-    if (extrafeatures.includes("cccc_ic_support")) {
-      const self_offset = extrafeatures.includes("y_offset")
-        ? `${self_hoffset}<and>${self_yoffset}`
-        : self_hoffset; // HACK: this should be an & but client fucked it up and all the servers adopted it
-      if (mode === "replay") {
-        other_emote = "##";
-        other_offset = "#0#0";
-      }
-      extra_cccc = `${escapeChat(
-        showname
-      )}#${other_charid}${other_emote}#${self_offset}${other_offset}#${Number(
-        noninterrupting_preanim
-      )}#`;
-
-      if (extrafeatures.includes("looping_sfx")) {
-        extra_27 = `${Number(looping_sfx)}#${Number(
-          screenshake
-        )}#${frame_screenshake}#${frame_realization}#${frame_sfx}#`;
-        if (extrafeatures.includes("effects")) {
-          extra_28 = `${Number(additive)}#${escapeChat(effect)}#`;
-        }
-      }
-    }
 
-    const serverMessage =
-      `MS#${deskmod}#${escapeChat(preanim)}#${escapeChat(name)}#${escapeChat(
-        emote
-      )}` +
-      `#${escapeChat(message)}#${escapeChat(side)}#${escapeChat(
-        sfx_name
-      )}#${emote_modifier}` +
-      `#${this.charID}#${sfx_delay}#${Number(objection_modifier)}#${Number(
-        evidence
-      )}#${Number(flip)}#${Number(
-        realization
-      )}#${text_color}#${extra_cccc}${extra_27}${extra_28}%`;
-
-    this.sendServer(serverMessage);
-    if (mode === "replay") {
-      (<HTMLInputElement>(
-        document.getElementById("client_ooclog")
-      )).value += `wait#${(<HTMLInputElement>document.getElementById("client_replaytimer")).value
-      }#%\r\n`;
-    }
-  }
 
   /**
    * Sends add evidence command.
@@ -365,7 +250,7 @@ class Client extends EventEmitter {
    * @param {string} evidence image filename
    */
   sendPE(name: string, desc: string, img: string) {
-    this.sendServer(
+    this.sender.sendServer(
       `PE#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%`
     );
   }
@@ -378,7 +263,7 @@ class Client extends EventEmitter {
    * @param {string} evidence image filename
    */
   sendEE(id: number, name: string, desc: string, img: string) {
-    this.sendServer(
+    this.sender.sendServer(
       `EE#${id}#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%`
     );
   }
@@ -388,16 +273,17 @@ class Client extends EventEmitter {
    * @param {number} evidence id
    */
   sendDE(id: number) {
-    this.sendServer(`DE#${id}#%`);
+    this.sender.sendServer(`DE#${id}#%`);
+    
   }
-
+  
   /**
    * Sends health point command.
    * @param {number} side the position
    * @param {number} hp the health point
    */
   sendHP(side: number, hp: number) {
-    this.sendServer(`HP#${side}#${hp}#%`);
+    this.sender.sendServer(`HP#${side}#${hp}#%`);
   }
 
   /**
@@ -406,9 +292,9 @@ class Client extends EventEmitter {
    */
   sendZZ(msg: string) {
     if (extrafeatures.includes("modcall_reason")) {
-      this.sendServer(`ZZ#${msg}#%`);
+      this.sender.sendServer(`ZZ#${msg}#%`);
     } else {
-      this.sendServer("ZZ#%");
+      this.sender.sendServer("ZZ#%");
     }
   }
 
@@ -417,7 +303,7 @@ class Client extends EventEmitter {
    * @param {string} testimony type
    */
   sendRT(testimony: string) {
-    this.sendServer(`RT#${testimony}#%`);
+    this.sender.sendServer(`RT#${testimony}#%`);
   }
 
   /**
@@ -425,7 +311,7 @@ class Client extends EventEmitter {
    * @param {string} track the track ID
    */
   sendMusicChange(track: string) {
-    this.sendServer(`MC#${track}#${this.charID}#%`);
+    this.sender.sendServer(`MC#${track}#${this.charID}#%`);
   }
 
   /**
@@ -433,8 +319,9 @@ class Client extends EventEmitter {
    * to the server.
    */
   joinServer() {
-    this.sendServer(`HI#${hdid}#%`);
-    this.sendServer("ID#webAO#webAO#%");
+    console.log(this.sender)
+    this.sender.sendServer(`HI#${hdid}#%`);
+    this.sender.sendServer("ID#webAO#webAO#%");
     if (mode !== "replay") {
       this.checkUpdater = setInterval(() => this.sendCheck(), 5000);
     }
@@ -518,7 +405,7 @@ class Client extends EventEmitter {
    */
   sendCharacter(character: number) {
     if (character === -1 || this.chars[character].name) {
-      this.sendServer(`CC#${this.playerID}#${character}#web#%`);
+      this.sender.sendServer(`CC#${this.playerID}#${character}#web#%`);
     }
   }
 
@@ -527,14 +414,14 @@ class Client extends EventEmitter {
    * @param {number?} song the song to be played
    */
   sendMusic(song: string) {
-    this.sendServer(`MC#${song}#${this.charID}#%`);
+    this.sender.sendServer(`MC#${song}#${this.charID}#%`);
   }
 
   /**
    * Sends a keepalive packet.
    */
   sendCheck() {
-    this.sendServer(`CH#${this.charID}#%`);
+    this.sender.sendServer(`CH#${this.charID}#%`);
   }
 
   /**
diff --git a/webAO/client/sender/index.ts b/webAO/client/sender/index.ts
new file mode 100644
index 0000000..ce5b488
--- /dev/null
+++ b/webAO/client/sender/index.ts
@@ -0,0 +1,39 @@
+import { sendIC } from "./sendIC";
+import { sendSelf } from './sendSelf'
+import { sendServer } from './sendServer'
+export interface ISender {
+    sendIC: (deskmod: number,
+        preanim: string,
+        name: string,
+        emote: string,
+        message: string,
+        side: string,
+        sfx_name: string,
+        emote_modifier: number,
+        sfx_delay: number,
+        objection_modifier: number,
+        evidence: number,
+        flip: boolean,
+        realization: boolean,
+        text_color: number,
+        showname: string,
+        other_charid: string,
+        self_hoffset: number,
+        self_yoffset: number,
+        noninterrupting_preanim: boolean,
+        looping_sfx: boolean,
+        screenshake: boolean,
+        frame_screenshake: string,
+        frame_realization: string,
+        frame_sfx: string,
+        additive: boolean,
+        effect: string) => void
+    sendSelf: (message: string) => void
+    sendServer: (message: string) => void
+}
+export const sender = {
+    sendIC,
+    sendSelf,
+    sendServer
+
+}
\ No newline at end of file
diff --git a/webAO/client/sender/sendIC.ts b/webAO/client/sender/sendIC.ts
new file mode 100644
index 0000000..9064115
--- /dev/null
+++ b/webAO/client/sender/sendIC.ts
@@ -0,0 +1,106 @@
+import { extrafeatures } from "../../client";
+import { escapeChat } from "../../encoding";
+import {client} from '../../client'
+import queryParser from "../../utils/queryParser";
+let {mode} = queryParser()
+
+/**
+ * Sends an in-character chat message.
+ * @param {number} deskmod controls the desk
+ * @param {string} speaking who is speaking
+ * @param {string} name the name of the current character
+ * @param {string} silent whether or not it's silent
+ * @param {string} message the message to be sent
+ * @param {string} side the name of the side in the background
+ * @param {string} sfx_name the name of the sound effect
+ * @param {number} emote_modifier whether or not to zoom
+ * @param {number} sfx_delay the delay (in milliseconds) to play the sound effect
+ * @param {number} objection_modifier the number of the shout to play
+ * @param {string} evidence the filename of evidence to show
+ * @param {boolean} flip change to 1 to reverse sprite for position changes
+ * @param {boolean} realization screen flash effect
+ * @param {number} text_color text color
+ * @param {string} showname custom name to be displayed (optional)
+ * @param {number} other_charid paired character (optional)
+ * @param {number} self_offset offset to paired character (optional)
+ * @param {number} noninterrupting_preanim play the full preanim (optional)
+ */
+export const sendIC = (
+    deskmod: number,
+    preanim: string,
+    name: string,
+    emote: string,
+    message: string,
+    side: string,
+    sfx_name: string,
+    emote_modifier: number,
+    sfx_delay: number,
+    objection_modifier: number,
+    evidence: number,
+    flip: boolean,
+    realization: boolean,
+    text_color: number,
+    showname: string,
+    other_charid: string,
+    self_hoffset: number,
+    self_yoffset: number,
+    noninterrupting_preanim: boolean,
+    looping_sfx: boolean,
+    screenshake: boolean,
+    frame_screenshake: string,
+    frame_realization: string,
+    frame_sfx: string,
+    additive: boolean,
+    effect: string
+) => {
+    let extra_cccc = "";
+    let other_emote = "";
+    let other_offset = "";
+    let extra_27 = "";
+    let extra_28 = "";
+
+    if (extrafeatures.includes("cccc_ic_support")) {
+        const self_offset = extrafeatures.includes("y_offset")
+            ? `${self_hoffset}<and>${self_yoffset}`
+            : self_hoffset; // HACK: this should be an & but client fucked it up and all the servers adopted it
+        if (mode === "replay") {
+            other_emote = "##";
+            other_offset = "#0#0";
+        }
+        extra_cccc = `${escapeChat(
+            showname
+        )}#${other_charid}${other_emote}#${self_offset}${other_offset}#${Number(
+            noninterrupting_preanim
+        )}#`;
+
+        if (extrafeatures.includes("looping_sfx")) {
+            extra_27 = `${Number(looping_sfx)}#${Number(
+                screenshake
+            )}#${frame_screenshake}#${frame_realization}#${frame_sfx}#`;
+            if (extrafeatures.includes("effects")) {
+                extra_28 = `${Number(additive)}#${escapeChat(effect)}#`;
+            }
+        }
+    }
+
+    const serverMessage =
+        `MS#${deskmod}#${escapeChat(preanim)}#${escapeChat(name)}#${escapeChat(
+            emote
+        )}` +
+        `#${escapeChat(message)}#${escapeChat(side)}#${escapeChat(
+            sfx_name
+        )}#${emote_modifier}` +
+        `#${client.charID}#${sfx_delay}#${Number(objection_modifier)}#${Number(
+            evidence
+        )}#${Number(flip)}#${Number(
+            realization
+        )}#${text_color}#${extra_cccc}${extra_27}${extra_28}%`;
+
+    client.sender.sendServer(serverMessage);
+    if (mode === "replay") {
+        (<HTMLInputElement>(
+            document.getElementById("client_ooclog")
+        )).value += `wait#${(<HTMLInputElement>document.getElementById("client_replaytimer")).value
+        }#%\r\n`;
+    }
+}
\ No newline at end of file
diff --git a/webAO/client/sender/sendSelf.ts b/webAO/client/sender/sendSelf.ts
new file mode 100644
index 0000000..66c35fa
--- /dev/null
+++ b/webAO/client/sender/sendSelf.ts
@@ -0,0 +1,13 @@
+import { client } from "../../client";
+
+
+/**
+ * Hook for sending messages to the client
+ * @param {string} message the message to send
+ */
+export const sendSelf = (message: string) => {
+    (<HTMLInputElement>(
+        document.getElementById("client_ooclog")
+    )).value += `${message}\r\n`;
+    client.handleSelf(message);
+}
\ No newline at end of file
diff --git a/webAO/client/sender/sendServer.ts b/webAO/client/sender/sendServer.ts
new file mode 100644
index 0000000..a9da3bd
--- /dev/null
+++ b/webAO/client/sender/sendServer.ts
@@ -0,0 +1,10 @@
+import { client } from "../../client";
+import queryParser from "../../utils/queryParser";
+let { mode } = queryParser()
+/**
+ * Hook for sending messages to the server
+ * @param {string} message the message to send
+ */
+export const sendServer = (message: string) => {
+    mode === "replay" ? client.sender.sendSelf(message) : client.serv.send(message);
+}
\ No newline at end of file
diff --git a/webAO/dom/changeBackgroundOOC.ts b/webAO/dom/changeBackgroundOOC.ts
index f840729..ff5aaaa 100644
--- a/webAO/dom/changeBackgroundOOC.ts
+++ b/webAO/dom/changeBackgroundOOC.ts
@@ -22,7 +22,7 @@ export function changeBackgroundOOC() {
     if (mode === "join") {
         client.sendOOC(`/${changeBGCommand.replace("$1", filename)}`);
     } else if (mode === "replay") {
-        client.sendSelf(`BN#${filename}#%`);
+        client.sender.sendSelf(`BN#${filename}#%`);
     }
 }
 window.changeBackgroundOOC = changeBackgroundOOC;
\ No newline at end of file
diff --git a/webAO/dom/changeRoleOOC.ts b/webAO/dom/changeRoleOOC.ts
index d838cb3..ec7b65d 100644
--- a/webAO/dom/changeRoleOOC.ts
+++ b/webAO/dom/changeRoleOOC.ts
@@ -7,7 +7,7 @@ export function changeRoleOOC() {
     const roleselect = <HTMLInputElement>document.getElementById("role_select");
 
     client.sendOOC(`/pos ${roleselect.value}`);
-    client.sendServer(`SP#${roleselect.value}#%`);
+    client.sender.sendServer(`SP#${roleselect.value}#%`);
     updateActionCommands(roleselect.value);
 }
 window.changeRoleOOC = changeRoleOOC;
\ No newline at end of file
diff --git a/webAO/dom/onEnter.ts b/webAO/dom/onEnter.ts
index 01fbbd5..5ab532c 100644
--- a/webAO/dom/onEnter.ts
+++ b/webAO/dom/onEnter.ts
@@ -69,7 +69,7 @@ import { escapeChat } from "../encoding";
         emote_mod = 0;
       }
   
-      client.sendIC(
+      client.sender.sendIC(
         myemo.deskmod,
         myemo.preanim,
         mychar.name,
diff --git a/webAO/packets/handlers/handleCC.ts b/webAO/packets/handlers/handleCC.ts
index 84e6ec0..36bcdc7 100644
--- a/webAO/packets/handlers/handleCC.ts
+++ b/webAO/packets/handlers/handleCC.ts
@@ -5,5 +5,5 @@ import { client } from "../../client";
  * @param {Array} args packet arguments
  */
 export const handleCC = (args: string[]) => {
-    client.sendSelf(`PV#1#CID#${args[2]}#%`);
+    client.sender.sendSelf(`PV#1#CID#${args[2]}#%`);
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleCI.ts b/webAO/packets/handlers/handleCI.ts
index 74d3039..53e42f7 100644
--- a/webAO/packets/handlers/handleCI.ts
+++ b/webAO/packets/handlers/handleCI.ts
@@ -22,5 +22,5 @@ export const handleCI = (args: string[]) => {
         }
     }
     // Request the next pack
-    client.sendServer(`AN#${Number(args[1]) / 10 + 1}#%`);
+    client.sender.sendServer(`AN#${Number(args[1]) / 10 + 1}#%`);
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleEI.ts b/webAO/packets/handlers/handleEI.ts
index c74e4d4..428baf1 100644
--- a/webAO/packets/handlers/handleEI.ts
+++ b/webAO/packets/handlers/handleEI.ts
@@ -26,5 +26,5 @@ export const handleEI = (args: string[]) => {
         icon: `${AO_HOST}evidence/${encodeURI(arg[3].toLowerCase())}`,
     };
 
-    client.sendServer("AE" + (evidenceID + 1) + "#%");
+    client.sender.sendServer("AE" + (evidenceID + 1) + "#%");
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleEM.ts b/webAO/packets/handlers/handleEM.ts
index 973d2af..9f3cb87 100644
--- a/webAO/packets/handlers/handleEM.ts
+++ b/webAO/packets/handlers/handleEM.ts
@@ -35,5 +35,5 @@ export const handleEM = (args: string[]) => {
     }
 
     // get the next batch of tracks
-    client.sendServer(`AM#${Number(args[1]) / 10 + 1}#%`);
+    client.sender.sendServer(`AM#${Number(args[1]) / 10 + 1}#%`);
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleHI.ts b/webAO/packets/handlers/handleHI.ts
index d15be0d..b4f00a8 100644
--- a/webAO/packets/handlers/handleHI.ts
+++ b/webAO/packets/handlers/handleHI.ts
@@ -7,8 +7,8 @@ const version = process.env.npm_package_version;
  * @param {Array} args packet arguments
  */
 export const handleHI = (_args: string[]) => {
-    client.sendSelf(`ID#1#webAO#${version}#%`);
-    client.sendSelf(
+    client.sender.sendSelf(`ID#1#webAO#${version}#%`);
+    client.sender.sendSelf(
         "FL#fastloading#yellowtext#cccc_ic_support#flipping#looping_sfx#effects#%"
     );
 }
diff --git a/webAO/packets/handlers/handleID.ts b/webAO/packets/handlers/handleID.ts
index 7def483..cd7b6ed 100644
--- a/webAO/packets/handlers/handleID.ts
+++ b/webAO/packets/handlers/handleID.ts
@@ -13,7 +13,7 @@ export const handleID = (args: string[]) => {
         serverVersion = args[2].split("&")[1];
     } else if (serverSoftware === "webAO") {
         setOldLoading(false);
-        client.sendSelf("PN#0#1#%");
+        client.sender.sendSelf("PN#0#1#%");
     } else {
         serverVersion = args[3];
     }
diff --git a/webAO/packets/handlers/handlePN.ts b/webAO/packets/handlers/handlePN.ts
index b16f77d..1b66fb9 100644
--- a/webAO/packets/handlers/handlePN.ts
+++ b/webAO/packets/handlers/handlePN.ts
@@ -5,5 +5,5 @@ import { client } from "../../client";
  * @param {Array} args packet arguments
  */
 export const handlePN = (_args: string[]) => {
-    client.sendServer("askchaa#%");
+    client.sender.sendServer("askchaa#%");
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleRC.ts b/webAO/packets/handlers/handleRC.ts
index 92c1e8e..0b5679f 100644
--- a/webAO/packets/handlers/handleRC.ts
+++ b/webAO/packets/handlers/handleRC.ts
@@ -6,5 +6,5 @@ import vanilla_character_arr from "../../constants/characters.js";
  * @param {Array} args packet arguments
  */
 export const handleRC = (_args: string[]) => {
-    client.sendSelf(`SC#${vanilla_character_arr.join("#")}#%`);
+    client.sender.sendSelf(`SC#${vanilla_character_arr.join("#")}#%`);
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleRD.ts b/webAO/packets/handlers/handleRD.ts
index 780b43f..dde994c 100644
--- a/webAO/packets/handlers/handleRD.ts
+++ b/webAO/packets/handlers/handleRD.ts
@@ -6,8 +6,8 @@ import { client } from "../../client";
  * @param {Array} args packet arguments
  */
 export const handleRD = (_args: string[]) => {
-    client.sendSelf("BN#gs4#%");
-    client.sendSelf("DONE#%");
+    client.sender.sendSelf("BN#gs4#%");
+    client.sender.sendSelf("DONE#%");
     const ooclog = <HTMLInputElement>document.getElementById("client_ooclog");
     ooclog.value = "";
     ooclog.readOnly = false;
diff --git a/webAO/packets/handlers/handleRM.ts b/webAO/packets/handlers/handleRM.ts
index 41a78b4..c18821b 100644
--- a/webAO/packets/handlers/handleRM.ts
+++ b/webAO/packets/handlers/handleRM.ts
@@ -6,5 +6,5 @@ import vanilla_music_arr from "../../constants/music.js";
    * @param {Array} args packet arguments
    */
 export const handleRM = (_args: string[]) => {
-    client.sendSelf(`SM#${vanilla_music_arr.join("#")}#%`);
+    client.sender.sendSelf(`SM#${vanilla_music_arr.join("#")}#%`);
   }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleSC.ts b/webAO/packets/handlers/handleSC.ts
index 3689a17..f4953e0 100644
--- a/webAO/packets/handlers/handleSC.ts
+++ b/webAO/packets/handlers/handleSC.ts
@@ -33,5 +33,5 @@ export const handleSC = async (args: string[]) => {
         client.handleCharacterInfo(chargs, charid);
     }
     // We're done with the characters, request the music
-    client.sendServer("RM#%");
+    client.sender.sendServer("RM#%");
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleSI.ts b/webAO/packets/handlers/handleSI.ts
index e040c83..b32fbc1 100644
--- a/webAO/packets/handlers/handleSI.ts
+++ b/webAO/packets/handlers/handleSI.ts
@@ -34,8 +34,8 @@ export const handleSI = (args: string[]) => {
 
     // this is determined at the top of this file
     if (!oldLoading && extrafeatures.includes("fastloading")) {
-        client.sendServer("RC#%");
+        client.sender.sendServer("RC#%");
     } else {
-        client.sendServer("askchar2#%");
+        client.sender.sendServer("askchar2#%");
     }
 }
\ No newline at end of file
diff --git a/webAO/packets/handlers/handleSM.ts b/webAO/packets/handlers/handleSM.ts
index 5dab83e..48f9cd9 100644
--- a/webAO/packets/handlers/handleSM.ts
+++ b/webAO/packets/handlers/handleSM.ts
@@ -32,5 +32,5 @@ export const handleSM = (args: string[]) => {
     }
 
     // Music done, carry on
-    client.sendServer("RD#%");
+    client.sender.sendServer("RD#%");
 }
diff --git a/webAO/packets/handlers/handleaskchaa.ts b/webAO/packets/handlers/handleaskchaa.ts
index 5930bf0..0f9e730 100644
--- a/webAO/packets/handlers/handleaskchaa.ts
+++ b/webAO/packets/handlers/handleaskchaa.ts
@@ -6,5 +6,5 @@ import vanilla_character_arr from "../../constants/characters.js";
    * @param {Array} args packet arguments
    */
 export const handleaskchaa = (_args: string[]) => {
-    client.sendSelf(`SI#${vanilla_character_arr.length}#0#0#%`);
+    client.sender.sendSelf(`SI#${vanilla_character_arr.length}#0#0#%`);
 }