@sap/cds 9.8.2 → 9.8.3

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 9.8.3 - 2026-03-12
+
+### Fixed
+
+- OData batch parallel processing: Drain remaining queue when aborting
+
 ## Version 9.8.2 - 2026-03-10
 
 ### Fixed

package/lib/srv/protocols/hcql.js

@@ -47,7 +47,7 @@ class HCQLAdapter extends require('./http') {
 
     // Error formatting
     router.use ((err, req, res, next) => {
-      err.$response = e => ({ errors: [ { ...e, message: e.message } ] })
+      if (typeof err === 'object') err.$response = e => ({ errors: [ { ...e, message: e.message } ] })
       next(err)
     })
 

package/libx/odata/middleware/batch.js

@@ -487,42 +487,43 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
 
             // ensure all subrequests run in this tx
             // (if first subrequest fails without really opening the tx, the rest are executed in a "dangling tx")
-            return Promise.allSettled(subrequests)
-              .then(ress => {
-                // wait for all previous atomicity groups (ignoring errors via allSettled) for odata v2
-                const prevs = []
-                for (let i = 0; i < agIndex; i++) prevs.push(promises[i])
-                return Promise.allSettled(prevs).then(() => ress)
-              })
-              .then(ress => {
-                const failed = ress.filter(({ status }) => status === 'rejected')
-                if (!failed.length) return
-                // throw first error and call srv.on('error') for the others
-                const first = failed.shift()
-                if (srv.handlers._error?.length)
-                  for (const other of failed)
-                    for (const each of srv.handlers._error) each.handler.call(srv, other.reason, cds.context)
-                throw first.reason
-              })
+            return Promise.allSettled(subrequests).then(ress => {
+              const failed = ress.filter(({ status }) => status === 'rejected')
+              if (!failed.length) return
+              // throw first error and call srv.on('error') for the others
+              const first = failed.shift()
+              if (srv.handlers._error?.length)
+                for (const other of failed)
+                  for (const each of srv.handlers._error) each.handler.call(srv, other.reason, cds.context)
+              throw first.reason
+            })
           })
           .catch(err => {
             responses._has_failure = true
 
             // abort batch on first failure with odata.continue-on-error: false
-            if (!continue_on_error) _continue = false
+            if (!continue_on_error) {
+              _continue = false
+              while (queue.length) queue.shift()()
+            }
 
             if (!responses.some(r => r.status === 'fail')) {
               // here, the commit was rejected even though all requests were successful (e.g., by custom handler or db consistency check)
               _replaceResponsesWithCommitErrors(err, responses, ids)
             }
           })
-          .finally(() => {
+          .finally(async () => {
             // trigger next in queue
             if (queue.length) queue.shift()()
 
             // late error serialization
             if (responses._has_failure) _serializeErrors(responses)
 
+            // wait for all previous atomicity groups (ignoring errors via allSettled) for odata v2
+            const prevs = []
+            for (let i = 0; i < agIndex; i++) prevs.push(promises[i])
+            await Promise.allSettled(prevs)
+
             if (isJson) _writeResponseJson(responses, res)
             else _writeResponseMultipart(responses, res, boundary)
           })
@@ -540,7 +541,7 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
     // trigger first max_parallel in queue
     for (let i = 0; i < max_parallel; i++) if (queue.length) queue.shift()()
 
-    await Promise.all(promises)
+    await Promise.allSettled(promises)
 
     res.write(isJson ? ']}' : `--${boundary}--${CRLF}`)
     res.end()

package/package.json

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