Fixed #507, addressing Webpage stream replay bug.

CHANGELOG.md

@@ -8,6 +8,7 @@ Dates are in `YYYY-MM-DD` format and versions are in [semantic versioning](http:
 ### Fixed
 
 -   [#509](https://github.com/wordplaydev/wordplay/issues/509) Fixed parsing regression from infinite loop fixes.
+-   [#507](https://github.com/wordplaydev/wordplay/issues/507) Fixed Webpage stream replay bug.
 
 ## 0.10.2 2024-06-29
 

src/input/Webpage.ts

@@ -92,6 +92,9 @@ export default class Webpage extends StreamValue<
     }
 
     react(event: FetchResponse) {
+        // If we're mirroring, and the input was a different URL, then don't replay it, since it's not relevant.
+        if (event.url !== this.url) return;
+
         // Cache the response
         URLResponseCache.set(event.url, { response: event, time: Date.now() });
 
@@ -160,16 +163,21 @@ export default class Webpage extends StreamValue<
     }
 
     start() {
-        this.get();
+        this.resetTimeout(true, true);
     }
 
     stop() {
-        this.resetTimeout();
+        this.resetTimeout(false, false);
         return;
     }
 
-    resetTimeout() {
+    resetTimeout(again: boolean, soon: boolean) {
         if (this.timeout) clearTimeout(this.timeout);
+        if (again)
+            this.timeout = setTimeout(
+                () => this.get(),
+                soon ? 50 : Math.max(1, this.frequency) * 60 * 1000,
+            );
     }
 
     async get() {
@@ -304,11 +312,7 @@ export default class Webpage extends StreamValue<
         });
 
         // Get it again in the next period.
-        this.resetTimeout();
-        this.timeout = setTimeout(
-            () => this.get(),
-            Math.max(1, this.frequency) * 60 * 1000,
-        );
+        this.resetTimeout(true, false);
     }
 
     getType() {

src/runtime/Evaluator.ts

@@ -1285,7 +1285,7 @@ export default class Evaluator {
         this.streamsByCreator.set(evaluate, [...streams, stream]);
         this.creatorByStream.set(stream, evaluate);
 
-        // Start the stream if this is reactive. Otherwise, we just take it's initial value.
+        // Start the stream if this evaluator is reactive. Otherwise, we just take it's initial value.
         if (this.reactive) stream.start();
 
         // Listen to it so we can react to changes.