svelte-adapter-uws 0.2.6 → 0.2.7

package/README.md

@@ -170,7 +170,10 @@ That's it. This gives you a pub/sub WebSocket server at `/ws` with no authentica
 
 ### Step 2: Add the Vite plugin
 
-This makes WebSockets work during `npm run dev`. Without this, `event.platform` won't have WebSocket methods in dev mode.
+The Vite plugin does two things:
+
+1. **Dev mode** - spins up a WebSocket server so `event.platform` works during `npm run dev`
+2. **Production builds** - runs your `hooks.ws` file through the same Vite pipeline as the rest of your server code, so `$lib`, `$env`, and `$app` imports work correctly
 
 **vite.config.js**
 ```js
@@ -258,6 +261,8 @@ The client store automatically uses `wss://` when the page is served over HTTPS
 
 Development works as expected. The Vite plugin (`svelte-adapter-uws/vite`) spins up a `ws` WebSocket server alongside Vite's dev server, so your client store and `event.platform` work identically to production.
 
+The same plugin also handles production builds - it runs your `hooks.ws` file through the Vite pipeline so that `$lib`, `$env`, and `$app` imports are resolved correctly and shared with the rest of your server code.
+
 **vite.config.js**
 ```js
 import { sveltekit } from '@sveltejs/kit/vite';
@@ -270,8 +275,9 @@ export default {
 
 Without the Vite plugin:
 - HTTP routes work fine
-- `event.platform` is `undefined` - any code calling `platform.publish()` will throw
-- The client store will try to connect to `/ws` and fail silently (auto-reconnect will keep trying)
+- `event.platform` is `undefined` in dev - any code calling `platform.publish()` will throw
+- The client store will try to connect to `/ws` in dev and fail silently (auto-reconnect will keep trying)
+- Production builds will fall back to a limited bundler that only resolves `$lib` (not `$env` or `$app`)
 
 ### `npm run preview` - WebSockets don't work
 
@@ -1193,12 +1199,12 @@ If a worker crashes, it is automatically restarted with exponential backoff. On
 
 ### WebSocket + clustering
 
-`platform.publish()` is automatically relayed across all workers via the primary thread, so subscribers on any worker receive the message. This is built in — no external pub/sub needed.
+`platform.publish()` is automatically relayed across all workers via the primary thread, so subscribers on any worker receive the message. This is built in  - no external pub/sub needed.
 
 Per-worker limitations (acceptable for most apps):
-- `platform.connections` — returns the count for the local worker only
-- `platform.subscribers(topic)` — returns the count for the local worker only
-- `platform.sendTo(filter, ...)` — only reaches connections on the local worker
+- `platform.connections`  - returns the count for the local worker only
+- `platform.subscribers(topic)`  - returns the count for the local worker only
+- `platform.sendTo(filter, ...)`  - only reaches connections on the local worker
 
 ---
 
@@ -1254,7 +1260,7 @@ The two largest WebSocket costs were `JSON.parse()` on every message for the sub
 | Layer | Before | After | How |
 |---|---|---|---|
 | Subscribe/unsubscribe check | ~15% | ~0% | Byte-prefix discriminator: control messages start with `{"ty` (byte[3]=`y`), user envelopes start with `{"to` (byte[3]=`o`). A single byte comparison skips `JSON.parse` for all regular messages -- from 0.39us to 0.001us per message. |
-| Envelope wrapping | ~8% | ~4.5% | String template with `esc()` validation instead of `JSON.stringify` on a wrapper object. Topic and event names are validated with a fast char scan (~10ns) that throws on quotes, backslashes, or control characters — only `data` is stringified. From 0.135us to ~0.085us per publish. |
+| Envelope wrapping | ~8% | ~4.5% | String template with `esc()` validation instead of `JSON.stringify` on a wrapper object. Topic and event names are validated with a fast char scan (~10ns) that throws on quotes, backslashes, or control characters  - only `data` is stringified. From 0.135us to ~0.085us per publish. |
 | Connection tracking | ~2% | ~2% | Unchanged |
 | Origin validation, upgrade headers | ~2% | ~2% | Unchanged |
 

package/files/handler.js

@@ -26,7 +26,7 @@ class PayloadTooLargeError extends Error {
 
 /**
  * Safely quote a string for JSON embedding. Topics and events are
- * developer-defined identifiers — a quote, backslash, or control character
+ * developer-defined identifiers  - a quote, backslash, or control character
  * is always a bug, so we throw instead of silently escaping.
  * @param {string} s
  * @returns {string} JSON-quoted string, e.g. '"todos"'

package/files/index.js

@@ -56,7 +56,7 @@ if (is_primary) {
 				workers.set(worker, msg.descriptor);
 				acceptorApp.addChildAppDescriptor(msg.descriptor);
 				console.log(`Worker thread ${worker.threadId} registered`);
-				// Worker started successfully — reset backoff
+				// Worker started successfully  - reset backoff
 				restart_delay = 0;
 				if (backoff_reset_timer) { clearTimeout(backoff_reset_timer); backoff_reset_timer = null; }
 			} else if (msg.type === 'publish') {
@@ -137,7 +137,7 @@ if (is_primary) {
 		// Single-process mode (no clustering)
 		start(host, parseInt(port, 10));
 	} else {
-		// Worker thread — register with acceptor, don't listen
+		// Worker thread  - register with acceptor, don't listen
 		parentPort.postMessage({ type: 'descriptor', descriptor: getDescriptor() });
 
 		parentPort.on('message', (msg) => {

package/index.js

@@ -72,70 +72,53 @@ export default function (opts = {}) {
 
 			// Write the WebSocket handler module
 			if (websocket) {
-				// Resolve the handler: explicit path > auto-discovered > built-in default
-				let handlerFile = websocket.handler;
-
-				if (!handlerFile) {
-					// Auto-discover src/hooks.ws.{js,ts,mjs}
-					const candidates = ['src/hooks.ws.js', 'src/hooks.ws.ts', 'src/hooks.ws.mjs'];
-					for (const candidate of candidates) {
-						if (existsSync(candidate)) {
-							handlerFile = candidate;
-							break;
+				// If the Vite plugin was used, ws-handler.js is already in the
+				// writeServer output - built through the same Vite pipeline as
+				// hooks.server.ts, with $lib/$env/$app resolved and shared modules.
+				if (existsSync(`${tmp}/ws-handler.js`)) {
+					builder.log.minor('WebSocket handler: built by Vite plugin');
+				} else {
+					// Vite plugin not installed - resolve handler ourselves
+					let handlerFile = websocket.handler;
+
+					if (!handlerFile) {
+						const candidates = ['src/hooks.ws.js', 'src/hooks.ws.ts', 'src/hooks.ws.mjs'];
+						for (const candidate of candidates) {
+							if (existsSync(candidate)) {
+								handlerFile = candidate;
+								break;
+							}
 						}
 					}
-				}
-
-				if (handlerFile) {
-					// Bundle through esbuild to resolve SvelteKit aliases ($lib, $env, $app)
-					// and handle TypeScript. Without this, these imports survive into
-					// the Rollup step which doesn't know about SvelteKit virtual modules.
-					const esbuild = await import('esbuild');
-					const { loadEnv } = await import('vite');
-					const libDir = path.resolve(builder.config.kit.files?.lib || 'src/lib');
-					const publicPrefix = builder.config.kit.env?.publicPrefix ?? 'PUBLIC_';
-					const allEnv = loadEnv('production', process.cwd(), '');
-					const version = builder.config.kit.version?.name ?? '';
 
-					await esbuild.build({
-						entryPoints: [path.resolve(handlerFile)],
-						bundle: true,
-						format: 'esm',
-						platform: 'node',
-						outfile: `${tmp}/ws-handler.js`,
-						alias: { '$lib': libDir },
-						packages: 'external',
-						plugins: [{
-							name: 'sveltekit-virtual-modules',
-							setup(build) {
-								build.onResolve({ filter: /^\$(env|app)\// }, (args) => ({
-									path: args.path,
-									namespace: 'sveltekit'
-								}));
-								build.onLoad({ filter: /.*/, namespace: 'sveltekit' }, (args) => {
-									if (args.path === '$app/environment') {
-										return { contents: `export const dev = false;\nexport const building = false;\nexport const version = ${JSON.stringify(version)};` };
-									}
-									const isPublic = args.path.includes('/public');
-									const isStatic = args.path.includes('/static');
-									const entries = Object.entries(allEnv).filter(([k]) =>
-										(isPublic ? k.startsWith(publicPrefix) : !k.startsWith(publicPrefix))
-										&& /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(k)
-									);
-									if (isStatic) {
-										return { contents: entries.map(([k, v]) => `export const ${k} = ${JSON.stringify(v)};`).join('\n') || 'export {};' };
-									}
-									// dynamic: re-export process.env directly
-									return { contents: 'export const env = process.env;' };
-								});
-							}
-						}]
-					});
-					builder.log.minor(`WebSocket handler: ${handlerFile}`);
-				} else {
-					// No handler found - use built-in default (subscribe/unsubscribe only)
-					writeFileSync(`${tmp}/ws-handler.js`, DEFAULT_WS_HANDLER);
-					builder.log.minor('WebSocket enabled (built-in handler)');
+					if (handlerFile) {
+						// Bundle through esbuild to resolve $lib and handle TypeScript.
+						// This is the fallback path - the Vite plugin approach is preferred
+						// because it shares modules with the server bundle and resolves
+						// all SvelteKit aliases ($env, $app) natively.
+						const esbuild = await import('esbuild');
+						const libDir = path.resolve(builder.config.kit.files?.lib || 'src/lib');
+
+						await esbuild.build({
+							entryPoints: [path.resolve(handlerFile)],
+							bundle: true,
+							format: 'esm',
+							platform: 'node',
+							outfile: `${tmp}/ws-handler.js`,
+							alias: { '$lib': libDir },
+							packages: 'external'
+						});
+						builder.log.minor(`WebSocket handler: ${handlerFile} (esbuild fallback)`);
+						builder.log.warn(
+							'Add the Vite plugin for full SvelteKit alias support in hooks.ws:\n' +
+							"  import uwsDev from 'svelte-adapter-uws/vite';\n" +
+							'  export default { plugins: [sveltekit(), uwsDev()] };'
+						);
+					} else {
+						// No handler found - use built-in default (subscribe/unsubscribe only)
+						writeFileSync(`${tmp}/ws-handler.js`, DEFAULT_WS_HANDLER);
+						builder.log.minor('WebSocket enabled (built-in handler)');
+					}
 				}
 			} else {
 				// No WebSocket - empty module

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-adapter-uws",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "SvelteKit adapter for uWebSockets.js - high-performance C++ HTTP server with built-in WebSocket support",
   "author": "Kevin Radziszewski",
   "license": "MIT",

package/vite.js

@@ -5,7 +5,7 @@ import { parseCookies } from './files/cookies.js';
 
 /**
  * Safely quote a string for JSON embedding. Throws on invalid characters
- * (quotes, backslashes, control chars) — these are always bugs in topic/event names.
+ * (quotes, backslashes, control chars)  - these are always bugs in topic/event names.
  * @param {string} s
  * @returns {string}
  */
@@ -187,8 +187,43 @@ export default function uwsDev(options = {}) {
 		};
 	}
 
+	/**
+	 * Discover the WS handler file path.
+	 * @param {string} root
+	 * @returns {string | null}
+	 */
+	function discoverHandler(root) {
+		if (options.handler) return path.resolve(root, options.handler);
+		const candidates = ['src/hooks.ws.js', 'src/hooks.ws.ts', 'src/hooks.ws.mjs'];
+		for (const candidate of candidates) {
+			const full = path.resolve(root, candidate);
+			if (existsSync(full)) return full;
+		}
+		return null;
+	}
+
 	return {
 		name: 'svelte-adapter-uws',
+		config(config, env) {
+			// During SSR build, inject ws-handler as an additional entry so it
+			// goes through the same Vite pipeline as hooks.server.ts - resolving
+			// $lib, $env, $app aliases and sharing modules with the server bundle.
+			if (env.isSsrBuild) {
+				const root = config.root || process.cwd();
+				const handlerPath = discoverHandler(root);
+				if (handlerPath) {
+					return {
+						build: {
+							rollupOptions: {
+								input: {
+									'ws-handler': handlerPath
+								}
+							}
+						}
+					};
+				}
+			}
+		},
 		configureServer(server) {
 			wss = new WebSocketServer({ noServer: true });
 			const root = server.config.root;