seyfert 2.1.1-dev-11388830407.0 → 2.1.1-dev-11415196258.0

package/lib/client/workerclient.d.ts

@@ -40,7 +40,8 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     handleManagerMessages(data: ManagerMessages): Promise<any>;
     private generateNonce;
     private generateSendPromise;
-    tellWorker(workerId: number, func: (_: this) => any): Promise<unknown>;
+    tellWorker<R>(workerId: number, func: (_: this) => R): Promise<R>;
+    tellWorkers<R>(func: (_: this) => R): Promise<Awaited<R>[]>;
     protected onPacket(packet: GatewayDispatchPayload, shardId: number): Promise<void>;
 }
 export declare function generateShardInfo(shard: Shard): WorkerShardInfo;

package/lib/client/workerclient.js

@@ -18,15 +18,16 @@ let manager;
 try {
     workerData = {
         debug: process.env.SEYFERT_WORKER_DEBUG === 'true',
-        intents: Number.parseInt(process.env.SEYFERT_WORKER_INTENTS),
+        intents: Number(process.env.SEYFERT_WORKER_INTENTS),
         path: process.env.SEYFERT_WORKER_PATH,
-        shards: process.env.SEYFERT_WORKER_SHARDS.split(',').map(id => Number.parseInt(id)),
+        shards: process.env.SEYFERT_WORKER_SHARDS.split(',').map(id => Number(id)),
         token: process.env.SEYFERT_WORKER_TOKEN,
-        workerId: Number.parseInt(process.env.SEYFERT_WORKER_WORKERID),
+        workerId: Number(process.env.SEYFERT_WORKER_WORKERID),
         workerProxy: process.env.SEYFERT_WORKER_WORKERPROXY === 'true',
         totalShards: Number(process.env.SEYFERT_WORKER_TOTALSHARDS),
         mode: process.env.SEYFERT_WORKER_MODE,
         resharding: process.env.SEYFERT_WORKER_RESHARDING === 'true',
+        totalWorkers: Number(process.env.SEYFERT_WORKER_TOTALWORKERS),
     };
 }
 catch {
@@ -327,6 +328,7 @@ class WorkerClient extends base_1.BaseClient {
                 }
                 break;
             case 'EXECUTE_EVAL':
+            case 'EXECUTE_EVAL_TO_WORKER':
                 {
                     let result;
                     try {
@@ -409,7 +411,7 @@ class WorkerClient extends base_1.BaseClient {
     tellWorker(workerId, func) {
         const nonce = this.generateNonce();
         this.postMessage({
-            type: 'EVAL',
+            type: 'EVAL_TO_WORKER',
             func: func.toString(),
             toWorkerId: workerId,
             workerId: workerData.workerId,
@@ -417,6 +419,13 @@ class WorkerClient extends base_1.BaseClient {
         });
         return this.generateSendPromise(nonce);
     }
+    tellWorkers(func) {
+        const promises = [];
+        for (let i = 0; i < workerData.totalWorkers; i++) {
+            promises.push(this.tellWorker(i, func));
+        }
+        return Promise.all(promises);
+    }
     async onPacket(packet, shardId) {
         Promise.allSettled([
             this.events?.runEvent('RAW', this, packet, shardId, false),
@@ -519,5 +528,6 @@ function generateShardInfo(shard) {
         shardId: shard.id,
         latency: shard.latency,
         resumable: shard.resumable,
+        workerId: workerData.workerId,
     };
 }

package/lib/commands/applications/entrycontext.d.ts

@@ -22,7 +22,7 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     get fullCommandName(): string;
     write<WR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, void | WebhookMessageStructure>>;
     modal(body: ModalCreateBodyRequest): Promise<undefined>;
-    deferReply<WR extends boolean = false>(ephemeral?: boolean): Promise<When<WR, WebhookMessageStructure, undefined>>;
+    deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
     deleteResponse(): Promise<void | undefined>;
     editOrReply<WR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure | MessageStructure, void | WebhookMessageStructure | MessageStructure>>;

package/lib/commands/applications/entrycontext.js

@@ -29,8 +29,8 @@ class EntryPointContext extends basecontext_1.BaseContext {
     modal(body) {
         return this.interaction.modal(body);
     }
-    deferReply(ephemeral = false) {
-        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined);
+    deferReply(ephemeral = false, withResponse) {
+        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined, withResponse);
     }
     editResponse(body) {
         return this.interaction.editResponse(body);

package/lib/commands/applications/menucontext.d.ts

@@ -23,7 +23,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     get fullCommandName(): string;
     write<WR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, void | WebhookMessageStructure>>;
     modal(body: ModalCreateBodyRequest): Promise<undefined>;
-    deferReply<WR extends boolean = false>(ephemeral?: boolean): Promise<When<WR, WebhookMessageStructure, undefined>>;
+    deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
     deleteResponse(): Promise<void | undefined>;
     editOrReply<WR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure | MessageStructure, void | WebhookMessageStructure | MessageStructure>>;

package/lib/commands/applications/menucontext.js

@@ -44,8 +44,8 @@ class MenuCommandContext extends basecontext_1.BaseContext {
     modal(body) {
         return this.interaction.modal(body);
     }
-    deferReply(ephemeral = false) {
-        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined);
+    deferReply(ephemeral = false, withResponse) {
+        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined, withResponse);
     }
     editResponse(body) {
         return this.interaction.editResponse(body);

package/lib/structures/Interaction.d.ts

@@ -36,7 +36,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     static transformBody<T>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest, files: RawFile[] | undefined, self: UsingClient): T;
     private matchReplied;
     reply<WR extends boolean = false>(body: ReplyInteractionBody, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
-    deferReply<WR extends boolean = false>(flags?: MessageFlags, withResponse?: boolean): Promise<When<WR, WebhookMessageStructure, undefined>>;
+    deferReply<WR extends boolean = false>(flags?: MessageFlags, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     isButton(): this is ButtonInteraction;
     isChannelSelectMenu(): this is ChannelSelectMenuInteraction;
     isRoleSelectMenu(): this is RoleSelectMenuInteraction;

package/lib/structures/Interaction.js

@@ -136,7 +136,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
         }
         return result;
     }
-    deferReply(flags, withResponse = false) {
+    deferReply(flags, withResponse) {
         return this.reply({
             type: types_1.InteractionResponseType.DeferredChannelMessageWithSource,
             data: {

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

@@ -112,6 +112,7 @@ export interface WorkerData {
     path: string;
     shards: number[];
     totalShards: number;
+    totalWorkers: number;
     mode: 'custom' | 'clusters' | 'threads';
     workerId: number;
     debug: boolean;

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

@@ -5,6 +5,7 @@ export interface WorkerShardInfo {
     shardId: number;
     latency: number;
     resumable: boolean;
+    workerId: number;
 }
 export type WorkerInfo = {
     shards: WorkerShardInfo[];
@@ -53,10 +54,10 @@ export type WorkerSendEvalResponse = CreateWorkerMessage<'EVAL_RESPONSE', {
     response: unknown;
     nonce: string;
 }>;
-export type WorkerSendEval = CreateWorkerMessage<'EVAL', {
+export type WorkerSendToWorkerEval = CreateWorkerMessage<'EVAL_TO_WORKER', {
     func: string;
     nonce: string;
     toWorkerId: number;
 }>;
-export type WorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendEval | WorkerStart | WorkerStartResharding | WorkerRequestConnectResharding | WorkerReadyResharding | WorkerDisconnectedAllShardsResharding;
+export type WorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendToWorkerEval | WorkerStart | WorkerStartResharding | WorkerRequestConnectResharding | WorkerReadyResharding | WorkerDisconnectedAllShardsResharding;
 export {};

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

@@ -1,12 +1,13 @@
 import { type Worker as ClusterWorker } from 'node:cluster';
-import { ApiHandler, Logger } from '../..';
+import type { Worker as WorkerThreadsWorker } from 'node:worker_threads';
+import { ApiHandler, Logger, type UsingClient, type WorkerClient } from '../..';
 import { type Adapter } from '../../cache';
 import { type MakePartial } from '../../common';
 import type { GatewayPresenceUpdateData, GatewaySendPayload } from '../../types';
 import { ConnectQueue } from '../structures/timeout';
 import type { ShardOptions, WorkerData, WorkerManagerOptions } from './shared';
 import type { WorkerInfo, WorkerMessage, WorkerShardInfo } from './worker';
-export declare class WorkerManager extends Map<number, (ClusterWorker | import('node:worker_threads').Worker | {
+export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerThreadsWorker | {
     ready?: boolean;
 }) & {
     ready?: boolean;
@@ -52,8 +53,8 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | import('
     calculateShardId(guildId: string): number;
     calculateWorkerId(shardId: number): number;
     postMessage(id: number, body: ManagerMessages): void;
-    prepareWorkers(shards: number[][], resharding?: boolean): Promise<void>;
-    createWorker(workerData: WorkerData): ClusterWorker | import("worker_threads").Worker | ({
+    prepareWorkers(shards: number[][], resharding?: boolean): void;
+    createWorker(workerData: WorkerData): ClusterWorker | WorkerThreadsWorker | ({
         ready?: boolean;
     } & {
         ready?: boolean;
@@ -67,6 +68,8 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | import('
     send(data: GatewaySendPayload, shardId: number): Promise<true>;
     getShardInfo(shardId: number): Promise<WorkerShardInfo>;
     getWorkerInfo(workerId: number): Promise<WorkerInfo>;
+    tellWorker<R>(workerId: number, func: (_: WorkerClient & UsingClient) => R): Promise<R>;
+    tellWorkers<R>(func: (_: WorkerClient & UsingClient) => R): Promise<Awaited<R>[]>;
     start(): Promise<void>;
     startResharding(): Promise<void>;
 }
@@ -107,14 +110,18 @@ export type ManagerSendApiResponse = CreateManagerMessage<'API_RESPONSE', {
     error?: any;
     nonce: string;
 }>;
-export type ManagerExecuteEval = CreateManagerMessage<'EXECUTE_EVAL', {
+export type ManagerExecuteEvalToWorker = CreateManagerMessage<'EXECUTE_EVAL_TO_WORKER', {
     func: string;
     nonce: string;
     toWorkerId: number;
 }>;
+export type ManagerExecuteEval = CreateManagerMessage<'EXECUTE_EVAL', {
+    func: string;
+    nonce: string;
+}>;
 export type ManagerSendEvalResponse = CreateManagerMessage<'EVAL_RESPONSE', {
     response: any;
     nonce: string;
 }>;
-export type ManagerMessages = ManagerAllowConnect | ManagerSpawnShards | ManagerSendPayload | ManagerRequestShardInfo | ManagerRequestWorkerInfo | ManagerSendCacheResult | ManagerSendBotReady | ManagerSendApiResponse | ManagerSendEvalResponse | ManagerExecuteEval | ManagerWorkerAlreadyExistsResharding | ManagerSpawnShardsResharding | ManagerAllowConnectResharding | DisconnectAllShardsResharding | ConnnectAllShardsResharding;
+export type ManagerMessages = ManagerAllowConnect | ManagerSpawnShards | ManagerSendPayload | ManagerRequestShardInfo | ManagerRequestWorkerInfo | ManagerSendCacheResult | ManagerSendBotReady | ManagerSendApiResponse | ManagerSendEvalResponse | ManagerExecuteEvalToWorker | ManagerWorkerAlreadyExistsResharding | ManagerSpawnShardsResharding | ManagerAllowConnectResharding | DisconnectAllShardsResharding | ConnnectAllShardsResharding | ManagerExecuteEval;
 export {};

package/lib/websocket/discord/workermanager.js

@@ -104,7 +104,7 @@ class WorkerManager extends Map {
                 break;
         }
     }
-    async prepareWorkers(shards, resharding = false) {
+    prepareWorkers(shards, resharding = false) {
         const worker_threads = (0, common_1.lazyLoadPackage)('node:worker_threads');
         if (!worker_threads)
             throw new Error('Cannot prepare workers without worker_threads.');
@@ -123,6 +123,7 @@ class WorkerManager extends Map {
                         totalShards: resharding ? this._info.shards : this.totalShards,
                         mode: this.options.mode,
                         resharding,
+                        totalWorkers: shards.length,
                     });
                     this.set(i, worker);
                 });
@@ -362,23 +363,23 @@ class WorkerManager extends Map {
                 break;
             case 'EVAL_RESPONSE':
                 {
-                    const { nonce, type, ...data } = message;
+                    const { nonce, response } = message;
                     const evalResponse = this.promises.get(nonce);
                     if (!evalResponse) {
                         return;
                     }
                     this.promises.delete(nonce);
                     clearTimeout(evalResponse.timeout);
-                    evalResponse.resolve(data.response);
+                    evalResponse.resolve(response);
                 }
                 break;
-            case 'EVAL':
+            case 'EVAL_TO_WORKER':
                 {
                     const nonce = this.generateNonce();
                     this.postMessage(message.toWorkerId, {
                         nonce,
                         func: message.func,
-                        type: 'EXECUTE_EVAL',
+                        type: 'EXECUTE_EVAL_TO_WORKER',
                         toWorkerId: message.toWorkerId,
                     });
                     this.generateSendPromise(nonce, 'Eval timeout').then(val => this.postMessage(message.workerId, {
@@ -439,6 +440,22 @@ class WorkerManager extends Map {
         this.postMessage(workerId, { nonce, type: 'WORKER_INFO' });
         return this.generateSendPromise(nonce, 'Get worker info timeout');
     }
+    tellWorker(workerId, func) {
+        const nonce = this.generateNonce();
+        this.postMessage(workerId, {
+            type: 'EXECUTE_EVAL',
+            func: func.toString(),
+            nonce,
+        });
+        return this.generateSendPromise(nonce);
+    }
+    tellWorkers(func) {
+        const promises = [];
+        for (const i of this.keys()) {
+            promises.push(this.tellWorker(i, func));
+        }
+        return Promise.all(promises);
+    }
     async start() {
         const rc = await base_1.BaseClient.prototype.getRC();
         this.options.debug ||= rc.debug;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11388830407.0",
+	"version": "2.1.1-dev-11415196258.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -21,10 +21,10 @@
 	"author": "MARCROCK22",
 	"license": "MIT",
 	"devDependencies": {
-		"@biomejs/biome": "1.9.3",
+		"@biomejs/biome": "1.9.4",
 		"@commitlint/cli": "^19.5.0",
 		"@commitlint/config-conventional": "^19.5.0",
-		"@types/node": "^22.7.6",
+		"@types/node": "^22.7.7",
 		"husky": "^9.1.6",
 		"lint-staged": "^15.2.10",
 		"typescript": "^5.6.3",