Merge pull request #664 from BlueBubblesApp/development

v1.9.8 Continued

packages/server/.gitignore

@@ -2,7 +2,7 @@ node_modules/
 !dist/
 dist/*
 !dist/dev-app-update.yml
-release/
+releases/
 .vscode
 .DS_Store
 **/*.log

packages/server/package.json

@@ -125,7 +125,6 @@
         "typeorm": "^0.3.20",
         "uuid": "^9.0.1",
         "validatorjs": "^3.22.1",
-        "vcf": "^2.1.1",
-        "zx": "^4.3.0"
+        "vcf": "^2.1.1"
     }
 }

packages/server/src/main.ts

@@ -111,6 +111,15 @@ app.on("window-all-closed", () => {
  */
 app.on("before-quit", event => handleExit(event));
 
+process.on("SIGTERM", async () => {
+    log.debug("Received SIGTERM, exiting...");
+    await handleExit(null, { exit: false });
+});
+process.on("SIGINT", async () => {
+    log.debug("Received SIGINT, exiting...");
+    await handleExit(null, { exit: false });
+});
+
 /**
  * All code below this point has to do with the command-line functionality.
  * This is when you run the app via terminal, we want to give users the ability

packages/server/src/server/api/http/index.ts

@@ -10,7 +10,6 @@ import koaCors from "koa-cors";
 import * as https from "https";
 import * as http from "http";
 import * as fs from "fs";
-import * as zx from "zx";
 
 // Internal libraries
 import { Server } from "@server";
@@ -26,6 +25,7 @@ import { HELLO_WORLD } from "@server/events";
 import { ScheduledService } from "../../lib/ScheduledService";
 import { Loggable } from "../../lib/logging/Loggable";
 import { ProxyServices } from "@server/databases/server/constants";
+import { ProcessSpawner } from "@server/lib/ProcessSpawner";
 
 /**
  * This service class handles all routing for incoming socket
@@ -152,9 +152,15 @@ export class HttpService extends Loggable {
     async checkIfPortInUse(port: number) {
         try {
             // Check if there are any listening services
-            zx.$.verbose = false;
-            const output = await zx.$`lsof -nP -iTCP -sTCP:LISTEN | grep ${port}`;
-            if (output.toString().includes(`:${port} (LISTEN)`)) return true;
+            const output = await ProcessSpawner.executeCommand('lsof', [
+                '-nP',
+                '-iTCP',
+                '-sTCP:LISTEN',
+                '|',
+                'grep',
+                `${port}`
+            ], {}, "PortChecker");
+            if (output.includes(`:${port} (LISTEN)`)) return true;
         } catch {
             // Don't show an error, I believe this throws a "false error".
             // For instance, if the proxy service doesn't start, and the command returns