feat(cli): support exit event

koishijs · May 10, 2021 · 3ca3f72 · 3ca3f72
1 parent 8880c86
commit 3ca3f72
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/packages/koishi/index.d.ts b/packages/koishi/index.d.ts
@@ -5,6 +5,12 @@ export * from 'koishi-core'
 
 export type PluginConfig = Record<string, any> | (string | [string, any?])[]
 
+declare module 'koishi-core' {
+  interface EventMap {
+    'exit'(signal: NodeJS.Signals): Promise<void>
+  }
+}
+
 interface LogLevelConfig {
   // a little different from koishi-utils
   // we don't enforce user to provide a base here

diff --git a/packages/koishi/src/start.ts b/packages/koishi/src/start.ts
@@ -47,8 +47,17 @@ function createWorker(options: WorkerOptions) {
     }
   })
 
+  /**
+   * https://tldp.org/LDP/abs/html/exitcodes.html
+   * - 0: exit manually
+   * - 130: SIGINT
+   * - 137: SIGKILL
+   * - **114: exit and restart (Koishi)**
+   */
+  const closingCode = [0, 130, 137]
+
   child.on('exit', (code) => {
-    if (!config || (!config.autoRestart && code !== 114)) {
+    if (!config || closingCode.includes(code) || code !== 114 && !config.autoRestart) {
       process.exit(code)
     }
     createWorker(options)

diff --git a/packages/koishi/src/worker.ts b/packages/koishi/src/worker.ts
@@ -140,6 +140,14 @@ const app = new App(config)
 
 const { exitCommand, autoRestart = true } = config.deamon || {}
 
+const handleSignal = (signal: NodeJS.Signals) => {
+  new Logger('app').info(`terminated by ${signal}`)
+  app.parallel('exit', signal).finally(() => process.exit())
+}
+
+process.on('SIGINT', handleSignal)
+process.on('SIGTERM', handleSignal)
+
 template.set('deamon', {
   exiting: '正在关机……',
   restarting: '正在重启……',

diff --git a/packages/plugin-webui/src/stats.ts b/packages/plugin-webui/src/stats.ts
@@ -1,5 +1,6 @@
-import { Context, Channel, noop, Session, Logger, Bot, Platform, Time } from 'koishi-core'
+import { Context, Channel, noop, Session, Bot, Platform, Time } from 'koishi-core'
 import { DataSource } from './data'
+import {} from 'koishi'
 
 export type StatRecord = Record<string, number>
 
@@ -83,22 +84,7 @@ export class Statistics implements DataSource<Statistics.Payload> {
   average = average
 
   constructor(private ctx: Context, public config: Statistics.Config = {}) {
-    if (config.handleSignals !== false) {
-      const handleSignal = (signal: NodeJS.Signals) => {
-        new Logger('app').info(`terminated by ${signal}`)
-        this.upload(true).finally(() => process.exit())
-      }
-
-      ctx.on('connect', () => {
-        process.on('SIGINT', handleSignal)
-        process.on('SIGTERM', handleSignal)
-      })
-
-      ctx.before('disconnect', async () => {
-        process.off('SIGINT', handleSignal)
-        process.off('SIGTERM', handleSignal)
-      })
-    }
+    ctx.on('exit', () => this.upload(true))
 
     ctx.on('delegate/database', () => {
       this.sync = ctx.database.createSynchronizer()
@@ -254,7 +240,6 @@ export namespace Statistics {
   }
 
   export interface Config {
-    handleSignals?: boolean
     statsInternal?: number
   }