Refactor state management: remove unused paused state variables and implement requests per second tracking

Author: richorama

index.min.js

@@ -26,10 +26,9 @@ const state = {
   isPaused: false,
   pauseCallbacks: [],
   requestsCompleted: 0,
-  startTime: Date.now(),
-  statsResetInterval: null,
-  pausedAt: null,
-  pausedDuration: 0
+  requestsInLastSecond: 0,
+  requestsPerSecond: 0,
+  requestCounterInterval: null
 }
 
 // Extract destructured state for cleaner code
@@ -179,18 +178,15 @@ function handleTestResult(item, result) {
         // Check if warm-up is complete
         if (state.warmupProgress.completed >= state.warmupProgress.total) {
           state.warmupProgress.isWarmupPhase = false
-          // Reset start time and counter when warmup completes
-          state.startTime = Date.now()
-          state.requestsCompleted = 0
 
-          // Start periodic stats reset (every 60 seconds)
-          if (state.statsResetInterval) {
-            clearInterval(state.statsResetInterval)
+          // Start 1-second interval to track requests per second
+          if (state.requestCounterInterval) {
+            clearInterval(state.requestCounterInterval)
           }
-          state.statsResetInterval = setInterval(() => {
-            state.requestsCompleted = 0
-            state.startTime = Date.now()
-          }, 60000)
+          state.requestCounterInterval = setInterval(() => {
+            state.requestsPerSecond = state.requestsInLastSecond
+            state.requestsInLastSecond = 0
+          }, 1000)
 
           progressCallbacks.forEach(callback => {
             try {
@@ -211,7 +207,7 @@ function handleTestResult(item, result) {
     }
 
     // Increment request counter (after warm-up)
-    state.requestsCompleted++
+    state.requestsInLastSecond++
 
     // Notify all callbacks with the result
     callbacks.forEach(callback => {
@@ -274,6 +270,16 @@ function handleFailedResult(item, result, callRecord) {
         // Check if warm-up is complete
         if (state.warmupProgress.completed >= state.warmupProgress.total) {
           state.warmupProgress.isWarmupPhase = false
+          
+          // Start 1-second interval to track requests per second
+          if (state.requestCounterInterval) {
+            clearInterval(state.requestCounterInterval)
+          }
+          state.requestCounterInterval = setInterval(() => {
+            state.requestsPerSecond = state.requestsInLastSecond
+            state.requestsInLastSecond = 0
+          }, 1000)
+          
           progressCallbacks.forEach(callback => {
             try {
               callback({
@@ -293,7 +299,7 @@ function handleFailedResult(item, result, callRecord) {
     }
 
     // Increment request counter (after warm-up) for failed requests too
-    state.requestsCompleted++
+    state.requestsInLastSecond++
 
     callbacks.forEach(callback => {
       try {
@@ -406,25 +412,13 @@ export const retry = (domain) => {
  * Get current statistics
  */
 export const getStats = () => {
-  let elapsed = (Date.now() - state.startTime) / 1000 // seconds
-  
-  // If paused, subtract the paused duration from elapsed time
-  if (state.isPaused && state.pausedAt) {
-    elapsed -= (Date.now() - state.pausedAt) / 1000
-  } else if (state.pausedDuration > 0) {
-    elapsed -= state.pausedDuration / 1000
-  }
-  
-  const requestsPerSecond = elapsed > 0 ? state.requestsCompleted / elapsed : 0
-  
   return {
     totalDomains: getLocations().length,
     blockedDomains: blockList.size,
     activeDomains: getLocations().length - blockList.size,
     queueLength: queue.length,
     activeRequests: Object.keys(callRecords).length,
-    requestsCompleted: state.requestsCompleted,
-    requestsPerSecond: requestsPerSecond
+    requestsPerSecond: state.requestsPerSecond
   }
 }
 
@@ -433,7 +427,6 @@ export const getStats = () => {
  */
 export const pause = () => {
   state.isPaused = true
-  state.pausedAt = Date.now()
 
   pauseCallbacks.forEach(callback => {
     try {
@@ -448,12 +441,6 @@ export const pause = () => {
  * Resume all speed test requests
  */
 export const resume = () => {
-  // Track paused duration
-  if (state.pausedAt) {
-    state.pausedDuration += Date.now() - state.pausedAt
-    state.pausedAt = null
-  }
-  
   state.isPaused = false
 
   // Clear any stale call records from before pause