Clear current timeout on heartbeat

.mocharc.js

@@ -2,5 +2,4 @@ module.exports = {
   require: ["ts-node/register/transpile-only", "test/index.ts"],
   extension: ["ts"],
   recursive: true,
-  exit: true,
 }

package.json

@@ -49,4 +49,4 @@
   "dependencies": {
     "winston": "^3.7.2"
   }
-}
+}

src/heartbeat.ts

@@ -13,17 +13,21 @@ export class Heartbeat {
   private lastMessageReceived = new Date()
   private lastMessageSent = new Date()
   private idleCounter: number = 0
+  private timeout: NodeJS.Timeout | null = null
 
   constructor(private readonly connection: HeartbeatConnection, private readonly logger: Logger) {}
 
   start(secondsInterval: number) {
     if (secondsInterval <= 0) return
     this.interval = secondsInterval * 1000
-    setTimeout(() => this.heartbeat(), this.interval)
+    this.timeout = setTimeout(() => this.heartbeat(), this.interval)
   }
 
   stop() {
     // TODO -> Wait the cycle of heartbeat...
+    if (this.timeout) {
+      clearTimeout(this.timeout)
+    }
     this.interval = 0
   }
 
@@ -48,7 +52,7 @@ export class Heartbeat {
     }
     await this.idleDetection()
     if (this.interval <= 0) return
-    setTimeout(() => this.heartbeat(), this.interval)
+    this.timeout = setTimeout(() => this.heartbeat(), this.interval)
   }
 
   private sendHeartbeat() {

test/unit/create_stream.test.ts

@@ -16,7 +16,7 @@ describe("Stream", () => {
   }
   let connection: Connection
 
-  before(async () => {
+  beforeEach(async () => {
     connection = await connect({
       hostname: "localhost",
       port: 5552,
@@ -33,6 +33,12 @@ describe("Stream", () => {
       await rabbit.deleteQueue("%2F", streamName)
     } catch (error) {}
   })
+  afterEach(async () => {
+    try {
+      await connection.close()
+    } catch (error) {}
+  })
+
   after(() => rabbit.closeAllConnections())
 
   describe("Create", () => {

test/unit/delete_stream.test.ts

@@ -8,7 +8,7 @@ describe("Delete command", () => {
   let connection: Connection
   const queue_name = `queue_${(Math.random() * 10) | 0}`
 
-  before(async () => {
+  beforeEach(async () => {
     connection = await connect({
       hostname: "localhost",
       port: 5552,
@@ -19,13 +19,18 @@ describe("Delete command", () => {
       heartbeat: 0, // not user
     })
   })
-
-  after(() => rabbit.closeAllConnections())
-
   afterEach(async () => {
     await rabbit.deleteAllQueues()
   })
 
+  afterEach(async () => {
+    try {
+      await connection.close()
+    } catch (error) {}
+  })
+
+  after(() => rabbit.closeAllConnections())
+
   it("delete a nonexisting stream (raises error)", async () => {
     await expectToThrowAsync(
       () => connection?.deleteStream({ stream: "AAA" }),

test/unit/heartbeat.test.ts

@@ -25,11 +25,10 @@ describe("heartbeat", () => {
   it("sent heartbeat every seconds", async () => {
     const connectionMock = new ConnectionMock()
     const hb = new Heartbeat(connectionMock, createConsoleLog())
+
     hb.start(1)
 
-    await eventually(async () => {
-      expect(connectionMock.getSendCount()).eq(4)
-    }, 6000)
+    await eventually(async () => expect(connectionMock.getSendCount()).eq(4), 6000)
     hb.stop()
   }).timeout(10000)
 
@@ -43,5 +42,13 @@ describe("heartbeat", () => {
     expect(connectionMock.getSendCount()).lessThanOrEqual(1)
   }).timeout(10000)
 
+  it("stop current timeout so we could exit immediately", () => {
+    const connectionMock = new ConnectionMock()
+    const hb = new Heartbeat(connectionMock, createConsoleLog())
+    hb.start(200)
+
+    hb.stop()
+  })
+
   it("start two times same object raise exception")
 })