galactic.ts 1.0.1 → 1.1.0

package/dist/index.mjs

@@ -195,6 +195,7 @@ var BridgeClientConnection = class {
   data;
   connectionStatus = "ready" /* READY */;
   dev = false;
+  establishedAt = Date.now();
   _onMessage;
   _onRequest;
   constructor(instanceID, connection, data, dev) {
@@ -388,6 +389,7 @@ var Bridge = class {
   intents;
   shardsPerCluster = 1;
   clusterToStart = 1;
+  reclusteringTimeoutInMs;
   clusterCalculator;
   eventMap = {
     CLUSTER_READY: void 0,
@@ -400,12 +402,13 @@ var Bridge = class {
     ERROR: void 0,
     CLIENT_STOP: void 0
   };
-  constructor(port, token, intents, shardsPerCluster, clusterToStart) {
+  constructor(port, token, intents, shardsPerCluster, clusterToStart, reclusteringTimeoutInMs) {
     this.port = port;
     this.token = token;
     this.intents = intents;
     this.clusterToStart = clusterToStart;
     this.shardsPerCluster = shardsPerCluster;
+    this.reclusteringTimeoutInMs = reclusteringTimeoutInMs;
     this.clusterCalculator = new ClusterCalculator(this.clusterToStart, this.shardsPerCluster);
     this.server = new Server({
       port: this.port
@@ -429,7 +432,7 @@ var Bridge = class {
     if (!up) {
       return;
     }
-    const connectedClients = this.connectedClients.values().filter((c) => c.connectionStatus == "ready" /* READY */ && !c.dev).toArray();
+    const connectedClients = this.connectedClients.values().filter((c) => c.connectionStatus == "ready" /* READY */).filter((c) => !c.dev).filter((c) => c.establishedAt + this.reclusteringTimeoutInMs < Date.now()).toArray();
     const { most, least } = this.clusterCalculator.findMostAndLeastClustersForConnections(connectedClients);
     if (most) {
       const clusterToSteal = this.clusterCalculator.getClusterForConnection(most)[0] || void 0;
@@ -731,6 +734,17 @@ var Bridge = class {
       await instance.connection.close("Instance stopped.", false);
     }
   }
+  sendRequestToGuild(cluster, guildID, data, timeout = 5e3) {
+    if (!cluster.connection) {
+      return Promise.reject(new Error("No connection defined for cluster " + cluster.clusterID));
+    }
+    return cluster.connection.eventManager.request({
+      type: "REDIRECT_REQUEST_TO_GUILD",
+      clusterID: cluster.clusterID,
+      guildID,
+      data
+    }, timeout);
+  }
 };
 
 // src/cluster/Cluster.ts
@@ -744,6 +758,7 @@ var Cluster = class _Cluster {
   intents;
   eventManager;
   client;
+  onSelfDestruct;
   eventMap = {
     message: void 0,
     request: void 0,
@@ -882,6 +897,10 @@ var Cluster = class _Cluster {
       } else {
         return result;
       }
+    } else if (m.type == "SELF_DESTRUCT") {
+      if (this.onSelfDestruct) {
+        this.onSelfDestruct();
+      }
     }
     return void 0;
   }
@@ -1015,6 +1034,7 @@ var BotInstance = class {
     "message": void 0,
     "request": void 0,
     "PROCESS_KILLED": void 0,
+    "PROCESS_SELF_DESTRUCT_ERROR": void 0,
     "PROCESS_SPAWNED": void 0,
     "ERROR": void 0,
     "PROCESS_ERROR": void 0,
@@ -1044,7 +1064,8 @@ var BotInstance = class {
         },
         stdio: "inherit",
         execArgv: this.execArgv,
-        silent: false
+        silent: false,
+        detached: true
       });
       const client = new ClusterProcess(clusterID, child, shardList, totalShards);
       child.stdout?.on("data", (data) => {
@@ -1079,18 +1100,29 @@ var BotInstance = class {
   }
   killProcess(client, reason) {
     client.status = "stopped";
-    if (client.child && client.child.pid) {
-      if (client.child.kill("SIGKILL")) {
-        if (this.eventMap.PROCESS_KILLED) this.eventMap.PROCESS_KILLED(client, reason, true);
+    client.eventManager.request({
+      type: "SELF_DESTRUCT",
+      reason
+    }, 5e3).catch(() => {
+      if (this.eventMap.PROCESS_SELF_DESTRUCT_ERROR) this.eventMap.PROCESS_SELF_DESTRUCT_ERROR(client, reason, "Cluster didnt respond to shot-call.");
+    }).finally(() => {
+      if (client.child && client.child.pid) {
+        if (client.child.kill("SIGKILL")) {
+          if (this.eventMap.PROCESS_KILLED) this.eventMap.PROCESS_KILLED(client, reason, true);
+        } else {
+          if (this.eventMap.ERROR) this.eventMap.ERROR(`Failed to kill process for cluster ${client.id}`);
+          client.child.kill("SIGKILL");
+        }
+        try {
+          process.kill(-client.child.pid);
+        } catch {
+        }
       } else {
-        if (this.eventMap.ERROR) this.eventMap.ERROR(`Failed to kill process for cluster ${client.id}`);
-        client.child.kill("SIGKILL");
+        if (this.eventMap.PROCESS_KILLED) this.eventMap.PROCESS_KILLED(client, reason, false);
       }
-    } else {
-      if (this.eventMap.PROCESS_KILLED) this.eventMap.PROCESS_KILLED(client, reason, false);
-    }
-    this.clients.delete(client.id);
-    this.setClusterStopped(client, reason);
+      this.clients.delete(client.id);
+      this.setClusterStopped(client, reason);
+    });
   }
   onMessage(client, message2) {
     if (message2.type === "CLUSTER_READY") {