@sap/cds 6.5.0 → 6.6.0

package/bin/serve.js

@@ -131,14 +131,14 @@ const cds = require('../lib'), { exists, isfile, local, path } = cds.utils
 
 // provisional loggers, see _prepare_logging
 let log = console.log
-let debug = false
 
 
 /**
  * The main function which dispatches into the respective usage variants.
  * @param {string[]} all - project folder, model filenames, or service name
  */
-async function serve (all=[], o={}) { // NOSONAR
+async function serve (all=[], o={}) {
+
   // canonicalize options to ease subsequent tasks...
   cds.options = o
   const [pms] = all // project folder, model filenames, or service name
@@ -200,17 +200,8 @@ async function serve (all=[], o={}) { // NOSONAR
 
     server.listening ? _started(server) : server.once('listening',_started)
     server.on ('error',_reject) // startup errors like EADDRINUSE
-    server.on ('close', ()=> shutdown())  // in case of server.close() was called, like in cds.test
-
-    process.once('SIGTERM', shutdown)
-    process.once('SIGINT', shutdown)
-    process.once('SIGHUP', shutdown)
-    process.once('SIGUSR2', shutdown) // by nodemon
-    process.on('beforeExit', shutdown) //> when event loop empties
-    process.on('message', (msg) => { if (msg.close||msg.exit) shutdown() })  // by `cds watch` on Windows
-
-    return server
-
+    // server.on ('close', _shutdown)  // IMPORTANT: Don't do that as that would be a very strange loop
+    // process.on ('exit', _shutdown)  // IMPORTANT: Don't do that as that would be a very strange loop
     async function _started() {
       _warn_if_cds_was_loaded_from_different_locations()
       const url = cds.server.url = `http://localhost:${server.address().port}`
@@ -218,13 +209,34 @@ async function serve (all=[], o={}) { // NOSONAR
       _resolve (server)
     }
 
-    async function shutdown (sig) {
-      if (shutdown.called) return; else shutdown.called = true // only do that once
-      global.it || cds.watched || console.log()  // blank line makes the ^C look pretty in terminals
-      debug && debug(`${sig}, shutting down, calling ${cds.listeners('shutdown').length} listeners`)
-      await Promise.all(cds.listeners('shutdown').map((fn) => fn()))
-      if (process.env.NODE_ENV !== 'test' && !global.it)  process.exit()
+    cds.shutdown = _shutdown //> for programmatic invocation
+    process.on('unhandledRejection', (_,p) => _shutdown (console.error('❗️Uncaught',p)))
+    process.on('uncaughtException', (e) => _shutdown (console.error('❗️Uncaught',e)))
+    process.on('SIGINT', cds.watched ? _shutdown : (s,n)=>_shutdown(s,n,console.log())) //> newline after ^C
+    process.on('SIGHUP', _shutdown)
+    process.on('SIGHUP2', _shutdown)
+    process.on('SIGTERM', _shutdown)
+
+    async function _shutdown (signal,n) {
+      if (signal) DEBUG?.('⚡️',signal,n, 'received by cds serve')
+      await Promise.all(cds.listeners('shutdown').map(fn => fn()))
+      server.close(()=>{/* it's ok if closed already */})   // first, we try stopping server and process the nice way
+      if (!global.it) setTimeout(process.exit,1111).unref() // after ~1 sec, we force-exit it, unless in test mode
     }
+
+    const DEBUG = cds.debug('cli')
+    if (DEBUG) {
+      cds.on('shutdown', () => DEBUG ('⚡️','cds serve - cds.shutdown'))
+      server.on('close', () => DEBUG ('⚡️','cds serve - server.close(d)'))
+      process.on('exit', () => DEBUG ('⚡️','cds serve - process.exit'))
+      process.on('beforeExit', ()=> DEBUG ('⚡️','cds serve - process.beforeExit'))
+    }
+
+    if (process.platform === 'win32') {
+      process.on('message', msg => msg.close && _shutdown())  // by `cds watch` on Windows
+    }
+
+    return server
   })
 }
 
@@ -269,7 +281,7 @@ function _prepare_logging () { // NOSONAR
 
   // print info when we are finally on air
   cds.once ('listening', ({url})=>{
-    LOG.info ()
+    console.log()
     LOG.info ('server listening on',{url})
     _timer && console.timeEnd (_timer)
     if (process.stdin.isTTY) LOG.info (`[ terminate with ^C ]\n`)

package/lib/auth/jwt-auth.js

@@ -24,16 +24,16 @@ module.exports = function jwt_auth(config) {
     .use(passport.authenticate(config.kind, { session: false }))
     .use((req, res, next) => {
       const payload = req.tokenInfo.getPayload()
-    
+
       let id = req.user.id
       let _is_system, _is_internal
-    
+
       let roles = payload.scope.map(s => s.replace(new RegExp(`^(${config.credentials.xsappname + '.'})`), ''))
       roles.push('identified-user')
       if (payload.grant_type) {
         // > not "weak"
         roles.push('authenticated-user')
-    
+
         const CLIENT = { client_credentials: 1, client_x509: 1 }
         if (payload.grant_type in CLIENT) {
           id = 'system'
@@ -54,7 +54,7 @@ module.exports = function jwt_auth(config) {
       req.tenant = req.tokenInfo.getZoneId?.()
       next()
     })
-    .use((err, req, res, next) => {
+    .use((err, req, res, _next) => {
       if (req.tokenInfo) {
         LOG?.debug('error during token validation', req.tokenInfo.getErrorObject())
       }

package/lib/compile/for/lean_drafts.js

@@ -1,5 +1,43 @@
-const cds = require ('../../index')
-module.exports = function cds_compile_for_lean_drafts(csn, o) {
+const cds = require('../../index')
+
+function _getBacklinkName(on) {
+  const i = on.findIndex(e => e.ref && e.ref[0] === '$self')
+  if (i === -1) return
+  let ref
+  if (on[i + 1] && on[i + 1] === '=') ref = on[i + 2].ref
+  if (on[i - 1] && on[i - 1] === '=') ref = on[i - 2].ref
+  return ref && ref[ref.length - 1]
+}
+
+function _isCompositionBacklink(e) {
+  if (!e.isAssociation) return
+  if (!e._target?.associations) return
+  if (!(!e.isComposition && (e.keys || e.on))) return
+  for (const anchor of Object.values(e._target.associations)) {
+    if (!(anchor.isComposition && anchor.on?.length > 2)) continue
+    if (_getBacklinkName(anchor.on) === e.name && anchor.target === e.parent.name) return anchor
+  }
+}
+
+const IGNORED_ANNOTATIONS = [
+  '@assert.range',
+  '@assert.enum',
+  '@assert.format',
+  '@assert.target',
+  '@mandatory',
+  '@Core.Immutable',
+  '@readonly',
+  '@cds.on.update',
+  '@cds.on.insert',
+  '@Core.Computed',
+  '@Common.FieldControl.Readonly',
+  '@Common.FieldControl.Mandatory',
+  '@FieldControl.Mandatory',
+  '@FieldControl.ReadOnly',
+  '@Common.FieldControl'
+]
+
+module.exports = function cds_compile_for_lean_drafts(csn) {
   const DRAFT_ELEMENTS = new Set([
     'IsActiveEntity',
     'HasDraftEntity',
@@ -22,6 +60,13 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
     return on
   }
 
+  function _isDraft(def) {
+    return (
+      def.associations?.DraftAdministrativeData ||
+      (def.own('@odata.draft.enabled') && def.own('@Common.DraftRoot.ActivationAction'))
+    )
+  }
+
   const { Draft } = cds.linked(`
   entity ActiveEntity { key ID: UUID; }
   entity Draft {
@@ -49,15 +94,21 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
     const draft = { __proto__: active, name: _draftEntity, elements: { ...active.elements, ...Draft.elements } }
     Object.defineProperty(model.definitions, _draftEntity, { value: draft })
     Object.defineProperty(active, 'drafts', { value: draft })
+    Object.defineProperty(draft, 'actives', { value: active })
     draft['@cds.persistence.table'] = _draftEntity
+    if (draft['@restrict']) draft['@restrict'] = undefined
     // Recursively add drafts for compositions
     for (const each in draft.elements) {
       const e = draft.elements[each]
       const newEl = Object.create(e)
-      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || e._isCompositionBacklink) {
+      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || _isCompositionBacklink(e)) {
+        if (e._target['@odata.draft.enabled'] === false) continue // happens for texts if @fiori.draft.enabled is not set
         _redirect(newEl, draftEntity(e._target, model))
       }
       newEl.parent = draft
+      for (const ignoredAnno of IGNORED_ANNOTATIONS) {
+        if (newEl[ignoredAnno]) newEl[ignoredAnno] = undefined
+      }
       draft.elements[each] = newEl
     }
     // TODO: Redirect associations to localized
@@ -65,9 +116,7 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
   }
   for (const name in csn.definitions) {
     const def = csn.definitions[name]
-    if (!def._isDraftEnabled || def.name.endsWith('.DraftAdministrativeData'))
-      continue
-      // so that database ignores them
+    if (!_isDraft(def)) continue
     ;[
       'IsActiveEntity',
       'HasDraftEntity',

package/lib/dbs/cds-deploy.js

@@ -107,9 +107,7 @@ exports.exclude_external_entities_in = function (csn) { // NOSONAR
 
 function getSqls(db, csn, o, beforeCsn) {
   const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
-  const creds = db.options?.credentials
-  const in_memory = (creds?.url || creds?.database) === ':memory:';
-  if (!in_memory && schemaEvo) {
+  if (schemaEvo) {
     const { afterImage: afterCsn, drops, createsAndAlters: creas } = cds.compile.to.sql.delta (csn, o, beforeCsn);
     if(beforeCsn === undefined) {
       // If this is the first deployment done with automatic schema evolution, generate everything as if it was a drop create
@@ -138,9 +136,8 @@ exports.create = async function (db, csn=db.model, o) {
     return db.deploy(csn, o);
   }
 
-  const in_memory = db.options?.credentials?.url === ':memory:';
   let beforeCsn
-  if (!in_memory && schemaEvo) try {
+  if (schemaEvo) try {
     const [{ csn }] = await db.read('cds.Model')
     beforeCsn = JSON.parse(csn);
   } catch(e) {
@@ -160,7 +157,7 @@ exports.create = async function (db, csn=db.model, o) {
   } else return db.run (async tx => {
     await tx.run(drops)
     await tx.run(creas)
-    if (!in_memory && schemaEvo) {
+    if (schemaEvo) {
       await tx.update('cds.Model').with({ csn: JSON.stringify(afterCsn) })
     }
     return true
@@ -169,10 +166,11 @@ exports.create = async function (db, csn=db.model, o) {
 
 
 exports.init = (db, csn=db.model, o, csvs, log=()=>{}) => db.run (async tx => {
+
+  const {tenant} = cds.context; if (tenant && tenant === cds.requires.multitenancy?.t0) return
+  const schemaEvo = db.options?.schema_evolution === 'auto' || o?.schema_evolution === 'auto'
   const resources = await exports.resources(csn, {testdata: cds.env.features.test_data})
   const inits=[]
-  const schemaEvo = (db.options?.schema_evolution === 'auto' || o?.schema_evolution === 'auto')
-
 
   if (csvs) {
     const ccsn = cds.compile.for['nodejs'](csn) // compile to calculate keys for newly added entities

package/lib/index.js

@@ -12,8 +12,9 @@ const facade = class cds extends require('events') {
   set context(_){ this._context._for(this,_) }
   get spawn() { return super.spawn = this._context.spawn }
 
-  emit (eve, ...args) {
-    if (eve === 'served') return Promise.all (this.listeners(eve).map (l => l.call(this,...args)))
+  async emit (eve, ...args) {
+    // if (eve === 'served') return Promise.all (this.listeners(eve).map (l => l.call(this,...args)))
+    if (eve === 'served') for (let l of this.listeners(eve)) await l.call(this,...args)
     else return super.emit (eve, ...args)
   }
 }
@@ -93,6 +94,7 @@ const cds = module.exports = extend (new facade) .with ({
   test: require ('./utils/cds-test'),
   log: require ('./log/cds-log'), debug: lazy => cds.log.debug,
   exec: require ('../bin/cds'),
+  exit: (code) => cds.shutdown ? cds.shutdown() : process.exit(code),
   clone: m => JSON.parse (JSON.stringify(m)),
   lazified, lazify,
 

package/lib/req/cds-context.js

@@ -47,9 +47,9 @@ module.exports = new class extends AsyncLocalStorage {
       })
     }
     const em = new EventEmitter; em.timer = (
-      (o && o.after) ? setTimeout(fx, o.after) :
-      (o && o.every) ? setInterval(fx, o.every) :
-      setImmediate(fx)
+      (o && o.after) ? setTimeout(fx, o.after).unref() :
+      (o && o.every) ? setInterval(fx, o.every).unref() :
+      setImmediate(fx).unref()
     )
     return em
   }

package/lib/srv/bindings.js

@@ -68,8 +68,7 @@ module.exports = class Bindings {
                 }
             }
         }
-        cds.on ('shutdown', ()=>this.purge())
-        process.on ('exit', ()=>this.purge()) // last resort e.g. in case of errors
+        process.on ('exit', ()=>this.purge())
         return this.store()
     }
 

package/lib/srv/cds-serve.js

@@ -56,7 +56,8 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
     if (o.service && o.service !== 'all') {
       // skip services not chosen by o.service, if specified
       const specified = o.service.split(/\s*,\s*/).map (s => required[s] && required[s].service || s )
-      services = services.filter (s => specified.some (n => s.name.endsWith(n)))
+      // matching exact or unqualified name
+      services = services.filter (s => specified.some (n => s.name === n || s.name.endsWith('.'+n)))
       if (!services.length) throw cds.error (`No such service: '${o.service}'`)
     }
     services = services.filter (d => !(

package/lib/srv/middlewares/trace.js

@@ -66,15 +66,22 @@ function _instrument_sqlite (_get_perf) {
   try { require.resolve('sqlite3') } catch { return }
   // eslint-disable-next-line cds/no-missing-dependencies
   const sqlite = require('sqlite3').Database.prototype
-  for (let each of ['all', 'get', 'run', 'prepare']) {
-    const _super = sqlite[each]
-    sqlite[each] = function (q, ..._) {
-      const perf = _get_perf(q)
+  for (let each of ['all', 'get', 'run', 'prepare']) _wrap(each,sqlite)
+  function _wrap (op,sqlite) {
+    const _super = sqlite[op]
+    sqlite[op] = function (q, ..._) {
+      const perf = _get_perf(q) //> q is a SQL command like BEGIN, COMMIT, ROLLBACK, SELECT ...
       if (perf) {
-        const pe = perf.log ('sqlite -', q)
-        const callback = _[_.length-1]; _[_.length-1] = function(){
-          perf.done(pe)
-          callback.apply (this, arguments)
+        const pe = perf.log ('sqlite3', '-', q)
+        const callback = _[_.length-1]; _[_.length-1] = function(ps){
+          if (op === 'prepare') callback.apply (this, {
+            all: _wrap('all',ps),
+            get: _wrap('get',ps),
+            run: _wrap('run',ps),
+          }); else {
+            perf.done(pe)
+            callback.apply (this, arguments)
+          }
         }
       }
       return _super.call (this, q, ..._)
@@ -87,14 +94,23 @@ function _instrument_better_sqlite (_get_perf) {
   try { require.resolve('better-sqlite3') } catch { return }
   // eslint-disable-next-line cds/no-missing-dependencies
   const sqlite = require('better-sqlite3').prototype
-  for (let each of ['exec', 'prepare']) {
-    const _super = sqlite[each]
-    sqlite[each] = function (q, ..._) {
-      const perf = _get_perf(q)
+  for (let each of ['exec', 'prepare']) _wrap(each,sqlite)
+  function _wrap (op,sqlite) {
+    const _super = sqlite[op]
+    sqlite[op] = function (q, ..._) {
+      const perf = _get_perf(q) //> q is a SQL command like BEGIN, COMMIT, ROLLBACK, SELECT ...
       if (perf) {
-        const pe = perf.log ('sqlite -', q)
-        try { return _super.call (this, q, ..._) }
-        finally { perf.done(pe) }
+        const pe = perf.log ('better-sqlite3', '-', q)
+        try {
+          const x = _super.call (this, q, ..._)
+          if (op === 'prepare') return {
+            all(..._){ try { return x.all(..._) } finally { perf.done(pe) }},
+            get(..._){ try { return x.get(..._) } finally { perf.done(pe) }},
+            run(..._){ try { return x.run(..._) } finally { perf.done(pe) }},
+          }
+          else return x
+        }
+        catch(e) { perf.done(pe); throw e }
       }
       else return _super.call (this, q, ..._)
     }

package/lib/srv/protocols/odata-v2-proxy.js

@@ -938,7 +938,7 @@ function cov2ap(options = {}) {
         }
       }
 
-      Object.entries(headers).forEach(([name, value]) => {
+      Object.keys(headers).forEach(name => {
         if (
           name === "dataserviceversion" ||
           name === "DataServiceVersion" ||
@@ -1171,7 +1171,7 @@ function cov2ap(options = {}) {
     return req.context;
   }
 
-  function convertUrlLinks(url, req) {
+  function convertUrlLinks(url) {
     url.contextPath = url.contextPath.replace(/\/\$links\//gi, "/");
   }
 
@@ -1630,7 +1630,7 @@ function cov2ap(options = {}) {
     }
   }
 
-  function convertFilter(url, req) {
+  function convertFilter(url) {
     const _ = "§§";
 
     let filter = url.query["$filter"];
@@ -1702,7 +1702,7 @@ function cov2ap(options = {}) {
     }
   }
 
-  function convertSearch(url, req) {
+  function convertSearch(url) {
     if (url.query.search) {
       let search = url.query.search;
       if (quoteSearch) {
@@ -2789,7 +2789,7 @@ function cov2ap(options = {}) {
     }
   }
 
-  function removeMetadata(data, headers, definition, elements, body, req) {
+  function removeMetadata(data) {
     Object.keys(data).forEach((key) => {
       if (key.startsWith("@") || key.startsWith("odata.") || key.includes("@odata.")) {
         delete data[key];
@@ -2797,7 +2797,7 @@ function cov2ap(options = {}) {
     });
   }
 
-  function convertMedia(data, headers, definition, elements, proxyBody, req) {
+  function convertMedia(data) {
     Object.keys(data).forEach((key) => {
       if (key.endsWith("@odata.mediaReadLink")) {
         data[key.split("@odata.mediaReadLink")[0]] = data[key];
@@ -2807,7 +2807,7 @@ function cov2ap(options = {}) {
     });
   }
 
-  function removeAnnotations(data, headers, definition, elements, proxyBody, req) {
+  function removeAnnotations(data) {
     Object.keys(data).forEach((key) => {
       if (key.startsWith("@")) {
         delete data[key];
@@ -2999,7 +2999,7 @@ function cov2ap(options = {}) {
     return `PT${timeParts[0] || "00"}H${timeParts[1] || "00"}M${timeParts[2] || "00"}S`;
   }
 
-  function addResultsNesting(data, headers, definition, elements, root, req) {
+  function addResultsNesting(data, headers, definition, elements) {
     if (!returnCollectionNested) {
       return;
     }

package/lib/srv/srv-handlers.js

@@ -16,13 +16,19 @@ class EventHandlers {
   )}
 
   async prepend (...impl_functions) {
-    // IMPORTANT: We might be called in parallel -> the ._handlers._handlers
-    // game below avoids loosing registrations due to race conditions
-    const _handlers = this._handlers._handlers || this._handlers
-    const _new = this._handlers = { _handlers, on:[], before:[], after:[], _initial:[], _error:[] }
-    await Promise.all (impl_functions.map (fn => is_impl(fn) && fn.call (this,this)))
-    for (let each in _new) if (_new[each].length) _handlers[each] = [ ..._new[each], ..._handlers[each] ]
-    this._handlers = _handlers
+    // IMPORTANT: We might be called in parallel -> the ._handlers._real
+    // game below avoids loosing registrations due to race conditions.
+    // Note also that {__proto__:this, _handlers:_new} doesn't work as
+    // usages frequently look like that: srv.prepend(()=>srv.on(...)),
+    // which means the derived srv instance would be bypassed.
+    const _real = this._handlers._real || this._handlers
+    const _new = { on:[], before:[], after:[], _initial:[], _error:[], _real }
+    await Promise.all (impl_functions.map (fn => { if (is_impl(fn)) {
+      this._handlers = _new
+      return fn.call (this,this)
+    }}))
+    for (let handlers in _new) if (_new[handlers].length) _real[handlers] = [ ..._new[handlers], ..._real[handlers] ]
+    this._handlers = _real
     return this
   }
 
@@ -85,6 +91,19 @@ const _register = function (srv, phase, event, path, handler) { //NOSONAR
     if (!path.startsWith(srv.name+'.')) path = `${srv.name}.${path}`
   }
 
+  if (cds.env.features.lean_draft && cds.env.features.lean_draft_compatibility) {
+    const entity = path && srv.model?.definitions[path.name || path]
+    if (['PATCH', 'CANCEL', 'NEW'].includes(event)) {
+      // delegate to drafts
+      path = typeof path === 'string' && path !== '*' && !path.endsWith('.drafts') ? path + '.drafts' : typeof path === 'object' && path.drafts || path
+      if (event === 'PATCH') event = 'UPDATE'
+    }
+    else if (entity && (event === 'READ' || entity.actions?.[event]) && (entity.drafts && !entity.name.endsWith('.drafts'))) {
+      // additionally add drafts for READ and bound actions/functions
+      _register(srv, phase, event, entity.name + '.drafts', handler)
+    }
+  }
+
   // Finally register with a filter function to match requests to be handled
   const _handlers = srv._handlers [event === 'error' ? '_error' : (handler._initial ? '_initial' : phase)] // REVISIT: remove _initial handlers
   _handlers.push (new EventHandler (phase, event, path, handler))

package/lib/srv/srv-methods.js

@@ -4,8 +4,8 @@ const LOG = cds.log('cds.serve',{label:'cds'})
 
 module.exports = (srv) => {
   if (srv.model && ( //> we only support that for app services
-    srv instanceof cds.ApplicationService ||
-    srv instanceof cds.RemoteService ||
+    srv.isAppService ||
+    srv.isExternal ||
     srv._add_stub_methods
   )) {
     for (const each of srv.operations) {

package/lib/srv/srv-models.js

@@ -61,7 +61,8 @@ class ExtendedModels {
       try {
         _has_extensions = tenant && extensibility && await _is_extended(tenant)
       } catch (error) {
-        LOG.error('`extensibility: true` is configured but table "cds.xt.Extensions" does not exist. Please redeploy.', error)
+        // Better error message for client
+        cds.error('`extensibility: true` is configured but table "cds.xt.Extensions" does not exist. Please redeploy.', error)
       }
       if (!_has_extensions) {
         let k = cache.key4 (tenant = undefined, features)
@@ -151,8 +152,7 @@ class ExtendedModels {
       if (Date.now() - m._cached.touched > ExtendedModels.sentinelInterval) {
         delete this [key]
       }
-    }}, ExtendedModels.sentinelInterval)
-    cds.on('shutdown', ()=> clearInterval(this.sentinel))
+    }}, ExtendedModels.sentinelInterval).unref()
   }
 
 

package/lib/utils/cds-test.js

@@ -29,10 +29,8 @@ class Test extends require('./axios') {
       catch (e) { if (is_mocha) console.error(e) } // eslint-disable-line no-console
     })
 
-    // shutdown cds server...
-    after (done => {
-      this.server ? this.server.close (done) : done && done()
-    })
+    // gracefully shutdown cds server...
+    after (() => this.server && cds.shutdown())
 
     beforeEach (async () => {
       if (this.data._autoReset)  await this.data.reset()
@@ -80,7 +78,11 @@ class Test extends require('./axios') {
 
   then(r) {
     const {cds} = this
-    cds.once('listening',r)
+    if (this.server) {
+      r({ server: this.server, url: this.url })
+    } else {
+      cds.once('listening', r)
+    }
   }
 }
 

package/libx/_runtime/auth/strategies/ias-auth.js

@@ -66,7 +66,7 @@ module.exports = function ias_auth(config) {
       req.tenant = req.tokenInfo.getZoneId()
       next()
     })
-    .use((err, req, res, next) => {
+    .use((err, req, res, _next) => {
       if (req.tokenInfo) {
         LOG?.debug('error during token validation', req.tokenInfo.getErrorObject())
       }

package/libx/_runtime/cds-services/adapter/odata-v4/OData.js

@@ -253,8 +253,12 @@ class OData {
     this._odataService.process(req, res).catch(err => {
       LOG.warn(err)
       // REVISIT: use i18n
-      //do not reply with error, if response already processed (streaming)
-      if (!res.headersSent) {
+      // do not reply with error, if response already processed (streaming)
+      // destroy response socket instead
+      if (res.headersSent) {
+        // REVISIT: temp solution until streaming is switched to express middlewares
+        res.socket.destroy()
+      } else {
         const { error, statusCode } = normalizeError(err, req)
         res.status(statusCode).send({ error })
       }

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/read.js

@@ -251,6 +251,14 @@ const _readEntityOrProperty = async (tx, req, segments) => {
   return odataResult
 }
 
+const _reliablePagingPossible = req => {
+  if (req.target._isDraftEnabled) return false
+  if (cds.context?.http.req.query.$apply) return false
+  if (req.query.SELECT.limit.offset?.val ?? req.query.SELECT.limit.offset > 0) return false
+  if (req.query.SELECT.orderBy.some(o => !o.ref)) return false
+  return req.query.SELECT.orderBy.every(o => req.query.SELECT.columns.some(c => o.ref[0] === c.ref[0]))
+}
+
 /**
  * Read an entity collection without including the count of the total amount of entities.
  *
@@ -260,6 +268,7 @@ const _readEntityOrProperty = async (tx, req, segments) => {
  * @returns {Promise}
  * @private
  */
+// eslint-disable-next-line complexity
 const _readCollection = async (tx, req, odataReq) => {
   const result = (await tx.dispatch(req)) || []
   if (Array.isArray(req.query)) {
@@ -284,7 +293,23 @@ const _readCollection = async (tx, req, odataReq) => {
   const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP)
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {
     const token = odataReq.getUriInfo().getQueryOption(QueryOptions.SKIPTOKEN)
-    result.$nextLink = (token ? parseInt(token) : 0) + limit
+    if (cds.env.query.limit.reliablePaging && _reliablePagingPossible(req)) {
+      const decoded = token && JSON.parse(Buffer.from(token, 'base64').toString())
+      const skipToken = {
+        r: (decoded?.r || 0) + limit,
+        c: req.query.SELECT.orderBy.map(o => ({
+          a: o.sort ? o.sort === 'asc' : true,
+          k: o.ref[0],
+          v: result[result.length - 1][o.ref[0]]
+        }))
+      }
+
+      if (limit + (decoded?.r || 0) !== top) {
+        result.$nextLink = Buffer.from(JSON.stringify(skipToken)).toString('base64')
+      }
+    } else {
+      result.$nextLink = (token ? parseInt(token) : 0) + limit
+    }
   }
 
   const odataResult = toODataResult(result, req)

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/update.js

@@ -11,6 +11,7 @@ const { isReturnMinimal } = require('../utils/handlerUtils')
 const { readAfterWrite } = require('../utils/readAfterWrite')
 const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { hasOmitValuesPreference } = require('../utils/omitValues')
+const { isStreaming } = require('../utils/stream')
 
 const { getSapMessages } = require('../../../../common/error/frontend')
 
@@ -146,6 +147,13 @@ const update = service => {
         previousResult = await readAfterWrite(req, service, { isBefore: true })
       }
 
+      // in case of express errors in streaming do rollback
+      const segments = odataReq.getUriInfo().getPathSegments()
+      if (isStreaming(segments)) {
+        odataReq.getIncomingRequest().on('error', async err => {
+          await tx.rollback(err).catch(() => {})
+        })
+      }
       // try UPDATE and, on 404 error, try CREATE
       ;[result, req] = await _updateThenCreate(req, odataReq, odataRes, tx)