workers: Enable CORS on error responses

workers/api-server/src/router.rs

@@ -128,19 +128,39 @@ impl<
 
         // Forward to the typed handler
         let res = self.handle_typed(headers, req_body, url_params).await;
-        if let Ok(resp) = res {
-            // Serialize the response into a body. We explicitly allow for all cross-origin
-            // requests, as users connecting to a locally-run node have a different origin port.
-
-            // TODO: Either remove this in the future, or ensure that no sensitive information can
-            // leak from cross-origin requests.
-            Response::builder()
-                .header("Access-Control-Allow-Origin", "*")
-                .body(Body::from(serde_json::to_vec(&resp).unwrap()))
-                .unwrap()
-        } else {
-            res.err().unwrap().into()
-        }
+
+        let response = match res {
+            Ok(resp) => {
+                // Serialize the response into a body. We explicitly allow for all cross-origin
+                // requests, as users connecting to a locally-run node have a different origin
+                // port.
+
+                // TODO: Either remove this in the future, or ensure that no sensitive
+                // information can leak from cross-origin requests.
+                Response::builder()
+                    .header("Access-Control-Allow-Origin", "*")
+                    .body(Body::from(serde_json::to_vec(&resp).unwrap()))
+                    .unwrap()
+            }
+            Err(ApiServerError::HttpStatusCode(status, msg)) => {
+                // Create a response with the status code from ApiServerError
+                Response::builder()
+                    .status(status)
+                    .header("Access-Control-Allow-Origin", "*")
+                    .body(Body::from(msg))
+                    .unwrap()
+            }
+            Err(_) => {
+                // Handle other error cases if needed
+                Response::builder()
+                    .status(StatusCode::INTERNAL_SERVER_ERROR)
+                    .header("Access-Control-Allow-Origin", "*")
+                    .body(Body::empty())
+                    .unwrap()
+            }
+        };
+
+        response
     }
 }