respond to adapter webserver upgrade message and optimize downtime (#2399)

* respoond to webserver upgrade message

* unlike controller ws, this is not a separate process, thus do not call process exit

* destroy all sockets, to prevent server beeing kept alive from new requests

* typo

Author: foxriver76

packages/controller/src/lib/adapterUpgradeManager.ts

@@ -7,6 +7,8 @@ import { setTimeout as wait } from 'timers/promises';
 import type { Logger } from 'winston';
 import { Upgrade } from '@iobroker/js-controller-cli';
 import type { ProcessExitCallback } from '@iobroker/js-controller-cli/build/lib/_Types';
+import type { Socket } from 'node:net';
+import type { Duplex } from 'node:stream';
 
 interface Certificates {
     /** Public certificate */
@@ -80,6 +82,8 @@ export class AdapterUpgradeManager {
 
     /** The server used for communicating upgrade status */
     private server?: https.Server | http.Server;
+    /** All socket connections of the webserver */
+    private sockets = new Set<Socket | Duplex>();
     /** Name of the host for logging purposes */
     private readonly hostname = tools.getHostName();
     /** The objects DB client */
@@ -202,15 +206,27 @@ export class AdapterUpgradeManager {
         }
 
         if (!this.server) {
-            process.exit();
+            return;
         }
 
+        this.destroySockets();
+
         this.server.close(async () => {
             await this.startAdapter();
             this.log('Successfully started adapter');
         });
     }
 
+    /**
+     * Destroy all sockets, to prevent requests from keeping server alive
+     */
+    destroySockets(): void {
+        for (const socket of this.sockets) {
+            socket.destroy();
+            this.sockets.delete(socket);
+        }
+    }
+
     /**
      * This function is called when the webserver receives a message
      *
@@ -276,6 +292,8 @@ export class AdapterUpgradeManager {
             this.webServerCallback(req, res);
         });
 
+        this.monitorSockets(this.server);
+
         this.server.listen(port, () => {
             this.log(`Server is running on http://localhost:${port}`);
         });
@@ -295,11 +313,28 @@ export class AdapterUpgradeManager {
             this.webServerCallback(req, res);
         });
 
+        this.monitorSockets(this.server);
+
         this.server.listen(port, () => {
             this.log(`Server is running on http://localhost:${port}`);
         });
     }
 
+    /**
+     * Keep track of all existing sockets
+     *
+     * @param server the webserver
+     */
+    monitorSockets(server: http.Server | https.Server): void {
+        server.on('connection', socket => {
+            this.sockets.add(socket);
+
+            server.once('close', () => {
+                this.sockets.delete(socket);
+            });
+        });
+    }
+
     /**
      * Get certificates from the DB
      *

packages/controller/src/lib/upgradeManager.ts

@@ -8,6 +8,8 @@ import type { Client as ObjectsClient } from '@iobroker/db-objects-redis';
 import { setTimeout as wait } from 'timers/promises';
 import type { Logger } from 'winston';
 import fs from 'fs-extra';
+import type { Socket } from 'node:net';
+import type { Duplex } from 'node:stream';
 
 export interface UpgradeArguments {
     /** Version of controller to upgrade too */
@@ -73,6 +75,8 @@ class UpgradeManager {
 
     /** The server used for communicating upgrade status */
     private server?: https.Server | http.Server;
+    /** All socket connections of the webserver */
+    private sockets = new Set<Socket | Duplex>();
     /** Name of the host for logging purposes */
     private readonly hostname = tools.getHostName();
 
@@ -206,6 +210,8 @@ class UpgradeManager {
             process.exit();
         }
 
+        this.destroySockets();
+
         this.server.close(async () => {
             await this.startController();
             this.log('Successfully started js-controller');
@@ -214,6 +220,16 @@ class UpgradeManager {
         });
     }
 
+    /**
+     * Destroy all sockets, to prevent requests from keeping server alive
+     */
+    destroySockets(): void {
+        for (const socket of this.sockets) {
+            socket.destroy();
+            this.sockets.delete(socket);
+        }
+    }
+
     /**
      * This function is called when the webserver receives a message
      *
@@ -245,6 +261,8 @@ class UpgradeManager {
             this.webServerCallback(req, res);
         });
 
+        this.monitorSockets(this.server);
+
         this.server.listen(port, () => {
             this.log(`Server is running on http://localhost:${port}`);
         });
@@ -262,11 +280,28 @@ class UpgradeManager {
             this.webServerCallback(req, res);
         });
 
+        this.monitorSockets(this.server);
+
         this.server.listen(port, () => {
             this.log(`Server is running on https://localhost:${port}`);
         });
     }
 
+    /**
+     * Keep track of all existing sockets
+     *
+     * @param server the webserver
+     */
+    monitorSockets(server: http.Server | https.Server): void {
+        server.on('connection', socket => {
+            this.sockets.add(socket);
+
+            server.once('close', () => {
+                this.sockets.delete(socket);
+            });
+        });
+    }
+
     /**
      * Get certificates from the DB
      *

packages/controller/src/main.ts

@@ -3199,6 +3199,10 @@ async function processMessage(msg: ioBroker.SendableMessage): Promise<null | voi
                 certPublicName
             });
 
+            if (msg.callback) {
+                sendTo(msg.from, msg.command, { result: true }, msg.callback);
+            }
+
             await upgradeManager.stopAdapter();
             await upgradeManager.startWebServer();
             await upgradeManager.performUpgrade();