Store fixes

2025-03-15 02:49:54 +00:00
parent 3284943bea
commit 38d0071a7b
2 changed files with 87 additions and 70 deletions
@@ -77,79 +77,85 @@ export class SSEClient {
      cache: 'no-store',
    };

-    // Using an async IIFE to handle the connection without blocking
-    return new Promise(async (resolve) => {
-      try {
-        const response = await fetch(this.url, fetchOptions);
+    // Using a regular Promise executor (not async)
+    return new Promise((resolve, reject) => {
+      // Move the async logic inside a separate function
+      const establishConnection = async () => {
+        try {
+          const response = await fetch(this.url, fetchOptions);

-        if (!response.ok) {
-          throw new Error(`HTTP error! Status: ${response.status}`);
-        }
-
-        if (!response.body) {
-          throw new Error('Response body is null');
-        }
-
-        // Notify that the connection has been established
-        if (this.options.onOpen) {
-          this.options.onOpen();
-        }
-
-        const reader = response.body.getReader();
-        const decoder = new TextDecoder();
-        let buffer = '';
-
-        // Start the read here so we can resolve and then start handlng the stream
-        // We will await this at the start of the loop, and redeclare it at the end of each loop iteration
-        let readPromise = reader.read();
-
-        // Resolve before starting the loop so that we can start peforming other actions
-        // Keep this out of the loop to avoid flags or `already resolved` errors.
-        resolve();
-
-        while (true) {
-          const { done, value } = await readPromise;
-
-          if (done) {
-            this.connected = false;
-            if (this.options.onClose) {
-              this.options.onClose();
-            }
-            break;
+          if (!response.ok) {
+            throw new Error(`HTTP error! Status: ${response.status}`);
          }

-          // Decode the received chunk and add it to the buffer
-          const chunk = decoder.decode(value, { stream: true });
-          buffer += chunk;
-
-          // Process any complete events in the buffer
-          const events = this.parseEvents(buffer);
-          buffer = events.remainder;
-
-          // Handle each complete event
-          for (const event of events.parsed) {
-            if (this.options.onMessage) {
-              this.options.onMessage(event);
-            }
+          if (!response.body) {
+            throw new Error('Response body is null');
          }

-          // Start reading the next chunk
-          readPromise = reader.read();
-        }
-      } catch (error) {
-        this.connected = false;
+          // Notify that the connection has been established
+          if (this.options.onOpen) {
+            this.options.onOpen();
+          }

-        if (this.options.onError) {
-          this.options.onError(error);
-        }
+          const reader = response.body.getReader();
+          const decoder = new TextDecoder();
+          let buffer = '';

-        if (this.options.onClose) {
-          this.options.onClose();
-        }
+          // Start the read here so we can resolve and then start handling the stream
+          // We will await this at the start of the loop, and redeclare it at the end of each loop iteration
+          let readPromise = reader.read();

-        // Doesnt seem like you want to propagate the error here.
-        resolve();
-      }
+          // Resolve before starting the loop so that we can start performing other actions
+          // Keep this out of the loop to avoid flags or `already resolved` errors.
+          resolve();
+
+          while (true) {
+            const { done, value } = await readPromise;
+
+            if (done) {
+              this.connected = false;
+              if (this.options.onClose) {
+                this.options.onClose();
+              }
+              break;
+            }
+
+            // Decode the received chunk and add it to the buffer
+            const chunk = decoder.decode(value, { stream: true });
+            buffer += chunk;
+
+            // Process any complete events in the buffer
+            const events = this.parseEvents(buffer);
+            buffer = events.remainder;
+
+            // Handle each complete event
+            for (const event of events.parsed) {
+              if (this.options.onMessage) {
+                this.options.onMessage(event);
+              }
+            }
+
+            // Start reading the next chunk
+            readPromise = reader.read();
+          }
+        } catch (error) {
+          this.connected = false;
+
+          if (this.options.onError) {
+            this.options.onError(error);
+          }
+
+          if (this.options.onClose) {
+            this.options.onClose();
+          }
+
+          // Now we'll reject the promise instead of resolving
+          reject(error);
+        }
+      };
+
+      // Execute the async function
+      establishConnection();
    });
  }