fix: stop reconnecting if the eventsource is closed

Signed-off-by: Lukas Reining <[email protected]>
lukas-reining · Apr 3, 2024 · c294aae · c294aae
1 parent f07ee9b
commit c294aae
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "express": "^4.18.2",
-    "extended-eventsource": "^1.3.2",
+    "extended-eventsource": "^1.4.9",
     "serve-static": "^1.15.0",
     "ssestream": "^1.1.0"
   }

diff --git a/jest.config.js → jest.config.cjs b/jest.config.js → jest.config.cjs
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extended-eventsource",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "author": "Lukas Reining",
   "readme": "README.md",
   "description": "Spec compliant EventSource implementation for browsers and Node.JS",

diff --git a/src/eventsource.ts b/src/eventsource.ts
@@ -34,6 +34,7 @@ export class CustomEventSource extends EventTarget implements EventSource {
 
   public readonly options: EventSourceInit & EventSourceOptions;
   private abortController?: AbortController;
+  private timeoutId: ReturnType<typeof setTimeout> | undefined = undefined;
   private retry: number;
   private currentLastEventId?: string;
 
@@ -65,6 +66,13 @@ export class CustomEventSource extends EventTarget implements EventSource {
   }
 
   private async connect(lastEventId?: string) {
+    if (this.readyState === this.CLOSED) {
+      this.logger?.warn(
+        'Canceled reconnecting due to state already being closed',
+      );
+      return;
+    }
+
     try {
       // https://html.spec.whatwg.org/multipage/server-sent-events.html#dom-eventsource
       this.abortController = new AbortController();
@@ -164,7 +172,7 @@ export class CustomEventSource extends EventTarget implements EventSource {
       this.logger?.warn(msg, error ?? '');
     }
 
-    setTimeout(async () => {
+    this.timeoutId = setTimeout(async () => {
       await this.connect(this.currentLastEventId);
     }, this.retry);
   }
@@ -211,6 +219,7 @@ export class CustomEventSource extends EventTarget implements EventSource {
   // https://html.spec.whatwg.org/multipage/server-sent-events.html#dom-eventsource-close
   public close() {
     this.readyState = this.CLOSED;
+    clearTimeout(this.timeoutId);
     this.abortController?.abort();
   }