seyfert 2.1.1-dev-11842640994.0 → 2.1.1-dev-11845956119.0

package/lib/client/base.d.ts

@@ -13,7 +13,7 @@ import type { ComponentCommand, ModalCommand } from '../components';
 import { ComponentHandler } from '../components/handler';
 import { LangsHandler } from '../langs/handler';
 import type { ChatInputCommandInteraction, ComponentInteraction, EntryPointInteraction, MessageCommandInteraction, ModalSubmitInteraction, UserCommandInteraction } from '../structures';
-import type { LocaleString, RESTPostAPIChannelMessageJSONBody } from '../types';
+import type { APIInteraction, APIInteractionResponse, LocaleString, RESTPostAPIChannelMessageJSONBody } from '../types';
 import type { MessageStructure } from './transformers';
 export declare class BaseClient {
     rest: ApiHandler;
@@ -55,6 +55,17 @@ export declare class BaseClient {
     protected execute(..._options: unknown[]): Promise<void>;
     start(options?: Pick<DeepPartial<StartOptions>, 'langsDir' | 'commandsDir' | 'connection' | 'token' | 'componentsDir'>): Promise<void>;
     protected onPacket(..._packet: unknown[]): Promise<any>;
+    /**
+     *
+     * @param rawBody body of interaction
+     * @returns
+     */
+    protected onInteractionRequest(rawBody: APIInteraction): Promise<{
+        headers: {
+            'Content-Type'?: string;
+        };
+        response: APIInteractionResponse | FormData;
+    }>;
     private shouldUploadCommands;
     private syncCachePath;
     uploadCommands({ applicationId, cachePath }?: {
@@ -74,7 +85,7 @@ export declare class BaseClient {
     }>;
 }
 export interface BaseClientOptions {
-    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ComponentInteraction | ModalSubmitInteraction | EntryPointInteraction<boolean> | When<InferWithPrefix, MessageStructure, never>) => object;
+    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ComponentInteraction | ModalSubmitInteraction | EntryPointInteraction<boolean> | When<InferWithPrefix, MessageStructure, never>) => Record<string, unknown>;
     globalMiddlewares?: readonly (keyof RegisteredMiddlewares)[];
     commands?: {
         defaults?: {
@@ -147,7 +158,7 @@ export type InternalRuntimeConfigHTTP = Omit<MakeRequired<RC, 'publicKey' | 'por
 export type RuntimeConfigHTTP = Omit<MakeRequired<RC, 'publicKey' | 'applicationId'>, 'intents' | 'locations'> & {
     locations: Omit<RC['locations'], 'events'>;
 };
-export type InternalRuntimeConfig = Omit<MakeRequired<RC, 'intents'>, 'publicKey' | 'port'>;
+export type InternalRuntimeConfig = MakeRequired<RC, 'intents'>;
 export type RuntimeConfig = OmitInsert<InternalRuntimeConfig, 'intents', {
     intents?: IntentStrings | number[] | number;
 }>;

package/lib/client/base.js

@@ -8,6 +8,7 @@ const shared_1 = require("../commands/applications/shared");
 const handler_1 = require("../commands/handler");
 const common_1 = require("../common");
 const node_fs_1 = require("node:fs");
+const utils_1 = require("../api/utils/utils");
 const handle_1 = require("../commands/handle");
 const bans_1 = require("../common/shorters/bans");
 const voiceStates_1 = require("../common/shorters/voiceStates");
@@ -182,18 +183,12 @@ class BaseClient {
             });
         }
     }
-    async start(options = {
-        token: undefined,
-        langsDir: undefined,
-        commandsDir: undefined,
-        connection: undefined,
-        componentsDir: undefined,
-    }) {
+    async start(options = {}) {
         await this.loadLangs(options.langsDir);
         await this.loadCommands(options.commandsDir);
         await this.loadComponents(options.componentsDir);
         const { token: tokenRC, debug } = await this.getRC();
-        const token = options?.token ?? tokenRC;
+        const token = options.token ?? tokenRC;
         BaseClient.assertString(token, 'token is not a string');
         if (this.rest.options.token === 'INVALID')
             this.rest.options.token = token;
@@ -207,14 +202,49 @@ class BaseClient {
     async onPacket(..._packet) {
         throw new Error('Function not implemented');
     }
-    shouldUploadCommands(cachePath, guildId) {
-        return this.commands.shouldUpload(cachePath, guildId).then(should => {
-            this.logger.debug(should
-                ? `[${guildId ?? 'global'}] Change(s) detected, uploading commands`
-                : `[${guildId ?? 'global'}] commands seems to be up to date`);
-            return should;
+    /**
+     *
+     * @param rawBody body of interaction
+     * @returns
+     */
+    async onInteractionRequest(rawBody) {
+        return new Promise(async (r) => {
+            await this.handleCommand.interaction(rawBody, -1, async ({ body, files }) => {
+                let response;
+                const headers = {};
+                if (files) {
+                    response = new FormData();
+                    for (const [index, file] of files.entries()) {
+                        const fileKey = file.key ?? `files[${index}]`;
+                        if ((0, utils_1.isBufferLike)(file.data)) {
+                            response.append(fileKey, new Blob([file.data], { type: file.contentType }), file.filename);
+                        }
+                        else {
+                            response.append(fileKey, new Blob([`${file.data}`], { type: file.contentType }), file.filename);
+                        }
+                    }
+                    if (body) {
+                        response.append('payload_json', JSON.stringify(body));
+                    }
+                }
+                else {
+                    response = body ?? {};
+                    headers['Content-Type'] = 'application/json';
+                }
+                return r({
+                    headers,
+                    response,
+                });
+            });
         });
     }
+    async shouldUploadCommands(cachePath, guildId) {
+        const should = await this.commands.shouldUpload(cachePath, guildId);
+        this.logger.debug(should
+            ? `[${guildId ?? 'global'}] Change(s) detected, uploading commands`
+            : `[${guildId ?? 'global'}] commands seems to be up to date`);
+        return should;
+    }
     syncCachePath(cachePath) {
         return node_fs_1.promises.writeFile(cachePath, JSON.stringify(this.commands.values.filter(cmd => !('ignore' in cmd) || cmd.ignore !== shared_1.IgnoreCommand.Slash).map(x => x.toJSON())));
     }

package/lib/client/httpclient.d.ts

@@ -1,14 +1,7 @@
 import type { DeepPartial } from '../common';
-import type { APIInteraction, APIInteractionResponse } from '../types';
 import type { BaseClientOptions, StartOptions } from './base';
 import { BaseClient } from './base';
 export declare class HttpClient extends BaseClient {
     constructor(options?: BaseClientOptions);
     start(options?: DeepPartial<Omit<StartOptions, 'connection' | 'eventsDir'>>): Promise<void>;
-    onPacket(rawBody: APIInteraction): Promise<{
-        headers: {
-            'Content-Type'?: string;
-        };
-        response: APIInteractionResponse | FormData;
-    }>;
 }

package/lib/client/httpclient.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
-const utils_1 = require("../api/utils/utils");
 const base_1 = require("./base");
 class HttpClient extends base_1.BaseClient {
     constructor(options) {
@@ -11,36 +10,5 @@ class HttpClient extends base_1.BaseClient {
         await super.start(options);
         return this.execute(options.httpConnection ?? {});
     }
-    async onPacket(rawBody) {
-        return new Promise(async (r) => {
-            await this.handleCommand.interaction(rawBody, -1, async ({ body, files }) => {
-                let response;
-                const headers = {};
-                if (files) {
-                    response = new FormData();
-                    for (const [index, file] of files.entries()) {
-                        const fileKey = file.key ?? `files[${index}]`;
-                        if ((0, utils_1.isBufferLike)(file.data)) {
-                            response.append(fileKey, new Blob([file.data], { type: file.contentType }), file.filename);
-                        }
-                        else {
-                            response.append(fileKey, new Blob([`${file.data}`], { type: file.contentType }), file.filename);
-                        }
-                    }
-                    if (body) {
-                        response.append('payload_json', JSON.stringify(body));
-                    }
-                }
-                else {
-                    response = body ?? {};
-                    headers['Content-Type'] = 'application/json';
-                }
-                return r({
-                    headers,
-                    response,
-                });
-            });
-        });
-    }
 }
 exports.HttpClient = HttpClient;

package/lib/client/types.d.ts

@@ -1,5 +1,5 @@
-import type { HttpClient } from './httpclient';
+import type { UsingClient } from '../commands';
 export interface HttpServerAdapter {
-    client: HttpClient;
+    client: UsingClient;
     start?(path: `/${string}`): any;
 }

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

@@ -45,7 +45,7 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     isChat(): this is CommandContext<T, M>;
     inGuild(): this is GuildCommandContext<T, M>;
 }
-export interface GuildCommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<CommandContext<T, M>, 'guildId'>, 'guild'> {
+export interface GuildCommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<CommandContext<T, M>, 'guildId' | 'member'>, 'guild'> {
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

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

@@ -40,7 +40,7 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     isEntryPoint(): this is EntryPointContext<M>;
     inGuild(): this is GuildEntryPointContext<M>;
 }
-export interface GuildEntryPointContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<EntryPointContext<M>, 'guildId'>, 'guild'> {
+export interface GuildEntryPointContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<EntryPointContext<M>, 'guildId' | 'member'>, 'guild'> {
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

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

@@ -43,7 +43,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
     inGuild(): this is GuildMenuCommandContext<T, M>;
 }
-export interface GuildMenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<MenuCommandContext<T, M>, 'guildId'>, 'guild'> {
+export interface GuildMenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<MenuCommandContext<T, M>, 'guildId' | 'member'>, 'guild'> {
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

package/lib/components/componentcontext.d.ts

@@ -126,7 +126,7 @@ export interface ContextComponentCommandInteractionMap {
     MentionableSelect: MentionableSelectMenuInteraction;
     ChannelSelect: ChannelSelectMenuInteraction;
 }
-export interface GuildComponentContext<Type extends keyof ContextComponentCommandInteractionMap, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ComponentContext<Type, M>, 'guildId'>, 'guild'> {
+export interface GuildComponentContext<Type extends keyof ContextComponentCommandInteractionMap, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ComponentContext<Type, M>, 'guildId' | 'member'>, 'guild'> {
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

package/lib/components/modalcontext.d.ts

@@ -109,7 +109,7 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
     isModal(): this is ModalContext<M>;
     inGuild(): this is GuildModalContext<M>;
 }
-export interface GuildModalContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ModalContext<M>, 'guildId'>, 'guild'> {
+export interface GuildModalContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ModalContext<M>, 'guildId' | 'member'>, 'guild'> {
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

package/package.json

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