add ability to restart server from client

jeffanddom · Dec 22, 2020 · d36ad78 · d36ad78
1 parent 5d59a97
commit d36ad78
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 17 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -154,6 +154,10 @@ export class Client {
     this.registerParticleEmitter = this.registerParticleEmitter.bind(this)
   }
 
+  shutdown(): void {
+    this.serverConnection?.close()
+  }
+
   setViewportDimensions(d: vec2): void {
     this.camera2d.setViewportDimensions(d)
     this.renderer3d.setViewportDimensions(d)

diff --git a/src/Server.ts b/src/Server.ts
@@ -29,6 +29,7 @@ export class Server {
   // Common game state
   state: GameState
   nextState: GameState | undefined
+  shuttingDown: boolean
 
   currentLevel: number
 
@@ -51,6 +52,7 @@ export class Server {
 
     this.state = GameState.Connecting
     this.nextState = undefined
+    this.shuttingDown = false
 
     this.currentLevel = 0
 
@@ -66,7 +68,21 @@ export class Server {
     this.simulationDurations = new RunningAverage(3 * 60)
   }
 
+  shutdown(): void {
+    this.shuttingDown = true
+
+    // Terminate all client connections
+    for (const { conn } of this.clients) {
+      conn.close()
+    }
+  }
+
   connectClient(conn: IClientConnection): void {
+    if (this.shuttingDown) {
+      conn.close()
+      return
+    }
+
     if (this.clients.length === this.playerCount) {
       console.log('already reached maximum player count') // TODO: close connection
       return
@@ -84,6 +100,10 @@ export class Server {
   }
 
   update(dt: number): void {
+    if (this.shuttingDown) {
+      return
+    }
+
     const now = time.current()
     this.updateFrameDurations.sample(now - this.lastUpdateAt)
     this.lastUpdateAt = now

diff --git a/src/clientMain.tsx b/src/clientMain.tsx
@@ -8,7 +8,10 @@ import { createServerConnectionWs } from '~/network/ServerConnection'
 
 declare global {
   interface Window {
-    client: Client
+    debug: {
+      client: Client
+      restartServer: () => Promise<void>
+    }
   }
 }
 
@@ -33,15 +36,13 @@ canvas2d.width = window.innerWidth
 canvas2d.height = window.innerHeight
 document.body.appendChild(canvas2d)
 
-const client = new Client({
+let client = new Client({
   canvas3d,
   canvas2d,
   keyboard: new DocumentEventKeyboard(document),
   mouse: new DocumentEventMouse(document),
 })
 
-// Development-related globals
-window.client = client // expose game to console
 clientHotReload.init({ enabled: true })
 
 function syncViewportSize() {
@@ -62,9 +63,46 @@ function clientRenderLoop() {
 clientRenderLoop()
 
 // Connect to server
-const schema = location.protocol === 'https:' ? 'wss' : 'ws'
-createServerConnectionWs(`${schema}://${location.host}/api/connect`).then(
-  (conn) => {
-    client.connectServer(conn)
-  },
-)
+function connectToServer(): Promise<void> {
+  const schema = location.protocol === 'https:' ? 'wss' : 'ws'
+  return createServerConnectionWs(
+    `${schema}://${location.host}/api/connect`,
+  ).then((conn) => client.connectServer(conn))
+}
+
+connectToServer()
+
+function restartServer(): Promise<void> {
+  return fetch(`${location.protocol}//${location.host}/api/restart`).then(
+    () => {
+      client = new Client({
+        canvas3d,
+        canvas2d,
+        keyboard: new DocumentEventKeyboard(document),
+        mouse: new DocumentEventMouse(document),
+      })
+      return connectToServer()
+    },
+  )
+}
+
+// Add a debounced hotkey for restarting the server
+let restartHotkeyTimeout: number | undefined = undefined
+document.addEventListener('keyup', (event) => {
+  if (event.code === 'KeyR' && event.ctrlKey && event.shiftKey) {
+    if (restartHotkeyTimeout !== undefined) {
+      return
+    }
+
+    restartHotkeyTimeout = setTimeout(() => {
+      restartHotkeyTimeout = undefined
+    }, 500)
+    restartServer()
+  }
+})
+
+// Development-related globals
+window.debug = {
+  client,
+  restartServer,
+}
diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts
@@ -9,6 +9,7 @@ import { ServerMessage } from '~/network/ServerMessage'
 export interface IClientConnection {
   send(msg: ServerMessage): void
   consume(): ClientMessage[]
+  close(): void
 }
 
 export class ClientConnectionWs implements IClientConnection {
@@ -34,4 +35,8 @@ export class ClientConnectionWs implements IClientConnection {
     this.received = []
     return msgs
   }
+
+  close(): void {
+    this.socket.close()
+  }
 }
diff --git a/src/network/ServerConnection.ts b/src/network/ServerConnection.ts
@@ -7,6 +7,7 @@ import { ServerMessage } from '~/network/ServerMessage'
 export interface IServerConnection {
   send(msg: ClientMessage): void
   consume(): ServerMessage[]
+  close(): void
 }
 
 export class ServerConnectionWs implements IServerConnection {
@@ -32,6 +33,10 @@ export class ServerConnectionWs implements IServerConnection {
     this.received = []
     return msgs
   }
+
+  close(): void {
+    this.socket.close()
+  }
 }
 
 export function createServerConnectionWs(

diff --git a/src/serverMain.ts b/src/serverMain.ts
@@ -16,7 +16,7 @@ import { Server as GameServer } from '~/Server'
 const playerCount = 1
 const clientBufferSize = 7
 
-const gameServer = new GameServer({
+let gameServer = new GameServer({
   playerCount,
   minFramesBehindClient: clientBufferSize,
 })
@@ -42,6 +42,15 @@ const wsServer = new WebSocket.Server({ noServer: true })
 const apiRouter = new KoaRouter()
 apiRouter
   .get('/buildkey', async (ctx) => (ctx.body = buildkey))
+  .get('/restart', async (ctx) => {
+    console.log('restarting game server')
+    gameServer.shutdown()
+    gameServer = new GameServer({
+      playerCount,
+      minFramesBehindClient: clientBufferSize,
+    })
+    ctx.body = 'ok'
+  })
   .get('/connect', async (ctx) => {
     if (ctx.get('Upgrade') !== 'websocket') {
       ctx.throw(400, 'invalid websocket connection request')
@@ -50,12 +59,7 @@ apiRouter
     ctx.respond = false
 
     const socket = await new Promise((resolve: (ws: WebSocket) => void) => {
-      wsServer.handleUpgrade(
-        ctx.req,
-        ctx.request.socket,
-        Buffer.alloc(0),
-        resolve,
-      )
+      wsServer.handleUpgrade(ctx.req, ctx.req.socket, Buffer.alloc(0), resolve)
     })
 
     console.log(