From cfbfb67c8e98329f3e70e06310a557d1d9134875 Mon Sep 17 00:00:00 2001 From: ITOH Date: Fri, 11 Feb 2022 11:21:10 +0100 Subject: [PATCH] refactor!: rename the `ws` folder to `gateway` (#2037) --- .github/workflows/local_tests.yml | 4 ++-- bot.ts | 2 +- dnt.ts | 2 +- {ws => gateway}/README.md | 0 {ws => gateway}/closeWs.ts | 0 {ws => gateway}/createShard.ts | 0 {ws => gateway}/deps.ts | 0 {ws => gateway}/gateway_manager.ts | 0 {ws => gateway}/handleOnMessage.ts | 0 {ws => gateway}/heartbeat.ts | 0 {ws => gateway}/identify.ts | 0 {ws => gateway}/mod.ts | 0 {ws => gateway}/processGatewayQueue.ts | 0 {ws => gateway}/resharder.ts | 0 {ws => gateway}/resume.ts | 0 {ws => gateway}/sendShardMessage.ts | 0 {ws => gateway}/spawnShards.ts | 0 {ws => gateway}/startGatewayOptions.ts | 0 {ws => gateway}/tellWorkerToIdentify.ts | 0 {ws => gateway}/ws.ts | 0 mod.ts | 2 +- util/calculateShardId.ts | 2 +- 22 files changed, 6 insertions(+), 6 deletions(-) rename {ws => gateway}/README.md (100%) rename {ws => gateway}/closeWs.ts (100%) rename {ws => gateway}/createShard.ts (100%) rename {ws => gateway}/deps.ts (100%) rename {ws => gateway}/gateway_manager.ts (100%) rename {ws => gateway}/handleOnMessage.ts (100%) rename {ws => gateway}/heartbeat.ts (100%) rename {ws => gateway}/identify.ts (100%) rename {ws => gateway}/mod.ts (100%) rename {ws => gateway}/processGatewayQueue.ts (100%) rename {ws => gateway}/resharder.ts (100%) rename {ws => gateway}/resume.ts (100%) rename {ws => gateway}/sendShardMessage.ts (100%) rename {ws => gateway}/spawnShards.ts (100%) rename {ws => gateway}/startGatewayOptions.ts (100%) rename {ws => gateway}/tellWorkerToIdentify.ts (100%) rename {ws => gateway}/ws.ts (100%) diff --git a/.github/workflows/local_tests.yml b/.github/workflows/local_tests.yml index 3c63da837..3b5f4387c 100644 --- a/.github/workflows/local_tests.yml +++ b/.github/workflows/local_tests.yml @@ -11,7 +11,7 @@ on: - "transformers/**" - "types/**" - "util/**" - - "ws/**" + - "gateway/**" pull_request: paths: - "handlers/**" @@ -22,7 +22,7 @@ on: - "transformers/**" - "types/**" - "util/**" - - "ws/**" + - "gateway/**" jobs: test: diff --git a/bot.ts b/bot.ts index 88a2a85bd..79f8d7bfc 100644 --- a/bot.ts +++ b/bot.ts @@ -31,7 +31,7 @@ import { } from "./util/constants.ts"; import { Errors } from "./types/discordeno/errors.ts"; import { DiscordGatewayPayload, GatewayDispatchEventNames, GatewayPayload } from "./types/gateway/gatewayPayload.ts"; -import { createGatewayManager, GatewayManager } from "./ws/mod.ts"; +import { createGatewayManager, GatewayManager } from "./gateway/mod.ts"; import { validateLength } from "./util/validateLength.ts"; import { delay, formatImageURL, hasProperty } from "./util/utils.ts"; import { iconBigintToHash, iconHashToBigInt } from "./util/hash.ts"; diff --git a/dnt.ts b/dnt.ts index 4f335b559..6ac8e1248 100644 --- a/dnt.ts +++ b/dnt.ts @@ -31,7 +31,7 @@ await build({ }, { name: "./gateway", - path: "ws/mod.ts", + path: "gateway/mod.ts", }, { name: "./types", diff --git a/ws/README.md b/gateway/README.md similarity index 100% rename from ws/README.md rename to gateway/README.md diff --git a/ws/closeWs.ts b/gateway/closeWs.ts similarity index 100% rename from ws/closeWs.ts rename to gateway/closeWs.ts diff --git a/ws/createShard.ts b/gateway/createShard.ts similarity index 100% rename from ws/createShard.ts rename to gateway/createShard.ts diff --git a/ws/deps.ts b/gateway/deps.ts similarity index 100% rename from ws/deps.ts rename to gateway/deps.ts diff --git a/ws/gateway_manager.ts b/gateway/gateway_manager.ts similarity index 100% rename from ws/gateway_manager.ts rename to gateway/gateway_manager.ts diff --git a/ws/handleOnMessage.ts b/gateway/handleOnMessage.ts similarity index 100% rename from ws/handleOnMessage.ts rename to gateway/handleOnMessage.ts diff --git a/ws/heartbeat.ts b/gateway/heartbeat.ts similarity index 100% rename from ws/heartbeat.ts rename to gateway/heartbeat.ts diff --git a/ws/identify.ts b/gateway/identify.ts similarity index 100% rename from ws/identify.ts rename to gateway/identify.ts diff --git a/ws/mod.ts b/gateway/mod.ts similarity index 100% rename from ws/mod.ts rename to gateway/mod.ts diff --git a/ws/processGatewayQueue.ts b/gateway/processGatewayQueue.ts similarity index 100% rename from ws/processGatewayQueue.ts rename to gateway/processGatewayQueue.ts diff --git a/ws/resharder.ts b/gateway/resharder.ts similarity index 100% rename from ws/resharder.ts rename to gateway/resharder.ts diff --git a/ws/resume.ts b/gateway/resume.ts similarity index 100% rename from ws/resume.ts rename to gateway/resume.ts diff --git a/ws/sendShardMessage.ts b/gateway/sendShardMessage.ts similarity index 100% rename from ws/sendShardMessage.ts rename to gateway/sendShardMessage.ts diff --git a/ws/spawnShards.ts b/gateway/spawnShards.ts similarity index 100% rename from ws/spawnShards.ts rename to gateway/spawnShards.ts diff --git a/ws/startGatewayOptions.ts b/gateway/startGatewayOptions.ts similarity index 100% rename from ws/startGatewayOptions.ts rename to gateway/startGatewayOptions.ts diff --git a/ws/tellWorkerToIdentify.ts b/gateway/tellWorkerToIdentify.ts similarity index 100% rename from ws/tellWorkerToIdentify.ts rename to gateway/tellWorkerToIdentify.ts diff --git a/ws/ws.ts b/gateway/ws.ts similarity index 100% rename from ws/ws.ts rename to gateway/ws.ts diff --git a/mod.ts b/mod.ts index ba6ebb2b2..7adfe0a6b 100644 --- a/mod.ts +++ b/mod.ts @@ -5,4 +5,4 @@ export * from "./rest/mod.ts"; export * from "./transformers/mod.ts"; export * from "./types/mod.ts"; export * from "./util/mod.ts"; -export * from "./ws/mod.ts"; +export * from "./gateway/mod.ts"; diff --git a/util/calculateShardId.ts b/util/calculateShardId.ts index 376684770..b12352891 100644 --- a/util/calculateShardId.ts +++ b/util/calculateShardId.ts @@ -1,4 +1,4 @@ -import { GatewayManager } from "../ws/gateway_manager.ts"; +import { GatewayManager } from "../gateway/gateway_manager.ts"; export function calculateShardId(gateway: GatewayManager, guildId: bigint) { if (gateway.maxShards === 1) return 0;