seyfert 1.5.0 → 2.0.0

package/package.json

@@ -1,74 +1,65 @@
-{
-	"name": "seyfert",
-	"version": "1.5.0",
-	"description": "The most advanced framework for discord bots",
-	"main": "./lib/index.js",
-	"module": "./lib/index.js",
-	"types": "./lib/index.d.ts",
-	"files": [
-		"lib/**"
-	],
-	"scripts": {
-		"build": "tsc --outDir ./lib",
-		"prepublishOnly": "npm run build",
-		"prepare": "npm run build && husky install",
-		"lint": "biome lint --apply ./src",
-		"format": "biome format --write ./src",
-		"check-h": "biome check --apply ./src",
-		"check": "biome check --apply --no-errors-on-unmatched ./src"
-	},
-	"author": "MARCROCK22",
-	"license": "Apache-2.0",
-	"dependencies": {
-		"chokidar": "^3.6.0",
-		"discord-api-types": "^0.37.86",
-		"magic-bytes.js": "^1.10.0",
-		"ts-mixer": "^6.0.4",
-		"ws": "^8.17.0"
-	},
-	"lint-staged": {
-		"*.ts": [
-			"biome check --apply",
-			"biome format --write"
-		]
-	},
-	"devDependencies": {
-		"@biomejs/biome": "1.7.3",
-		"@commitlint/cli": "^19.3.0",
-		"@commitlint/config-conventional": "^19.2.2",
-		"@types/node": "^20.12.12",
-		"@types/ws": "^8.5.10",
-		"husky": "^9.0.11",
-		"lint-staged": "^15.2.5",
-		"typescript": "^5.4.5"
-	},
-	"optionalDependencies": {
-		"ioredis": "^5.4.1",
-		"tweetnacl": "^1.0.3",
-		"uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.42.0"
-	},
-	"homepage": "https://seyfert.dev",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/tiramisulabs/seyfert.git"
-	},
-	"bugs": {
-		"url": "https://github.com/tiramisulabs/seyfert"
-	},
-	"keywords": [
-		"api",
-		"discord",
-		"bots",
-		"typescript",
-		"botdev"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"contributors": [
-		{
-			"name": "socram03",
-			"url": "https://github.com/socram03"
-		}
-	]
-}
+{
+	"name": "seyfert",
+	"version": "2.0.0",
+	"description": "The most advanced framework for discord bots",
+	"main": "./lib/index.js",
+	"module": "./lib/index.js",
+	"types": "./lib/index.d.ts",
+	"files": [
+		"lib/**"
+	],
+	"scripts": {
+		"build": "tsc --outDir ./lib",
+		"prepublishOnly": "npm run build",
+		"prepare": "npm run build && husky",
+		"lint": "biome lint --write ./src",
+		"format": "biome format --write ./src",
+		"check-h": "biome check --write ./src",
+		"check": "biome check --write --no-errors-on-unmatched ./src"
+	},
+	"author": "MARCROCK22",
+	"license": "Apache-2.0",
+	"devDependencies": {
+		"@biomejs/biome": "1.8.3",
+		"@commitlint/cli": "^19.4.0",
+		"@commitlint/config-conventional": "^19.2.2",
+		"@types/node": "^22.5.0",
+		"husky": "^9.1.5",
+		"lint-staged": "^15.2.9",
+		"typescript": "^5.5.4"
+	},
+	"homepage": "https://seyfert.dev",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/tiramisulabs/seyfert.git"
+	},
+	"bugs": {
+		"url": "https://github.com/tiramisulabs/seyfert"
+	},
+	"keywords": [
+		"api",
+		"discord",
+		"bots",
+		"typescript",
+		"botdev"
+	],
+	"publishConfig": {
+		"access": "public"
+	},
+	"maintainers": [
+		{
+			"name": "socram03",
+			"url": "https://github.com/socram03"
+		}
+	],
+	"contributors": [
+		{
+			"name": "Free 公園",
+			"url": "https://github.com/FreeAoi"
+		},
+		{
+			"name": "David",
+			"url": "https://github.com/Drylozu"
+		}
+	]
+}

package/lib/cache/adapters/redis.d.ts

