Skip to content

A modern and easy to use dashboard. 80+ integrations. 20K+ icons built in. Authentication out of the box. No YAML, drag and drop configuration.

fix(adguard): handle empty filter lists

ajnartec5930cd8af4
diff --git a/packages/integrations/src/adguard-home/adguard-home-integration.ts b/packages/integrations/src/adguard-home/adguard-home-integration.ts
index 66688d745..ad893e8f9 100644
--- a/packages/integrations/src/adguard-home/adguard-home-integration.ts
+++ b/packages/integrations/src/adguard-home/adguard-home-integration.ts
@@ -71,9 +71,12 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar
stats.data.time_units === "days"
? (stats.data.dns_queries[stats.data.dns_queries.length - 1] ?? 0)
: stats.data.dns_queries.reduce((prev, sum) => prev + sum, 0);
- const countFilteredDomains = filteringStatus.data.filters
- .filter((filter) => filter.enabled)
- .reduce((sum, filter) => filter.rules_count + sum, 0);
+ let countFilteredDomains = 0;
+ if (filteringStatus.data.filters !== null) {
+ countFilteredDomains = filteringStatus.data.filters
+ .filter((filter) => filter.enabled)
+ .reduce((sum, filter) => filter.rules_count + sum, 0);
+ }
let adsBlockedTodayPercentage = 0;
if (queriesToday > 0) {
adsBlockedTodayPercentage = (blockedQueriesToday / queriesToday) * 100;
diff --git a/packages/integrations/src/adguard-home/adguard-home-types.ts b/packages/integrations/src/adguard-home/adguard-home-types.ts
index 20563dd36..e4f7852ce 100644
--- a/packages/integrations/src/adguard-home/adguard-home-types.ts
+++ b/packages/integrations/src/adguard-home/adguard-home-types.ts
@@ -29,14 +29,16 @@ export const statusResponseSchema = z.object({
});
export const filteringStatusSchema = z.object({
- filters: z.array(
- z.object({
- url: z.string(),
- name: z.string(),
- last_updated: z.string().optional(),
- id: z.number().nonnegative(),
- rules_count: z.number().nonnegative(),
- enabled: z.boolean(),
- }),
- ),
+ filters: z
+ .array(
+ z.object({
+ url: z.string(),
+ name: z.string(),
+ last_updated: z.string().optional(),
+ id: z.number().nonnegative(),
+ rules_count: z.number().nonnegative(),
+ enabled: z.boolean(),
+ }),
+ )
+ .nullable(),
});
diff --git a/packages/integrations/src/adguard-home/test/adguard-home-integration.spec.ts b/packages/integrations/src/adguard-home/test/adguard-home-integration.spec.ts
index bcc83674a..e1f0d46a8 100644
--- a/packages/integrations/src/adguard-home/test/adguard-home-integration.spec.ts
+++ b/packages/integrations/src/adguard-home/test/adguard-home-integration.spec.ts
@@ -11,6 +11,7 @@ vi.hoisted(() => {
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
import { AdGuardHomeIntegration } from "../adguard-home-integration";
+import { filteringStatusSchema } from "../adguard-home-types";
vi.mock("@homarr/core/infrastructure/http", () => ({ fetchWithTrustedCertificatesAsync: vi.fn() }));
@@ -89,10 +90,53 @@ describe("AdGuardHomeIntegration", () => {
expect(Number.isFinite(summary.adsBlockedTodayPercentage)).toBe(true);
},
);
+
+ test.each([
+ { filters: null, expected: 0 },
+ { filters: [], expected: 0 },
+ { filters: filteringStatus.filters, expected: 12 },
+ ])("reports $expected blocked domains for the configured filters", async ({ filters, expected }) => {
+ mockSummaryResponses({ filters });
+
+ await expect(integration.getSummaryAsync()).resolves.toMatchObject({
+ domainsBeingBlocked: expected,
+ adsBlockedTodayPercentage: 20,
+ dnsQueriesToday: 100,
+ });
+ if (filters === null) {
+ expect(filteringStatusSchema.parse({ filters }).filters).toBeNull();
+ }
+ });
+
+ test.each([undefined, "invalid", 0, {}, [null], [{ ...filteringStatus.filters[0], rules_count: "12" }]])(
+ "rejects malformed filtering status filters: %j",
+ async (filters) => {
+ mockSummaryResponses({ filters });
+
+ await expect(integration.getSummaryAsync()).rejects.toMatchObject({
+ cause: { message: expect.stringContaining("Filtering status parsing error") },
+ });
+ },
+ );
});
const jsonResponse = (body: unknown) => new Response(JSON.stringify(body), { status: 200 });
+function mockSummaryResponses(filtering: unknown) {
+ mockFetch.mockImplementation(async (url) => {
+ switch (new URL(url.toString()).pathname) {
+ case "/control/stats":
+ return jsonResponse(stats);
+ case "/control/status":
+ return jsonResponse(status);
+ case "/control/filtering/status":
+ return jsonResponse(filtering);
+ default:
+ throw new Error("Unexpected AdGuard request");
+ }
+ });
+}
+
const stats = {
time_units: "hours",
top_queried_domains: [],