@sap/cds 7.8.2 → 7.9.0

package/libx/odata/middleware/metadata.js

@@ -51,8 +51,10 @@ const mpSupportsEmptyLocale = () => {
 
 module.exports = srv =>
   async function metadata(req, res, _next) {
-    if (req.method !== 'GET')
-      throw Object.assign(new Error(`Method ${req.method} not allowed for $metadata.`), { statusCode: 405 })
+    if (req.method !== 'GET') {
+      const msg = `Method ${req.method} is not allowed for calls to the metadata endpoint`
+      throw Object.assign(new Error(msg), { statusCode: 405 })
+    }
 
     const tenant = cds.context.tenant
     const locale = cds.context.locale
@@ -60,7 +62,7 @@ module.exports = srv =>
 
     // REVISIT: edm(x) and etag cache is only evicted with model
     const csnService = (cds.context.model || cds.model).definitions[srv.name]
-    const metadataCache = (csnService.metadataCache = csnService.metadataCache || { jsonEtag: {}, xmlEtag: {} })
+    const metadataCache = (csnService.metadataCache = csnService.metadataCache || { jsonEtag: {}, xmlEtag: {} }) // REVISIT: yet another uncontrolled cache?
 
     const etag = format === 'json' ? metadataCache.jsonEtag?.[locale] : metadataCache.xmlEtag?.[locale]
 
@@ -75,7 +77,7 @@ module.exports = srv =>
       if (etag) {
         const unchanged = validate_etag(req.headers['if-none-match'], etag)
         if (unchanged) {
-          res.set('Etag', etag)
+          res.set('etag', etag)
           return res.status(304).end()
         }
       }
@@ -83,11 +85,11 @@ module.exports = srv =>
 
     const { 'cds.xt.ModelProviderService': mps } = cds.services
     if (mps) {
-      if (format === 'json')
-        throw Object.assign(new Error('JSON metadata is not supported if cds.requires.extensibilty: true.'), {
-          statusCode: 400,
-          code: 'UNSUPPORTED_METADATA_TYPE'
-        })
+      if (format === 'json') {
+        LOG._warn && LOG.warn('JSON metadata is not supported in case of cds.requires.extensibilty: true')
+        const msg = 'JSON metadata is not supported for this service'
+        throw Object.assign(new Error(msg), { statusCode: 501 })
+      }
 
       try {
         let edmx
@@ -105,7 +107,7 @@ module.exports = srv =>
           edmx = await mps.getEdmx({ tenant, model: srv.model, service: srv.definition.name, locale })
         }
         metadataCache.xmlEtag[locale] = generateEtag(edmx)
-        res.set('Content-Type', 'application/xml')
+        res.set('content-type', 'application/xml')
         res.send(edmx)
         return
       } catch (e) {
@@ -113,8 +115,7 @@ module.exports = srv =>
           e.message = 'Unable to get EDMX for tenant ' + tenant + ' due to error: ' + e.message
           LOG.error(e)
         }
-
-        throw Object.assign(new Error('Service Unavailable'), { statusCode: 503 })
+        throw Object.assign(new Error('503'), { statusCode: 503 })
       }
     }
 
@@ -132,7 +133,7 @@ module.exports = srv =>
       (metadataCache.edmx = cds.compile.to.edmx(srv.model, { service: srv.definition.name }))
     const localized = cds.localize(srv.model, locale, edmx)
     metadataCache.xmlEtag[locale] = generateEtag(localized)
-    res.set('Etag', metadataCache.xmlEtag[locale])
-    res.set('Content-Type', 'application/xml')
+    res.set('etag', metadataCache.xmlEtag[locale])
+    res.set('content-type', 'application/xml')
     return res.send(localized)
   }

package/libx/odata/middleware/operation.js

@@ -1,15 +1,11 @@
 const cds = require('../../../')
 
 const { toODataResult, postProcess } = require('../utils/result')
