redo error handling, centralize cacher, change schema handler, improve node support, fix revolt embed colors, fix guilded reply handling, and bump versions?

fixes #78

Author: williamhorning

.github/workflows/publish.yml

@@ -11,27 +11,20 @@ permissions:
   id-token: write
 
 jobs:
-  publish_jsr:
-    name: publish to jsr
+  publish:
+    name: publish to jsr and ghcr
     runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: setup deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
-          deno-version: v2.2.11
+          deno-version: v2.3.3
       - name: publish to jsr
         run: deno publish
-  publish_docker:
-    name: publish to ghcr
-    runs-on: ubuntu-latest
-    needs: publish_jsr
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: login to ghcr
         uses: redhat-actions/podman-login@v1
         with:

containerfile

@@ -1,30 +1,22 @@
-FROM denoland/deno:alpine-2.2.11@sha256:c6c801a49a98f295f46176fba6172a1a656decd7dfb086a499fe863f595b922b
-
-# metadata
-LABEL org.opencontainers.image.authors=Jersey
-LABEL org.opencontainers.image.url=https://github.com/williamhorning/lightning
-LABEL org.opencontainers.image.source=https://github.com/williamhorning/lightning
-LABEL org.opencontainers.image.documentation=https://williamhorning.eu.org/lightning
-LABEL org.opencontainers.image.version=0.8.0-alpha.2
-LABEL org.opencontainers.image.licenses=MIT
-LABEL org.opencontainers.image.title=lightning
+FROM denoland/deno:alpine-2.3.3
 
 # make a deno cache directory
 RUN ["mkdir", "/deno_dir"]
 ENV DENO_DIR=/deno_dir
 
 # install lightning
-RUN ["deno", "install", "--global", "--name", "lightning", "--allow-all", "--unstable-temporal", "--unstable-net", "jsr:@lightning/lightning@0.8.0-alpha.2"]
+RUN ["deno", "install", "-gA", "--unstable-temporal", "--unstable-net", "jsr:@lightning/lightning@0.8.0-alpha.3"]
 RUN ["chown", "--recursive", "1001:1001", "/deno_dir"]
 
 # run as user instead of root
 USER 1001:1001
 
 # the volume containing your lightning.toml file
 VOLUME [ "/data" ]
+WORKDIR /data
 
 # this is the lightning command line
 ENTRYPOINT [ "lightning" ]
 
 # run the bot using the user-provided lightning.toml file
-CMD [ "run", "/data/lightning.toml" ]
+CMD [ "run" ]

packages/lightning/logo.svg renamed to logo.svg

@@ -9,6 +9,6 @@ you do that, you will need to add the following to your `lightning.toml` file:
 
 ```toml
 [[plugins]]
-plugin = "jsr:@lightning/discord@0.8.0-alpha.2"
+plugin = "jsr:@lightning/discord@0.8.0-alpha.3"
 config.token = "your_bot_token"
 ```

packages/discord/README.md

@@ -1,12 +1,12 @@
 {
 	"name": "@lightning/discord",
-	"version": "0.8.0-alpha.2",
+	"version": "0.8.0-alpha.3",
 	"license": "MIT",
 	"exports": "./src/mod.ts",
 	"imports": {
 		"@discordjs/core": "npm:@discordjs/core@^2.1.0",
 		"@discordjs/rest": "npm:@discordjs/rest@^2.5.0",
 		"@discordjs/ws": "npm:@discordjs/ws@^2.0.2",
-		"@lightning/lightning": "jsr:@lightning/lightning@0.8.0-alpha.2"
+		"@lightning/lightning": "jsr:@lightning/lightning@0.8.0-alpha.3"
 	}
 }

packages/discord/deno.json

