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): correct the blocked query percentage
ajnartcf5ad96e64eb
diff --git a/packages/integrations/src/adguard-home/adguard-home-integration.ts b/packages/integrations/src/adguard-home/adguard-home-integration.tsindex f33ca42c7..66688d745 100644--- a/packages/integrations/src/adguard-home/adguard-home-integration.ts+++ b/packages/integrations/src/adguard-home/adguard-home-integration.ts@@ -74,11 +74,15 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummarconst 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;+ }return {status: status.data.protection_enabled ? ("enabled" as const) : ("disabled" as const),adsBlockedToday: blockedQueriesToday,- adsBlockedTodayPercentage: blockedQueriesToday > 0 ? (queriesToday / blockedQueriesToday) * 100 : 0,+ adsBlockedTodayPercentage,domainsBeingBlocked: countFilteredDomains,dnsQueriesToday: queriesToday,};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.tsindex 980b390fd..bcc83674a 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@@ -51,10 +51,44 @@ describe("AdGuardHomeIntegration", () => {await expect(resultPromise).resolves.toMatchObject({status: "enabled",adsBlockedToday: 20,+ adsBlockedTodayPercentage: 20,dnsQueriesToday: 100,domainsBeingBlocked: 12,});});++ test.each([+ { timeUnits: "days", queries: [1000, 100], blocked: [900, 20], expected: 20 },+ { timeUnits: "hours", queries: [0, 0], blocked: [0, 0], expected: 0 },+ { timeUnits: "hours", queries: [40, 60], blocked: [0, 0], expected: 0 },+ { timeUnits: "hours", queries: [40, 60], blocked: [40, 60], expected: 100 },+ ])(+ "reports the actual blocked share for $timeUnits buckets (expected $expected percent)",+ async ({ timeUnits, queries, blocked, expected }) => {+ mockFetch.mockImplementation(async (url) => {+ switch (new URL(url.toString()).pathname) {+ case "/control/stats":+ return jsonResponse({+ ...stats,+ time_units: timeUnits,+ dns_queries: queries,+ blocked_filtering: blocked,+ num_dns_queries: queries.reduce((sum, value) => sum + value, 0),+ num_blocked_filtering: blocked.reduce((sum, value) => sum + value, 0),+ });+ case "/control/status":+ return jsonResponse(status);+ case "/control/filtering/status":+ return jsonResponse(filteringStatus);+ default:+ throw new Error("Unexpected AdGuard request");+ }+ });+ const summary = await integration.getSummaryAsync();+ expect(summary.adsBlockedTodayPercentage).toBe(expected);+ expect(Number.isFinite(summary.adsBlockedTodayPercentage)).toBe(true);+ },+ );});const jsonResponse = (body: unknown) => new Response(JSON.stringify(body), { status: 200 });