fix: transformThrottle was actually buggy

NaturalCycles · Sep 10, 2024 · c4e8f4c · c4e8f4c
1 parent 5d684e1
commit c4e8f4c
Show file tree

Hide file tree

Showing 2 changed files with 232 additions and 223 deletions.
diff --git a/src/stream/transform/transformThrottle.ts b/src/stream/transform/transformThrottle.ts
@@ -1,6 +1,7 @@
 import { Transform } from 'node:stream'
 import {
   _ms,
+  _since,
   DeferredPromise,
   localTime,
   NumberOfMilliseconds,
@@ -75,7 +76,7 @@ export function transformThrottle<T>(opt: TransformThrottleOptions): TransformTy
         paused = pDefer()
         if (debug) {
           console.log(
-            `${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_ms(interval * 1000)}, will pause for ${_ms(interval * 1000 - (Date.now() - start))}`,
+            `${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_since(start)}, will pause for ${_ms(interval * 1000 - (Date.now() - start))}`,
           )
         }
       }
@@ -89,16 +90,23 @@ export function transformThrottle<T>(opt: TransformThrottleOptions): TransformTy
   })
 
   function onInterval(transform: Transform): void {
-    if (!paused) return
+    if (paused) {
+      if (debug) {
+        console.log(`${localTime.now().toPretty()} transformThrottle resumed`)
+      }
 
-    if (debug) {
-      console.log(`${localTime.now().toPretty()} transformThrottle resumed`)
+      paused.resolve()
+      paused = undefined
+    } else {
+      if (debug) {
+        console.log(
+          `${localTime.now().toPretty()} transformThrottle passed ${count} (of max ${throughput}) items in ${_since(start)}`,
+        )
+      }
     }
 
     count = 0
     start = Date.now()
     timeout = setTimeout(() => onInterval(transform), interval * 1000)
-    paused.resolve()
-    paused = undefined
   }
 }