@sap/cds 5.8.2 → 5.9.0

package/libx/_runtime/index.js

@@ -5,12 +5,12 @@ module.exports = {
       return this._odatav4 || (this._odatav4 = require('./cds-services/adapter/odata-v4/to'))
     },
 
-    get rest() {
-      if (!this._rest) {
-        if (global.cds.env.features.rest_new_adapter) this._rest = require('../rest')
-        else this._rest = require('./cds-services/adapter/rest/to')
-      }
-      return this._rest
+    get old_rest() {
+      return this._old_rest || (this._old_rest = require('./cds-services/adapter/rest/to'))
+    },
+
+    get new_rest() {
+      return this._new_rest || (this._new_rest = require('../rest'))
     }
   },
 

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -1,8 +1,8 @@
 const cds = require('../cds')
-const LOG = cds.log('messaging')
 const MessagingService = require('./service.js')
 const { queueName } = require('./common-utils/naming-conventions')
 const optionsApp = require('../common/utils/vcap.js')
+const normalizeIncomingMessage = require('./common-utils/normalizeIncomingMessage')
 
 class AMQPWebhookMessaging extends MessagingService {
   async init() {
@@ -33,25 +33,9 @@ class AMQPWebhookMessaging extends MessagingService {
       const management = this.getManagement()
       if (!opt.doNotDeploy) this.queued(management.createQueueAndSubscriptions.bind(management))()
       this.queued(this.listenToClient.bind(this))(async (_topic, _payload, _other, { done, failed }) => {
-        const event = _topic
-        // Some messaging systems don't adhere to the standard that the payload has a `data` property.
-        // For these cases, we interpret the whole payload as `data`.
-        let data, headers
-        if (typeof _payload === 'object' && 'data' in _payload) {
-          data = _payload.data
-          headers = { ..._payload }
-          delete headers.data
-        } else {
-          data = _payload
-          headers = {}
-        }
-        const msg = {
-          event,
-          data,
-          headers,
-          inbound: true,
-          ...(_other || {})
-        }
+        const msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
+        msg.event = _topic
+
         if (!msg._) msg._ = {}
         msg._.topic = _topic
         try {
@@ -61,7 +45,7 @@ class AMQPWebhookMessaging extends MessagingService {
           // In case of AMQP and Solace, the `failed` callback must be called
           // with an error, otherwise there are problems with the redelivery count.
           failed(new Error('processing failed'))
-          LOG.error('ERROR occured in asynchronous event processing:', e)
+          this.LOG.error('ERROR occured in asynchronous event processing:', e)
         }
       })
     }

package/libx/_runtime/messaging/Outbox.js

@@ -19,7 +19,7 @@ class OutboxService extends cds.Service {
     this.emit = async function (...args) {
       const msg = typeof args[0] === 'object' ? args[0] : { event: args[0], data: args[1], headers: args[2] }
       const context = this.context || cds.context
-      if (this.options.outbox && context && typeof context.on === 'function') {
+      if (this.options.outbox && context) {
         const outboxOpts = Object.assign(
           {},
           (typeof cds.requires.outbox === 'object' && cds.requires.outbox) || {},
@@ -38,7 +38,7 @@ class OutboxService extends cds.Service {
           try {
             await this._emitImmediate(msg)
           } catch (e) {
-            LOG._error && LOG.error('Emit failed', { event: msg.event, cause: e })
+            LOG.error('Emit failed', { event: msg.event, cause: e })
             // opts.crashOnError is not official!!!
             if (isUnrecoverable(this, e) && outboxOpts.crashOnError !== false) process.exit(1)
           }

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

@@ -1,17 +1,8 @@
 const cds = require('../../cds.js')
-const LOG = cds.log('messaging')
 const ClientAmqp = require('@sap/xb-msg-amqp-v100').Client
 const { connect, disconnect } = require('./connections')
 const { hasPersistentOutbox } = require('../outbox/utils')
 
-const _JSONorString = string => {
-  try {
-    return JSON.parse(string)
-  } catch (e) {
-    return string
-  }
-}
-
 const addDataListener = (client, queue, prefix, cb) =>
   new Promise((resolve, reject) => {
     const source = `${prefix}${queue}`
@@ -19,8 +10,7 @@ const addDataListener = (client, queue, prefix, cb) =>
       .receiver(queue)
       .attach(source)
       .on('data', async raw => {
-        const buffer = raw.payload && Buffer.concat(raw.payload.chunks)
-        const payload = buffer && _JSONorString(buffer.toString())
+        const payload = raw.payload && Buffer.concat(raw.payload.chunks).toString()
         const topic =
           raw.source &&
           raw.source.properties &&
@@ -36,7 +26,7 @@ const addDataListener = (client, queue, prefix, cb) =>
 
 const sender = (client, optionsApp) => client.sender(`${optionsApp.appName}-${optionsApp.appID}`)
 
-const emit = ({ data, event: topic, headers = {} }, stream, prefix) =>
+const emit = ({ data, event: topic, headers = {} }, stream, prefix, LOG) =>
   new Promise((resolve, reject) => {
     LOG._info && LOG.info('Emit', { topic })
     const message = { ...headers, data }
@@ -69,7 +59,7 @@ class AMQPClient {
     this.client = new ClientAmqp(this.optionsAMQP)
     this.sender = sender(this.client, this.service.optionsApp)
     this.stream = this.sender.attach('')
-    return connect(this.client, this.keepAlive)
+    return connect(this.client, this.service.LOG, this.keepAlive)
   }
 
   async disconnect() {
@@ -84,7 +74,7 @@ class AMQPClient {
     // REVISIT: Is this a robust way to find out if the connection is working?
     if (hasPersistentOutbox(this.service, cds.context && cds.context.tenant) && !this.sender.opened())
       throw new Error('AMQP: Sender is not open')
-    await emit(msg, this.stream, this.prefix.topic)
+    await emit(msg, this.stream, this.prefix.topic, this.service.LOG)
     if (!this.keepAlive) return this.disconnect()
   }
 

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

@@ -1,11 +1,9 @@
-const cds = require('../../cds')
-const LOG = cds.log('messaging')
 const waitingTime = require('./waitingTime')
 
-const _connectUntilConnected = (client, x) => {
+const _connectUntilConnected = (client, LOG, x) => {
   const _waitingTime = waitingTime(x)
   setTimeout(() => {
-    connect(client, true)
+    connect(client, LOG, true)
       .then(() => {
         LOG._warn && LOG.warn('Reconnected to Enterprise Messaging Client')
       })
@@ -14,12 +12,12 @@ const _connectUntilConnected = (client, x) => {
           LOG.warn(
             `Connection to Enterprise Messaging Client lost: Reconnecting in ${Math.round(_waitingTime / 1000)} s`
           )
-        _connectUntilConnected(client, x + 1)
+        _connectUntilConnected(client, LOG, x + 1)
       })
   }, _waitingTime)
 }
 
-const connect = (client, keepAlive) => {
+const connect = (client, LOG, keepAlive) => {
   return new Promise((resolve, reject) => {
     client
       .once('connected', function () {
@@ -37,7 +35,7 @@ const connect = (client, keepAlive) => {
           client.once('disconnected', () => {
             client.removeAllListeners('error')
             client.removeAllListeners('connected')
-            _connectUntilConnected(client, 0)
+            _connectUntilConnected(client, LOG, 0)
           })
         }
 

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

@@ -0,0 +1,30 @@
+const _JSONorString = string => {
+  try {
+    return JSON.parse(string)
+  } catch (e) {
+    return string
+  }
+}
+
+// Some messaging systems don't adhere to the standard that the payload has a `data` property.
+// For these cases, we interpret the whole payload as `data`.
+const normalizeIncomingMessage = message => {
+  const _payload = typeof message === 'object' ? message : _JSONorString(message)
+  let data, headers
+  if (typeof _payload === 'object' && 'data' in _payload) {
+    data = _payload.data
+    headers = { ..._payload }
+    delete headers.data
+  } else {
+    data = _payload
+    headers = {}
+  }
+
+  return {
+    data,
+    headers,
+    inbound: true
+  }
+}
+
+module.exports = normalizeIncomingMessage

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

@@ -34,7 +34,8 @@ class EnterpriseMessagingShared extends AMQPWebhookMessaging {
       queueName,
       subscribedTopics: this.subscribedTopics,
       alternativeTopics: this.alternativeTopics,
-      namespace: this.options.credentials && this.options.credentials.namespace
+      namespace: this.options.credentials && this.options.credentials.namespace,
+      LOG: this.LOG
     })
     return this.management
   }

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

@@ -1,6 +1,4 @@
 const authorizedRequest = require('../common-utils/authorizedRequest')
-const cds = require('../../cds.js')
-const LOG = cds.log('messaging')
 const sleep = require('util').promisify(setTimeout)
 
 const _getWebhookName = queueName => queueName
@@ -19,7 +17,8 @@ class EMManagement {
     subscribedTopics,
     maxRetries,
     subdomain,
-    namespace
+    namespace,
+    LOG
   }) {
     this.subdomain = subdomain
     this.options = optionsManagement
@@ -33,6 +32,7 @@ class EMManagement {
     this.maxRetries = maxRetries === undefined ? 10 : maxRetries
     this.subdomainInfo = this.subdomain ? `(subdomain: ${this.subdomain})` : ''
     this.namespace = namespace
+    this.LOG = LOG
   }
 
   async getQueue(queueName = this.queueName) {
@@ -42,8 +42,11 @@ class EMManagement {
       path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
       oa2: this.options.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info('Get queue', this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }),
+        this.LOG._info &&
+        this.LOG.info(
+          'Get queue',
+          this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
+        ),
       errMsg: `Queue "${queueName}" could not be retrieved ${this.subdomainInfo}`,
       target: { kind: 'QUEUE', queue: queueName },
       tokenStore: this
@@ -57,7 +60,8 @@ class EMManagement {
       uri: this.options.uri,
       path: `/hub/rest/api/v1/management/messaging/queues`,
       oa2: this.options.oa2,
-      attemptInfo: () => LOG._info && LOG.info('Get queues', this.subdomain ? { subdomain: this.subdomain } : {}),
+      attemptInfo: () =>
+        this.LOG._info && this.LOG.info('Get queues', this.subdomain ? { subdomain: this.subdomain } : {}),
       errMsg: `Queues could not be retrieved ${this.subdomainInfo}`,
       target: { kind: 'QUEUE' },
       tokenStore: this
@@ -73,8 +77,8 @@ class EMManagement {
       oa2: this.options.oa2,
       dataObj: this.queueConfig,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Create queue',
           this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
         ),
@@ -91,8 +95,8 @@ class EMManagement {
       path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
       oa2: this.options.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Delete queue',
           this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
         ),
@@ -109,8 +113,8 @@ class EMManagement {
       path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}/subscriptions`,
       oa2: this.options.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Get subscriptions',
           this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
         ),
@@ -130,8 +134,8 @@ class EMManagement {
       )}/subscriptions/${encodeURIComponent(topicPattern)}`,
       oa2: this.options.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Create subscription',
           this.subdomain
             ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
@@ -152,8 +156,8 @@ class EMManagement {
       )}/subscriptions/${encodeURIComponent(topicPattern)}`,
       oa2: this.options.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Delete subscription',
           this.subdomain
             ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
@@ -173,8 +177,8 @@ class EMManagement {
       path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
       oa2: this.optionsMessagingREST.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Get webhook',
           this.subdomain
             ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
@@ -195,8 +199,8 @@ class EMManagement {
       path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
       oa2: this.optionsMessagingREST.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Delete webhook',
           this.subdomain
             ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
@@ -245,8 +249,8 @@ class EMManagement {
       oa2: this.optionsMessagingREST.oa2,
       dataObj,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Create webhook',
           this.subdomain
             ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
@@ -266,8 +270,8 @@ class EMManagement {
       path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
       oa2: this.optionsMessagingREST.oa2,
       attemptInfo: () =>
-        LOG._info &&
-        LOG.info(
+        this.LOG._info &&
+        this.LOG.info(
           'Delete webhook',
           this.subdomain
             ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
@@ -280,7 +284,7 @@ class EMManagement {
   }
 
   async createQueueAndSubscriptions() {
-    LOG._info && LOG.info(`Create messaging artifacts ${this.subdomainInfo}`)
+    this.LOG._info && this.LOG.info(`Create messaging artifacts ${this.subdomainInfo}`)
 
     const created = await this.createQueue()
     if (created && created.statusCode === 200) {
@@ -297,7 +301,7 @@ class EMManagement {
         for (const [s, _] of this.subscribedTopics) {
           if (existingSubscriptions.some(e => s === e)) unchangedSubs.push(s)
         }
-        LOG._info && LOG.info('Unchanged subscriptions', unchangedSubs, ' ', this.subdomainInfo)
+        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))
@@ -331,7 +335,7 @@ class EMManagement {
   }
 
   async undeploy() {
-    LOG._info && LOG.info(`Delete messaging artifacts ${this.subdomainInfo}`)
+    this.LOG._info && this.LOG.info(`Delete messaging artifacts ${this.subdomainInfo}`)
     await this.deleteQueue()
     if (this.optionsMessagingREST) await this.deleteWebhook()
   }
@@ -342,7 +346,7 @@ class EMManagement {
       uri: this.options.uri,
       path: `/hub/rest/api/v1/management/messaging/readinessCheck`,
       oa2: this.options.oa2,
-      attemptInfo: () => LOG._info && LOG.info(`Readiness Check ${this.subdomainInfo}`),
+      attemptInfo: () => this.LOG._info && this.LOG.info(`Readiness Check ${this.subdomainInfo}`),
       errMsg: `Readiness Check failed ${this.subdomainInfo}`,
       target: { kind: 'READINESSCHECK' },
       tokenStore: this
@@ -365,8 +369,10 @@ class EMManagement {
           }
           const retryAfter = e.response && e.response.headers && e.response.headers['retry-after']
           const _waitingPeriod = waitingPeriod || (retryAfter && Number(retryAfter) * 1000) || 120 * 1000
-          LOG._info &&
-            LOG.info(`Readiness Check failed ${this.subdomainInfo}, retrying in ${_waitingPeriod / 1000} seconds...`)
+          this.LOG._info &&
+            this.LOG.info(
+              `Readiness Check failed ${this.subdomainInfo}, retrying in ${_waitingPeriod / 1000} seconds...`
+            )
           await sleep(_waitingPeriod)
           await check()
         } else {

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

@@ -1,16 +1,13 @@
 const cds = require('../../cds.js')
-const LOG = cds.log('messaging')
 const express = require('express')
 const getTenantInfo = require('./getTenantInfo.js')
-const isSecured = () => cds.requires.uaa && cds.requires.uaa.credentials
-const { getTenant } = require('../../auth/strategies/utils/xssec.js')
+const isSecured = () => cds.requires.auth && cds.requires.auth.credentials
+const { getTenant } = require('../../auth/strategies/xssecUtils')
 
 const _isAll = a => a && a.includes('all')
-const _hasScope = (scope, req) =>
-  req && req.authInfo && req.authInfo.checkLocalScope && req.authInfo.checkLocalScope(scope)
 
 class EndpointRegistry {
-  constructor(basePath) {
+  constructor(basePath, LOG) {
     const deployPath = basePath + '/deploy'
     const paths = [basePath, deployPath]
     this.webhookCallbacks = new Map()
@@ -18,11 +15,20 @@ class EndpointRegistry {
     if (isSecured()) {
       const JWTStrategy = require('../../auth/strategies/JWT.js')
       const passport = require('passport')
-      passport.use(new JWTStrategy(cds.requires.uaa))
+      // REVISIT: It's unclear if the credentials from cds.requires.auth need to be used here.
+      //          In principle, user-facing endpoints might differ from messaging ones.
+      passport.use(new JWTStrategy(cds.requires.auth.credentials))
       paths.forEach(path => {
         cds.app.use(path, passport.initialize())
         cds.app.use(path, passport.authenticate('JWT', { session: false }))
+        cds.app.use(path, (req, res, next) => {
+          // unsuccessful auth doesn't automatically reject!
+          if (!req.user) return res.status(401).json({ message: 'Unauthorized' })
+          next()
+        })
       })
+    } else if (process.env.NODE_ENV === 'production') {
+      LOG.warn('Messaging endpoints not secured')
     }
     paths.forEach(path => {
       cds.app.use(path, express.json({ type: 'application/*+json' }))
@@ -43,7 +49,7 @@ class EndpointRegistry {
 
     cds.app.options(basePath, (req, res) => {
       try {
-        if (isSecured() && !_hasScope('emcallback', req)) return res.sendStatus(403)
+        if (isSecured() && !req.user.is('emcallback')) return res.sendStatus(403)
         res.set('WebHook-Allowed-Origin', req.headers['webhook-request-origin'])
         res.sendStatus(200)
       } catch (error) {
@@ -53,7 +59,7 @@ class EndpointRegistry {
     LOG._debug && LOG.debug('Register inbound endpoint', { basePath, method: 'POST' })
     cds.app.post(basePath, (req, res) => {
       try {
-        if (isSecured() && !_hasScope('emcallback', req)) return res.sendStatus(403)
+        if (isSecured() && !req.user.is('emcallback')) return res.sendStatus(403)
         const queueName = req.query.q
         const authInfo = req.authInfo
         const xAddress = req.headers['x-address']
@@ -83,7 +89,7 @@ class EndpointRegistry {
     })
     cds.app.post(deployPath, async (req, res) => {
       try {
-        if (isSecured() && !_hasScope('emmanagement', req)) return res.sendStatus(403)
+        if (isSecured() && !req.user.is('emmanagement')) return res.sendStatus(403)
         const tenants = req.body && !_isAll(req.body.tenants) && req.body.tenants
         const queues = req.body && !_isAll(req.body.queues) && req.body.queues
         const options = { wipeData: req.body && req.body.wipeData }
@@ -120,9 +126,10 @@ class EndpointRegistry {
 const registries = new Map()
 
 // REVISIT: Use cds mechanism instead of express? -> Need option method and handler for specifica
-const registerWebhookEndpoints = (basePath, queueName, cb) => {
+const registerWebhookEndpoints = (basePath, queueName, LOG, cb) => {
   const registry =
-    registries.get(basePath) || (registries.set(basePath, new EndpointRegistry(basePath)) && registries.get(basePath))
+    registries.get(basePath) ||
+    (registries.set(basePath, new EndpointRegistry(basePath, LOG)) && registries.get(basePath))
   registry.registerWebhookCallback(queueName, cb)
 }
 

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

@@ -10,7 +10,6 @@ const {
   registerDeployEndpoints,
   registerWebhookEndpoints
 } = require('./enterprise-messaging-utils/registerEndpoints.js')
-const LOG = cds.log('messaging')
 const cloudEvents = require('./enterprise-messaging-utils/cloudEvents.js')
 
 const BASE_PATH = '/messaging/enterprise-messaging'
@@ -61,12 +60,12 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
           const management = await this.getManagement(subdomain).waitUntilReady()
           await management.undeploy()
         } catch (error) {
-          LOG._error && LOG.error('Failed to delete messaging artifacts for subdomain', subdomain, '(', error, ')')
+          this.LOG.error('Failed to delete messaging artifacts for subdomain', subdomain, '(', error, ')')
         }
         return next()
       })
       provisioning.on('dependencies', async (req, next) => {
-        LOG._info && LOG.info('Include Enterprise-Messaging as SaaS dependency')
+        this.LOG._info && this.LOG.info('Include Enterprise-Messaging as SaaS dependency')
         const res = await next()
         const xsappname = this.options.credentials && this.options.credentials.xsappname
         if (xsappname) {
@@ -80,7 +79,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
 
   startListening() {
     const doNotDeploy = cds._mtxEnabled && !this.options.deployForProvider
-    if (doNotDeploy) LOG._info && LOG.info('Skipping deployment of messaging artifacts for provider account')
+    if (doNotDeploy) this.LOG._info && this.LOG.info('Skipping deployment of messaging artifacts for provider account')
     super.startListening({ doNotDeploy })
     if (!doNotDeploy && this.subscribedTopics.size) {
       const management = this.getManagement()
@@ -97,7 +96,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
 
   async listenToClient(cb) {
     _checkAppURL(this.optionsApp.appURL)
-    registerWebhookEndpoints(BASE_PATH, this.queueName, cb)
+    registerWebhookEndpoints(BASE_PATH, this.queueName, this.LOG, cb)
     if (cds._mtxEnabled) {
       await this.addMTXHandlers()
       registerDeployEndpoints(BASE_PATH, this.queueName, async (tenantInfo, options) => {
@@ -110,7 +109,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
               await management.deploy()
               result.succeeded.push(info.tenant)
             } catch (error) {
-              LOG._error && LOG.error('Failed to create messaging artifacts for subdomain', info.subdomain, ':', error)
+              this.LOG.error('Failed to create messaging artifacts for subdomain', info.subdomain, ':', error)
               result.failed.push({ error: error.message, tenant: info.tenant })
             }
           })
@@ -147,7 +146,8 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
       subscribedTopics: this.subscribedTopics,
       alternativeTopics: this.alternativeTopics,
       subdomain: _subdomain,
-      namespace: this.options.credentials && this.options.credentials.namespace
+      namespace: this.options.credentials && this.options.credentials.namespace,
+      LOG: this.LOG
     })
   }
 
@@ -174,7 +174,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
         headers: {
           'x-qos': 1
         },
-        attemptInfo: () => LOG._info && LOG.info('Emit', { topic }),
+        attemptInfo: () => this.LOG._info && this.LOG.info('Emit', { topic }),
         errMsg,
         target: { kind: 'MESSAGE', topic },
         tokenStore: {}

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

@@ -1,5 +1,4 @@
 const cds = require('../cds')
-const LOG = cds.log('messaging')
 
 const path = require('path')
 const fs = require('fs').promises
@@ -25,11 +24,11 @@ class FileBasedMessaging extends MessagingService {
     const e = _msg.event
     delete _msg.event
     await this.queued(lock)(this.file)
-    LOG._debug && LOG.debug('Emit', { topic: e, file: this.file })
+    this.LOG._debug && this.LOG.debug('Emit', { topic: e, file: this.file })
     try {
       await fs.appendFile(this.file, `\n${e} ${JSON.stringify(_msg)}`)
     } catch (e) {
-      LOG._debug && LOG.debug('Error', e)
+      this.LOG._debug && this.LOG.debug('Error', e)
     } finally {
       unlock(this.file)
     }
@@ -53,9 +52,10 @@ class FileBasedMessaging extends MessagingService {
               if (this.subscribedTopics.has(topic)) {
                 const event = this.subscribedTopics.get(topic)
                 if (!event) return
+                // REVISIT: should we use this.dispatch instead of super.emit for inbound messages?
                 super
                   .emit({ event, ...json, inbound: true })
-                  .catch(e => LOG.error('ERROR occured in asynchronous event processing:', e))
+                  .catch(e => this.LOG.error('ERROR occured in asynchronous event processing:', e))
               } else other.push(each + '\n')
             }
           } catch (e) {
@@ -65,7 +65,7 @@ class FileBasedMessaging extends MessagingService {
         if (other.length < lines.length) await fs.writeFile(this.file, other.join(''))
         this.recent = await touched(this.file)
       } catch (e) {
-        LOG._debug && LOG.debug(e)
+        this.LOG._debug && this.LOG.debug(e)
       } finally {
         unlock(this.file)
       }