keys => scan

src/BaseClient/Bot/Cache/automod.ts

@@ -42,10 +42,9 @@ export default class AutomodCache extends Cache<APIAutoModerationRule> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIAutoModerationRule) {

src/BaseClient/Bot/Cache/base.ts

@@ -23,6 +23,7 @@ import type {
  APIWebhook,
 } from 'discord-api-types/v10';
 import type Redis from 'ioredis';
+import scanKeys from '../../UtilModules/scanKeys.js';
 import type { RAutomod } from './automod';
 import type { RBan } from './ban';
 import type { RChannel, RChannelTypes } from './channel';
@@ -155,6 +156,10 @@ export default abstract class Cache<
   return `${this.prefix}${id ? `:${id}` : '*'}`;
  }
 
+ static async scanKeys(pattern: string): Promise<string[]> {
+  return scanKeys(pattern);
+ }
+
  abstract set(...args: [T, string, string, string]): Promise<boolean>;
  abstract get(...args: string[]): Promise<null | DeriveRFromAPI<T, K>>;
  abstract del(...args: string[]): Promise<number>;

src/BaseClient/Bot/Cache/channel.ts

@@ -74,10 +74,9 @@ export default class ChannelCache extends Cache<
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIGuildChannel<RChannelTypes>) {

src/BaseClient/Bot/Cache/commandPermission.ts

@@ -30,10 +30,9 @@ export default class CommandPermissionCache extends Cache<APIApplicationCommandP
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIApplicationCommandPermission, guildId: string) {

src/BaseClient/Bot/Cache/emoji.ts

@@ -39,10 +39,9 @@ export default class EmojiCache extends Cache<APIEmoji> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIEmoji, guildId: string) {

src/BaseClient/Bot/Cache/event.ts

@@ -55,10 +55,9 @@ export default class EventCache extends Cache<APIGuildScheduledEvent> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIGuildScheduledEvent) {

src/BaseClient/Bot/Cache/guildCommand.ts

@@ -54,10 +54,9 @@ export default class GuildCommandCache extends Cache<
   return this.redis.get(`${this.key()}:${gId}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  // eslint-disable-next-line class-methods-use-this

src/BaseClient/Bot/Cache/integration.ts

@@ -50,10 +50,9 @@ export default class IntegrationCache extends Cache<
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIGuildIntegration, guildId: string) {

src/BaseClient/Bot/Cache/invite.ts

@@ -53,10 +53,9 @@ export default class InviteCache extends Cache<APIInvite> {
   return this.redis.get(`${this.key()}:${code}`).then((data) => this.stringToData(data));
  }
 
- del(code: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${code}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(code: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${code}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIInvite) {

src/BaseClient/Bot/Cache/message.ts

@@ -82,10 +82,9 @@ export default class MessageCache extends Cache<APIMessage> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIMessage, guildId: string) {

src/BaseClient/Bot/Cache/reaction.ts

@@ -42,10 +42,9 @@ export default class ReactionCache extends Cache<APIReaction> {
   return this.redis.get(`${this.key()}:${mId}:${eId}`).then((data) => this.stringToData(data));
  }
 
- del(mId: string, eId: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${mId}:${eId}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(mId: string, eId: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${mId}:${eId}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIReaction, guildId: string, channelId: string, messageId: string) {

src/BaseClient/Bot/Cache/role.ts

@@ -48,10 +48,9 @@ export default class RoleCache extends Cache<APIRole> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIRole, guildId: string) {

src/BaseClient/Bot/Cache/soundboard.ts

@@ -39,10 +39,9 @@ export default class SoundboardCache extends Cache<APISoundboardSound> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APISoundboardSound) {

src/BaseClient/Bot/Cache/stage.ts

@@ -38,10 +38,9 @@ export default class StageCache extends Cache<APIStageInstance> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIStageInstance) {

src/BaseClient/Bot/Cache/sticker.ts

@@ -42,10 +42,9 @@ export default class StickerCache extends Cache<APISticker> {
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APISticker) {

src/BaseClient/Bot/Cache/thread.ts

@@ -67,10 +67,9 @@ export default class ThreadCache extends Cache<
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: Omit<APIThreadChannel, 'position'>) {

src/BaseClient/Bot/Cache/threadMember.ts

@@ -37,10 +37,9 @@ export default class ThreadMemberCache extends Cache<APIThreadMember> {
   return this.redis.get(`${this.key()}:${tId}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(tId: string, id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${tId}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(tId: string, id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${tId}${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIThreadMember, guildId: string) {

src/BaseClient/Bot/Cache/webhook.ts

@@ -55,10 +55,9 @@ export default class WebhookCache extends Cache<
   return this.redis.get(`${this.key()}:${id}`).then((data) => this.stringToData(data));
  }
 
- del(id: string): Promise<number> {
-  return this.redis
-   .keys(`${this.key()}:${id}`)
-   .then((keys) => (keys.length ? this.redis.del(keys) : 0));
+ async del(id: string): Promise<number> {
+  const keys = await Cache.scanKeys(`${this.key()}:${id}`);
+  return keys.length ? this.redis.del(keys) : 0;
  }
 
  apiToR(data: APIWebhook) {

src/BaseClient/Bot/Redis.ts

@@ -33,7 +33,6 @@ const subscriber = new Redis({ host: 'redis', db });
 export default redis;
 
 export const prefix = `${process.env.mainId}:cache`;
-await redis.keys(`${prefix}:*`).then((r) => (r.length ? redis.del(r) : 0));
 await redis.config('SET', 'notify-keyspace-events', 'Ex');
 await subscriber.subscribe(`__keyevent@${db}__:expired`);
 

src/BaseClient/Bot/Util.ts

@@ -102,6 +102,7 @@ import getScheduled from '../UtilModules/getScheduled.js';
 import delScheduled from '../UtilModules/delScheduled.js';
 import setRatelimit from '../UtilModules/setRatelimit.js';
 import getRatelimit from '../UtilModules/getRatelimit.js';
+import scanKeys from '../UtilModules/scanKeys.js';
 
 const logFiles = {
  ratelimits: fs.createWriteStream(
@@ -212,6 +213,7 @@ interface Util {
  delScheduled: typeof delScheduled;
  setRatelimit: typeof setRatelimit;
  getRatelimit: typeof getRatelimit;
+ scanKeys: typeof scanKeys;
 }
 
 const util: Util = {
@@ -316,6 +318,7 @@ const util: Util = {
  delScheduled,
  setRatelimit,
  getRatelimit,
+ scanKeys,
 };
 
 export default util;

src/BaseClient/UtilModules/delScheduled.ts

@@ -1,8 +1,9 @@
 import Redis from '../Bot/Redis.js';
 import { prefix } from './getScheduled.js';
+import scanKeys from './scanKeys.js';
 
 export default async (key: string) => {
- const keys = await Redis.keys(`${prefix}:${key}`);
+ const keys = await scanKeys(`${prefix}:${key}`);
  if (!keys.length) return;
 
  const allKeys = [...keys, ...keys.map((k) => k.replace('scheduled', 'scheduled-data'))];

src/BaseClient/UtilModules/scanKeys.ts

@@ -0,0 +1,15 @@
+import redis from '../Bot/Redis.js';
+
+export default async (pattern: string) => {
+ const keys: string[] = [];
+ let cursor = '0';
+
+ do {
+  // eslint-disable-next-line no-await-in-loop
+  const [nextCursor, scanKeys] = await redis.scan(cursor, 'MATCH', pattern, 'COUNT', '100');
+  cursor = nextCursor;
+  keys.push(...scanKeys);
+ } while (cursor !== '0');
+
+ return keys;
+};

src/Events/BotEvents/messageEvents/messageCreate/votePunish.ts

@@ -1,5 +1,4 @@
 import type { Message } from 'discord.js';
-import redis from '../../../../BaseClient/Bot/Redis.js';
 import { prefix } from '../../../../BaseClient/UtilModules/getScheduled.js';
 
 export default async (msg: Message) => {
@@ -14,7 +13,9 @@ export default async (msg: Message) => {
 
  if (!msg.mentions.roles.size) return;
 
- if ((await redis.keys(`${prefix}:votePunish:${msg.guildId}:*:${msg.channelId}`)).length) {
+ if (
+  (await msg.client.util.scanKeys(`${prefix}:votePunish:${msg.guildId}:*:${msg.channelId}`)).length
+ ) {
   return;
  }
 

src/Events/BotEvents/raw/Cache/Channel.ts

@@ -7,14 +7,15 @@ import {
  type GatewayChannelUpdateDispatchData,
 } from 'discord.js';
 import RedisClient, { cache as redis } from '../../../../BaseClient/Bot/Redis.js';
+import scanKeys from '../../../../BaseClient/UtilModules/scanKeys.js';
 
 export default {
  [GatewayDispatchEvents.ChannelCreate]: (data: GatewayChannelCreateDispatchData) =>
   redis.channels.set(data),
 
  [GatewayDispatchEvents.ChannelDelete]: (data: GatewayChannelDeleteDispatchData) => {
   redis.channels.del(data.id);
-  RedisClient.keys(`${redis.messages.key}:${data.guild_id}:${data.id}:*`).then((keys) =>
+  scanKeys(`${redis.messages.key()}:${data.guild_id}:${data.id}:*`).then((keys) =>
    keys.length ? RedisClient.del(keys) : 0,
   );
  },

src/Events/BotEvents/raw/Cache/Guilds.ts

@@ -31,6 +31,7 @@ import RedisClient, {
  cache as redis,
  prefix as redisKey,
 } from '../../../../BaseClient/Bot/Redis.js';
+import scanKeys from '../../../../BaseClient/UtilModules/scanKeys.js';
 
 export default {
  [GatewayDispatchEvents.GuildAuditLogEntryCreate]: (
@@ -64,13 +65,13 @@ export default {
  },
 
  [GatewayDispatchEvents.GuildDelete]: (data: GatewayGuildDeleteDispatchData) =>
-  RedisClient.keys(`${redisKey}:${data.id}:*`).then((r) => (r.length ? RedisClient.del(r) : 0)),
+  scanKeys(`${redisKey}:${data.id}:*`).then((r) => (r.length ? RedisClient.del(r) : 0)),
 
  [GatewayDispatchEvents.GuildUpdate]: (data: GatewayGuildUpdateDispatchData) =>
   redis.guilds.set(data),
 
  [GatewayDispatchEvents.GuildEmojisUpdate]: async (data: GatewayGuildEmojisUpdateDispatchData) => {
-  await RedisClient.keys(`${redis.emojis.key()}:${data.guild_id}:*`).then((r) =>
+  await scanKeys(`${redis.emojis.key()}:${data.guild_id}:*`).then((r) =>
    r.length ? RedisClient.del(r) : 0,
   );
 
@@ -177,7 +178,7 @@ export default {
  [GatewayDispatchEvents.GuildSoundboardSoundsUpdate]: async (
   data: GatewayGuildSoundboardSoundsUpdateDispatchData,
  ) => {
-  await RedisClient.keys(`${redis.soundboards.key()}:${data.guild_id}:*`).then((r) =>
+  await scanKeys(`${redis.soundboards.key()}:${data.guild_id}:*`).then((r) =>
    r.length ? RedisClient.del(r) : 0,
   );
 
@@ -189,7 +190,7 @@ export default {
  [GatewayDispatchEvents.GuildStickersUpdate]: async (
   data: GatewayGuildStickersUpdateDispatchData,
  ) => {
-  await RedisClient.keys(`${redis.stickers.key()}:${data.guild_id}:*`).then((r) =>
+  await scanKeys(`${redis.stickers.key()}:${data.guild_id}:*`).then((r) =>
    r.length ? RedisClient.del(r) : 0,
   );