@skgo/sveltekit-adapter 0.28.2 → 0.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@skgo/sveltekit-adapter",
-	"version": "0.28.2",
+	"version": "0.32.0",
 	"description": "SvelteKit adapter for skgo: builds a frontend that a Go binary renders and answers",
 	"keywords": [
 		"adapter",

package/skgo-adapter/env-private.js

@@ -11,6 +11,7 @@ export function protectEnvironmentFiles({ root, kitOut, output, base = '/', toke
 	const files = [
 		resolve(root, '.svelte-kit/skgo-env-values.js'),
 		resolve(root, '.svelte-kit/skgo-env-runtime.json'),
+		resolve(root, '.svelte-kit/skgo-dev-supervisor.json'),
 		resolve(root, kitOut, 'generated/build/env/config.js'),
 		resolve(root, kitOut, 'generated/dev/env/config.js'),
 		resolve(root, output, 'env.json')

package/skgo-adapter/env.js

@@ -29,7 +29,7 @@ import { execFileSync } from 'node:child_process';
 import { createHash, 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 { dirname, isAbsolute, join, posix as posixPath, relative, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
 /**
@@ -1014,8 +1014,8 @@ export function gojaDevEnvironment({ outDir = '.svelte-kit' } = {}) {
  * way. Kit's own dev server has no answer to it: vite turns each report into a
  * hot update or a full page reload, and a reload throws away what a visitor
  * had typed and aborts the documents Go was rendering for them. So the dev
- * server remembers the content it last loaded or was told about, and lets
- * through only the reports whose content differs.
+ * server initializes its baseline from the first load, then advances it when
+ * the watcher reports a change, and lets through reports whose content differs.
  *
  * Content means the file's bytes, not the text vite decoded from them: two
  * different invalid byte sequences decode to the same replacement characters,
@@ -1040,7 +1040,7 @@ export function gojaDevEnvironment({ outDir = '.svelte-kit' } = {}) {
  * @returns {import('vite').Plugin}
  */
 export function gojaDevUnchangedFiles({ out = 'build' } = {}) {
-	/** What vite last loaded for a file, or last reported changed: its byte digest. */
+	/** The initial load or last delivered watcher content: its byte digest. */
 	const known = new Map();
 	const digest = (/** @type {Uint8Array} */ bytes) => createHash('sha256').update(bytes).digest('base64');
 	const read = (/** @type {string} */ file) => {
@@ -1050,8 +1050,12 @@ export function gojaDevUnchangedFiles({ out = 'build' } = {}) {
 			return null;
 		}
 	};
-	/** Remember a file by the bytes vite decoded `code` from, if they are the ones on disk now. */
+	/** Initialize a file from the bytes vite decoded, without consuming pending watcher changes. */
 	const remember = (/** @type {string} */ file, /** @type {string} */ code) => {
+		// A module request can transform new bytes while awaitWriteFinish is
+		// still settling their event. Only watcher delivery advances this baseline
+		// after initialization, or that real change would be suppressed.
+		if (known.has(posix(file))) return;
 		try {
 			const bytes = readFileSync(file);
 			if (bytes.toString('utf8') === code) known.set(posix(file), digest(bytes));
@@ -1264,6 +1268,55 @@ function errorText(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.
+// The Go supervisor publishes readiness through Vite's existing HMR protocol.
+// This is adapter glue: the browser keeps using Vite's own client and overlay.
+export function goSupervisorReload() {
+	return {
+		name: 'skgo-supervisor-reload',
+		configureServer(server) {
+			const token = randomBytes(32).toString('hex');
+			const file = join(server.config.root, '.svelte-kit/skgo-dev-supervisor.json');
+			// Vite's client imports @vite/env. Import analysis rewrites that to
+			// its installed env.mjs, either under root or through /@fs/. Publish
+			// only this exact bootstrap dependency, never an application prefix.
+			const envFile = app.resolve('vite/dist/client/env.mjs').replaceAll('\\', '/');
+			const root = server.config.root.replaceAll('\\', '/').replace(/\/$/, '');
+			const envURL = envFile.startsWith(root + '/') ? envFile.slice(root.length) : posixPath.join('/@fs/', envFile);
+			const clientFiles = [server.config.base.replace(/\/$/, '') + envURL];
+			mkdirSync(dirname(file), { recursive: true });
+			writeFileSync(file, JSON.stringify({ token, base: server.config.base, clientFiles }), { mode: 0o600 });
+			chmodSync(file, 0o600);
+			let failure;
+			server.ws.on('vite:client:connect', (_, client) => {
+				if (failure) client.send(failure);
+			});
+			server.middlewares.use((req, res, next) => {
+				if ((req.url || '').split('?')[0] !== '/__skgo_dev/supervisor') return next();
+				if (req.method !== 'POST' || req.headers['x-skgo-dev-token'] !== token) {
+					res.statusCode = 403; res.end('Forbidden'); return;
+				}
+				let body = '', size = 0;
+				req.setEncoding('utf8');
+				req.on('data', chunk => {
+					size += Buffer.byteLength(chunk);
+					if (size <= 1048576) body += chunk;
+				});
+				req.on('end', () => {
+					let message;
+					try { message = JSON.parse(body); } catch {}
+					if (size > 1048576 || !message || typeof message.diagnostic !== 'string') {
+						res.statusCode = 400; res.end('Invalid supervisor status'); return;
+					}
+					failure = message.diagnostic ? { type: 'error', err: { message: message.diagnostic, stack: '', plugin: 'skgo' } } : undefined;
+					// Kit also omits path for full-reload: app.html is not the page URL.
+					server.ws.send(failure || { type: 'full-reload' });
+					res.statusCode = 204; res.end();
+				});
+			});
+		}
+	};
+}
+
 export function goEnvironmentValues(output = 'build') {
 	let token = '';
 	let kitOut = '.svelte-kit';

package/skgo-adapter.js

@@ -21,7 +21,7 @@ import {
  remoteEndpoint,
 	remoteLoad
 } from './skgo-adapter/prerender.js';
-import { gojaDevEnvironment, gojaDevUnchangedFiles, gojaEnvironment, goEnvironmentValues, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
+import { gojaDevEnvironment, gojaDevUnchangedFiles, gojaEnvironment, goEnvironmentValues, goSupervisorReload, nodeTable, SSR_TARGET } from './skgo-adapter/env.js';
 import { prerenderModules } from './skgo-adapter/prerender-modules.js';
 import { identity } from './skgo-adapter/identity.js';
 import { checkEndpoints, validateGenerated } from './skgo-adapter/generated.js';
@@ -116,7 +116,7 @@ export default function skgo({ out = 'build', precompress = true, prerenderPacka
 		// 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: { pre: [prerenderOwnerPlugin, prerenderModules()], post: [environment.plugin, goja.plugin, gojaDevEnvironment(), gojaDevUnchangedFiles({ out })] } },
+		vite: { plugins: { pre: [prerenderOwnerPlugin, prerenderModules()], post: [environment.plugin, goSupervisorReload(), goja.plugin, gojaDevEnvironment(), gojaDevUnchangedFiles({ out })] } },
 		async adapt(builder) {
 			let failure;
 			try {