epos 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epos",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "author": "imkost",
   "description": "",
   "keywords": [],
@@ -9,7 +9,7 @@
   "scripts": {
     "dev": "node ./src/kit/kit-bin.js",
     "lint": "eslint ./src",
-    "publish": "npm publish --loglevel=error"
+    "release": "npm publish --loglevel=error"
   },
   "bin": {
     "epos": "src/kit/kit-bin.js"

package/src/kit/kit-server.js

@@ -12,9 +12,9 @@ const $server = {
     this._port = 4322
     this._maxFiles = 10_000
 
-    this._pkgs = {} // { [path]: { name, dir, watcher } }
-    this._server = null
     this._wss = null
+    this._server = null
+    this._pkgs = {} // { [path]: { name, dir, watcher } }
 
     await this._initServer()
     await this._initWebSocket()
@@ -82,43 +82,51 @@ const $server = {
       ready.resolve()
     })
 
-    // watch added manifest files
+    // watch manifest files
     const variants = new Set(['epos.json', 'epos.yaml', 'epos.yml'])
-    watcher.on('add', async path => {
-      if (!variants.has($path.basename(path))) return
-      const pkg = await this._createPkgWatcher(path)
-      if (!pkg) return
-      this._pkgs[path] = pkg
-    })
+    watcher.on('all', async (event, path) => {
+      const isManifest = variants.has($path.basename(path))
+      if (!isManifest) return
+
+      // manifest removed? -> stop pkg watcher
+      if (event === 'unlink') {
+        if (!this._pkgs[path]) return
+        this._pkgs[path].watcher.close()
+        delete this._pkgs[path]
+        return
+      }
 
-    // watch removed manifest files
-    watcher.on('unlink', path => {
-      if (!this._pkgs[path]) return
-      this._pkgs[path].watcher.close()
-      delete this._pkgs[path]
+      // read manifest
+      let name = null
+      let manifest = null
+      try {
+        const isJson = path.endsWith('.json')
+        const content = await $fs.readFile(path, 'utf-8')
+        manifest = isJson ? JSON.parse(content) : $yaml.load(content)
+        name = manifest.name
+      } catch {}
+
+      // invalid manifest? -> stop pkg watcher
+      if (!name) {
+        if (!this._pkgs[path]) return
+        this._pkgs[path].watcher.close()
+        delete this._pkgs[path]
+        return
+      }
+
+      // create pkg watcher
+      const dir = $path.dirname(path)
+      const pkgWatcher = this._createPkgWatcher(name, dir)
+      this._pkgs[path] = { name, dir, watcher: pkgWatcher }
     })
 
     await ready.promise
   },
 
-  async _createPkgWatcher(manifestPath) {
-    // read manifest
-    const isJson = manifestPath.endsWith('.json')
-    const content = await $fs.readFile(manifestPath, 'utf-8')
-    const manifest = isJson ? JSON.parse(content) : $yaml.load(content)
-
-    // no name? -> ignore
-    const name = manifest.name
-    if (!name) return null
-
-    // create pkg dir watcher
-    const dir = $path.dirname(manifestPath)
-    const watcher = $chokidar.watch(dir, {
-      ignored: this._ignored,
-      ignoreInitial: true,
-    })
+  _createPkgWatcher(name, dir) {
+    const watcher = $chokidar.watch(dir, { ignored: this._ignored })
 
-    // broadcast changes
+    // broadcast all changes
     watcher.on('all', (event, path) => {
       const data = JSON.stringify({ name, path: $path.relative(dir, path) })
       for (const client of this._wss.clients) {
@@ -127,7 +135,7 @@ const $server = {
       }
     })
 
-    return { name, dir, watcher }
+    return watcher
   },
 
   async _handleRequest(req) {