refactor: use cf workers

Author: didinele

.dockerignore

@@ -1,5 +1,6 @@
 /**/node_modules
-.env
+.dev.vars
+.wrangler
 
 coverage
 /**/dist

.gitignore

@@ -19,17 +19,22 @@
 	"scripts": {
 		"lint": "eslint src && prettier --check .",
 		"build": "tsc",
+		"publish": "wrangler deploy",
+		"dev": "wrangler dev",
+		"schema:dev": "wrangler d1 execute db --local --file=./schema.sql",
+		"schema": "wrangler d1 execute db --remote --file=./schema.sql",
 		"format": "prettier --write .",
 		"update": "yarn upgrade-interactive"
 	},
 	"devDependencies": {
-		"@types/express": "^4",
+		"@cloudflare/workers-types": "^4.20250204.0",
 		"eslint": "^8.57.1",
 		"eslint-config-neon": "^0.1.62",
 		"prettier": "^3.3.3",
 		"prettier-eslint": "^16.3.0",
-		"turbo": "^2.3.1",
-		"typescript": "^5.6.3"
+		"typescript": "^5.6.3",
+		"undici-types": "^7.3.0",
+		"wrangler": "^3.107.3"
 	},
 	"dependencies": {
 		"@discordjs/builders": "^1.10.0",
@@ -38,9 +43,8 @@
 		"@sapphire/bitfield": "^1.2.4",
 		"@sapphire/discord-utilities": "^3.4.4",
 		"discord-interactions": "^4.1.1",
-		"express": "^4.21.2",
+		"itty-router": "^5.0.18",
 		"pino": "^9.6.0",
-		"postgres": "^3.4.5",
-		"zod": "^3.24.1"
+		"postgres": "^3.4.5"
 	}
 }

Dockerfile

@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS linked_accounts;
+CREATE TABLE IF NOT EXISTS linked_accounts (
+    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+    discord_id TEXT NOT NULL UNIQUE,
+    minecraft_username TEXT NOT NULL UNIQUE,
+    confirmed BOOLEAN NOT NULL DEFAULT 0
+);

docker-compose.yml

@@ -1,8 +1,10 @@
-import type { RESTPostAPIApplicationCommandsJSONBody } from '@discordjs/core';
+import type { API } from '@discordjs/core/http-only';
+import type { RESTPostAPIApplicationCommandsJSONBody } from '@discordjs/core/http-only';
+import type { Env } from '../util.js';
 import * as setup from './setup.js';
 
 interface Command {
-	handle(interaction: any): Promise<unknown>;
+	handle(interaction: any, env: Env, api: API): Promise<unknown>;
 	interaction: RESTPostAPIApplicationCommandsJSONBody;
 }
 

package.json

@@ -8,10 +8,11 @@ import {
 	PermissionFlagsBits,
 	type APIChatInputApplicationCommandGuildInteraction,
 	type RESTPostAPIApplicationCommandsJSONBody,
-} from '@discordjs/core';
+} from '@discordjs/core/http-only';
+import type { API } from '@discordjs/core/http-only';
 import { InteractionOptionResolver } from '@sapphire/discord-utilities';
 import { PermissionsBitField } from '../permissions.js';
