taler-typescript-core

commit 5a0502481e477110e18288b04afe32f29d0bef67
parent a84c0f8e8b85036961ee8227c2326bf7afddf85f
Author: Sebastian <sebasjm@taler-systems.com>
Date:   Wed, 22 Jul 2026 14:44:44 -0300

only one server is needed, switch depending on tls flag

Diffstat:
M
packages/web-util/src/serve.ts
 | 
32
++++++++++++--------------------

1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/packages/web-util/src/serve.ts b/packages/web-util/src/serve.ts
@@ -147,16 +147,10 @@ export async function serve(opts: {
   app.use(router);
 
   const nodeListener = toNodeListener(app);
-  const httpServer = http.createServer(nodeListener);
+  const httpServer = opts.tls
+    ? https.createServer(httpServerOptions, nodeListener)
+    : http.createServer(nodeListener);
   const httpPort = opts.port;
-  let httpsServer: typeof httpServer | undefined;
-  let httpsPort: number | undefined;
-  const servers = [httpServer];
-  if (opts.tls) {
-    httpsServer = https.createServer(httpServerOptions, nodeListener);
-    httpsPort = opts.port + 1;
-    servers.push(httpsServer);
-  }
 
   logger.info(`Dev server. Endpoints:`);
   logger.info(`  ${PATHS.APP}: where root application can be tested`);
@@ -169,17 +163,15 @@ export async function serve(opts: {
     ws.send("welcome");
   });
 
-  servers.forEach(function addWSHandler(server) {
-    server.on("upgrade", function upgrade(request, socket, head) {
-      const { pathname } = parse(request.url || "");
-      if (pathname === PATHS.WS) {
-        wss.handleUpgrade(request, socket, head, function done(ws) {
-          wss.emit("connection", ws, request);
-        });
-      } else {
-        socket.destroy();
-      }
-    });
+  httpServer.on("upgrade", function upgrade(request, socket, head) {
+    const { pathname } = parse(request.url || "");
+    if (pathname === PATHS.WS) {
+      wss.handleUpgrade(request, socket, head, function done(ws) {
+        wss.emit("connection", ws, request);
+      });
+    } else {
+      socket.destroy();
+    }
   });
 
   const sendToAllClients = function (data: {