Skip to content

fix(hibp): improve error tracking and fix json decode error #6544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kschelonka wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(hibp): improve error tracking and fix json decode error #6544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e123c0
fix(hibp): improve error tracking and fix json decode error
kschelonka Mar 12, 2026
1681a78
Merge branch 'main' into fix/hibp-error-tracking-json-decode
codemist Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/utils/hibp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
} from "../db/redis/client.ts";
import { config } from "../config.ts";
import { incKanonFailure, incKanonRequest } from "./metrics.ts";
import { captureException } from "@sentry/node";

// TODO: fix hardcode
const HIBP_USER_AGENT = "monitor/1.0.0";
Expand Down Expand Up @@ -69,9 +70,9 @@ async function _throttledFetch(
try {
meters?.requests?.();
const response = await fetch(url, reqOptions);
const responseJson = await response.json();
if (response.ok) return responseJson as unknown;

if (response.ok) {
return await response.json();

@Vinnl Vinnl Mar 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only parsing the JSON on successful response makes sense, but right now you're also changing the return type to any:

Suggested change
return await response.json();
return await response.json() as unknown;

}
switch (response.status) {
case 404:
// 404 can mean "no results", return undefined response
Expand All @@ -97,12 +98,13 @@ async function _throttledFetch(
}
default:
meters?.failures?.(response.status ?? 500);
throw responseJson;
throw Error(
`HTTP Response: [${response.status}] ${response.statusText}`,
);
}
} catch (e) {
if (e instanceof Error) {
logger.error("hibp_throttle_fetch_error", { stack: e.stack });
}
logger.error("hibp_throttle_fetch_error", { error: e, url });
captureException(e, { data: url });
throw e;
}
}
Expand All @@ -116,7 +118,7 @@ async function hibpApiFetch(path: string, options = {}) {
try {
return await _throttledFetch(url, reqOptions);
} catch (ex) {
logger.error("hibp_api_fetch", { exception: ex });
logger.error("hibp_api_fetch", { exception: ex, path });
}
}
/* c8 ignore stop */
Expand Down
Loading