htmx-router 1.0.13 → 1.0.15

package/event-source.js

@@ -17,6 +17,7 @@ const headers = {
  */
 export class EventSource {
     #controller;
+    #signal;
     #timer;
     #state;
     response;
@@ -43,6 +44,7 @@ export class EventSource {
         // immediate prepare for abortion
         const cancel = () => { this.close(); };
         request.signal.addEventListener('abort', cancel);
+        this.#signal = request.signal;
         const start = (c) => { this.#controller = c; this.#state = EventSource.OPEN; };
         const stream = new ReadableStream({ start, cancel }, { highWaterMark: 0 });
         this.response = new Response(stream, { headers });
@@ -50,6 +52,14 @@ export class EventSource {
         register.add(this);
     }
     sendBytes(chunk, active) {
+        if (this.#state === EventSource.CLOSED) {
+            const err = new Error(`Warn: Attempted to send data on closed stream for: ${this.url}`);
+            console.warn(err);
+        }
+        if (this.#signal.aborted) {
+            this.close();
+            return false;
+        }
         if (!this.#controller)
             return false;
         try {
@@ -71,15 +81,9 @@ export class EventSource {
         return this.sendText("\n\n", false);
     }
     dispatch(type, data) {
-        if (this.#state !== EventSource.CLOSED)
-            console.warn(`Warn: Attempted to dispatch event "${type}" to a closed connection for: ${this.url}`);
         return this.sendText(`event: ${type}\ndata: ${data}\n\n`, true);
     }
     close(unlink = true) {
-        if (this.#state === EventSource.CLOSED) {
-            this.#controller = null;
-            return false;
-        }
         if (this.#controller) {
             try {
                 this.#controller.close();
@@ -94,6 +98,9 @@ export class EventSource {
             clearInterval(this.#timer);
         if (unlink)
             register.delete(this);
+        // was already closed
+        if (this.#state === EventSource.CLOSED)
+            return false;
         // Mark closed
         this.#state = EventSource.CLOSED;
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "htmx-router",
-	"version": "1.0.13",
+	"version": "1.0.15",
 	"description": "A lightweight SSR framework with server+client islands",
 	"keywords": [
 		"htmx",

package/status.d.ts

@@ -64,7 +64,11 @@ declare const dictionary: {
     511: "Network Authentication Required";
 };
 type Definitions = typeof dictionary;
-export type Status = keyof Definitions;
-export type StatusText = Definitions[Status];
-export declare function MakeStatus(lookup: Status | StatusText, init?: ResponseInit | Headers): ResponseInit;
+export type StatusCode = keyof Definitions;
+export type StatusText = Definitions[StatusCode];
+export declare function MakeStatus(lookup: StatusCode | StatusText, init?: ResponseInit | Headers): ResponseInit;
+/**
+ * @deprecated
+ */
+export type Status = StatusCode;
 export {};