@@ -1,37 +0,0 @@
-import type { RedisOptions } from 'ioredis';
-import type { Adapter } from './types';
-interface RedisAdapterOptions {
-    namespace?: string;
-}
-export declare class RedisAdapter implements Adapter {
-    isAsync: boolean;
-    client: import('ioredis').Redis;
-    namespace: string;
-    constructor(data: ({
-        client: import('ioredis').Redis;
-    } | {
-        redisOptions: RedisOptions;
-    }) & RedisAdapterOptions);
-    private __scanSets;
-    scan(query: string, returnKeys?: false): Promise<any[]>;
-    scan(query: string, returnKeys: true): Promise<string[]>;
-    get(keys: string[]): Promise<any[]>;
-    get(keys: string): Promise<any>;
-    set(id: [string, any][]): Promise<void>;
-    set(id: string, data: any): Promise<void>;
-    patch(updateOnly: boolean, id: [string, any][]): Promise<void>;
-    patch(updateOnly: boolean, id: string, data: any): Promise<void>;
-    values(to: string): Promise<any[]>;
-    keys(to: string): Promise<string[]>;
-    count(to: string): Promise<number>;
-    remove(keys: string | string[]): Promise<void>;
-    flush(): Promise<void>;
-    contains(to: string, keys: string): Promise<boolean>;
-    getToRelationship(to: string): Promise<string[]>;
-    bulkAddToRelationShip(data: Record<string, string[]>): Promise<void>;
-    addToRelationship(to: string, keys: string | string[]): Promise<void>;
-    removeToRelationship(to: string, keys: string | string[]): Promise<void>;
-    removeRelationship(to: string | string[]): Promise<void>;
-    protected buildKey(key: string): string;
-}
-export {};

package/lib/cache/adapters/redis.js

