epos 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epos",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "author": "imkost",
   "description": "",
   "keywords": [],
@@ -10,7 +10,7 @@
     "dev": "node ./src/kit/kit-bin.js"
   },
   "bin": {
-    "epos": "./src/kit/kit-bin.js"
+    "epos": "src/kit/kit-bin.js"
   },
   "exports": {
     ".": {

package/src/kit/kit-server.js

@@ -6,21 +6,34 @@ import $yaml from 'js-yaml'
 import $chokidar from 'chokidar'
 import * as $ws from 'ws'
 
+// TODO: handle 'port in use' error
+// TODO: epos-kit as separate package (?) but bin: epos
 const $server = {
   async init(dir = '/Users/imkost/z/epos') {
     this._dir = dir
-    this._wsPort = 2217
-    this._httpPort = 2218
+    this._port = 4322
     this._maxFiles = 10_000
     this._pkgs = {} // { [path]: { name, dir, watcher } }
-    await this._start()
+    const httpServer = await this._startHttpServer()
+    await this._startMainWatcher()
+    this._wss = await this._startWebSocketServer(httpServer)
+    console.log('⚡ running')
   },
 
-  async _start() {
-    const watcherReady = Promise.withResolvers()
-    const httpServerReady = Promise.withResolvers()
+  async _startWebSocketServer(httpServer) {
+    // TODO: handle port in use error
+    const wss = new $ws.WebSocketServer({ server: httpServer })
+    wss.on('error', e => {
+      console.warn('##############')
+    })
+    wss.on('open', () => {
+      console.warn('connection')
+    })
+    return wss
+  },
 
-    const wss = new $ws.WebSocketServer({ port: this._wsPort })
+  async _startMainWatcher() {
+    const watcherReady = Promise.withResolvers()
     const watcher = $chokidar.watch(this._dir, { ignored: this._ignored })
 
     // initial scan
@@ -45,7 +58,7 @@ const $server = {
     watcher.on('add', async path => {
       const isEposManifest = variants.has($path.basename(path))
       if (!isEposManifest) return
-      const pkg = await this._createPkgWatcher(path, wss)
+      const pkg = await this._createPkgWatcher(path)
       if (!pkg) return
       this._pkgs[path] = pkg
     })
@@ -57,7 +70,11 @@ const $server = {
       delete this._pkgs[path]
     })
 
-    // static server
+    await watcherReady.promise
+  },
+
+  async _startHttpServer() {
+    const httpServerReady = Promise.withResolvers()
     const httpServer = $http.createServer(async (req, res) => {
       const pkgName = req.url.split('/')[1]
       const pkg = Object.values(this._pkgs).find(p => p.name === pkgName)
@@ -83,17 +100,19 @@ const $server = {
         }
       }
     })
-    httpServer.listen(this._httpPort, () => {
+    httpServer.listen(this._port, () => {
       httpServerReady.resolve()
     })
 
-    await watcherReady.promise
-    await httpServerReady.promise
+    httpServer.on('error', e => {
+      console.warn(e)
+    })
 
-    console.log('⚡ running')
+    await httpServerReady.promise
+    return httpServer
   },
 
-  async _createPkgWatcher(manifestPath, wss) {
+  async _createPkgWatcher(manifestPath) {
     const isJson = manifestPath.endsWith('.json')
     const content = await $fs.readFile(manifestPath, 'utf-8')
     const manifest = isJson ? JSON.parse(content) : $yaml.load(content)
@@ -108,7 +127,7 @@ const $server = {
 
     watcher.on('all', (event, path) => {
       const data = JSON.stringify({ name: pkgName, path: $path.relative(dir, path) })
-      for (const client of wss.clients) {
+      for (const client of this._wss.clients) {
         if (client.readyState !== 1) continue
         client.send(data)
       }