seyfert 2.2.1-dev-12797288169.0 → 2.2.1-dev-12848723720.0

package/lib/cache/index.d.ts

@@ -30,7 +30,7 @@ type ReturnManagers = {
     [K in NonGuildBased | GuildBased | GuildRelated]: NonNullable<Awaited<ReturnType<NonNullable<Cache[K]>['get']>>>;
 };
 export * from './adapters/index';
-export type CachedEvents = 'READY' | 'GUILD_CREATE' | 'GUILD_UPDATE' | 'GUILD_DELETE' | 'CHANNEL_CREATE' | 'CHANNEL_UPDATE' | 'CHANNEL_DELETE' | 'GUILD_ROLE_CREATE' | 'GUILD_ROLE_UPDATE' | 'GUILD_ROLE_DELETE' | 'GUILD_BAN_ADD' | 'GUILD_BAN_REMOVE' | 'GUILD_EMOJIS_UPDATE' | 'GUILD_STICKERS_UPDATE' | 'GUILD_MEMBER_ADD' | 'GUILD_MEMBER_UPDATE' | 'GUILD_MEMBER_REMOVE' | 'MESSAGE_CREATE' | 'PRESENCE_UPDATE' | 'THREAD_DELETE' | 'THREAD_CREATE' | 'THREAD_UPDATE' | 'USER_UPDATE' | 'VOICE_STATE_UPDATE' | 'STAGE_INSTANCE_CREATE' | 'STAGE_INSTANCE_UPDATE' | 'STAGE_INSTANCE_DELETE';
+export type CachedEvents = 'READY' | 'GUILD_CREATE' | 'GUILD_UPDATE' | 'GUILD_DELETE' | 'CHANNEL_CREATE' | 'CHANNEL_UPDATE' | 'CHANNEL_DELETE' | 'GUILD_ROLE_CREATE' | 'GUILD_ROLE_UPDATE' | 'GUILD_ROLE_DELETE' | 'GUILD_BAN_ADD' | 'GUILD_BAN_REMOVE' | 'GUILD_EMOJIS_UPDATE' | 'GUILD_STICKERS_UPDATE' | 'GUILD_MEMBER_ADD' | 'GUILD_MEMBER_UPDATE' | 'GUILD_MEMBER_REMOVE' | 'MESSAGE_CREATE' | 'PRESENCE_UPDATE' | 'THREAD_DELETE' | 'THREAD_CREATE' | 'THREAD_UPDATE' | 'USER_UPDATE' | 'VOICE_STATE_UPDATE' | 'STAGE_INSTANCE_CREATE' | 'STAGE_INSTANCE_UPDATE' | 'STAGE_INSTANCE_DELETE' | 'GUILD_MEMBERS_CHUNK';
 export type DisabledCache = {
     [P in NonGuildBased | GuildBased | GuildRelated | SeyfertBased]?: boolean;
 };

package/lib/cache/index.js

@@ -376,6 +376,23 @@ class Cache {
                     await this.stickers?.set(CacheFrom.Gateway, event.d.stickers.map(x => [x.id, x]), event.d.guild_id);
                 }
                 break;
+            case 'GUILD_MEMBERS_CHUNK': {
+                const data = [];
+                if (this.members) {
+                    for (const member of event.d.members) {
+                        data.push([CacheFrom.Gateway, 'members', member, member.user.id, event.d.guild_id], [CacheFrom.Gateway, 'users', member.user, member.user.id]);
+                    }
+                }
+                if (this.presences && event.d.presences) {
+                    for (const presence of event.d.presences) {
+                        data.push([CacheFrom.Gateway, 'presences', presence, presence.user.id, event.d.guild_id]);
+                    }
+                }
+                if (data.length) {
+                    await this.bulkSet(data);
+                }
+                break;
+            }
             case 'GUILD_MEMBER_ADD':
             case 'GUILD_MEMBER_UPDATE':
                 if (event.d.user)

package/lib/client/workerclient.js

