unitup 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unitup",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Minimal, zero-dependency systemd-native service manager for any runtime, script, or executable",
   "main": "src/index.js",
   "types": "./index.d.ts",

package/src/cli.js

@@ -108,12 +108,15 @@ export function parseArgs(argv) {
     } else if (arg.startsWith('--runtime=')) {
       result.flags.runtime = arg.slice(10);
       i++;
-    } else if (arg === '--runtime-arg') {
+    } else if (arg === '--runtime-arg' || arg === '--runtime-args') {
       if (argv[i + 1]) result.flags.runtimeArgs.push(argv[i + 1]);
       i += 2;
     } else if (arg.startsWith('--runtime-arg=')) {
       result.flags.runtimeArgs.push(arg.slice(14));
       i++;
+    } else if (arg.startsWith('--runtime-args=')) {
+      result.flags.runtimeArgs.push(arg.slice(15));
+      i++;
     } else if (arg === '--command') {
       result.flags.command = argv[i + 1] || '';
       i += 2;
@@ -162,12 +165,15 @@ export function parseArgs(argv) {
     } else if (arg.startsWith('--restart=')) {
       result.flags.restart = arg.slice(10);
       i++;
-    } else if (arg === '--arg') {
+    } else if (arg === '--arg' || arg === '--args') {
       if (argv[i + 1]) result.flags.args.push(argv[i + 1]);
       i += 2;
     } else if (arg.startsWith('--arg=')) {
       result.flags.args.push(arg.slice(6));
       i++;
+    } else if (arg.startsWith('--args=')) {
+      result.flags.args.push(arg.slice(7));
+      i++;
     } else if (arg === '--lines' || arg === '-n') {
       result.flags.lines = parseInt(argv[i + 1] || '100', 10);
       i += 2;

package/src/schedule.js

@@ -6,6 +6,7 @@ import {
   getUnitFilename,
   getTimerFilename,
   resolveAbsolutePath,
+  resolveWorkingDirectory,
   validateDuration,
   formatFutureTime,
   formatRelativeTime,
@@ -125,11 +126,7 @@ export async function createSchedule(opts = {}) {
   const execArgs = resolved.args;
   const detectedRuntime = resolved.runtime;
 
-  const cwd = opts.cwd
-    ? resolveAbsolutePath(opts.cwd)
-    : scriptPath
-    ? path.dirname(scriptPath)
-    : process.cwd();
+  const cwd = resolveWorkingDirectory({ cwd: opts.cwd, script: scriptPath });
 
   const envObj = {};
   if (opts.env) {
@@ -173,6 +170,7 @@ export async function createSchedule(opts = {}) {
 
   if (opts.start || opts.enable) {
     await runCommand('systemctl', ['--user', 'daemon-reload']);
+    await runCommand('systemctl', ['--user', 'reset-failed', getUnitFilename(safeName), getTimerFilename(safeName)]);
     await runCommand('systemctl', ['--user', 'enable', getTimerFilename(safeName)]);
     await runCommand('systemctl', ['--user', 'start', getTimerFilename(safeName)]);
   }
@@ -212,6 +210,7 @@ export async function enableSchedule(name) {
     throw new Error(`Schedule timer unit up for "${name}" does not exist.`);
   }
   await runCommand('systemctl', ['--user', 'daemon-reload']);
+  await runCommand('systemctl', ['--user', 'reset-failed', getUnitFilename(safeName), getTimerFilename(safeName)]);
   const res = await runCommand('systemctl', ['--user', 'enable', '--now', getTimerFilename(safeName)]);
   return res.code === 0;
 }

package/src/unit.js

@@ -9,6 +9,7 @@ import {
   formatSystemdEnv,
   escapeExecArg,
   resolveAbsolutePath,
+  resolveWorkingDirectory,
   saveAppMetadata,
   deleteAppMetadata,
   saveScheduleMetadata,
@@ -83,11 +84,7 @@ export function generateUnitContent(opts) {
     throw new Error('Either "command" or "script" must be provided to generate systemd unit file.');
   }
 
-  const cwd = opts.cwd
-    ? resolveAbsolutePath(opts.cwd)
-    : opts.script
-    ? path.dirname(resolveAbsolutePath(opts.script))
-    : process.cwd();
+  const cwd = resolveWorkingDirectory(opts);
   const restartPolicy = opts.restart || 'on-failure';
 
   const execStartTokens = [commandExec, ...execArgs];
@@ -309,11 +306,7 @@ export function generateScheduleServiceContent(opts) {
     throw new Error('Either "command" or "script" must be provided to generate scheduled unit file.');
   }
 
-  const cwd = opts.cwd
-    ? resolveAbsolutePath(opts.cwd)
-    : opts.script
-    ? path.dirname(resolveAbsolutePath(opts.script))
-    : process.cwd();
+  const cwd = resolveWorkingDirectory(opts);
 
   const execStartTokens = [commandExec, ...execArgs];
   const execStartLine = execStartTokens.map(escapeExecArg).join(' ');

package/src/utils.js

@@ -141,7 +141,7 @@ export function saveAppMetadata(meta) {
   const rawArgs = Array.isArray(meta.args) ? meta.args : (meta.script ? [meta.script] : []);
   const args = rawArgs.map(a => (a.startsWith('/') || a.startsWith('./') || a.startsWith('../') || a.startsWith('~/')) ? resolveAbsolutePath(a) : a);
   const scriptPath = meta.script ? resolveAbsolutePath(meta.script) : (args[0] ? resolveAbsolutePath(args[0]) : command);
-  const cwd = meta.cwd ? resolveAbsolutePath(meta.cwd) : (meta.script ? path.dirname(resolveAbsolutePath(meta.script)) : process.cwd());
+  const cwd = resolveWorkingDirectory(meta);
 
   // Extract memory resources if present
   const resources = meta.resources || {};
@@ -180,10 +180,17 @@ export function readAppMetadata(name) {
     const data = JSON.parse(content);
     if (!data) return null;
 
-    // Normalization for legacy metadata format
     const command = data.command || data.node || process.execPath;
     const args = data.args || (data.script ? [data.script] : []);
-    const runtime = data.runtime || 'node';
+    let runtime = data.runtime;
+    if (!runtime || (runtime === 'node' && data.command)) {
+      const baseCmd = path.basename(command).toLowerCase();
+      if (baseCmd !== 'node' && baseCmd !== 'nodejs') {
+        runtime = 'custom';
+      } else {
+        runtime = 'node';
+      }
+    }
     const script = data.script || args[0] || command;
     const cwd = data.cwd || (script ? path.dirname(script) : process.cwd());
 
@@ -302,6 +309,31 @@ export function resolveAbsolutePath(filepath, baseDir = process.cwd()) {
   return path.resolve(baseDir, p);
 }
 
+/**
+ * Safely resolves the working directory for a service or schedule unit.
+ *
+ * @param {Object} [opts]
+ * @returns {string}
+ */
+export function resolveWorkingDirectory(opts = {}) {
+  if (opts.cwd) {
+    return resolveAbsolutePath(opts.cwd);
+  }
+  if (opts.script) {
+    return path.dirname(resolveAbsolutePath(opts.script));
+  }
+  try {
+    const cwd = process.cwd();
+    if (fs.existsSync(cwd)) {
+      fs.accessSync(cwd, fs.constants.R_OK | fs.constants.X_OK);
+      return cwd;
+    }
+  } catch {
+    // fallback if process.cwd() is inaccessible
+  }
+  return os.homedir();
+}
+
 /**
  * Escapes values for systemd Environment= line entries.
  * E.g. KEY="val with spaces"
@@ -447,7 +479,7 @@ export function saveScheduleMetadata(meta) {
     name: safeName,
     group: meta.group || 'default',
     type: 'timer',
-    runtime: meta.runtime || 'node',
+    runtime: meta.runtime || (meta.command ? 'custom' : 'node'),
     command,
     args,
     cwd: meta.cwd ? resolveAbsolutePath(meta.cwd) : process.cwd(),
@@ -477,7 +509,17 @@ export function readScheduleMetadata(name) {
     const filePath = getScheduleMetadataPath(name);
     if (!fs.existsSync(filePath)) return null;
     const content = fs.readFileSync(filePath, 'utf8');
-    return JSON.parse(content);
+    const meta = JSON.parse(content);
+    if (!meta) return null;
+
+    // Normalization for legacy metadata format where runtime defaulted to 'node' for custom commands
+    if (meta.runtime === 'node' && meta.command) {
+      const baseCmd = path.basename(meta.command).toLowerCase();
+      if (baseCmd !== 'node' && baseCmd !== 'nodejs') {
+        meta.runtime = 'custom';
+      }
+    }
+    return meta;
   } catch {
     return null;
   }