seyfert 4.4.1 → 4.6.0

package/lib/websocket/discord/workermanager.js

@@ -85,9 +85,7 @@ class WorkerManager extends Map {
         }
         const id = workerId ?? this.calculateWorkerId(shardId);
         if (!this.has(id)) {
-            throw new common_1.SeyfertError('WORKER_NOT_FOUND', {
-                metadata: { ...{ workerId: id }, detail: `Worker #${id} doesn't exist` },
-            });
+            throw this.createWorkerNotFoundError(id);
         }
         const data = await this.getWorkerInfo(id);
         return data.shards.reduce((acc, prv) => acc + prv.latency, 0) / data.shards.length;
@@ -95,22 +93,25 @@ class WorkerManager extends Map {
     calculateShardId(guildId) {
         return Number((BigInt(guildId) >> 22n) % BigInt(this.totalShards));
     }
+    createWorkerNotFoundError(workerId) {
+        return new common_1.SeyfertError('WORKER_NOT_FOUND', {
+            metadata: { workerId, detail: `Worker #${workerId} doesn't exist` },
+        });
+    }
     calculateWorkerId(shardId) {
-        const workerId = Math.floor((shardId - this.shardStart) / this.shardsPerWorker);
-        if (workerId >= this.totalWorkers) {
+        const minimumShardId = this.shardStart;
+        const maximumShardId = this.shardEnd - 1;
+        if (shardId < minimumShardId || shardId > maximumShardId) {
             throw new common_1.SeyfertError('INVALID_SHARD_ID', {
                 metadata: {
-                    ...{
-                        shardId,
-                        shardStart: this.shardStart,
-                        shardsPerWorker: this.shardsPerWorker,
-                        totalWorkers: this.totalWorkers,
-                    },
-                    detail: 'Invalid shardId',
+                    shardId,
+                    minimumShardId,
+                    maximumShardId,
+                    detail: `Invalid shardId ${shardId}: expected ${minimumShardId}..${maximumShardId}.`,
                 },
             });
         }
-        return workerId;
+        return Math.floor((shardId - minimumShardId) / this.shardsPerWorker);
     }
     postMessage(id, body) {
         const worker = this.get(id);
@@ -185,6 +186,7 @@ class WorkerManager extends Map {
                 metadata: { detail: 'Cannot create worker without worker_threads.' },
             });
         const env = {
+            ...this.options.workerEnv,
             SEYFERT_SPAWNING: 'true',
         };
         if (workerData.resharding)
@@ -196,7 +198,7 @@ class WorkerManager extends Map {
         switch (this.options.mode) {
             case 'threads': {
                 const worker = new worker_threads.Worker(workerData.path, {
-                    env,
+                    env: { ...process.env, ...env },
                 });
                 worker.on('message', data => this.handleWorkerMessage(data));
                 worker.on('error', err => {
@@ -413,9 +415,12 @@ class WorkerManager extends Map {
                         });
                     }
                     const response = await this.rest.request(message.method, message.url, message.requestOptions);
+                    const encodedResponse = response instanceof ArrayBuffer ? Array.from(new Uint8Array(response)) : response;
+                    const responseType = response instanceof ArrayBuffer ? 'arrayBuffer' : undefined;
                     this.postMessage(message.workerId, {
                         nonce: message.nonce,
-                        response,
+                        response: encodedResponse,
+                        responseType,
                         type: 'API_RESPONSE',
                     });
                 }
@@ -442,7 +447,7 @@ class WorkerManager extends Map {
                         toWorkerId: message.toWorkerId,
                         vars: message.vars,
                     });
-                    this.generateSendPromise(nonce, 'Eval timeout').then(val => this.postMessage(message.workerId, {
+                    this.generateSendPromise(nonce, 'Worker evaluation').then(val => this.postMessage(message.workerId, {
                         nonce: message.nonce,
                         response: val,
                         type: 'EVAL_RESPONSE',
@@ -457,11 +462,13 @@ class WorkerManager extends Map {
             return this.generateNonce();
         return uuid;
     }
-    generateSendPromise(nonce, message = 'Timeout') {
+    generateSendPromise(nonce, operation = 'Worker request') {
         return new Promise((res, rej) => {
             const timeout = setTimeout(() => {
                 this.promises.delete(nonce);
-                rej(new common_1.SeyfertError('WORKER_TIMEOUT', { metadata: { ...{ nonce }, detail: message } }));
+                rej(new common_1.SeyfertError('WORKER_TIMEOUT', {
+                    metadata: { nonce, operation, detail: `${operation} timed out (nonce: ${nonce}).` },
+                }));
             }, 60e3);
             this.promises.set(nonce, { resolve: res, timeout });
         });
@@ -470,7 +477,7 @@ class WorkerManager extends Map {
         const workerId = this.calculateWorkerId(shardId);
         const worker = this.has(workerId);
         if (!worker) {
-            throw new common_1.SeyfertError('INTERNAL_ERROR', { metadata: { detail: `Worker #${workerId} doesn't exist` } });
+            throw this.createWorkerNotFoundError(workerId);
         }
         const nonce = this.generateNonce();
         this.postMessage(workerId, {
@@ -479,26 +486,26 @@ class WorkerManager extends Map {
             nonce,
             ...data,
         });
-        return this.generateSendPromise(nonce, 'Shard send payload timeout');
+        return this.generateSendPromise(nonce, 'Shard payload send');
     }
     async getShardInfo(shardId) {
         const workerId = this.calculateWorkerId(shardId);
         const worker = this.has(workerId);
         if (!worker) {
-            throw new common_1.SeyfertError('INTERNAL_ERROR', { metadata: { detail: `Worker #${workerId} doesn't exist` } });
+            throw this.createWorkerNotFoundError(workerId);
         }
         const nonce = this.generateNonce();
         this.postMessage(workerId, { shardId, nonce, type: 'SHARD_INFO' });
-        return this.generateSendPromise(nonce, 'Get shard info timeout');
+        return this.generateSendPromise(nonce, 'Shard info request');
     }
     async getWorkerInfo(workerId) {
         const worker = this.has(workerId);
         if (!worker) {
-            throw new common_1.SeyfertError('INTERNAL_ERROR', { metadata: { detail: `Worker #${workerId} doesn't exist` } });
+            throw this.createWorkerNotFoundError(workerId);
         }
         const nonce = this.generateNonce();
         this.postMessage(workerId, { nonce, type: 'WORKER_INFO' });
-        return this.generateSendPromise(nonce, 'Get worker info timeout');
+        return this.generateSendPromise(nonce, 'Worker info request');
     }
     tellWorker(workerId, func, vars) {
         const nonce = this.generateNonce();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "4.4.1",
+	"version": "4.6.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -28,7 +28,7 @@
 		"@types/node": "^24.10.0",
 		"husky": "^9.1.7",
 		"typescript": "^5.9.3",
-		"vitest": "^3.2.4"
+		"vitest": "^4.1.10"
 	},
 	"homepage": "https://seyfert.dev",
 	"repository": {
@@ -70,4 +70,4 @@
 			"esbuild"
 		]
 	}
-}
+}