hx-stream 0.2.2 → 0.2.4

package/client.js

@@ -23,10 +23,13 @@
             }
         }
     });
+    const METHODS_WITHOUT_BODY = new Set(['GET', 'HEAD', 'DELETE', 'OPTIONS', 'TRACE', 'CONNECT']);
     const decoder = new TextDecoder("utf8");
-    async function Process(method, url, headers, formData, source) {
+    async function Process(method, url, headers, body, source) {
+        if (METHODS_WITHOUT_BODY.has(method.toUpperCase()))
+            body = undefined;
         source.classList.add("htmx-request");
-        const req = await fetch(url, { method, headers, body: formData, duplex: "half" });
+        const req = await fetch(url, { method, headers, body, duplex: "half" });
         if (!req.ok) {
             console.error(await req.text());
             source.classList.remove("htmx-request");

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hx-stream",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"description": "keep htmx client state across page refreshes",
 	"keywords": [ "htmx", "streaming" ],
 	"homepage": "https://hx-stream.ajanibilby.com",
@@ -18,10 +18,14 @@
 		"minify": "npm run minify:client",
 		"minify:client": "terser client.js --compress --mangle --output client.min.js"
 	},
+	"main": "client.min.js",
+	"exports": {
+		"./client": "./client.js",
+		"./server": "./server.js"
+	},
 	"license": "MIT",
 	"author": "Ajani Bilby",
 	"type": "module",
-	"main": "client.min.js",
 	"devDependencies": {
 		"terser": "^5.39.0",
 		"typescript": "^5.8.3"

package/server.d.ts

@@ -22,7 +22,7 @@ export declare class StreamResponse<JsxEnabled extends boolean> {
     private sendBytes;
     private sendText;
     private keepAlive;
-    send(target: string, swap: string, html: JsxEnabled extends true ? (JSX.Element | string) : string): boolean;
+    send(target: string, swap: string, html: JsxEnabled extends true ? (JSX.Element | string) : string): boolean | undefined;
     close(): boolean;
 }
 export declare function MakeStream<T extends Partial<RenderOptions>>(props: T, cb: (stream: StreamResponse<HasRender<T>>, props: T) => Promise<void> | void): Response;

package/server.js

@@ -70,12 +70,11 @@ export class StreamResponse {
     }
     keepAlive() { return this.sendText(" "); }
     send(target, swap, html) {
-        if (typeof html !== "string") {
-            if (!this.#render)
-                throw new Error(`Cannot render to JSX when no renderer provided during class initialization`);
-            html = this.#render(html);
-        }
-        return this.sendText(`<${this.#boundary}>${target}|${swap}|${html}</${this.#boundary}>\n`);
+        if (typeof html === "string")
+            return this.sendText(`<${this.#boundary}>${target}|${swap}|${html}</${this.#boundary}>\n`);
+        if (!this.#render)
+            throw new Error(`Cannot render to JSX when no renderer provided during class initialization`);
+        html = this.#render(html);
     }
     close() {
         if (this.#controller) {