#1073, change interval to timeout + fix core-serv

Author: davegarthsimpson

arduino-ide-extension/src/node/core-service-impl.ts

@@ -57,6 +57,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
         .compile(request)
         .on('data', handler.onData)
         .on('error', (error) => {
+          handler.dispose();
           if (!ServiceError.is(error)) {
             console.error(
               'Unexpected error occurred while compiling the sketch.',
@@ -83,8 +84,11 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
             reject(CoreError.VerifyFailed(message, compilerErrors));
           }
         })
-        .on('end', resolve);
-    }).finally(() => handler.dispose());
+        .on('end', () => {
+          handler.dispose();
+          resolve();
+        });
+    });
   }
 
   private compileRequest(
@@ -171,6 +175,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
         responseHandler(client, request)
           .on('data', handler.onData)
           .on('error', (error) => {
+            handler.dispose();
             if (!ServiceError.is(error)) {
               console.error(`Unexpected error occurred while ${task}.`, error);
               reject(error);
@@ -193,9 +198,11 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
               );
             }
           })
-          .on('end', resolve);
+          .on('end', () => {
+            handler.dispose();
+            resolve();
+          });
       }).finally(async () => {
-        handler.dispose();
         await this.notifyUploadDidFinish(options);
       })
     );
@@ -238,6 +245,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
           .burnBootloader(request)
           .on('data', handler.onData)
           .on('error', (error) => {
+            handler.dispose();
             if (!ServiceError.is(error)) {
               console.error(
                 'Unexpected error occurred while burning the bootloader.',
@@ -258,9 +266,11 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
               );
             }
           })
-          .on('end', resolve);
+          .on('end', () => {
+            handler.dispose();
+            resolve();
+          });
       }).finally(async () => {
-        handler.dispose();
         await this.notifyUploadDidFinish(options);
       })
     );

arduino-ide-extension/src/node/utils/simple-buffer.ts

@@ -6,7 +6,8 @@ const DEFAULT_FLUS_TIMEOUT_MS = 32;
 export class SimpleBuffer implements Disposable {
   private readonly chunks = Chunks.create();
   private readonly flush: () => void;
-  private flushInterval?: NodeJS.Timeout;
+  private flushTimeout?: NodeJS.Timeout;
+  private disposed = false;
 
   constructor(
     onFlush: (chunks: Map<OutputMessage.Severity, string | undefined>) => void,
@@ -19,7 +20,8 @@ export class SimpleBuffer implements Disposable {
         onFlush(chunks);
       }
     };
-    this.flushInterval = setInterval(this.flush, flushTimeout);
+
+    this.setTimeoutVariable(flushTimeout);
   }
 
   addChunk(
@@ -33,11 +35,40 @@ export class SimpleBuffer implements Disposable {
     Chunks.clear(this.chunks);
   }
 
+  private setTimeoutVariable(flushTimeout: number): void {
+    let isDisposed = this.disposed;
+    if (isDisposed) {
+      // once "isDisposed" is true we stop
+      // creating timeouts and do one more
+      // flush AFTER any setTimeout
+      // callback that may be in progress
+      this.flush();
+      isDisposed = false;
+      return;
+    }
+
+    if (!this.flushTimeout) {
+      const onTimeout = () => {
+        this.flush();
+        this.clearTimeoutVariable();
+      };
+
+      this.flushTimeout = setTimeout(() => {
+        onTimeout();
+        this.setTimeoutVariable(flushTimeout);
+      }, flushTimeout);
+    }
+  }
+
+  private clearTimeoutVariable(): void {
+    if (this.flushTimeout) {
+      clearTimeout(this.flushTimeout);
+      this.flushTimeout = undefined;
+    }
+  }
+
   dispose(): void {
-    this.flush();
-    clearInterval(this.flushInterval);
-    this.clearChunks();
-    this.flushInterval = undefined;
+    this.disposed = true;
   }
 }