Merge pull request #14 from hzrd149/x-reason

Return X-Reason header for all errors

.changeset/tough-papayas-join.md

@@ -0,0 +1,5 @@
+---
+"blossom-server-ts": minor
+---
+
+Return X-Reason header for all errors

public/upload-form.js

@@ -59,7 +59,7 @@ export class UploadForm extends LitElement {
       });
 
       if (!check.ok) {
-        throw new Error(check.headers.get("x-upload-message") || "Upload Rejected");
+        throw new Error(check.headers.get("x-reason") || "Upload Rejected");
       }
 
       // Upload blob

src/api/upload.ts

@@ -17,24 +17,6 @@ type UploadState = CommonState & {
   rule: Rule;
 };
 
-// handle errors
-router.use(async (ctx, next) => {
-  try {
-    await next();
-  } catch (err) {
-    // BUD-06 set `X-Upload-Message` on failure
-    if (isHttpError(err)) {
-      const status = (ctx.status = err.status || 500);
-      ctx.set("X-Upload-Message", status > 500 ? "Something went wrong" : err.message);
-    } else {
-      ctx.set("X-Upload-Message", "Something went wrong");
-    }
-
-    // pass error to parent handler
-    throw err;
-  }
-});
-
 router.all<CommonState>("/upload", async (ctx, next) => {
   if (!config.upload.enabled) throw new HttpErrors.NotFound("Uploads disabled");
 

src/index.ts

@@ -41,7 +41,9 @@ app.use(async (ctx, next) => {
     if (isHttpError(err)) {
       const status = (ctx.status = err.status || 500);
       if (status >= 500) console.error(err.stack);
+      // TODO: remove this when clients no long rely on it
       ctx.body = status > 500 ? { message: "Something went wrong" } : { message: err.message };
+      ctx.set("X-Reason", status > 500 ? "Something went wrong" : err.message);
     } else {
       console.log(err);
       ctx.status = 500;