hx-stream 0.0.9 → 0.1.1

package/dist/server.d.ts

@@ -26,5 +26,6 @@ export declare class StreamResponse<JsxEnabled extends boolean> {
     send(target: string, swap: string, html: JsxEnabled extends true ? (JSX.Element | string) : string): boolean;
     close(): boolean;
 }
-export declare function MakeStream<O extends (DefaultOptions | RenderOptions)>(request: Request, options: O): StreamResponse<HasRender<O>>;
+export declare function MakeRawStream<O extends (DefaultOptions | RenderOptions)>(request: Request, options: O): StreamResponse<HasRender<O>>;
+export declare function MakeStream<T extends Partial<RenderOptions>>(request: Request, props: T, cb: (stream: StreamResponse<HasRender<T>>, props: T) => Promise<void> | void): Response;
 export {};

package/dist/server.js

@@ -1,6 +1,7 @@
 const encoder = new TextEncoder();
 const headers = {
     // Chunked encoding with immediate forwarding by proxies (i.e. nginx)
+    "X-Content-Type-Options": "nosniff",
     "X-Accel-Buffering": "no",
     "Transfer-Encoding": "chunked",
     "Content-Type": "text/html",
@@ -14,6 +15,7 @@ function MakeBoundary() {
 }
 export class StreamResponse {
     #controller;
+    #signal;
     #timer;
     #state;
     #boundary;
@@ -34,10 +36,11 @@ export class StreamResponse {
         this.withCredentials = request.mode === "cors";
         this.url = request.url;
         // immediate prepare for abortion
-        const cancel = () => { this.close(); };
+        const cancel = () => { this.close(); request.signal.removeEventListener("abort", cancel); };
         request.signal.addEventListener('abort', cancel);
+        this.#signal = request.signal;
         const start = (c) => { this.#controller = c; this.#state = StreamResponse.OPEN; };
-        const stream = new ReadableStream({ start, cancel }, { highWaterMark: options.highWaterMark || 0 });
+        const stream = new ReadableStream({ start, cancel }, { highWaterMark: options.highWaterMark });
         this.response = new Response(stream, { headers });
         this.response.headers.set("X-Chunk-Boundary", this.#boundary);
         this.#timer = setInterval(() => this.keepAlive(), options.keepAlive || 30_000);
@@ -46,6 +49,14 @@ export class StreamResponse {
         this.#controller = controller;
     }
     sendBytes(chunk) {
+        if (this.#state === StreamResponse.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 {
@@ -63,10 +74,6 @@ export class StreamResponse {
     }
     keepAlive() { return this.sendText(" "); }
     send(target, swap, html) {
-        if (this.#state === StreamResponse.CLOSED) {
-            const err = new Error(`Warn: Attempted to send data on closed stream for: ${this.url}`);
-            console.warn(err);
-        }
         if (typeof html !== "string") {
             if (!this.#render)
                 throw new Error(`Cannot render to JSX when no renderer provided during class initialization`);
@@ -75,10 +82,6 @@ export class StreamResponse {
         return this.sendText(`<${this.#boundary}>${target}|${swap}|${html}</${this.#boundary}>\n`);
     }
     close() {
-        if (this.#state === StreamResponse.CLOSED) {
-            this.#controller = null;
-            return false;
-        }
         if (this.#controller) {
             try {
                 this.#controller.close();
@@ -91,11 +94,23 @@ export class StreamResponse {
         // Cleanup
         if (this.#timer)
             clearInterval(this.#timer);
+        // was already closed
+        if (this.#state === EventSource.CLOSED)
+            return false;
         // Mark closed
         this.#state = StreamResponse.CLOSED;
         return true;
     }
 }
-export function MakeStream(request, options) {
+export function MakeRawStream(request, options) {
     return new StreamResponse(request, options);
 }
+export function MakeStream(request, props, cb) {
+    const stream = MakeRawStream(request, props);
+    queueMicrotask(() => {
+        const p = cb(stream, props);
+        if (p instanceof Promise)
+            p.catch(console.error);
+    });
+    return stream.response;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hx-stream",
-	"version": "0.0.9",
+	"version": "0.1.1",
 	"description": "keep htmx client state across page refreshes",
 	"keywords": [ "htmx", "streaming" ],
 	"homepage": "https://hx-stream.ajanibilby.com",