@inox-tools/request-state 0.7.2 → 0.8.2

package/dist/runtime/middleware.js

@@ -1,2 +1,2 @@
-import {defineMiddleware}from'astro/middleware';import {collectState}from'./serverState.js';import {parse}from'content-type';const h=defineMiddleware(async(u,a)=>{const{getState:c,result:t}=await collectState(a),o=t.headers.get("Content-Type");if(o===null)return t;const{type:r}=parse(o);if(r!=="text/html"&&!r.startsWith("text/html+"))return t;const e=await t.text(),i=c(),s=i?`<script class="it-astro-state" type="application/json+devalue">${i}</script>`:null;if(s){const n=e.indexOf("</head>");return n>-1?new Response(e.slice(0,n)+s+e.slice(n),t):new Response(s+e,t)}return new Response(e,t)});export{h as onRequest};//# sourceMappingURL=middleware.js.map
+import {defineMiddleware}from'astro/middleware';import {collectState}from'./serverState.js';import {parse}from'content-type';const m=new TextEncoder,S=defineMiddleware(async(x,d)=>{const{getState:l,result:t}=await collectState(d),o=t.headers.get("Content-Type");if(o===null)return t;const{type:a}=parse(o);if(a!=="text/html"&&!a.startsWith("text/html+"))return t;const e=await t.text(),r=l(),n=r?`<script class="it-astro-state" type="application/json+devalue">${r}</script>`:null;if(!n)return new Response(e,t);const s=e.indexOf("</head>"),p=s>-1?e.slice(0,s)+n+e.slice(s):n+e,c=m.encode(p),u=c.byteLength,i=new Headers(t.headers);return i.set("Content-Length",u.toString()),new Response(c,{status:t.status,statusText:t.statusText,headers:i})});export{S as onRequest};//# sourceMappingURL=middleware.js.map
 //# sourceMappingURL=middleware.js.map

