xp-command 1.6.0 → 1.6.2

package/bin/index.js

@@ -24,7 +24,7 @@ import {
 import { copyToClipboard } from "../src/clipboard.js";
 import { editConfig, getConfig } from "../src/config.js";
 import { clearLine, hideCursor, showCursor } from "../src/console.js";
-import { isAPIError, isEconnRefused } from "../src/error.js";
+import { isAPIError, isConfigError, isEconnRefused } from "../src/error.js";
 import history from "../src/history.js";
 import { Logger } from "../src/logger.js";
 import { sleep } from "../src/sleep.js";
@@ -64,6 +64,17 @@ const processCommand = async (command) => {
       showCursor();
       return false;
     }
+    if (isConfigError(error)) {
+      spinner.fail(
+        chalk.red(
+          `${PREFIX} Config error${typeof error.reason === "string" ? " - " + error.reason : ""}`,
+        ),
+      );
+      hideCursor();
+      await sleep(1500);
+      showCursor();
+      return false;
+    }
   }
 
   if (command?.toLowerCase() === "config") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xp-command",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Quick cockpit commands for X-Plane 12 - set your radios, altimeter, autopilot, and more from the terminal while flying.",
   "keywords": [
     "xplane",

package/src/clipboard.js

@@ -1,19 +1,26 @@
-import { exec } from "child_process";
+import { spawn } from "child_process";
 
 /**
  * @param {string|number} text
  */
 export const copyToClipboard = async (text) => {
-  const command =
+  const cmd =
     process.platform === "win32"
-      ? `echo ${text} | clip`
+      ? { cmd: "clip", args: [] }
       : process.platform === "darwin"
-        ? `echo "${text}" | pbcopy`
-        : `echo "${text}" | xclip -selection clipboard`;
+        ? { cmd: "pbcopy", args: [] }
+        : { cmd: "xclip", args: ["-selection", "clipboard"] };
 
-  await new Promise((resolve) => {
-    exec(command, () => {
-      resolve();
-    });
+  return new Promise((resolve, reject) => {
+    const proc = spawn(cmd.cmd, cmd.args);
+    proc.stdin.write(
+      String(text)
+        .split("\n")
+        .filter((line) => !!line.trim())
+        .join("\n"),
+    );
+    proc.stdin.end();
+    proc.on("close", resolve);
+    proc.on("error", reject);
   });
 };

package/src/error.js

@@ -11,6 +11,13 @@ export const isEconnRefused = (error) => {
   );
 };
 
+/**
+ * @param {unknown} error
+ */
+export const isConfigError = (error) => {
+  return Boolean(error instanceof Error && error.name === "YAMLException");
+};
+
 /**
  * @param {unknown} error
  */