From 3585e9316ee454f18dd28f75838b317544dbe53c Mon Sep 17 00:00:00 2001
From: "Emma [it/its]@Rory&" <root@rory.gay>
Date: Wed, 9 Oct 2024 05:08:37 +0200
Subject: [PATCH] Fall back to @yukikaze-bot/erlpack if erlpack cant be found
 or loaded

---
 flake.lock                       | Bin 1497 -> 1497 bytes
 src/gateway/events/Connection.ts |   7 ++++++-
 src/gateway/events/Message.ts    |   7 ++++++-
 src/gateway/util/Send.ts         |   7 ++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 42952374c13a35769b490038fb91fbf81b588142..2e819fa13ad725309c1a2265654167b414af0dda 100644
GIT binary patch
delta 253
zcmcb~eUp1a2ZxcFshNR=sqw@Kvf2@5MP8A?uE9=WMaCIU`5p%0N#3re-enm9p{7YW
z`IS*dJ|^B~2Ks3Mfs^O6h);ZPp^<Eul9rriU}0itm}Fp)W|m}OW@wsbo?>BXZkTA4
zl$K~=m|~i0kvRDPqw-`PX3dH34JV&rjAgelGBGqWG6mUMS(=+-lIE1GpOI;iXc?I9
zXz3YZQI-=}>Jw#@Uzm~Y72y%!UE!f$5>yVfRdTX9v%uu_jBJzhn1%I=Qp=RA6qJ&U
y4J|A!5>wJl6D?9xj0}vDQ%#dn6D`w>P0W)Flg%v54bzN`QVc<^*v!LxmI(lAAx=mD

delta 253
zcmWm8O-jQ+7ywXWM1^)CxDXeD)Q!?bzM0AVbytkks8~xBCE#KvGl8~tYO9F!1TGuq
z03N}G7w`ajfS#gP(4OGEMQu@=zi%NxF#`hCe7~9H^pe>&KRb`yXgKS1c$8+v<HWLY
zZo2u+)!07wQ#ZW7?)i`P-D)Y0G%`|Y4vb+LGh2e7U}7PRLWKk*OQIyFSo!bZ(AUG`
zYKi<$@UTf3;ey61b!3fb(j>c6_||nNFD5;4W{|W`2X9lF@R>^c7x9yW9xwjYJ<r2!
x{~2s}7w$w;``Tz7Gzy{=*FqAZ5m#0lY^*Ixt}QUa0KhP;u$HUES3Ue)`vY?LPC)<w

diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts
index 1991ebbe..e2135a13 100644
--- a/src/gateway/events/Connection.ts
+++ b/src/gateway/events/Connection.ts
@@ -33,7 +33,12 @@ let erlpack: ErlpackType | null = null;
 try {
 	erlpack = require("erlpack") as ErlpackType;
 } catch (e) {
-	// empty
+	console.log("Failed to import erlpack: ", e);
+	try {
+		erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
+	} catch (e) {
+		console.log("Failed to import @yukikaze-bot/erlpack: ", e);
+	}
 }
 
 // TODO: check rate limit
diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
index 52d9edd8..b21965ce 100644
--- a/src/gateway/events/Message.ts
+++ b/src/gateway/events/Message.ts
@@ -31,7 +31,12 @@ let erlpack: ErlpackType | null = null;
 try {
 	erlpack = require("erlpack") as ErlpackType;
 } catch (e) {
-	// empty
+	console.log("Failed to import erlpack: ", e);
+	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) {
diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts
index 57f87d8b..a1be8398 100644
--- a/src/gateway/util/Send.ts
+++ b/src/gateway/util/Send.ts
@@ -25,7 +25,12 @@ let erlpack: ErlpackType | null = null;
 try {
 	erlpack = require("erlpack") as ErlpackType;
 } catch (e) {
-	// empty
+	console.log("Failed to import erlpack: ", e);
+	try {
+		erlpack = require("@yukikaze-bot/erlpack") as ErlpackType;
+	} catch (e) {
+		console.log("Failed to import @yukikaze-bot/erlpack: ", e);
+	}
 }
 
 // don't care