-import { api, ENV, logger } from '../util.js';
+import { logger, type Env } from '../util.js';
 
 export const interaction: RESTPostAPIApplicationCommandsJSONBody = {
 	name: 'setup',
@@ -42,9 +43,9 @@ export const interaction: RESTPostAPIApplicationCommandsJSONBody = {
 	integration_types: [ApplicationIntegrationType.GuildInstall],
 };
 
-export async function handle(interaction: APIChatInputApplicationCommandGuildInteraction) {
+export async function handle(interaction: APIChatInputApplicationCommandGuildInteraction, env: Env, api: API) {
 	if (!PermissionsBitField.has(BigInt(interaction.app_permissions), PermissionFlagsBits.ManageWebhooks)) {
-		return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+		return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 			content: 'The bot does not have the required permissions to set up the webhook.',
 		});
 	}
@@ -54,11 +55,11 @@ export async function handle(interaction: APIChatInputApplicationCommandGuildInt
 	switch (options.getSubcommand(true)) {
 		case 'webhook': {
 			const webhooks = await api.channels.getWebhooks(interaction.channel.id);
-			const webhook = webhooks.find((webhook) => webhook.user!.id === ENV.CLIENT_ID);
+			const webhook = webhooks.find((webhook) => webhook.user!.id === env.CLIENT_ID);
 			if (webhook) {
 				logger.debug('found existing webhook');
 				const fullWebhook = await api.webhooks.get(webhook.id);
-				return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+				return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 					content: `Here's the webhook url: https://discord.com/api/webhooks/${fullWebhook.id}/${fullWebhook.token!}`,
 				});
 			}
@@ -68,7 +69,7 @@ export async function handle(interaction: APIChatInputApplicationCommandGuildInt
 				name: 'Prompt',
 			});
 
-			return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+			return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 				content: `Here's the webhook url: https://discord.com/api/webhooks/${newWebhook.id}/${newWebhook.token!}`,
 			});
 		}
@@ -77,21 +78,21 @@ export async function handle(interaction: APIChatInputApplicationCommandGuildInt
 			const messageURL = options.getString('message', true);
 			const [channelId, messageId] = messageURL.split('/').slice(-2) as [string, string];
 			if (!channelId || !messageId) {
-				return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+				return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 					content: 'Invalid message URL',
 				});
 			}
 
 			const message = await api.channels.getMessage(channelId, messageId).catch(() => null);
 			if (!message) {
-				return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+				return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 					content: 'Message not found',
 				});
 			}
 
 			const webhook = message.webhook_id ? await api.webhooks.get(message.webhook_id).catch(() => null) : null;
-			if (!webhook || webhook.user!.id !== ENV.CLIENT_ID) {
-				return api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+			if (!webhook || webhook.user!.id !== env.CLIENT_ID) {
+				return api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 					content: 'Message does not belong to bot webhook',
 				});
 			}
@@ -111,7 +112,7 @@ export async function handle(interaction: APIChatInputApplicationCommandGuildInt
 					},
 				],
 			});
-			await api.interactions.editReply(ENV.CLIENT_ID, interaction.token, {
+			await api.interactions.editReply(env.CLIENT_ID, interaction.token, {
 				content: 'Prompt added to the message',
 			});
 

schema.sql

@@ -1,8 +1,9 @@
-import type { Response } from 'express';
+import type { IRequest } from 'itty-router';
+import type { JsonResponse } from '../response.js';
 import * as link from './link.js';
 
 interface Component {
-	handle(res: Response, interaction: any): Promise<unknown>;
+	handle(req: IRequest, ctx: ExecutionContext, interaction: any): Promise<JsonResponse>;
 }
 
 export const components: Record<string, Component> = {

src/commands/index.ts

@@ -1,11 +1,10 @@
 import { ActionRowBuilder, ModalBuilder, TextInputBuilder } from '@discordjs/builders';
-import { TextInputStyle, type APIMessageComponentGuildInteraction } from '@discordjs/core';
-import { InteractionResponseType } from 'discord-interactions';
-import type { Response } from 'express';
+import { InteractionResponseType, TextInputStyle } from '@discordjs/core/http-only';
+import { JsonResponse } from '../response.js';
 
-export async function handle(res: Response, interaction: APIMessageComponentGuildInteraction) {
-	return res.status(200).send({
-		type: InteractionResponseType.MODAL,
+export async function handle(): Promise<JsonResponse> {
+	return new JsonResponse({
+		type: InteractionResponseType.Modal,
 		data: new ModalBuilder()
 			.setCustomId('submit')
 			.setTitle('Link your Minecraft account')