svelte-adapter-uws 0.1.3 → 0.1.4

package/README.md

@@ -345,6 +345,9 @@ adapter({
     // Automatically send pings to keep the connection alive
     sendPingsAutomatically: true, // default: true
 
+    // Seconds before an async upgrade handler is rejected with 504
+    upgradeTimeout: 10, // default: 10
+
     // Allowed origins for WebSocket connections
     // 'same-origin' - only accept where Origin matches Host (default)
     // '*' - accept from any origin
@@ -836,18 +839,18 @@ The main function most users need. Returns a Svelte readable store that updates
 
 ### `on(topic, event)` - subscribe to a specific event
 
-Filters to a single event name and returns just the `data` payload (no envelope):
+Filters to a single event name and wraps the payload in `{ data }`:
 
 ```svelte
 <script>
   import { on } from 'svelte-adapter-uws/client';
 
-  // Only 'created' events, gives you just the data
+  // Only 'created' events, wrapped in { data }
   const newTodo = on('todos', 'created');
 </script>
 
 {#if $newTodo}
-  <p>New todo: {$newTodo.text}</p>
+  <p>New todo: {$newTodo.data.text}</p>
 {/if}
 ```
 
@@ -1463,9 +1466,9 @@ The client store parses this automatically. When you use `on('todos')`, the stor
 { topic: 'todos', event: 'created', data: { id: 1, text: 'Buy milk', done: false } }
 ```
 
-When you use `on('todos', 'created')`, you get just the `data`:
+When you use `on('todos', 'created')`, you get the payload wrapped in `{ data }`:
 ```js
-{ id: 1, text: 'Buy milk', done: false }
+{ data: { id: 1, text: 'Buy milk', done: false } }
 ```
 
 ### "WebSocket works locally but not behind nginx/Caddy"

package/client.d.ts

@@ -101,7 +101,7 @@ export interface TopicStore<T> extends Readable<T | null> {
  * {/if}
  * ```
  *
- * @example Event-level (filtered, data-only):
+ * @example Event-level (filtered, wrapped in `{ data }`):
  * ```svelte
  * <script>
  *   import { on } from 'svelte-adapter-uws/client';
@@ -109,7 +109,7 @@ export interface TopicStore<T> extends Readable<T | null> {
  * </script>
  *
  * {#if $newTodo}
- *   <p>New: {$newTodo.text}</p>
+ *   <p>New: {$newTodo.data.text}</p>
  * {/if}
  * ```
  *
@@ -126,7 +126,7 @@ export interface TopicStore<T> extends Readable<T | null> {
  * ```
  */
 export function on<T = unknown>(topic: string): TopicStore<WSEvent<T>>;
-export function on<T = unknown>(topic: string, event: string): TopicStore<T>;
+export function on<T = unknown>(topic: string, event: string): TopicStore<{ data: T }>;
 
 /**
  * Readable store - connection status: `'connecting'` | `'open'` | `'closed'`.
@@ -279,7 +279,7 @@ export function count(topic: string, initial?: number): Readable<number>;
  * ```
  */
 export function once<T = unknown>(topic: string, options?: { timeout?: number }): Promise<WSEvent<T>>;
-export function once<T = unknown>(topic: string, event: string, options?: { timeout?: number }): Promise<T>;
+export function once<T = unknown>(topic: string, event: string, options?: { timeout?: number }): Promise<{ data: T }>;
 
 /**
  * Returns a promise that resolves when the WebSocket connection is open.

package/client.js

@@ -309,9 +309,9 @@ function createConnection(options) {
 					const tStore = topicStores.get(msg.topic);
 					if (tStore) tStore.set(wsEvent);
 
-					// Update topic+event filtered stores (data only)
+					// Update topic+event filtered stores (wrapped for unique reference)
 					const eStore = eventStores.get(`${msg.topic}\0${msg.event}`);
-					if (eStore) eStore.set(msg.data);
+					if (eStore) eStore.set({ data: msg.data });
 				}
 			} catch {
 				// Not a valid envelope - ignore

package/files/handler.js

@@ -326,8 +326,9 @@ function readBody(res, limit, signal) {
  * @param {StaticEntry} entry
  * @param {string} acceptEncoding
  * @param {string} ifNoneMatch
+ * @param {boolean} headOnly
  */
-function serveStatic(res, entry, acceptEncoding, ifNoneMatch) {
+function serveStatic(res, entry, acceptEncoding, ifNoneMatch, headOnly = false) {
 	if (entry.etag && ifNoneMatch === entry.etag) {
 		res.cork(() => {
 			res.writeStatus('304 Not Modified').end();
@@ -356,7 +357,11 @@ function serveStatic(res, entry, acceptEncoding, ifNoneMatch) {
 		for (let i = 0; i < entry.headers.length; i++) {
 			res.writeHeader(entry.headers[i][0], entry.headers[i][1]);
 		}
-		res.end(body);
+		if (headOnly) {
+			res.endWithoutBody();
+		} else {
+			res.end(body);
+		}
 	});
 }
 
@@ -626,7 +631,8 @@ function handleRequest(res, req) {
 		return serveStatic(
 			res, staticFile,
 			req.getHeader('accept-encoding'),
-			req.getHeader('if-none-match')
+			req.getHeader('if-none-match'),
+			method === 'head'
 		);
 	}
 
@@ -746,9 +752,23 @@ if (WS_ENABLED) {
 
 			const cookies = parseCookies(headers['cookie']);
 
+			const upgradeTimeoutMs = (wsOptions.upgradeTimeout || 10) * 1000;
+			let timedOut = false;
+			const timer = setTimeout(() => {
+				timedOut = true;
+				if (!aborted) {
+					res.cork(() => {
+						res.writeStatus('504 Gateway Timeout');
+						res.writeHeader('content-type', 'text/plain');
+						res.end('Upgrade timed out');
+					});
+				}
+			}, upgradeTimeoutMs);
+
 			Promise.resolve(wsModule.upgrade({ headers, cookies, url, remoteAddress }))
 				.then((userData) => {
-					if (aborted) return;
+					clearTimeout(timer);
+					if (aborted || timedOut) return;
 					if (userData === false) {
 						res.cork(() => {
 							res.writeStatus('401 Unauthorized');
@@ -768,8 +788,9 @@ if (WS_ENABLED) {
 					});
 				})
 				.catch((err) => {
+					clearTimeout(timer);
 					console.error('WebSocket upgrade error:', err);
-					if (!aborted) {
+					if (!aborted && !timedOut) {
 						res.cork(() => {
 							res.writeStatus('500 Internal Server Error');
 							res.writeHeader('content-type', 'text/plain');

package/index.d.ts

@@ -133,6 +133,14 @@ export interface WebSocketOptions {
 	 */
 	sendPingsAutomatically?: boolean;
 
+	/**
+	 * Timeout in seconds for async `upgrade` handlers.
+	 * If the upgrade hook doesn't resolve within this time, the connection
+	 * is rejected with 504 Gateway Timeout.
+	 * @default 10
+	 */
+	upgradeTimeout?: number;
+
 	/**
 	 * Allowed origins for WebSocket connections.
 	 *

package/index.js

@@ -158,7 +158,8 @@ export default function (opts = {}) {
 				maxBackpressure: websocket?.maxBackpressure ?? 1024 * 1024,
 				sendPingsAutomatically: websocket?.sendPingsAutomatically ?? true,
 				compression: websocket?.compression ?? false,
-				allowedOrigins: websocket?.allowedOrigins ?? 'same-origin'
+				allowedOrigins: websocket?.allowedOrigins ?? 'same-origin',
+				upgradeTimeout: websocket?.upgradeTimeout ?? 10
 			};
 
 			builder.copy(files, out, {

package/package.json

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

package/vite.js

@@ -1,5 +1,6 @@
 import { WebSocketServer } from 'ws';
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { parseCookies } from './files/cookies.js';
 
 /**
@@ -164,7 +165,7 @@ export default function uwsDev(options = {}) {
 				: null;
 
 			if (handlerPath) {
-				handlerReady = import(handlerPath).then((mod) => {
+				handlerReady = import(pathToFileURL(handlerPath).href).then((mod) => {
 					userHandlers = {
 						upgrade: mod.upgrade,
 						open: mod.open,
@@ -182,7 +183,7 @@ export default function uwsDev(options = {}) {
 				handlerReady = (async () => {
 					for (const candidate of candidates) {
 						try {
-							const mod = await import(path.resolve(root, candidate));
+							const mod = await import(pathToFileURL(path.resolve(root, candidate)).href);
 							userHandlers = {
 								upgrade: mod.upgrade,
 								open: mod.open,