diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-02-01 13:00:04 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 13:00:04 +1100 |
| commit | da2086696784f4d4d82eb853630e4d94662661dd (patch) | |
| tree | c8bf2c3b587844f7993d76db555d70f2dbfa0d2b /src/gateway/events/Connection.ts | |
| parent | use print instead of console.log in client cache so it doesn't output weirdness (diff) | |
| download | server-da2086696784f4d4d82eb853630e4d94662661dd.tar.xz | |
Use erlpack instead of @yukikaze-bot/erlpack (#968)
Diffstat (limited to 'src/gateway/events/Connection.ts')
| -rw-r--r-- | src/gateway/events/Connection.ts | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index 82081266..5ba68ef7 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -27,12 +27,13 @@ import { Close } from "./Close"; import { Message } from "./Message"; import { Deflate, Inflate } from "fast-zlib"; import { URL } from "url"; -import { Config } from "@fosscord/util"; -let erlpack: unknown; +import { Config, ErlpackType } from "@fosscord/util"; + +let erlpack: ErlpackType | null = null; try { - erlpack = require("@yukikaze-bot/erlpack"); -} catch (error) { - /* empty */ + erlpack = require("erlpack") as ErlpackType; +} catch (e) { + // empty } // TODO: check rate limit @@ -84,14 +85,11 @@ export async function Connection( const { searchParams } = new URL(`http://localhost${request.url}`); // @ts-ignore socket.encoding = searchParams.get("encoding") || "json"; - if (!["json", "etf"].includes(socket.encoding)) { - if (socket.encoding === "etf" && erlpack) { - throw new Error( - "Erlpack is not installed: 'npm i @yukikaze-bot/erlpack'", - ); - } + if (!["json", "etf"].includes(socket.encoding)) return socket.close(CLOSECODES.Decode_error); - } + + if (socket.encoding === "etf" && erlpack) + throw new Error("Erlpack is not installed: 'npm i erlpack'"); socket.version = Number(searchParams.get("version")) || 8; if (socket.version != 8) |