seyfert 2.1.1-dev-11847255319.0 → 2.1.1-dev-11871861192.0

package/lib/api/api.d.ts

@@ -1,4 +1,5 @@
 import { type Awaitable, Logger } from '../common';
+import type { WorkerSendApiRequest } from '../websocket/discord/worker';
 import type { APIRoutes } from './Routes';
 import { Bucket } from './bucket';
 import { type ApiHandlerInternalOptions, type ApiHandlerOptions, type ApiRequestOptions, type HttpMethods, type RawFile, type RequestHeaders } from './shared';
@@ -22,6 +23,8 @@ export declare class ApiHandler {
     set debug(active: boolean);
     get proxy(): APIRoutes;
     globalUnblock(): void;
+    private sendMessage;
+    protected postMessage<T = unknown>(body: WorkerSendApiRequest): Promise<T>;
     request<T = unknown>(method: HttpMethods, url: `/${string}`, { auth, ...request }?: ApiRequestOptions): Promise<T>;
     parseError(method: HttpMethods, route: `/${string}`, response: Response, result: string | Record<string, any>): Error;
     parseValidationError(data: Record<string, any>, path?: string, errors?: string[]): string[];

package/lib/api/api.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiHandler = void 0;
 const node_crypto_1 = require("node:crypto");
 const common_1 = require("../common");
+const utils_1 = require("../common/it/utils");
 const Router_1 = require("./Router");
 const bucket_1 = require("./bucket");
 const shared_1 = require("./shared");
-const utils_1 = require("./utils/utils");
-let parentPort;
-let workerData;
+const utils_2 = require("./utils/utils");
 class ApiHandler {
     options;
     globalBlock = false;
@@ -28,14 +27,33 @@ class ApiHandler {
         if (options.debug)
             this.debug = true;
         const worker_threads = (0, common_1.lazyLoadPackage)('node:worker_threads');
-        if (options.workerProxy && !worker_threads?.parentPort)
+        if (options.workerProxy && !worker_threads?.parentPort && !process.send)
             throw new Error('Cannot use workerProxy without a parent.');
         if (options.workerProxy)
             this.workerPromises = new Map();
-        if (worker_threads) {
-            workerData = worker_threads.workerData;
-            if (worker_threads.parentPort)
-                parentPort = worker_threads.parentPort;
+        if (worker_threads?.parentPort) {
+            this.sendMessage = async (body) => {
+                console;
+                worker_threads.parentPort.postMessage(body, body.requestOptions.files
+                    ?.filter(x => !['string', 'boolean', 'number'].includes(typeof x.data))
+                    .map(x => (x.data instanceof Buffer ? (0, utils_1.toArrayBuffer)(x.data) : x.data)));
+            };
+        }
+        else if (process.send) {
+            this.sendMessage = body => {
+                const data = {
+                    ...body,
+                    requestOptions: {
+                        ...body.requestOptions,
+                        files: body.requestOptions.files?.map(file => {
+                            if (file.data instanceof ArrayBuffer)
+                                file.data = (0, utils_1.toBuffer)(file.data);
+                            return file;
+                        }),
+                    },
+                };
+                process.send(data);
+            };
         }
     }
     set debug(active) {
@@ -61,21 +79,25 @@ class ApiHandler {
             return this.#randomUUID();
         return uuid;
     }
+    sendMessage(_body) {
+        throw new Error('Function not implemented');
+    }
+    postMessage(body) {
+        this.sendMessage(body);
+        return new Promise((res, rej) => {
+            this.workerPromises.set(body.nonce, { reject: rej, resolve: res });
+        });
+    }
     async request(method, url, { auth = true, ...request } = {}) {
         if (this.options.workerProxy) {
             const nonce = this.#randomUUID();
-            parentPort.postMessage({
+            return this.postMessage({
                 method,
                 url,
                 type: 'WORKER_API_REQUEST',
-                workerId: workerData.workerId,
+                workerId: this.workerData.workerId,
                 nonce,
                 requestOptions: { auth, ...request },
-            }, request.files
-                ?.filter(x => !['string', 'boolean', 'number'].includes(typeof x.data))
-                .map(x => x.data));
-            return new Promise((res, rej) => {
-                this.workerPromises.set(nonce, { reject: rej, resolve: res });
             });
         }
         const route = request.route || this.routefy(url, method);
@@ -306,7 +328,7 @@ class ApiHandler {
             const formData = new FormData();
             for (const [index, file] of options.request.files.entries()) {
                 const fileKey = file.key ?? `files[${index}]`;
-                if ((0, utils_1.isBufferLike)(file.data)) {
+                if ((0, utils_2.isBufferLike)(file.data)) {
                     formData.append(fileKey, new Blob([file.data], { type: file.contentType }), file.filename);
                 }
                 else {

package/lib/client/workerclient.js

@@ -99,6 +99,7 @@ class WorkerClient extends base_1.BaseClient {
             });
         }
         this.cache.intents = workerData.intents;
+        this.rest.workerData = workerData;
         this.postMessage({
             type: workerData.resharding ? 'WORKER_START_RESHARDING' : 'WORKER_START',
             workerId: workerData.workerId,

package/lib/common/it/utils.d.ts

@@ -118,3 +118,5 @@ export declare function resolveEmoji(emoji: EmojiResolvable, cache: Cache): Prom
 export declare function encodeEmoji(rawEmoji: APIPartialEmoji): string;
 export declare function hasProps<T extends Record<any, any>>(target: T, props: TypeArray<keyof T>): boolean;
 export declare function hasIntent(intents: number, target: keyof typeof GatewayIntentBits | GatewayIntentBits): boolean;
+export declare function toArrayBuffer(buffer: Buffer): ArrayBuffer;
+export declare function toBuffer(arrayBuffer: ArrayBuffer): Buffer;

package/lib/common/it/utils.js

@@ -19,6 +19,8 @@ exports.resolveEmoji = resolveEmoji;
 exports.encodeEmoji = encodeEmoji;
 exports.hasProps = hasProps;
 exports.hasIntent = hasIntent;
+exports.toArrayBuffer = toArrayBuffer;
+exports.toBuffer = toBuffer;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const __1 = require("..");
@@ -367,3 +369,19 @@ function hasIntent(intents, target) {
     const intent = typeof target === 'string' ? types_1.GatewayIntentBits[target] : target;
     return (intents & intent) === intent;
 }
+function toArrayBuffer(buffer) {
+    const arrayBuffer = new ArrayBuffer(buffer.length);
+    const view = new Uint8Array(arrayBuffer);
+    for (let i = 0; i < buffer.length; ++i) {
+        view[i] = buffer[i];
+    }
+    return arrayBuffer;
+}
+function toBuffer(arrayBuffer) {
+    const buffer = Buffer.alloc(arrayBuffer.byteLength);
+    const view = new Uint8Array(arrayBuffer);
+    for (let i = 0; i < buffer.length; ++i) {
+        buffer[i] = view[i];
+    }
+    return buffer;
+}

package/lib/websocket/discord/workermanager.js

@@ -359,6 +359,14 @@ class WorkerManager extends Map {
                 break;
             case 'WORKER_API_REQUEST':
                 {
+                    if (this.options.mode === 'clusters' && message.requestOptions.files?.length) {
+                        message.requestOptions.files.forEach(file => {
+                            //@ts-expect-error
+                            if (file.data.type === 'Buffer' && Array.isArray(file.data?.data))
+                                //@ts-expect-error
+                                file.data = new Uint8Array(file.data.data);
+                        });
+                    }
                     const response = await this.rest.request(message.method, message.url, message.requestOptions);
                     this.postMessage(message.workerId, {
                         nonce: message.nonce,

package/package.json

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