package/dist/runtime/middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/middleware.ts"],"names":["onRequest","defineMiddleware","_","next","getState","result","collectState","contentType","mediaType","parse","originalBody","state","stateScript","headCloseIndex"],"mappings":"6HAIO,MAAMA,EAAYC,gBAAAA,CAAiB,MAAOC,CAAAA,CAAGC,CAAAA,GAAS,CAC5D,KAAM,CAAE,QAAA,CAAAC,CAAAA,CAAU,MAAA,CAAAC,CAAO,CAAA,CAAI,MAAMC,YAAAA,CAAaH,CAAI,CAAA,CAE9CI,CAAAA,CAAcF,CAAAA,CAAO,OAAA,CAAQ,GAAA,CAAI,cAAc,EAErD,GAAIE,CAAAA,GAAgB,IAAA,CAAM,OAAOF,CAAAA,CAEjC,KAAM,CAAE,IAAA,CAAMG,CAAU,CAAA,CAAIC,KAAAA,CAAMF,CAAW,CAAA,CAE7C,GAAIC,CAAAA,GAAc,WAAA,EAAe,CAACA,CAAAA,CAAU,UAAA,CAAW,YAAY,CAAA,CAAG,OAAOH,CAAAA,CAE7E,MAAMK,CAAAA,CAAe,MAAML,CAAAA,CAAO,IAAA,GAE5BM,CAAAA,CAAQP,CAAAA,EAAS,CACjBQ,CAAAA,CAAcD,CAAAA,CACjB,CAAA,+DAAA,EAAkEA,CAAK,CAAA,SAAA,CAAA,CACvE,IAAA,CACH,GAAIC,CAAAA,CAAa,CAChB,MAAMC,CAAAA,CAAiBH,CAAAA,CAAa,OAAA,CAAQ,SAAS,CAAA,CACrD,OAAIG,CAAAA,CAAiB,EAAA,CACb,IAAI,QAAA,CACVH,CAAAA,CAAa,KAAA,CAAM,CAAA,CAAGG,CAAc,CAAA,CAAID,EAAcF,CAAAA,CAAa,KAAA,CAAMG,CAAc,CAAA,CACvFR,CACD,CAAA,CAEO,IAAI,QAAA,CAASO,CAAAA,CAAcF,CAAAA,CAAcL,CAAM,CAExD,CAEA,OAAO,IAAI,QAAA,CAASK,CAAAA,CAAcL,CAAM,CACzC,CAAC","file":"middleware.js","sourcesContent":["import { defineMiddleware } from 'astro/middleware';\nimport { collectState } from './serverState.js';\nimport { parse } from 'content-type';\n\nexport const onRequest = defineMiddleware(async (_, next) => {\n\tconst { getState, result } = await collectState(next);\n\n\tconst contentType = result.headers.get('Content-Type');\n\n\tif (contentType === null) return result;\n\n\tconst { type: mediaType } = parse(contentType);\n\n\tif (mediaType !== 'text/html' && !mediaType.startsWith('text/html+')) return result;\n\n\tconst originalBody = await result.text();\n\n\tconst state = getState();\n\tconst stateScript = state\n\t\t? `<script class=\"it-astro-state\" type=\"application/json+devalue\">${state}</script>`\n\t\t: null;\n\tif (stateScript) {\n\t\tconst headCloseIndex = originalBody.indexOf('</head>');\n\t\tif (headCloseIndex > -1) {\n\t\t\treturn new Response(\n\t\t\t\toriginalBody.slice(0, headCloseIndex) + stateScript + originalBody.slice(headCloseIndex),\n\t\t\t\tresult\n\t\t\t);\n\t\t} else {\n\t\t\treturn new Response(stateScript + originalBody, result);\n\t\t}\n\t}\n\n\treturn new Response(originalBody, result);\n});\n"]}
+{"version":3,"sources":["../../src/runtime/middleware.ts"],"names":["encoder","onRequest","defineMiddleware","_","next","getState","result","collectState","contentType","mediaType","parse","originalBody","state","stateScript","headCloseIndex","finalBody","encodedBody","contentLength","headers"],"mappings":"6HAIA,MAAMA,CAAAA,CAAU,IAAI,WAAA,CAEPC,CAAAA,CAAYC,gBAAAA,CAAiB,MAAOC,CAAAA,CAAGC,CAAAA,GAAS,CAC5D,KAAM,CAAE,QAAA,CAAAC,CAAAA,CAAU,MAAA,CAAAC,CAAO,CAAA,CAAI,MAAMC,YAAAA,CAAaH,CAAI,EAE9CI,CAAAA,CAAcF,CAAAA,CAAO,OAAA,CAAQ,GAAA,CAAI,cAAc,CAAA,CAErD,GAAIE,CAAAA,GAAgB,KAAM,OAAOF,CAAAA,CAEjC,KAAM,CAAE,IAAA,CAAMG,CAAU,CAAA,CAAIC,KAAAA,CAAMF,CAAW,CAAA,CAE7C,GAAIC,CAAAA,GAAc,WAAA,EAAe,CAACA,CAAAA,CAAU,UAAA,CAAW,YAAY,EAAG,OAAOH,CAAAA,CAE7E,MAAMK,CAAAA,CAAe,MAAML,CAAAA,CAAO,IAAA,EAAK,CAEjCM,CAAAA,CAAQP,GAAS,CACjBQ,CAAAA,CAAcD,CAAAA,CACjB,CAAA,+DAAA,EAAkEA,CAAK,CAAA,SAAA,CAAA,CACvE,IAAA,CAEH,GAAI,CAACC,CAAAA,CACJ,OAAO,IAAI,QAAA,CAASF,CAAAA,CAAcL,CAAM,CAAA,CAGzC,MAAMQ,EAAiBH,CAAAA,CAAa,OAAA,CAAQ,SAAS,CAAA,CAC/CI,CAAAA,CACLD,CAAAA,CAAiB,EAAA,CACdH,CAAAA,CAAa,MAAM,CAAA,CAAGG,CAAc,CAAA,CAAID,CAAAA,CAAcF,CAAAA,CAAa,KAAA,CAAMG,CAAc,CAAA,CACvFD,EAAcF,CAAAA,CAGZK,CAAAA,CAAchB,CAAAA,CAAQ,MAAA,CAAOe,CAAS,CAAA,CACtCE,CAAAA,CAAgBD,CAAAA,CAAY,WAE5BE,CAAAA,CAAU,IAAI,OAAA,CAAQZ,CAAAA,CAAO,OAAO,CAAA,CAC1C,OAAAY,CAAAA,CAAQ,IAAI,gBAAA,CAAkBD,CAAAA,CAAc,QAAA,EAAU,CAAA,CAE/C,IAAI,QAAA,CAASD,CAAAA,CAAa,CAChC,MAAA,CAAQV,CAAAA,CAAO,MAAA,CACf,UAAA,CAAYA,EAAO,UAAA,CACnB,OAAA,CAAAY,CACD,CAAC,CACF,CAAC","file":"middleware.js","sourcesContent":["import { defineMiddleware } from 'astro/middleware';\nimport { collectState } from './serverState.js';\nimport { parse } from 'content-type';\n\nconst encoder = new TextEncoder();\n\nexport const onRequest = defineMiddleware(async (_, next) => {\n\tconst { getState, result } = await collectState(next);\n\n\tconst contentType = result.headers.get('Content-Type');\n\n\tif (contentType === null) return result;\n\n\tconst { type: mediaType } = parse(contentType);\n\n\tif (mediaType !== 'text/html' && !mediaType.startsWith('text/html+')) return result;\n\n\tconst originalBody = await result.text();\n\n\tconst state = getState();\n\tconst stateScript = state\n\t\t? `<script class=\"it-astro-state\" type=\"application/json+devalue\">${state}</script>`\n\t\t: null;\n\n\tif (!stateScript) {\n\t\treturn new Response(originalBody, result);\n\t}\n\n\tconst headCloseIndex = originalBody.indexOf('</head>');\n\tconst finalBody =\n\t\theadCloseIndex > -1\n\t\t\t? originalBody.slice(0, headCloseIndex) + stateScript + originalBody.slice(headCloseIndex)\n\t\t\t: stateScript + originalBody;\n\n\t// TextEncoder is also supported in CloudFlare Workers, so this should work in all environments Astro supports.\n\tconst encodedBody = encoder.encode(finalBody);\n\tconst contentLength = encodedBody.byteLength;\n\n\tconst headers = new Headers(result.headers);\n\theaders.set('Content-Length', contentLength.toString());\n\n\treturn new Response(encodedBody, {\n\t\tstatus: result.status,\n\t\tstatusText: result.statusText,\n\t\theaders,\n\t});\n});\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inox-tools/request-state",
-  "version": "0.7.2",
+  "version": "0.8.2",
   "description": "Shared request state between server and client",
   "keywords": [
     "astro-integration",
@@ -8,6 +8,9 @@
     "astro",
     "utils"
   ],
+  "repository": {
+    "url": "https://github.com/Fryuni/inox-tools"
+  },
   "license": "MIT",
   "author": "Luiz Ferraz <luiz@lferraz.com>",
   "type": "module",
@@ -23,21 +26,21 @@
     "virtual.d.ts"
   ],
   "dependencies": {
-    "astro-integration-kit": "~0.19.0",
+    "astro-integration-kit": "~0.19.1",
     "content-type": "^1.0.5",
-    "devalue": "^5.3.2",
-    "@inox-tools/utils": "^0.8.0"
+    "devalue": "^5.6.2",
+    "@inox-tools/utils": "^1.1.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.55.0",
+    "@playwright/test": "^1.58.2",
     "@types/content-type": "^1.1.9",
-    "@types/node": "^24.3.0",
-    "astro": "^5.13.3",
-    "jest-extended": "^6.0.0",
-    "tsup": "8.5.0",
-    "typescript": "^5.9.2",
-    "vite": "^7.1.3",
-    "@inox-tools/astro-tests": "^0.8.1"
+    "@types/node": "^25.2.2",
+    "astro": "^5.17.1",
+    "jest-extended": "^7.0.0",
+    "tsup": "8.5.1",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.1",
+    "@inox-tools/astro-tests": "^0.9.1"
   },
   "peerDependencies": {
     "astro": "^5"

package/src/runtime/middleware.ts

@@ -2,6 +2,8 @@ import { defineMiddleware } from 'astro/middleware';
 import { collectState } from './serverState.js';
 import { parse } from 'content-type';
 
+const encoder = new TextEncoder();
+
 export const onRequest = defineMiddleware(async (_, next) => {
 	const { getState, result } = await collectState(next);
 
@@ -19,17 +21,27 @@ export const onRequest = defineMiddleware(async (_, next) => {
 	const stateScript = state
 		? `<script class="it-astro-state" type="application/json+devalue">${state}</script>`
 		: null;
-	if (stateScript) {
-		const headCloseIndex = originalBody.indexOf('</head>');
-		if (headCloseIndex > -1) {
-			return new Response(
-				originalBody.slice(0, headCloseIndex) + stateScript + originalBody.slice(headCloseIndex),
-				result
-			);
-		} else {
-			return new Response(stateScript + originalBody, result);
-		}
+
+	if (!stateScript) {
+		return new Response(originalBody, result);
 	}
 
-	return new Response(originalBody, result);
+	const headCloseIndex = originalBody.indexOf('</head>');
+	const finalBody =
+		headCloseIndex > -1
+			? originalBody.slice(0, headCloseIndex) + stateScript + originalBody.slice(headCloseIndex)
+			: stateScript + originalBody;
+
+	// TextEncoder is also supported in CloudFlare Workers, so this should work in all environments Astro supports.
+	const encodedBody = encoder.encode(finalBody);
+	const contentLength = encodedBody.byteLength;
+
+	const headers = new Headers(result.headers);
+	headers.set('Content-Length', contentLength.toString());
+
+	return new Response(encodedBody, {
+		status: result.status,
+		statusText: result.statusText,
+		headers,
+	});
 });