-const { cds2edm, calculateLocationHeader, getKeysAndParamsFromPath, handleSapMessages } = require('../utils')
+const { cds2edm, getKeysAndParamsFromPath, handleSapMessages } = require('../utils')
 
 const { deepCopy } = require('../../_runtime/common/utils/copy')
 
-// REVISIT: move to or rewrite in libx/odata
-const { readAfterWrite } = require('../../_runtime/cds-services/adapter/odata-v4/utils/readAfterWrite')
-const metaInfo = require('../../_runtime/cds-services/adapter/odata-v4/utils/metaInfo')
-
-const DRAFT_EVENTS = { draftActivate: 1, EDIT: 1, draftPrepare: 1 }
+const metaInfo = require('../utils/metaInfo')
 
 module.exports = srv =>
   function operation(req, res, next) {
@@ -46,16 +42,21 @@ module.exports = srv =>
 
     // event
     // REVISIT: when is operation.name actually prefixed with the service name?
-    let event = operation.name.replace(`${srv.name}.`, '')
-    // REVISIT: rewrite draft event -> do centrally in draft impl
-    if (event === 'draftEdit') event = 'EDIT'
+    const event = operation.name.replace(`${srv.name}.`, '')
 
     const query = entity ? req._query : undefined
 
+    // cdsReq.headers should contain merged headers of envelope and subreq
+    const headers = { ...cds.context.http.req.headers, ...req.headers }
+
     // we need a cds.Request for multiple reasons, incl. params, headers, sap-messages, read after write, ...
-    const cdsReq = new cds.Request({ query, event, data, params, target: query?.target, req, res })
+    const cdsReq = new cds.Request({ query, event, data, params, headers, target: query?.target, req, res })
     Object.defineProperty(cdsReq, 'protocol', { value: 'odata-v4' })
 
+    // API for subrequests of $batch (or incoming request)
+    cdsReq.req = req
+    cdsReq.res = res
+
     // REVISIT: only via srv.run in combination with srv.dispatch inside
     //          we automatically either use a single auto-managed tx for the req (i.e., insert and read after write in same tx)
     //          or the auto-managed tx opened for the respective atomicity group, if exists
@@ -63,41 +64,37 @@ module.exports = srv =>
       .run(() => {
         return srv.dispatch(cdsReq).then(result => {
           handleSapMessages(cdsReq, req, res)
-
-          // FIXME: should be handled in draft impl
-          if (event in /* { draftActivate: 1, EDIT: 1 } */ DRAFT_EVENTS /* && cdsReq._.readAfterWrite */) {
-            let columns
-            const queryOptions = req.url.split('?')[1]
-            if (queryOptions) columns = cds.odata.parse(`/X?${queryOptions}`).SELECT.columns
-            return readAfterWrite(cdsReq, srv, { operation: { result, returnType: operation.returns }, columns })
-          }
-
           return result
         })
       })
       .then(result => {
         // we use an extra then block, after getting the result, so the transaction is commited, before sending the response
+
         if (!operation.returns || result == null) return res.status(204).end()
 
         if (operation.returns._type?.match?.(/^cds\./)) {
+          res.set('content-type', 'application/json;IEEE754Compatible=true')
           // TODO: check result type
-          return res.set('Content-Type', 'application/json;IEEE754Compatible=true').send({
-            '@odata.context': `${entity ? '../' : ''}$metadata#${cds2edm[operation.returns._type]}`,
+          return res.send({
+            '@odata.context': `${'../'.repeat(query?.SELECT?.from?.ref?.length)}$metadata#${cds2edm[operation.returns._type]}`,
             value: result
           })
         }
 
         const info = metaInfo(req._query, event, srv, result, req)
 
-        // FIXME: info.metadata.isCollection and contextUrl are incorrect for draft events
-        if (event in /* { draftActivate: 1, EDIT: 1 } */ DRAFT_EVENTS) {
-          info.metadata.isCollection = false
-          info.metadata.contextUrl += '/$entity'
-        }
-
         // FIXME: info.metadata.isCollection is incorrect
         if (!operation.returns.items) info.metadata.isCollection = false
 
+        // REVISIT impl of context url generation
+        if (
+          !info.metadata.isCollection &&
+          info.metadata.isServiceEntity &&
+          !info.metadata.contextUrl.endsWith('$entity')
+        ) {
+          info.metadata.contextUrl += '/$entity'
+        }
+
         if (info.metadata.returnType) {
           postProcess(info.metadata.returnType, srv, result)
           if (result['$etag']) res.set('etag', result['$etag'])
@@ -105,22 +102,15 @@ module.exports = srv =>
 
         result = toODataResult(result, info)
 
-        // FIXME: draftActivate needs location header -> move to draft impl
-        // FIXME: draftActivate needs HasActiveEntity and HasDraftEntity -> move to draft impl
-        if (event in /* { draftActivate: 1, EDIT: 1 } */ DRAFT_EVENTS) {
-          res.set('location', '../' + calculateLocationHeader(cdsReq.target, srv, result))
-          result.HasDraftEntity = false
-          if (event === 'draftActivate' || event === 'draftPrepare') result.HasActiveEntity = false
-        }
-
-        // // FIXME: draftEdit needs HasDraftEntity -> move to draft impl
-        // if (event === 'EDIT') result.HasDraftEntity = false
-
         // FIXME: toODataResult() doesn't seem to handle this case
         if (entity && !result['@odata.context'].match(/^\.\.\//))
           result['@odata.context'] = '../' + result['@odata.context']
 
-        res.set('Content-Type', 'application/json;IEEE754Compatible=true').send(result)
+        res.set('content-type', 'application/json;IEEE754Compatible=true')
+        res.send(result)
+      })
+      .catch(err => {
+        handleSapMessages(cdsReq, req, res)
+        next(err)
       })
-      .catch(next)
   }

package/libx/odata/middleware/parse.js

@@ -5,6 +5,8 @@ module.exports = srv =>
     // REVISIT: can't we register the batch handler before the parse handler to avoid this?
     if (req.path.startsWith('/$batch')) return next()
 
+    if (req._query) return next() //> already parsed (e.g., upsert)
+
     // if not a GET, use req.path instead of req.url to ignore query parameters
     req._query = cds.odata.parse(req.method === 'GET' ? req.url : req.path, {
       service: srv,
@@ -12,8 +14,5 @@ module.exports = srv =>
       strict: true
     })
 
-    const preferReturn = req.headers.prefer?.match(/\W?return=(\w+)/i)
-    if (preferReturn) req._preferReturn = preferReturn[1]
-
     next()
   }

package/libx/odata/middleware/read.js

@@ -1,11 +1,10 @@
 const cds = require('../../../')
 const { toODataResult, postProcess } = require('../utils/result')
 const querystring = require('node:querystring')
-const { getKeysAndParamsFromPath, handleSapMessages } = require('../utils')
+const { getKeysAndParamsFromPath, handleSapMessages, validateIfNoneMatch, getPreferReturnHeader } = require('../utils')
 const { handleStreamProperties } = require('../../_runtime/common/utils/streamProp')
 
-// REVISIT: move to or rewrite in libx/odata
-const metaInfo = require('../../_runtime/cds-services/adapter/odata-v4/utils/metaInfo')
+const metaInfo = require('../utils/metaInfo')
 const { getPageSize } = require('../../_runtime/common/generic/paging')
 
 const _getCount = result =>
@@ -18,10 +17,10 @@ const _getCount = result =>
 const _calculateNextLink = (req, result) => {
   const $skiptoken = result.$nextLink ?? _calculateSkiptoken(req, result)
   if ($skiptoken) {
-    const queryParamsWithSkipToken = { ...req.http.req.query, $skiptoken }
+    const queryParamsWithSkipToken = { ...req.req.query, $skiptoken }
     // REVISIT: slice replaces leading '/'. Always starts with '/'?
     result.$nextLink =
-      req.http.req.path.slice(1) +
+      req.req.path.slice(1) +
       '?' +
       querystring.stringify(queryParamsWithSkipToken, '&', '=', { encodeURIComponent: e => e })
   }
@@ -29,9 +28,9 @@ const _calculateNextLink = (req, result) => {
 
 const _calculateSkiptoken = (req, result) => {
   const limit = Array.isArray(req.query) ? getPageSize(req.query[0]._target).max : req.query.SELECT.limit?.rows?.val
-  const top = parseInt(req.http.req.query.$top)
+  const top = parseInt(req.req.query.$top)
   if (limit === result.length && limit !== top) {
-    const token = req.http.req.query.$skiptoken
+    const token = req.req.query.$skiptoken
     if (cds.env.query.limit.reliablePaging && _reliablePagingPossible(req)) {
       const decoded = token && JSON.parse(Buffer.from(token, 'base64').toString())
       const skipToken = {
@@ -100,6 +99,14 @@ const _isNullableSingleton = query => query._target._isSingleton && query._targe
 const _isToOneAssoc = query =>
   query.SELECT.from.ref.length > 1 && typeof query.SELECT.from.ref.slice(-1)[0] === 'string'
 
+const _count = result => {
+  return Array.isArray(result)
+    ? result.reduce((acc, val) => {
+        return acc + (val?.$count ?? val?._counted_ ?? (Array.isArray(val) && _count(val))) || 0
+      }, 0)
+    : result.$count ?? result._counted_ ?? 0
+}
+
 // basically stolen from old read handler without understanding it ^^
 const _handleArrayOfQueries = (srv, req, res, next) => {
   const info = metaInfo(req._query, 'READ', srv, {}, req, false)
@@ -109,45 +116,27 @@ const _handleArrayOfQueries = (srv, req, res, next) => {
     .then(result => {
       handleSapMessages(cdsReq, req, res)
 
-      if (req.url.match(/\/\$count/)) {
-        const count = Array.isArray(result)
-          ? result.reduce((acc, val) => {
-              return (
-                acc + ((val && (val.$count || val._counted_)) || (val[0] && (val[0].$count || val[0]._counted_))) || 0
-              )
-            }, 0)
-          : result.$count || result._counted_ || 0
-        return res.set('Content-Type', 'text/plain').send(count.toString())
-      }
+      if (req.url.match(/\/\$count/)) return res.set('content-type', 'text/plain').send(_count(result).toString())
 
-      const adjustedResult = []
-      if (cdsReq.query[0].SELECT.count) adjustedResult.$count = 0
-      adjustedResult.push(...result[0])
-      adjustedResult.$count += result[0].$count ? result[0].$count : 0
-      for (let i = 1; i < result.length; i++) {
-        adjustedResult.push(...result[i])
-        adjustedResult.$count += result[i].$count ? result[i].$count : 0
+      for (let i = 0; i < result.length; i++) {
         // Add OData context, if it deviates from main context
-        if (info.metadata.contextUrl !== info.metadata.additionalContextUrl[i - 1])
+        if (i !== 0 && info.metadata.contextUrl !== info.metadata.additionalContextUrl[i - 1])
           result[i].forEach(entry => (entry['@odata.context'] = info.metadata.additionalContextUrl[i - 1]))
       }
-      result.splice(0, result.length, ...adjustedResult)
-      if (cdsReq.query[0].SELECT.count) result.$count = adjustedResult.$count || 0
-      result = toODataResult(result, info)
-      res.set('Content-Type', 'application/json;IEEE754Compatible=true').send(result)
+
+      res.set('content-type', 'application/json;IEEE754Compatible=true')
+      const flatRes = result.flat(Infinity)
+      if (cdsReq.query[0].SELECT.count) flatRes.$count = flatRes.length
+      res.send(toODataResult(flatRes, info))
     })
     .catch(next)
 }
 
 module.exports = srv =>
   function read(req, res, next) {
-    // disable express etag checks
-    req.headers['cache-control'] = 'no-cache'
-
-    if (req._preferReturn) {
-      throw Object.assign(new Error(`The 'return' preference is not allowed in ${req.method} requests`), {
-        statusCode: 400
-      })
+    if (getPreferReturnHeader(req)) {
+      const msg = `The 'return' preference is not allowed in ${req.method} requests`
+      throw Object.assign(new Error(msg), { statusCode: 400 })
     }
 
     // $apply with concat -> multiple queries with special handling
@@ -165,10 +154,17 @@ module.exports = srv =>
     const { keys, params } = getKeysAndParamsFromPath(from, srv)
     const data = keys //> for read and delete, we provide keys in req.data
 
+    // cdsReq.headers should contain merged headers of envelope and subreq
+    const headers = { ...cds.context.http.req.headers, ...req.headers }
+
     // we need a cds.Request for multiple reasons, incl. params, headers, sap-messages, read after write, ...
-    const cdsReq = new cds.Request({ query, data, params, req, res })
+    const cdsReq = new cds.Request({ query, data, params, headers, req, res })
     Object.defineProperty(cdsReq, 'protocol', { value: 'odata-v4' })
 
+    // API for subrequests of $batch (or incoming request)
+    cdsReq.req = req
+    cdsReq.res = res
+
     // REVISIT: what is this for? some tests fail without it... we should find a better solution!
     Object.defineProperty(query.SELECT, '_4odata', { value: true })
 
@@ -190,8 +186,6 @@ module.exports = srv =>
 
     const lastPathElement = req.path.split('/').slice(-1)[0]
 
-    query.SELECT.columns ??= ['*']
-
     if (cds.env.effective.odata.proxies && cds.env.effective.odata.xrefs) {
       // REVISIT check above is still not perfect solution
       resolveProxyExpands(query, srv)
@@ -207,24 +201,35 @@ module.exports = srv =>
       .then(result => {
         handleSapMessages(cdsReq, req, res)
 
-        if (cdsReq.target._etag && result == null && cdsReq.headers['if-none-match']) {
+        if (result == null) {
+          if (!query.SELECT.one) {
+            result = []
+            if (req.query.$count) result.$count = 0
+          } else if (_isNullableSingleton(query) || _isToOneAssoc(query)) {
+            return res.sendStatus(204)
+          } else {
+            throw Object.assign(new Error('404'), { statusCode: 404 })
+          }
+        }
+
+        if (validateIfNoneMatch(cdsReq, req, result)) {
           return res.status(304).end()
         }
 
-        if (result == null) {
-          if (_isNullableSingleton(query) || _isToOneAssoc(query)) return res.sendStatus(204)
-          throw Object.assign(new Error(`Not Found`), {
-            statusCode: 404
-          })
+        // express always handles if-none-match header (see req.fresh)
+        if (!cdsReq.target._etag && req.headers['if-none-match']) {
+          delete req.headers['if-none-match']
         }
 
         if (_propertyAccess && result[_propertyAccess] === null) return res.sendStatus(204)
 
         if (lastPathElement === '$count') {
           result = _getCount(result)
-          return res.set('Content-Type', 'text/plain').send(result.toString())
-        } else if (lastPathElement === '$value' && _propertyAccess) {
-          return res.set('Content-Type', 'text/plain').send(result[_propertyAccess].toString())
+          return res.set('content-type', 'text/plain').send(result.toString())
+        }
+
+        if (lastPathElement === '$value' && _propertyAccess) {
+          return res.set('content-type', 'text/plain').send(result[_propertyAccess].toString())
         }
 
         if (info.metadata.isCollection) _calculateNextLink(cdsReq, result)
@@ -234,9 +239,11 @@ module.exports = srv =>
 
         // Express interprets numbers as HTTP status codes
         const isNumber = typeof result === 'number'
-        res
-          .set('Content-Type', isNumber ? 'text/plain' : 'application/json;IEEE754Compatible=true')
-          .send(isNumber ? result.toString() : result)
+        res.set('content-type', isNumber ? 'text/plain' : 'application/json;IEEE754Compatible=true')
+        res.send(isNumber ? result.toString() : result)
+      })
+      .catch(err => {
+        handleSapMessages(cdsReq, req, res)
+        next(err)
       })
-      .catch(next)
   }

package/libx/odata/middleware/service-document.js

@@ -1,7 +1,7 @@
 const cds = require('../../../')
 
 const crypto = require('crypto')
-const metaInfo = require('../../_runtime/cds-services/adapter/odata-v4/utils/metaInfo')
+const metaInfo = require('../utils/metaInfo')
 
 const normalize_header = value => {
   return value.split(',').map(str => str.trim())
@@ -19,10 +19,10 @@ const generateEtag = s => {
 module.exports = srv =>
   function service_document(req, res) {
     if (req.method === 'HEAD') return res.end()
-    if (req.method !== 'GET')
-      throw Object.assign(new Error(`Method ${req.method} not allowed for service document.`), {
-        statusCode: 405
-      })
+    if (req.method !== 'GET') {
+      const msg = `Method ${req.method} is not allowed for calls to the service endpoint`
+      throw Object.assign(new Error(msg), { statusCode: 405 })
+    }
 
     const m = cds.context.model || cds.model
     const csnService = (cds.context.model || cds.model).definitions[srv.name]
@@ -38,7 +38,7 @@ module.exports = srv =>
       if (csnService.srvDocEtag) {
         const unchanged = validate_etag(req.headers['if-none-match'], csnService.srvDocEtag)
         if (unchanged) {
-          res.set('Etag', csnService.srvDocEtag)
+          res.set('etag', csnService.srvDocEtag)
           return res.status(304).end()
         }
       }
@@ -51,7 +51,7 @@ module.exports = srv =>
     )
 
     csnService.srvDocEtag = generateEtag(JSON.stringify(exposedEntities))
-    res.set('Etag', csnService.srvDocEtag)
+    res.set('etag', csnService.srvDocEtag)
 
     const info = metaInfo({ SELECT: { from: { ref: [srv.name] } } }, 'READ', srv, {}, req, false)
 

package/libx/odata/middleware/stream.js

@@ -3,7 +3,7 @@ const { Readable } = require('node:stream')
 const getError = require('../../_runtime/common/error')
 const { getTransition } = require('../../_runtime/common/utils/resolveView')
 const LOG = cds.log('odata')
-const { getKeysAndParamsFromPath, handleSapMessages } = require('../utils')
+const { getKeysAndParamsFromPath, handleSapMessages, validateIfNoneMatch } = require('../utils')
 
 const _resolveContentProperty = (target, annotName, resolvedProp) => {
   if (target.elements[resolvedProp]) {
@@ -20,8 +20,10 @@ const _resolveContentProperty = (target, annotName, resolvedProp) => {
 
 const isStream = query => {
   const { _propertyAccess, target } = query
+  if (!_propertyAccess) return
+
   const element = target.elements[_propertyAccess]
-  return Boolean(element?.['@Core.MediaType'])
+  return element._type === 'cds.LargeBinary' && element['@Core.MediaType']
 }
 
 const isStreamByDollarValue = (query, previous, last) => {
@@ -47,7 +49,7 @@ const _addMetadataProperty = (query, property, annotName, odataName) => {
 const addStreamMetadata = query => {
   // new odata parser sets streaming property in SELECT.from
   const ref = query.SELECT.columns?.[0].ref || query.SELECT.from.ref
-  const propertyName = ref[ref.length - 1]
+  const propertyName = ref.at(-1)
   let mediaTypeProperty
   for (let key in query.target.elements) {
     const val = query.target.elements[key]
@@ -76,19 +78,16 @@ const addStreamMetadata = query => {
   }
 }
 
-const validateStream = (req, res, result) => {
+const validateStream = (req, result) => {
   // REVISIT: compat, should actually be treated as object
   if (!Array.isArray(result)) result = [result]
 
   // Reading one entity or a property of it should yield only a result length of one.
-  if (result.length === 0 || result[0] === undefined) {
-    if (req.headers['if-none-match']) return
-    throw getError(404)
-  }
+  if (result.length === 0 || result[0] === undefined) throw getError(404)
 
   if (result.length > 1) throw getError(400)
 
-  if (result[0] === null) return null
+  if (result[0] === null) return
 
   result = result[0]
 
@@ -102,9 +101,8 @@ const validateStream = (req, res, result) => {
     !headers.accept.includes(contentType) &&
     !headers.accept.includes(contentType.split('/')[0] + '/*')
   ) {
-    throw Object.assign(new Error(`Content type "${contentType}" not listed in accept header "${headers.accept}".`), {
-      statusCode: 406
-    })
+    const msg = `Content type "${contentType}" is not listed in accept header "${headers.accept}"`
+    throw Object.assign(new Error(msg), { statusCode: 406 })
   }
 }
 
@@ -173,7 +171,7 @@ const stream = srv =>
     const { _query: query } = req
 
     // $apply with concat -> multiple queries with special handling -> read only, no stream?
-    if (Array.isArray(query)) return next(null, req, res)
+    if (Array.isArray(query)) return next()
 
     const [previous, lastPathElement] = req.path.split('/').slice(-2)
     const _isStreamByDollarValue = isStreamByDollarValue(query, previous, lastPathElement)
@@ -188,16 +186,16 @@ const stream = srv =>
       }
     }
 
-    query.SELECT.columns ??= ['*']
+    const pdfMimeType = !!req.headers.accept?.match(/application\/pdf/)
+    const isMimeTypeStreamedByDefault = !!(!query.SELECT.one && pdfMimeType)
+    const _isStream = isStream(query) || _isStreamByDollarValue || isMimeTypeStreamedByDefault
 
-    const _isStream = isStream(query) || _isStreamByDollarValue
+    if (!_isStream) return next()
 
-    if (!_isStream) {
-      return next(null, req, res)
+    if (!query.target['@cds.persistence.skip'] && !isMimeTypeStreamedByDefault) {
+      addStreamMetadata(query)
     }
 
-    if (!query.target['@cds.persistence.skip']) addStreamMetadata(query)
-
     // we need the cds request, so we can access the modified query, which is cloned due to lean-draft, so we need to use dispatch here and pass a cds req
     const cdsReq = new cds.Request({ query, req, res })
     Object.defineProperty(cdsReq, 'protocol', { value: 'odata-v4' })
@@ -214,18 +212,22 @@ const stream = srv =>
       .tx(() => {
         return srv.dispatch(cdsReq).then(async result => {
           handleSapMessages(cdsReq, req, res)
-          validateStream(req, res, result)
+          validateStream(req, result)
+
+          if (validateIfNoneMatch(cdsReq, req, result)) {
+            return res.status(304).end()
+          }
 
           const stream = normalizeStream(result, query._propertyAccess, lastPathElement, query.target)
           if (stream === null) {
-            if (req.headers['if-none-match']) {
-              res.status(304)
-              return
-            }
             res.status(204)
             return
           }
 
+          if (pdfMimeType) {
+            if (!result.$mediaContentType) result.$mediaContentType = 'application/pdf'
+          }
+
           setStreamingHeaders(result, res)
 
           return new Promise((resolve, reject) => {