fix(stage-tamagotchi,server-runtime): h3 update breaks websocket functionality

Author: nekomeowww

apps/stage-tamagotchi/package.json

@@ -65,6 +65,7 @@
     "@xsai/utils-chat": "catalog:",
     "animejs": "^4.2.2",
     "colorjs.io": "^0.5.2",
+    "crossws": "^0.4.1",
     "culori": "^4.0.2",
     "date-fns": "^4.1.0",
     "defu": "^6.1.4",
@@ -74,8 +75,8 @@
     "drizzle-orm": "^0.44.7",
     "electron-click-drag-plugin": "^2.0.2",
     "es-toolkit": "^1.41.0",
+    "h3": "2.0.1-rc.5",
     "jszip": "^3.10.1",
-    "listhen": "^1.9.0",
     "localforage": "^1.10.0",
     "mediabunny": "^1.24.2",
     "node-vibrant": "^4.0.3",

apps/stage-tamagotchi/src/main/index.ts

@@ -1,8 +1,6 @@
-import type http from 'node:http'
-
 import type { BrowserWindow } from 'electron'
 
-import { platform } from 'node:process'
+import { env, platform } from 'node:process'
 
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { Format, LogLevel, setGlobalFormat, setGlobalLogLevel, useLogg } from '@guiiai/logg'
@@ -95,15 +93,17 @@ async function setupProjectAIRIServerRuntime() {
   // Start the server-runtime server with WebSocket support
   try {
     // Dynamically import the server-runtime and listhen
-    const [serverRuntimeModule, { listen }] = await Promise.all([
-      import('@proj-airi/server-runtime'),
-      import('listhen'),
-    ])
-
-    const serverInstance = await listen(serverRuntimeModule.app as unknown as http.RequestListener, {
-      port: 6121,
-      hostname: 'localhost',
-      ws: true,
+    const serverRuntime = await import('@proj-airi/server-runtime')
+    const { serve } = await import('h3')
+    const { plugin: ws } = await import('crossws/server')
+
+    const serverInstance = serve(serverRuntime.app, {
+      // TODO: fix types
+      // @ts-expect-error - the .crossws property wasn't extended in types
+      plugins: [ws({ resolve: async req => (await serverRuntime.app.fetch(req)).crossws })],
+      port: env.PORT ? Number(env.PORT) : 6121,
+      hostname: env.SERVER_RUNTIME_HOSTNAME || 'localhost',
+      reusePort: true,
     })
 
     log.log('@proj-airi/server-runtime started on ws://localhost:6121')

packages/server-runtime/package.json

@@ -22,14 +22,15 @@
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "bin": "./dist/bin/run.js",
   "files": [
     "README.md",
     "dist",
     "package.json"
   ],
   "scripts": {
-    "dev": "listhen -w --ws --port 6121 ./src/index.ts",
-    "start": "listhen --ws --port 6121 ./src/index.ts",
+    "dev": "tsx ./src/bin/run.js",
+    "start": "tsx ./src/bin/run.js",
     "build": "tsdown",
     "typecheck": "tsc --noEmit"
   },

packages/server-runtime/src/bin/run.ts

@@ -0,0 +1,15 @@
+#!/usr/bin/env tsx
+
+import { env } from 'node:process'
+
+import { plugin as ws } from 'crossws/server'
+import { serve } from 'h3'
+
+import { app } from '../'
+
+serve(app, {
+  // TODO: fix types
+  // @ts-expect-error - the .crossws property wasn't extended in types
+  plugins: [ws({ resolve: async req => (await app.fetch(req)).crossws })],
+  port: env.PORT ? Number(env.PORT) : 6121,
+})

packages/server-runtime/src/index.ts

@@ -4,14 +4,21 @@ import type { AuthenticatedPeer, Peer } from './types'
 
 import { env } from 'node:process'
 
-import { Format, LogLevel, setGlobalFormat, setGlobalLogLevel, useLogg } from '@guiiai/logg'
+import { availableLogLevelStrings, Format, LogLevel, logLevelStringToLogLevelMap, setGlobalFormat, setGlobalLogLevel, useLogg } from '@guiiai/logg'
 import { defineWebSocketHandler, H3 } from 'h3'
 
 import { WebSocketReadyState } from './types'
 
 setGlobalFormat(Format.Pretty)
 setGlobalLogLevel(LogLevel.Log)
 
+if (env.LOG_LEVEL) {
+  const level = env.LOG_LEVEL as typeof availableLogLevelStrings[number]
+  if (availableLogLevelStrings.includes(level)) {
+    setGlobalLogLevel(logLevelStringToLogLevelMap[level])
+  }
+}
+
 // cache token once
 const AUTH_TOKEN = env.AUTHENTICATION_TOKEN || ''
 
@@ -26,7 +33,7 @@ function send(peer: Peer, event: WebSocketEvent<Record<string, unknown>> | strin
   peer.send(typeof event === 'string' ? event : JSON.stringify(event))
 }
 
-function main(): H3 {
+function setupApp(): H3 {
   const appLogger = useLogg('App').useGlobalConfig()
   const websocketLogger = useLogg('WebSocket').useGlobalConfig()
 
@@ -161,13 +168,19 @@ function main(): H3 {
       }
 
       const payload = JSON.stringify(event)
+      websocketLogger.withFields({ peer: peer.id, event: payload }).debug('broadcasting event to peers')
+
       for (const [id, other] of peers.entries()) {
-        if (id === peer.id)
+        if (id === peer.id) {
+          websocketLogger.withFields({ peer: peer.id, event: payload }).debug('not sending event to self')
           continue
+        }
         if (other.peer.readyState === WebSocketReadyState.OPEN) {
+          websocketLogger.withFields({ fromPeer: peer.id, toPeer: other.peer.id, event: payload }).debug('sending event to peer')
           other.peer.send(payload)
         }
         else {
+          websocketLogger.withFields({ peer: other.peer.id }).debug('removing closed peer')
           peers.delete(id)
           unregisterModulePeer(other)
         }
@@ -189,4 +202,4 @@ function main(): H3 {
   return app
 }
 
-export const app: H3 = main()
+export const app = setupApp() as H3