From 56ae1797ed120e0ad10a37984d1fde0a8f266679 Mon Sep 17 00:00:00 2001
From: yuuki <>
Date: Tue, 7 Jan 2025 15:59:38 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=BF=E3=83=AB=E6=95=B0?=
 =?UTF-8?q?=E3=82=82=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 analytics_daily.txt  | 34 +++++++++++++++++++---------------
 analytics_hourly.txt | 34 +++++++++++++++++++---------------
 static/script.js     | 34 ++++++++++++++++++++++------------
 3 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/analytics_daily.txt b/analytics_daily.txt
index 0a82ce8..106216c 100644
--- a/analytics_daily.txt
+++ b/analytics_daily.txt
@@ -1,27 +1,31 @@
-{
+query GetZoneAnalytics($zoneTag: string, $from: string, $to: string) {
   viewer {
-    zones(filter: {
-      zoneTag: $zoneTag
-    }) {
-      httpRequests1dGroups(
-        orderBy: [date_ASC],
-        limit: $limit,
-        filter: {
-          date_gt: $from,
-          date_leq: $to
+    zones(filter: {zoneTag: $zoneTag}) {
+      totals: httpRequests1dGroups(limit: 10000, filter: {date_gt: $from, date_leq: $to}) {
+        uniq {
+          uniques
+          __typename
         }
-      ) {
+        __typename
+      }
+      zones: httpRequests1dGroups(orderBy: [date_ASC], limit: 10000, filter: {date_gt: $from, date_leq: $to}) {
         dimensions {
-          date
+          timeslot: date
+          __typename
+        }
+        uniq {
+          uniques
+          __typename
         }
         sum {
           bytes
           cachedBytes
+          __typename
         }
-        uniq {
-          uniques
-        }
+        __typename
       }
+      __typename
     }
+    __typename
   }
 }
diff --git a/analytics_hourly.txt b/analytics_hourly.txt
index 890b039..d7f9a49 100644
--- a/analytics_hourly.txt
+++ b/analytics_hourly.txt
@@ -1,27 +1,31 @@
-{
+query GetZoneAnalytics($zoneTag: string, $from: string, $to: string) {
   viewer {
-    zones(filter: {
-      zoneTag: $zoneTag
-    }) {
-      httpRequests1hGroups(
-        orderBy: [datetime_ASC],
-        limit: $limit,
-        filter: {
-          datetime_gt: $from,
-          datetime_leq: $to
+    zones(filter: {zoneTag: $zoneTag}) {
+      totals: httpRequests1hGroups(limit: 10000, filter: {datetime_gt: $from, datetime_leq: $to}) {
+        uniq {
+          uniques
+          __typename
         }
-      ) {
+        __typename
+      }
+      zones: httpRequests1hGroups(orderBy: [datetime_ASC], limit: 10000, filter: {datetime_gt: $from, datetime_leq: $to}) {
         dimensions {
-          datetime
+          timeslot: datetime
+          __typename
+        }
+        uniq {
+          uniques
+          __typename
         }
         sum {
           bytes
           cachedBytes
+          __typename
         }
-        uniq {
-          uniques
-        }
+        __typename
       }
+      __typename
     }
+    __typename
   }
 }
diff --git a/static/script.js b/static/script.js
index e3b787c..cb7db9b 100644
--- a/static/script.js
+++ b/static/script.js
@@ -89,8 +89,8 @@ addEventListener("load", () => {
     .then((results) => {
       document.querySelector("#loading").remove();
 
-      const scale = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["httpRequests1dGroups"].length));
-      const endedAt = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["httpRequests1dGroups"].map((g) => new Date(g["dimensions"]["date"]).getTime())).flat());
+      const scale = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["zones"].length));
+      const endedAt = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["zones"].map((g) => new Date(g["dimensions"]["timeslot"]).getTime())).flat());
       const range = Array.from({ length: scale }, (_, k) => new Date(endedAt - k * 24 * 60 * 60 * 1000));
 
       const ctxUsers = document.querySelector("#users").getContext("2d");
@@ -99,10 +99,15 @@ addEventListener("load", () => {
         ctxUsers,
         range.map((d) => d.toISOString().slice(0, 10)).reverse(),
         results.map((r) => {
+          const total = Intl.NumberFormat('en-US', {
+            notation: "compact",
+            maximumFractionDigits: 1,
+          }).format(r.json["data"]["viewer"]["zones"][0]["totals"][0]["uniq"]["uniques"]);
+
           return {
             type: "line",
-            label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1dGroups"].find((g) => g["dimensions"]["date"] === d.toISOString().slice(0, 10))?.["uniq"]?.["uniques"] ?? null).reverse(),
+            label: r.domain + " - (" + total + ")",
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 10))?.["uniq"]?.["uniques"] ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",
@@ -122,7 +127,7 @@ addEventListener("load", () => {
           return {
             type: "line",
             label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1dGroups"].find((g) => g["dimensions"]["date"] === d.toISOString().slice(0, 10))?.["sum"]?.["bytes"] / 1000 ** 3 ?? null).reverse(),
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 10))?.["sum"]?.["bytes"] / 1000 ** 3 ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",
@@ -142,7 +147,7 @@ addEventListener("load", () => {
           return {
             type: "line",
             label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1dGroups"].find((g) => g["dimensions"]["date"] === d.toISOString().slice(0, 10))?.["sum"]?.["cachedBytes"] / 1000 ** 3 ?? null).reverse(),
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 10))?.["sum"]?.["cachedBytes"] / 1000 ** 3 ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",
@@ -158,8 +163,8 @@ addEventListener("load", () => {
     .then((results) => {
       document.querySelector("#loading-2").remove();
 
-      const scale = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["httpRequests1hGroups"].length));
-      const endedAt = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["httpRequests1hGroups"].map((g) => new Date(g["dimensions"]["datetime"]).getTime())).flat());
+      const scale = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["zones"].length));
+      const endedAt = Math.max(...results.map((r) => r.json["data"]["viewer"]["zones"][0]["zones"].map((g) => new Date(g["dimensions"]["timeslot"]).getTime())).flat());
       const range = Array.from({ length: scale }, (_, k) => new Date(endedAt - k * 60 * 60 * 1000));
 
       const ctxUsers = document.querySelector("#users-2").getContext("2d");
@@ -168,10 +173,15 @@ addEventListener("load", () => {
         ctxUsers,
         range.map((d) => d.toLocaleString()).reverse(),
         results.map((r) => {
+          const total = Intl.NumberFormat('en-US', {
+            notation: "compact",
+            maximumFractionDigits: 1,
+          }).format(r.json["data"]["viewer"]["zones"][0]["totals"][0]["uniq"]["uniques"]);
+
           return {
             type: "line",
-            label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1hGroups"].find((g) => g["dimensions"]["datetime"] === d.toISOString().slice(0, 19) + "Z")?.["uniq"]?.["uniques"] ?? null).reverse(),
+            label: r.domain + " - (" + total + ")",
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 19) + "Z")?.["uniq"]?.["uniques"] ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",
@@ -191,7 +201,7 @@ addEventListener("load", () => {
           return {
             type: "line",
             label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1hGroups"].find((g) => g["dimensions"]["datetime"] === d.toISOString().slice(0, 19) + "Z")?.["sum"]?.["bytes"] / 1000 ** 3 ?? null).reverse(),
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 19) + "Z")?.["sum"]?.["bytes"] / 1000 ** 3 ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",
@@ -211,7 +221,7 @@ addEventListener("load", () => {
           return {
             type: "line",
             label: r.domain,
-            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["httpRequests1hGroups"].find((g) => g["dimensions"]["datetime"] === d.toISOString().slice(0, 19) + "Z")?.["sum"]?.["cachedBytes"] / 1000 ** 3 ?? null).reverse(),
+            data: range.map((d) => r.json["data"]["viewer"]["zones"][0]["zones"].find((g) => g["dimensions"]["timeslot"] === d.toISOString().slice(0, 19) + "Z")?.["sum"]?.["cachedBytes"] / 1000 ** 3 ?? null).reverse(),
             borderColor: r.fg,
             borderWidth: 1,
             fill: "origin",