Commit c4715a8
fix(errors): emit JSON envelope from WriteHTTPError + harden fetch callers (#114)
* fix(errors): emit JSON envelope from WriteHTTPError + harden fetch callers (#112)
errors.WriteHTTPError historically wrote `text/plain` via http.Error, so
any API handler that returned an error through it (Logs, Services,
Certificates, ...) sent a body like "Failed to fetch logs. Please try
again later." Frontend JS that unconditionally `response.json()`s the
body then threw `Unexpected token 'F', "Failed to "... is not valid
JSON`, which the Logs and Services pages rendered verbatim as a hostile
error toast.
Change WriteHTTPError to emit the same `{"success": false, "message":
"..."}` envelope that Handler.jsonError() produces, with
`Content-Type: application/json`. Frontend callers that JSON.parse the
body now get a structured error they can surface cleanly.
Also harden the two visibly-affected pages (Logs, Services) to:
- check response.ok before parsing
- prefer the JSON envelope's .message field for the user-facing toast
- fall back to response.statusText for non-JSON / malformed bodies
Add regression tests for the new wire format in
internal/framework/errors.
Phase 1 slice of #112.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(errors): address Copilot review on WriteHTTPError JSON envelope (#112)
Copilot flagged three callers that would render the new
{"success":false,"message":...} envelope opaquely:
1. services.templ service-control: did `await response.text()` and
toasted the raw blob.
2. certificates.templ downloadCertificate: same.
3. security.templ blockIP / unblockIP: same.
Also flagged the 2xx-non-JSON fallback I added in logs.templ and
services.templ as too permissive — silently rendering a non-JSON 2xx
response would hide an auth-redirect HTML page or proxy error.
Fixes:
* security.templ now defines an `extractErrorMessage(response)`
helper that parses the JSON envelope when content-type advertises
JSON, falling back to text otherwise. blockIP / unblockIP route
through it.
* services.templ service-control inlines the same JSON-first
pattern.
* certificates.templ downloadCertificate inlines the same pattern.
* logs.templ + services.templ success-path: a 2xx with a non-JSON
body now throws a "non-JSON response" error instead of being
silently rendered as log lines / empty service list.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent a0faaca commit c4715a8
6 files changed
Lines changed: 201 additions & 14 deletions
File tree
- gearbox/internal/framework
- errors
- templates/pages
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
168 | 169 | | |
169 | 170 | | |
170 | 171 | | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
171 | 181 | | |
172 | 182 | | |
173 | 183 | | |
| |||
194 | 204 | | |
195 | 205 | | |
196 | 206 | | |
197 | | - | |
198 | | - | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
199 | 220 | | |
200 | 221 | | |
201 | 222 | | |
| |||
Lines changed: 64 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
Lines changed: 17 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
470 | 470 | | |
471 | 471 | | |
472 | 472 | | |
473 | | - | |
474 | | - | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
475 | 490 | | |
476 | 491 | | |
477 | 492 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
489 | 489 | | |
490 | 490 | | |
491 | 491 | | |
492 | | - | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
493 | 519 | | |
494 | 520 | | |
495 | 521 | | |
496 | 522 | | |
497 | 523 | | |
498 | | - | |
499 | | - | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
500 | 530 | | |
501 | 531 | | |
502 | 532 | | |
| |||
Lines changed: 20 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
203 | 221 | | |
204 | 222 | | |
205 | 223 | | |
| |||
363 | 381 | | |
364 | 382 | | |
365 | 383 | | |
366 | | - | |
367 | | - | |
| 384 | + | |
368 | 385 | | |
369 | 386 | | |
370 | 387 | | |
| |||
391 | 408 | | |
392 | 409 | | |
393 | 410 | | |
394 | | - | |
395 | | - | |
| 411 | + | |
396 | 412 | | |
397 | 413 | | |
398 | 414 | | |
| |||
Lines changed: 44 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
216 | | - | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
217 | 243 | | |
218 | 244 | | |
219 | 245 | | |
| |||
500 | 526 | | |
501 | 527 | | |
502 | 528 | | |
503 | | - | |
504 | | - | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
505 | 546 | | |
506 | 547 | | |
507 | 548 | | |
| |||
0 commit comments