@@ -1,218 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisAdapter = void 0;
-let Redis;
-try {
-    Redis = require('ioredis').Redis;
-}
-catch {
-    // potocuit > seyfert
-}
-class RedisAdapter {
-    isAsync = true;
-    client;
-    namespace;
-    constructor(data) {
-        if (!Redis) {
-            throw new Error('No ioredis installed');
-        }
-        this.client = 'client' in data ? data.client : new Redis(data.redisOptions);
-        this.namespace = data.namespace ?? 'seyfert';
-    }
-    __scanSets(query, returnKeys = false) {
-        const match = this.buildKey(query);
-        return new Promise((r, j) => {
-            const stream = this.client.scanStream({
-                match,
-                type: 'set',
-            });
-            const keys = [];
-            stream
-                .on('data', resultKeys => keys.push(...resultKeys))
-                .on('end', () => (returnKeys ? r(keys.map(x => this.buildKey(x))) : r(this.get(keys))))
-                .on('error', err => j(err));
-        });
-    }
-    scan(query, returnKeys = false) {
-        const match = this.buildKey(query);
-        return new Promise((r, j) => {
-            const stream = this.client.scanStream({
-                match,
-                // omit relationships
-                type: 'hash',
-            });
-            const keys = [];
-            stream
-                .on('data', resultKeys => keys.push(...resultKeys))
-                .on('end', () => (returnKeys ? r(keys.map(x => this.buildKey(x))) : r(this.get(keys))))
-                .on('error', err => j(err));
-        });
-    }
-    async get(keys) {
-        if (!Array.isArray(keys)) {
-            const value = await this.client.hgetall(this.buildKey(keys));
-            if (value) {
-                return toNormal(value);
-            }
-            return;
-        }
-        const pipeline = this.client.pipeline();
-        for (const key of keys) {
-            pipeline.hgetall(this.buildKey(key));
-        }
-        return (await pipeline.exec())?.filter(x => !!x[1]).map(x => toNormal(x[1])) ?? [];
-    }
-    async set(id, data) {
-        if (!Array.isArray(id)) {
-            await this.client.hset(this.buildKey(id), toDb(data));
-            return;
-        }
-        const pipeline = this.client.pipeline();
-        for (const [k, v] of id) {
-            pipeline.hset(this.buildKey(k), toDb(v));
-        }
-        await pipeline.exec();
-    }
-    async patch(updateOnly, id, data) {
-        if (!Array.isArray(id)) {
-            if (updateOnly) {
-                await this.client.eval(`if redis.call('exists',KEYS[1]) == 1 then redis.call('hset', KEYS[1], ${Array.from({ length: Object.keys(data).length * 2 }, (_, i) => `ARGV[${i + 1}]`)}) end`, 1, this.buildKey(id), ...Object.entries(toDb(data)).flat());
-            }
-            else {
-                await this.client.hset(this.buildKey(id), toDb(data));
-            }
-            return;
-        }
-        const pipeline = this.client.pipeline();
-        for (const [k, v] of id) {
-            if (updateOnly) {
-                pipeline.eval(`if redis.call('exists',KEYS[1]) == 1 then redis.call('hset', KEYS[1], ${Array.from({ length: Object.keys(v).length * 2 }, (_, i) => `ARGV[${i + 1}]`)}) end`, 1, this.buildKey(k), ...Object.entries(toDb(v)).flat());
-            }
-            else {
-                pipeline.hset(this.buildKey(k), toDb(v));
-            }
-        }
-        await pipeline.exec();
-    }
-    async values(to) {
-        const array = [];
-        const data = await this.keys(to);
-        if (data.length) {
-            const items = await this.get(data);
-            for (const item of items) {
-                if (item) {
-                    array.push(item);
-                }
-            }
-        }
-        return array;
-    }
-    async keys(to) {
-        const data = await this.getToRelationship(to);
-        return data.map(id => this.buildKey(`${to}.${id}`));
-    }
-    async count(to) {
-        return this.client.scard(`${this.buildKey(to)}:set`);
-    }
-    async remove(keys) {
-        if (!Array.isArray(keys)) {
-            await this.client.del(this.buildKey(keys));
-            return;
-        }
-        await this.client.del(...keys.map(x => this.buildKey(x)));
-    }
-    async flush() {
-        const keys = await Promise.all([
-            this.scan(this.buildKey('*'), true),
-            this.__scanSets(this.buildKey('*'), true),
-        ]).then(x => x.flat());
-        if (!keys.length)
-            return;
-        await this.remove(keys);
-    }
-    async contains(to, keys) {
-        return (await this.client.sismember(`${this.buildKey(to)}:set`, keys)) === 1;
-    }
-    async getToRelationship(to) {
-        return this.client.smembers(`${this.buildKey(to)}:set`);
-    }
-    async bulkAddToRelationShip(data) {
-        const pipeline = this.client.pipeline();
-        for (const [key, value] of Object.entries(data)) {
-            pipeline.sadd(`${this.buildKey(key)}:set`, ...value);
-        }
-        await pipeline.exec();
-    }
-    async addToRelationship(to, keys) {
-        await this.client.sadd(`${this.buildKey(to)}:set`, ...(Array.isArray(keys) ? keys : [keys]));
-    }
-    async removeToRelationship(to, keys) {
-        await this.client.srem(`${this.buildKey(to)}:set`, ...(Array.isArray(keys) ? keys : [keys]));
-    }
-    async removeRelationship(to) {
-        await this.client.del(...(Array.isArray(to) ? to.map(x => `${this.buildKey(x)}:set`) : [`${this.buildKey(to)}:set`]));
-    }
-    buildKey(key) {
-        return key.startsWith(this.namespace) ? key : `${this.namespace}:${key}`;
-    }
-}
-exports.RedisAdapter = RedisAdapter;
-const isObject = (o) => {
-    return !!o && typeof o === 'object' && !Array.isArray(o);
-};
-function toNormal(target) {
-    if (typeof target.ARRAY_OF === 'string')
-        return JSON.parse(target.ARRAY_OF).map(toNormal);
-    if (!Object.keys(target).length)
-        return undefined;
-    const result = {};
-    for (const [key, value] of Object.entries(target)) {
-        if (key.startsWith('O_')) {
-            result[key.slice(2)] = JSON.parse(value);
-        }
-        else if (key.startsWith('N_')) {
-            result[key.slice(2)] = Number(value);
-        }
-        else if (key.startsWith('B_')) {
-            result[key.slice(2)] = value === 'true';
-        }
-        else {
-            result[key] = value;
-        }
-    }
-    return result;
-}
-function toDb(target) {
-    if (Array.isArray(target))
-        return { ARRAY_OF: JSON.stringify(target.map(toDb)) };
-    const result = {};
-    for (const [key, value] of Object.entries(target)) {
-        switch (typeof value) {
-            case 'boolean':
-                result[`B_${key}`] = value;
-                break;
-            case 'number':
-                result[`N_${key}`] = `${value}`;
-                break;
-            case 'object':
-                if (Array.isArray(value)) {
-                    result[`O_${key}`] = JSON.stringify(value);
-                    break;
-                }
-                if (isObject(value)) {
-                    result[`O_${key}`] = JSON.stringify(value);
-                    break;
-                }
-                if (!Number.isNaN(value)) {
-                    result[`O_${key}`] = 'null';
-                    break;
-                }
-                result[`O_${key}`] = JSON.stringify(value);
-                break;
-            default:
-                result[key] = value;
-                break;
-        }
-    }
-    return result;
-}

