send final error message on timeout

Author: jgoux

apps/browser-proxy/src/connection-manager.ts

@@ -19,6 +19,11 @@ class ConnectionManager {
     return this.sockets.get(connectionId)
   }
 
+  public getSocketForDatabase(databaseId: DatabaseId) {
+    const connectionId = this.socketsByDatabase.get(databaseId)
+    return connectionId ? this.sockets.get(connectionId) : undefined
+  }
+
   public setSocket(databaseId: DatabaseId, connectionId: ConnectionId, socket: PostgresConnection) {
     this.sockets.set(connectionId, socket)
     this.socketsByDatabase.set(databaseId, connectionId)

apps/browser-proxy/src/tcp-server.ts

@@ -26,13 +26,6 @@ tcpServer.on('connection', async (socket) => {
     connectionId: string
   } | null = null
 
-  // 5 minutes idle timeout for the tcp connection
-  socket.setTimeout(1000 * 60 * 5)
-  socket.on('timeout', () => {
-    debug('tcp connection timeout')
-    socket.end()
-  })
-
   debug('new tcp connection')
 
   const connection = await fromNodeSocket(socket, {
@@ -110,6 +103,21 @@ tcpServer.on('connection', async (socket) => {
     },
   })
 
+  // 5 minutes idle timeout for the tcp connection
+  socket.setTimeout(1000 * 60 * 5)
+  socket.on('timeout', () => {
+    debug('tcp connection timeout')
+    if (connectionState) {
+      const errorMessage = BackendError.create({
+        code: '57P05',
+        message: 'terminating connection due to idle timeout (5 minutes)',
+        severity: 'FATAL',
+      }).flush()
+      connection.streamWriter?.write(errorMessage)
+    }
+    socket.end()
+  })
+
   socket.on('close', () => {
     if (connectionState) {
       connectionManager.deleteSocketForDatabase(connectionState.databaseId)

apps/browser-proxy/src/websocket-server.ts

@@ -8,6 +8,7 @@ import { connectionManager } from './connection-manager.ts'
 import { DatabaseShared, DatabaseUnshared, logEvent } from './telemetry.ts'
 import { parse } from './protocol.ts'
 import { pgDumpMiddleware } from './pg-dump-middleware/pg-dump-middleware.ts'
+import { BackendError } from 'pg-gateway'
 
 const debug = mainDebug.extend('websocket-server')
 
@@ -48,15 +49,6 @@ websocketServer.on('error', (error) => {
 websocketServer.on('connection', async (websocket, request) => {
   debug('websocket connection')
 
-  // 1 hour lifetime for the websocket connection
-  const websocketConnectionTimeout = setTimeout(
-    () => {
-      debug('websocket connection timed out')
-      websocket.close()
-    },
-    1000 * 60 * 60 * 1
-  )
-
   const host = request.headers.host
 
   if (!host) {
@@ -109,6 +101,24 @@ websocketServer.on('connection', async (websocket, request) => {
     }
   })
 
+  // 1 hour lifetime for the websocket connection
+  const websocketConnectionTimeout = setTimeout(
+    () => {
+      debug('websocket connection timed out')
+      const tcpConnection = connectionManager.getSocketForDatabase(databaseId)
+      if (tcpConnection) {
+        const errorMessage = BackendError.create({
+          code: '57P01',
+          message: 'terminating connection due to lifetime timeout (1 hour)',
+          severity: 'FATAL',
+        }).flush()
+        tcpConnection.streamWriter?.write(errorMessage)
+      }
+      websocket.close()
+    },
+    1000 * 60 * 60 * 1
+  )
+
   websocket.on('close', () => {
     clearTimeout(websocketConnectionTimeout)
     connectionManager.deleteWebsocket(databaseId)