@buape/carbon 0.1.1 → 0.1.3

package/src/abstracts/BaseCommand.ts

@@ -2,8 +2,11 @@ import {
 	ApplicationCommandType,
 	type RESTPostAPIApplicationCommandsJSONBody
 } from "discord-api-types/v10"
-import { ApplicationIntegrationType, InteractionContextType } from "../index.js"
-import type { BaseComponent } from "./BaseComponent.js"
+import {
+	ApplicationIntegrationType,
+	type BaseComponent,
+	InteractionContextType
+} from "../index.js"
 
 /**
  * Represents the base data of a command that the user creates
@@ -52,6 +55,7 @@ export abstract class BaseCommand {
 	 * You mount these here so the handler can access them
 	 */
 	components?: BaseComponent[] = []
+
 	/**
 	 * All the paginators that the command is able to use.
 	 * You mount these here so the handler can access them

package/src/classes/Client.ts

@@ -58,6 +58,11 @@ export type ClientOptions = {
 	 * ```
 	 */
 	mode: ClientMode
+	/**
+	 * The route to use for interactions on your server.
+	 * @default "/interaction"
+	 */
+	interactionRoute?: string
 	/**
 	 * The options used to initialize the request client, if you want to customize it.
 	 */
@@ -150,78 +155,78 @@ export class Client {
 				return Response.redirect(this.options.redirectUrl, 302)
 			throw new StatusError(404)
 		})
-		this.router.post("/interaction", async (req, ctx?: ExecutionContext) => {
-			const isValid = await this.validateInteraction(req)
-			if (!isValid) {
-				return new Response("Invalid request signature", { status: 401 })
+		this.router.post(
+			this.options.interactionRoute || "/interaction",
+			async (req, ctx?: ExecutionContext) => {
+				return await this.handle(req, ctx)
 			}
+		)
+	}
 
-			const rawInteraction = (await req.json()) as unknown as APIInteraction
-			if (rawInteraction.type === InteractionType.Ping) {
-				return json({
-					type: InteractionResponseType.Pong
-				})
-			}
+	/**
+	 * If you want use a custom handler for HTTP requests instead of Carbon's router, you can use this method.
+	 * @param req The request to handle
+	 * @param ctx Cloudflare Workers only. The execution context of the request, provided in the fetch handler from CF.
+	 * @returns A response to send back to the client.
+	 */
+	public async handle(req: Request, ctx?: ExecutionContext) {
+		const isValid = await this.validateInteraction(req)
+		if (!isValid) {
+			return new Response("Invalid request signature", { status: 401 })
+		}
 
-			if (rawInteraction.type === InteractionType.ApplicationCommand) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleCommandInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleCommandInteraction(rawInteraction)
-				}
-			}
-			if (
-				rawInteraction.type === InteractionType.ApplicationCommandAutocomplete
-			) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleAutocompleteInteraction(
-								rawInteraction
-							)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleAutocompleteInteraction(
-						rawInteraction
-					)
-				}
+		const rawInteraction = (await req.json()) as unknown as APIInteraction
+		if (rawInteraction.type === InteractionType.Ping) {
+			return json({
+				type: InteractionResponseType.Pong
+			})
+		}
+
+		if (rawInteraction.type === InteractionType.ApplicationCommand) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.commandHandler.handleCommandInteraction(rawInteraction)
+					})()
+				)
+			} else {
+				await this.commandHandler.handleCommandInteraction(rawInteraction)
 			}
-			if (rawInteraction.type === InteractionType.ApplicationCommand) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.commandHandler.handleCommandInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.commandHandler.handleCommandInteraction(rawInteraction)
-				}
+		}
+		if (
+			rawInteraction.type === InteractionType.ApplicationCommandAutocomplete
+		) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.commandHandler.handleAutocompleteInteraction(
+							rawInteraction
+						)
+					})()
+				)
+			} else {
+				await this.commandHandler.handleAutocompleteInteraction(rawInteraction)
 			}
-			if (rawInteraction.type === InteractionType.MessageComponent) {
-				if (ctx?.waitUntil) {
-					ctx.waitUntil(
-						(async () => {
-							await this.componentHandler.handleInteraction(rawInteraction)
-						})()
-					)
-				} else {
-					await this.componentHandler.handleInteraction(rawInteraction)
-				}
+		}
+		if (rawInteraction.type === InteractionType.MessageComponent) {
+			if (ctx?.waitUntil) {
+				ctx.waitUntil(
+					(async () => {
+						await this.componentHandler.handleInteraction(rawInteraction)
+					})()
+				)
+			} else {
+				await this.componentHandler.handleInteraction(rawInteraction)
 			}
-			return new Response(null, { status: 202 })
-		})
+		}
+		return new Response(null, { status: 202 })
 	}
 
 	/**
 	 * Validate the interaction request
 	 * @param req The request to validate
 	 */
-	private async validateInteraction(req: IRequestStrict) {
+	private async validateInteraction(req: Request) {
 		if (req.method !== "POST") {
 			throw new StatusError(405)
 		}

package/src/classes/Command.ts

@@ -2,9 +2,11 @@ import {
 	type APIApplicationCommandBasicOption,
 	ApplicationCommandType
 } from "discord-api-types/v10"
-import { BaseCommand } from "../abstracts/BaseCommand.js"
-import type { AutocompleteInteraction } from "../internals/AutocompleteInteraction.js"
-import type { CommandInteraction } from "../internals/CommandInteraction.js"
+import {
+	type AutocompleteInteraction,
+	BaseCommand,
+	type CommandInteraction
+} from "../index.js"
 
 export type CommandOptions = APIApplicationCommandBasicOption[]
 

package/src/internals/OptionsHandler.ts

@@ -57,7 +57,8 @@ export class OptionsHandler extends Base {
 		const num = this.raw.find(
 			(x) => x.name === key && x.type === ApplicationCommandOptionType.Integer
 		)?.value
-		if (!num || !Number.isSafeInteger(num)) return undefined
+		if (!num || typeof num !== "number" || !Number.isSafeInteger(num))
+			return undefined
 		return num
 	}