@sap/cds-dk 7.2.0 → 7.3.1

package/lib/watch/livereload-server.js

@@ -5,9 +5,14 @@ const axios = require('axios')
 const ws = require('ws')
 const express = require('express')
 const { URL } = require('url')
+const { relative, sep } = require ('path')
+
+const ext = 'css,gif,html,jpg,png,svg,ts,mjs,cjs,js,json,properties,change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change'
+const watchIncludes = RegExp(`\\.(${ext.replace(/,/g,'|')})$|\\${sep}(webapp|appconfig)`)
+const watchExcludes = RegExp(`@cds-models\\${sep}|@types\\${sep}`)
 
 module.exports = class LiveReload {
-  async start(port) {
+  async start(port, cwd, delay=0) {
     if (!parseInt(port))  port = 35729
     this.files = []
 
@@ -43,7 +48,7 @@ module.exports = class LiveReload {
         this.wsServer.on('connection', (socket) => {
           DEBUG?.('Client connected')
           socket.on('message', (msg) => {
-            DEBUG?.('Client message', msg)
+            DEBUG?.('Client message', msg.toString())
             const request = JSON.parse(msg)
 
             if (request.command === 'hello') {
@@ -77,6 +82,24 @@ module.exports = class LiveReload {
         this.wsServer.close()
         server.close()
       })
+
+      // Watching for touched files...
+      const watch = require('node-watch')
+      const filter = f => {
+        const isIn = !watchExcludes.test(f) && watchIncludes.test(f)
+        if (!isIn)  DEBUG?. (`livereload ignored: ${relative(cwd||process.cwd(), f)}`)
+        // else        DEBUG?. (`livereload NOT ignored: ${relative(cwd||process.cwd(), f)}`, watchIncludes)
+        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'))
+      watcher.on('change', _coalesceEvents(delay, (files) => {
+        DEBUG?. (`livereload for: ${files.map(f => f.name)}`)
+        this.markPending(files.map(f => f.name))
+        this.reload()
+      }))
+      process.once('shutdown', ()=> watcher.close())
+
     })
   }
 
@@ -99,6 +122,19 @@ module.exports = class LiveReload {
   }
 }
 
+// reduces mutiple node-watch events in a time frame into a bulk
+function _coalesceEvents(delay, fn) {
+  let timer, cache = []
+  return function(type, name) { // node-watch callback signature
+    if (type) cache.push({type, name})
+    if (!timer) timer = setTimeout(() => {
+      fn(cache)
+      timer = null
+      cache = []
+    }, delay).unref();
+  }
+}
+
 function broadcast(data, sockets) {
   sockets.forEach(socket => {
     DEBUG?.(`Sending ${data}`)

package/lib/watch/node-watch.js

@@ -2,7 +2,7 @@ const cds = require ('../cds')
 const DEBUG = cds.debug('cli|watch')
 const { relative } = require('path')
 
-module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}, delay=200, options={} })=>{
+module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, options={} })=>{
 
   let child
 
@@ -52,10 +52,11 @@ module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}
 
   // Watching for touched files...
   const watch = require('node-watch')
-  const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$|${includes.source}`)
+  const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$`)
   const filter = f => {
     const isIn = !ignore.test(f) && include.test(f)
     if (!isIn)  DEBUG?. (`ignored: ${relative(cwd||process.cwd(), f)}`)
+    // else  DEBUG?. (`NOT ignored: ${relative(cwd||process.cwd(), f)}`, include.test(f), include)
     return isIn
   }
   const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })