Exit command

Author: kerfouffle

packages/server/src/server/services/remoteConfigService/commands.ts

@@ -70,35 +70,38 @@ Available Commands:
                             -> last_fcm_restart: number
                             -> start_via_terminal: boolean
     - show:             Show the current configuration for an item -> \`show <config item>\`
+    - exit:             Exit the configurator
 \n[===============================================================================]`;
 
 
-export async function handleLine (line: string) {
+export async function handleLine (line: string) : Promise<[string, boolean]> {
     line = line.trim();
-    if (line === "") return;
+    if (line === "") return ['', true];
 
     // Handle the standard input
     const parts = line.split(" ");
-    if (isEmpty(parts)) return;
+    if (isEmpty(parts)) return ['', true];
 
     if (!Server()) {
-        return "Server is not running???????";
+        return ["Server is not running???????", true];
     }
 
     switch (parts[0].toLowerCase()) {
         case "help":
-            return help;
+            return [help, true];
         case "set":
-            return await handleSet(parts);
+            return [await handleSet(parts), true];
             break;
         case "show":
-            return await handleShow(parts);
+            return [await handleShow(parts), true];
             break;
         case "restart":
         case "relaunch":
             Server().relaunch();
-            return "Okay, restarting";
+            return ["Okay, restarting", true];
+        case "exit":
+            return ["Thank you for using the Bluebubbles configurator!", false];
         default:
-            return "Unrecognized command. Type 'help' for help.";
+            return ["Unrecognized command. Type 'help' for help.", true];
     }
 }

packages/server/src/server/services/remoteConfigService/index.ts

@@ -6,7 +6,7 @@ import { app } from "electron";
 import { handleLine } from "./commands";
 
 
-const PROMPT = 'bluebubbles-config>';
+const PROMPT = 'bluebubbles-configurator>';
 
 
 export class RemoteConfigService {
@@ -55,7 +55,7 @@ export class RemoteConfigService {
         this.clients.add(client);
         const lineExtractor = new LineExtractor();
 
-        client.write(`Welcome to the BlueBubbles remote configurator!\nType 'help' for help.\nPress Ctrl-D or Ctrl-C to exit the remote configurator.\n${PROMPT} `);
+        client.write(`Welcome to the BlueBubbles configurator!\nType 'help' for help.\nType 'exit' to exit.\n${PROMPT} `);
 
         client.on("data", async (data: Buffer) => {
             for (const line of lineExtractor.feed(data)) {
@@ -74,19 +74,23 @@ export class RemoteConfigService {
 
     private async handleLine (client: net.Socket, line: string) {
         this.log(`Remote Config Service client received line: ${JSON.stringify(line)}`, "debug");
-        const response = await handleLine(line);
+        const [response, keepOpen] = await handleLine(line);
         if (response) {
             client.write(`${response}\n`);
         }
-        client.write(`${PROMPT} `);
+        if (keepOpen) {
+            client.write(`${PROMPT} `);
+        }
+        else {
+            client.destroy();
+        }
     }
 
     private closeServer () {
         if (this.server === null) {
             return;
         }
         this.server.close();
-        fs.unlinkSync(this.socketPath);
         this.server = null;
     }