fix: ctrl+c not working

rejetto · Jan 16, 2022 · 1cb188c · 1cb188c
1 parent 35758b9
commit 1cb188c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/misc.ts b/src/misc.ts
@@ -71,16 +71,16 @@ export function randomId(len = 10) {
         .replace(/l/g, 'L'); // avoid confusion reading l1
 }
 
-export function onProcessExit(cb: ()=>void) {
+export function onProcessExit(cb: (signal:string)=>void) {
     onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT'], cb)
 }
 
-export function onFirstEvent(emitter:EventEmitter, events: string[], cb: ()=> void) {
+export function onFirstEvent(emitter:EventEmitter, events: string[], cb: (...args:any[])=> void) {
     let already = false
     for (const e of events)
-        emitter.on(e, () => {
+        emitter.on(e, (...args) => {
             if (already) return
             already = true
-            cb()
+            cb(...args)
         })
 }
diff --git a/src/plugins.ts b/src/plugins.ts
@@ -177,7 +177,9 @@ function deleteModule(id: string) {
     }
 }
 
-onProcessExit(() => {
+onProcessExit(sig => {
     for (const pl of Object.values(plugins))
         pl.unload()
+    if (sig === 'SIGINT') // ctrl+c
+        setTimeout(()=> process.exit(0))
 })