@@ -310,7 +310,7 @@ class WorkerClient extends base_1.BaseClient {
             case 'DISCONNECT_ALL_SHARDS_RESHARDING':
                 {
                     for (const i of this.shards.values()) {
-                        await i.disconnect();
+                        await i.disconnect(websocket_1.ShardSocketCloseCodes.Resharding);
                     }
                     this.postMessage({
                         type: 'DISCONNECTED_ALL_SHARDS_RESHARDING',

package/lib/websocket/discord/shard.d.ts

@@ -1,9 +1,11 @@
 import { Logger, type MakeRequired } from '../../common';
-import { type GatewayReceivePayload, type GatewaySendPayload } from '../../types';
+import { type APIGuildMember, type GatewayGuildMembersChunkPresence, type GatewayReceivePayload, type GatewaySendPayload } from '../../types';
+import type { GatewayRequestGuildMembersDataWithQuery, GatewayRequestGuildMembersDataWithUserIds } from '../../types/gateway';
 import { DynamicBucket } from '../structures';
 import { ConnectTimeout } from '../structures/timeout';
 import { BaseSocket } from './basesocket';
 import type { ShardData, ShardOptions } from './shared';
+import { ShardSocketCloseCodes } from './shared';
 export interface ShardHeart {
     interval: number;
     nodeInterval?: NodeJS.Timeout;
@@ -24,6 +26,7 @@ export declare class Shard {
     pendingGuilds: Set<string>;
     options: MakeRequired<ShardOptions, 'properties' | 'ratelimitOptions'>;
     isReady: boolean;
+    private requestGuildMembersChunk;
     constructor(id: number, options: ShardOptions);
     get latency(): number;
     get isOpen(): boolean;
@@ -37,9 +40,13 @@ export declare class Shard {
     get resumable(): boolean;
     resume(): Promise<void>;
     heartbeat(requested: boolean): void;
-    disconnect(): void;
+    disconnect(code?: ShardSocketCloseCodes): void;
     reconnect(): Promise<void>;
     onpacket(packet: GatewayReceivePayload): void | Promise<void>;
+    requestGuildMember(options: Omit<GatewayRequestGuildMembersDataWithQuery, 'nonce'> | Omit<GatewayRequestGuildMembersDataWithUserIds, 'nonce'>): Promise<{
+        members: APIGuildMember[];
+        presences: GatewayGuildMembersChunkPresence[];
+    }>;
     protected handleClosed(close: {
         code: number;
         reason: string;

package/lib/websocket/discord/shard.js

@@ -27,6 +27,7 @@ class Shard {
     pendingGuilds = new Set();
     options;
     isReady = false;
+    requestGuildMembersChunk = new Map();
     constructor(id, options) {
         this.id = id;
         this.options = (0, common_1.MergeOptions)({
@@ -144,13 +145,13 @@ class Shard {
             d: this.data.resume_seq ?? null,
         }));
     }
-    disconnect() {
+    disconnect(code = shared_1.ShardSocketCloseCodes.Shutdown) {
         this.debugger?.info(`[Shard #${this.id}] Disconnecting`);
-        this.close(shared_1.ShardSocketCloseCodes.Shutdown, 'Shard down request');
+        this.close(code, 'Shard down request');
     }
     async reconnect() {
         this.debugger?.info(`[Shard #${this.id}] Reconnecting`);
-        this.disconnect();
+        this.disconnect(shared_1.ShardSocketCloseCodes.Reconnect);
         await this.connect();
     }
     onpacket(packet) {
@@ -239,6 +240,30 @@ class Shard {
                                 this.options.handlePayload(this.id, packet);
                             }
                             break;
+                        case types_1.GatewayDispatchEvents.GuildMembersChunk:
+                            {
+                                if (!packet.d.nonce) {
+                                    this.options.handlePayload(this.id, packet);
+                                    break;
+                                }
+                                const guildMemberChunk = this.requestGuildMembersChunk.get(packet.d.nonce);
+                                if (!guildMemberChunk) {
+                                    this.options.handlePayload(this.id, packet);
+                                    break;
+                                }
+                                guildMemberChunk.members.push(...packet.d.members);
+                                if (packet.d.presences)
+                                    guildMemberChunk.presences.push(...packet.d.presences);
+                                if (packet.d.chunk_index + 1 === packet.d.chunk_count) {
+                                    this.requestGuildMembersChunk.delete(packet.d.nonce);
+                                    guildMemberChunk.resolve({
+                                        members: guildMemberChunk.members,
+                                        presences: guildMemberChunk.presences,
+                                    });
+                                }
+                                this.options.handlePayload(this.id, packet);
+                            }
+                            break;
                         default:
                             this.options.handlePayload(this.id, packet);
                             break;
@@ -247,6 +272,33 @@ class Shard {
                 break;
         }
     }
+    async requestGuildMember(options) {
+        const nonce = Date.now().toString() + Math.random().toString(36);
+        let resolve = () => {
+            //
+        };
+        let reject = () => {
+            //
+        };
+        const promise = new Promise((res, rej) => {
+            resolve = res;
+            reject = rej;
+        });
+        this.requestGuildMembersChunk.set(nonce, {
+            members: [],
+            presences: [],
+            reject,
+            resolve,
+        });
+        this.send(false, {
+            op: types_1.GatewayOpcodes.RequestGuildMembers,
+            d: {
+                ...options,
+                nonce,
+            },
+        });
+        return promise;
+    }
     async handleClosed(close) {
         this.isReady = false;
         clearInterval(this.heart.nodeInterval);

package/lib/websocket/discord/sharder.d.ts

@@ -4,7 +4,7 @@ import { type GatewaySendPayload, type GatewayUpdatePresence, type GatewayVoiceS
 import { ShardManagerDefaults } from '../constants';
 import { ConnectQueue } from '../structures/timeout';
 import { Shard } from './shard';
-import type { ShardData, ShardManagerOptions } from './shared';
+import { type ShardData, type ShardManagerOptions, ShardSocketCloseCodes } from './shared';
 export declare class ShardManager extends Map<number, Shard> {
     connectQueue: ConnectQueue;
     options: MakeRequired<ShardManagerOptions, keyof typeof ShardManagerDefaults>;
@@ -22,8 +22,8 @@ export declare class ShardManager extends Map<number, Shard> {
     startResharder(): Promise<void>;
     spawnBuckets(): Shard[][];
     forceIdentify(shardId: number): Promise<void>;
-    disconnect(shardId: number): void | undefined;
-    disconnectAll(): void;
+    disconnect(shardId: number, code?: ShardSocketCloseCodes): void | undefined;
+    disconnectAll(code?: ShardSocketCloseCodes): void;
     setShardPresence(shardId: number, payload: GatewayUpdatePresence['d']): void;
     setPresence(payload: GatewayUpdatePresence['d']): void;
     joinVoice(guild_id: string, channel_id: string, options: Pick<GatewayVoiceStateUpdate['d'], 'self_deaf' | 'self_mute'>): void;

package/lib/websocket/discord/sharder.js

@@ -7,6 +7,7 @@ const constants_1 = require("../constants");
 const structures_1 = require("../structures");
 const timeout_1 = require("../structures/timeout");
 const shard_1 = require("./shard");
+const shared_1 = require("./shared");
 let parentPort;
 let workerData;
 class ShardManager extends Map {
@@ -117,7 +118,7 @@ class ShardManager extends Map {
                 handlePayload = () => {
                     //
                 };
-                this.disconnectAll();
+                this.disconnectAll(shared_1.ShardSocketCloseCodes.Resharding);
                 this.clear();
                 this.options.totalShards = this.options.shardEnd = this.options.info.shards = info.shards;
                 for (const [id, shard] of sharder) {
@@ -169,13 +170,13 @@ class ShardManager extends Map {
         this.debugger?.info(`Shard #${shardId} force identify`);
         return this.create(shardId).identify();
     }
-    disconnect(shardId) {
+    disconnect(shardId, code) {
         this.debugger?.info(`Shard #${shardId} force disconnect`);
-        return this.get(shardId)?.disconnect();
+        return this.get(shardId)?.disconnect(code);
     }
-    disconnectAll() {
+    disconnectAll(code = shared_1.ShardSocketCloseCodes.ShutdownAll) {
         this.debugger?.info('Disconnect all shards');
-        this.forEach(shard => shard.disconnect());
+        this.forEach(shard => shard.disconnect(code));
     }
     setShardPresence(shardId, payload) {
         this.debugger?.info(`Shard #${shardId} update presence`);

package/lib/websocket/discord/shared.d.ts

@@ -108,7 +108,10 @@ export interface ShardOptions extends ShardDetails {
 }
 export declare enum ShardSocketCloseCodes {
     Shutdown = 3000,
-    ZombiedConnection = 3010
+    ZombiedConnection = 3010,
+    Reconnect = 3020,
+    Resharding = 3030,
+    ShutdownAll = 3040
 }
 export interface WorkerData {
     intents: number;

package/lib/websocket/discord/shared.js

@@ -5,4 +5,7 @@ var ShardSocketCloseCodes;
 (function (ShardSocketCloseCodes) {
     ShardSocketCloseCodes[ShardSocketCloseCodes["Shutdown"] = 3000] = "Shutdown";
     ShardSocketCloseCodes[ShardSocketCloseCodes["ZombiedConnection"] = 3010] = "ZombiedConnection";
+    ShardSocketCloseCodes[ShardSocketCloseCodes["Reconnect"] = 3020] = "Reconnect";
+    ShardSocketCloseCodes[ShardSocketCloseCodes["Resharding"] = 3030] = "Resharding";
+    ShardSocketCloseCodes[ShardSocketCloseCodes["ShutdownAll"] = 3040] = "ShutdownAll";
 })(ShardSocketCloseCodes || (exports.ShardSocketCloseCodes = ShardSocketCloseCodes = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.2.1-dev-12797288169.0",
+	"version": "2.2.1-dev-12848723720.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",