Update coffee extension

extensions/coffee/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Coffee Changelog
 
+## [Update] – 2024-05-24
+
+- Fixed an issue that caused the extension to crash when the `Caffeinate Status` command was disabled.
+
 ## [Update] – 2024-05-19
 
 - Replaced the form in the `Caffeinate For` command with arguments in the root search.

extensions/coffee/src/utils.ts

@@ -1,33 +1,24 @@
 import { getPreferenceValues, launchCommand, LaunchType, showHUD } from "@raycast/api";
 import { exec, execSync } from "node:child_process";
 
-function generateArgs(additionalArgs?: string) {
-  const preferences = getPreferenceValues<Preferences>();
-  const args = [];
-
-  if (preferences.preventDisplay) args.push("d");
-  if (preferences.preventDisk) args.push("m");
-  if (preferences.preventSystem) args.push("i");
-  if (additionalArgs) args.push(` ${additionalArgs}`);
-
-  return args.length > 0 ? `-${args.join("")}` : "";
-}
+type Preferences = {
+  preventDisplay: boolean;
+  preventDisk: boolean;
+  preventSystem: boolean;
+  icon: string;
+};
 
 type Updates = {
   menubar: boolean;
   status: boolean;
 };
 
-async function update(updates: Updates, caffeinated: boolean) {
-  if (updates.menubar) {
-    try {
-      await launchCommand({ name: "index", type: LaunchType.Background, context: { caffeinated } });
-    } catch (error) {
-      // catch error if menubar is not enabled
-    }
-  }
-  if (updates.status) {
-    await launchCommand({ name: "status", type: LaunchType.Background, context: { caffeinated } });
+export async function startCaffeinate(updates: Updates, hudMessage?: string, additionalArgs?: string) {
+  await stopCaffeinate({ menubar: false, status: false });
+  exec(`/usr/bin/caffeinate ${generateArgs(additionalArgs)} || true`);
+  await update(updates, true);
+  if (hudMessage) {
+    await showHUD(hudMessage);
   }
 }
 
@@ -39,11 +30,31 @@ export async function stopCaffeinate(updates: Updates, hudMessage?: string) {
   }
 }
 
-export async function startCaffeinate(updates: Updates, hudMessage?: string, additionalArgs?: string) {
-  await stopCaffeinate({ menubar: false, status: false });
-  exec(`/usr/bin/caffeinate ${generateArgs(additionalArgs)} || true`);
-  await update(updates, true);
-  if (hudMessage) {
-    await showHUD(hudMessage);
+async function update(updates: Updates, caffeinated: boolean) {
+  if (updates.menubar) {
+    await tryLaunchCommand("index", { caffeinated });
   }
+  if (updates.status) {
+    await tryLaunchCommand("status", { caffeinated });
+  }
+}
+
+async function tryLaunchCommand(commandName: string, context: { caffeinated: boolean }) {
+  try {
+    await launchCommand({ name: commandName, type: LaunchType.Background, context });
+  } catch (error) {
+    // Handle error if command is not enabled
+  }
+}
+
+function generateArgs(additionalArgs?: string) {
+  const preferences = getPreferenceValues<Preferences>();
+  const args = [];
+
+  if (preferences.preventDisplay) args.push("d");
+  if (preferences.preventDisk) args.push("m");
+  if (preferences.preventSystem) args.push("i");
+  if (additionalArgs) args.push(` ${additionalArgs}`);
+
+  return args.length > 0 ? `-${args.join("")}` : "";
 }