seyfert 2.1.1-dev-11916234323.0 → 2.1.1-dev-11937208019.0

package/lib/api/Router.js

@@ -45,12 +45,10 @@ exports.CDNRouter = {
                 if (key === 'get') {
                     return (value, options) => {
                         const lastRoute = `${common_1.CDN_URL}/${route.join('/')}`;
-                        let routeResult = lastRoute;
                         if (typeof value === 'string' || typeof value === 'number') {
-                            routeResult = `${lastRoute}${value ? `/${value}` : ''}`;
-                            return parseCDNURL(routeResult, options);
+                            return parseCDNURL(`${lastRoute}/${value}`, options);
                         }
-                        return parseCDNURL(routeResult, value);
+                        return parseCDNURL(lastRoute, value);
                     };
                 }
                 return this.createProxy([...route, key]);

package/lib/client/workerclient.d.ts

@@ -2,7 +2,7 @@ import { type DeepPartial, type MakeRequired, type When } from '../common';
 import { EventHandler } from '../events';
 import type { GatewayDispatchPayload } from '../types';
 import { Shard, type ShardManagerOptions, type WorkerData } from '../websocket';
-import type { WorkerMessage, WorkerShardInfo } from '../websocket/discord/worker';
+import type { WorkerMessages, WorkerShardInfo } from '../websocket/discord/worker';
 import type { ManagerMessages, ManagerSpawnShards } from '../websocket/discord/workermanager';
 import type { BaseClientOptions, ServicesOptions, StartOptions } from './base';
 import { BaseClient } from './base';
@@ -36,7 +36,7 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     get workerData(): WorkerData;
     start(options?: Omit<DeepPartial<StartOptions>, 'httpConnection' | 'token' | 'connection'>): Promise<void>;
     loadEvents(dir?: string): Promise<void>;
-    postMessage(body: WorkerMessage): unknown;
+    postMessage(body: WorkerMessages): unknown;
     handleManagerMessages(data: ManagerMessages): Promise<any>;
     private generateNonce;
     private generateSendPromise;
@@ -54,5 +54,6 @@ interface WorkerClientOptions extends BaseClientOptions {
     postMessage?: (body: unknown) => unknown;
     /** can have perfomance issues in big bots if the client sends every event, specially in startup (false by default) */
     sendPayloadToParent?: boolean;
+    handleManagerMessages?(message: ManagerMessages): any;
 }
 export {};

package/lib/client/workerclient.js

@@ -52,6 +52,13 @@ class WorkerClient extends base_1.BaseClient {
         if (options?.postMessage) {
             this.postMessage = options.postMessage;
         }
+        if (this.options.handleManagerMessages) {
+            const oldFn = this.handleManagerMessages.bind(this);
+            this.handleManagerMessages = async (message) => {
+                await this.options.handleManagerMessages(message);
+                return oldFn(message);
+            };
+        }
     }
     get workerId() {
         return workerData.workerId;

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

@@ -20,6 +20,10 @@ export interface ExtraProps {
 }
 export interface UsingClient extends BaseClient {
 }
+export interface CustomWorkerClientEvents {
+}
+export interface CustomWorkerManagerEvents {
+}
 export interface ExtendedRC {
 }
 export interface ExtendedRCLocations {

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

@@ -1,6 +1,7 @@
 import type { Awaitable, DeepPartial, Logger } from '../../common';
 import type { APIGatewayBotInfo, GatewayDispatchPayload, GatewayIntentBits, GatewayPresenceUpdateData } from '../../types';
 import type { IdentifyProperties } from '../constants';
+import type { WorkerMessages } from './worker';
 export interface ShardManagerOptions extends ShardDetails {
     /** Important data which is used by the manager to connect shards to the gateway. */
     info: APIGatewayBotInfo;
@@ -53,6 +54,7 @@ export interface WorkerManagerOptions extends Omit<ShardManagerOptions, 'handleP
     workerProxy?: boolean;
     path: string;
     handlePayload?(shardId: number, workerId: number, packet: GatewayDispatchPayload): any;
+    handleWorkerMessage?(message: WorkerMessages): any;
     properties?: DeepPartial<NonNullable<ShardManagerOptions['properties']>>;
 }
 export interface ShardData {

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

@@ -1,4 +1,5 @@
-import type { ApiRequestOptions, HttpMethods } from '../..';
+import type { ApiRequestOptions, CustomWorkerClientEvents, HttpMethods } from '../..';
+import type { Identify } from '../../common';
 import type { GatewayDispatchPayload } from '../../types';
 export interface WorkerShardInfo {
     open: boolean;
@@ -60,5 +61,16 @@ export type WorkerSendToWorkerEval = CreateWorkerMessage<'EVAL_TO_WORKER', {
     vars: string;
     toWorkerId: number;
 }>;
-export type WorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendToWorkerEval | WorkerStart | WorkerStartResharding | WorkerRequestConnectResharding | WorkerReadyResharding | WorkerDisconnectedAllShardsResharding;
+export type BaseWorkerMessage = WorkerRequestConnect | WorkerReceivePayload | WorkerSendResultPayload | WorkerSendCacheRequest | WorkerSendShardInfo | WorkerSendInfo | WorkerReady | WorkerShardsConnected | WorkerSendApiRequest | WorkerSendEvalResponse | WorkerSendToWorkerEval | WorkerStart | WorkerStartResharding | WorkerRequestConnectResharding | WorkerReadyResharding | WorkerDisconnectedAllShardsResharding;
+export type CustomWorkerClientMessages = {
+    [K in keyof CustomWorkerClientEvents]: Identify<{
+        type: K;
+        workerId: number;
+    } & Identify<CustomWorkerClientEvents[K] extends never ? {} : CustomWorkerClientEvents[K]>>;
+};
+export type WorkerMessages = {
+    [K in BaseWorkerMessage['type']]: Identify<Extract<BaseWorkerMessage, {
+        type: K;
+    }>>;
+}[BaseWorkerMessage['type']] | CustomWorkerClientMessages[keyof CustomWorkerClientMessages];
 export {};

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

@@ -1,12 +1,12 @@
 import { type Worker as ClusterWorker } from 'node:cluster';
 import type { Worker as WorkerThreadsWorker } from 'node:worker_threads';
-import { ApiHandler, Logger, type UsingClient, type WorkerClient } from '../..';
+import { ApiHandler, type CustomWorkerManagerEvents, Logger, type UsingClient, type WorkerClient } from '../..';
 import { type Adapter } from '../../cache';
-import { type MakePartial } from '../../common';
+import { type Identify, 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';
+import type { WorkerInfo, WorkerMessages, WorkerShardInfo } from './worker';
 export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerThreadsWorker | {
     ready?: boolean;
 }) & {
@@ -19,7 +19,7 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerTh
         shardEnd: number;
         shardsPerWorker: number;
     }, logger?: Logger): number[][];
-    options: MakePartial<Required<WorkerManagerOptions>, 'adapter'>;
+    options: MakePartial<Required<WorkerManagerOptions>, 'adapter' | 'handleWorkerMessage' | 'handlePayload'>;
     debugger?: Logger;
     connectQueue: ConnectQueue;
     workerQueue: (() => void)[];
@@ -31,7 +31,7 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerTh
     rest: ApiHandler;
     reshardingWorkerQueue: (() => void)[];
     private _info?;
-    constructor(options: Omit<MakePartial<WorkerManagerOptions, 'token' | 'intents' | 'info' | 'handlePayload'>, 'resharding'> & {
+    constructor(options: Omit<MakePartial<WorkerManagerOptions, 'token' | 'intents' | 'info' | 'handlePayload' | 'handleWorkerMessage'>, 'resharding'> & {
         resharding?: MakePartial<NonNullable<WorkerManagerOptions['resharding']>, 'getInfo'>;
     });
     setCache(adapter: Adapter): void;
@@ -62,7 +62,7 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerTh
         resharded?: boolean;
     });
     spawn(workerId: number, shardId: number, resharding?: boolean): void;
-    handleWorkerMessage(message: WorkerMessage): Promise<void>;
+    handleWorkerMessage(message: WorkerMessages): Promise<void>;
     private generateNonce;
     private generateSendPromise;
     send(data: GatewaySendPayload, shardId: number): Promise<true>;
@@ -125,5 +125,15 @@ export type ManagerSendEvalResponse = CreateManagerMessage<'EVAL_RESPONSE', {
     response: any;
     nonce: string;
 }>;
-export type ManagerMessages = ManagerAllowConnect | ManagerSpawnShards | ManagerSendPayload | ManagerRequestShardInfo | ManagerRequestWorkerInfo | ManagerSendCacheResult | ManagerSendBotReady | ManagerSendApiResponse | ManagerSendEvalResponse | ManagerExecuteEvalToWorker | ManagerWorkerAlreadyExistsResharding | ManagerSpawnShardsResharding | ManagerAllowConnectResharding | DisconnectAllShardsResharding | ConnnectAllShardsResharding | ManagerExecuteEval;
+export type BaseManagerMessages = ManagerAllowConnect | ManagerSpawnShards | ManagerSendPayload | ManagerRequestShardInfo | ManagerRequestWorkerInfo | ManagerSendCacheResult | ManagerSendBotReady | ManagerSendApiResponse | ManagerSendEvalResponse | ManagerExecuteEvalToWorker | ManagerWorkerAlreadyExistsResharding | ManagerSpawnShardsResharding | ManagerAllowConnectResharding | DisconnectAllShardsResharding | ConnnectAllShardsResharding | ManagerExecuteEval;
+export type CustomManagerMessages = {
+    [K in keyof CustomWorkerManagerEvents]: Identify<{
+        type: K;
+    } & Identify<CustomWorkerManagerEvents[K] extends never ? {} : CustomWorkerManagerEvents[K]>>;
+};
+export type ManagerMessages = {
+    [K in BaseManagerMessages['type']]: Identify<Extract<BaseManagerMessages, {
+        type: K;
+    }>>;
+}[BaseManagerMessages['type']] | CustomManagerMessages[keyof CustomManagerMessages];
 export {};

package/lib/websocket/discord/workermanager.js

@@ -39,6 +39,13 @@ class WorkerManager extends Map {
         super();
         this.options = options;
         this.cacheAdapter = new cache_1.MemoryAdapter();
+        if (this.options.handleWorkerMessage) {
+            const oldFn = this.handleWorkerMessage.bind(this);
+            this.handleWorkerMessage = async (message) => {
+                await this.options.handleWorkerMessage(message);
+                return oldFn(message);
+            };
+        }
     }
     setCache(adapter) {
         this.cacheAdapter = adapter;
@@ -295,7 +302,7 @@ class WorkerManager extends Map {
                 }
                 break;
             case 'RECEIVE_PAYLOAD':
-                await this.options.handlePayload(message.shardId, message.workerId, message.payload);
+                await this.options.handlePayload?.(message.shardId, message.workerId, message.payload);
                 break;
             case 'RESULT_PAYLOAD':
                 {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11916234323.0",
+	"version": "2.1.1-dev-11937208019.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",