@skgo/sveltekit-adapter 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@skgo/sveltekit-adapter",
-	"version": "0.10.0",
+	"version": "0.11.0",
 	"description": "SvelteKit adapter for skgo: builds a frontend that a Go binary renders and answers",
 	"keywords": [
 		"adapter",
@@ -32,6 +32,7 @@
 		"skgo-adapter/app-paths.js",
 		"skgo-adapter/app-server.js",
 		"skgo-adapter/entry.js",
+		"skgo-adapter/env-private.js",
 		"skgo-adapter/env.js",
 		"skgo-adapter/generated.js",
 		"skgo-adapter/identity.js",

package/skgo-adapter/entry.js

@@ -218,7 +218,7 @@ function node_data(node) {
 	});
 }
 
-async function build_props(req, url) {
+async function build_props(req, url, event, state) {
 	const form = req.form ? devalue.parse(req.form, decoders) : null;
 	const page = {
 		error: req.error ?? null,
@@ -252,21 +252,23 @@ async function build_props(req, url) {
 		const load = universalLoads[branch[i].node];
 		const parent_data = data;
 		const result = load
-			? await load.call(null, {
-				url,
-				params: req.params ?? {},
-				data: server_data,
-				route: { id: req.route_id ?? null },
-				parent: async () => parent_data,
-				depends: () => {},
-				untrack: (fn) => fn(),
-				fetch: () => {
-					throw new Error('skgo: universal load fetch is not supported during rendering');
-				},
-				setHeaders: () => {
-					throw new Error('skgo: universal load setHeaders is not supported during rendering');
-				}
-			})
+			? await with_request_store({ event, state }, () =>
+				load.call(null, {
+					url,
+					params: req.params ?? {},
+					data: server_data,
+					route: { id: req.route_id ?? null },
+					parent: async () => parent_data,
+					depends: () => {},
+					untrack: (fn) => fn(),
+					fetch: () => {
+						throw new Error('skgo: universal load fetch is not supported during rendering');
+					},
+					setHeaders: () => {
+						throw new Error('skgo: universal load setHeaders is not supported during rendering');
+					}
+				})
+			)
 			: server_data;
 		if (result != null && Object.getPrototypeOf(result) !== Object.prototype) {
 			throw new Error('skgo: universal load must return a plain object');
@@ -367,9 +369,9 @@ globalThis.__skgo_render = function (req_json) {
 	try {
 		const req = JSON.parse(req_json);
 		const url = new URL(req.url);
-		const props_promise = build_props(req, url);
 		const state = make_state();
 		const event = make_event(req, url);
+		const props_promise = build_props(req, url, event, state);
 		const promise = props_promise.then((props) => {
 			result.status = props.page.status;
 			result.error = req.error ?? null;

package/skgo-adapter/env-private.js

@@ -0,0 +1,48 @@
+import { resolve } from 'node:path';
+import { realpathSync } from 'node:fs';
+
+function canonical(file) {
+	try { return realpathSync.native(file); } catch { return file; }
+}
+
+// Vite's raw/transform middleware can serve generated server files directly.
+// Deny them before those middleware run, including absolute /@fs requests.
+export function protectEnvironmentFiles({ root, kitOut, output, base = '/', token }) {
+	const files = [
+		resolve(root, '.svelte-kit/skgo-env-values.js'),
+		resolve(root, '.svelte-kit/skgo-env-runtime.json'),
+		resolve(root, kitOut, 'generated/build/env/config.js'),
+		resolve(root, kitOut, 'generated/dev/env/config.js'),
+		resolve(root, output, 'env.json')
+	].map(canonical);
+	const directories = [
+		resolve(root, kitOut, 'output/server'),
+		resolve(root, kitOut, 'generated/build/env/private'),
+		resolve(root, kitOut, 'generated/dev/env/private'),
+		resolve(root, output, 'ssr')
+	].map(canonical);
+	return (req, res, next) => {
+		let path;
+		try { path = decodeURIComponent((req.url || '').split('?')[0]); }
+		catch { res.statusCode = 400; res.end('Bad request'); return; }
+		if (base !== '/' && path.startsWith(base)) path = '/' + path.slice(base.length);
+		if (token && /^\/__skgo_dev\/(?:module|styles)(?:\/|$)/.test(path) && req.headers['x-skgo-dev-token'] !== token) {
+			res.statusCode = 403; res.end('Forbidden'); return;
+		}
+		let file;
+		if (path.startsWith('/@id/')) {
+			const id = path.slice(5).replace('__x00__', '\0');
+			if (id === '$app/env/private' || id === '#app/env/private' || /<sveltekit:generated>\/env\/(?:config\.js|private(?:\/|$))/.test(id)) {
+				res.statusCode = 403; res.end('Forbidden'); return;
+			}
+			file = resolve(id);
+		} else {
+			file = path.startsWith('/@fs/') ? resolve(path.slice(4)) : resolve(root, '.' + path);
+		}
+		file = canonical(file);
+		if (files.includes(file) || directories.some(dir => file === dir || file.startsWith(dir + '/'))) {
+			res.statusCode = 403; res.end('Forbidden'); return;
+		}
+		next();
+	};
+}

package/skgo-adapter/env.js

@@ -25,7 +25,10 @@
  */
 
 import { createRequire } from 'node:module';
-import { existsSync, readdirSync, readFileSync, realpathSync, rmSync, statSync } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { randomBytes } from 'node:crypto';
+import { protectEnvironmentFiles } from './env-private.js';
+import { existsSync, readdirSync, readFileSync, realpathSync, rmSync, statSync, mkdirSync, writeFileSync, chmodSync } from 'node:fs';
 import { dirname, isAbsolute, join, relative, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
@@ -64,7 +67,7 @@ const { transformSync } = await fromApp('vite/rolldown/experimental');
 // `fetchModule` operates on the app's own `DevEnvironment`, so it has to be
 // the app's copy for the same reason rolldown is: a second module realm's
 // vite does not recognise this one's environments.
-const { fetchModule, isCSSRequest } = await fromApp('vite');
+const { fetchModule, isCSSRequest, loadEnv } = await fromApp('vite');
 
 // These are the same two Kit functions its own dev server calls in
 // `update_manifest`: one derives the route/node graph from the authored tree,
@@ -324,6 +327,11 @@ export function gojaEnvironment() {
 		load: {
 			order: 'pre',
 			handler(id) {
+				if (/\/\.svelte-kit\/skgo-env-(?:values\.js|runtime\.json)(?:\?|$)/.test(id)) {
+					throw new Error('skgo: environment build inputs are private');
+				}
+				const environment = goEnvironmentModule(id);
+				if (environment !== null) return environment;
 				if (!id.startsWith(PREFIX)) return null;
 				const make = sources[id.slice(PREFIX.length)];
 				if (!make) throw new Error('skgo: no virtual module ' + id.slice(PREFIX.length));
@@ -926,6 +934,11 @@ export function gojaDevEnvironment({ outDir = '.svelte-kit' } = {}) {
 		load: {
 			order: 'pre',
 			handler(id) {
+				if (/\/\.svelte-kit\/skgo-env-(?:values\.js|runtime\.json)(?:\?|$)/.test(id)) {
+					throw new Error('skgo: environment build inputs are private');
+				}
+				const environment = goEnvironmentModule(id);
+				if (environment !== null) return environment;
 				if (!id.startsWith(PREFIX)) return null;
 				const make = sources[id.slice(PREFIX.length)];
 				if (!make) throw new Error('skgo: no virtual module ' + id.slice(PREFIX.length));
@@ -1056,3 +1069,75 @@ function errorText(e) {
 	if (e instanceof Error) return e.stack ?? e.message;
 	return String(e);
 }
+
+
+// Values are validated by Go once before Kit loads its environment declaration.
+// This must be a real file: Kit imports env.ts in a separate Vite server with
+// configFile:false, where this adapter's virtual modules do not exist.
+export function goEnvironmentValues(output = 'build') {
+	let token = '';
+	let kitOut = '.svelte-kit';
+	let fields = [];
+	let values = {};
+	return {
+		plugin: {
+			name: 'skgo-environment-values',
+			configureServer(server) {
+				// A server-only build input can contain private values. Vite's
+				// filesystem endpoint must not make it downloadable in development.
+				server.middlewares.use(protectEnvironmentFiles({
+					root: server.config.root, kitOut, output, base: server.config.base, token
+				}));
+			},
+			configResolved(config) {
+				const schema = join(config.root, 'skgo.env.json');
+				if (!existsSync(schema)) return;
+				fields = JSON.parse(readFileSync(schema, 'utf8')).fields;
+				const setup = config.plugins.find((p) => p.name === 'vite-plugin-sveltekit-setup');
+				const kit = setup?.api?.options;
+				if (!kit) throw new Error('skgo: Kit environment configuration is unavailable');
+				kitOut = kit.outDir;
+				const raw = loadEnv(config.mode, resolve(config.root, kit.env.dir), '');
+				// Pass only declared values; diagnostics never echo the full process env.
+				const input = Object.fromEntries(fields.filter((f) => f.name in raw).map((f) => [f.name, raw[f.name]]));
+				try {
+					values = JSON.parse(execFileSync('go', ['tool', 'skgo', 'env', '--schema', schema], {
+						cwd: config.root, input: JSON.stringify(input), encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe']
+					}));
+				} catch (error) {
+					throw new Error('skgo: Go environment validation failed\n' + String(error.stderr || error.message));
+				}
+				const file = join(config.root, '.svelte-kit/skgo-env-values.js');
+				mkdirSync(dirname(file), { recursive: true });
+				writeFileSync(file, 'export const values = ' + JSON.stringify(values) + ';\n', { mode: 0o600 });
+				chmodSync(file, 0o600);
+
+				if (config.command === 'serve') {
+					token = randomBytes(32).toString('hex');
+					const artifact = { token, fields, static: Object.fromEntries(fields.filter((f) => f.static && f.name in values).map((f) => [f.name, values[f.name]])), values: input };
+					const runtimeFile = join(config.root, '.svelte-kit/skgo-env-runtime.json');
+					writeFileSync(runtimeFile, JSON.stringify(artifact), { mode: 0o600 });
+					chmodSync(runtimeFile, 0o600);
+				}
+			},
+		},
+		artifact() {
+			return { fields, static: Object.fromEntries(fields.filter((f) => f.static && f.name in values).map((f) => [f.name, values[f.name]])) };
+		}
+	};
+}
+
+// Kit's public/private modules snapshot these properties during evaluation.
+// Go installs the snapshot before loading any application module. In particular,
+// importing Kit's original config here would re-run JavaScript validators and
+// bake the development/build environment into newly-created renderer runtimes.
+function goEnvironmentModule(id) {
+	if (!existsSync(join(process.cwd(), 'skgo.env.json'))) return null;
+	if (!/\/generated\/(?:build|dev)\/env\/config\.js$/.test(id.replaceAll('\\', '/'))) return null;
+	return `const snapshot = globalThis.__skgo_environment || {};
+export const dynamic_private_env = snapshot.private || {};
+export const explicit_public_env = snapshot.public || {};
+export const rendered_env = snapshot.dynamicPublic || {};
+export const variables = {};
+export function set_env() {}`;
+}

package/skgo-adapter.js

@@ -10,7 +10,7 @@ import {
 } from 'node:fs';
 import { basename, dirname, join, relative, resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { gojaDevEnvironment, gojaEnvironment, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
+import { gojaDevEnvironment, gojaEnvironment, goEnvironmentValues, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
 import { identity } from './skgo-adapter/identity.js';
 import { checkEndpoints, validateGenerated } from './skgo-adapter/generated.js';
 
@@ -56,6 +56,7 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 	// runs, so the plugin that declares the environment has to exist here; the
 	// build itself waits until adapt() knows the node table.
 	const goja = gojaEnvironment();
+	const environment = goEnvironmentValues(out);
 
 	return {
 		name: 'skgo',
@@ -65,10 +66,11 @@ export default function skgo({ out = 'build', precompress = true } = {}) {
 		// compiles the SSR bundle in is also declared in `vite dev`, where Go
 		// pulls one transformed module at a time out of it instead. Each plugin
 		// states its own `apply`, so only one of them is ever live.
-		vite: { plugins: { post: [goja.plugin, gojaDevEnvironment()] } },
+		vite: { plugins: { post: [environment.plugin, goja.plugin, gojaDevEnvironment()] } },
 		async adapt(builder) {
 			rmSync(out, { force: true, recursive: true });
 
+			write(`${out}/env.json`, JSON.stringify(environment.artifact()));
 			const generated = readGenerated();
 			const { manifest: kit, source } = await readKitManifest(builder);
 			const hashes = checkRemoteHashes(kit, generated.remotes);