@@ -5,44 +5,32 @@ export async function setup_commands(
 	api: API,
 	commands: command[],
 ): Promise<void> {
-	await api.applicationCommands.bulkOverwriteGlobalCommands(
-		(await api.applications.getCurrent()).id,
-		commands.map((command) => {
-			const opts = [];
-
-			if (command.arguments) {
-				for (const argument of command.arguments) {
-					opts.push({
-						name: argument.name,
-						description: argument.description,
-						type: 3,
-						required: argument.required,
-					});
-				}
-			}
+	const format_arguments = (args: command['arguments']) =>
+		args?.map((arg) => ({
+			name: arg.name,
+			description: arg.description,
+			type: 3,
+			required: arg.required,
+		})) || [];
 
-			if (command.subcommands) {
-				for (const subcommand of command.subcommands) {
-					opts.push({
-						name: subcommand.name,
-						description: subcommand.description,
-						type: 1,
-						options: subcommand.arguments?.map((opt) => ({
-							name: opt.name,
-							description: opt.description,
-							type: 3,
-							required: opt.required,
-						})),
-					});
-				}
-			}
+	const format_subcommands = (subcommands: command['subcommands']) =>
+		subcommands?.map((subcommand) => ({
+			name: subcommand.name,
+			description: subcommand.description,
+			type: 1,
+			options: format_arguments(subcommand.arguments),
+		})) || [];
 
-			return {
-				name: command.name,
-				type: 1,
-				description: command.description,
-				options: opts,
-			};
-		}),
+	await api.applicationCommands.bulkOverwriteGlobalCommands(
+		(await api.applications.getCurrent()).id,
+		commands.map((cmd) => ({
+			name: cmd.name,
+			type: 1,
+			description: cmd.description,
+			options: [
+				...format_arguments(cmd.arguments),
+				...format_subcommands(cmd.subcommands),
+			],
+		})),
 	);
 }

packages/discord/src/commands.ts

@@ -1,36 +1,29 @@
 import { DiscordAPIError } from '@discordjs/rest';
 import { log_error } from '@lightning/lightning';
 
+const errors = [
+	[30007, 'Too many webhooks in channel, try deleting some', false],
+	[30058, 'Too many webhooks in guild, try deleting some', false],
+	[50013, 'Missing permissions to make webhook', false],
+	[10003, 'Unknown channel, disabling channel', true],
+	[10015, 'Unknown message, disabling channel', true],
+	[50027, 'Invalid webhook token, disabling channel', true],
+	[0, 'Unknown DiscordAPIError, not disabling channel', false],
+] as const;
+
 export function handle_error(
 	err: unknown,
 	channel: string,
 	edit?: boolean,
 ) {
 	if (err instanceof DiscordAPIError) {
-		if (err.code === 30007 || err.code === 30058) {
-			log_error(err, {
-				message: 'too many webhooks in channel/guild. try deleting some',
-				extra: { channel },
-			});
-		} else if (err.code === 50013) {
-			log_error(err, {
-				message: 'missing permissions to create webhook. check bot permissions',
-				extra: { channel },
-			});
-		} else if (err.code === 10003 || err.code === 10015 || err.code === 50027) {
-			log_error(err, {
-				disable: true,
-				message: `disabling channel due to error code ${err.code}`,
-				extra: { channel },
-			});
-		} else if (edit && err.code === 10008) {
-			return []; // message already deleted or non-existent
-		} else {
-			log_error(err, {
-				message: `unknown discord api error`,
-				extra: { channel, code: err.code },
-			});
-		}
+		if (edit && err.code === 10008) return []; // message already deleted or non-existent
+
+		const extra = { channel, code: err.code };
+		const [, message, disable] = errors.find((e) => e[0] === err.code) ??
+			errors[errors.length - 1];
+
+		log_error(err, { disable, message, extra });
 	} else {
 		log_error(err, {
 			message: `unknown discord error`,

packages/discord/src/errors.ts

@@ -26,7 +26,7 @@ export function get_deleted_message(
 }
 
 async function fetch_author(api: API, data: GatewayMessageUpdateDispatchData) {
-	let profile = data.author.avatar !== null
+	let profile = data.author.avatar
 		? `https://cdn.discordapp.com/avatars/${data.author.id}/${data.author.avatar}.png`
 		: `https://cdn.discordapp.com/embed/avatars/${
 			Number(BigInt(data.author.id) >> 22n) % 6
@@ -84,17 +84,9 @@ export async function get_incoming_message(
 	{ api, data }: { api: API; data: GatewayMessageUpdateDispatchData },
 ): Promise<message | undefined> {
 	// normal messages, replies, and user joins
-	if (
-		data.type !== 0 &&
-		data.type !== 7 &&
-		data.type !== 19 &&
-		data.type !== 20 &&
-		data.type !== 23
-	) {
-		return;
-	}
+	if (![0, 7, 19, 20, 23].includes(data.type)) return;
 
-	const message: message = {
+	return {
 		attachments: [
 			...data.attachments?.map(
 				(i: typeof data['attachments'][0]) => {
@@ -135,8 +127,6 @@ export async function get_incoming_message(
 			Number(BigInt(data.id) >> 22n) + 1420070400000,
 		),
 	};
-
-	return message;
 }
 
 export function get_incoming_command(

packages/discord/src/incoming.ts

@@ -4,8 +4,8 @@ import { WebSocketManager } from '@discordjs/ws';
 import {
 	type bridge_message_opts,
 	type command,
+	type config_schema,
 	type deleted_message,
-	log_error,
 	type message,
 	plugin,
 } from '@lightning/lightning';
@@ -24,16 +24,11 @@ export type discord_config = {
 	token: string;
 };
 
-/** check if something is actually a config object, return if it is */
-export function parse_config(v: unknown): discord_config {
-	if (typeof v !== 'object' || v === null) {
-		log_error("discord config isn't an object!", { without_cause: true });
-	}
-	if (!('token' in v) || typeof v.token !== 'string') {
-		log_error("discord token isn't a string", { without_cause: true });
-	}
-	return { token: v.token };
-}
+/** the config schema for the class */
+export const schema: config_schema = {
+	name: 'bolt-discord',
+	keys: { token: { type: 'string', required: true } },
+};
 
 /** discord support for lightning */
 export default class discord extends plugin {

packages/discord/src/mod.ts

@@ -8,6 +8,6 @@ your `lightning.toml` file:
 
 ```toml
 [[plugins]]
-plugin = "jsr:@lightning/guilded@0.8.0-alpha.2"
+plugin = "jsr:@lightning/guilded@0.8.0-alpha.3"
 config.token = "your_bot_token"
 ```

packages/guilded/README.md

@@ -1,11 +1,11 @@
 {
 	"name": "@lightning/guilded",
-	"version": "0.8.0-alpha.2",
+	"version": "0.8.0-alpha.3",
 	"license": "MIT",
 	"exports": "./src/mod.ts",
 	"imports": {
-		"@lightning/lightning": "jsr:@lightning/lightning@0.8.0-alpha.2",
-		"@jersey/guildapi": "jsr:@jersey/guildapi@^0.0.4",
+		"@lightning/lightning": "jsr:@lightning/lightning@0.8.0-alpha.3",
+		"@jersey/guildapi": "jsr:@jersey/guildapi@^0.0.5",
 		"@jersey/guilded-api-types": "jsr:@jersey/guilded-api-types@^0.0.2"
 	}
 }

packages/guilded/deno.json

@@ -1,27 +1,24 @@
 import { RequestError } from '@jersey/guilded-api-types';
 import { log_error } from '@lightning/lightning';
 
+const errors = [
+	[403, 'No permission to send/delete messages! Check permissions', true],
+	[404, 'Not found! This might be a Guilded problem if making a bridge', true],
+	[0, 'Unknown Guilded error, not disabling channel', false],
+] as const;
+
 export function handle_error(err: unknown, channel: string): never {
 	if (err instanceof RequestError) {
-		if (err.cause.status === 404) {
-			log_error(err, {
-				message:
-					"resource not found! if you're trying to make a bridge, this is likely an issue with Guilded",
-				extra: { channel_id: channel, response: err.cause },
-				disable: true,
-			});
-		} else if (err.cause.status === 403) {
-			log_error(err, {
-				message: 'no permission to send/delete messages! check bot permissions',
-				extra: { channel_id: channel, response: err.cause },
-				disable: true,
-			});
-		} else {
-			log_error(err, {
-				message: `unknown guilded error with status code ${err.cause.status}`,
-				extra: { channel_id: channel, response: err.cause },
-			});
-		}
+		const [, message, disable] = errors.find((e) =>
+			e[0] === err.cause.status
+		) ??
+			errors[errors.length - 1];
+
+		log_error(err, {
+			disable,
+			extra: { channel_id: channel, response: err.cause },
+			message,
+		});
 	} else {
 		log_error(err, {
 			message: `unknown error`,