@sap/cds 8.9.7 → 8.9.8

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 8.9.8 - 2025-12-17
+
+### Fixed
+
+- `enterprise-messaging-shared`: preserve error listener during reconnect
+
 ## Version 8.9.7 - 2025-11-07
 
 ### Fixed

package/libx/_runtime/messaging/common-utils/connections.js

@@ -1,64 +1,66 @@
 const waitingTime = require('../../common/utils/waitingTime')
 
-const _connectUntilConnected = (client, LOG, x) => {
-  const _waitingTime = waitingTime(x)
-  setTimeout(() => {
-    connect(client, LOG, true)
-      .then(() => {
-        LOG._warn && LOG.warn('Reconnected to Enterprise Messaging Client')
-      })
-      .catch(() => {
-        LOG._warn &&
-          LOG.warn(
-            `Connection to Enterprise Messaging Client lost: Reconnecting in ${Math.round(_waitingTime / 1000)} s`
-          )
-        _connectUntilConnected(client, LOG, x + 1)
-      })
-  }, _waitingTime)
+const _rmHandlers = client => {
+  client.removeAllListeners('connected')
+  client.removeAllListeners('error')
+  client.removeAllListeners('disconnected')
 }
 
 const connect = (client, LOG, keepAlive) => {
   return new Promise((resolve, reject) => {
+    _rmHandlers(client)
+
     client
       .once('connected', function () {
-        client.removeAllListeners('error')
+        _rmHandlers(client)
 
-        client.once('error', err => {
-          if (LOG._error) {
-            err.message = 'Client error: ' + err.message
-            LOG.error(err)
-          }
-          if (keepAlive) {
-            client.removeAllListeners('error')
-            client.removeAllListeners('connected')
-            _connectUntilConnected(client, LOG, 0)
-          }
-        })
+        // It's important to _always_ keep an error listener,
+        // otherwise it will throw and crash the server
+        client.on('error', err => LOG(err?.message))
 
         if (keepAlive) {
-          client.once('disconnected', () => {
-            client.removeAllListeners('error')
-            client.removeAllListeners('connected')
-            _connectUntilConnected(client, LOG, 0)
+          client.on('disconnected', () => {
+            let connected = false
+            client.once('connected', () => {
+              LOG('Reconnected')
+              connected = true
+            })
+            let x = 1
+            const _untilConnected = async () => {
+              if (!connected) {
+                LOG('Reconnecting')
+                try {
+                  client.connect()
+                } catch {
+                  // we try again...
+                }
+                setTimeout(_untilConnected, waitingTime(x++))
+              }
+            }
+            _untilConnected()
           })
         }
 
-        resolve(this)
+        resolve(client)
       })
       .once('error', err => {
-        client.removeAllListeners('connected')
-        reject(err)
+        _rmHandlers(client)
+        const e = new Error('Connection error')
+        e.cause = err
+        reject(e)
       })
 
-    client.connect()
+    try {
+      client.connect()
+    } catch (e) {
+      reject(e)
+    }
   })
 }
 
 const disconnect = client => {
   return new Promise((resolve, reject) => {
-    client.removeAllListeners('disconnected')
-    client.removeAllListeners('connected')
-    client.removeAllListeners('error')
+    _rmHandlers(client)
 
     client.once('disconnected', () => {
       client.removeAllListeners('error')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "8.9.7",
+  "version": "8.9.8",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [