fix(docz-core): close data server when need

packages/docz-core/package.json

@@ -63,7 +63,7 @@
     "progress-estimator": "^0.2.2",
     "react-dev-utils": "^6.1.1",
     "react-docgen-typescript-loader": "^3.0.0-rc.0",
-    "react-hot-loader": "^4.6.2",
+    "react-hot-loader": "^4.6.3",
     "rehype-docz": "^0.13.3",
     "rehype-slug": "^2.0.2",
     "remark-docz": "^0.13.3",
@@ -75,7 +75,7 @@
     "terser-webpack-plugin": "^1.1.0",
     "titleize": "^1.0.1",
     "url-loader": "^1.1.2",
-    "webpack": "^4.27.1",
+    "webpack": "^4.28.0",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-chain": "^5.0.1",
     "webpack-dev-server": "^3.1.10",

packages/docz-core/src/DataServer.ts

@@ -3,6 +3,7 @@ import WS from 'ws'
 import { touch } from './utils/fs'
 import { isFn } from './utils/helpers'
 import * as paths from './config/paths'
+import { onSignal } from './utils/on-signal'
 
 export type Send = (type: string, payload: any) => void
 export type On = (type: string) => Promise<any>
@@ -31,7 +32,7 @@ export interface State {
 }
 
 export class DataServer {
-  private server?: WS.Server
+  private client?: WS.Server
   private states: Set<State>
   private state: Record<string, any>
 
@@ -40,7 +41,11 @@ export class DataServer {
     this.state = {}
 
     if (server) {
-      this.server = new WS.Server({ server, port, host })
+      this.client = new WS.Server({
+        server,
+        port,
+        host,
+      })
     }
   }
 
@@ -65,13 +70,16 @@ export class DataServer {
   }
 
   public async listen(): Promise<void> {
-    if (this.server) {
-      this.server.on('connection', socket => {
+    if (this.client) {
+      this.client.on('connection', socket => {
         const close = this.handleConnection(socket)
-
-        this.server!.on('close', async () => {
+        const handleClose = async () => {
           await close()
-        })
+          socket.terminate()
+        }
+
+        this.client!.on('close', handleClose)
+        onSignal(handleClose)
       })
     }
   }
@@ -101,7 +109,7 @@ export class DataServer {
 
     return async () => {
       const fns = await Promise.all(states.filter(Boolean))
-      for (const fn of fns) fn && isFn(fn) && fn()
+      for (const fn of fns) isFn(fn) && fn()
     }
   }
 

packages/docz-core/src/commands/dev.ts

@@ -11,6 +11,7 @@ import { bundler as webpack } from '../webpack'
 import { Entries } from '../Entries'
 import { loadConfig } from '../utils/load-config'
 import { promiseLogger } from '../utils/promise-logger'
+import { onSignal } from '../utils/on-signal'
 
 export const dev = async (args: Config) => {
   const env = envDotProp.get('node.env')
@@ -35,7 +36,11 @@ export const dev = async (args: Config) => {
   }
 
   const server = await promiseLogger(app.start(), 'Starting your server')
-  const dataServer = new DataServer(server, websocketPort, config.websocketHost)
+  const dataServer = new DataServer(
+    server.listeningApp,
+    websocketPort,
+    config.websocketHost
+  )
 
   dataServer.register([
     states.config(newConfig),
@@ -47,14 +52,16 @@ export const dev = async (args: Config) => {
     await dataServer.listen()
   } catch (err) {
     logger.fatal('Failed to process your server:', err)
+    await dataServer.close()
     process.exit(1)
   }
 
-  const signals: any = ['SIGINT', 'SIGTERM']
-  for (const sig of signals) {
-    process.on(sig, async () => {
-      server.close()
-      process.exit()
-    })
-  }
+  onSignal(async () => {
+    await dataServer.close()
+    server.close()
+  })
+
+  server.listeningApp.on('close', async () => {
+    await dataServer.close()
+  })
 }

packages/docz-core/src/utils/on-signal.ts

@@ -0,0 +1,9 @@
+export const onSignal = (cb: () => any) => {
+  const signals: any = ['SIGINT', 'SIGTERM']
+  for (const sig of signals) {
+    process.on(sig, async () => {
+      await cb()
+      process.exit()
+    })
+  }
+}

packages/docz-core/src/webpack/devserver.ts

@@ -17,6 +17,7 @@ export const devServerConfig = (hooks: ServerHooks, args: Args) => {
   return {
     publicPath: '/',
     compress: true,
+    logLevel: args.debug ? 'debug' : 'none',
     clientLogLevel: args.debug ? 'info' : 'none',
     contentBase: [nonExistentDir],
     watchContentBase: true,