Switch network cleanup to beforeExit (#497)

fixes #424
project-chip · Nov 8, 2023 · f1d82f9 · f1d82f9
1 parent 50202f5
commit f1d82f9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/packages/matter-node.js-examples/src/examples/BridgedDevicesNode.ts b/packages/matter-node.js-examples/src/examples/BridgedDevicesNode.ts
@@ -235,6 +235,7 @@ device
     .catch(err => console.error(err));
 
 process.on("SIGINT", () => {
+    // Clean up on CTRL-C
     device
         .stop()
         .then(() => {

diff --git a/packages/matter-node.js-examples/src/examples/ComposedDeviceNode.ts b/packages/matter-node.js-examples/src/examples/ComposedDeviceNode.ts
@@ -233,6 +233,7 @@ device
     .catch(err => console.error(err));
 
 process.on("SIGINT", () => {
+    // Clean up on CTRL-C
     device
         .stop()
         .then(() => {

diff --git a/packages/matter-node.js-examples/src/examples/ControllerNode.ts b/packages/matter-node.js-examples/src/examples/ControllerNode.ts
@@ -336,6 +336,7 @@ class ControllerNode {
 new ControllerNode().start().catch(error => logger.error(error));
 
 process.on("SIGINT", () => {
+    // Clean up on CTRL-C
     // Pragmatic way to make sure the storage is correctly closed before the process ends.
     storage
         .close()

diff --git a/packages/matter-node.js-examples/src/examples/DeviceNode.ts b/packages/matter-node.js-examples/src/examples/DeviceNode.ts
@@ -288,6 +288,7 @@ device
     .catch(err => console.error(err));
 
 process.on("SIGINT", () => {
+    // Clean up on CTRL-C
     device
         .stop()
         .then(() => {

diff --git a/packages/matter-node.js-examples/src/examples/MultiDeviceNode.ts b/packages/matter-node.js-examples/src/examples/MultiDeviceNode.ts
@@ -248,6 +248,7 @@ device
     .catch(err => console.error(err));
 
 process.on("SIGINT", () => {
+    // Clean up on CTRL-C
     device
         .stop()
         .then(() => {

diff --git a/packages/matter-node.js/src/net/register.ts b/packages/matter-node.js/src/net/register.ts
@@ -16,7 +16,7 @@ try {
     if (error instanceof NoProviderError) {
         Network.get = singleton(() => new NetworkNode());
         // When we initialize anything we also need to make st is closed correctly
-        process.on("SIGINT", () => void Network.get().close());
+        process.on("beforeExit", () => void Network.get().close());
     } else {
         throw error;
     }