diff --git a/apis/websocket/package.json b/apis/websocket/package.json index 323de24..4a92de7 100755 --- a/apis/websocket/package.json +++ b/apis/websocket/package.json @@ -37,4 +37,4 @@ "@types/ws": "^8.5.10", "typed-emitter": "^2.1.0" } -} \ No newline at end of file +} diff --git a/biome.json b/biome.json index 21f22fe..7b175a7 100644 --- a/biome.json +++ b/biome.json @@ -21,6 +21,9 @@ }, "useNodejsImportProtocol": { "level": "off" + }, + "useNumberNamespace": { + "level": "off" } } } diff --git a/bots/discord/docs/4_commands_and_events.md b/bots/discord/docs/4_commands_and_events.md index e1bb033..c1d58b2 100644 --- a/bots/discord/docs/4_commands_and_events.md +++ b/bots/discord/docs/4_commands_and_events.md @@ -35,8 +35,6 @@ export default { data: new SlashCommandBuilder() .setName("my-command") .setDescription("My cool command") - // Allowing this command to be used in DMs - .setDMPermission(true) // DO NOT forget this line! .toJSON(), diff --git a/bots/discord/src/events/api/disconnect.ts b/bots/discord/src/events/api/disconnect.ts index 75b9340..178980d 100644 --- a/bots/discord/src/events/api/disconnect.ts +++ b/bots/discord/src/events/api/disconnect.ts @@ -16,7 +16,7 @@ withContext(on, 'disconnect', ({ api, config, logger }, reason, msg) => { ) if (api.disconnectCount >= (config.api.disconnectLimit ?? 3)) { - console.error('Disconnected from bot API too many times') + logger.fatal('Disconnected from bot API too many times') // We don't want the process hanging process.exit(1) } diff --git a/packages/api/src/classes/ClientWebSocket.ts b/packages/api/src/classes/ClientWebSocket.ts index bcb9a5f..0632da0 100755 --- a/packages/api/src/classes/ClientWebSocket.ts +++ b/packages/api/src/classes/ClientWebSocket.ts @@ -49,19 +49,13 @@ export class ClientWebSocketManager { const timeout = setTimeout(() => { if (!this.ready) { this.#socket?.close(DisconnectReason.TooSlow) - throw new Error('WebSocket connection was not readied in time') + this._handleDisconnect(DisconnectReason.TooSlow, 'WebSocket connection was not readied in time') } }, this.timeout) - const errorBeforeReadyHandler = (err: Error) => { - cleanup() - throw err - } - const closeBeforeReadyHandler = (code: number, reason: Buffer) => { - clearTimeout(timeout) this._handleDisconnect(code, reason.toString()) - throw new Error('WebSocket connection closed before ready') + cleanup() } const readyHandler = () => { @@ -71,15 +65,14 @@ export class ClientWebSocketManager { rs() } + const socket = this.#socket const cleanup = () => { - this.#socket.off('open', readyHandler) - this.#socket.off('close', closeBeforeReadyHandler) - this.#socket.off('error', errorBeforeReadyHandler) + socket.off('open', readyHandler) + socket.off('close', closeBeforeReadyHandler) clearTimeout(timeout) } this.#socket.on('open', readyHandler) - this.#socket.on('error', errorBeforeReadyHandler) this.#socket.on('close', closeBeforeReadyHandler) } catch (e) { rj(e) diff --git a/semantic-release-config.js b/semantic-release-config.js index a0f2c5d..a834cdc 100644 --- a/semantic-release-config.js +++ b/semantic-release-config.js @@ -25,8 +25,8 @@ const Options = { [ '@semantic-release/npm', { - npmPublish: false, - } + npmPublish: false, + }, ], [ '@semantic-release/git',