Merge pull request #3690 from harsh-aghara/feat/accept-status-codes-backend
Add customUpCodes support for HTTP monitors (Backend)
This commit is contained in:
13 files changed
+346
-60
No files matched your search
@@ -56,6 +56,7 @@ const makeMonitor = (overrides?: Partial<Monitor>): Monitor =>
|
||||
useAdvancedMatching: false,
|
||||
matchMethod: undefined,
|
||||
expectedValue: undefined,
|
||||
customUpCodes: [],
|
||||
...overrides,
|
||||
}) as Monitor;
|
||||
|
||||
@@ -253,14 +254,13 @@ describe("HttpProvider", () => {
|
||||
expect(result.extracted).toBe("value");
|
||||
});
|
||||
|
||||
it("sets status to false when response.ok is false even if matcher passes", async () => {
|
||||
it("sets status to false when status code is non-2xx even if matcher passes", async () => {
|
||||
mockGot.mockResolvedValue(makeGotResponse({ ok: false, statusCode: 301 }));
|
||||
const matcher = createMockMatcher({ ok: true, message: "Success" });
|
||||
const { provider } = createProvider(matcher);
|
||||
|
||||
const result = await provider.handle(makeMonitor());
|
||||
|
||||
// status = response.ok && matchResult.ok
|
||||
expect(result.status).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -345,4 +345,92 @@ describe("HttpProvider", () => {
|
||||
await expect(provider.handle(makeMonitor({ url: "" }))).rejects.toThrow("URL is required for HTTP monitor");
|
||||
});
|
||||
});
|
||||
|
||||
// ── customUpCodes ────────────────────────────────────────────────────
|
||||
|
||||
describe("customUpCodes", () => {
|
||||
it("returns status true when HTTPError status code is in customUpCodes", async () => {
|
||||
const err = new HTTPError("Unauthorized");
|
||||
(err as any).response = { statusCode: 401 };
|
||||
(err as any).timings = { phases: { total: 30 } };
|
||||
mockGot.mockRejectedValue(err);
|
||||
const { provider } = createProvider();
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [401] }));
|
||||
|
||||
expect(result.status).toBe(true);
|
||||
expect(result.code).toBe(401);
|
||||
});
|
||||
|
||||
it("returns status false when HTTPError status code is not in customUpCodes", async () => {
|
||||
const err = new HTTPError("Internal Server Error");
|
||||
(err as any).response = { statusCode: 500 };
|
||||
(err as any).timings = { phases: { total: 40 } };
|
||||
mockGot.mockRejectedValue(err);
|
||||
const { provider } = createProvider();
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [401, 403] }));
|
||||
|
||||
expect(result.status).toBe(false);
|
||||
expect(result.code).toBe(500);
|
||||
});
|
||||
|
||||
it("returns status false when customUpCodes is empty", async () => {
|
||||
const err = new HTTPError("Unauthorized");
|
||||
(err as any).response = { statusCode: 401 };
|
||||
(err as any).timings = { phases: { total: 25 } };
|
||||
mockGot.mockRejectedValue(err);
|
||||
const { provider } = createProvider();
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [] }));
|
||||
|
||||
expect(result.status).toBe(false);
|
||||
expect(result.code).toBe(401);
|
||||
});
|
||||
|
||||
it("treats non-2xx success response as up when status code is in customUpCodes", async () => {
|
||||
mockGot.mockResolvedValue(makeGotResponse({ ok: false, statusCode: 301, statusMessage: "Moved Permanently" }));
|
||||
const { provider } = createProvider();
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [301] }));
|
||||
|
||||
expect(result.status).toBe(true);
|
||||
expect(result.code).toBe(301);
|
||||
});
|
||||
|
||||
it("does not override matcher failure even when status code is in customUpCodes", async () => {
|
||||
mockGot.mockResolvedValue(makeGotResponse({ ok: false, statusCode: 301 }));
|
||||
const matcher = createMockMatcher({ ok: false, message: "Body mismatch" });
|
||||
const { provider } = createProvider(matcher);
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [301] }));
|
||||
|
||||
expect(result.status).toBe(false);
|
||||
expect(result.message).toBe("Body mismatch");
|
||||
});
|
||||
|
||||
it("does not override matcher failure on HTTPError when status code is in customUpCodes", async () => {
|
||||
const err = new HTTPError("Unauthorized");
|
||||
(err as any).response = {
|
||||
statusCode: 401,
|
||||
body: '{"status":"down"}',
|
||||
headers: { "content-type": "application/json" },
|
||||
};
|
||||
(err as any).timings = { phases: { total: 30 } };
|
||||
mockGot.mockRejectedValue(err);
|
||||
const matcher = createMockMatcher({
|
||||
ok: false,
|
||||
message: "Body mismatch",
|
||||
extracted: "down",
|
||||
});
|
||||
const { provider } = createProvider(matcher);
|
||||
|
||||
const result = await provider.handle(makeMonitor({ customUpCodes: [401], useAdvancedMatching: true }));
|
||||
|
||||
expect(result.status).toBe(false);
|
||||
expect(result.message).toBe("Body mismatch");
|
||||
expect(result.payload).toEqual({ status: "down" });
|
||||
expect(result.extracted).toBe("down");
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "@jest/globals";
|
||||
import { timeRequest, NETWORK_ERROR, PING_ERROR } from "../../../../src/service/infrastructure/network/utils.ts";
|
||||
import { timeRequest, NETWORK_ERROR, PING_ERROR, isStatusUp } from "../../../../src/service/infrastructure/network/utils.ts";
|
||||
|
||||
describe("network utils", () => {
|
||||
describe("timeRequest", () => {
|
||||
@@ -41,4 +41,40 @@ describe("network utils", () => {
|
||||
expect(PING_ERROR).toBe(5001);
|
||||
});
|
||||
});
|
||||
|
||||
describe("isStatusUp", () => {
|
||||
it("returns true for 2xx status codes", () => {
|
||||
expect(isStatusUp(200)).toBe(true);
|
||||
expect(isStatusUp(201)).toBe(true);
|
||||
expect(isStatusUp(204)).toBe(true);
|
||||
expect(isStatusUp(299)).toBe(true);
|
||||
});
|
||||
|
||||
it("returns false for non-2xx status codes without customUpCodes", () => {
|
||||
expect(isStatusUp(100)).toBe(false);
|
||||
expect(isStatusUp(301)).toBe(false);
|
||||
expect(isStatusUp(404)).toBe(false);
|
||||
expect(isStatusUp(500)).toBe(false);
|
||||
});
|
||||
|
||||
it("returns true when status code is in customUpCodes", () => {
|
||||
expect(isStatusUp(301, [301])).toBe(true);
|
||||
expect(isStatusUp(404, [200, 404])).toBe(true);
|
||||
expect(isStatusUp(401, [401, 403])).toBe(true);
|
||||
});
|
||||
|
||||
it("returns false when status code is not in customUpCodes", () => {
|
||||
expect(isStatusUp(500, [401, 403])).toBe(false);
|
||||
});
|
||||
|
||||
it("returns false when statusCode is undefined", () => {
|
||||
expect(isStatusUp(undefined)).toBe(false);
|
||||
expect(isStatusUp(undefined, [200])).toBe(false);
|
||||
});
|
||||
|
||||
it("defaults customUpCodes to empty array", () => {
|
||||
expect(isStatusUp(200)).toBe(true);
|
||||
expect(isStatusUp(404)).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -222,3 +222,93 @@ describe("monitorValidation — strategy gating", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("monitorValidation — customUpCodes", () => {
|
||||
const baseHttpBody = {
|
||||
name: "HTTP check",
|
||||
type: "http" as const,
|
||||
url: "https://example.com",
|
||||
};
|
||||
|
||||
describe("createMonitorBodyValidation", () => {
|
||||
it("accepts valid HTTP status codes", () => {
|
||||
const parsed = createMonitorBodyValidation.parse({
|
||||
...baseHttpBody,
|
||||
customUpCodes: [200, 301, 404, 503],
|
||||
});
|
||||
expect(parsed.customUpCodes).toEqual([200, 301, 404, 503]);
|
||||
});
|
||||
|
||||
it("rejects invalid HTTP status codes", () => {
|
||||
expect(() =>
|
||||
createMonitorBodyValidation.parse({
|
||||
...baseHttpBody,
|
||||
customUpCodes: [5000],
|
||||
})
|
||||
).toThrow();
|
||||
|
||||
expect(() =>
|
||||
createMonitorBodyValidation.parse({
|
||||
...baseHttpBody,
|
||||
customUpCodes: [-1],
|
||||
})
|
||||
).toThrow();
|
||||
});
|
||||
|
||||
it("defaults to an empty array when not provided", () => {
|
||||
const parsed = createMonitorBodyValidation.parse(baseHttpBody);
|
||||
expect(parsed.customUpCodes).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("editMonitorBodyValidation", () => {
|
||||
it("accepts valid HTTP status codes on edits", () => {
|
||||
const parsed = editMonitorBodyValidation.parse({
|
||||
customUpCodes: [200, 201],
|
||||
});
|
||||
expect(parsed.customUpCodes).toEqual([200, 201]);
|
||||
});
|
||||
|
||||
it("rejects invalid HTTP status codes on edits", () => {
|
||||
expect(() =>
|
||||
editMonitorBodyValidation.parse({
|
||||
customUpCodes: [9999],
|
||||
})
|
||||
).toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe("importMonitorsBodyValidation", () => {
|
||||
it("retains valid HTTP status codes on imported HTTP monitors", () => {
|
||||
const parsed = importMonitorsBodyValidation.parse({
|
||||
monitors: [
|
||||
{
|
||||
...baseHttpBody,
|
||||
customUpCodes: [404],
|
||||
},
|
||||
],
|
||||
});
|
||||
expect(parsed.monitors[0].customUpCodes).toEqual([404]);
|
||||
});
|
||||
|
||||
it("rejects invalid HTTP status codes on imported HTTP monitors", () => {
|
||||
expect(() =>
|
||||
importMonitorsBodyValidation.parse({
|
||||
monitors: [
|
||||
{
|
||||
...baseHttpBody,
|
||||
customUpCodes: [5000],
|
||||
},
|
||||
],
|
||||
})
|
||||
).toThrow();
|
||||
});
|
||||
|
||||
it("defaults to an empty array when not provided on import", () => {
|
||||
const parsed = importMonitorsBodyValidation.parse({
|
||||
monitors: [baseHttpBody],
|
||||
});
|
||||
expect(parsed.monitors[0].customUpCodes).toEqual([]);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user