From 9957a3f1ca01fc4fdd3e25de80336fa5de6ec89b Mon Sep 17 00:00:00 2001 From: Yaikava <83710104+Yaikava@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:39:12 +0000 Subject: [PATCH] Revert "fix: use isomorphic ws" (#2744) This reverts commit ad306b0d0ae35a0d69b941fa8148dcf6da95214f. --- packages/gateway/package.json | 3 +-- packages/gateway/src/Shard.ts | 5 ++--- yarn.lock | 22 ++++++---------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/packages/gateway/package.json b/packages/gateway/package.json index cb21db8a7..76e58af88 100644 --- a/packages/gateway/package.json +++ b/packages/gateway/package.json @@ -25,8 +25,7 @@ "dependencies": { "@discordeno/types": "19.0.0-alpha.1", "@discordeno/utils": "19.0.0-alpha.1", - "isomorphic-ws": "^5.0.0", - "ws": "^8.12.0" + "ws": "^8.11.0" }, "devDependencies": { "@swc/cli": "^0.1.57", diff --git a/packages/gateway/src/Shard.ts b/packages/gateway/src/Shard.ts index dd431e100..25f641a81 100644 --- a/packages/gateway/src/Shard.ts +++ b/packages/gateway/src/Shard.ts @@ -1,4 +1,3 @@ -import WebSocket from 'isomorphic-ws' import type { DiscordGatewayPayload, DiscordHello, DiscordReady } from '@discordeno/types' import { GatewayCloseEventCodes, GatewayOpcodes } from '@discordeno/types' import { camelize, createLeakyBucket, delay } from '@discordeno/utils' @@ -255,7 +254,7 @@ export class Shard { } /** Handle a gateway connection close. */ - async handleClose (close: WebSocket.CloseEvent): Promise { + async handleClose (close: CloseEvent): Promise { // gateway.debug("GW CLOSED", { shardId, payload: event }); this.stopHeartbeating() @@ -317,7 +316,7 @@ export class Shard { } /** Handle an incoming gateway message. */ - async handleMessage (message: WebSocket.MessageEvent): Promise { + async handleMessage (message: MessageEvent): Promise { let preProcessMessage = message.data // If message compression is enabled, diff --git a/yarn.lock b/yarn.lock index 8e83f6e20..847b67193 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,13 +90,12 @@ __metadata: chai: ^4.3.7 eslint: ^8.0.1 eslint-config-discordeno: "*" - isomorphic-ws: ^5.0.0 mocha: ^10.1.0 sinon: ^15.0.0 ts-node: ^10.9.1 tsconfig: "*" typescript: ^4.9.3 - ws: ^8.12.0 + ws: ^8.11.0 languageName: unknown linkType: soft @@ -3280,15 +3279,6 @@ __metadata: languageName: node linkType: hard -"isomorphic-ws@npm:^5.0.0": - version: 5.0.0 - resolution: "isomorphic-ws@npm:5.0.0" - peerDependencies: - ws: "*" - checksum: e20eb2aee09ba96247465fda40c6d22c1153394c0144fa34fe6609f341af4c8c564f60ea3ba762335a7a9c306809349f9b863c8beedf2beea09b299834ad5398 - languageName: node - linkType: hard - "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0": version: 3.2.0 resolution: "istanbul-lib-coverage@npm:3.2.0" @@ -5580,18 +5570,18 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.12.0": - version: 8.12.0 - resolution: "ws@npm:8.12.0" +"ws@npm:^8.11.0": + version: 8.11.0 + resolution: "ws@npm:8.11.0" peerDependencies: bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" + utf-8-validate: ^5.0.2 peerDependenciesMeta: bufferutil: optional: true utf-8-validate: optional: true - checksum: 818ff3f8749c172a95a114cceb8b89cedd27e43a82d65c7ad0f7882b1e96a2ee6709e3746a903c3fa88beec0c8bae9a9fcd75f20858b32a166dfb7519316a5d7 + checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67 languageName: node linkType: hard