hx-stream 0.0.6 → 0.0.7

package/dist/client.js

@@ -2,7 +2,8 @@
 (function () {
     let binding;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    globalThis.htmx.defineExtension("hx-stream", {
+    const htmx = globalThis.htmx;
+    htmx.defineExtension("hx-stream", {
         init: (config) => { binding = config; },
         onEvent: (name, event) => {
             switch (name) {
@@ -23,30 +24,57 @@
         }
     });
     const decoder = new TextDecoder("utf8");
-    async function Process(method, url, headers, formData, target) {
-        target.classList.add("htmx-request");
+    async function Process(method, url, headers, formData, source) {
+        source.classList.add("htmx-request");
         const req = await fetch(url, { method, headers, body: formData });
         if (!req.ok) {
             console.error(await req.text());
-            target.classList.remove("htmx-request");
+            source.classList.remove("htmx-request");
             return;
         }
         if (!req.body) {
             console.error("hx-stream response is missing body");
-            target.classList.remove("htmx-request");
+            source.classList.remove("htmx-request");
+            return;
+        }
+        const boundary = req.headers.get("X-Chunk-Boundary");
+        if (!boundary) {
+            console.error("hx-stream response is chunk boundary header");
+            source.classList.remove("htmx-request");
             return;
         }
         const reader = req.body.getReader();
+        let buffer = "";
         // eslint-disable-next-line no-constant-condition
         while (true) {
             const { done, value } = await reader.read();
             if (done)
                 break;
-            const html = decoder.decode(value).trim();
-            if (html === "")
-                continue; // ignore keepalive byte
-            binding.swap(target, html, { swapStyle: "beforeend" });
+            const html = decoder.decode(value);
+            const search = Math.max(0, buffer.length - boundary.length);
+            buffer += html;
+            let idx = buffer.indexOf(boundary, search);
+            while (idx !== -1) {
+                const chunk = buffer.slice(0, idx);
+                const a = chunk.indexOf("|");
+                if (a === -1)
+                    return console.error("hx-stream received invalid chunk");
+                const b = chunk.indexOf("|", a + 1);
+                if (b === -1)
+                    return console.error("hx-stream received invalid chunk");
+                const retarget = chunk.slice(0, a).trim(); // trim to remove any keep alive spaces
+                const swap = chunk.slice(a + 1, b);
+                const html = chunk.slice(b + 1);
+                const target = htmx.find(source, retarget);
+                if (target)
+                    binding.swap(target, html, { swapStyle: swap });
+                else
+                    console.warn(`hx-stream unable to find target ${retarget}`);
+                buffer = buffer.slice(idx + boundary.length);
+                idx = buffer.indexOf(boundary);
+            }
+            // binding.swap(target, html, { swapStyle: "beforeend" });
         }
-        target.classList.remove("htmx-request");
+        source.classList.remove("htmx-request");
     }
 })();

package/dist/client.min.js

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

package/dist/server.js

@@ -8,10 +8,15 @@ const headers = {
     "Keep-Alive": "timeout=60",
     "Connection": "keep-alive",
 };
+const SCALE = 36 ** 10;
+function MakeBoundary() {
+    return "<" + (Math.random() * SCALE).toString(36) + ">";
+}
 export class StreamResponse {
     #controller;
     #timer;
     #state;
+    #boundary;
     #render;
     response;
     // just to make it polyfill
@@ -25,6 +30,7 @@ export class StreamResponse {
         this.#controller = null;
         this.#state = StreamResponse.CONNECTING;
         this.#render = options.render;
+        this.#boundary = MakeBoundary();
         this.withCredentials = request.mode === "cors";
         this.url = request.url;
         // immediate prepare for abortion
@@ -33,6 +39,7 @@ export class StreamResponse {
         const start = (c) => { this.#controller = c; this.#state = StreamResponse.OPEN; };
         const stream = new ReadableStream({ start, cancel }, { highWaterMark: 0 });
         this.response = new Response(stream, { headers });
+        this.response.headers.set("X-Chunk-Boundary", this.#boundary);
         this.#timer = setInterval(() => this.keepAlive(), options.keepAlive || 30_000);
     }
     bind(controller) {
@@ -65,7 +72,7 @@ export class StreamResponse {
                 throw new Error(`Cannot render to JSX when no renderer provided during class initialization`);
             html = this.#render(html);
         }
-        return this.sendText(`<div hx-swap-oob="${swap}:${target}">${html}</div>`);
+        return this.sendText(`${target}|${swap}|${html}${this.#boundary}`);
     }
     close() {
         if (this.#state === StreamResponse.CLOSED) {

package/package.json

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