@bakit/gateway 3.0.1 → 3.0.2

package/dist/index.cjs

@@ -10,6 +10,8 @@ var child_process = require('child_process');
 var path = require('path');
 var url = require('url');
 var utils = require('@bakit/utils');
+var collection = require('@discordjs/collection');
+var PQueue = require('p-queue');
 var rest = require('@bakit/rest');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -17,6 +19,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var EventEmitter__default = /*#__PURE__*/_interopDefault(EventEmitter);
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
+var PQueue__default = /*#__PURE__*/_interopDefault(PQueue);
 
 // src/lib/Shard.ts
 var MIN_HEARTBEAT_INTERVAL = 1e3, MAX_HEARTBEAT_INTERVAL = 6e4, SAFE_HEARTBEAT_INTERVAL = 45e3, ShardState = /* @__PURE__ */ ((ShardState2) => (ShardState2[ShardState2.Idle = 0] = "Idle", ShardState2[ShardState2.Connecting = 1] = "Connecting", ShardState2[ShardState2.Ready = 2] = "Ready", ShardState2[ShardState2.Resuming = 3] = "Resuming", ShardState2[ShardState2.Disconnecting = 4] = "Disconnecting", ShardState2[ShardState2.Disconnected = 5] = "Disconnected", ShardState2))(ShardState || {}), ShardStrategy = /* @__PURE__ */ ((ShardStrategy2) => (ShardStrategy2[ShardStrategy2.Resume = 0] = "Resume", ShardStrategy2[ShardStrategy2.Reconnect = 1] = "Reconnect", ShardStrategy2[ShardStrategy2.Shutdown = 2] = "Shutdown", ShardStrategy2))(ShardStrategy || {}), Shard = class extends EventEmitter__default.default {
@@ -283,6 +286,10 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter__default.default
   }
   process;
   #pendingEvals = /* @__PURE__ */ new Map();
+  #shards = /* @__PURE__ */ new Set();
+  get shards() {
+    return new Set(this.#shards);
+  }
   get killed() {
     return this.process.killed || !this.process.connected;
   }
@@ -351,7 +358,7 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter__default.default
   #handleIPC(message) {
     if (this.#isValidPayload(message)) {
       if (isDispatchPayload(message)) {
-        this.emit(message.t, ...message.d);
+        this.#handleDispatchPayload(message);
         return;
       }
       if (isEvalResponsePayload(message)) {
@@ -360,6 +367,9 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter__default.default
       }
     }
   }