package/lib/client/oninteractioncreate.d.ts

@@ -1,4 +0,0 @@
-import { type APIInteraction } from 'discord-api-types/v10';
-import { type UsingClient } from '../commands';
-import type { __InternalReplyFunction } from '../structures';
-export declare function onInteractionCreate(self: UsingClient, body: APIInteraction, shardId: number, __reply?: __InternalReplyFunction): Promise<any>;

package/lib/client/oninteractioncreate.js

@@ -1,198 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onInteractionCreate = void 0;
-const v10_1 = require("discord-api-types/v10");
-const commands_1 = require("../commands");
-const structures_1 = require("../structures");
-const components_1 = require("../components");
-async function onInteractionCreate(self, body, shardId, __reply) {
-    self.debugger?.debug(`[${v10_1.InteractionType[body.type] ?? body.type}] Interaction received.`);
-    switch (body.type) {
-        case v10_1.InteractionType.ApplicationCommandAutocomplete:
-            {
-                const parentCommand = self.commands?.values.find(x => {
-                    if (body.data.guild_id) {
-                        return x.guildId?.includes(body.data.guild_id) && x.name === body.data.name;
-                    }
-                    return x.name === body.data.name;
-                });
-                const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
-                const interaction = new structures_1.AutocompleteInteraction(self, body, optionsResolver, __reply);
-                const command = optionsResolver.getAutocomplete();
-                // idc, is a YOU problem
-                if (!command?.autocomplete)
-                    return self.logger.warn(`${optionsResolver.fullCommandName} ${command?.name} command does not have 'autocomplete' callback`);
-                try {
-                    try {
-                        await command.autocomplete(interaction);
-                    }
-                    catch (error) {
-                        if (!command.onAutocompleteError)
-                            return self.logger.error(`${optionsResolver.fullCommandName} ${command.name} just threw an error, ${error ? (typeof error === 'object' && 'message' in error ? error.message : error) : 'Unknown'}`);
-                        await command.onAutocompleteError(interaction, error);
-                    }
-                }
-                catch (error) {
-                    try {
-                        await optionsResolver.getCommand()?.onInternalError?.(self, optionsResolver.getCommand(), error);
-                    }
-                    catch {
-                        // supress error
-                    }
-                }
-            }
-            break;
-        case v10_1.InteractionType.ApplicationCommand:
-            {
-                switch (body.data.type) {
-                    case v10_1.ApplicationCommandType.Message:
-                    case v10_1.ApplicationCommandType.User:
-                        {
-                            const command = self.commands?.values.find(x => {
-                                if (body.data.guild_id) {
-                                    return x.guildId?.includes(body.data.guild_id) && x.name === body.data.name;
-                                }
-                                return x.name === body.data.name;
-                            });
-                            const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                            // idc, is a YOU problem
-                            if (!command?.run)
-                                return self.logger.warn(`${command.name ?? 'Unknown'} command does not have 'run' callback`);
-                            const context = new commands_1.MenuCommandContext(self, interaction, shardId, command);
-                            const extendContext = self.options?.context?.(interaction) ?? {};
-                            Object.assign(context, extendContext);
-                            try {
-                                if (command.botPermissions && interaction.appPermissions) {
-                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values([command.botPermissions]));
-                                    if (!interaction.appPermissions.has('Administrator') && permissions.length) {
-                                        return command.onBotPermissionsFail(context, interaction.appPermissions.keys(permissions));
-                                    }
-                                }
-                                const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (self.options?.globalMiddlewares ?? []), true);
-                                if (resultRunGlobalMiddlewares.pass) {
-                                    return;
-                                }
-                                if ('error' in resultRunGlobalMiddlewares) {
-                                    return command.onMiddlewaresError(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
-                                }
-                                const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, command.middlewares, false);
-                                if (resultRunMiddlewares.pass) {
-                                    return;
-                                }
-                                if ('error' in resultRunMiddlewares) {
-                                    return command.onMiddlewaresError(context, resultRunMiddlewares.error ?? 'Unknown error');
-                                }
-                                try {
-                                    await command.run(context);
-                                    await command.onAfterRun?.(context, undefined);
-                                }
-                                catch (error) {
-                                    await command.onRunError(context, error);
-                                    await command.onAfterRun?.(context, error);
-                                }
-                            }
-                            catch (error) {
-                                try {
-                                    await command.onInternalError(self, error);
-                                }
-                                catch {
-                                    // supress error
-                                }
-                            }
-                        }
-                        break;
-                    case v10_1.ApplicationCommandType.ChatInput:
-                        {
-                            const parentCommand = self.commands?.values.find(x => {
-                                if (body.data.guild_id) {
-                                    return x.guildId?.includes(body.data.guild_id) && x.name === body.data.name;
-                                }
-                                return x.name === body.data.name;
-                            });
-                            const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
-                            const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                            const command = optionsResolver.getCommand();
-                            if (!command?.run)
-                                return self.logger.warn(`${optionsResolver.fullCommandName} command does not have 'run' callback`);
-                            const context = new commands_1.CommandContext(self, interaction, optionsResolver, shardId, command);
-                            const extendContext = self.options?.context?.(interaction) ?? {};
-                            Object.assign(context, extendContext);
-                            try {
-                                if (command.botPermissions && interaction.appPermissions) {
-                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values([command.botPermissions]));
-                                    if (!interaction.appPermissions.has('Administrator') && permissions.length) {
-                                        return command.onBotPermissionsFail?.(context, interaction.appPermissions.keys(permissions));
-                                    }
-                                }
-                                const [erroredOptions, result] = await command.__runOptions(context, optionsResolver);
-                                if (erroredOptions) {
-                                    return command.onOptionsError?.(context, result);
-                                }
-                                const resultRunGlobalMiddlewares = await command.__runGlobalMiddlewares(context);
-                                if (resultRunGlobalMiddlewares.pass) {
-                                    return;
-                                }
-                                if ('error' in resultRunGlobalMiddlewares) {
-                                    return command.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
-                                }
-                                const resultRunMiddlewares = await command.__runMiddlewares(context);
-                                if (resultRunMiddlewares.pass) {
-                                    return;
-                                }
-                                if ('error' in resultRunMiddlewares) {
-                                    return command.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
-                                }
-                                try {
-                                    await command.run(context);
-                                    await command.onAfterRun?.(context, undefined);
-                                }
-                                catch (error) {
-                                    await command.onRunError?.(context, error);
-                                    await command.onAfterRun?.(context, error);
-                                }
-                            }
-                            catch (error) {
-                                try {
-                                    await command.onInternalError?.(self, context.command, error);
-                                }
-                                catch {
-                                    // supress error
-                                }
-                            }
-                        }
-                        break;
-                }
-            }
-            break;
-        case v10_1.InteractionType.ModalSubmit:
-            {
-                const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                if (self.components?.hasModal(interaction)) {
-                    await self.components.onModalSubmit(interaction);
-                }
-                else {
-                    const context = new components_1.ModalContext(self, interaction);
-                    const extended = self.options?.context?.(interaction) ?? {};
-                    Object.assign(context, extended);
-                    await self.components?.executeModal(context);
-                }
-            }
-            break;
-        case v10_1.InteractionType.MessageComponent:
-            {
-                const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                if (self.components?.hasComponent(body.message.id, interaction.customId)) {
-                    await self.components.onComponent(body.message.id, interaction);
-                }
-                else {
-                    //@ts-expect-error
-                    const context = new components_1.ComponentContext(self, interaction);
-                    const extended = self.options?.context?.(interaction) ?? {};
-                    Object.assign(context, extended);
-                    await self.components?.executeComponent(context);
-                }
-            }
-            break;
-    }
-}
-exports.onInteractionCreate = onInteractionCreate;

package/lib/client/onmessagecreate.d.ts

@@ -1,13 +0,0 @@
-import { type APIApplicationCommandInteractionDataOption, type GatewayMessageCreateDispatchData } from 'discord-api-types/v10';
-import { Command, type MessageCommandOptionErrors, SubCommand, type UsingClient, type Client, type ContextOptionsResolved, type WorkerClient } from '..';
-import type { MakeRequired } from '../common';
-export declare function onMessageCreate(self: Client | WorkerClient, rawMessage: GatewayMessageCreateDispatchData, shardId: number): Promise<any>;
-export declare function defaultOptionsParser(self: UsingClient, command: Command | SubCommand, message: GatewayMessageCreateDispatchData, args: Partial<Record<string, string>>, resolved: MakeRequired<ContextOptionsResolved>): Promise<{
-    errors: {
-        name: string;
-        error: string;
-        fullError: MessageCommandOptionErrors;
-    }[];
-    options: APIApplicationCommandInteractionDataOption[];
-}>;
-export declare function defaultArgsParser(content: string): Record<string, string>;