@thru/replay 0.2.4 → 0.2.5

package/dist/index.cjs

@@ -588,7 +588,10 @@ var ReplayStream = class {
 };
 async function safeClose(pump) {
   try {
-    await pump.close();
+    await Promise.race([
+      pump.close(),
+      new Promise((resolve) => setTimeout(resolve, 5e3))
+    ]);
   } catch {
   }
 }
@@ -1075,6 +1078,7 @@ async function* createAccountsByOwnerReplay(options) {
   const streamBuffer = [];
   let streamDone = false;
   let streamError = null;
+  let lastActivityTime = Date.now();
   try {
     cleanupTimer = setInterval(() => {
       assembler.cleanup();
@@ -1084,6 +1088,7 @@ async function* createAccountsByOwnerReplay(options) {
     const streamProcessor = (async () => {
       try {
         for await (const response of stream) {
+          lastActivityTime = Date.now();
           const event = processResponseMulti(response, assembler);
           if (event) {
             if (event.type === "account") {
@@ -1173,6 +1178,7 @@ async function* createAccountsByOwnerReplay(options) {
     let retryAttempt = 0;
     let currentStream = stream;
     let currentStreamProcessor = streamProcessor;
+    lastActivityTime = Date.now();
     const createStreamProcessor = () => {
       if (clientFactory) {
         try {
@@ -1188,6 +1194,7 @@ async function* createAccountsByOwnerReplay(options) {
         try {
           for await (const response of newStream) {
             retryAttempt = 0;
+            lastActivityTime = Date.now();
             const event = processResponseMulti(response, assembler);
             if (event) {
               if (event.type === "account") {
@@ -1208,7 +1215,18 @@ async function* createAccountsByOwnerReplay(options) {
       return { stream: newStream, processor: newProcessor };
     };
     while (true) {
+      const hadEvents = streamBuffer.length > 0;
       yield* yieldStreamBuffer();
+      if (hadEvents) {
+        lastActivityTime = Date.now();
+      }
+      if (!streamDone && Date.now() - lastActivityTime > retryConfig.connectionTimeoutMs) {
+        logger.warn(
+          `[account-stream] no activity for ${retryConfig.connectionTimeoutMs}ms; forcing reconnection`
+        );
+        streamDone = true;
+        streamError = new Error(`Operation timed out after ${retryConfig.connectionTimeoutMs}ms`);
+      }
       if (streamDone) {
         if (streamError) {
           const backoffMs = calculateBackoff(retryAttempt, retryConfig);
@@ -1220,6 +1238,7 @@ async function* createAccountsByOwnerReplay(options) {
           streamDone = false;
           streamError = null;
           streamBuffer.length = 0;
+          lastActivityTime = Date.now();
           const { stream: newStream, processor: newProcessor } = createStreamProcessor();
           currentStream = newStream;
           currentStreamProcessor = newProcessor;
@@ -1227,6 +1246,7 @@ async function* createAccountsByOwnerReplay(options) {
         } else {
           logger.warn("[account-stream] stream ended unexpectedly; reconnecting...");
           streamDone = false;
+          lastActivityTime = Date.now();
           const { stream: newStream, processor: newProcessor } = createStreamProcessor();
           currentStream = newStream;
           currentStreamProcessor = newProcessor;