@sap/cds 5.9.8 → 6.0.3

package/libx/_runtime/fiori/generic/readOverDraft.js

@@ -38,6 +38,11 @@ const _modifyCQN = (cqnDraft, where, context) => {
     const fromRef = cqnDraft.SELECT.from.ref
     cqnDraft.SELECT.from.ref[fromRef.length - 1] = ensureDraftsSuffix(fromRef[fromRef.length - 1])
   }
+  if (cqnDraft.SELECT.columns) {
+    cqnDraft.SELECT.columns = cqnDraft.SELECT.columns.map(e =>
+      e.ref && e.ref.includes('IsActiveEntity') ? { val: true, as: 'IsActiveEntity', cast: { type: 'cds.Boolean' } } : e
+    )
+  }
 
   _modifyWhere(cqnDraft.SELECT.where, context)
 }
@@ -66,8 +71,9 @@ const _shouldReadOverDraft = (req, definitions) => {
 
   if (!fromRef) return false
 
-  // read over the draft if the navigation target is non-draft-enabled
-  if (!req.target._isDraftEnabled) return true
+  // for $expand requests, read over the draft if the navigation target is non-draft-enabled
+  // REVISIT: this is an interim workaround to be removed
+  if (!req.target._isDraftEnabled && SELECT.columns && SELECT.columns.some(column => column.expand)) return true
 
   // read over the draft only for navigation scenarios
   if (fromRef.length === 1) return false
@@ -136,6 +142,6 @@ const _readOverDraftHandler = async function (req, next) {
   return cds.tx(req).run(sqlQuery)
 }
 
-module.exports = cds.service.impl(function readOverDraft() {
-  this.on('READ', '*', _readOverDraftHandler)
+module.exports = cds.service.impl(function readOverDraft(srv) {
+  srv.on('READ', '*', _readOverDraftHandler)
 })

package/libx/_runtime/fiori/utils/handler.js

@@ -137,17 +137,17 @@ const getEnrichedCQN = (cqn, select, draftWhere, scenarioAlias, addLimitOrder =
   if (select.one) cqn.SELECT.one = true
 
   if (select.having) {
-    cqn.having(_aliased(select.having, alias))
+    cqn.having(_aliased(select.having, select.columns, alias))
   }
 
   // groupBy, orderBy and limit do not support partial CQNs
   if (select.groupBy) {
-    cqn.SELECT.groupBy = _aliased(select.groupBy, alias)
+    cqn.SELECT.groupBy = _aliased(select.groupBy, select.columns, alias)
     cqn.SELECT.columns = _getSelectedColumns(cqn.SELECT.columns, select.columns)
   }
 
   if (select.orderBy && addLimitOrder) {
-    cqn.SELECT.orderBy = _aliased(select.orderBy, alias)
+    cqn.SELECT.orderBy = _aliased(select.orderBy, select.columns, alias)
   }
 
   if (select.limit && addLimitOrder) {
@@ -169,24 +169,20 @@ const _aliasRef = (ref, alias) => {
 const getDeleteDraftAdminCqn = draftUUID =>
   DELETE.from('DRAFT.DraftAdministrativeData').where([{ ref: ['DraftUUID'] }, '=', { val: draftUUID }])
 
-const _aliased = (arr, alias) =>
+const _aliased = (arr, columns, alias) =>
   arr.map(item => {
-    if (alias && item.ref && item.ref[0] !== alias) {
+    if (item.ref && columns.some(c => c.as === item.ref[item.ref.length - 1])) {
+      // remove table alias if present for a calculated field
+      if (item.ref[0] === alias) {
+        return item.ref.splice(0, 1)
+      }
+    } else if (alias && item.ref && item.ref[0] !== alias) {
       return Object.assign({}, item, { ref: _aliasRef(item.ref, alias) })
     }
     return item
   })
 
 // Only works for root entity, otherwise the relative position needs to be adapted
-const setStatusCodeAndHeader = (response, keys, entityName, isActiveEntity) => {
-  response.setStatusCode(201)
-
-  const keysString = Object.keys(keys)
-    .map(key => `${key}=${keys[key]}`)
-    .join(',')
-  response.setHeader('location', `../${entityName}(${keysString},IsActiveEntity=${isActiveEntity})`)
-}
-
 const removeDraftUUIDIfNecessary = req =>
   req._.req && req._.req.headers && req._.req.headers['x-cds-odata-version'] === 'v2'
     ? () => {}
@@ -250,12 +246,6 @@ const draftIsLocked = lastChangedAt => {
   return DRAFT_CANCEL_TIMEOUT_IN_MS > Date.now() - Date.parse(lastChangedAt)
 }
 
-const getKeyProperty = keys => {
-  return Object.keys(keys).find(k => {
-    return k !== 'IsActiveEntity' && !keys[k]._isAssociationStrict
-  })
-}
-
 const filterKeys = keys => {
   return Object.keys(keys).filter(key => {
     return key !== 'IsActiveEntity' && !keys[key]._isAssociationStrict
@@ -268,7 +258,6 @@ module.exports = {
   getUpdateDraftAdminCQN,
   getEnrichedCQN,
   removeDraftUUIDIfNecessary,
-  setStatusCodeAndHeader,
   isDraftActivateAction,
   ensureDraftsSuffix,
   ensureNoDraftsSuffix,
@@ -277,7 +266,6 @@ module.exports = {
   proxifyToNoDraftsName,
   addColumnAlias,
   replaceRefWithDraft,
-  getKeyProperty,
   filterKeys,
   getDeleteDraftAdminCqn,
   getCompositionTargets

package/libx/_runtime/fiori/utils/where.js

@@ -54,8 +54,6 @@ const _removeIsActiveEntityCondition = where => {
       i = i + 3
     } else if (where[i] === 'and' && _isActiveEntity(where[i + 1])) {
       i = i + 4
-    } else if (where[i] === 'and' && where[i + 1] === '(' && _isActiveEntity(where[i + 2])) {
-      i = i + 6
     } else if (where[i].xpr) {
       if (where[i].xpr.length) {
         newWhere.push({ xpr: _removeIsActiveEntityCondition(where[i].xpr) })
@@ -69,8 +67,6 @@ const _removeIsActiveEntityCondition = where => {
 
   if (newWhere[0] === 'and' || newWhere[0] === 'or') {
     newWhere.splice(0, 1)
-  } else if (newWhere[0] === '(' && newWhere[1] === 'and') {
-    newWhere.splice(0, 2)
   }
 
   return newWhere
@@ -144,6 +140,7 @@ const removeIsActiveEntityRecursively = where => {
       entry.xpr = removeIsActiveEntityRecursively(entry.xpr)
       continue
     }
+
     if (entry.SELECT && entry.SELECT.where && entry.SELECT.from.ref && !entry.SELECT.from.ref[0].endsWith('_drafts')) {
       entry.SELECT.where = removeIsActiveEntityRecursively(entry.SELECT.where)
 

package/libx/_runtime/hana/Service.js

@@ -1,5 +1,6 @@
 const cds = require('../cds')
 const LOG = cds.log('hana|db|sql')
+const coloredTxCommands = require('../db/utils/coloredTxCommands')
 
 const DatabaseService = require('../db/Service')
 const pool = require('./pool')
@@ -22,9 +23,10 @@ const _setSessionContext = (dbc, property, value) => {
   if (dbc._connection) {
     // Works, but bad practice to access an internal scope
     dbc._connection.getClientInfo().setProperty(property, value)
-  } else {
-    dbc.setClientInfo(property, value)
+    return
   }
+
+  dbc.setClientInfo(property, value)
 }
 
 /*
@@ -53,7 +55,8 @@ class HanaDatabase extends DatabaseService {
     /*
      * tx
      */
-    this.on('BEGIN', async function (req) {
+    this.on('BEGIN', function () {
+      LOG._debug && LOG.debug(coloredTxCommands['BEGIN'])
       this.dbc.setAutoCommit(false)
       return 'dummy'
     })
@@ -62,6 +65,7 @@ class HanaDatabase extends DatabaseService {
     this.before('COMMIT', this._integrity.performCheck)
 
     this.on(['COMMIT', 'ROLLBACK'], function (req) {
+      LOG._debug && LOG.debug(coloredTxCommands[req.event])
       return new Promise((resolve, reject) => {
         this.dbc[req.event.toLowerCase()](async err => {
           try {
@@ -70,6 +74,7 @@ class HanaDatabase extends DatabaseService {
             // REVISIT: what to do?
             return reject(e)
           }
+
           if (err) return reject(err)
           resolve('dummy')
         })
@@ -121,21 +126,24 @@ class HanaDatabase extends DatabaseService {
   // eslint-disable-next-line complexity
   async acquire(arg) {
     // REVISIT: remove fallback arg.user.tenant with cds^6 (still needed for cds-mtx)
-    const tenant = (typeof arg === 'string' ? arg : arg.tenant || (arg.user && arg.user.tenant)) || 'anonymous'
+    const tenant = arg && (typeof arg === 'string' ? arg : arg.tenant || (arg.user && arg.user.tenant))
     const dbc = await pool.acquire(tenant, this)
 
-    if (typeof arg !== 'string') {
+    if (arg && typeof arg !== 'string') {
       _setSessionContext(dbc, 'APPLICATIONUSER', arg.user.id || 'ANONYMOUS')
       _setSessionContext(dbc, 'LOCALE', arg.locale || 'en')
+
       // REVISIT: stable access
       const validFrom = (arg.context && arg.context._ && arg.context._['VALID-FROM']) || (arg._ && arg._['VALID-FROM'])
       const validto = (arg.context && arg.context._ && arg.context._['VALID-TO']) || (arg._ && arg._['VALID-TO'])
+
       if (validFrom)
         _setSessionContext(
           dbc,
           'VALID-FROM',
           validFrom instanceof Date ? validFrom.toISOString().replace('T', ' ') : validFrom.replace('T', ' ')
         )
+
       if (validto)
         _setSessionContext(
           dbc,
@@ -145,12 +153,12 @@ class HanaDatabase extends DatabaseService {
     }
 
     dbc._tenant = tenant
-
     return dbc
   }
 
   release(dbc) {
     if (dbc) return pool.release(dbc)
+
     // should not happen, but just in case
     LOG._warn && LOG.warn(new Error('Release called without client. Please report this warning.'))
   }
@@ -158,7 +166,6 @@ class HanaDatabase extends DatabaseService {
   // REVISIT: should happen automatically after a configurable time
   // poolOnly: private param for mtx
   async disconnect(tenant, poolOnly) {
-    tenant = tenant || 'anonymous'
     await pool.drain(tenant)
     if (!poolOnly) super.disconnect(tenant)
   }

package/libx/_runtime/hana/customBuilder/CustomSelectBuilder.js

@@ -79,7 +79,7 @@ if (cds.env.sql.names === 'plain') {
   CustomSelectBuilder.prototype._buildRefElement = function (col, res, noQuoting) {
     res = new this.ReferenceBuilder(col, this._options, this._csn).build()
 
-    if (!noQuoting && !col.as && res.sql && !res.sql.match(/\sas\s/i)) {
+    if (!noQuoting && !col.as) {
       res.sql += ` AS ${this._options.delimiter}${col.ref[col.ref.length - 1]}${this._options.delimiter}`
     }
 

package/libx/_runtime/hana/dynatrace.js

@@ -65,7 +65,7 @@ const _preparedStmtUsingDynatrace = function (client, prepareFn, dbInfo) {
 
 const dynatraceClient = (client, credentials, tenant) => {
   const dbInfo = {
-    name: `SAPHANA${tenant === 'anonymous' ? '' : `-${tenant}`}`,
+    name: `SAPHANA${tenant ? `-${tenant}` : ''}`,
     vendor: dynatrace.sdk.DatabaseVendor.HANADB,
     host: credentials.host,
     port: Number(credentials.port)
@@ -90,7 +90,7 @@ const _createHanaClientStreamingStatement = function (extension, createStmtFn) {
   // args = [sql, options, callback] --> options is optional
   return function (dbc, sql, cb) {
     const dbInfo = {
-      name: `SAPHANA${dbc._tenant === 'anonymous' ? '' : `-${dbc._tenant}`}`,
+      name: `SAPHANA${dbc._tenant ? `-${dbc._tenant}` : ''}`,
       vendor: dynatrace.sdk.DatabaseVendor.HANADB,
       host: dbc._creds.host,
       port: Number(dbc._creds.port)

package/libx/_runtime/hana/localized.js

@@ -1,14 +1,13 @@
 const { ensureUnlocalized } = require('../common/utils/draft')
 const { redirect } = require('../db/utils/localized')
 
-const getLocalize = (locale, model) => name => {
+const getLocalize = model => name => {
   if (name.endsWith('_drafts')) return name
 
-  // if we get here via onReadDraft, target is already localized
-  // because of subrequest using SELECT.from as new target
+  // if we get here via onReadDraft, the target is already localized
+  // because of sub-request using SELECT.from as the new target
   const target = model.definitions[ensureUnlocalized(name)]
   const localizedView = target && target['@cds.localized'] !== false && model.definitions[`localized.${name}`]
-
   return localizedView ? localizedView.name : name
 }
 
@@ -28,10 +27,12 @@ const localizedHandler = function (req) {
   const columns = query.SELECT.columns
   if (columns && columns.length === 1 && columns[0].func === 'count') return
 
-  // suppress localization in "select for update"
+  // suppress localization (no redirection to localized view) for queries that
+  // lock the selected record (exclusive and shared locks)
   if (query.SELECT.forUpdate) return
+  if (query.SELECT.forShareLock) return
 
-  redirect(query, getLocalize(req.locale, this.model))
+  redirect(query, getLocalize(this.model))
 }
 
 localizedHandler._initial = true

package/libx/_runtime/hana/pool.js

@@ -5,6 +5,7 @@ const { pool } = require('@sap/cds-foss')
 const hana = require('./driver')
 
 const _require = require('../common/utils/require')
+const getError = require('../common/error')
 
 function multiTenantInstanceManager(config = cds.env.requires.db) {
   const { credentials } = config
@@ -65,7 +66,7 @@ function singleTenantInstanceManager(config = cds.env.requires.db) {
 async function credentials4(tenant, db) {
   if (!db._instance_manager) {
     const opts = db.options && db.options.credentials ? db.options : undefined
-    db._instance_manager = cds.env.requires.db.multiTenant
+    db._instance_manager = cds.requires.multitenancy
       ? await multiTenantInstanceManager(opts)
       : singleTenantInstanceManager(opts)
   }
@@ -221,12 +222,14 @@ async function resilientAcquire(pool, attempts = 1) {
     }
   }
   if (client) return client
-  err.statusCode = 503
-  err.message =
-    'Acquiring client from pool timed out. Please review your system setup, transaction handling, and pool configuration.'
-  err._attempts = attempt
   const { borrowed, pending, size, available, max } = pool
-  err._poolState = { borrowed, pending, size, available, max }
+  err = getError(
+    Object.assign(err, {
+      statusCode: 503,
+      message: `Acquiring client from pool timed out. Please review your system setup, transaction handling, and pool configuration. Pool State: borrowed: ${borrowed}, pending: ${pending}, size: ${size}, available: ${available}, max: ${max}`
+    })
+  )
+  err._attempts = attempt
   LOG._debug && LOG.debug(err)
   throw err
 }

package/libx/_runtime/hana/search.js

@@ -11,9 +11,8 @@ function searchHandler(req) {
   // REVISIT: remove feature toggle optimized_search after grace period
   // inject the search2cqn4sql module into the rewrite handler only when
   // the optimized search feature toggle is turned on
-  if (cds.env.features.optimized_search) {
-    _setSearchOptions(req.query, { search2cqn4sql, locale: req.locale })
-  }
+  if (cds.env.features.optimized_search === false) return
+  _setSearchOptions(req.query, { search2cqn4sql, locale: req.locale })
 }
 
 // handlers marked with `._initial = true` run in sequence

package/libx/_runtime/hana/{searchToContains.js → search2Contains.js}

@@ -24,7 +24,7 @@
  * @param {import("../types/api").ColumnRefs} columns The columns to be searched
  * @returns {import("../types/api").searchContainsExp} The `CONTAINS` CQN expression
  */
-const searchToContains = (cqnSearchPhrase, columns) => {
+const search2Contains = (cqnSearchPhrase, columns) => {
   // serialize the CQN search phrase
   const searchString = cqnSearchPhrase.reduce((searchStringAccumulator, currentValue) => {
     // Multiple search terms separated by an space are automatically
@@ -92,4 +92,7 @@ const isContainsPredicateSupported = query => {
   return true
 }
 
-module.exports = { searchToContains, isContainsPredicateSupported }
+module.exports = {
+  isContainsPredicateSupported,
+  search2Contains
+}

package/libx/_runtime/hana/search2cqn4sql.js

@@ -1,6 +1,6 @@
 const { computeColumnsToBeSearched } = require('../cds-services/services/utils/columns')
 const searchToLike = require('../common/utils/searchToLike')
-const { isContainsPredicateSupported, searchToContains } = require('./searchToContains')
+const { isContainsPredicateSupported, search2Contains } = require('./search2Contains')
 const { addAliasToExpression } = require('../db/utils/generateAliases')
 
 /**
@@ -24,7 +24,7 @@ const search2cqn4sql = (query, entity, options) => {
   const cqnSearchPhrase = query.SELECT.search
   if (!cqnSearchPhrase) return query
 
-  let { columns: columnsToBeSearched = computeColumnsToBeSearched(query, entity), locale } = options
+  let { columns: columns2Search = computeColumnsToBeSearched(query, entity), locale } = options
   const localizedAssociation = _getLocalizedAssociation(entity)
 
   // If the localized association is defined for the target entity,
@@ -34,14 +34,15 @@ const search2cqn4sql = (query, entity, options) => {
   // suppress the localize handler from redirecting the query's target to the localized view
   Object.defineProperty(query, '_suppressLocalization', { value: true })
 
+  const columnsDefs = entity.query && entity.query.SELECT.columns
+  const isSomeColumn2SearchUseFunction = _isSomeColumn2SearchAFunction(columns2Search, columnsDefs)
+
   if (resolveLocalizedDataAtRuntime) {
     const onCondition = entity._relations[localizedAssociation.name].join(localizedAssociation.target, entity.name)
 
     // REVISIT this is dirty but works for now
     // replace $user_locale placeholder with the user locale or the HANA session context
-    if (onCondition[0].xpr) {
-      onCondition[0].xpr[onCondition[0].xpr.length - 1] = { val: locale || "SESSION_CONTEXT('LOCALE')" }
-    } else onCondition[onCondition.length - 2] = { val: locale || "SESSION_CONTEXT('LOCALE')" }
+    onCondition[0].xpr[onCondition[0].xpr.length - 1] = { val: locale || "SESSION_CONTEXT('LOCALE')" }
 
     // inner join the target table with the _texts table (the _texts table contains
     // the translated texts)
@@ -49,25 +50,18 @@ const search2cqn4sql = (query, entity, options) => {
     query.join(localizedEntityName).on(onCondition)
 
     // prevent SQL ambiguity error for columns with the same name
-    columnsToBeSearched = _addAliasToQuery(query, entity, columnsToBeSearched)
+    columns2Search = _addAliasToQuery(query, entity, columns2Search)
   } // else --> resolve localized texts via localized view (default)
 
-  const useContains = isContainsPredicateSupported(query)
+  const useContains = !isSomeColumn2SearchUseFunction && isContainsPredicateSupported(query)
   let expression
 
   if (useContains) {
-    const namedColumns = columnsToBeSearched.filter(col => !col.func)
-    expression = searchToContains(cqnSearchPhrase, namedColumns)
-
-    // func columns handling
-    if (columnsToBeSearched.length > namedColumns.length) {
-      const funcColumns = columnsToBeSearched.filter(col => col.func)
-      expression = [expression, 'or', ...searchToLike(cqnSearchPhrase, funcColumns)]
-    }
+    expression = search2Contains(cqnSearchPhrase, columns2Search)
   } else {
     // No CONTAINS optimization possible. The search implementation for localized
     // texts falls back to the LIKE predicate.
-    expression = searchToLike(cqnSearchPhrase, columnsToBeSearched)
+    expression = searchToLike(cqnSearchPhrase, columns2Search)
   }
 
   // REVISIT: find out here if where or having must be used
@@ -75,7 +69,16 @@ const search2cqn4sql = (query, entity, options) => {
   return query
 }
 
-const _getLocalizedAssociation = entity => entity.associations && entity.associations.localized
+const _isSomeColumn2SearchAFunction = (columns2Search, columnsDefs) =>
+  columns2Search.some(column2Search => {
+    if (column2Search.func) return true
+    return columnsDefs && columnsDefs.some(columnDef => columnDef.func && columnDef.as === column2Search.ref[0])
+  })
+
+const _getLocalizedAssociation = entity => {
+  const associations = entity.associations
+  return associations && associations.localized
+}
 
 // The inner join modifies the original SELECT ... FROM query and adds ambiguity,
 // therefore add the table/entity name (as a preceding element) to the columns ref

package/libx/_runtime/index.js

@@ -5,12 +5,8 @@ module.exports = {
       return this._odatav4 || (this._odatav4 = require('./cds-services/adapter/odata-v4/to'))
     },
 
-    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'))
+    get rest() {
+      return this._rest || (this._rest = require('../rest'))
     }
   },
 

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -1,8 +1,8 @@
 const cds = require('../cds')
 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')
+const appId = require('./common-utils/appId')
 
 class AMQPWebhookMessaging extends MessagingService {
   async init() {
@@ -12,7 +12,10 @@ class AMQPWebhookMessaging extends MessagingService {
       delete queueConfig.name
       if (Object.keys(queueConfig).length) this.queueConfig = queueConfig
     }
-    this.queueName = queueName(this.options, this.optionsApp)
+    this.queueName = this.prepareQueueName(
+      (this.options.queue && this.options.queue.name) ||
+        (this.options.credentials && this.options.credentials.namespace ? '$namespace/$appId' : '$appId')
+    )
 
     cds.once('listening', () => {
       this.startListening()
@@ -28,27 +31,32 @@ class AMQPWebhookMessaging extends MessagingService {
     return client.emit(_msg)
   }
 
+  prepareQueueName(queueName) {
+    const queue = queueName.replace(/\$appId/g, appId())
+    const namespace = (this.options.credentials && this.options.credentials.namespace) || ''
+    return queue.replace(/\$namespace/g, namespace)
+  }
+
   startListening(opt = {}) {
-    if (this.subscribedTopics.size) {
-      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 msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
-        msg.event = _topic
-
-        if (!msg._) msg._ = {}
-        msg._.topic = _topic
-        try {
-          await super.emit(msg)
-          done()
-        } catch (e) {
-          // 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'))
-          this.LOG.error('ERROR occured in asynchronous event processing:', e)
-        }
-      })
-    }
+    if (!this.subscribedTopics.size) return
+    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 msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
+      msg.event = _topic
+
+      if (!msg._) msg._ = {}
+      msg._.topic = _topic
+      try {
+        await super.emit(msg)
+        done()
+      } catch (e) {
+        // 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'))
+        this.LOG.error('ERROR occured in asynchronous event processing:', e)
+      }
+    })
   }
 
   listenToClient(cb) {

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

@@ -4,7 +4,7 @@ const { connect, disconnect } = require('./connections')
 const { hasPersistentOutbox } = require('../outbox/utils')
 
 const addDataListener = (client, queue, prefix, cb) =>
-  new Promise((resolve, reject) => {
+  new Promise(resolve => {
     const source = `${prefix}${queue}`
     client
       .receiver(queue)
@@ -53,13 +53,14 @@ class AMQPClient {
     this.prefix = prefix
     this.keepAlive = keepAlive
     this.service = service
+    cds.on('shutdown', () => this.disconnect())
   }
 
-  connect() {
+  async connect() {
     this.client = new ClientAmqp(this.optionsAMQP)
     this.sender = sender(this.client, this.service.optionsApp)
     this.stream = this.sender.attach('')
-    return connect(this.client, this.service.LOG, this.keepAlive)
+    await connect(this.client, this.service.LOG, this.keepAlive)
   }
 
   async disconnect() {

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

@@ -0,0 +1,9 @@
+const optionsApp = require('../../common/utils/vcap')
+const appId = () => {
+  const appName = optionsApp.appName || 'CAP'
+  const appID = optionsApp.appID || '00000000'
+  const shrunkAppID = appID.substring(0, 4)
+  return `${appName}/${shrunkAppID}`
+}
+
+module.exports = appId

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

@@ -1,20 +1,7 @@
 const https = require('https')
 const requestToken = require('../http-utils/token')
 
-const authorizedRequest = ({
-  method,
-  uri,
-  path,
-  oa2,
-  tenant,
-  dataObj,
-  headers,
-  tokenStore,
-  attemptInfo,
-  errMsg,
-  target
-}) => {
-  attemptInfo()
+const authorizedRequest = ({ method, uri, path, oa2, tenant, dataObj, headers, tokenStore }) => {
   return new Promise((resolve, reject) => {
     ;((tokenStore.token && Promise.resolve(tokenStore.token)) || requestToken(oa2, tenant, tokenStore))
       .catch(err => reject(err))
@@ -56,10 +43,7 @@ const authorizedRequest = ({
             }
             const result = { body, headers: res.headers, statusCode: res.statusCode }
             if (res.statusCode < 200 || (res.statusCode >= 300 && !(res.statusCode === 404 && method === 'DELETE'))) {
-              const errObj = new Error(errMsg)
-              errObj.target = target
-              errObj.response = result
-              reject(errObj)
+              reject(result)
             } else {
               resolve(result)
             }

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

@@ -7,7 +7,7 @@ const _connectUntilConnected = (client, LOG, x) => {
       .then(() => {
         LOG._warn && LOG.warn('Reconnected to Enterprise Messaging Client')
       })
-      .catch(e => {
+      .catch(() => {
         LOG._warn &&
           LOG.warn(
             `Connection to Enterprise Messaging Client lost: Reconnecting in ${Math.round(_waitingTime / 1000)} s`

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

@@ -1,6 +1,6 @@
 const AMQPWebhookMessaging = require('./AMQPWebhookMessaging')
 const AMQPClient = require('./common-utils/AMQPClient')
-const optionsMessaging = require('./enterprise-messaging-utils/options-messaging.js')
+const { optionsMessagingAMQP } = require('./enterprise-messaging-utils/options-messaging.js')
 const optionsManagement = require('./enterprise-messaging-utils/options-management.js')
 const EMManagement = require('./enterprise-messaging-utils/EMManagement.js')
 const cloudEvents = require('./enterprise-messaging-utils/cloudEvents.js')
@@ -14,7 +14,7 @@ class EnterpriseMessagingShared extends AMQPWebhookMessaging {
 
   getClient() {
     if (this.client) return this.client
-    const optionsAMQP = optionsMessaging(this.options, 'amqp10ws')
+    const optionsAMQP = optionsMessagingAMQP(this.options)
     this.client = new AMQPClient({
       optionsAMQP,
       prefix: { topic: 'topic:', queue: 'queue:' },