From 98a4ce34248249eb5da7627d25818488ef28551d Mon Sep 17 00:00:00 2001
From: sbruens <sbruens@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:16:38 -0400
Subject: [PATCH] Use a Map.

---
 src/shadowbox/server/shared_metrics.ts | 38 +++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/shadowbox/server/shared_metrics.ts b/src/shadowbox/server/shared_metrics.ts
index 42bb54a9b..c5576af19 100644
--- a/src/shadowbox/server/shared_metrics.ts
+++ b/src/shadowbox/server/shared_metrics.ts
@@ -101,27 +101,33 @@ export class PrometheusUsageMetrics implements UsageMetrics {
       )
     `);
 
-    const usage: {[key: string]: LocationUsage} = {};
-    for (const entry of queryResponse.result) {
-      const country = entry.metric['location'] || '';
-      const asn = entry.metric['asn'] ? Number(entry.metric['asn']) : undefined;
+    const usage = new Map<string, LocationUsage>();
+    for (const result of queryResponse.result) {
+      const country = result.metric['location'] || '';
+      const asn = result.metric['asn'] ? Number(result.metric['asn']) : undefined;
 
-      // Create or update the entry for the country+ASN combination.
+      // Get or create an entry for the country+ASN combination.
       const key = `${country}-${asn}`;
-      usage[key] = {
-        country,
-        asn,
-        inboundBytes: usage[key]?.inboundBytes || 0,
-        tunnelTimeSec: usage[key]?.tunnelTimeSec || 0,
-      };
+      let entry: LocationUsage;
+      if (usage.has(key)) {
+        entry = usage.get(key);
+      } else {
+        entry = {
+          country,
+          asn,
+          inboundBytes: 0,
+          tunnelTimeSec: 0,
+        };
+      }
 
-      if (entry.metric['metric_type'] === 'inbound_bytes') {
-        usage[key].inboundBytes = Math.round(parseFloat(entry.value[1]));
-      } else if (entry.metric['metric_type'] === 'tunnel_time') {
-        usage[key].tunnelTimeSec = Math.round(parseFloat(entry.value[1]));
+      if (result.metric['metric_type'] === 'inbound_bytes') {
+        entry.inboundBytes = Math.round(parseFloat(result.value[1]));
+      } else if (result.metric['metric_type'] === 'tunnel_time') {
+        entry.tunnelTimeSec = Math.round(parseFloat(result.value[1]));
       }
+      usage.set(key, entry);
     }
-    return Object.values(usage);
+    return Array.from(usage.values());
   }
 
   reset() {