@sap/cds 6.5.0 → 6.6.1

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')
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/ExpressionToCQN.js

@@ -187,7 +187,7 @@ class ExpressionToCQN {
         // ignore
       }
     }
-    return { func: `${operator ? `${operator} ` : ''}${methodName}`, args }
+    return operator ? [operator, { func: `${methodName}`, args }] : { func: `${methodName}`, args }
   }
 
   /* eslint-disable complexity */

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/readToCQN.js

@@ -41,6 +41,8 @@ const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks'
 
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
 
+const { skipToken: handleSkipToken } = require('../../../../../odata/utils')
+
 const _applyOnlyContainsFilter = apply => Object.keys(apply).length === 1 && apply.filter
 
 /**
@@ -136,9 +138,9 @@ const _apply = (uriInfo, queryOptions, entity, model) => {
 }
 
 const _topSkip = (queryOptions, target, cqn) => {
-  if (queryOptions && (queryOptions.$top || queryOptions.$skip || queryOptions.$skiptoken)) {
+  if (queryOptions && (queryOptions.$top || queryOptions.$skip)) {
     const top = queryOptions.$top ? parseInt(queryOptions.$top) : getDefaultPageSize(target)
-    const skip = parseInt(queryOptions.$skip || 0) + parseInt(queryOptions.$skiptoken || 0)
+    const skip = parseInt(queryOptions.$skip || 0)
     cqn.limit(Math.min(top, getMaxPageSize(target)), skip)
   }
 }
@@ -324,6 +326,10 @@ const _handleApply = (apply, select) => {
   select.push(...mergedArray)
 }
 
+const _skipToken = (token, cqn) => {
+  handleSkipToken(token, cqn)
+}
+
 /**
  * Transform odata READ request into a CQN object.
  *
@@ -393,6 +399,9 @@ const readToCQN = (service, target, odataReq) => {
   if (isCollectionOrToMany) {
     _topSkip(queryOptions, target, cqn)
     _orderby(uriInfo, cqn)
+
+    const skipToken = queryOptions?.$skiptoken
+    if (skipToken) _skipToken(skipToken, cqn)
   }
 
   if (!isCollectionOrToMany || entity._isSingleton) cqn.SELECT.one = true

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/utils/PrimitiveValueDecoder.js

@@ -166,7 +166,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             '). ' +
             'A JSON string must be specified as value for type ' +
@@ -180,7 +180,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             ') ' +
             'as value for type ' +
@@ -209,7 +209,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             ') ' +
             'as value for type ' +
@@ -226,7 +226,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             ') ' +
             'as value for type ' +
@@ -247,7 +247,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             '). A JSON string must be specified ' +
             'as value for type ' +
@@ -262,7 +262,7 @@ class PrimitiveValueDecoder {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             ') ' +
             'as value for type ' +
@@ -311,7 +311,7 @@ class PrimitiveValueDecoder {
           throw new IllegalArgumentError(
             'Invalid value ' +
               value +
-              ' (JavaScript ' +
+              ' (' +
               typeof value +
               '). A JSON ' +
               kind +
@@ -339,7 +339,7 @@ class PrimitiveValueDecoder {
           throw new IllegalArgumentError(
             'Invalid value ' +
               value +
-              ' (JavaScript ' +
+              ' (' +
               typeof value +
               ') for enumeration type ' +
               type.getFullQualifiedName() +

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/utils/ValueConverter.js

@@ -544,7 +544,7 @@ class ValueConverter {
       throw new IllegalArgumentError(
         'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ') ' +
           'for enumeration type ' +

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -260,7 +260,7 @@ class ValueValidator {
       throw new IllegalArgumentError(
         'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ')' +
           (this.property ? ' for property "' + this.property + '"' : '') +
@@ -350,7 +350,7 @@ class ValueValidator {
       throw new IllegalArgumentError(
         'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ')' +
           (this.property ? ' for property "' + this.property + '"' : '') +
@@ -383,7 +383,7 @@ class ValueValidator {
       throw new IllegalArgumentError(
           'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ')' +
           (this.property ? ' for property "' + this.property + '"' : '') +
@@ -406,7 +406,7 @@ class ValueValidator {
         throw new IllegalArgumentError(
           'Invalid value ' +
             value +
-            ' (JavaScript ' +
+            ' (' +
             typeof value +
             ')' +
             (this.property ? ' for property "' + this.property + '"' : '') +
@@ -424,7 +424,7 @@ class ValueValidator {
       throw new IllegalArgumentError(
         'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ')' +
           (this.property ? ' for property "' + this.property + '"' : '') +
@@ -442,7 +442,7 @@ class ValueValidator {
       throw new IllegalArgumentError(
           'Invalid value ' +
           value +
-          ' (JavaScript ' +
+          ' (' +
           typeof value +
           ')' +
           (this.property ? ' for property "' + this.property + '"' : '') +
@@ -510,7 +510,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyPoint or Edm.GeometryPoint',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -528,7 +528,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyLineString or Edm.GeometryLineString',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -543,7 +543,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyPolygon or Edm.GeometryPolygon',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -561,7 +561,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyMultiPoint or Edm.GeometryMultiPoint',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -579,7 +579,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyMultiLineString or Edm.GeometryMultiLineString',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -597,7 +597,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyMultiPolygon or Edm.GeometryMultiPolygon',
-        'JavaScript object with type and coordinates'
+        'Object with type and coordinates'
       )
     }
   }
@@ -629,7 +629,7 @@ class ValueValidator {
       throw this._valueError(
         value,
         'Edm.GeographyCollection or Edm.GeometryCollection',
-        'JavaScript object with type and geometries'
+        'Object with type and geometries'
       )
     }
   }
@@ -725,7 +725,7 @@ class ValueValidator {
     const msg =
       'Invalid value ' +
       (typeName.includes('Geo') ? JSON.stringify(value) : value) +
-      ' (JavaScript ' +
+      ' (' +
       typeof value +
       ')' +
       (this.property ? ' for property "' + this.property + '"' : '') +

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/deserializer/DeserializerFactory.js

@@ -127,15 +127,14 @@ class DeserializerFactory {
   static createBinaryDeserializer () {
     return (request, next) => {
       let type = request.getUriInfo() && request.getUriInfo().getFinalEdmType()
-      if (type && type.getKind() === EdmTypeKind.DEFINITION) type = type.getUnderlyingType()
+      if (type && type.getKind() === EdmTypeKind.DEFINITION) type = type.getUnderlyingType()      
       if (type && type === EdmPrimitiveTypeKind.Stream) {
-        next(
-          null,
-          request
-            .getIncomingRequest()
-            .on('error', next)
-            .pipe(new stream.PassThrough())
-        )
+        if (request.getIncomingRequest().complete) { // empty or NULL
+          next(null, request.getIncomingRequest())
+        } else {
+          const streamPipeline = stream.pipeline(request.getIncomingRequest(), new stream.PassThrough(), () => {})
+          next(null, streamPipeline)
+        }
       } else {
         request
           .getIncomingRequest()

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ResourceJsonSerializer.js

@@ -950,6 +950,7 @@ class ResourceJsonSerializer {
       const [identifier, star, annotation] = this._getPropertyNameAndAnnotation(entityProp)
 
       if (identifier && !type.getProperty(identifier)) {
+        if (identifier === 'DraftAdministrativeData_DraftUUID') continue
         throw new SerializationError(
           "The entity contains data for '" +
             entityProp +
@@ -1042,6 +1043,8 @@ class ResourceJsonSerializer {
   _serializeNullValue (propertyOrReturnType) {
     const nullable = propertyOrReturnType.isNullable()
     if (nullable === undefined || nullable) return null
+    const name = propertyOrReturnType.getName()
+    if (name === 'IsActiveEntity' || name === 'HasActiveEntity' || name === 'HasDraftEntity') return
     throw new SerializationError(
       'Not nullable value ' +
         (propertyOrReturnType.getName ? "for '" + propertyOrReturnType.getName() + "' " : '') +

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/UriHelper.js

@@ -83,10 +83,11 @@ class UriHelper {
       const property = keyPropertyRef.getProperty()
       for (const pathElement of keyPropertyRef.getName().split('/')) {
         value = value[pathElement]
-        if (value === undefined) {
+        if (value === undefined && name !== 'IsActiveEntity') {
           throw new IllegalArgumentError(`The key '${pathElement}' does not exist in the given entity`)
         }
       }
+      if (value === undefined && name === 'IsActiveEntity') continue
       value = primitiveValueEncoder.encodeText(value, property)
       keys.push({ type: property.getType(), name, value })
     }

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

@@ -306,9 +306,10 @@ const _getPathInfo = (query, model) => {
   } else {
     returnType = target
     isCollection = Array.isArray(query) || (query.SELECT && !query.SELECT.one)
-    propertyName = !isCollection && last.kind !== 'entity' && last.name
+    propertyName = query._propertyAccess && query.SELECT.columns[0].ref[query.SELECT.columns[0].ref.length - 1]
+    if (propertyName) returnType = query.SELECT.columns[0].ref.reduce((r, c) => r.elements[c], target)
   }
-  const isStream = last['@Core.MediaType']
+  const isStream = propertyName && target.elements[propertyName]?.['@Core.MediaType']
   return {
     path,
     target,

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

@@ -38,6 +38,12 @@ const _getOperationQueryColumns = urlQueryOptions => {
 const _isDraftAction = req => req.event in { draftActivate: 1, EDIT: 1, draftPrepare: 1 }
 const _isActionOrFunction = req => !(req.event in CDS_EVENTS) || _isDraftAction(req)
 const _isWriteWithResponse = req => req.event in WRITE_EVENTS && !(req.event in { CANCEL: 1, DELETE: 1 })
+const _ensureKeysAreSelected = query => {
+  if (!query.SELECT.columns || query.SELECT.columns.some(c => c === '*')) return
+  for (const key in query._target.keys) {
+    if (!query.SELECT.columns.some(c => c.ref?.[0] === key)) query.SELECT.columns.push({ ref: [key] })
+  }
+}
 
 const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: false }) => {
   let query
@@ -55,6 +61,7 @@ const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: fa
     query = getDeepSelect(req)
   }
   Object.defineProperty(query.SELECT, '_4odata', { value: true })
+  _ensureKeysAreSelected(query)
   // gracefully set location and no body if no read auth or not readable capability
   let result
   try {

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

@@ -108,9 +108,6 @@ const getStreamProperties = (req, model) => {
     // used cloned path
     let select = SELECT.one.from({ ref: deepCopyArray(req.query.SELECT.from.ref) }).columns(columns)
 
-    // new parser has media property as last ref element -> remove
-    if (req._metaInfo && req._metaInfo.propertyName) select.SELECT.from.ref.pop()
-
     const pathToDraft = isPathToDraft(select.SELECT.from.ref, model)
     if (req.target._isDraftEnabled && pathToDraft) {
       select = cqn2cqn4sql(select, model)

package/libx/_runtime/cds-services/services/Service.js

@@ -54,26 +54,14 @@ class ApplicationService extends cds.Service {
 
   registerFioriHandlers() {
     if (cds.env.features.lean_draft) {
-      const {
-        onNewDraft,
-        onDraftPrepare,
-        onDraftActivate,
-        onPatch,
-        onDraftEdit,
-        onDelete
-      } = require('../../fiori/lean-draft')
-      const LOG = cds.log('fiori|drafts')
-
-      for (let each of this.entities)
+      const { onNew, onPrepare, onEdit, onCancel } = require('../../fiori/lean-draft')
+
+      for (const each of this.entities)
         if (each.drafts) {
-          LOG.debug('serving drafts for', { entity: each.name })
-          this.on('NEW', each, onNewDraft)
-          this.on('PATCH', each, onPatch)
-          this.on('EDIT', each, onDraftEdit)
-          this.on('draftPrepare', each, onDraftPrepare)
-          this.on('draftActivate', each, onDraftActivate)
-          this.on('draftActivate', each, onDraftActivate)
-          this.on(['CANCEL', 'DELETE'], each, onDelete)
+          this.on('NEW', each.drafts, onNew)
+          this.on('EDIT', each, onEdit)
+          this.on('CANCEL', each.drafts, onCancel)
+          this.on('draftPrepare', each.drafts, onPrepare)
         }
     } else return require('../../fiori/generic').impl.call(this)
   }
@@ -148,4 +136,5 @@ class ApplicationService extends cds.Service {
   }
 }
 
+ApplicationService.prototype.isAppService = true
 module.exports = ApplicationService

package/libx/_runtime/cds-services/services/utils/columns.js

@@ -4,6 +4,8 @@ const LOG = cds.log()
 
 const { DRAFT_COLUMNS_UNION_MAP } = require('../../../common/constants/draft')
 
+const defaultSearchableType = 'cds.String'
+
 // REVISIT: Can we combine that with db/utils/columns.js?
 /**
  * This method gets all columns for an entity.
@@ -43,7 +45,10 @@ const _getSearchableColumns = entity => {
   const columnsOptions = { removeIgnore: true, filterVirtual: true }
   const columns = getColumns(entity, columnsOptions)
   const cdsSearchTerm = '@cds.search'
-  const cdsSearchKeys = Object.keys(entity).filter(key => key.startsWith(cdsSearchTerm))
+  const cdsSearchKeys = []
+  for (const key in entity) {
+    if (key.startsWith(cdsSearchTerm)) cdsSearchKeys.push(key)
+  }
   const cdsSearchColumnMap = new Map()
   let atLeastOneColumnIsSearchable = false
 
@@ -63,9 +68,6 @@ const _getSearchableColumns = entity => {
     cdsSearchColumnMap.set(columnName, annotationValue)
   }
 
-  // For performance reasons, by default, only elements typed as strings are searchable unless
-  // the @cds.search annotation is specified.
-  const defaultSearchableType = 'cds.String'
   const searchableColumns = columns.filter(column => {
     const annotatedColumnValue = cdsSearchColumnMap.get(column.name)
 
@@ -144,6 +146,7 @@ const computeColumnsToBeSearched = (cqn, entity = { __searchableColumns: [] }, a
 
         const columnRef = column.ref
         if (columnRef) {
+          if (entity.elements[columnRef[columnRef.length - 1]]?._type !== defaultSearchableType) return
           column = { ref: [...column.ref] }
           if (alias) column.ref.unshift(alias)
           toBeSearched.push(column)

package/libx/_runtime/cds-services/util/assert.js

@@ -25,7 +25,6 @@ const ASSERT_FORMAT = 'ASSERT_FORMAT'
 const ASSERT_DATA_TYPE = 'ASSERT_DATA_TYPE'
 const ASSERT_ENUM = 'ASSERT_ENUM'
 const ASSERT_NOT_NULL = 'ASSERT_NOT_NULL'
-const ASSERT_DEEP_ASSOCIATION = 'ASSERT_DEEP_ASSOCIATION'
 
 const _enumValues = element => {
   return Object.keys(element).map(enumKey => {
@@ -221,11 +220,18 @@ const _isNotFilled = value => {
 }
 
 const _checkMandatoryElement = (element, value, errors, key, pathSegments) => {
+  if (element.parent?.query?.SELECT?.columns?.find(col => _isNavigationColumn(col, element.name))) return
   if (element._isMandatory && !element.default && _isNotFilled(value)) {
     errors.push(assertError(ASSERT_NOT_NULL, element, value, key, pathSegments))
   }
 }
 
+const _isNavigationColumn = (column, searched) => {
+  return (
+    column.ref && column.ref.length > 1 && (column.as === searched || column.ref[column.ref.length - 1] === searched)
+  )
+}
+
 const _getEnumElement = element => {
   return (element['@assert.range'] && element.enum) || element['@assert.enum'] ? element.enum : undefined
 }

package/libx/_runtime/common/code-ext/WorkerReq.js

@@ -2,7 +2,8 @@ const { parentPort } = require('worker_threads')
 const { Responses, Errors } = require('../../../../lib/req/response')
 
 class WorkerReq {
-  constructor(reqData) {
+  constructor(contextId, reqData) {
+    this.contextId = contextId
     Object.assign(this, reqData)
     this.postMessages = []
     this.messages = this.messages ?? []
@@ -64,6 +65,7 @@ class WorkerReq {
 
   reject(...args) {
     parentPort.postMessage({
+      contextId: this.contextId,
       kind: 'run',
       target: 'req',
       prop: 'reject',

package/libx/_runtime/common/code-ext/execute.js

@@ -4,6 +4,7 @@ const path = require('node:path')
 const { timeout, resourceLimits } = require('./config')
 const workerPath = path.resolve(__dirname, 'worker.js')
 const { Errors } = require('../../../../lib/req/response')
+const LOG = cds.log()
 
 const _getReqData = req => {
   return {
@@ -17,10 +18,11 @@ const _getReqData = req => {
 
 module.exports = async function executeCode(code, req) {
   const reqData = _getReqData(req)
+  const srv = this
   const _getTarget = target => {
     switch (target) {
       case 'srv':
-        return this
+        return srv
 
       case 'req':
         return req
@@ -29,6 +31,7 @@ module.exports = async function executeCode(code, req) {
     }
   }
   const workerId = cds.utils.uuid()
+  const contextId = cds.utils.uuid()
   const worker = new Worker(workerPath, {
     workerData: { id: workerId },
     resourceLimits
@@ -50,6 +53,8 @@ module.exports = async function executeCode(code, req) {
     }
 
     function onMessageReceived(message) {
+      if (LOG._debug)
+        LOG.debug(`Post message received on main thread (code-ext/execute.js) from worker thread`, message)
       switch (message.kind) {
         case 'run':
           run(message)
@@ -89,6 +94,7 @@ module.exports = async function executeCode(code, req) {
         if (typeof result?.then === 'function') result = await result
         if (message.responseData) worker.postMessage({ id: message.id, kind: 'responseData', result })
       } catch (error) {
+        if (LOG._debug) LOG.debug(`Calling ${message.target}.${message.prop}(...) throws an error.`, error)
         worker.postMessage({ id: message.id, kind: 'cleanup' })
         reject(error)
       }
@@ -101,6 +107,7 @@ module.exports = async function executeCode(code, req) {
   })
 
   // triggers execution of the code in the worker thread
-  worker.postMessage({ id: workerId, code, reqData })
+  const message = { contextId, workerId, kind: 'start', code, reqData }
+  worker.postMessage(message)
   return executePromise
 }

package/libx/_runtime/common/code-ext/handlers.js

@@ -35,14 +35,14 @@ module.exports = cds.service.impl(function () {
     let fqn = req.target?.actions?.[`${req.event}`] // check for bound action/function
     if (!fqn) {
       if (req.target) return next()
-      fqn = this.model.definitions[`${this.name}.${req.event}`] // check for unbound action/function or event
+      fqn = this.model.definitions[`${this.name}.${req.event}`] // check for bound action/function or event
     }
 
     // REVISIT: DO NOT OVERWRITE EXISTING Action Implementations!
     // REVISIT: check whether action/function or event is part of an extension
     if (fqn.kind === 'action' || fqn.kind === 'function' || req.constructor.name === 'EventMessage') {
       const code = await getCodeFromAnnotation(req?.target?.name ?? fqn.name, req.event, 'on')
-      if (!code) return
+      if (!code) return next()
       return await executeCode.call(this, code, req)
     }
   })

package/libx/_runtime/common/code-ext/worker.js

@@ -1,14 +1,18 @@
+const cds = require('../../cds')
+const LOG = cds.log()
 const { parentPort, workerData } = require('worker_threads')
 const { WorkerSELECT, WorkerINSERT, WorkerUPSERT, WorkerUPDATE, WorkerDELETE } = require('./workerQuery')
 const WorkerReq = require('./WorkerReq')
 const { timeout } = require('./config')
 
-parentPort.once('message', function onMessageReceived({ id, code, reqData }) {
-  if (id !== workerData.id) return
+parentPort.once('message', function onWorkerMessageReceived(message) {
+  const { contextId, workerId, kind, code, reqData } = message
+  if (LOG._debug) LOG.debug(`Post message received on worker thread (worker.js) from main thread`, message)
+  if (kind !== 'start' || workerId !== workerData.id) return
 
   // eslint-disable-next-line cds/no-missing-dependencies
   const { VM } = require('vm2')
-  const workerReq = new WorkerReq(reqData)
+  const workerReq = new WorkerReq(contextId, reqData)
   const vm = new VM({
     console: 'inherit',
     timeout, // specifies the number of milliseconds to execute code before terminating execution
@@ -28,9 +32,9 @@ parentPort.once('message', function onMessageReceived({ id, code, reqData }) {
   try {
     ;(async function () {
       const result = await vm.run(code)
-      parentPort.postMessage({ kind: 'success', req: reqData, postMessages: workerReq.postMessages, result })
+      parentPort.postMessage({ contextId, kind: 'success', req: reqData, postMessages: workerReq.postMessages, result })
     })()
   } catch (error) {
-    parentPort.postMessage({ kind: 'error', error })
+    parentPort.postMessage({ contextId, kind: 'error', error })
   }
 })