galactic.ts 1.0.1 → 1.1.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Connection, Server } from 'net-ipc';
-import { GatewayIntentsString, Client } from 'discord.js';
+import { GatewayIntentsString, Snowflake, Client } from 'discord.js';
 import { ChildProcess } from 'child_process';
 
 type EventPayload = {
@@ -32,6 +32,7 @@ declare class BridgeClientConnection {
     readonly data: unknown;
     connectionStatus: BridgeClientConnectionStatus;
     readonly dev: boolean;
+    readonly establishedAt: number;
     private _onMessage?;
     private _onRequest?;
     constructor(instanceID: number, connection: Connection, data: unknown, dev: boolean);
@@ -103,9 +104,10 @@ declare class Bridge {
     private readonly intents;
     private readonly shardsPerCluster;
     private readonly clusterToStart;
+    private readonly reclusteringTimeoutInMs;
     private readonly clusterCalculator;
     private readonly eventMap;
-    constructor(port: number, token: string, intents: GatewayIntentsString[], shardsPerCluster: number, clusterToStart: number);
+    constructor(port: number, token: string, intents: GatewayIntentsString[], shardsPerCluster: number, clusterToStart: number, reclusteringTimeoutInMs: number);
     start(): void;
     private interval;
     private checkRecluster;
@@ -121,6 +123,7 @@ declare class Bridge {
     stopAllInstancesWithRestart(): Promise<void>;
     moveCluster(instance: BridgeClientConnection, cluster: BridgeClientCluster): Promise<void>;
     stopInstance(instance: BridgeClientConnection, recluster?: boolean): Promise<void>;
+    sendRequestToGuild(cluster: BridgeClientCluster, guildID: Snowflake, data: unknown, timeout?: number): Promise<unknown>;
 }
 type BridgeEventListeners = {
     'CLUSTER_READY': ((cluster: BridgeClientCluster, guilds: number, members: number) => void) | undefined;
@@ -199,6 +202,7 @@ declare class Cluster<T extends Client> {
     readonly intents: GatewayIntentsString[];
     eventManager: EventManager;
     client: T;
+    onSelfDestruct?: () => void;
     private readonly eventMap;
     constructor(instanceID: number, clusterID: number, shardList: number[], totalShards: number, token: string, intents: GatewayIntentsString[]);
     static initial<T extends Client>(): Cluster<T>;
@@ -264,6 +268,7 @@ type BotInstanceEventListeners = {
     'message': ((client: ClusterProcess, message: unknown) => void) | undefined;
     'request': ((client: ClusterProcess, message: unknown, resolve: (data: unknown) => void, reject: (error: any) => void) => void) | undefined;
     'PROCESS_KILLED': ((client: ClusterProcess, reason: string, processKilled: boolean) => void) | undefined;
+    'PROCESS_SELF_DESTRUCT_ERROR': ((client: ClusterProcess, reason: string, error: unknown) => void) | undefined;
     'PROCESS_SPAWNED': ((client: ClusterProcess) => void) | undefined;
     'PROCESS_ERROR': ((client: ClusterProcess, error: unknown) => void) | undefined;
     'CLUSTER_READY': ((client: ClusterProcess) => void) | undefined;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Connection, Server } from 'net-ipc';
-import { GatewayIntentsString, Client } from 'discord.js';
+import { GatewayIntentsString, Snowflake, Client } from 'discord.js';
 import { ChildProcess } from 'child_process';
 
 type EventPayload = {
@@ -32,6 +32,7 @@ declare class BridgeClientConnection {
     readonly data: unknown;
     connectionStatus: BridgeClientConnectionStatus;
     readonly dev: boolean;
+    readonly establishedAt: number;
     private _onMessage?;
     private _onRequest?;
     constructor(instanceID: number, connection: Connection, data: unknown, dev: boolean);
@@ -103,9 +104,10 @@ declare class Bridge {
     private readonly intents;
     private readonly shardsPerCluster;
     private readonly clusterToStart;
+    private readonly reclusteringTimeoutInMs;
     private readonly clusterCalculator;
     private readonly eventMap;
-    constructor(port: number, token: string, intents: GatewayIntentsString[], shardsPerCluster: number, clusterToStart: number);
+    constructor(port: number, token: string, intents: GatewayIntentsString[], shardsPerCluster: number, clusterToStart: number, reclusteringTimeoutInMs: number);
     start(): void;
     private interval;
     private checkRecluster;
@@ -121,6 +123,7 @@ declare class Bridge {
     stopAllInstancesWithRestart(): Promise<void>;
     moveCluster(instance: BridgeClientConnection, cluster: BridgeClientCluster): Promise<void>;
     stopInstance(instance: BridgeClientConnection, recluster?: boolean): Promise<void>;
+    sendRequestToGuild(cluster: BridgeClientCluster, guildID: Snowflake, data: unknown, timeout?: number): Promise<unknown>;
 }
 type BridgeEventListeners = {
     'CLUSTER_READY': ((cluster: BridgeClientCluster, guilds: number, members: number) => void) | undefined;
@@ -199,6 +202,7 @@ declare class Cluster<T extends Client> {
     readonly intents: GatewayIntentsString[];
     eventManager: EventManager;
     client: T;
+    onSelfDestruct?: () => void;
     private readonly eventMap;
     constructor(instanceID: number, clusterID: number, shardList: number[], totalShards: number, token: string, intents: GatewayIntentsString[]);
     static initial<T extends Client>(): Cluster<T>;
@@ -264,6 +268,7 @@ type BotInstanceEventListeners = {
     'message': ((client: ClusterProcess, message: unknown) => void) | undefined;
     'request': ((client: ClusterProcess, message: unknown, resolve: (data: unknown) => void, reject: (error: any) => void) => void) | undefined;
     'PROCESS_KILLED': ((client: ClusterProcess, reason: string, processKilled: boolean) => void) | undefined;
+    'PROCESS_SELF_DESTRUCT_ERROR': ((client: ClusterProcess, reason: string, error: unknown) => void) | undefined;
     'PROCESS_SPAWNED': ((client: ClusterProcess) => void) | undefined;
     'PROCESS_ERROR': ((client: ClusterProcess, error: unknown) => void) | undefined;
     'CLUSTER_READY': ((client: ClusterProcess) => void) | undefined;

package/dist/index.js

@@ -244,6 +244,7 @@ var BridgeClientConnection = class {
   data;
   connectionStatus = "ready" /* READY */;
   dev = false;
+  establishedAt = Date.now();
   _onMessage;
   _onRequest;
   constructor(instanceID, connection, data, dev) {
@@ -437,6 +438,7 @@ var Bridge = class {
   intents;
   shardsPerCluster = 1;
   clusterToStart = 1;
+  reclusteringTimeoutInMs;
   clusterCalculator;
   eventMap = {
     CLUSTER_READY: void 0,
@@ -449,12 +451,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 import_net_ipc.Server({
       port: this.port
@@ -478,7 +481,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;
@@ -780,6 +783,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
@@ -793,6 +807,7 @@ var Cluster = class _Cluster {
   intents;
   eventManager;
   client;
+  onSelfDestruct;
   eventMap = {
     message: void 0,
     request: void 0,
@@ -931,6 +946,10 @@ var Cluster = class _Cluster {
       } else {
         return result;
       }
+    } else if (m.type == "SELF_DESTRUCT") {
+      if (this.onSelfDestruct) {
+        this.onSelfDestruct();
+      }
     }
     return void 0;
   }
@@ -1064,6 +1083,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,
@@ -1093,7 +1113,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) => {
@@ -1128,18 +1149,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") {