@sap/cds-dk 8.1.2 → 8.2.1

package/lib/init/template/cloud-logging/files/package.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "@cap-js/telemetry": ">=0",
+    "@grpc/grpc-js": "^1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "^0",
+    "@opentelemetry/host-metrics": "^0"
+  },
+  "cds": {
+    "requires": {
+      "telemetry": "to-cloud-logging"
+    }
+  }
+}

package/lib/init/template/cloud-logging/index.js

@@ -0,0 +1,80 @@
+const cds = require('../../../cds')
+const { merge, sort } = require('../../merge')
+
+const { readProject } = require('../../projectReader')
+const { srv4, mtxSidecar4, approuter } = require('../../registries/mta')
+
+module.exports = class extends require('../../plugin') {
+
+  static hasInProduction(env) {
+    return env.requires?.telemetry?.kind === 'to-cloud-logging'
+  }
+
+  options() {
+    return {
+      'plan': {
+        type: 'string',
+        help: `Override the service plan used for the MTA generation.`,
+      },
+      'with-telemetry': {
+        type: 'boolean',
+        help: 'Add telemetry capabilities.'
+      }
+    }
+  }
+
+  async canRun() {
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
+    if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add cloud-logging' is not available for Kyma yet`
+    return true
+  }
+
+  async run() {
+    const { hasTelemetry } = readProject()
+    if (cds.cli.options['with-telemetry'] || hasTelemetry) {
+      await merge(__dirname, 'files/package.json').into('package.json')
+      await sort('package.json', 'dependencies')
+    }
+  }
+
+  async combine() {
+    const project = readProject()
+    const { hasMta, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+
+    if (hasMta) {
+      const cloudLogging = {
+        in: 'resources',
+        where: {
+          type: 'org.cloudfoundry.managed-service',
+          'parameters.service': 'cloud-logging'
+        }
+      }
+      const srv = srv4(srvPath)
+      const additions = [srv, cloudLogging]
+      const relationships = [{
+        insert: [cloudLogging, 'name'],
+        into: [srv, 'requires', 'name']
+      }]
+      if (hasMultitenancy) {
+        const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
+        additions.push(mtxSidecar)
+        relationships.push({
+          insert: [cloudLogging, 'name'],
+          into: [mtxSidecar, 'requires', 'name']
+        })
+      }
+      if (hasApprouter) {
+        additions.push(approuter)
+        relationships.push({
+          insert: [cloudLogging, 'name'],
+          into: [approuter, 'requires', 'name']
+        })
+      }
+
+      project.cloudLoggingServicePlan = cds.cli.options['plan'] ?? 'standard'
+      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+        with: project, additions, relationships
+      })
+    }
+  }
+}

package/lib/init/template/containerize/files/containerize.yaml.hbs

@@ -11,10 +11,15 @@ modules:
   - name: {{appName}}-srv
     build-parameters:
       buildpack:
