hx-stream 0.0.8 → 0.0.10

package/dist/client.js

@@ -70,7 +70,16 @@
                 const retarget = buffer.slice(a, b).trim();
                 const swap = buffer.slice(b + 1, c).trim();
                 const html = buffer.slice(c + 1, idx);
-                const target = htmx.find(source, retarget);
+                let target;
+                switch (retarget) {
+                    case "this":
+                        target = source;
+                        break;
+                    case "body":
+                        target = document.body;
+                        break;
+                    default: target = htmx.find(source, retarget);
+                }
                 if (target)
                     binding.swap(target, html, { swapStyle: swap });
                 else

package/dist/client.min.js

@@ -1 +1 @@
-"use strict";!function(){let e;const t=globalThis.htmx;t.defineExtension("hx-stream",{init:t=>{e=t},onEvent:(s,n)=>{if("htmx:beforeRequest"!==s);else{const s=n.detail.elt;if("on"!==e.getAttributeValue(s,"hx-stream"))return;n.preventDefault();const o=n.detail.requestConfig.formData,i=n.detail.requestConfig.headers,a=n.detail.requestConfig.path;(async function(s,n,o,i,a){a.classList.add("htmx-request");const c=await fetch(n,{method:s,headers:o,body:i});if(!c.ok)return console.error(await c.text()),void a.classList.remove("htmx-request");if(!c.body)return console.error("hx-stream response is missing body"),void a.classList.remove("htmx-request");const l=c.headers.get("X-Chunk-Boundary");if(!l)return console.error("hx-stream response is chunk boundary header"),void a.classList.remove("htmx-request");const d=`<${l}>`,h=`</${l}>`,u=c.body.getReader();let f="";for(;;){const{done:s,value:n}=await u.read();if(s)break;const o=r.decode(n),i=Math.max(0,f.length-h.length);f+=o;let c=f.indexOf(h,i);for(;-1!==c;){let r=f.lastIndexOf(d,c);if(-1===r)return console.error("hx-stream received invalid chunk");r+=d.length;const s=f.indexOf("|",r);if(-1===s)return console.error("hx-stream received invalid chunk");const n=f.indexOf("|",s+1);if(-1===n)return console.error("hx-stream received invalid chunk");const o=f.slice(r,s).trim(),i=f.slice(s+1,n).trim(),l=f.slice(n+1,c),u=t.find(a,o);u?e.swap(u,l,{swapStyle:i}):console.warn(`hx-stream unable to find target ${o}`),f=f.slice(c+h.length),c=f.indexOf(h)}}a.classList.remove("htmx-request")})(n.detail.requestConfig.verb,a,i,o,n.detail.target).catch(console.error)}}});const r=new TextDecoder("utf8")}();
+"use strict";!function(){let e;const t=globalThis.htmx;t.defineExtension("hx-stream",{init:t=>{e=t},onEvent:(s,n)=>{if("htmx:beforeRequest"!==s);else{const s=n.detail.elt;if("on"!==e.getAttributeValue(s,"hx-stream"))return;n.preventDefault();const o=n.detail.requestConfig.formData,i=n.detail.requestConfig.headers,a=n.detail.requestConfig.path;(async function(s,n,o,i,a){a.classList.add("htmx-request");const c=await fetch(n,{method:s,headers:o,body:i});if(!c.ok)return console.error(await c.text()),void a.classList.remove("htmx-request");if(!c.body)return console.error("hx-stream response is missing body"),void a.classList.remove("htmx-request");const d=c.headers.get("X-Chunk-Boundary");if(!d)return console.error("hx-stream response is chunk boundary header"),void a.classList.remove("htmx-request");const l=`<${d}>`,h=`</${d}>`,u=c.body.getReader();let f="";for(;;){const{done:s,value:n}=await u.read();if(s)break;const o=r.decode(n),i=Math.max(0,f.length-h.length);f+=o;let c=f.indexOf(h,i);for(;-1!==c;){let r=f.lastIndexOf(l,c);if(-1===r)return console.error("hx-stream received invalid chunk");r+=l.length;const s=f.indexOf("|",r);if(-1===s)return console.error("hx-stream received invalid chunk");const n=f.indexOf("|",s+1);if(-1===n)return console.error("hx-stream received invalid chunk");const o=f.slice(r,s).trim(),i=f.slice(s+1,n).trim(),d=f.slice(n+1,c);let u;switch(o){case"this":u=a;break;case"body":u=document.body;break;default:u=t.find(a,o)}u?e.swap(u,d,{swapStyle:i}):console.warn(`hx-stream unable to find target ${o}`),f=f.slice(c+h.length),c=f.indexOf(h)}}a.classList.remove("htmx-request")})(n.detail.requestConfig.verb,a,i,o,n.detail.target).catch(console.error)}}});const r=new TextDecoder("utf8")}();

package/dist/server.js

@@ -14,6 +14,7 @@ function MakeBoundary() {
 }
 export class StreamResponse {
     #controller;
+    #signal;
     #timer;
     #state;
     #boundary;
@@ -36,6 +37,7 @@ export class StreamResponse {
         // 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 = StreamResponse.OPEN; };
         const stream = new ReadableStream({ start, cancel }, { highWaterMark: options.highWaterMark || 0 });
         this.response = new Response(stream, { headers });
@@ -46,6 +48,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 +73,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 +81,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,6 +93,9 @@ 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;

package/package.json

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