Merge branch 'swap-to-handler' of https://github.com/LukeHagar/sveltekit-adapters into swap-to-handler

examples/electron/src/main.ts

@@ -34,9 +34,7 @@ async function createWindow() {
 		stopIntercept?.();
 	});
 
-	await app.whenReady();
-
-	// Third setup the handler
+	// Setup the handler
 	stopIntercept = await setupHandler(mainWindow);
 
 	return mainWindow;
@@ -52,6 +50,11 @@ app.on('window-all-closed', () => {
 
 app.on('activate', async () => {
 	if (BrowserWindow.getAllWindows().length === 0 && !mainWindow) {
-		await createWindow();
+		try {
+			await createWindow();
+		} catch (error) {
+			console.error('Failed to create window:', error);
+		}
 	}
 });
+});

examples/electron/src/routes/sverdle/+page.server.ts

@@ -30,7 +30,14 @@ export const load = (({ cookies }) => {
 
 		return gameState
 	} catch (e) {
-		console.log("Error getting cookie", e);
+		console.error("Error loading game state:", e);
+		// Return a new game state as fallback
+		const newGame = new Game();
+		return {
+			guesses: newGame.guesses,
+			answers: newGame.answers,
+			answer: null
+		};
 	}
 }) satisfies PageServerLoad;
 

packages/adapter-electron/functions/setupHandler.js

@@ -11,9 +11,9 @@ import { serialize as serializeCookie } from 'cookie';
 let server;
 let clientDir;
 let prerenderedDir;
-let Protocol = 'http';
-let Host = '127.0.0.1';
-let Origin = `${Protocol}://${Host}`;
+const Protocol = 'http';
+const Host = '127.0.0.1';
+const Origin = `${Protocol}://${Host}`;
 
 /**
  * Reports errors to the user in a way that can be filed on GitHub
@@ -285,7 +285,7 @@ export async function setupHandler(mainWindow) {
   await mainWindow.loadURL(url);
 
   return function stopIntercept() {
-    protocol.unhandle('http');
+    protocol.unhandle(Protocol);
   };
 }