From 1eb2d71854c8a44ee525fb4872aae6bf074c9efd Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Wed, 29 Apr 2026 16:16:27 +0200
Subject: [PATCH] switch to harmony-erlpack

---
 package-lock.json             | Bin 328299 -> 311326 bytes
 package.json                  |   2 +-
 src/gateway/events/Message.ts |  18 ++++++++++--------
 src/gateway/util/Send.ts      |  16 +++++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 827b0feadc1f65069a089a2c88c741f89b4af524..ce23ed7b89006a5281b7a4211134e8ef7e63c8d5 100644
GIT binary patch
delta 544
zcmaFeA~LT*ctb4<e@0?aZhl^+Zfa3ZL1J?D^tD3Fa+4=~<=))E@{)7&622)jHcwo&
zb;I^Uaf}Ptw})jgGK*|iYhcV)ohrZ>w*CE5MqZ8W)6O&AVB4;8gOQ0DD5^U7!e^!J
zrMDTAnWpzYWMrM*9>>Ht{g@e})bs~|EH>MZ-)G#aupOv)+0^Y#vzbH~fqE3DPq@y=
zGClqulhXF5bC}jMZkJoc6wM8j5uRR<$*8>j##*Ll9K0y*ojlQ5e!9&qMk_@$kLc^_
zqlrv^D9)@G8e&|Wm{H^wk)P#in&%j9S*BfDrSFpMXcFRL<{9V~T;^ZuTwq`t<`$S~
znHJ@2Zk7~U6=GN%5m-`H>Eaua8&n!<kmZ#cRczrCXi}0{QkfVUl{xvMm)vANMvm#m
z3z?O-@7c!0&9Pnc0MlpA?Jj4S)=I;@G5LXw(sutBOsjpjb6GK0^TQ>kZ|G!Jo}O#P
zD7^i<C-WBO?Q4UXOBJWrS2J^Nuc~C`=iI)rg*lpWdu<0Z57Ty=9_AJ!pk9;dAA*>)
zr~m)WXuLgYKlA3`?W;stIK;M#>#{r--JamWQYyc_C7q>7Vta5S%SONHw=T2rO-|h=
oINg9B7$fd~S**6dzQ{6xb$i53mMqroZ4X%Xifo_xjpY(I0GI>K6951J

delta 6564
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

diff --git a/package.json b/package.json
index 63fdd9233..3206e54dd 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
         "fido2-lib": "^3.5.9",
         "file-type": "^22.0.1",
         "form-data": "^4.0.5",
+        "harmony-erlpack": "^0.0.1",
         "i18next": "^26.0.6",
         "i18next-fs-backend": "^2.6.4",
         "i18next-http-middleware": "^3.9.3",
@@ -131,7 +132,6 @@
     },
     "optionalDependencies": {
         "@sendgrid/mail": "^8.1.6",
-        "@yukikaze-bot/erlpack": "^1.0.1",
         "jimp": "^1.6.1",
         "mailgun.js": "^13.0.0",
         "node-mailjet": "^6.0.11",
diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
index 8bd1adda9..043b73768 100644
--- a/src/gateway/events/Message.ts
+++ b/src/gateway/events/Message.ts
@@ -17,7 +17,8 @@
 */
 
 import { CLOSECODES, Payload, WebSocket } from "@spacebar/gateway";
-import { ErlpackType } from "@spacebar/util";
+// import { ErlpackType } from "@spacebar/util";
+import * as erlpack from "harmony-erlpack";
 import fs from "node:fs/promises";
 import BigIntJson from "json-bigint";
 import path from "node:path";
@@ -28,12 +29,12 @@ import { PayloadSchema } from "@spacebar/schemas";
 
 const bigIntJson = BigIntJson({ storeAsString: true });
 
-let erlpack: ErlpackType | null = null;
-try {
-    erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
-} catch (e) {
-    console.log("Failed to import @yukikaze-bot/erlpack: ", e);
-}
+// let erlpack: ErlpackType | null = null;
+// try {
+//     erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
+// } catch (e) {
+//     console.log("Failed to import @yukikaze-bot/erlpack: ", e);
+// }
 
 export async function Message(this: WebSocket, buffer: WS.Data) {
     // TODO: compression
@@ -61,7 +62,8 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
         data = bigIntJson.parse(buffer as string);
     } else if (this.encoding === "etf" && Buffer.isBuffer(buffer) && erlpack) {
         try {
-            data = erlpack.unpack(buffer);
+            // cast is ~safe: unpack returns the parsed data in the shape it was provided, @yukikaze-bot/erlpack got around this by returning `any` instead of an actual type union.
+            data = erlpack.unpack(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength)) as unknown as Payload;
         } catch {
             console.error(`[Gateway/${this.user_id ?? this.ipAddress}] Failed to decode ETF payload`);
             return this.close(CLOSECODES.Decode_error);
diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts
index 00fd4b454..6a9c639d7 100644
--- a/src/gateway/util/Send.ts
+++ b/src/gateway/util/Send.ts
@@ -21,12 +21,14 @@ import fs from "node:fs/promises";
 import path from "node:path";
 
 import { ErlpackType, JSONReplacer } from "@spacebar/util";
-let erlpack: ErlpackType | null = null;
-try {
-    erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
-} catch (e) {
-    console.log("Failed to import @yukikaze-bot/erlpack: ", e);
-}
+import * as erlpack from "harmony-erlpack";
+
+// let erlpack: ErlpackType | null = null;
+// try {
+//     erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
+// } catch (e) {
+//     console.log("Failed to import @yukikaze-bot/erlpack: ", e);
+// }
 
 // don't care
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -58,7 +60,7 @@ export async function Send(socket: WebSocket, data: Payload) {
     if (socket.encoding === "etf" && erlpack) {
         // Erlpack doesn't like Date objects, encodes them as {}
         data = recurseJsonReplace(data);
-        buffer = erlpack.pack(data);
+        buffer = Buffer.from(erlpack.pack(data));
     }
     // TODO: encode circular object
     else if (socket.encoding === "json") buffer = JSON.stringify(data, JSONReplacer);