+        {{#hasHelmUnifiedRuntime}}
+        builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
+        {{/hasHelmUnifiedRuntime}}
+        {{^hasHelmUnifiedRuntime}}
         {{#isNodejs}}
         type: nodejs
         {{/isNodejs}}
         builder: builder-jammy-base
+        {{/hasHelmUnifiedRuntime}}
         path: {{#isNodejs}}gen/srv{{/isNodejs}}{{#isJava}}srv/target/{{appName}}-exec.jar{{/isJava}}
         env:
         {{#isNodejs}}

package/lib/init/template/dynatrace/files/mta.yaml.hbs

@@ -0,0 +1,24 @@
+---
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    requires:
+      - name: {{appName}}-dynatrace
+  - name: {{appName}}-mtx
+    type: nodejs
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    requires:
+      - name: {{appName}}-dynatrace
+resources:
+  - name: {{appName}}-dynatrace
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: dynatrace
+      service-plan: standard
+      config:
+        tokens:
+          - name: ingest_apitoken
+            scopes:
+              - openTelemetryTrace.ingest
+              - metrics.ingest

package/lib/init/template/dynatrace/files/package.json.hbs

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "@cap-js/telemetry": ">=0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "^0"{{#hasHelm}},
+    "@opentelemetry/exporter-trace-otlp-proto": "^0",
+    "@opentelemetry/host-metrics": "^0"
+    {{/hasHelm}}
+  },
+  "cds": {
+    "requires": {
+      "telemetry": "to-dynatrace"
+    }
+  }
+}

package/lib/init/template/dynatrace/index.js

@@ -0,0 +1,55 @@
+const { merge, sort } = require('../../merge')
+
+const { readProject } = require('../../projectReader')
+const { srv4, mtxSidecar4 } = require('../../registries/mta')
+
+module.exports = class extends require('../../plugin') {
+
+  static hasInProduction(env) {
+    return env.requires?.telemetry?.kind === 'to-dynatrace'
+  }
+
+  async canRun() {
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
+    if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add dynatrace' is not available for Kyma yet`
+    return true
+  }
+
+  async run() {
+    const project = readProject()
+    await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+    await sort('package.json', 'dependencies')
+  }
+
+  async combine() {
+    const project = readProject()
+    const { hasMta, isJava, hasMultitenancy, srvPath } = project
+
+    if (hasMta) {
+      const dynatrace = {
+        in: 'resources',
+        where: {
+          type: 'org.cloudfoundry.managed-service',
+          'parameters.service': 'dynatrace'
+        }
+      }
+      const srv = srv4(srvPath)
+      const additions = [srv, dynatrace]
+      const relationships = [{
+        insert: [dynatrace, 'name'],
+        into: [srv, 'requires', 'name']
+      }]
+      if (hasMultitenancy) {
+        const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
+        additions.push(mtxSidecar)
+        relationships.push({
+          insert: [dynatrace, 'name'],
+          into: [mtxSidecar, 'requires', 'name']
+        })
+      }
+      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+        with: project, additions, relationships
+      })
+    }
+  }
+}

package/lib/init/template/hana/files/containerize.yaml.hbs

@@ -3,8 +3,13 @@ modules:
   - name: {{appName}}-hana-deployer
     build-parameters:
       buildpack:
+        {{#hasHelmUnifiedRuntime}}
+        builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
+        {{/hasHelmUnifiedRuntime}}
+        {{^hasHelmUnifiedRuntime}}
         type: nodejs
         builder: builder-jammy-base
+        {{/hasHelmUnifiedRuntime}}
         path: {{& db.path}}
         env:
           BP_NODE_RUN_SCRIPTS: ""

package/lib/init/template/hana/files/package.json.hbs

@@ -1,10 +1,13 @@
 {
   "dependencies": {
     "@cap-js/hana": "^1"
-  }{{#profile}},
+  },
   {{#isNodejs}}
   "cds": {
   {{/isNodejs}}
+    "sql": {
+      "native_hana_associations": false
+    }{{#profile}},
     "requires": {
       "[{{profile}}]": {
       {{#shortcut}}
@@ -16,9 +19,8 @@
         }
       {{/shortcut}}
       }
-    }
+    }{{/profile}}
   {{#isNodejs}}
   }
   {{/isNodejs}}
-  {{/profile}}
 }

package/lib/init/template/handler/index.js

@@ -0,0 +1,22 @@
+const { readProject } = require('../../projectReader')
+const mvn = require('../../mvn')
+
+
+module.exports = class Handler extends require('../../plugin') {
+
+  static help() {
+    return 'add handler stubs' 
+  }
+
+  canRun() {
+    const { isJava } = readProject()
+    if (!isJava) {
+      throw `No Java project detected. 'cds add handler' is currently only supported for Java projects.\n`
+    }
+    return true
+  }
+
+  async run() {
+    await mvn.generate('handler')
+  }
+}

package/lib/init/template/helm/index.js

@@ -93,7 +93,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasMalwareScanner } = readProject()
+        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner } = readProject()
 
         if (hasApprouter) {
             await this._mergeDependency('web-application', 'approuter')
@@ -133,6 +133,10 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         if (hasKafka) {
             await this._mergeDependency('service-instance', 'kafka')
         }
+        if (hasPortal) {
+            await this._mergeDependency('service-instance', 'portal')
+            await this._mergeDependency('content-deployment', 'portal-deployer')
+        }
         if (hasMalwareScanner) {
             await this._mergeDependency('service-instance', 'malware-scanner')
         }

package/lib/init/template/html5-repo/index.js

@@ -5,6 +5,11 @@ const { srv4, html5RepoHost, html5Runtime, appDeployer, approuter, mtxSidecar4 }
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
+    requires() {
+        const { hasHelm, hasHelmUnifiedRuntime } = readProject()
+        if (hasHelm || hasHelmUnifiedRuntime) return ['destination']
+    }
+
     static help() {
         return 'SAP BTP HTML5 Application Repository'
     }

package/lib/init/template/http/index.js

@@ -178,7 +178,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
             let id
             const compositeKey = Object.keys(e.keys).length > 1
             if (compositeKey) {
-              id = e.keys.map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
+              id = [...e.keys].map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
             } else {
               id = entityData[Object.keys(e.keys)[0]]
             }

package/lib/init/template/java/index.js

@@ -40,9 +40,9 @@ module.exports = class JavaTemplate extends require('../../plugin') {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw `Maven executable 'mvn' not found. Follow ${info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
             }
-            throw err;
+            throw err
         } finally {
-            await rimraf(temp);
+            await rimraf(temp)
         }
     }
 

package/lib/init/template/multitenancy/files/containerize.yaml.hbs

@@ -3,8 +3,13 @@ modules:
   - name: {{appName}}-sidecar
     build-parameters:
       buildpack:
+        {{#hasHelmUnifiedRuntime}}
+        builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
+        {{/hasHelmUnifiedRuntime}}
+        {{^hasHelmUnifiedRuntime}}
         type: nodejs
         builder: builder-jammy-base
+        {{/hasHelmUnifiedRuntime}}
         path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar{{#isJava}}/gen{{/isJava}}
         env:
           BP_NODE_RUN_SCRIPTS: ""

package/lib/init/template/portal/files/portal-site/CommonDataModel.json.hbs

@@ -19,7 +19,7 @@
           "viz": [
             {{#apps}}
             {
-              "appId": "{{appName}}.{{app}}",
+              "appId": "{{manifestAppId}}",
               "vizId": "{{vizId}}"
             }{{#isNotLast}},{{/isNotLast}}
             {{/apps}}
@@ -41,7 +41,7 @@
             {{#apps}}
             {
               "id": "{{appName}}{{app}}-001",
-              "appId": "{{appName}}.{{app}}",
+              "appId": "{{manifestAppId}}",
               "vizId": "{{vizId}}"
             }{{#isNotLast}},{{/isNotLast}}
             {{/apps}}

package/lib/init/template/portal/files/values.yaml.hbs

@@ -0,0 +1,43 @@
+---
+approuter:
+    bindings:
+        portal:
+            serviceInstanceName: portal
+portal:
+    serviceOfferingName: portal
+    servicePlanName: standard
+portal-deployer:
+  image:
+    repository: {{appName}}-portalcontent
+  resources:
+    limits:
+      ephemeral-storage: 1G
+      memory: 500M
+    requests:
+      ephemeral-storage: 1G
+      cpu: 500m
+      memory: 500M
+  bindings:
+    auth:
+      serviceInstanceName: xsuaa
+    html5-apps-repo-host:
+      serviceInstanceName: html5-apps-repo-host
+    portal:
+      serviceInstanceName: portal
+{{=<% %>=}}
+  env:
+    SERVICE_BINDING_ROOT: /bindings
+    BPL_VCAP_SERVICES_ENABLED: "true"
+    XSUAA_CREDENTIALS:
+      secretKeyRef:
+        name: "{{ .Release.Name }}-approuter-auth"
+        key: credentials
+    REPOHOST_CREDENTIALS:
+      secretKeyRef:
+        name: "{{ .Release.Name }}-html5-apps-deployer-html5-apps-repo"
+        key: credentials
+    PORTAL_CREDENTIALS:
+      secretKeyRef:
+        name: "{{ .Release.Name }}-approuter-portal"
+        key: credentials
+<%={{ }}=%>

package/lib/init/template/portal/index.js

@@ -29,7 +29,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { isJava, hasMta, srvPath, hasHtml5Repo, hasXsuaa, hasApprouter, hasMultitenancy } = project
+    const { isJava, hasMta, srvPath, hasHtml5Repo, hasXsuaa, hasApprouter, hasMultitenancy, hasHelm, hasHelmUnifiedRuntime } = project
 
     if (hasMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
@@ -79,6 +79,8 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       })
     }
 
-    // if (hasHelm) TODO
+    if (hasHelm || hasHelmUnifiedRuntime) {
+      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+    }
   }
 }

package/lib/init/template/telemetry/index.js

@@ -0,0 +1,19 @@
+const cds = require('../../../cds')
+const { readProject } = require('../../projectReader')
+
+module.exports = class extends require('../../plugin') {
+
+  static hasInProduction(env) {
+    return !!env.requires?.telemetry || cds.cli.argv?.includes('telemetry') || !!cds.cli.options?.add?.telemetry
+  }
+
+  async canRun() {
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
+    if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add telemetry' is not available for Kyma yet`
+    return true
+  }
+
+  requires() {
+    return ['cloud-logging']
+  }
+}

package/lib/init/template/typescript/files/package.json

@@ -5,8 +5,6 @@
     "typescript": "^5"
   },
   "scripts": {
-    "watch": "cds-ts w",
-    "build:ts": "tsc",
-    "build": "cds build && npm run build:ts"
+    "watch": "cds-ts w"
   }
 }

package/lib/mtx/auth_manager.js

@@ -12,20 +12,25 @@ const REASONS = { invalid_scope: /\binvalid_scope\b/ };
 
 function assign(params, authData) {
     if (authData?.access_token) {
-        let message = 'Retrieved access token';
         params.set('token', authData.access_token);
+        const refresh = authData.refresh_token && params.get('saveRefreshToken');
+        if (refresh) {
+            params.set('refreshToken', authData.refresh_token);
+        } else {
+            params.delete('refreshToken');
+        }
+
+        let message = 'Retrieved access token';
         if (authData.expires_in) {
             params.set('tokenExpirationDate', Date.now() + authData.expires_in * 1000);
             if (params.get('saveData')) {
-                message += ` (expires on ${(new Date(params.get('tokenExpirationDate'))).toLocaleString()})`;
+                message += ` (${refresh ? 'refreshed' : 'expiring'} after ${(new Date(params.get('tokenExpirationDate'))).toLocaleString()})`;
             }
         } else {
             params.delete('tokenExpirationDate');
-        }
-        if (authData.refresh_token) {
-            params.set('refreshToken', authData.refresh_token);
-        } else {
-            params.delete('refreshToken');
+            if (params.get('saveData') && refresh) {
+                message += ' (will be refreshed after expiry)';
+            }
         }
         console.log(message + '.');
     }
@@ -132,14 +137,6 @@ module.exports = class AuthManager {
                 throw getMessage('Failed to login', { error });
             }
             params.set('reqAuth', { headers: { Authorization: 'Bearer ' + params.get('token') } });
-            if (params.has('refreshToken') && params.get('saveData')) {
-                if (params.get('saveRefreshToken')) {
-                    console.log('Refresh Token saved. Token will be refreshed automatically.');
-                } else {
-                    console.log(`Note: Refresh Token is not saved by default for security reasons. Use '--save-refresh-token' to override.`);
-                    params.delete('refreshToken');
-                }
-            }
         }
 
         if (params.get('saveData')) {

package/lib/mtx/settings_manager.js

@@ -13,7 +13,7 @@ const Question = require('./util/question');
 const { httpSchema, httpsSchema, schemaRegex, localhostRegex } = require('./util/urls');
 const { capitalize } = require('./util/strings');
 
-const DEBUG = cds.debug('cli');
+const LOG = cds.log('cli'), DEBUG = cds.debug('cli');
 
 const { ParamCollection, Persistence } = require('./params');
 

package/lib/mtx/util/logging.js

@@ -1,10 +1,10 @@
- 
+const cds = require('../../cds')
 
 function getMessage(errorText, { error, command, help = command && getCommandHelp(command) } = {}) {
+    const DEBUG = cds.log('cli')._debug
     let message = errorText ? errorText.trim() : '';
     if (error) {
-        const debug = require('../../cds').debug('cli');
-        const includeStack = debug && error.stack?.includes('\n');
+        const includeStack = DEBUG && error.stack?.includes('\n');
         if (message.length) {
             message = message.replace(/(?<!\p{P})$/u, ':'); // Append colon if no punctuation at the end
             message += includeStack ? '\n' : ' ';
@@ -17,7 +17,7 @@ function getMessage(errorText, { error, command, help = command && getCommandHel
             message += (oriMsg ? '\n' : '') + error.stack;
         }
         if (error.cause) {
-            if (debug) {
+            if (DEBUG) {
                 message += '\nCaused by: ' + getMessage('', { error: error.cause }).replace(/^(?= *at)/gm, '  ');
             } else if (error.cause.status) {
                 message += `\nHTTP status: ${error.cause.status}`;

package/lib/util/cf.js

@@ -16,6 +16,8 @@ const DEBUG = cds.debug('cli');
 
 const { bold, warn } = require('./term');
 
+const { URLS } = require('../init/constants');
+
 const CF_COMMAND = 'cf';
 
 const POLL_COUNTER = 40;
@@ -41,7 +43,7 @@ module.exports = new class CfUtil {
     async cfRun(...args) {
         args = args.map(arg => arg.replace(/"/g, '\\"'));
         const cmdLine = `${CF_COMMAND} "${args.join('" "')}"`;
-        DEBUG && console.time(cmdLine);
+        DEBUG?.time(cmdLine);
         LOG.debug('>>>', cmdLine);
 
         try {
@@ -55,9 +57,14 @@ module.exports = new class CfUtil {
         } catch (err) {
             err.stdout = err.stdout?.trim();
             err.stderr = err.stderr?.trim();
+
+            if (err.stderr.includes('command')) {
+                throw err.message + `\nPlease install the Cloud Foundry CLI from ${URLS.CF_CLI}`;
+            }
+
             throw err;
         } finally {
-            DEBUG && console.timeEnd(cmdLine);
+            DEBUG?.timeEnd(cmdLine);
         }
     }
 
@@ -84,10 +91,13 @@ module.exports = new class CfUtil {
             } else {
                 response = (await axios.get(url, options));
             }
-            if (DEBUG) {
+            if (LOG._debug) {
                 options.headers.Authorization = 'bearer <token>';
                 LOG.debug(`POST ${url}\n${JSON.stringify(options, null, 4)}\n${JSON.stringify(response.data, null, 4)}`);
             }
+
+            // require('../../test/testUtil/recorder').record(urlPath, options.params, response.data, 'cf.json');
+
             return response.data;
         } catch (err) {
             if (err instanceof axios.AxiosError) {
@@ -234,7 +244,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                     return serviceInstance;
 
                 case OPERATION_STATE_FAILED:
-                    if (!DEBUG && serviceInstance?.last_operation?.description) {
+                    if (!LOG._debug && serviceInstance?.last_operation?.description) {
                         throw serviceInstance.last_operation.description;
                     }
                     throw `The returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`;
@@ -331,7 +341,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                 }
 
                 case OPERATION_STATE_FAILED:
-                    if (!DEBUG && binding?.last_operation?.description) {
+                    if (!LOG._debug && binding?.last_operation?.description) {
                         throw binding.last_operation.description;
                     }
                     throw `The returned binding reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(binding, null, 4)}`;

package/lib/util/command.js

@@ -1,7 +1,7 @@
 const cp = require('child_process');
 const os = require('os');
 const cds = require('../cds');
-const DEBUG = cds.debug('cli');
+const LOG = cds.log('cli'), DEBUG = cds.debug('cli');
 
 
 const { IS_WIN } = require('../init/constants');
@@ -29,14 +29,14 @@ class CommandUtil {
             const child = this._getChildProcess(cmd, args, options);
 
             // use inplace methods to ensure logger is called in context
-            const stdLogBuffer = new LogBuffer(showOutput || DEBUG ? (chunk) => console.log(chunk) : undefined, collectResult);
+            const stdLogBuffer = new LogBuffer(showOutput || LOG._debug ? (chunk) => console.log(chunk) : undefined, collectResult);
             child.stdout.on('data', (chunk) => {
                 stdLogBuffer.handleChunk(chunk);
             });
 
             // use inplace methods to ensure logger is called in context
             // collect error log in case of Win to handle command not found (ENOENT),
-            const errLogBuffer = new LogBuffer(showOutput || DEBUG ? (chunk) => console.error(chunk) : undefined, (IS_WIN || collectResult));
+            const errLogBuffer = new LogBuffer(showOutput || LOG._debug ? (chunk) => console.error(chunk) : undefined, (IS_WIN || collectResult));
             child.stderr.on('data', (chunk) => {
                 errLogBuffer.handleChunk(chunk);
             });

package/lib/watch/livereload-server.js

@@ -1,5 +1,5 @@
 const cds = require('../cds')
-const DEBUG = cds.debug('cli|watch|livereload')
+const LOG = cds.log('cli|watch|livereload'), DEBUG = cds.debug('cli|watch|livereload')
 
 const axios = require('axios')
 const ws = require('ws')
@@ -70,7 +70,7 @@ module.exports = class LiveReload {
             }
           })
         })
-        if (DEBUG) {
+        if (LOG._debug) {
           server.on('close', () => DEBUG('⚡️','cds watch - livereload closed'))
           this.wsServer.on('close', () => DEBUG('⚡️','cds watch - web socket closed'))
           this.wsServer.on('error', (e) => DEBUG(e))
@@ -92,7 +92,7 @@ module.exports = class LiveReload {
         return isIn
       }
       const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
-      if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - livereload file watcher closed'))
+      if (LOG._debug) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - livereload file watcher closed'))
       watcher.on('change', _coalesceEvents(delay, (files) => {
         DEBUG?. (`livereload for: ${files.map(f => f.name)}`)
         this.markPending(files.map(f => f.name))