seyfert 2.2.1-dev-13381595851.0 → 2.2.1-dev-13478083325.0

package/lib/common/it/utils.js

@@ -261,7 +261,14 @@ exports.ReplaceRegex = {
     },
 };
 async function magicImport(path) {
-    return new Function('path', 'return import(`file:///${path}?update=${Date.now()}`)')(path);
+    try {
+        if ('Deno' in globalThis)
+            throw new Error('https://github.com/denoland/deno/issues/26136');
+        return require(path);
+    }
+    catch {
+        return new Function('path', 'return import(`file:///${path}?update=${Date.now()}`)')(path);
+    }
 }
 function fakePromise(value) {
     if (value instanceof Promise)

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

@@ -24,8 +24,9 @@ export declare class Shard {
     bucket: DynamicBucket;
     offlineSendQueue: ((_?: unknown) => void)[];
     pendingGuilds: Set<string>;
-    options: MakeRequired<ShardOptions, 'properties' | 'ratelimitOptions'>;
+    options: MakeRequired<ShardOptions, 'properties' | 'ratelimitOptions' | 'reconnectTimeout' | 'connectionTimeout'>;
     isReady: boolean;
+    connectionTimeout?: NodeJS.Timeout;
     private requestGuildMembersChunk;
     constructor(id: number, options: ShardOptions);
     get latency(): number;
@@ -41,7 +42,7 @@ export declare class Shard {
     resume(): Promise<void>;
     heartbeat(requested: boolean): void;
     disconnect(code?: ShardSocketCloseCodes): void;
-    reconnect(): Promise<void>;
+    reconnect(code?: ShardSocketCloseCodes): Promise<void>;
     onpacket(packet: GatewayReceivePayload): void | Promise<void>;
     requestGuildMember(options: Omit<GatewayRequestGuildMembersDataWithQuery, 'nonce'> | Omit<GatewayRequestGuildMembersDataWithUserIds, 'nonce'>): Promise<{
         members: APIGuildMember[];

package/lib/websocket/discord/shard.js

@@ -27,6 +27,7 @@ class Shard {
     pendingGuilds = new Set();
     options;
     isReady = false;
+    connectionTimeout;
     requestGuildMembersChunk = new Map();
     constructor(id, options) {
         this.id = id;
@@ -36,6 +37,8 @@ class Shard {
                 rateLimitResetInterval: 60_000,
                 maxRequestsPerRateLimitTick: 120,
             },
+            reconnectTimeout: 10e3,
+            connectionTimeout: 30e3,
         }, options);
         this.logger = new common_1.Logger({
             name: `[Shard #${id}]`,
@@ -78,6 +81,7 @@ class Shard {
         }
         clearTimeout(this.heart.nodeInterval);
         this.debugger?.debug(`[Shard #${this.id}] Connecting to ${this.currentGatewayURL}`);
+        this.connectionTimeout = setTimeout(() => this.reconnect(shared_1.ShardSocketCloseCodes.Timeout), this.options.connectionTimeout);
         // @ts-expect-error Use native websocket when using Bun
         // biome-ignore lint/correctness/noUndeclaredVariables: /\
         this.websocket = new basesocket_1.BaseSocket(typeof Bun === 'undefined' ? 'ws' : 'bun', this.currentGatewayURL);
@@ -146,12 +150,15 @@ class Shard {
         }));
     }
     disconnect(code = shared_1.ShardSocketCloseCodes.Shutdown) {
+        clearTimeout(this.connectionTimeout);
+        this.connectionTimeout = undefined;
         this.debugger?.info(`[Shard #${this.id}] Disconnecting`);
         this.close(code, 'Shard down request');
     }
-    async reconnect() {
+    async reconnect(code = shared_1.ShardSocketCloseCodes.Reconnect) {
         this.debugger?.info(`[Shard #${this.id}] Reconnecting`);
-        this.disconnect(shared_1.ShardSocketCloseCodes.Reconnect);
+        this.disconnect(code);
+        await (0, common_1.delay)(this.options.reconnectTimeout);
         await this.connect();
     }
     onpacket(packet) {
@@ -161,6 +168,8 @@ class Shard {
         this.debugger?.debug(`[Shard #${this.id}]`, packet.t ? packet.t : types_1.GatewayOpcodes[packet.op], this.data.resume_seq);
         switch (packet.op) {
             case types_1.GatewayOpcodes.Hello: {
+                clearTimeout(this.connectionTimeout);
+                this.connectionTimeout = undefined;
                 clearInterval(this.heart.nodeInterval);
                 this.heart.interval = packet.d.heartbeat_interval;
                 this.heartbeat(false);
@@ -197,12 +206,16 @@ class Shard {
                     switch (packet.t) {
                         case types_1.GatewayDispatchEvents.Resumed:
                             {
+                                clearTimeout(this.connectionTimeout);
+                                this.connectionTimeout = undefined;
                                 this.isReady = true;
                                 this.offlineSendQueue.map(resolve => resolve());
                                 this.options.handlePayload(this.id, packet);
                             }
                             break;
                         case types_1.GatewayDispatchEvents.Ready: {
+                            clearTimeout(this.connectionTimeout);
+                            this.connectionTimeout = undefined;
                             if ((0, common_1.hasIntent)(this.options.intents, 'Guilds')) {
                                 for (let i = 0; i < packet.d.guilds.length; i++) {
                                     this.pendingGuilds.add(packet.d.guilds.at(i).id);
@@ -314,6 +327,8 @@ class Shard {
             case types_1.GatewayCloseCodes.UnknownOpcode:
             case types_1.GatewayCloseCodes.InvalidSeq:
             case types_1.GatewayCloseCodes.SessionTimedOut:
+            // shard failed to connect, try connecting from scratch
+            case shared_1.ShardSocketCloseCodes.Timeout:
                 {
                     this.data.resume_seq = 0;
                     this.data.session_id = undefined;

package/lib/websocket/discord/sharder.js

@@ -68,6 +68,8 @@ class ShardManager extends Map {
             debugger: this.debugger,
             compress: this.options.compress ?? false,
             presence: this.options.presence?.(shardId, -1),
+            connectionTimeout: this.options.connectionTimeout,
+            reconnectTimeout: this.options.reconnectTimeout,
         });
         this.set(shardId, shard);
         return shard;

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

@@ -39,6 +39,8 @@ export interface ShardManagerOptions extends ShardDetails {
         interval: number;
         percentage: number;
     };
+    reconnectTimeout?: number;
+    connectionTimeout?: number;
 }
 export interface CustomManagerAdapter {
     postMessage(workerId: number, body: unknown): Awaitable<unknown>;
@@ -105,13 +107,16 @@ export interface ShardOptions extends ShardDetails {
     debugger?: Logger;
     compress: boolean;
     presence?: GatewayPresenceUpdateData;
+    reconnectTimeout?: number;
+    connectionTimeout?: number;
 }
 export declare enum ShardSocketCloseCodes {
     Shutdown = 3000,
     ZombiedConnection = 3010,
     Reconnect = 3020,
     Resharding = 3030,
-    ShutdownAll = 3040
+    ShutdownAll = 3040,
+    Timeout = 3050
 }
 export interface WorkerData {
     intents: number;

package/lib/websocket/discord/shared.js

@@ -8,4 +8,5 @@ var ShardSocketCloseCodes;
     ShardSocketCloseCodes[ShardSocketCloseCodes["Reconnect"] = 3020] = "Reconnect";
     ShardSocketCloseCodes[ShardSocketCloseCodes["Resharding"] = 3030] = "Resharding";
     ShardSocketCloseCodes[ShardSocketCloseCodes["ShutdownAll"] = 3040] = "ShutdownAll";
+    ShardSocketCloseCodes[ShardSocketCloseCodes["Timeout"] = 3050] = "Timeout";
 })(ShardSocketCloseCodes || (exports.ShardSocketCloseCodes = ShardSocketCloseCodes = {}));

package/package.json

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