@sap/cds 5.9.6 → 6.0.1

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

@@ -36,180 +36,241 @@ class EMManagement {
   }
 
   async getQueue(queueName = this.queueName) {
-    const res = await authorizedRequest({
-      method: 'GET',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
-      oa2: this.options.oa2,
-      attemptInfo: () =>
-        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
-    })
-    return res.body
+    this.LOG._info &&
+      this.LOG.info(
+        'Get queue',
+        this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
+      )
+    try {
+      const res = await authorizedRequest({
+        method: 'GET',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+      return res.body
+    } catch (e) {
+      const error = new Error(`Queue "${queueName}" could not be retrieved ${this.subdomainInfo}`)
+      error.code = 'GET_QUEUE_FAILED'
+      error.target = { kind: 'QUEUE', queue: queueName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async getQueues() {
-    const res = await authorizedRequest({
-      method: 'GET',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues`,
-      oa2: this.options.oa2,
-      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
-    })
-    return res.body
+    this.LOG._info && this.LOG.info('Get queues', this.subdomain ? { subdomain: this.subdomain } : {})
+    try {
+      const res = await authorizedRequest({
+        method: 'GET',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+      return res.body
+    } catch (e) {
+      const error = new Error(`Queues could not be retrieved ${this.subdomainInfo}`)
+      error.code = 'GET_QUEUES_FAILED'
+      error.target = { kind: 'QUEUE' }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
-  createQueue(queueName = this.queueName) {
-    return authorizedRequest({
-      method: 'PUT',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
-      oa2: this.options.oa2,
-      dataObj: this.queueConfig,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Create queue',
-          this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
-        ),
-      errMsg: `Queue "${queueName}" could not be created ${this.subdomainInfo}`,
-      target: { kind: 'QUEUE', queue: queueName },
-      tokenStore: this
-    })
+  async createQueue(queueName = this.queueName) {
+    this.LOG._info &&
+      this.LOG.info(
+        'Create queue',
+        this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
+      )
+    try {
+      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,
+        tokenStore: this
+      })
+      if (res.statusCode === 201) return true
+    } catch (e) {
+      const error = new Error(`Queue "${queueName}" could not be created ${this.subdomainInfo}`)
+      error.code = 'CREATE_QUEUE_FAILED'
+      error.target = { kind: 'QUEUE', queue: queueName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
-  deleteQueue(queueName = this.queueName) {
-    return authorizedRequest({
-      method: 'DELETE',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
-      oa2: this.options.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Delete queue',
-          this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
-        ),
-      errMsg: `Queue "${queueName}" could not be deleted ${this.subdomainInfo}`,
-      target: { kind: 'QUEUE', queue: queueName },
-      tokenStore: this
-    })
+  async deleteQueue(queueName = this.queueName) {
+    this.LOG._info &&
+      this.LOG.info(
+        'Delete queue',
+        this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
+      )
+    try {
+      await authorizedRequest({
+        method: 'DELETE',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+    } catch (e) {
+      const error = new Error(`Queue "${queueName}" could not be deleted ${this.subdomainInfo}`)
+      error.code = 'DELETE_QUEUE_FAILED'
+      error.target = { kind: 'QUEUE', queue: queueName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async getSubscriptions(queueName = this.queueName) {
-    const res = await authorizedRequest({
-      method: 'GET',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}/subscriptions`,
-      oa2: this.options.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Get subscriptions',
-          this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
-        ),
-      errMsg: `Subscriptions for "${queueName}" could not be retrieved ${this.subdomainInfo}`,
-      target: { kind: 'SUBSCRIPTION', queue: queueName },
-      tokenStore: this
-    })
-    return res.body
+    this.LOG._info &&
+      this.LOG.info(
+        'Get subscriptions',
+        this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
+      )
+    try {
+      const res = await authorizedRequest({
+        method: 'GET',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}/subscriptions`,
+        oa2: this.options.oa2,
+        target: { kind: 'SUBSCRIPTION', queue: queueName },
+        tokenStore: this
+      })
+      return res.body
+    } catch (e) {
+      const error = new Error(`Subscriptions for "${queueName}" could not be retrieved ${this.subdomainInfo}`)
+      error.code = 'GET_SUBSCRIPTIONS_FAILED'
+      error.target = { kind: 'SUBSCRIPTION', queue: queueName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
-  createSubscription(topicPattern, queueName = this.queueName) {
-    return authorizedRequest({
-      method: 'PUT',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(
-        queueName
-      )}/subscriptions/${encodeURIComponent(topicPattern)}`,
-      oa2: this.options.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Create subscription',
-          this.subdomain
-            ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
-            : { topic: topicPattern, queue: queueName }
-        ),
-      errMsg: `Subscription "${topicPattern}" could not be added to queue "${queueName}" ${this.subdomainInfo}`,
-      target: { kind: 'SUBSCRIPTION', queue: queueName, topic: topicPattern },
-      tokenStore: this
-    })
+  async createSubscription(topicPattern, queueName = this.queueName) {
+    this.LOG._info &&
+      this.LOG.info(
+        'Create subscription',
+        this.subdomain
+          ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
+          : { topic: topicPattern, queue: queueName }
+      )
+    try {
+      const res = await authorizedRequest({
+        method: 'PUT',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(
+          queueName
+        )}/subscriptions/${encodeURIComponent(topicPattern)}`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+      if (res.statusCode === 201) return true
+    } catch (e) {
+      const error = new Error(
+        `Subscription "${topicPattern}" could not be added to queue "${queueName}" ${this.subdomainInfo}`
+      )
+      error.code = 'CREATE_SUBSCRIPTION_FAILED'
+      error.target = { kind: 'SUBSCRIPTION', queue: queueName, topic: topicPattern }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
-  deleteSubscription(topicPattern, queueName = this.queueName) {
-    return authorizedRequest({
-      method: 'DELETE',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(
-        queueName
-      )}/subscriptions/${encodeURIComponent(topicPattern)}`,
-      oa2: this.options.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Delete subscription',
-          this.subdomain
-            ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
-            : { topic: topicPattern, queue: queueName }
-        ),
-      errMsg: `Subscription "${topicPattern}" could not be deleted from queue "${queueName}" ${this.subdomainInfo}`,
-      target: { kind: 'SUBSCRIPTION', queue: queueName, topic: topicPattern },
-      tokenStore: this
-    })
+  async deleteSubscription(topicPattern, queueName = this.queueName) {
+    this.LOG._info &&
+      this.LOG.info(
+        'Delete subscription',
+        this.subdomain
+          ? { topic: topicPattern, queue: queueName, subdomain: this.subdomain }
+          : { topic: topicPattern, queue: queueName }
+      )
+    try {
+      await authorizedRequest({
+        method: 'DELETE',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(
+          queueName
+        )}/subscriptions/${encodeURIComponent(topicPattern)}`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+    } catch (e) {
+      const error = new Error(
+        `Subscription "${topicPattern}" could not be deleted from queue "${queueName}" ${this.subdomainInfo}`
+      )
+      error.code = 'DELETE_SUBSCRIPTION_FAILED'
+      error.target = { kind: 'SUBSCRIPTION', queue: queueName, topic: topicPattern }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async getWebhook(queueName = this.queueName) {
     const webhookName = _getWebhookName(queueName)
-    const res = await authorizedRequest({
-      method: 'GET',
-      uri: this.optionsMessagingREST.uri,
-      path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
-      oa2: this.optionsMessagingREST.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Get webhook',
-          this.subdomain
-            ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
-            : { webhook: webhookName, queue: queueName }
-        ),
-      errMsg: `Webhook "${webhookName}" could not be retrieved ${this.subdomainInfo}`,
-      target: { kind: 'WEBHOOK', queue: queueName, webhook: webhookName },
-      tokenStore: this
-    })
-    return res.body
+    this.LOG._info &&
+      this.LOG.info(
+        'Get webhook',
+        this.subdomain
+          ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
+          : { webhook: webhookName, queue: queueName }
+      )
+    try {
+      const res = await authorizedRequest({
+        method: 'GET',
+        uri: this.optionsMessagingREST.uri,
+        path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
+        oa2: this.optionsMessagingREST.oa2,
+        tokenStore: this
+      })
+      return res.body
+    } catch (e) {
+      const error = new Error(`Webhook "${webhookName}" could not be retrieved ${this.subdomainInfo}`)
+      error.code = 'GET_WEBHOOK_FAILED'
+      error.target = { kind: 'WEBHOOK', queue: queueName, webhook: webhookName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async createWebhook(queueName = this.queueName) {
     const webhookName = _getWebhookName(queueName)
-    await authorizedRequest({
-      method: 'DELETE',
-      uri: this.optionsMessagingREST.uri,
-      path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
-      oa2: this.optionsMessagingREST.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Delete webhook',
-          this.subdomain
-            ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
-            : { webhook: webhookName, queue: queueName }
-        ),
-      errMsg: `Webhook "${webhookName}" could not be deleted ${this.subdomainInfo}`,
-      target: { kind: 'WEBHOOK', queue: queueName, webhook: webhookName },
-      tokenStore: this
-    })
+    this.LOG._info &&
+      this.LOG.info(
+        'Delete webhook',
+        this.subdomain
+          ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
+          : { webhook: webhookName, queue: queueName }
+      )
+    try {
+      await authorizedRequest({
+        method: 'DELETE',
+        uri: this.optionsMessagingREST.uri,
+        path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
+        oa2: this.optionsMessagingREST.oa2,
+        tokenStore: this
+      })
+    } catch (e) {
+      const error = new Error(`Webhook "${webhookName}" could not be deleted ${this.subdomainInfo}`)
+      error.code = 'DELETE_WEBHOOK_FAILED'
+      error.target = { kind: 'WEBHOOK', queue: queueName, webhook: webhookName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
     const pushConfig = {
       type: 'webhook',
       endpoint: this.optionsApp.appURL + this.path,
@@ -226,12 +287,24 @@ class EMManagement {
     //   "description": "EM Callback Access",
     //   "grant-as-authority-to-apps": ["$XSSERVICENAME(messaging-name)"]
     // }]
-    pushConfig.securitySchema = {
-      type: 'oauth2',
-      grantType: 'client_credentials',
-      clientId: this.optionsMessagingREST.oa2.client,
-      clientSecret: this.optionsMessagingREST.oa2.secret,
-      tokenUrl: this.optionsMessagingREST.oa2.endpoint
+
+    if (this.optionsMessagingREST.oa2.mTLS) {
+      pushConfig.securitySchema = {
+        type: 'oauth2-x509',
+        grantType: 'client_credentials',
+        clientId: this.optionsMessagingREST.oa2.client,
+        certificate: this.optionsMessagingREST.oa2.mTLS.cert,
+        key: this.optionsMessagingREST.oa2.mTLS.key,
+        tokenUrl: this.optionsMessagingREST.oa2.endpoint
+      }
+    } else {
+      pushConfig.securitySchema = {
+        type: 'oauth2',
+        grantType: 'client_credentials',
+        clientId: this.optionsMessagingREST.oa2.client,
+        clientSecret: this.optionsMessagingREST.oa2.secret,
+        tokenUrl: this.optionsMessagingREST.oa2.endpoint
+      }
     }
 
     const dataObj = {
@@ -242,52 +315,65 @@ class EMManagement {
       pushConfig: { ...pushConfig, ...((this.optionsWebhook && this.optionsWebhook.pushConfig) || {}) }
     }
 
-    return authorizedRequest({
-      method: 'POST',
-      uri: this.optionsMessagingREST.uri,
-      path: '/messagingrest/v1/subscriptions',
-      oa2: this.optionsMessagingREST.oa2,
-      dataObj,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Create webhook',
-          this.subdomain
-            ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
-            : { webhook: webhookName, queue: queueName }
-        ),
-      errMsg: `Webhook "${webhookName}" could not be created ${this.subdomainInfo}`,
-      target: { kind: 'WEBHOOK', queue: queueName, webhook: webhookName },
-      tokenStore: this
-    })
+    this.LOG._info &&
+      this.LOG.info(
+        'Create webhook',
+        this.subdomain
+          ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
+          : { webhook: webhookName, queue: queueName }
+      )
+    try {
+      const res = await authorizedRequest({
+        method: 'POST',
+        uri: this.optionsMessagingREST.uri,
+        path: '/messagingrest/v1/subscriptions',
+        oa2: this.optionsMessagingREST.oa2,
+        dataObj,
+        tokenStore: this
+      })
+      if (res.statusCode === 201) return true
+    } catch (e) {
+      const error = new Error(`Webhook "${webhookName}" could not be created ${this.subdomainInfo}`)
+      error.code = 'CREATE_WEBHOOK_FAILED'
+      error.target = { kind: 'WEBHOOK', queue: queueName, webhook: webhookName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
-  deleteWebhook(queueName = this.queueName) {
+  async deleteWebhook(queueName = this.queueName) {
     const webhookName = _getWebhookName(queueName)
-    return authorizedRequest({
-      method: 'DELETE',
-      uri: this.optionsMessagingREST.uri,
-      path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
-      oa2: this.optionsMessagingREST.oa2,
-      attemptInfo: () =>
-        this.LOG._info &&
-        this.LOG.info(
-          'Delete webhook',
-          this.subdomain
-            ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
-            : { webhook: webhookName, queue: queueName }
-        ),
-      errMsg: `Webhook "${webhookName}" could not be deleted ${this.subdomainInfo}`,
-      target: { kind: 'WEBHOOK', queue: queueName, webhook: webhookName },
-      tokenStore: this
-    })
+    this.LOG._info &&
+      this.LOG.info(
+        'Delete webhook',
+        this.subdomain
+          ? { webhook: webhookName, queue: queueName, subdomain: this.subdomain }
+          : { webhook: webhookName, queue: queueName }
+      )
+    try {
+      await authorizedRequest({
+        method: 'DELETE',
+        uri: this.optionsMessagingREST.uri,
+        path: `/messagingrest/v1/subscriptions/${encodeURIComponent(webhookName)}`,
+        oa2: this.optionsMessagingREST.oa2,
+        tokenStore: this
+      })
+    } catch (e) {
+      const error = new Error(`Webhook "${webhookName}" could not be deleted ${this.subdomainInfo}`)
+      error.code = 'DELETE_WEBHOOK_FAILED'
+      error.target = { kind: 'WEBHOOK', queue: queueName, webhook: webhookName }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async createQueueAndSubscriptions() {
     this.LOG._info && this.LOG.info(`Create messaging artifacts ${this.subdomainInfo}`)
 
     const created = await this.createQueue()
-    if (created && created.statusCode === 200) {
+    if (!created) {
       // We need to make sure to only keep our own subscriptions
       const resGet = await this.getSubscriptions()
       if (Array.isArray(resGet)) {
@@ -304,29 +390,12 @@ 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 s => this.createSubscription(s))
         ])
         return
       }
     }
-    await Promise.all([...this.subscribedTopics].map(kv => kv[0]).map(t => this._createSubscription(t)))
-  }
-
-  _throwIfNotBadRequest(e) {
-    // If it's not a bad request, immediately throw,
-    // otherwise throw a better error message.
-    if (!e.response || !e.response.statusCode >= 500 || e.response.statusCode < 400) throw e
-  }
-
-  async _createSubscription(sub) {
-    try {
-      await this.createSubscription(sub)
-    } catch (e) {
-      this._throwIfNotBadRequest(e)
-      throw new Error(
-        `Topic subscription "${sub}" cannot be created. Hint: Please check the topic rules of your SAP Event Mesh instance.`
-      )
-    }
+    await Promise.all([...this.subscribedTopics].map(kv => kv[0]).map(t => this.createSubscription(t)))
   }
 
   async deploy() {
@@ -340,17 +409,24 @@ class EMManagement {
     if (this.optionsMessagingREST) await this.deleteWebhook()
   }
 
-  readinessCheck() {
-    return authorizedRequest({
-      method: 'GET',
-      uri: this.options.uri,
-      path: `/hub/rest/api/v1/management/messaging/readinessCheck`,
-      oa2: this.options.oa2,
-      attemptInfo: () => this.LOG._info && this.LOG.info(`Readiness Check ${this.subdomainInfo}`),
-      errMsg: `Readiness Check failed ${this.subdomainInfo}`,
-      target: { kind: 'READINESSCHECK' },
-      tokenStore: this
-    })
+  async readinessCheck() {
+    this.LOG._info && this.LOG.info(`Readiness Check ${this.subdomainInfo}`)
+    try {
+      await authorizedRequest({
+        method: 'GET',
+        uri: this.options.uri,
+        path: `/hub/rest/api/v1/management/messaging/readinessCheck`,
+        oa2: this.options.oa2,
+        tokenStore: this
+      })
+    } catch (e) {
+      const error = new Error(`Readiness Check failed ${this.subdomainInfo}`)
+      error.code = 'READINESS_CHECK_FAILED'
+      error.target = { kind: 'READINESSCHECK' }
+      error.reason = e
+      this.LOG.error(error)
+      throw error
+    }
   }
 
   async waitUntilReady({ maxRetries = this.maxRetries, waitingPeriod } = {}) {
@@ -361,13 +437,10 @@ class EMManagement {
         await this.readinessCheck()
       } catch (e) {
         if (tries <= maxRetries) {
-          if (e.response.statusCode !== 503) {
-            const errMsg = 'Readiness Check cannot be performed: ' + JSON.stringify(e.response)
-            const errObj = new Error(errMsg)
-            errObj.target = e.target
-            throw errObj
+          if (e.reason.statusCode !== 503) {
+            throw e
           }
-          const retryAfter = e.response && e.response.headers && e.response.headers['retry-after']
+          const retryAfter = e.reason && e.reason.headers && e.reason.headers['retry-after']
           const _waitingPeriod = waitingPeriod || (retryAfter && Number(retryAfter) * 1000) || 120 * 1000
           this.LOG._info &&
             this.LOG.info(
@@ -381,6 +454,7 @@ class EMManagement {
             uri: this.options.uri
           })
           errObj.target = e.target
+          errObj.code = e.code
           throw errObj
         }
       }

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

@@ -19,8 +19,8 @@ const prepareHeaders = (headers, event, options, superPrepareHeaders) => {
 
 const defaultOptions = options => {
   if (options.format === 'cloudevents') {
-    if (!options.subscribePrefix) options.subscribePrefix = '+/+/+/ce/'
-    if (!options.publishPrefix) options.publishPrefix = '$namespace/ce/'
+    if (typeof options.subscribePrefix !== 'string') options.subscribePrefix = '+/+/+/ce/'
+    if (typeof options.publishPrefix !== 'string') options.publishPrefix = '$namespace/ce/'
   }
 }