diff --git a/packages/ws/src/defaults.ts b/packages/ws/src/defaults.ts index 25179c4..5718dc0 100644 --- a/packages/ws/src/defaults.ts +++ b/packages/ws/src/defaults.ts @@ -1,12 +1,10 @@ export const GatewayManagerDefaultOptions = { - compress: false, intents: 0, properties: { os: process.platform, browser: 'Biscuit', device: 'Biscuit' }, - url: 'wss://gateway.discord.gg', version: 10, totalShards: 1, lastShardId: 0, diff --git a/packages/ws/src/manager/GatewayManager.ts b/packages/ws/src/manager/GatewayManager.ts index 57ccfd8..4dfc677 100644 --- a/packages/ws/src/manager/GatewayManager.ts +++ b/packages/ws/src/manager/GatewayManager.ts @@ -13,12 +13,13 @@ export class GatewayManager { cache: Collection | null = null; options: Required; logger: Logger; - constructor(options: CreateGatewayManagerOptions) { + constructor({ connection, ...options }: CreateGatewayManagerOptions) { this.options = Options>(GatewayManagerDefaultOptions, { ...options, - lastShardId: - options.lastShardId ?? (options.totalShards ? options.totalShards - 1 : options.connection ? options.connection.shards - 1 : 0) + lastShardId: options.lastShardId ?? (options.totalShards ? options.totalShards - 1 : connection ? connection.shards - 1 : 0) }); + + this.options.connection = connection; if (this.options.cache) this.cache = new Collection(); this.logger = new Logger({ name: '[GatewayManager]', @@ -114,7 +115,7 @@ export class GatewayManager { id: shardId, connection: { intents: this.options.intents, - url: this.options.url, + url: this.options.connection.url, version: this.options.version, token: this.options.token, totalShards: this.options.totalShards,