seyfert 4.3.0 → 4.3.1-dev-24757643741.0

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

@@ -22,6 +22,8 @@ export declare class Shard {
     websocket: BaseSocket | null;
     connectTimeout: ConnectTimeout;
     heart: ShardHeart;
+    private isConnecting;
+    private reconnectPromise;
     bucket: DynamicBucket;
     offlineSendQueue: ((_?: unknown) => void)[];
     pendingGuilds?: Set<string>;
@@ -44,6 +46,7 @@ export declare class Shard {
     heartbeat(requested: boolean): void;
     disconnect(code?: ShardSocketCloseCodes): void;
     reconnect(code?: ShardSocketCloseCodes): Promise<void>;
+    private flushOfflineSendQueue;
     onpacket(packet: GatewayReceivePayload): void | Promise<void>;
     requestGuildMember(options: Omit<GatewayRequestGuildMembersDataWithQuery, 'nonce'> | Omit<GatewayRequestGuildMembersDataWithUserIds, 'nonce'>): Promise<{
         members: APIGuildMember[];

package/lib/websocket/discord/shard.js

@@ -22,6 +22,8 @@ class Shard {
         interval: 30e3,
         ack: true,
     };
+    isConnecting = false;
+    reconnectPromise;
     bucket;
     offlineSendQueue = [];
     pendingGuilds;
@@ -74,9 +76,15 @@ class Shard {
         return this.websocket.ping();
     }
     async connect() {
+        if (this.isConnecting) {
+            this.debugger?.debug(`[Shard #${this.id}] Already connecting, skipping`);
+            return;
+        }
+        this.isConnecting = true;
         await this.connectTimeout.wait();
         if (this.isOpen) {
             this.debugger?.debug(`[Shard #${this.id}] Attempted to connect while open`);
+            this.isConnecting = false;
             return;
         }
         clearTimeout(this.heart.nodeInterval);
@@ -90,6 +98,7 @@ class Shard {
         this.websocket.onclose = (event) => this.handleClosed(event);
         this.websocket.onerror = (event) => this.logger.error(event);
         this.websocket.onopen = () => {
+            this.isConnecting = false;
             this.heart.ack = true;
             void this.options.onShardReconnect?.({ shardId: this.id });
         };
@@ -159,14 +168,24 @@ class Shard {
         clearTimeout(this.connectionTimeout);
         this.connectionTimeout = undefined;
         clearTimeout(this.heart.ackTimeout);
+        this.isConnecting = false;
         this.debugger?.info(`[Shard #${this.id}] Disconnecting`);
         this.close(code, 'Shard down request');
     }
     async reconnect(code = shared_1.ShardSocketCloseCodes.Reconnect) {
-        this.debugger?.info(`[Shard #${this.id}] Reconnecting`);
-        this.disconnect(code);
-        await (0, common_1.delay)(this.options.reconnectTimeout);
-        await this.connect();
+        return (this.reconnectPromise ??= (async () => {
+            this.debugger?.info(`[Shard #${this.id}] Reconnecting`);
+            this.disconnect(code);
+            await (0, common_1.delay)(this.options.reconnectTimeout);
+            await this.connect();
+        })().finally(() => {
+            this.reconnectPromise = undefined;
+        }));
+    }
+    flushOfflineSendQueue() {
+        const queue = this.offlineSendQueue.splice(0);
+        for (const resolve of queue)
+            resolve();
     }
     onpacket(packet) {
         if (packet.s !== null) {
@@ -217,8 +236,7 @@ class Shard {
                                 clearTimeout(this.connectionTimeout);
                                 this.connectionTimeout = undefined;
                                 this.isReady = true;
-                                for (const resolve of this.offlineSendQueue.splice(0))
-                                    resolve();
+                                this.flushOfflineSendQueue();
                                 this.options.handlePayload(this.id, packet);
                             }
                             break;
@@ -230,8 +248,7 @@ class Shard {
                             }
                             this.data.resume_gateway_url = packet.d.resume_gateway_url;
                             this.data.session_id = packet.d.session_id;
-                            for (const resolve of this.offlineSendQueue.splice(0))
-                                resolve();
+                            this.flushOfflineSendQueue();
                             this.options.handlePayload(this.id, packet);
                             if (this.pendingGuilds?.size === 0) {
                                 this.isReady = true;
@@ -427,7 +444,7 @@ class Shard {
     }
     close(code, reason) {
         clearInterval(this.heart.nodeInterval);
-        if (!this.isOpen) {
+        if (!this.websocket) {
             return this.debugger?.warn(`[Shard #${this.id}] Is not open, reason:`, reason);
         }
         this.debugger?.debug(`[Shard #${this.id}] Called close with reason:`, reason);

package/lib/websocket/discord/socket/custom.d.ts

@@ -1,3 +1,4 @@
+import type { ClientRequest } from 'node:http';
 import type { Socket } from 'node:net';
 export declare class SeyfertWebSocket {
     #private;
@@ -15,6 +16,8 @@ export declare class SeyfertWebSocket {
         reason: string;
     };
     __closeCalled?: boolean;
+    request?: ClientRequest;
+    retryTimeout?: NodeJS.Timeout;
     constructor(url: string);
     private connect;
     handleReadable(): void;

package/lib/websocket/discord/socket/custom.js

@@ -13,6 +13,9 @@ class SeyfertWebSocket {
     __promises = new Map();
     __lastError = null;
     __closeCalled;
+    request;
+    retryTimeout;
+    #closeEmitted = false;
     constructor(url) {
         const urlParts = new URL(url);
         this.hostname = urlParts.hostname || '';
@@ -33,7 +36,16 @@ class SeyfertWebSocket {
                     'Sec-WebSocket-Version': '13',
                 },
             });
+            this.request = req;
             req.on('upgrade', (res, socket) => {
+                if (this.request === req) {
+                    this.request = undefined;
+                }
+                if (this.__closeCalled) {
+                    socket.destroy();
+                    resolve();
+                    return;
+                }
                 const hash = (0, node_crypto_1.createHash)('sha1').update(`${key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11`).digest('base64');
                 const accept = res.headers['sec-websocket-accept'];
                 if (accept !== hash) {
@@ -52,20 +64,34 @@ class SeyfertWebSocket {
                 this.onopen();
             });
             req.on('close', () => {
+                if (this.request === req) {
+                    this.request = undefined;
+                }
                 req.removeAllListeners();
             });
             req.on('error', e => {
+                if (this.request === req) {
+                    this.request = undefined;
+                }
+                if (this.__closeCalled) {
+                    resolve();
+                    return;
+                }
                 if (retries < 5) {
-                    setTimeout(() => {
+                    this.retryTimeout = setTimeout(() => {
+                        this.retryTimeout = undefined;
+                        if (this.__closeCalled) {
+                            resolve();
+                            return;
+                        }
                         resolve(this.connect(retries + 1));
                     }, 500);
+                    return;
                 }
-                else {
-                    this.onerror(e);
-                    setTimeout(() => {
-                        resolve(this.connect(0));
-                    }, 5e3);
-                }
+                this.onerror(e);
+                this.__lastError = { code: 1006, reason: e.message };
+                resolve();
+                this.#emitClose(this.__lastError);
             });
             req.end();
         });
@@ -135,19 +161,19 @@ class SeyfertWebSocket {
                     this.onmessage({ data: body });
                 }
                 break;
-            // pong
+            // ping
             case 0x9:
                 this.onping(body.toString());
                 break;
-            // ping
+            // pong
             case 0xa:
                 this.onpong(body.toString());
                 break;
             // close
             case 0x8:
                 this.__lastError = {
-                    code: body.readUInt16BE(0),
-                    reason: body.subarray(2).toString(),
+                    code: body.length >= 2 ? body.readUInt16BE(0) : 1005,
+                    reason: body.length > 2 ? body.subarray(2).toString() : '',
                 };
                 break;
         }
@@ -158,9 +184,10 @@ class SeyfertWebSocket {
         this.socket = undefined;
         if (this.__closeCalled)
             return;
-        if (!this.__lastError)
-            return this.connect();
-        this.onclose(this.__lastError);
+        this.#emitClose(this.__lastError ?? {
+            code: 1006,
+            reason: 'Socket closed without a close frame',
+        });
         this.__lastError = null;
     }
     send(data) {
@@ -193,7 +220,7 @@ class SeyfertWebSocket {
         this.socket?.write(frame);
     }
     onping(_data) {
-        //
+        this.pong(_data);
     }
     onpong(_data) {
         //
@@ -212,6 +239,10 @@ class SeyfertWebSocket {
     }
     close(code, reason) {
         this.__closeCalled = true;
+        clearTimeout(this.retryTimeout);
+        this.retryTimeout = undefined;
+        this.request?.destroy();
+        this.request = undefined;
         // alloc payload length
         const buffer = Buffer.alloc(2 + Buffer.byteLength(reason));
         // gateway close code
@@ -221,7 +252,13 @@ class SeyfertWebSocket {
         // message, close opcode
         this._write(buffer, 0x8);
         this.socket?.end();
-        this.onclose({ code, reason });
+        this.#emitClose({ code, reason });
+    }
+    #emitClose(close) {
+        if (this.#closeEmitted)
+            return;
+        this.#closeEmitted = true;
+        this.onclose(close);
     }
     pong(data) {
         //send pong opcode (10)
@@ -259,6 +296,8 @@ class SeyfertWebSocket {
         return id;
     }
     get readyState() {
+        if (this.request || this.retryTimeout)
+            return 0;
         return ['opening', 'open', 'closed', 'closed'].indexOf(this.socket?.readyState ?? 'closed');
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "4.3.0",
+	"version": "4.3.1-dev-24757643741.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -70,4 +70,4 @@
 			"esbuild"
 		]
 	}
-}
+}