From 6641e263def0f1b67c17404464f15c442e94e936 Mon Sep 17 00:00:00 2001
From: casmbu <grayt1988@gmail.com>
Date: Sat, 2 Aug 2025 16:19:40 -0400
Subject: [PATCH] feat: add pi-hole-top-queries-v6 widget

---
 src/components/Widgets/PiHoleTopQueries.vue   |   1 -
 src/components/Widgets/PiHoleTopQueriesV6.vue | 159 ++++++++++++++++++
 src/components/Widgets/WidgetBase.vue         |   1 +
 3 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 src/components/Widgets/PiHoleTopQueriesV6.vue

diff --git a/src/components/Widgets/PiHoleTopQueries.vue b/src/components/Widgets/PiHoleTopQueries.vue
index b72b2426..39a780a1 100644
--- a/src/components/Widgets/PiHoleTopQueries.vue
+++ b/src/components/Widgets/PiHoleTopQueries.vue
@@ -103,5 +103,4 @@ export default {
     }
   }
 }
-
 </style>
diff --git a/src/components/Widgets/PiHoleTopQueriesV6.vue b/src/components/Widgets/PiHoleTopQueriesV6.vue
new file mode 100644
index 00000000..2da16342
--- /dev/null
+++ b/src/components/Widgets/PiHoleTopQueriesV6.vue
@@ -0,0 +1,159 @@
+<template>
+<div class="pi-hole-queries-wrapper" v-if="results">
+  <div v-for="section in results" :key="section.id" class="query-section">
+    <p class="section-title">{{ section.title }}</p>
+    <div v-for="(query, i) in section.results" :key="i" class="query-row">
+      <p class="domain">{{ query.domain }}</p>
+      <p class="count">{{ query.count }}</p>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+import { showNumAsThousand } from '@/utils/MiscHelpers';
+
+export default {
+  mixins: [WidgetMixin],
+  components: {},
+  data() {
+    return {
+      results: null,
+      csrfToken: null,
+      sid: null,
+    };
+  },
+  computed: {
+    /* Let user select which comic to display: random, latest or a specific number */
+    hostname() {
+      const usersChoice = this.parseAsEnvVar(this.options.hostname);
+      if (!usersChoice) this.error('You must specify the hostname for your Pi-Hole server');
+      return usersChoice;
+    },
+    apiKey() {
+      const usersChoice = this.parseAsEnvVar(this.options.apiKey);
+      if (!usersChoice) this.error('App Password is required, please see the docs');
+      return usersChoice;
+    },
+    count() {
+      const usersChoice = this.options.count;
+      if (usersChoice && typeof usersChoice === 'number') return usersChoice;
+      return 10;
+    },
+    authHeader() {
+      return {
+        'X-FTL-SID': this.sid,
+        'X-FTL-CSRF': this.csrfToken,
+        Accept: 'application/json',
+      };
+    },
+    authEndpoint() {
+      return `${this.hostname}/api/auth`;
+    },
+    /* This is actually just the stats that are shown on the Pi-Hole dashboard, which amounts to
+    24hrs when the service first boots up, but will drift to be a little more than 24hrs worth of
+    data as the server runs. If you need accurate stats to a particular timeframe, then the
+    /api/stats/database/top_domains endpoint is the way to go. However, that endpoint does not
+    return sorted results, so you would have to get everything and sort it yourself, which presents
+    logistical problems. */
+    topDomainsEndpoint() {
+      return `${this.hostname}/api/stats/top_domains`;
+    },
+  },
+  methods: {
+    fetchData() {
+      this.makeRequest(
+        this.authEndpoint,
+        { 'Content-Type': 'application/json' },
+        'POST',
+        { password: this.apiKey },
+      )
+        .then(this.processAuthData)
+        .then(
+          () => {
+            if (!this.sid || !this.csrfToken) return;
+
+            Promise.all([
+              this.fetchTopAllowedDomains(),
+              this.fetchTopBlockedDomains(),
+            ]).then(this.processData);
+          },
+        );
+    },
+    processAuthData({ session }) {
+      if (!session) {
+        this.error('Missing session info in auth response');
+      } else if (session.valid !== true) {
+        this.error('Authentication failed: Invalid credentials or 2FA token required');
+      } else {
+        const { sid, csrf } = session;
+        if (!sid || !csrf) {
+          this.error('No CSRF token or SID received');
+        } else {
+          this.sid = sid;
+          this.csrfToken = csrf;
+        }
+      }
+    },
+    fetchTopAllowedDomains() {
+      const url = new URL(this.topDomainsEndpoint);
+      url.searchParams.append('blocked', false);
+      url.searchParams.append('count', this.count);
+      return this.makeRequest(url.toString(), this.authHeader);
+    },
+    fetchTopBlockedDomains() {
+      const url = new URL(this.topDomainsEndpoint);
+      url.searchParams.append('blocked', true);
+      url.searchParams.append('count', this.count);
+      return this.makeRequest(url.toString(), this.authHeader);
+    },
+    processData([topAllowedDomains, topBlockedDomains]) {
+      const topAds = [];
+      topBlockedDomains.domains.forEach(({ domain, count }) => {
+        topAds.push({ domain, count: showNumAsThousand(count) });
+      });
+      const topQueries = [];
+      topAllowedDomains.domains.forEach(({ domain, count }) => {
+        topQueries.push({ domain, count: showNumAsThousand(count) });
+      });
+      this.results = [
+        { id: '01', title: 'Top Ads Blocked', results: topAds },
+        { id: '02', title: 'Top Queries', results: topQueries },
+      ];
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.pi-hole-queries-wrapper {
+  color: var(--widget-text-color);
+  .query-section {
+    display: inline-block;
+    width: 100%;
+    p.section-title {
+      margin: 0.75rem 0 0.25rem;
+      font-size: 1.2rem;
+      font-weight: bold;
+    }
+    .query-row {
+      display: flex;
+      justify-content: space-between;
+      margin: 0.25rem;
+      p.domain {
+        margin: 0.25rem 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      p.count {
+        margin: 0.25rem 0;
+        font-family: var(--font-monospace);
+      }
+      &:not(:last-child) {
+        border-bottom: 1px dashed var(--widget-text-color);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue
index 0836ce0d..28c58393 100644
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@@ -105,6 +105,7 @@ const COMPAT = {
   'pi-hole-stats': 'PiHoleStats',
   'pi-hole-stats-v6': 'PiHoleStatsV6',
   'pi-hole-top-queries': 'PiHoleTopQueries',
+  'pi-hole-top-queries-v6': 'PiHoleTopQueriesV6',
   'pi-hole-traffic': 'PiHoleTraffic',
   'proxmox-lists': 'Proxmox',
   'public-holidays': 'PublicHolidays',