refactor(sharding): simplify guilds, drop top.gg stats, sendGuildCount

Author: noadevbr

package.json

@@ -15,7 +15,6 @@
 	"packageManager": "bun@1.3.13",
 	"scripts": {
 		"start": "bun run --env-file=.env ./src/index.ts",
-		"prestart": "bun run format && bun run lint",
 		"dev": "bun run --env-file=.env.dev ./src/index.ts",
 		"dev:watch": "bun run --watch --env-file=.env.dev ./src/index.ts",
 		"build": "tsup ./src && tsc-alias",

src/app/discord/commands/public/subcommands/info.ts

@@ -26,28 +26,16 @@ export default createSubCommand({
 		const displayShardId = isSharded ? (shardId ?? 0) + 1 : 1;
 		const displayShardCount = isSharded ? (shardCount ?? 1) : 1;
 
-		let guilds = 0;
-		let members = 0;
-		let channels = 0;
+	const guilds =
+		client.getCustomVariable<number>('totalGuildCount') ??
+		client.guilds.cache.size;
 
-		if (client.shard) {
-			const results = await client.shard.broadcastEval((c) => ({
-				guilds: c.guilds.cache.size,
-				members: c.guilds.cache.reduce((total, g) => total + g.memberCount, 0),
-				channels: c.channels.cache.size,
-			}));
+	const members = client.guilds.cache.reduce(
+		(total, guild) => total + guild.memberCount,
+		0,
+	);
 
-			guilds = results.reduce((a, b) => a + b.guilds, 0);
-			members = results.reduce((a, b) => a + b.members, 0);
-			channels = results.reduce((a, b) => a + b.channels, 0);
-		} else {
-			guilds = client.guilds.cache.size;
-			members = client.guilds.cache.reduce(
-				(total, guild) => total + guild.memberCount,
-				0,
-			);
-			channels = client.channels.cache.size;
-		}
+	const channels = client.channels.cache.size;
 
 		const uptimeTimestamp = Math.floor(
 			(Date.now() - (client.uptime ?? 0)) / 1000,

src/app/discord/events/clientReady.ts

@@ -1,11 +1,8 @@
 import { createEvent } from '@base';
-import { env } from '@env';
 import { logger } from '@fx/utils/logger.js';
-import { isShardManager } from '@basedir/discord/client/bot/sharding.js';
 import { loadWorkers } from '@basedir/discord/client/bot/loaders.js';
 import { preloadBlacklistCache } from '@basedir/discord/client/bot/middleware.js';
 import { ActivityType } from 'discord.js';
-import { AutoPoster } from 'topgg-autoposter';
 import { MusicController } from '@basedir/music/MusicController.js';
 import type { KoxikClient } from '@basedir/discord/client/bot/CustomClient.js';
 import { setupMusicPresence } from '@app/discord/utils/musicPresence.js';
@@ -41,27 +38,27 @@ export default createEvent({
 					type: ActivityType.Watching,
 				},
 				{
-					name: `slash commands`,
+					name: 'slash commands',
 					type: ActivityType.Listening,
 				},
 				{
-					name: `async dreams`,
+					name: 'async dreams',
 					type: ActivityType.Playing,
 				},
 				{
-					name: `TypeScript thoughts`,
+					name: 'TypeScript thoughts',
 					type: ActivityType.Competing,
 				},
 				{
-					name: `online… probably`,
+					name: 'online… probably',
 					type: ActivityType.Playing,
 				},
 			];
 		};
 
 		let index = 0;
 
-		setInterval(async () => {
+		setInterval(() => {
 			if (musicController.musicModeActive) return;
 
 			const statuses = getStatuses();
@@ -74,25 +71,6 @@ export default createEvent({
 			index++;
 		}, 60_000);
 
-		if (env.TOPGG_TOKEN) {
-			if (process.env.KOXIK_SHARD === 'true') {
-				const report = () => {
-					if (!process.send) return;
 
-					process.send({
-						type: 'GUILD_COUNT',
-						shardId: Number(process.env.SHARD_ID),
-						count: client.guilds.cache.size,
-					});
-				};
-
-				report();
-				setInterval(report, 30 * 60 * 1000);
-			} else if (!isShardManager()) {
-				AutoPoster(env.TOPGG_TOKEN!, client).on('posted', () => {
-					logger.success('Posted stats on top.gg!');
-				});
-			}
-		}
 	},
 });

src/core/base/discord/client/KoxikClient.ts

@@ -3,7 +3,6 @@ import { env } from '@env';
 import { logger } from '@fx/utils/logger.js';
 import { initSentry, Sentry } from '@basedir/sentry/index.js';
 import {
-	type Client,
 	type ClientEvents,
 	GatewayIntentBits,
 	Partials,
@@ -36,8 +35,10 @@ import type {
 
 import {
 	getShardData,
+	isShardManager,
 	resolveSharding,
 	applySharding,
+	sendGuildCount,
 } from './bot/sharding.js';
 
 export function resolveRegisterTypes(
@@ -71,6 +72,18 @@ export function createBot(options: BotOptions) {
 		applySharding(resolved);
 	}
 
+	if (isShardManager()) {
+		return {
+			client: undefined as never,
+			createCommand: undefined as never,
+			createEvent: undefined as never,
+			createSubCommand: undefined as never,
+			createSubCommandGroup: undefined as never,
+			createResponder: undefined as never,
+			registerResponder: undefined as never,
+		};
+	}
+
 	const { shardId, shardCount, isMainShard, isPM2Cluster } = getShardData();
 
 	const clientOptions: any = {
@@ -99,14 +112,6 @@ export function createBot(options: BotOptions) {
 				: [],
 	);
 
-	if (shardId !== undefined && shardCount !== undefined) {
-		(client as unknown as Record<string, unknown>).shard = {
-			ids: [shardId],
-			count: shardCount,
-			broadcastEval: async (fn: (c: Client) => unknown) => [await fn(client)],
-		};
-	}
-
 	const commands = new Map<string, Command>();
 	const registeredEvents = new Set<string>();
 
@@ -137,6 +142,13 @@ export function createBot(options: BotOptions) {
 			`Connected as ${client.user?.tag ?? 'unknown'} (shard ${shardId ?? 0})`,
 		);
 
+		sendGuildCount(client.guilds.cache.size);
+		setInterval(() => {
+			sendGuildCount(client.guilds.cache.size);
+		}, 5 * 60 * 1000);
+		client.on('guildCreate', () => sendGuildCount(client.guilds.cache.size));
+		client.on('guildDelete', () => sendGuildCount(client.guilds.cache.size));
+
 		if (!isMainShard) {
 			logger.info('Not main shard - loading commands only');
 		} else {

src/core/base/discord/client/bot/interactionHandler.ts

@@ -10,6 +10,7 @@ import { ReplyBuilder } from './ReplyBuilder.js';
 import { getResponders } from './registry.js';
 import { isShardManager } from './sharding.js';
 import type { Command, ComponentInteraction, InteractionMap } from './types.js';
+import { getShardData } from './sharding.js';
 
 export function checkInteractionGlobal(id: string): Promise<boolean> {
 	return new Promise((resolve) => {
@@ -109,10 +110,9 @@ export function setupInteractionHandler(
 			if (!command) return;
 			if (!(await checkInteractionGlobal(interaction.id))) return;
 
-			if (interaction.guildId && client.shard) {
-				const shardId = client.shard.ids[0];
-				const shardCount = client.options.shardCount ?? 1;
+			const { shardId, shardCount } = getShardData();
 
+			if (interaction.guildId && shardId !== undefined && shardCount !== undefined) {
 				const guildShard =
 					Number(BigInt(interaction.guildId) >> 22n) % shardCount;
 

src/core/base/discord/client/bot/sharding.ts

@@ -15,17 +15,28 @@ export function isShardManager(): boolean {
 
 function postToTopGg() {
 	if (!topGgApi) return;
+	if (guildCounts.size !== topGgTotalShards) return;
+
+	console.log(guildCounts);
 
 	let total = 0;
+
 	for (const count of guildCounts.values()) {
 		total += count;
 	}
-	if (total === 0) return;
+
+	console.log({
+		total,
+		shards: guildCounts.size,
+	});
 
 	topGgApi
-		.postStats({ serverCount: total, shardCount: topGgTotalShards })
-		.then(() => console.log('[Koxik] Posted stats on top.gg!'))
-		.catch((err) => console.error('[Koxik] Top.GG post failed:', err));
+		.postStats({
+			serverCount: total,
+			shardCount: topGgTotalShards,
+		})
+		.then(() => console.log(`[Koxik] Posted ${total} guilds to top.gg!`))
+		.catch(console.error);
 }
 
 function startTopGGPosting(totalShards: number) {
@@ -102,9 +113,14 @@ export function setupSharding() {
 						typeof msg.count === 'number'
 					) {
 						guildCounts.set(msg.shardId, msg.count);
+
 						broadcastTotalGuildCount();
-						postToTopGg();
+
+						if (guildCounts.size === topGgTotalShards) {
+							postToTopGg();
+						}
 					}
+
 					break;
 				}
 			}
@@ -128,6 +144,12 @@ export function setupSharding() {
 	return true;
 }
 
+export function sendGuildCount(count: number) {
+	const { shardId } = getShardData();
+	if (shardId === undefined || !process.send) return;
+	process.send({ type: 'GUILD_COUNT', shardId, count });
+}
+
 export function getShardData() {
 	const isPM2Cluster =
 		process.env.KOXIK_PM2_SHARD === 'true' || process.env.pm_id !== undefined;