@sap/cds 6.2.3 → 6.3.0

package/libx/_runtime/messaging/enterprise-messaging-utils/EMManagement.js

@@ -87,12 +87,15 @@ class EMManagement {
         this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
       )
     try {
+      const queueConfig = this.queueConfig && { ...this.queueConfig }
+      if (queueConfig?.deadMsgQueue)
+        queueConfig.deadMsgQueue = queueConfig.deadMsgQueue.replace(/\$namespace/g, this.namespace)
       const res = await authorizedRequest({
         method: 'PUT',
         uri: this.options.uri,
         path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
         oa2: this.options.oa2,
-        dataObj: this.queueConfig,
+        dataObj: queueConfig,
         tokenStore: this
       })
       if (res.statusCode === 201) return true
@@ -389,7 +392,7 @@ class EMManagement {
         this.LOG._info && this.LOG.info('Unchanged subscriptions', unchangedSubs, ' ', this.subdomainInfo)
         await Promise.all([
           ...obsoleteSubs.map(s => this.deleteSubscription(s)),
-          ...additionalSubs.map(async s => this.createSubscription(s))
+          ...additionalSubs.map(async t => this.createSubscription(t))
         ])
         return
       }

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -139,7 +139,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     const doNotDeploy = _multitenancyEnabled() && !this.options.deployForProvider
     if (doNotDeploy) this.LOG._info && this.LOG.info('Skipping deployment of messaging artifacts for provider account')
     super.startListening({ doNotDeploy })
-    if (!doNotDeploy && this.subscribedTopics.size) {
+    if (!doNotDeploy && (this._listenToAll || this.subscribedTopics.size)) {
       const management = this.getManagement()
       // Webhooks will perform an OPTIONS call on creation to check the availability of the app.
       // On systems like Cloud Foundry the app URL will only be advertised once
@@ -218,6 +218,11 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     const topic = msg.event
     const message = { ...(msg.headers || {}), data: msg.data }
 
+    const contentType =
+      msg.headers && ['id', 'source', 'specversion', 'type'].every(el => el in msg.headers)
+        ? 'application/cloudevents+json'
+        : 'application/json'
+
     await this.queued(() => {})()
 
     try {
@@ -229,6 +234,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
         tenant,
         dataObj: message,
         headers: {
+          'Content-Type': contentType,
           'x-qos': 1
         },
         tokenStore: {}

package/libx/_runtime/messaging/file-based.js

@@ -35,7 +35,7 @@ class FileBasedMessaging extends MessagingService {
   }
 
   startWatching() {
-    if (!this.subscribedTopics.size) return
+    if (!this._listenToAll && !this.subscribedTopics.size) return
     const watcher = async () => {
       if (!(await touched(this.file, this.recent))) return // > not touched since last check
       // REVISIT: Bad if lock file wasn't cleaned up (due to crashes...)

package/libx/_runtime/messaging/message-queuing.js

@@ -61,12 +61,15 @@ class MQManagement {
   async createQueue(queueName = this.queueName) {
     this.LOG._info && this.LOG.info('Create queue', { queue: queueName })
     try {
+      const queueConfig = this.queueConfig && { ...this.queueConfig }
+      if (queueConfig?.deadMessageQueue)
+        queueConfig.deadMessageQueue = queueConfig.deadMessageQueue.replace(/\$namespace/g, '')
       const res = await authorizedRequest({
         method: 'PUT',
         uri: this.options.url,
         path: `/v1/management/queues/${encodeURIComponent(queueName)}`,
         oa2: this.options.auth.oauth2,
-        dataObj: this.queueConfig,
+        dataObj: queueConfig,
         tokenStore: this
       })
       if (res.statusCode === 201) return true
@@ -182,7 +185,7 @@ class MQManagement {
           .filter(s => !existingSubscriptions.some(e => s === e))
         await Promise.all([
           ...obsoleteSubs.map(s => this.deleteSubscription(s)),
-          ...additionalSubs.map(s => this.createSubscription(s))
+          ...additionalSubs.map(t => this.createSubscription(t))
         ])
         return
       }

package/libx/_runtime/messaging/outbox/utils.js

@@ -50,7 +50,7 @@ const _processSingleMessage = async (service, message, succeededMessages) => {
   // Promise resolve is necessary because we want to set `cds.context` only
   // inside this call
   return Promise.resolve().then(async () => {
-    if (userId) cds.context.user = new cds.User.Privileged(userId)
+    if (userId) cds.context = { user: new cds.User.Privileged(userId) }
     try {
       service._emitImmediate && (await service._emitImmediate(msg))
       succeededMessages.push(message.ID)

package/libx/_runtime/messaging/service.js

@@ -97,7 +97,8 @@ class MessagingService extends OutboxService {
   on(event, cb) {
     const _event = _warnAndStripTopicPrefix(event, this.LOG)
     // save all subscribed topics (not needed for local-messaging)
-    this.subscribedTopics.set(this.prepareTopic(_event, true), _event)
+    if (event !== '*') this.subscribedTopics.set(this.prepareTopic(_event, true), _event)
+    else this._listenToAll = true
     return super.on(_event, cb)
   }
 
@@ -134,8 +135,9 @@ class MessagingService extends OutboxService {
       const subscribedEvent =
         this.subscribedTopics.get(_msg.event) ||
         (this.wildcarded && this.subscribedTopics.get(this.wildcarded(_msg.event)))
-      if (!subscribedEvent) throw new Error(`No handler for incoming message with topic '${_msg.event}' found.`)
-      _msg.event = subscribedEvent
+      if (!subscribedEvent && !this._listenToAll)
+        throw new Error(`No handler for incoming message with topic '${_msg.event}' found.`)
+      _msg.event = subscribedEvent || _msg.event
     }
     return _msg
   }

package/libx/odata/cqn2odata.js

@@ -516,12 +516,15 @@ const _select = (cqn, kind, model) => {
 const _insert = (cqn, kind, model) => {
   const INSERT = getProp(cqn, 'INSERT')
   const { url } = _from(getProp(INSERT, 'into'), kind, model)
-  const body = Array.isArray(INSERT.entries) && INSERT.entries.length === 1 ? INSERT.entries[0] : INSERT.entries
+  const body = _copyData(
+    Array.isArray(INSERT.entries) && INSERT.entries.length === 1 ? INSERT.entries[0] : INSERT.entries
+  )
   return { method: 'POST', path: url, body }
 }
 
 const _copyData = data => {
   // only works on flat structures
+  if (Array.isArray(data)) return data.map(_copyData)
   const copied = {}
   for (const property in data) {
     copied[property] =

package/libx/odata/utils.js

@@ -52,10 +52,9 @@ const formatVal = (val, elementName, csnTarget, kind) => {
   if (typeof val === 'boolean') return val
   if (typeof val === 'number') return getSafeNumber(val)
   if (!csnTarget && typeof val === 'string' && UUID.test(val)) return kind === 'odata-v2' ? `guid'${val}'` : val
-  const { type } = _getElement(csnTarget, elementName)
-
+  const element = _getElement(csnTarget, elementName)
   if (kind === 'odata-v2') {
-    switch (type) {
+    switch (element.type) {
       case 'cds.Decimal':
       case 'cds.Integer64':
       case 'cds.Int64':
@@ -64,20 +63,22 @@ const formatVal = (val, elementName, csnTarget, kind) => {
       case 'cds.LargeBinary':
         return `binary'${toBase64url(val)}'`
       case 'cds.Date':
-        return `datetime'${val}T00:00:00'`
+        return element['@odata.Type'] === 'Edm.DateTimeOffset'
+          ? `datetimeoffset'${val}T00:00:00'`
+          : `datetime'${val}T00:00:00'`
       case 'cds.DateTime':
-        return `datetime'${val}'`
+        return element['@odata.Type'] === 'Edm.DateTimeOffset' ? `datetimeoffset'${val}'` : `datetime'${val}'`
       case 'cds.Time':
         return `time'${_PT(val.split(':'))}'`
       case 'cds.Timestamp':
-        return `datetimeoffset'${val}'`
+        return element['@odata.Type'] === 'Edm.DateTime' ? `datetime'${val}'` : `datetimeoffset'${val}'`
       case 'cds.UUID':
         return `guid'${val}'`
       default:
         return `'${val}'`
     }
   } else {
-    switch (type) {
+    switch (element.type) {
       case 'cds.Binary':
       case 'cds.LargeBinary':
         return `binary'${toBase64url(val)}'`

package/libx/rest/RestAdapter.js

@@ -197,10 +197,7 @@ const RestAdapter = function (srv) {
 
     next(err)
   })
-  
-  if (!cds.env.features.rest_error_handler) {
-    router.use(error) // FIXME: nope -> call next()
-  }
+  router.use(error) // FIXME: nope -> call next()
 
   return router
 }

package/package.json

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