1.0.11

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartexit",
-  "version": "1.0.6",
+  "version": "1.0.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartexit",
-  "version": "1.0.6",
+  "version": "1.0.11",
   "private": false,
   "description": "do things before one exists a process",
   "main": "dist/index.js",
@@ -21,6 +21,7 @@
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.5"
+    "@pushrocks/lik": "^3.0.5",
+    "@pushrocks/smartdelay": "^2.0.3"
   }
 }

ts/index.ts

@@ -2,7 +2,7 @@ import * as plugins from './smartexit.plugins';
 
 export class SmartExit {
   public processesToEnd = new plugins.lik.Objectmap<plugins.childProcess.ChildProcess>();
-  
+
   /**
    * adds a process to be exited
    * @param childProcessArg
@@ -19,36 +19,49 @@ export class SmartExit {
   }
 
   public async killAll() {
-    console.log('Checking for remaining child processes before exit...');
+    console.log('SMARTEXIT: Checking for remaining child processes before exit...');
     if (this.processesToEnd.getArray().length > 0) {
       console.log('found remaining child processes');
       let counter = 1;
       this.processesToEnd.forEach(async childProcessArg => {
-        console.log(`killing process #${counter}`);
-        childProcessArg.kill('SIGINT');
+        const pid = childProcessArg.pid;
+        console.log(`SMARTEXIT: killing process #${counter} with pid ${pid}`);
+        plugins.smartdelay.delayFor(10000).then(() => {
+          if (childProcessArg.killed) {
+            return;
+          }
+          process.kill(-pid, 'SIGKILL');
+        });
+        process.kill(-pid, 'SIGINT');
+        
         counter++;
       });
     } else {
-      console.log(`Everything looks clean. Ready to exit!`);
+      console.log(`SMARTEXIT: Everything looks clean. Ready to exit!`);
     }
   }
 
   constructor() {
     // do app specific cleaning before exiting
-    process.on('exit', async () => {
-      await this.killAll();
+    process.on('exit', async (code) => {
+      if (code === 0) {
+        console.log('SMARTEXIT: Process wants to exit');
+        await this.killAll();
+      }
     });
 
     // catch ctrl+c event and exit normally
     process.on('SIGINT', async () => {
-      console.log('Ctrl-C...');
+      console.log('SMARTEXIT: Ctrl-C... or SIGINT signal received!');
       await this.killAll();
     });
 
     //catch uncaught exceptions, trace, then exit normally
     process.on('uncaughtException', async err => {
-      console.log('Ctrl-C...');
+      console.log('SMARTEXIT: uncaught exception...');
+      console.log(err);
       await this.killAll();
+      process.exit(1);
     });
   }
 }

ts/smartexit.plugins.ts

@@ -5,5 +5,6 @@ export { childProcess };
 
 // pushrocks scope
 import * as lik from '@pushrocks/lik';
+import * as smartdelay from '@pushrocks/smartdelay';
 
-export { lik };
+export { lik, smartdelay };