+  #handleDispatchPayload(payload) {
+    payload.t === "shardAdd" && this.#shards.add(payload.d[0]), this.emit(payload.t, ...payload.d);
+  }
   #handleEvalResponse(payload) {
     let pending = this.#pendingEvals.get(payload.d.nonce);
     if (!pending) {
@@ -452,7 +462,7 @@ var Cluster = class extends EventEmitter__default.default {
     this.id = id;
     this.options = options;
   }
-  shards = new utils.Collection();
+  shards = new collection.Collection();
   #readyCount = 0;
   #starting = false;
   get size() {
@@ -515,7 +525,7 @@ var Cluster = class extends EventEmitter__default.default {
   }
 };
 var ShardingManager = class extends EventEmitter__default.default {
-  clusters = new utils.Collection();
+  clusters = new collection.Collection();
   options;
   rest;
   #gatewayInfo;
@@ -537,22 +547,21 @@ var ShardingManager = class extends EventEmitter__default.default {
     return this.#totalShards;
   }
   get ready() {
-    return this.#readyCount === this.totalClusters;
+    return this.totalClusters > 0 && this.#readyCount === this.totalClusters;
   }
   async spawn() {
     this.#gatewayInfo = await this.rest.get("/gateway/bot");
     let { session_start_limit: limit } = this.#gatewayInfo;
-    this.#totalShards = typeof this.options.totalShards == "number" ? this.options.totalShards : this.#gatewayInfo.shards, this.#identifyQueue = new utils.Queue({
+    this.#totalShards = typeof this.options.totalShards == "number" ? this.options.totalShards : this.#gatewayInfo.shards, this.#identifyQueue = new PQueue__default.default({
       concurrency: limit.max_concurrency,
       intervalCap: limit.max_concurrency,
       interval: 5e3
     });
     let { totalShards, totalClusters } = this;
     this.emit("debug", `Spawning ${totalClusters} clusters (${totalShards} total shards)...`);
-    let promises = [];
     for (let i = 0; i < totalClusters; i++)
-      promises.push(this.#spawnCluster(i));
-    await Promise.all(promises), this.emit("debug", "All clusters spawned");
+      this.#spawnCluster(i);
+    this.emit("debug", "All clusters spawned");
   }
   async kill(signal = "SIGTERM") {
     this.emit("debug", "Shutting down all clusters...");
@@ -573,6 +582,12 @@ var ShardingManager = class extends EventEmitter__default.default {
     let promises = this.clusters.map((cluster) => cluster.eval(fn));
     return Promise.all(promises);
   }
+  send(shardId, payload) {
+    let cluster = this.clusters.find((cluster2) => cluster2.shards.has(shardId));
+    if (!cluster)
+      throw new Error(`Shard ${shardId} not found`);
+    cluster.send(payload);
+  }
   requestIdentify(cluster, shardId) {
     this.#identifyQueue?.add(() => cluster.identifyShard(shardId));
   }
@@ -580,7 +595,7 @@ var ShardingManager = class extends EventEmitter__default.default {
     let start = clusterId * this.options.shardsPerCluster, end = Math.min(start + this.options.shardsPerCluster, this.totalShards);
     return Array.from({ length: end - start }, (_, i) => start + i);
   }
-  async #spawnCluster(id) {
+  #spawnCluster(id) {
     let shardIds = this.#getShardIdsForCluster(id), firstShardId = shardIds[0], lastShardId = shardIds[shardIds.length - 1];
     this.emit("debug", `Spawning cluster ${id} (shards ${firstShardId}-${lastShardId})`);
     let env = {

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import EventEmitter from 'node:events';
 import { GatewayReadyDispatchData, GatewayReceivePayload, GatewayDispatchPayload, GatewaySendPayload } from 'discord-api-types/v10';
 import { ChildProcess } from 'node:child_process';
-import { Collection } from '@bakit/utils';
-import { REST, RESTProxy } from '@bakit/rest';
+import { Collection } from '@discordjs/collection';
+import { RESTLike } from '@bakit/rest';
 
 declare enum ShardState {
     Idle = 0,
@@ -115,8 +115,8 @@ declare class ShardingManager extends EventEmitter<ShardingManagerEvents> {
     #private;
     readonly clusters: Collection<number, ClusterProcess>;
     readonly options: Required<ShardingManagerOptions>;
-    readonly rest: REST | RESTProxy;
-    constructor(options: ShardingManagerOptions, rest?: REST | RESTProxy);
+    readonly rest: RESTLike;
+    constructor(options: ShardingManagerOptions, rest?: RESTLike);
     get totalClusters(): number;
     get totalShards(): number;
     get ready(): boolean;
@@ -124,6 +124,7 @@ declare class ShardingManager extends EventEmitter<ShardingManagerEvents> {
     kill(signal?: NodeJS.Signals): Promise<void>;
     broadcast(payload: GatewaySendPayload): void;
     broadcastEval<T>(fn: (cluster: Cluster) => T | Promise<T>): Promise<EvalResult<T>[]>;
+    send(shardId: number, payload: GatewaySendPayload): void;
     protected requestIdentify(cluster: ClusterProcess, shardId: number): void;
 }
 
@@ -188,6 +189,7 @@ declare class ClusterProcess extends EventEmitter<ClusterEvents> {
     readonly id: number;
     readonly process: ChildProcess;
     constructor(manager: ShardingManager, id: number, options?: ClusterProcessOptions);
+    get shards(): Set<number>;
     get killed(): boolean;
     kill(signal?: NodeJS.Signals): void;
     eval<T, C = unknown>(fn: (cluster: Cluster, ctx: C) => T | Promise<T>, ctx?: C): Promise<EvalResult<T>>;

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import EventEmitter from 'node:events';
 import { GatewayReadyDispatchData, GatewayReceivePayload, GatewayDispatchPayload, GatewaySendPayload } from 'discord-api-types/v10';
 import { ChildProcess } from 'node:child_process';
-import { Collection } from '@bakit/utils';
-import { REST, RESTProxy } from '@bakit/rest';
+import { Collection } from '@discordjs/collection';
+import { RESTLike } from '@bakit/rest';
 
 declare enum ShardState {
     Idle = 0,
@@ -115,8 +115,8 @@ declare class ShardingManager extends EventEmitter<ShardingManagerEvents> {
     #private;
     readonly clusters: Collection<number, ClusterProcess>;
     readonly options: Required<ShardingManagerOptions>;
-    readonly rest: REST | RESTProxy;
-    constructor(options: ShardingManagerOptions, rest?: REST | RESTProxy);
+    readonly rest: RESTLike;
+    constructor(options: ShardingManagerOptions, rest?: RESTLike);
     get totalClusters(): number;
     get totalShards(): number;
     get ready(): boolean;
@@ -124,6 +124,7 @@ declare class ShardingManager extends EventEmitter<ShardingManagerEvents> {
     kill(signal?: NodeJS.Signals): Promise<void>;
     broadcast(payload: GatewaySendPayload): void;
     broadcastEval<T>(fn: (cluster: Cluster) => T | Promise<T>): Promise<EvalResult<T>[]>;
+    send(shardId: number, payload: GatewaySendPayload): void;
     protected requestIdentify(cluster: ClusterProcess, shardId: number): void;
 }
 
@@ -188,6 +189,7 @@ declare class ClusterProcess extends EventEmitter<ClusterEvents> {
     readonly id: number;
     readonly process: ChildProcess;
     constructor(manager: ShardingManager, id: number, options?: ClusterProcessOptions);
+    get shards(): Set<number>;
     get killed(): boolean;
     kill(signal?: NodeJS.Signals): void;
     eval<T, C = unknown>(fn: (cluster: Cluster, ctx: C) => T | Promise<T>, ctx?: C): Promise<EvalResult<T>>;

package/dist/index.js

@@ -7,7 +7,9 @@ import { GatewayOpcodes, GatewayDispatchEvents, GatewayCloseCodes } from 'discor
 import { fork } from 'child_process';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
-import { isCommonJS, Collection, Queue } from '@bakit/utils';
+import { isCommonJS } from '@bakit/utils';
+import { Collection } from '@discordjs/collection';
+import PQueue from 'p-queue';
 import { REST } from '@bakit/rest';
 
 // src/lib/Shard.ts
@@ -275,6 +277,10 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter {
   }
   process;
   #pendingEvals = /* @__PURE__ */ new Map();
+  #shards = /* @__PURE__ */ new Set();
+  get shards() {
+    return new Set(this.#shards);
+  }
   get killed() {
     return this.process.killed || !this.process.connected;
   }
@@ -343,7 +349,7 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter {
   #handleIPC(message) {
     if (this.#isValidPayload(message)) {
       if (isDispatchPayload(message)) {
-        this.emit(message.t, ...message.d);
+        this.#handleDispatchPayload(message);
         return;
       }
       if (isEvalResponsePayload(message)) {
@@ -352,6 +358,9 @@ var ClusterProcess = class _ClusterProcess extends EventEmitter {
       }
     }
   }
+  #handleDispatchPayload(payload) {
+    payload.t === "shardAdd" && this.#shards.add(payload.d[0]), this.emit(payload.t, ...payload.d);
+  }
   #handleEvalResponse(payload) {
     let pending = this.#pendingEvals.get(payload.d.nonce);
     if (!pending) {
@@ -529,22 +538,21 @@ var ShardingManager = class extends EventEmitter {
     return this.#totalShards;
   }
   get ready() {
-    return this.#readyCount === this.totalClusters;
+    return this.totalClusters > 0 && this.#readyCount === this.totalClusters;
   }
   async spawn() {
     this.#gatewayInfo = await this.rest.get("/gateway/bot");
     let { session_start_limit: limit } = this.#gatewayInfo;
-    this.#totalShards = typeof this.options.totalShards == "number" ? this.options.totalShards : this.#gatewayInfo.shards, this.#identifyQueue = new Queue({
+    this.#totalShards = typeof this.options.totalShards == "number" ? this.options.totalShards : this.#gatewayInfo.shards, this.#identifyQueue = new PQueue({
       concurrency: limit.max_concurrency,
       intervalCap: limit.max_concurrency,
       interval: 5e3
     });
     let { totalShards, totalClusters } = this;
     this.emit("debug", `Spawning ${totalClusters} clusters (${totalShards} total shards)...`);
-    let promises = [];
     for (let i = 0; i < totalClusters; i++)
-      promises.push(this.#spawnCluster(i));
-    await Promise.all(promises), this.emit("debug", "All clusters spawned");
+      this.#spawnCluster(i);
+    this.emit("debug", "All clusters spawned");
   }
   async kill(signal = "SIGTERM") {
     this.emit("debug", "Shutting down all clusters...");
@@ -565,6 +573,12 @@ var ShardingManager = class extends EventEmitter {
     let promises = this.clusters.map((cluster) => cluster.eval(fn));
     return Promise.all(promises);
   }
+  send(shardId, payload) {
+    let cluster = this.clusters.find((cluster2) => cluster2.shards.has(shardId));
+    if (!cluster)
+      throw new Error(`Shard ${shardId} not found`);
+    cluster.send(payload);
+  }
   requestIdentify(cluster, shardId) {
     this.#identifyQueue?.add(() => cluster.identifyShard(shardId));
   }
@@ -572,7 +586,7 @@ var ShardingManager = class extends EventEmitter {
     let start = clusterId * this.options.shardsPerCluster, end = Math.min(start + this.options.shardsPerCluster, this.totalShards);
     return Array.from({ length: end - start }, (_, i) => start + i);
   }
-  async #spawnCluster(id) {
+  #spawnCluster(id) {
     let shardIds = this.#getShardIdsForCluster(id), firstShardId = shardIds[0], lastShardId = shardIds[shardIds.length - 1];
     this.emit("debug", `Spawning cluster ${id} (shards ${firstShardId}-${lastShardId})`);
     let env = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakit/gateway",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Gateway manager for bakit framework",
   "type": "module",
   "exports": {
@@ -34,11 +34,13 @@
   "author": "louiszn",
   "license": "MIT",
   "dependencies": {
+    "@discordjs/collection": "^2.1.1",
     "discord-api-types": "^0.38.38",
+    "p-queue": "^9.1.0",
     "type-fest": "^4.41.0",
     "ws": "^8.19.0",
-    "@bakit/rest": "^3.0.1",
-    "@bakit/utils": "^2.3.0"
+    "@bakit/rest": "^3.0.2",
+    "@bakit/utils": "^3.0.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"