@inox-tools/request-state 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,8 +1,8 @@
-import { defineIntegration, addVitePlugin } from 'astro-integration-kit';
+import { defineIntegration, createResolver, addVitePlugin } from 'astro-integration-kit';
 import { plugin } from './plugin.js';
 
-var u=defineIntegration({name:"@inox-tools/request-state",setup(){return {hooks:{"astro:config:setup":e=>{const{addMiddleware:t}=e;t({order:"pre",entrypoint:"@inox-tools/request-state/runtime/middleware"}),addVitePlugin(e,{warnDuplicated:!0,plugin:plugin()});}}}}});
+var g=defineIntegration({name:"@inox-tools/request-state",setup(){const{resolve:t}=createResolver(import.meta.url);return {hooks:{"astro:config:setup":e=>{const{addMiddleware:r}=e;e.logger.debug("Adding request-state middleware"),r({order:"pre",entrypoint:t("runtime/middleware.js")}),e.logger.debug("Adding request-state virtual module"),addVitePlugin(e,{warnDuplicated:!0,plugin:plugin()});}}}}});
 
-export { u as default };
+export { g as default };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["src_default","defineIntegration","params","addMiddleware","addVitePlugin","plugin"],"mappings":";;;AAGA,IAAOA,CAAQC,CAAAA,iBAAAA,CAAkB,CAChC,IAAM,CAAA,2BAAA,CACN,KAAQ,EAAA,CACP,OAAO,CACN,MAAO,CACN,oBAAA,CAAuBC,CAAW,EAAA,CACjC,KAAM,CAAE,cAAAC,CAAc,CAAA,CAAID,CAE1BC,CAAAA,CAAAA,CAAc,CACb,KAAA,CAAO,MACP,UAAY,CAAA,8CACb,CAAC,CAAA,CACDC,aAAcF,CAAAA,CAAAA,CAAQ,CACrB,cAAgB,CAAA,CAAA,CAAA,CAChB,MAAQG,CAAAA,MAAAA,EACT,CAAC,EACF,CACD,CACD,CACD,CACD,CAAC","file":"index.js","sourcesContent":["import { defineIntegration, addVitePlugin } from 'astro-integration-kit';\nimport { plugin } from './plugin.js';\n\nexport default defineIntegration({\n\tname: '@inox-tools/request-state',\n\tsetup() {\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\taddMiddleware({\n\t\t\t\t\t\torder: 'pre',\n\t\t\t\t\t\tentrypoint: '@inox-tools/request-state/runtime/middleware',\n\t\t\t\t\t});\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":["src_default","defineIntegration","resolve","createResolver","params","addMiddleware","addVitePlugin","plugin"],"mappings":";;;AAGA,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/plugin.js

@@ -1,5 +1,10 @@
-const e="@it-astro:state",r=`\0${e}`,n=()=>({name:"@inox-tools/request-state/vite-plugin",resolveId(t){if(t===e)return r},load(t,o){return t!==r?void 0:`export {setState, getState} from '@inox-tools/request-state/runtime/${o?.ssr?"serverState":"clientState"}';`}});
+import { createResolver } from 'astro-integration-kit';
 
-export { n as plugin };
+const r="@it-astro:state",s=`\0${r}`,u=()=>{const{resolve:e}=createResolver(import.meta.url);return {name:"@inox-tools/request-state/vite-plugin",resolveId(t){if(t===r)return s},config(t){t.ssr?.external!==!0&&(t.ssr={...t.ssr,external:[...t.ssr?.external??[],"node:async_hooks"]});},load(t,o){if(t!==s)return;const n=o?.ssr?"serverState.js":"clientState.js";return `
+export {setState, getState} from '${e("runtime",n)}';
+export {ServerStateLoaded} from '${e("events.js")}';
+`.trim()}}};
+
+export { u as plugin };
 //# sourceMappingURL=plugin.js.map
 //# sourceMappingURL=plugin.js.map

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin.ts"],"names":["MODULE_ID","RESOLVED_MODULE_ID","plugin","id","options"],"mappings":"AAEA,MAAMA,CAAY,CAAA,iBAAA,CACZC,CAAqB,CAAA,CAAA,EAAA,EAAOD,CAAS,CAE9BE,CAAAA,CAAAA,CAAAA,CAAS,KACd,CACN,KAAM,uCACN,CAAA,SAAA,CAAUC,CAAI,CAAA,CACb,GAAIA,CAAOH,GAAAA,CAAAA,CACV,OAAOC,CAET,CACA,CAAA,IAAA,CAAKE,CAAIC,CAAAA,CAAAA,CAAS,CACjB,OAAID,CAAAA,GAAOF,CAAoB,CAAA,KAAA,CAAA,CAIxB,uEAFaG,CAAS,EAAA,GAAA,CAAM,aAAgB,CAAA,aAEsC,IAC1F,CACD,CAAA","file":"plugin.js","sourcesContent":["import type { Plugin } from 'vite';\n\nconst MODULE_ID = '@it-astro:state';\nconst RESOLVED_MODULE_ID = `\\x00${MODULE_ID}`;\n\nexport const plugin = (): Plugin => {\n\treturn {\n\t\tname: '@inox-tools/request-state/vite-plugin',\n\t\tresolveId(id) {\n\t\t\tif (id === MODULE_ID) {\n\t\t\t\treturn RESOLVED_MODULE_ID;\n\t\t\t}\n\t\t},\n\t\tload(id, options) {\n\t\t\tif (id !== RESOLVED_MODULE_ID) return;\n\n\t\t\tconst stateSource = options?.ssr ? 'serverState' : 'clientState';\n\n\t\t\treturn `export {setState, getState} from '@inox-tools/request-state/runtime/${stateSource}';`;\n\t\t},\n\t};\n};\n"]}
+{"version":3,"sources":["../src/plugin.ts"],"names":["MODULE_ID","RESOLVED_MODULE_ID","plugin","resolve","createResolver","id","config","options","stateSource"],"mappings":";;AAGA,MAAMA,EAAY,iBACZC,CAAAA,CAAAA,CAAqB,CAAOD,EAAAA,EAAAA,CAAS,GAE9BE,CAAS,CAAA,IAAc,CACnC,KAAM,CAAE,OAAAC,CAAAA,CAAQ,CAAIC,CAAAA,cAAAA,CAAe,YAAY,GAAG,CAAA,CAElD,OAAO,CACN,KAAM,uCACN,CAAA,SAAA,CAAUC,CAAI,CAAA,CACb,GAAIA,CAAOL,GAAAA,CAAAA,CACV,OAAOC,CAET,EACA,MAAOK,CAAAA,CAAAA,CAAQ,CACVA,CAAAA,CAAO,GAAK,EAAA,QAAA,GAAa,CAE7BA,CAAAA,GAAAA,CAAAA,CAAO,IAAM,CACZ,GAAGA,CAAO,CAAA,GAAA,CACV,SAAU,CAAC,GAAIA,CAAO,CAAA,GAAA,EAAK,UAAY,EAAC,CAAI,kBAAkB,CAC/D,GACD,CACA,CAAA,IAAA,CAAKD,CAAIE,CAAAA,CAAAA,CAAS,CACjB,GAAIF,CAAAA,GAAOJ,CAAoB,CAAA,OAE/B,MAAMO,CAAcD,CAAAA,CAAAA,EAAS,GAAM,CAAA,gBAAA,CAAmB,iBAGtD,OAAO,CAAA;AAAA,kCAFYJ,EAAAA,CAAAA,CAAQ,SAAWK,CAAAA,CAAW,CAGN,CAAA;AAAA,iCACXL,EAAAA,CAAAA,CAAQ,WAAW,CAAC,CAAA;AAAA,CACrD,CAAA,IAAA,EACA,CACD,CACD","file":"plugin.js","sourcesContent":["import { createResolver } from 'astro-integration-kit';\nimport type { Plugin } from 'vite';\n\nconst MODULE_ID = '@it-astro:state';\nconst RESOLVED_MODULE_ID = `\\x00${MODULE_ID}`;\n\nexport const plugin = (): Plugin => {\n\tconst { resolve } = createResolver(import.meta.url);\n\n\treturn {\n\t\tname: '@inox-tools/request-state/vite-plugin',\n\t\tresolveId(id) {\n\t\t\tif (id === MODULE_ID) {\n\t\t\t\treturn RESOLVED_MODULE_ID;\n\t\t\t}\n\t\t},\n\t\tconfig(config) {\n\t\t\tif (config.ssr?.external === true) return;\n\n\t\t\tconfig.ssr = {\n\t\t\t\t...config.ssr,\n\t\t\t\texternal: [...(config.ssr?.external ?? []), 'node:async_hooks'],\n\t\t\t};\n\t\t},\n\t\tload(id, options) {\n\t\t\tif (id !== RESOLVED_MODULE_ID) return;\n\n\t\t\tconst stateSource = options?.ssr ? 'serverState.js' : 'clientState.js';\n\t\t\tconst importPath = resolve('runtime', stateSource);\n\n\t\t\treturn `\nexport {setState, getState} from '${importPath}';\nexport {ServerStateLoaded} from '${resolve('events.js')}';\n`.trim();\n\t\t},\n\t};\n};\n"]}

package/dist/runtime/middleware.js

@@ -2,7 +2,7 @@ import { defineMiddleware } from 'astro/middleware';
 import { collectState } from './serverState.js';
 import { parse } from 'content-type';
 
-const u=defineMiddleware(async(l,o)=>{const{getState:n,result:t}=await collectState(o),e=t.headers.get("Content-Type");if(e===null)return t;const{type:r}=parse(e);if(r!=="text/html"&&!r.startsWith("text/html+"))return t;async function*s(){for await(const i of t.body)yield i;const a=n();a&&(yield `<script id="it-astro-state" type="application/json+devalue">${a}</script>`);}return new Response(s(),t)});
+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

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","render","chunk","state"],"mappings":";;;;MAKaA,CAAYC,CAAAA,gBAAAA,CAAiB,MAAOC,CAAGC,CAAAA,CAAAA,GAAS,CAC5D,KAAM,CAAE,QAAAC,CAAAA,CAAAA,CAAU,OAAAC,CAAO,CAAA,CAAI,MAAMC,YAAaH,CAAAA,CAAI,EAE9CI,CAAcF,CAAAA,CAAAA,CAAO,OAAQ,CAAA,GAAA,CAAI,cAAc,CAErD,CAAA,GAAIE,IAAgB,IAAM,CAAA,OAAOF,EAEjC,KAAM,CAAE,IAAMG,CAAAA,CAAU,EAAIC,KAAMF,CAAAA,CAAW,EAE7C,GAAIC,CAAAA,GAAc,aAAe,CAACA,CAAAA,CAAU,UAAW,CAAA,YAAY,EAAG,OAAOH,CAAAA,CAE7E,eAAgBK,CAAS,EAAA,CACxB,gBAAiBC,CAASN,IAAAA,CAAAA,CAAO,IAChC,CAAA,MAAMM,EAGP,MAAMC,CAAAA,CAAQR,GAEVQ,CAAAA,CAAAA,GACH,MAAM,CAA+DA,4DAAAA,EAAAA,CAAK,CAE5E,SAAA,CAAA,EAAA,CAGA,OAAO,IAAI,QAAA,CAASF,GAAUL,CAAAA,CAAM,CACrC,CAAC","file":"middleware.js","sourcesContent":["import type { ReadableStream } from 'node:stream/web';\nimport { 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\tasync function* render() {\n\t\tfor await (const chunk of result.body as ReadableStream<ArrayBuffer>) {\n\t\t\tyield chunk;\n\t\t}\n\n\t\tconst state = getState();\n\n\t\tif (state) {\n\t\t\tyield `<script id=\"it-astro-state\" type=\"application/json+devalue\">${state}</script>`;\n\t\t}\n\t}\n\n\t// @ts-expect-error generator not assignable to ReadableStream\n\treturn new Response(render(), result);\n});\n"]}
+{"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":";;;;AAIaA,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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inox-tools/request-state",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Shared request state between server and client",
   "keywords": [
     "astro-integration",
@@ -14,14 +14,6 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    },
-    "./events": {
-      "types": "./dist/events.d.ts",
-      "default": "./dist/events.js"
-    },
-    "./runtime/*": {
-      "types": "./dist/runtime/*.d.ts",
-      "default": "./dist/runtime/*.js"
     }
   },
   "files": [

package/src/index.ts

@@ -1,18 +1,23 @@
-import { defineIntegration, addVitePlugin } from 'astro-integration-kit';
+import { defineIntegration, addVitePlugin, createResolver } from 'astro-integration-kit';
 import { plugin } from './plugin.js';
 
 export default defineIntegration({
 	name: '@inox-tools/request-state',
 	setup() {
+		const { resolve } = createResolver(import.meta.url);
+
 		return {
 			hooks: {
 				'astro:config:setup': (params) => {
 					const { addMiddleware } = params;
 
+					params.logger.debug('Adding request-state middleware');
 					addMiddleware({
 						order: 'pre',
-						entrypoint: '@inox-tools/request-state/runtime/middleware',
+						entrypoint: resolve('runtime/middleware.js'),
 					});
+
+					params.logger.debug('Adding request-state virtual module');
 					addVitePlugin(params, {
 						warnDuplicated: true,
 						plugin: plugin(),

package/src/plugin.ts

@@ -1,9 +1,12 @@
+import { createResolver } from 'astro-integration-kit';
 import type { Plugin } from 'vite';
 
 const MODULE_ID = '@it-astro:state';
 const RESOLVED_MODULE_ID = `\x00${MODULE_ID}`;
 
 export const plugin = (): Plugin => {
+	const { resolve } = createResolver(import.meta.url);
+
 	return {
 		name: '@inox-tools/request-state/vite-plugin',
 		resolveId(id) {
@@ -11,12 +14,24 @@ export const plugin = (): Plugin => {
 				return RESOLVED_MODULE_ID;
 			}
 		},
+		config(config) {
+			if (config.ssr?.external === true) return;
+
+			config.ssr = {
+				...config.ssr,
+				external: [...(config.ssr?.external ?? []), 'node:async_hooks'],
+			};
+		},
 		load(id, options) {
 			if (id !== RESOLVED_MODULE_ID) return;
 
-			const stateSource = options?.ssr ? 'serverState' : 'clientState';
+			const stateSource = options?.ssr ? 'serverState.js' : 'clientState.js';
+			const importPath = resolve('runtime', stateSource);
 
-			return `export {setState, getState} from '@inox-tools/request-state/runtime/${stateSource}';`;
+			return `
+export {setState, getState} from '${importPath}';
+export {ServerStateLoaded} from '${resolve('events.js')}';
+`.trim();
 		},
 	};
 };

package/src/runtime/middleware.ts

@@ -1,4 +1,3 @@
-import type { ReadableStream } from 'node:stream/web';
 import { defineMiddleware } from 'astro/middleware';
 import { collectState } from './serverState.js';
 import { parse } from 'content-type';
@@ -14,18 +13,31 @@ export const onRequest = defineMiddleware(async (_, next) => {
 
 	if (mediaType !== 'text/html' && !mediaType.startsWith('text/html+')) return result;
 
-	async function* render() {
-		for await (const chunk of result.body as ReadableStream<ArrayBuffer>) {
-			yield chunk;
-		}
+	const newBody = result.body
+		?.pipeThrough(new TextDecoderStream())
+		.pipeThrough(injectState(getState))
+		.pipeThrough(new TextEncoderStream());
 
-		const state = getState();
-
-		if (state) {
-			yield `<script id="it-astro-state" type="application/json+devalue">${state}</script>`;
-		}
-	}
-
-	// @ts-expect-error generator not assignable to ReadableStream
-	return new Response(render(), result);
+	return new Response(newBody, 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);
+		},
+	});
+}

package/virtual.d.ts

@@ -1,10 +1,12 @@
 declare module '@it-astro:state' {
 	export const getState: (key: string, valueIfMissing?: unknown) => unknown;
 	export const setState: (key: string, value: unknown) => void;
+
+	export { ServerStateLoaded } from './src/events.js';
 }
 
 declare global {
 	interface DocumentEventMap {
-		[ServerStateLoaded.NAME]: import('@inox-tools/request-state/events').ServerStateLoaded;
+		[ServerStateLoaded.NAME]: import('./src/events.js').ServerStateLoaded;
 	}
 }

package/dist/events.d.ts

@@ -1,33 +0,0 @@
-/// <reference path="../virtual.d.ts" />
-
-type State = Map<string, unknown>;
-declare class ServerStateLoaded extends Event {
-    /**
-     * The client state before loading the server state.
-     *
-     * On first load, this will be an empty map.
-     * When using View Transitions and navigating to another page,
-     * this will be state of the previous page.
-     */
-    readonly previousState: State;
-    /**
-     * The server state that will be loaded.
-     */
-    readonly serverState: State;
-    static NAME: "@it-astro:server-state-loaded";
-    constructor(
-    /**
-     * The client state before loading the server state.
-     *
-     * On first load, this will be an empty map.
-     * When using View Transitions and navigating to another page,
-     * this will be state of the previous page.
-     */
-    previousState: State, 
-    /**
-     * The server state that will be loaded.
-     */
-    serverState: State, options?: EventInit);
-}
-
-export { ServerStateLoaded, type State };