Fixed onRestartInactivitySeconds not stopping

package.json

@@ -1,6 +1,6 @@
 {
     "name": "substreams-sink",
-    "version": "0.9.5",
+    "version": "0.9.6",
     "description": "Substreams Sink",
     "type": "module",
     "exports": "./dist/index.js",
@@ -43,7 +43,7 @@
     "dependencies": {
         "@substreams/core": "^0.1.19",
         "@substreams/manifest": "^0.0.9",
-        "@substreams/node": "^0.2.1",
+        "@substreams/node": "^0.2.2",
         "commander": "latest",
         "dotenv": "latest",
         "node-fetch": "latest",

src/restartInactivitySeconds.ts

@@ -4,7 +4,7 @@ import { logger } from "./logger.js";
 
 const CHECK_INACTIVITY_INTERVAL = 1000;
 
-export function onRestartInactivitySeconds(emitter: BlockEmitter, restartInactivitySeconds: number) {
+export function onRestartInactivitySeconds(emitter: BlockEmitter, restartInactivitySeconds: number, hasStopBlock: boolean) {
     let lastUpdate = now();
     let isFinished = false;
 
@@ -17,11 +17,13 @@ export function onRestartInactivitySeconds(emitter: BlockEmitter, restartInactiv
         await setTimeout(CHECK_INACTIVITY_INTERVAL);
         checkInactivity();
     }
+
+    // Check for inactivity after starting
     emitter.on("clock", clock => {
         lastUpdate = now();
-        if (clock.number >= emitter.request.stopBlockNum - 1n) {
+        if (hasStopBlock && clock.number >= emitter.request.stopBlockNum - 1n) {
             isFinished = true;
-        };
+        }
     });
     checkInactivity();
 }

src/setup.ts

@@ -82,10 +82,7 @@ export async function setup(options: RunOptions) {
     await setTimeout(options.delayBeforeStart);
 
     // Restart on inactivity
-    // only activate once first cursor is received
-    emitter.once("cursor", () => {
-        onRestartInactivitySeconds(emitter, options.restartInactivitySeconds);
-    });
+    onRestartInactivitySeconds(emitter, options.restartInactivitySeconds, stopBlockNum !== undefined);
 
     return { emitter, substreamPackage, moduleHash, startCursor };
 }