@inox-tools/request-state 0.2.0 → 0.3.1

package/README.md

@@ -16,7 +16,7 @@ This library provides a solution for those problems:
 
 ## Installing the dependency
 
-```js
+```sh
 npm i @inox-tools/request-state
 ```
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["src_default","defineIntegration","resolve","createResolver","params","addMiddleware","addVitePlugin","plugin"],"mappings":"oHAGA,IAAOA,CAAQC,CAAAA,iBAAAA,CAAkB,CAChC,IAAM,CAAA,2BAAA,CACN,KAAQ,EAAA,CACP,KAAM,CAAE,OAAA,CAAAC,CAAQ,CAAA,CAAIC,eAAe,MAAY,CAAA,IAAA,CAAA,GAAG,CAElD,CAAA,OAAO,CACN,KAAO,CAAA,CACN,oBAAuBC,CAAAA,CAAAA,EAAW,CACjC,KAAM,CAAE,aAAAC,CAAAA,CAAc,EAAID,CAE1BA,CAAAA,CAAAA,CAAO,MAAO,CAAA,KAAA,CAAM,iCAAiC,CACrDC,CAAAA,CAAAA,CAAc,CACb,KAAA,CAAO,MACP,UAAYH,CAAAA,CAAAA,CAAQ,uBAAuB,CAC5C,CAAC,CAEDE,CAAAA,CAAAA,CAAO,MAAO,CAAA,KAAA,CAAM,qCAAqC,CACzDE,CAAAA,aAAAA,CAAcF,CAAQ,CAAA,CACrB,eAAgB,CAChB,CAAA,CAAA,MAAA,CAAQG,MAAO,EAChB,CAAC,EACF,CACD,CACD,CACD,CACD,CAAC","file":"index.js","sourcesContent":["import { defineIntegration, addVitePlugin, createResolver } from 'astro-integration-kit';\nimport { plugin } from './plugin.js';\n\nexport default defineIntegration({\n\tname: '@inox-tools/request-state',\n\tsetup() {\n\t\tconst { resolve } = createResolver(import.meta.url);\n\n\t\treturn {\n\t\t\thooks: {\n\t\t\t\t'astro:config:setup': (params) => {\n\t\t\t\t\tconst { addMiddleware } = params;\n\n\t\t\t\t\tparams.logger.debug('Adding request-state middleware');\n\t\t\t\t\taddMiddleware({\n\t\t\t\t\t\torder: 'pre',\n\t\t\t\t\t\tentrypoint: resolve('runtime/middleware.js'),\n\t\t\t\t\t});\n\n\t\t\t\t\tparams.logger.debug('Adding request-state virtual module');\n\t\t\t\t\taddVitePlugin(params, {\n\t\t\t\t\t\twarnDuplicated: true,\n\t\t\t\t\t\tplugin: plugin(),\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t},\n\t\t};\n\t},\n});\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":["index_default","defineIntegration","resolve","createResolver","params","addMiddleware","addVitePlugin","plugin"],"mappings":"oHAGA,IAAOA,CAAQC,CAAAA,iBAAAA,CAAkB,CAChC,IAAM,CAAA,2BAAA,CACN,KAAQ,EAAA,CACP,KAAM,CAAE,OAAA,CAAAC,CAAQ,CAAA,CAAIC,eAAe,MAAY,CAAA,IAAA,CAAA,GAAG,CAElD,CAAA,OAAO,CACN,KAAO,CAAA,CACN,oBAAuBC,CAAAA,CAAAA,EAAW,CACjC,KAAM,CAAE,aAAAC,CAAAA,CAAc,EAAID,CAE1BA,CAAAA,CAAAA,CAAO,MAAO,CAAA,KAAA,CAAM,iCAAiC,CACrDC,CAAAA,CAAAA,CAAc,CACb,KAAA,CAAO,MACP,UAAYH,CAAAA,CAAAA,CAAQ,uBAAuB,CAC5C,CAAC,CAEDE,CAAAA,CAAAA,CAAO,MAAO,CAAA,KAAA,CAAM,qCAAqC,CACzDE,CAAAA,aAAAA,CAAcF,CAAQ,CAAA,CACrB,eAAgB,CAChB,CAAA,CAAA,MAAA,CAAQG,MAAO,EAChB,CAAC,EACF,CACD,CACD,CACD,CACD,CAAC","file":"index.js","sourcesContent":["import { defineIntegration, addVitePlugin, createResolver } from 'astro-integration-kit';\nimport { plugin } from './plugin.js';\n\nexport default defineIntegration({\n\tname: '@inox-tools/request-state',\n\tsetup() {\n\t\tconst { resolve } = createResolver(import.meta.url);\n\n\t\treturn {\n\t\t\thooks: {\n\t\t\t\t'astro:config:setup': (params) => {\n\t\t\t\t\tconst { addMiddleware } = params;\n\n\t\t\t\t\tparams.logger.debug('Adding request-state middleware');\n\t\t\t\t\taddMiddleware({\n\t\t\t\t\t\torder: 'pre',\n\t\t\t\t\t\tentrypoint: resolve('runtime/middleware.js'),\n\t\t\t\t\t});\n\n\t\t\t\t\tparams.logger.debug('Adding request-state virtual module');\n\t\t\t\t\taddVitePlugin(params, {\n\t\t\t\t\t\twarnDuplicated: true,\n\t\t\t\t\t\tplugin: plugin(),\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t},\n\t\t};\n\t},\n});\n"]}

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 u=defineMiddleware(async(i,n)=>{const{getState:e,result:t}=await collectState(n),r=t.headers.get("Content-Type");if(r===null)return t;const{type:o}=parse(r);if(o!=="text/html"&&!o.startsWith("text/html+"))return t;const s=t.body?.pipeThrough(new TextDecoderStream).pipeThrough(d(e)).pipeThrough(new TextEncoderStream);return new Response(s,t)});function d(i){let n=!1;return new TransformStream({transform(e,t){if(!n){const r=e.indexOf("</body>");if(r>-1){const o=i();if(o){const s=`<script id="it-astro-state" type="application/json+devalue">${o}</script>`;e=e.slice(0,r)+s+e.slice(r);}n=!0;}}t.enqueue(e);}})}export{u as onRequest};//# sourceMappingURL=middleware.js.map
+import {defineMiddleware}from'astro/middleware';import {collectState}from'./serverState.js';import {parse}from'content-type';const h=defineMiddleware(async(f,r)=>{const{getState:a,result:t}=await collectState(r),s=t.headers.get("Content-Type");if(s===null)return t;const{type:o}=parse(s);if(o!=="text/html"&&!o.startsWith("text/html+"))return t;const e=await t.text(),n=e.indexOf("</head>");if(n>-1){const i=a();if(i){const c=`<script id="it-astro-state" type="application/json+devalue">${i}</script>`;return new Response(e.slice(0,n)+c+e.slice(n),t)}}return new Response(e,t)});export{h 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","newBody","injectState","injected","chunk","controller","bodyCloseIndex","state","stateScript"],"mappings":"6HAIaA,MAAAA,CAAAA,CAAYC,iBAAiB,MAAOC,CAAAA,CAAGC,CAAS,GAAA,CAC5D,KAAM,CAAE,QAAAC,CAAAA,CAAAA,CAAU,OAAAC,CAAO,CAAA,CAAI,MAAMC,YAAAA,CAAaH,CAAI,CAE9CI,CAAAA,CAAAA,CAAcF,CAAO,CAAA,OAAA,CAAQ,IAAI,cAAc,CAAA,CAErD,GAAIE,CAAAA,GAAgB,IAAM,CAAA,OAAOF,CAEjC,CAAA,KAAM,CAAE,IAAMG,CAAAA,CAAU,CAAIC,CAAAA,KAAAA,CAAMF,CAAW,CAE7C,CAAA,GAAIC,CAAc,GAAA,WAAA,EAAe,CAACA,CAAU,CAAA,UAAA,CAAW,YAAY,CAAA,CAAG,OAAOH,CAAAA,CAE7E,MAAMK,CAAAA,CAAUL,EAAO,IACpB,EAAA,WAAA,CAAY,IAAI,iBAAmB,EACpC,WAAYM,CAAAA,CAAAA,CAAYP,CAAQ,CAAC,EACjC,WAAY,CAAA,IAAI,iBAAmB,CAAA,CAErC,OAAO,IAAI,QAASM,CAAAA,CAAAA,CAASL,CAAM,CACpC,CAAC,EAED,SAASM,CAAYP,CAAAA,CAAAA,CAAgC,CACpD,IAAIQ,EAAW,CACf,CAAA,CAAA,OAAO,IAAI,eAAA,CAAgB,CAC1B,SAAA,CAAUC,CAAOC,CAAAA,CAAAA,CAAY,CAC5B,GAAI,CAACF,CAAU,CAAA,CACd,MAAMG,CAAiBF,CAAAA,CAAAA,CAAM,OAAQ,CAAA,SAAS,EAC9C,GAAIE,CAAAA,CAAiB,CAAI,CAAA,CAAA,CACxB,MAAMC,CAAAA,CAAQZ,CAAS,EAAA,CACvB,GAAIY,CAAO,CAAA,CACV,MAAMC,CAAAA,CAAc,+DAA+DD,CAAK,CAAA,SAAA,CAAA,CAExFH,CAAQA,CAAAA,CAAAA,CAAM,MAAM,CAAGE,CAAAA,CAAc,CAAIE,CAAAA,CAAAA,CAAcJ,CAAM,CAAA,KAAA,CAAME,CAAc,EAClF,CACAH,CAAW,CAAA,CAAA,EACZ,CACD,CACAE,EAAW,OAAQD,CAAAA,CAAK,EACzB,CACD,CAAC,CACF","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 newBody = result.body\n\t\t?.pipeThrough(new TextDecoderStream())\n\t\t.pipeThrough(injectState(getState))\n\t\t.pipeThrough(new TextEncoderStream());\n\n\treturn new Response(newBody, result);\n});\n\nfunction injectState(getState: () => string | false) {\n\tlet injected = false;\n\treturn new TransformStream({\n\t\ttransform(chunk, controller) {\n\t\t\tif (!injected) {\n\t\t\t\tconst bodyCloseIndex = chunk.indexOf('</body>');\n\t\t\t\tif (bodyCloseIndex > -1) {\n\t\t\t\t\tconst state = getState();\n\t\t\t\t\tif (state) {\n\t\t\t\t\t\tconst stateScript = `<script id=\"it-astro-state\" type=\"application/json+devalue\">${state}</script>`;\n\n\t\t\t\t\t\tchunk = chunk.slice(0, bodyCloseIndex) + stateScript + chunk.slice(bodyCloseIndex);\n\t\t\t\t\t}\n\t\t\t\t\tinjected = true;\n\t\t\t\t}\n\t\t\t}\n\t\t\tcontroller.enqueue(chunk);\n\t\t},\n\t});\n}\n"]}
+{"version":3,"sources":["../../src/runtime/middleware.ts"],"names":["onRequest","defineMiddleware","_","next","getState","result","collectState","contentType","mediaType","parse","originalBody","headCloseIndex","state","stateScript"],"mappings":"6HAIO,MAAMA,EAAYC,gBAAiB,CAAA,MAAOC,CAAGC,CAAAA,CAAAA,GAAS,CAC5D,KAAM,CAAE,QAAAC,CAAAA,CAAAA,CAAU,MAAAC,CAAAA,CAAO,CAAI,CAAA,MAAMC,aAAaH,CAAI,CAAA,CAE9CI,CAAcF,CAAAA,CAAAA,CAAO,OAAQ,CAAA,GAAA,CAAI,cAAc,CAErD,CAAA,GAAIE,CAAgB,GAAA,IAAA,CAAM,OAAOF,CAAAA,CAEjC,KAAM,CAAE,IAAA,CAAMG,CAAU,CAAA,CAAIC,KAAMF,CAAAA,CAAW,EAE7C,GAAIC,CAAAA,GAAc,WAAe,EAAA,CAACA,CAAU,CAAA,UAAA,CAAW,YAAY,CAAG,CAAA,OAAOH,CAE7E,CAAA,MAAMK,CAAe,CAAA,MAAML,EAAO,IAAK,EAAA,CAEjCM,CAAiBD,CAAAA,CAAAA,CAAa,OAAQ,CAAA,SAAS,EACrD,GAAIC,CAAAA,CAAiB,CAAI,CAAA,CAAA,CACxB,MAAMC,CAAAA,CAAQR,GACd,CAAA,GAAIQ,CAAO,CAAA,CACV,MAAMC,CAAAA,CAAc,+DAA+DD,CAAK,CAAA,SAAA,CAAA,CAExF,OAAO,IAAI,QACVF,CAAAA,CAAAA,CAAa,MAAM,CAAGC,CAAAA,CAAc,CAAIE,CAAAA,CAAAA,CAAcH,CAAa,CAAA,KAAA,CAAMC,CAAc,CACvFN,CAAAA,CACD,CACD,CACD,CAEA,OAAO,IAAI,QAASK,CAAAA,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 headCloseIndex = originalBody.indexOf('</head>');\n\tif (headCloseIndex > -1) {\n\t\tconst state = getState();\n\t\tif (state) {\n\t\t\tconst stateScript = `<script id=\"it-astro-state\" type=\"application/json+devalue\">${state}</script>`;\n\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}\n\t}\n\n\treturn new Response(originalBody, result);\n});\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inox-tools/request-state",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Shared request state between server and client",
   "keywords": [
     "astro-integration",
@@ -23,21 +23,21 @@
     "virtual.d.ts"
   ],
   "dependencies": {
-    "astro-integration-kit": "~0.17.0",
+    "astro-integration-kit": "~0.18.0",
     "content-type": "^1.0.5",
     "devalue": "^5.1.1",
     "@inox-tools/utils": "^0.3.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.49.1",
     "@types/content-type": "^1.1.8",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.3",
     "astro": "^5",
     "jest-extended": "^4.0.2",
     "tsup": "8.3.5",
     "typescript": "^5.7.2",
-    "vite": "^6.0.2",
-    "@inox-tools/astro-tests": "^0.2.1"
+    "vite": "^6.0.6",
+    "@inox-tools/astro-tests": "^0.2.2"
   },
   "peerDependencies": {
     "astro": "^5"

package/src/runtime/middleware.ts

@@ -13,31 +13,20 @@ export const onRequest = defineMiddleware(async (_, next) => {
 
 	if (mediaType !== 'text/html' && !mediaType.startsWith('text/html+')) return result;
 
-	const newBody = result.body
-		?.pipeThrough(new TextDecoderStream())
-		.pipeThrough(injectState(getState))
-		.pipeThrough(new TextEncoderStream());
-
-	return new Response(newBody, result);
+	const originalBody = await result.text();
+
+	const headCloseIndex = originalBody.indexOf('</head>');
+	if (headCloseIndex > -1) {
+		const state = getState();
+		if (state) {
+			const stateScript = `<script id="it-astro-state" type="application/json+devalue">${state}</script>`;
+
+			return new Response(
+				originalBody.slice(0, headCloseIndex) + stateScript + originalBody.slice(headCloseIndex),
+				result
+			);
+		}
+	}
+
+	return new Response(originalBody, result);
 });
-
-function injectState(getState: () => string | false) {
-	let injected = false;
-	return new TransformStream({
-		transform(chunk, controller) {
-			if (!injected) {
-				const bodyCloseIndex = chunk.indexOf('</body>');
-				if (bodyCloseIndex > -1) {
-					const state = getState();
-					if (state) {
-						const stateScript = `<script id="it-astro-state" type="application/json+devalue">${state}</script>`;
-
-						chunk = chunk.slice(0, bodyCloseIndex) + stateScript + chunk.slice(bodyCloseIndex);
-					}
-					injected = true;
-				}
-			}
-			controller.enqueue(chunk);
-		},
-	});
-}