feat: catch and return discord errors (#10)

Co-authored-by: Josh Roy <[email protected]>

Author: MiniDigger

README.md

@@ -12,11 +12,13 @@ You can also deploy disgit to docker container:
 * Docker Image: The disgit container image is published to the GitHub Container Registry [here](https://github.com/JRoy/disgit/pkgs/container/disgit). For more information on how to authenticate with GitHub's container registry, check the help article [here](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-to-the-container-registry). 
 
 ## Environment Variables
-digit has the following optional environment variables that you can use to customize your instance;
+disgit has the following optional environment variables that you can use to customize your instance;
 - `IGNORED_BRANCHES_REGEX` - A regex pattern for branches that should be ignored
 - `IGNORED_BRANCHES` - A comma seperated list of branches that should be ignored
 - `IGNORED_USERS` - A comma seperated list of users that should be ignored
 - `IGNORED_PAYLOADS` - A comma seperated list of webhook events that should be ignored
+- `AWAIT_ERRORS` - Set to `true` to await errors from the Discord webhook executor
+- `DEBUG_PASTE` - Set to `true` to enable debug embeds.
 
 ## Supported Events
 The following webhook events are supported as of now;

docker-compose.yml

@@ -7,6 +7,8 @@ services:
             - IGNORED_BRANCHES=${IGNORED_BRANCHES}
             - IGNORED_USERS=${IGNORED_USERS}
             - IGNORED_PAYLOADS=${IGNORED_PAYLOADS}
+            - AWAIT_ERRORS=${AWAIT_ERRORS}
+            - DEBUG_PASTE=${DEBUG_PASTE}
         volumes:
             - ./.storage/cache:/worker/cache
         ports:

src/env.ts

@@ -8,6 +8,9 @@ export interface Env {
     IGNORED_PAYLOADS: string;
 
     GITHUB_WEBHOOK_SECRET: string;
+
+    DEBUG_PASTE: string;
+    AWAIT_ERRORS: string;
 }
 
 /**
@@ -19,6 +22,8 @@ export class BoundEnv {
     private ignoredUsers: string[];
     private ignoredPayloads: string[];
     readonly githubWebhookSecret: string;
+    readonly debugPaste: boolean;
+    readonly awaitErrors: boolean;
 
     constructor(env: Env) {
         if (typeof env.IGNORED_BRANCHES_REGEX !== 'undefined') {
@@ -28,6 +33,8 @@ export class BoundEnv {
         this.ignoredUsers = env.IGNORED_USERS?.split(",") || [];
         this.ignoredPayloads = env.IGNORED_PAYLOADS?.split(",") || [];
         this.githubWebhookSecret = env.GITHUB_WEBHOOK_SECRET;
+        this.debugPaste = env.DEBUG_PASTE == "true" || env.DEBUG_PASTE == "1";
+        this.awaitErrors = env.AWAIT_ERRORS == "true" || env.AWAIT_ERRORS == "1";
     }
 
     /**

src/index.ts

@@ -1,9 +1,6 @@
 import {BoundEnv, Env} from './env';
 import {Sender, shortCommit, truncate} from './util';
 
-// If true, will send paste of embed json to discord for debugging
-const debug = false;
-
 // Handles event sent by cloudflare
 async function handleRequest(request: Request, env: BoundEnv): Promise<Response> {
     const event = request.headers.get("X-GitHub-Event");
@@ -26,7 +23,7 @@ async function handleRequest(request: Request, env: BoundEnv): Promise<Response>
             return new Response('Webhook NO-OP', {status: 200})
         }
 
-        if (debug) {
+        if (env.debugPaste) {
             embed = await env.buildDebugPaste(embed);
         }
 
@@ -37,14 +34,21 @@ async function handleRequest(request: Request, env: BoundEnv): Promise<Response>
             return new Response('Missing Webhook Authorization', { status: 400 });
         }
 
-        await fetch(`https://discord.com/api/webhooks/${hookId}/${hookToken}`, {
+        const promise = fetch(`https://discord.com/api/webhooks/${hookId}/${hookToken}`, {
             headers: {
                 "content-type": "application/json;charset=UTF=8"
             },
             method: "POST",
             body: embed
         })
-        return new Response(`disgit successfully executed webhook ${hookId}`, {status: 200})
+
+        let result = env.awaitErrors ? await promise : undefined;
+
+        if (result === undefined || result.ok) {
+            return new Response(`disgit successfully executed webhook ${hookId}`, { status: 200 });
+        }
+
+        return new Response(`Failed to send webhook ${hookId}: Got ${result.status} from discord: ${await result.text()}`, { status: 400 });
     } else {
         return new Response('Bad Request', { status: 400 })
     }