Use httpError helper and payload for errors

Standardize error handling by introducing/using httpError and a `payload` property for error bodies. rest.js now sets error.payload instead of errorBody/body. error-messenger.js was simplified to send rerum_error_res.payload and dropped the ReadableStream/body detection logic. Routes (overwrite, query, update) now import and throw httpError for validation and upstream RERUM errors instead of creating Error objects and manually setting status codes. This centralizes HTTP error construction and response payload handling.

Author: cubap

error-messenger.js

@@ -14,23 +14,14 @@ export async function messenger(rerum_error_res, req, res, next) {
         return
     }
 
-    const hasReadableStream = typeof globalThis.ReadableStream === "function"
-    const explicitBody = rerum_error_res.errorBody ?? (
-        rerum_error_res.body !== undefined
-        && (!hasReadableStream || !(rerum_error_res.body instanceof globalThis.ReadableStream))
-            ? rerum_error_res.body
-            : undefined
-    )
-
     const error = {
         message: rerum_error_res.statusMessage ?? rerum_error_res.message ?? "A server error has occurred",
         status: rerum_error_res.statusCode ?? rerum_error_res.status ?? 500,
-        body: explicitBody
     }
 
-    if (error.body !== undefined) {
+    if (rerum_error_res.payload !== undefined) {
         console.error(error)
-        res.status(error.status).json(error.body)
+        res.status(error.status).json(rerum_error_res.payload)
         return
     }
 

rest.js

@@ -7,8 +7,7 @@ export function httpError(message, status = 500, body) {
   const error = new Error(message)
   error.status = status
   if (body !== undefined) {
-    error.errorBody = body
-    error.body = body
+    error.payload = body
   }
   return error
 }

routes/overwrite.js

@@ -1,6 +1,6 @@
 import express from "express"
 import checkAccessToken from "../tokens.js"
-import { verifyJsonContentType } from "../rest.js"
+import { httpError, verifyJsonContentType } from "../rest.js"
 import { createRerumNetworkError, fetchRerum } from "../rerum.js"
 const router = express.Router()
 
@@ -12,9 +12,7 @@ router.put('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
     const overwriteBody = req.body
     // check for @id; any value is valid
     if (!overwriteBody || !(overwriteBody['@id'] ?? overwriteBody.id)) {
-      const err = new Error("No record id to overwrite! (https://store.rerum.io/API.html#overwrite)")
-      err.status = 400
-      throw err
+      throw httpError("No record id to overwrite! (https://store.rerum.io/API.html#overwrite)", 400)
     }
 
     const overwriteOptions = {

routes/query.js

@@ -1,5 +1,5 @@
 import express from "express"
-import { verifyJsonContentType } from "../rest.js"
+import { httpError, verifyJsonContentType } from "../rest.js"
 import { fetchRerum } from "../rerum.js"
 const router = express.Router()
 
@@ -14,17 +14,13 @@ router.post('/', verifyJsonContentType, async (req, res, next) => {
     // If there is an empty query with [] or {}, we consider that a query for all data,
     // which we don't want to allow. We will throw a 400 error.
     if (queryBody === '{}' || queryBody === '[]') {
-      const err = new Error("Empty query is not allowed. Please provide a valid query in the request body.")
-      err.status = 400
-      throw err
+      throw httpError("Empty query is not allowed. Please provide a valid query in the request body.", 400)
     }
     // check limit and skip for INT
     if (Number.isNaN(Number.parseInt(lim, 10) + Number.parseInt(skip, 10))
       || (lim < 0)
       || (skip < 0)) {
-      const err = new Error("`limit` and `skip` values must be non-negative integers or omitted.")
-      err.status = 400
-      throw err
+      throw httpError("`limit` and `skip` values must be non-negative integers or omitted.", 400)
     }
 
     const queryOptions = {
@@ -48,9 +44,7 @@ router.post('/', verifyJsonContentType, async (req, res, next) => {
       } catch (e) {
         rerumErrorMessage = `500: ${queryURL} - A RERUM error occurred`
       }
-      const err = new Error(rerumErrorMessage)
-      err.status = 502
-      throw err
+      throw httpError(rerumErrorMessage, 502)
     })
     res.status(200).json(rerumResponse)
   }

routes/update.js

@@ -1,6 +1,6 @@
 import express from "express"
 import checkAccessToken from "../tokens.js"
-import { verifyJsonContentType } from "../rest.js"
+import { httpError, verifyJsonContentType } from "../rest.js"
 import { createRerumNetworkError, fetchRerum } from "../rerum.js"
 const router = express.Router()
 
@@ -10,9 +10,7 @@ router.put('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
   try {
     // check for @id; any value is valid
     if (!req.body || !(req.body['@id'] ?? req.body.id)) {
-      const err = new Error("No record id to update! (https://store.rerum.io/API.html#update)")
-      err.status = 400
-      throw err
+      throw httpError("No record id to update! (https://store.rerum.io/API.html#update)", 400)
     }
 
     const updateBody = JSON.stringify(req.body)
@@ -37,9 +35,7 @@ router.put('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
       } catch (e) {
         rerumErrorMessage = `500: ${updateURL} - A RERUM error occurred`
       }
-      const err = new Error(rerumErrorMessage)
-      err.status = 502
-      throw err
+      throw httpError(rerumErrorMessage, 502)
     })
     if (!(rerumResponse.id || rerumResponse["@id"])) {
       // A 200 with garbled data, call it a fail