From 472fbf1317a8f9b74fcf5d842789108db0350ed6 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Fri, 12 Aug 2022 18:30:48 +0800
Subject: [PATCH 1/3] fix: Fix ckb process kill unexpected.

1. Sometime ckb process not emit close after call `ckb.kill`, so wait 1 second when stop process monitor.
2. Use kill(2) replace kill(), kill(2) means Sends a signal to a specified process, to all members of a specified process group, or to all processes on the system.
---
 packages/neuron-wallet/src/controllers/api.ts     | 2 +-
 packages/neuron-wallet/src/services/ckb-runner.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 86ed499dda..2488d9a9e7 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -496,7 +496,7 @@ export default class ApiController {
     })
 
     handle('stop-process-monitor', async (_, monitorName: string) => {
-      await stopMonitor(monitorName)
+      await Promise.race([stopMonitor(monitorName), CommonUtils.sleep(1000)])
       return {
         status: ResponseCode.Success,
       }
diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index a7eec6a131..f49a7cbd8a 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -114,7 +114,7 @@ export const stopCkbNode = () => {
     if (ckb) {
       logger.info('CKB:\tkilling node')
       ckb.once('close', () => resolve())
-      ckb.kill()
+      ckb.kill(2)
       ckb = null
     } else {
       resolve()

From 6b2597fcba60b092f39a755422e51ad07ee7c4a2 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Sat, 13 Aug 2022 08:47:33 +0800
Subject: [PATCH 2/3] fix: Use SIGKILL for kill parameter.

---
 packages/neuron-wallet/src/services/ckb-runner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index f49a7cbd8a..aeac9e28d1 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -114,7 +114,7 @@ export const stopCkbNode = () => {
     if (ckb) {
       logger.info('CKB:\tkilling node')
       ckb.once('close', () => resolve())
-      ckb.kill(2)
+      ckb.kill('SIGKILL')
       ckb = null
     } else {
       resolve()

From b312c79a47bec86d164def555f9e0bace6914264 Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Tue, 16 Aug 2022 10:42:35 +0800
Subject: [PATCH 3/3] fix: Fix CI error without npmlog type

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 9d8b788387..e2ae7c3e57 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "@babel/core": "7.17.10",
     "@types/jest": "27.5.0",
     "@types/node": "16.11.7",
+    "@types/npmlog": "4.1.2",
     "@typescript-eslint/eslint-plugin": "5.23.0",
     "@typescript-eslint/parser": "5.23.0",
     "concurrently": "7.0.0",