chore: refine worker dispatch logic, update dependencies, and clean up typings

Author: gentlementlegen

bun.lock

@@ -64,7 +64,7 @@
     "@octokit/webhooks": "^14.2.0",
     "@octokit/webhooks-types": "^7.6.1",
     "@sinclair/typebox": "^0.34.30",
-    "@ubiquity-os/plugin-sdk": "^3.5.2",
+    "@ubiquity-os/plugin-sdk": "^3.5.3",
     "dotenv": "16.4.5",
     "hono": "^4.10.7",
     "js-yaml": "^4.1.1",

package.json

@@ -56,15 +56,18 @@ async function handleEvent(event: EmitterWebhookEvent, eventHandler: InstanceTyp
     const stateId = crypto.randomUUID();
     const manifest = await getManifest(context, plugin);
     const workerUrl = getWorkerUrlFromManifest(manifest);
-    const ref = workerUrl ? workerUrl : plugin.ref ?? (await getDefaultBranch(context, plugin.owner, plugin.repo));
+    const ref = workerUrl ? workerUrl : (plugin.ref ?? (await getDefaultBranch(context, plugin.owner, plugin.repo)));
     const token = await eventHandler.getToken(event.payload.installation.id);
     const inputs = new PluginInput(context.eventHandler, stateId, context.key, event.payload, settings?.with, token, ref, null);
 
     // We wrap the dispatch so a failing plugin doesn't break the whole execution
     try {
       context.logger.debug({ plugin: pluginEntry.key, worker: Boolean(workerUrl) }, "Dispatching event");
       if (workerUrl) {
-        await dispatchWorker(workerUrl, await inputs.getInputs());
+        const res = await dispatchWorker(workerUrl, await inputs.getInputs());
+        if (res.status >= 300) {
+          context.logger.warn({ plugin: pluginEntry.key, response: await safeJson(res) }, "Error response on dispatch event");
+        }
       } else {
         await dispatchWorkflow(context, {
           owner: plugin.owner,
@@ -80,3 +83,11 @@ async function handleEvent(event: EmitterWebhookEvent, eventHandler: InstanceTyp
     }
   }
 }
+
+async function safeJson(response: Response) {
+  const contentType = response.headers.get("content-type");
+  if (contentType && contentType.includes("application/json")) {
+    return response.json();
+  }
+  return await response.text();
+}

src/github/handlers/index.ts

@@ -33,14 +33,13 @@ export async function dispatchWorkflow(context: GitHubContext, options: Workflow
 }
 
 export async function dispatchWorker(targetUrl: string, payload?: Record<string, unknown>) {
-  const result = await fetch(targetUrl, {
+  return await fetch(targetUrl, {
     body: JSON.stringify(payload),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
     },
   });
-  return result.json();
 }
 
 export async function getDefaultBranch(context: GitHubContext, owner: string, repository: string) {

src/github/utils/workflow-dispatch.ts

@@ -31,7 +31,7 @@
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
-    "types": ["@cloudflare/workers-types/2023-07-01"] /* Specify type package names to be included without being referenced in a source file. */,
+    "types": [] /* Specify type package names to be included without being referenced in a source file. */,
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     "resolveJsonModule": true /* Enable importing .json files */,
     // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
@@ -48,7 +48,7 @@
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
-		"rootDir": ".",
+    "rootDir": ".",
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true                                    /* Disable emitting files from a compilation. */,
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */