magalh 1.0.16 → 1.0.18

package/bin/mgl.js

@@ -26,15 +26,6 @@ function warn(message) {
   console.warn(`[magalh] ${message}`);
 }
 
-function fail(message, exitCode = 1) {
-  try {
-    process.stderr.write(`[magalh] ${message}\n`);
-  } catch {
-    console.error(`[magalh] ${message}`);
-  }
-  process.exit(exitCode);
-}
-
 function isRootOnLinux() {
   return typeof process.getuid === "function" && process.getuid() === 0;
 }
@@ -51,13 +42,17 @@ function isWindowsAdminLike() {
   }
 }
 
-function fileExists(filePath) {
-  try {
-    fs.accessSync(filePath, fs.constants.F_OK);
-    return true;
-  } catch {
-    return false;
-  }
+function printHelp() {
+  process.stdout.write(
+    [
+      "magalh - Magala Media Server",
+      "",
+      "Usage:",
+      "  magalh [--help]",
+      "  magalh --install-service",
+      "",
+    ].join("\n"),
+  );
 }
 
 function runCommand(command, commandArgs, options = {}) {
@@ -67,11 +62,10 @@ function runCommand(command, commandArgs, options = {}) {
   });
 }
 
-function runCommandQuiet(command, commandArgs, options = {}) {
+function safeRunCommand(command, commandArgs, options = {}) {
   try {
     return execFileSync(command, commandArgs, {
       stdio: "pipe",
-      encoding: "utf8",
       ...options,
     });
   } catch {
@@ -79,45 +73,26 @@ function runCommandQuiet(command, commandArgs, options = {}) {
   }
 }
 
-function printHelp() {
-  process.stdout.write(
-    [
-      "magalh - Magala Media Server",
-      "",
-      "Usage:",
-      "  magalh",
-      "  magalh --help",
-      "  magalh --install-service",
-      "  magalh --uninstall-service",
-      "  magalh --service-status",
-      "",
-      "Notes:",
-      "  - The server starts normally with: magalh",
-      "  - Service installation is explicit only; it is never done automatically.",
-      "",
-    ].join("\n"),
-  );
-}
-
-function getCliBin() {
-  return path.join(rootDir, "bin", "mgl.js");
-}
-
-function getLinuxServiceFile() {
-  return `/etc/systemd/system/${SERVICE_NAME}.service`;
-}
+function installLinuxService() {
+  if (!isRootOnLinux()) {
+    log(
+      "Skipping systemd setup (not running as root).\n" +
+      "         To install manually: sudo npm install -g magalh",
+    );
+    return;
+  }
 
-function ensureEntryFileExists() {
-  if (!fileExists(entryFile)) {
-    fail(`Entry file not found: ${entryFile}`);
+  const systemdDir = "/etc/systemd/system";
+  if (!fs.existsSync(systemdDir)) {
+    log("Skipping systemd setup (systemd not found).");
+    return;
   }
-}
 
-function getLinuxServiceContent() {
+  const serviceFile = path.join(systemdDir, `${SERVICE_NAME}.service`);
   const nodeBin = process.execPath;
-  const cliBin = getCliBin();
+  const cliBin = path.join(rootDir, "bin", "mgl.js");
 
-  return [
+  const serviceContent = [
     "[Unit]",
     `Description=${SERVICE_DISPLAY_NAME}`,
     "After=network-online.target",
@@ -137,37 +112,10 @@ function getLinuxServiceContent() {
     "WantedBy=multi-user.target",
     "",
   ].join("\n");
-}
-
-function isLinuxServiceInstalled() {
-  return fileExists(getLinuxServiceFile());
-}
-
-function isWindowsServiceInstalled() {
-  const out = runCommandQuiet("sc", ["query", SERVICE_NAME]);
-  return typeof out === "string" && out.includes("SERVICE_NAME");
-}
-
-function installLinuxService() {
-  if (!isRootOnLinux()) {
-    fail("Linux service installation requires root. Run: sudo magalh --install-service");
-  }
-
-  const systemdDir = "/etc/systemd/system";
-  if (!fileExists(systemdDir)) {
-    fail("systemd directory not found. Service install is not supported on this Linux system.");
-  }
-
-  const cliBin = getCliBin();
-  if (!fileExists(cliBin)) {
-    fail(`CLI file not found: ${cliBin}`);
-  }
-
-  const serviceFile = getLinuxServiceFile();
-  const content = getLinuxServiceContent();
 
   try {
-    fs.writeFileSync(serviceFile, content, { mode: 0o644 });
+    fs.writeFileSync(serviceFile, serviceContent, { mode: 0o644 });
+
     log(`Service file written -> ${serviceFile}`);
 
     runCommand("systemctl", ["daemon-reload"]);
@@ -180,66 +128,26 @@ function installLinuxService() {
       `         Logs   : journalctl -u ${SERVICE_NAME} -f`,
     );
   } catch (error) {
-    fail(`Linux service installation failed: ${error.message || String(error)}`);
-  }
-}
-
-function uninstallLinuxService() {
-  if (!isRootOnLinux()) {
-    fail("Linux service removal requires root. Run: sudo magalh --uninstall-service");
-  }
-
-  const serviceFile = getLinuxServiceFile();
-
-  try {
-    runCommandQuiet("systemctl", ["stop", SERVICE_NAME]);
-    runCommandQuiet("systemctl", ["disable", SERVICE_NAME]);
-
-    if (fileExists(serviceFile)) {
-      fs.unlinkSync(serviceFile);
-      log(`Removed service file -> ${serviceFile}`);
-    } else {
-      log("Service file does not exist. Nothing to remove.");
-    }
-
-    runCommand("systemctl", ["daemon-reload"]);
-    log("Linux service removed.");
-  } catch (error) {
-    fail(`Linux service removal failed: ${error.message || String(error)}`);
-  }
-}
-
-function printLinuxServiceStatus() {
-  if (!isLinuxServiceInstalled()) {
-    log("Linux service is not installed.");
-    process.exit(0);
-  }
-
-  log(`Linux service file exists -> ${getLinuxServiceFile()}`);
-  const status = runCommandQuiet("systemctl", ["status", SERVICE_NAME, "--no-pager"]);
-  if (status) {
-    process.stdout.write(`${status}\n`);
-  } else {
-    warn("Could not read systemd status output.");
+    warn(`Warning: systemd setup failed: ${error.message || String(error)}`);
   }
 }
 
 function installWindowsService() {
   if (!isWindowsAdminLike()) {
-    fail("Windows service installation requires Administrator privileges.");
-  }
-
-  const cliBin = getCliBin();
-  if (!fileExists(cliBin)) {
-    fail(`CLI file not found: ${cliBin}`);
+    log(
+      "Skipping Windows service setup (not running as Administrator).\n" +
+      "         To install manually: run npm install -g magalh as Administrator.",
+    );
+    return;
   }
 
   const nodeBin = process.execPath;
+  const cliBin = path.join(rootDir, "bin", "mgl.js");
   const binPath = `"${nodeBin}" "${cliBin}"`;
 
   try {
-    runCommandQuiet("sc", ["stop", SERVICE_NAME]);
-    runCommandQuiet("sc", ["delete", SERVICE_NAME]);
+    safeRunCommand("sc", ["stop", SERVICE_NAME]);
+    safeRunCommand("sc", ["delete", SERVICE_NAME]);
 
     runCommand("sc", [
       "create",
@@ -276,83 +184,21 @@ function installWindowsService() {
       "         Logs   : Event Viewer -> Windows Logs -> Application",
     );
   } catch (error) {
-    fail(`Windows service installation failed: ${error.message || String(error)}`);
-  }
-}
-
-function uninstallWindowsService() {
-  if (!isWindowsAdminLike()) {
-    fail("Windows service removal requires Administrator privileges.");
-  }
-
-  try {
-    runCommandQuiet("sc", ["stop", SERVICE_NAME]);
-    runCommandQuiet("sc", ["delete", SERVICE_NAME]);
-    log("Windows service removed.");
-  } catch (error) {
-    fail(`Windows service removal failed: ${error.message || String(error)}`);
-  }
-}
-
-function printWindowsServiceStatus() {
-  if (!isWindowsServiceInstalled()) {
-    log("Windows service is not installed.");
-    process.exit(0);
-  }
-
-  const status = runCommandQuiet("sc", ["query", SERVICE_NAME]);
-  if (status) {
-    process.stdout.write(`${status}\n`);
-  } else {
-    warn("Could not read Windows service status output.");
+    warn(`Warning: Windows service setup failed: ${error.message || String(error)}`);
   }
 }
 
 function installService() {
   if (process.platform === "linux") {
     installLinuxService();
-    return;
-  }
-
-  if (process.platform === "win32") {
+  } else if (process.platform === "win32") {
     installWindowsService();
-    return;
-  }
-
-  fail(`Service installation is not supported on platform: ${process.platform}`);
-}
-
-function uninstallService() {
-  if (process.platform === "linux") {
-    uninstallLinuxService();
-    return;
-  }
-
-  if (process.platform === "win32") {
-    uninstallWindowsService();
-    return;
-  }
-
-  fail(`Service removal is not supported on platform: ${process.platform}`);
-}
-
-function printServiceStatus() {
-  if (process.platform === "linux") {
-    printLinuxServiceStatus();
-    return;
-  }
-
-  if (process.platform === "win32") {
-    printWindowsServiceStatus();
-    return;
+  } else {
+    log(`Service install is not supported on platform: ${process.platform}`);
   }
-
-  log(`Service status is not supported on platform: ${process.platform}`);
 }
 
 function startMainProcess() {
-  ensureEntryFileExists();
-
   const child = spawn(process.execPath, [entryFile, ...args], {
     cwd: rootDir,
     env: process.env,
@@ -364,13 +210,44 @@ function startMainProcess() {
     if (signal) {
       process.exit(1);
     }
+    process.exit(typeof code === "number" ? code : 0);
   });
 
   child.on("error", (error) => {
-    fail(`Failed to start msh: ${error.message || String(error)}`);
+    try {
+      process.stderr.write(
+        `Failed to start msh: ${error.message || String(error)}\n`,
+      );
+    } catch {
+    }
+    process.exit(1);
   });
 }
 
+function isWindowsServiceInstalled() {
+  try {
+    const out = execFileSync("sc", ["query", SERVICE_NAME], { stdio: "pipe" }).toString();
+    return out.includes("SERVICE_NAME");
+  } catch {
+    return false;
+  }
+}
+
+function autoInstallServiceIfNeeded() {
+  if (process.platform === "linux") {
+    const serviceFile = `/etc/systemd/system/${SERVICE_NAME}.service`;
+    if (!fs.existsSync(serviceFile)) {
+      log("Service not found, attempting auto-install...");
+      installLinuxService();
+    }
+  } else if (process.platform === "win32") {
+    if (!isWindowsServiceInstalled()) {
+      log("Service not found, attempting auto-install...");
+      installWindowsService();
+    }
+  }
+}
+
 function main() {
   if (hasArg("--help") || hasArg("-h")) {
     printHelp();
@@ -382,16 +259,7 @@ function main() {
     process.exit(0);
   }
 
-  if (hasArg("--uninstall-service")) {
-    uninstallService();
-    process.exit(0);
-  }
-
-  if (hasArg("--service-status")) {
-    printServiceStatus();
-    process.exit(0);
-  }
-
+  autoInstallServiceIfNeeded();
   startMainProcess();
 }