seyfert 2.1.1-dev-11768778519.0 → 2.1.1-dev-11842640994.0

package/lib/cache/index.d.ts

@@ -34,7 +34,6 @@ export type DisabledCache = {
 export declare class Cache {
     intents: number;
     adapter: Adapter;
-    readonly disabledCache: DisabledCache;
     users?: Users;
     guilds?: Guilds;
     members?: Members;
@@ -49,7 +48,8 @@ export declare class Cache {
     messages?: Messages;
     bans?: Bans;
     __logger__?: Logger;
-    constructor(intents: number, adapter: Adapter, disabledCache?: DisabledCache, client?: UsingClient);
+    constructor(intents: number, adapter: Adapter, disabledCache: DisabledCache, client: UsingClient);
+    buildCache(disabledCache: DisabledCache, client: UsingClient): void;
     flush(): ReturnCache<void>;
     hasIntent(intent: keyof typeof GatewayIntentBits): boolean;
     get hasGuildsIntent(): boolean;
@@ -76,7 +76,6 @@ export declare class Cache {
         members: import("..").GuildMember[];
         users: import("..").User[];
         channels: NonNullable<ReturnCache<import("..").AllChannels | undefined>>[];
-        messages: import("..").Message[];
         voiceStates: import("..").VoiceState[];
         presences: (Omit<import("../types").GatewayPresenceUpdate, "user"> & {
             id: string;
@@ -94,6 +93,7 @@ export declare class Cache {
             allow: import("../structures/extra/Permissions").PermissionsBitField;
             guildId: string;
         }[][];
+        messages: import("..").Message[];
         bans: import("../structures/GuildBan").GuildBan[];
     }>>;
     bulkPatch(keys: (readonly [
@@ -117,6 +117,7 @@ export declare class Cache {
         string
     ])[]): Promise<void>;
     onPacket(event: GatewayDispatchPayload): Promise<void>;
+    protected onPacketDefault(event: GatewayDispatchPayload): Promise<void>;
     testAdapter(): Promise<void>;
     private testUsersAndMembers;
     private testChannelsAndOverwrites;

package/lib/cache/index.js

@@ -40,7 +40,6 @@ __exportStar(require("./adapters/index"), exports);
 class Cache {
     intents;
     adapter;
-    disabledCache;
     // non-guild based
     users;
     guilds;
@@ -58,74 +57,33 @@ class Cache {
     messages;
     bans;
     __logger__;
-    constructor(intents, adapter, disabledCache = {}, client) {
+    constructor(intents, adapter, disabledCache, client) {
         this.intents = intents;
         this.adapter = adapter;
-        this.disabledCache = disabledCache;
+        this.buildCache(disabledCache, client);
+    }
+    buildCache(disabledCache, client) {
         // non-guild based
-        if (!this.disabledCache.users) {
-            this.users = new users_1.Users(this, client);
-        }
-        if (!this.disabledCache.guilds) {
-            this.guilds = new guilds_1.Guilds(this, client);
-        }
+        this.users = disabledCache.users ? undefined : new users_1.Users(this, client);
+        this.guilds = disabledCache.guilds ? undefined : new guilds_1.Guilds(this, client);
         // guild related
-        if (!this.disabledCache.members) {
-            this.members = new members_1.Members(this, client);
-        }
-        if (!this.disabledCache.voiceStates) {
-            this.voiceStates = new voice_states_1.VoiceStates(this, client);
-        }
+        this.members = disabledCache.members ? undefined : new members_1.Members(this, client);
+        this.voiceStates = disabledCache.voiceStates ? undefined : new voice_states_1.VoiceStates(this, client);
         // guild based
-        if (!this.disabledCache.roles) {
-            this.roles = new roles_1.Roles(this, client);
-        }
-        if (!this.disabledCache.overwrites) {
-            this.overwrites = new overwrites_1.Overwrites(this, client);
-        }
-        if (!this.disabledCache.channels) {
-            this.channels = new channels_1.Channels(this, client);
-        }
-        if (!this.disabledCache.emojis) {
-            this.emojis = new emojis_1.Emojis(this, client);
-        }
-        if (!this.disabledCache.stickers) {
-            this.stickers = new stickers_1.Stickers(this, client);
-        }
-        if (!this.disabledCache.presences) {
-            this.presences = new presence_1.Presences(this, client);
-        }
-        if (!this.disabledCache.stageInstances) {
-            this.stageInstances = new stage_instances_1.StageInstances(this, client);
-        }
-        if (!this.disabledCache.messages) {
-            this.messages = new messages_1.Messages(this, client);
-        }
-        if (!this.disabledCache.bans) {
-            this.bans = new bans_1.Bans(this, client);
-        }
-        if (this.disabledCache.onPacket) {
-            //@ts-expect-error
-            this.onPacket = () => {
-                // disable cache
-            };
-        }
-    }
-    /** @internal */
-    __setClient(client) {
-        this.users?.__setClient(client);
-        this.guilds?.__setClient(client);
-        this.members?.__setClient(client);
-        this.voiceStates?.__setClient(client);
-        this.roles?.__setClient(client);
-        this.overwrites?.__setClient(client);
-        this.channels?.__setClient(client);
-        this.emojis?.__setClient(client);
-        this.stickers?.__setClient(client);
-        this.presences?.__setClient(client);
-        this.stageInstances?.__setClient(client);
-        this.messages?.__setClient(client);
-        this.bans?.__setClient(client);
+        this.roles = disabledCache.roles ? undefined : new roles_1.Roles(this, client);
+        this.overwrites = disabledCache.overwrites ? undefined : new overwrites_1.Overwrites(this, client);
+        this.channels = disabledCache.channels ? undefined : new channels_1.Channels(this, client);
+        this.emojis = disabledCache.emojis ? undefined : new emojis_1.Emojis(this, client);
+        this.stickers = disabledCache.stickers ? undefined : new stickers_1.Stickers(this, client);
+        this.presences = disabledCache.presences ? undefined : new presence_1.Presences(this, client);
+        this.stageInstances = disabledCache.stageInstances ? undefined : new stage_instances_1.StageInstances(this, client);
+        this.messages = disabledCache.messages ? undefined : new messages_1.Messages(this, client);
+        this.bans = disabledCache.bans ? undefined : new bans_1.Bans(this, client);
+        this.onPacket = disabledCache.onPacket
+            ? (() => {
+                //
+            })
+            : this.onPacketDefault.bind(this);
     }
     flush() {
         return this.adapter.flush();
@@ -353,7 +311,10 @@ class Cache {
         await this.adapter.bulkAddToRelationShip(relationshipsData);
         await this.adapter.bulkSet(allData);
     }
-    async onPacket(event) {
+    onPacket(event) {
+        return this.onPacketDefault(event);
+    }
+    async onPacketDefault(event) {
         switch (event.t) {
             case 'READY':
                 await this.users?.set(event.d.user.id, event.d.user);

package/lib/cache/resources/default/base.d.ts

@@ -3,9 +3,9 @@ import type { GatewayIntentBits } from '../../../types';
 import type { Cache, ReturnCache } from '../../index';
 export declare class BaseResource<T = any, S = any> {
     protected cache: Cache;
-    client: UsingClient;
+    readonly client: UsingClient;
     namespace: string;
-    constructor(cache: Cache, client?: UsingClient);
+    constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string): boolean;
     get adapter(): import("../../index").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string): import("../../../common").Awaitable<void>;

package/lib/cache/resources/default/base.js

@@ -8,12 +8,6 @@ class BaseResource {
     namespace = 'base';
     constructor(cache, client) {
         this.cache = cache;
-        if (client) {
-            this.client = client;
-        }
-    }
-    /** @internal */
-    __setClient(client) {
         this.client = client;
     }
     //@ts-expect-error

package/lib/cache/resources/default/guild-based.d.ts

@@ -3,9 +3,9 @@ import type { GatewayIntentBits } from '../../../types';
 import type { Cache, ReturnCache } from '../../index';
 export declare class GuildBasedResource<T = any, S = any> {
     protected cache: Cache;
-    client: UsingClient;
+    readonly client: UsingClient;
     namespace: string;
-    constructor(cache: Cache, client?: UsingClient);
+    constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string, guild_id: string): boolean;
     parse(data: any, id: string, guild_id: string): any;
     get adapter(): import("../../index").Adapter;

package/lib/cache/resources/default/guild-based.js

@@ -8,12 +8,6 @@ class GuildBasedResource {
     namespace = 'base';
     constructor(cache, client) {
         this.cache = cache;
-        if (client) {
-            this.client = client;
-        }
-    }
-    /** @internal */
-    __setClient(client) {
         this.client = client;
     }
     //@ts-expect-error

package/lib/cache/resources/default/guild-related.d.ts

@@ -3,9 +3,9 @@ import type { GatewayIntentBits } from '../../../types';
 import type { Cache, ReturnCache } from '../../index';
 export declare class GuildRelatedResource<T = any, S = any> {
     protected cache: Cache;
-    client: UsingClient;
+    readonly client: UsingClient;
     namespace: string;
-    constructor(cache: Cache, client?: UsingClient);
+    constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string, guild_id?: string): boolean;
     parse(data: any, id: string, guild_id: string): any;
     get adapter(): import("../../index").Adapter;

package/lib/cache/resources/default/guild-related.js

@@ -8,12 +8,6 @@ class GuildRelatedResource {
     namespace = 'base';
     constructor(cache, client) {
         this.cache = cache;
-        if (client) {
-            this.client = client;
-        }
-    }
-    /** @internal */
-    __setClient(client) {
         this.client = client;
     }
     //@ts-expect-error

package/lib/client/base.d.ts

@@ -1,5 +1,5 @@
 import { ApiHandler } from '../api';
-import type { Adapter } from '../cache';
+import type { Adapter, DisabledCache } from '../cache';
 import { Cache } from '../cache';
 import type { Command, CommandContext, ContextMenuCommand, ExtendedRC, ExtendedRCLocations, ExtraProps, MenuCommandContext, RegisteredMiddlewares, SubCommand, UsingClient } from '../commands';
 import { type InferWithPrefix, type MiddlewareContext } from '../commands/applications/shared';
@@ -155,7 +155,7 @@ export interface ServicesOptions {
     rest?: ApiHandler;
     cache?: {
         adapter?: Adapter;
-        disabledCache?: boolean | Cache['disabledCache'] | ((cacheType: keyof Cache['disabledCache']) => boolean);
+        disabledCache?: boolean | DisabledCache | ((cacheType: keyof DisabledCache) => boolean);
     };
     langs?: {
         default?: string;

package/lib/client/base.js

@@ -15,7 +15,7 @@ const handler_2 = require("../components/handler");
 const handler_3 = require("../langs/handler");
 class BaseClient {
     rest = new api_1.ApiHandler({ token: 'INVALID' });
-    cache = new cache_1.Cache(0, new cache_1.MemoryAdapter());
+    cache = new cache_1.Cache(0, new cache_1.MemoryAdapter(), {}, this);
     applications = new common_1.ApplicationShorter(this);
     users = new common_1.UsersShorter(this);
     channels = new common_1.ChannelShorter(this);
@@ -142,7 +142,7 @@ class BaseClient {
                 'users',
                 'voiceStates',
             ];
-            let disabledCache = this.cache.disabledCache;
+            let disabledCache = {};
             if (typeof cache.disabledCache === 'boolean') {
                 for (const i of caches) {
                     disabledCache[i] = cache.disabledCache;
@@ -156,7 +156,10 @@ class BaseClient {
             else if (typeof cache.disabledCache === 'object') {
                 disabledCache = cache.disabledCache;
             }
-            this.cache = new cache_1.Cache(this.cache.intents, cache.adapter ?? this.cache.adapter, disabledCache, this);
+            if (cache.adapter)
+                this.cache.adapter = cache.adapter;
+            if (cache.disabledCache)
+                this.cache.buildCache(disabledCache, this);
         }
         if (middlewares) {
             this.middlewares = middlewares;
@@ -195,7 +198,6 @@ class BaseClient {
         if (this.rest.options.token === 'INVALID')
             this.rest.options.token = token;
         this.rest.debug = debug;
-        this.cache.__setClient(this);
         if (!this.handleCommand)
             this.handleCommand = new handle_1.HandleCommand(this);
         // The reason of this method is so for adapters that need to connect somewhere, have time to connect.

package/lib/client/workerclient.js

@@ -64,7 +64,7 @@ class WorkerClient extends base_1.BaseClient {
     }
     setServices(rest) {
         super.setServices(rest);
-        if (rest.cache) {
+        if (rest.cache?.adapter) {
             this.__setServicesCache = true;
         }
     }
@@ -84,13 +84,8 @@ class WorkerClient extends base_1.BaseClient {
         this.logger = new __1.Logger({
             name: `[Worker #${workerData.workerId}]`,
         });
-        if (this.__setServicesCache) {
-            this.setServices({
-                cache: {
-                    disabledCache: this.cache.disabledCache,
-                },
-            });
-        }
+        if (this.__setServicesCache)
+            delete this.__setServicesCache;
         else {
             const adapter = new cache_1.WorkerAdapter(workerData);
             if (this.options.postMessage) {
@@ -99,11 +94,9 @@ class WorkerClient extends base_1.BaseClient {
             this.setServices({
                 cache: {
                     adapter,
-                    disabledCache: this.cache.disabledCache,
                 },
             });
         }
-        delete this.__setServicesCache;
         if (workerData.debug) {
             this.debugger = new __1.Logger({
                 name: `[Worker #${workerData.workerId}]`,

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

@@ -39,8 +39,8 @@ export declare abstract class ContextMenuCommand {
     reload(): Promise<void>;
     abstract run?(context: MenuCommandContext<any>): any;
     onAfterRun?(context: MenuCommandContext<any>, error: unknown | undefined): any;
-    onRunError(context: MenuCommandContext<any, never>, error: unknown): any;
-    onMiddlewaresError(context: MenuCommandContext<any, never>, error: string): any;
-    onBotPermissionsFail(context: MenuCommandContext<any, never>, permissions: PermissionStrings): any;
-    onInternalError(client: UsingClient, command: ContextMenuCommand, error?: unknown): any;
+    onRunError?(context: MenuCommandContext<any, never>, error: unknown): any;
+    onMiddlewaresError?(context: MenuCommandContext<any, never>, error: string): any;
+    onBotPermissionsFail?(context: MenuCommandContext<any, never>, permissions: PermissionStrings): any;
+    onInternalError?(client: UsingClient, command: ContextMenuCommand, error?: unknown): any;
 }

package/lib/commands/applications/menu.js

@@ -39,17 +39,5 @@ class ContextMenuCommand {
         const __tempCommand = await (0, common_1.magicImport)(this.__filePath).then(x => x.default ?? x);
         Object.setPrototypeOf(this, __tempCommand.prototype);
     }
-    onRunError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onRunError>`, context.author.id, error);
-    }
-    onMiddlewaresError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onMiddlewaresError>`, context.author.id, error);
-    }
-    onBotPermissionsFail(context, permissions) {
-        context.client.logger.fatal(`${this.name}.<onBotPermissionsFail>`, context.author.id, permissions);
-    }
-    onInternalError(client, command, error) {
-        client.logger.fatal(command.name, error);
-    }
 }
 exports.ContextMenuCommand = ContextMenuCommand;

package/lib/commands/handle.js

@@ -40,7 +40,7 @@ class HandleCommand {
         if (context.guildId && command.botPermissions) {
             const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
             if (permissions)
-                return command.onBotPermissionsFail(context, permissions);
+                return command.onBotPermissionsFail?.(context, permissions);
         }
         const resultGlobal = await this.runGlobalMiddlewares(command, context);
         if (typeof resultGlobal === 'boolean')
@@ -54,13 +54,13 @@ class HandleCommand {
                 await command.onAfterRun?.(context, undefined);
             }
             catch (error) {
-                await command.onRunError(context, error);
+                await command.onRunError?.(context, error);
                 await command.onAfterRun?.(context, error);
             }
         }
         catch (error) {
             try {
-                await command.onInternalError(this.client, command, error);
+                await command.onInternalError?.(this.client, command, error);
             }
             catch {
                 // pass

package/lib/commands/handler.js

@@ -448,14 +448,10 @@ class CommandHandler extends common_1.BaseHandler {
         if (!(commandInstance instanceof menu_1.ContextMenuCommand))
             return false;
         commandInstance.onAfterRun ??= this.client.options.commands?.defaults?.onAfterRun;
-        if (this.client.options.commands?.defaults?.onBotPermissionsFail)
-            commandInstance.onBotPermissionsFail ??= this.client.options.commands?.defaults?.onBotPermissionsFail;
-        if (this.client.options.commands?.defaults?.onInternalError)
-            commandInstance.onInternalError ??= this.client.options.commands.defaults.onInternalError;
-        if (this.client.options.commands?.defaults?.onMiddlewaresError)
-            commandInstance.onMiddlewaresError ??= this.client.options.commands.defaults.onMiddlewaresError;
-        if (this.client.options.commands?.defaults?.onRunError)
-            commandInstance.onRunError ??= this.client.options.commands.defaults.onRunError;
+        commandInstance.onBotPermissionsFail ??= this.client.options.commands?.defaults?.onBotPermissionsFail;
+        commandInstance.onInternalError ??= this.client.options.commands?.defaults?.onInternalError;
+        commandInstance.onMiddlewaresError ??= this.client.options.commands?.defaults?.onMiddlewaresError;
+        commandInstance.onRunError ??= this.client.options.commands?.defaults?.onRunError;
         return commandInstance;
     }
     stablishCommandDefaults(commandInstance) {

package/package.json

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