unitup 0.1.0 → 0.1.2

package/package.json

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

package/src/schedule.js

@@ -1,10 +1,12 @@
 import path from 'node:path';
 import fs from 'node:fs';
+import os from 'node:os';
 import {
   sanitizeServiceName,
   getUnitFilename,
   getTimerFilename,
   resolveAbsolutePath,
+  resolveWorkingDirectory,
   validateDuration,
   formatFutureTime,
   formatRelativeTime,
@@ -106,42 +108,25 @@ export async function createSchedule(opts = {}) {
 
   const safeName = sanitizeServiceName(rawName);
 
-  let commandExec = '';
-  let execArgs = [];
-  let detectedRuntime = opts.runtime || 'node';
-  let scriptPath = '';
-
-  if (opts.command) {
-    commandExec = resolveAbsolutePath(opts.command);
-    execArgs = Array.isArray(opts.args) ? opts.args : [];
-    if (opts.script) {
-      scriptPath = resolveAbsolutePath(opts.script);
-    }
-  } else if (opts.script) {
-    scriptPath = resolveAbsolutePath(opts.script);
-    const runtimeInfo = detectRuntime(scriptPath, opts.runtime);
-    detectedRuntime = runtimeInfo.runtime;
-
-    const resolved = await resolveRuntimeConfig({
-      runtime: detectedRuntime,
-      script: scriptPath,
-      command: opts.command,
-      args: opts.args || [],
-      runtimeArgs: opts.runtimeArgs || [],
-      customNodePath: opts.node
-    });
-
-    commandExec = resolved.command;
-    execArgs = resolved.args;
-  } else {
+  if (!opts.script && !opts.command) {
     throw new Error('Either script or command must be provided to create schedule.');
   }
 
-  const cwd = opts.cwd
-    ? resolveAbsolutePath(opts.cwd)
-    : scriptPath
-    ? path.dirname(scriptPath)
-    : path.dirname(commandExec);
+  const scriptPath = opts.script ? resolveAbsolutePath(opts.script) : '';
+  const resolved = await resolveRuntimeConfig({
+    runtime: opts.runtime,
+    script: scriptPath,
+    command: opts.command,
+    args: opts.args || [],
+    runtimeArgs: opts.runtimeArgs || [],
+    customNodePath: opts.node
+  });
+
+  const commandExec = resolved.command;
+  const execArgs = resolved.args;
+  const detectedRuntime = resolved.runtime;
+
+  const cwd = resolveWorkingDirectory({ cwd: opts.cwd, script: scriptPath });
 
   const envObj = {};
   if (opts.env) {
@@ -185,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)]);
   }
@@ -224,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;
 }
@@ -333,7 +320,7 @@ export async function getScheduleStatus(name) {
     '--user',
     'show',
     timerFilename,
-    '--property=ActiveState,SubState,NextElapseUSecRealtime,NextElapseUSec,LastTriggerUSec,Unit,Triggers,UnitFileState'
+    '--property=ActiveState,SubState,NextElapseUSecRealtime,NextElapseUSecMonotonic,NextElapseUSec,LastTriggerUSec,Unit,Triggers,UnitFileState'
   ]);
 
   const showServiceRes = await runCommand('systemctl', [
@@ -374,18 +361,27 @@ export async function getScheduleStatus(name) {
 
   // Parse NextElapse timestamp
   let rawNext = timerProps.NextElapseUSecRealtime || timerProps.NextElapseUSec;
-  if (!rawNext || rawNext === '0' || rawNext === '18446744073709551615') {
-    rawNext = 'n/a';
-  }
-
   let nextRun = 'n/a';
-  if (rawNext !== 'n/a') {
+
+  if (rawNext && rawNext !== '0' && rawNext !== '18446744073709551615') {
     const num = Number(rawNext);
     if (!isNaN(num) && num > 0) {
       nextRun = formatFutureTime(Math.floor(num / 1000));
     } else {
       nextRun = formatFutureTime(rawNext);
     }
+  } else if (timerProps.NextElapseUSecMonotonic && timerProps.NextElapseUSecMonotonic !== '0' && timerProps.NextElapseUSecMonotonic !== '18446744073709551615') {
+    const monoNum = Number(timerProps.NextElapseUSecMonotonic);
+    if (!isNaN(monoNum) && monoNum > 0) {
+      const currentMonoUSec = os.uptime() * 1000000;
+      const diffUSec = monoNum - currentMonoUSec;
+      if (diffUSec > 0) {
+        const targetMs = Date.now() + Math.floor(diffUSec / 1000);
+        nextRun = formatFutureTime(targetMs);
+      } else {
+        nextRun = 'imminent';
+      }
+    }
   }
 
   // Parse LastTrigger timestamp

package/src/unit.js

@@ -9,6 +9,7 @@ import {
   formatSystemdEnv,
   escapeExecArg,
   resolveAbsolutePath,
+  resolveWorkingDirectory,
   saveAppMetadata,
   deleteAppMetadata,
   saveScheduleMetadata,
@@ -83,8 +84,7 @@ export function generateUnitContent(opts) {
     throw new Error('Either "command" or "script" must be provided to generate systemd unit file.');
   }
 
-  const scriptOrCmdPath = opts.script ? resolveAbsolutePath(opts.script) : (execArgs[0] && (execArgs[0].startsWith('/') || execArgs[0].startsWith('./')) ? resolveAbsolutePath(execArgs[0]) : commandExec);
-  const cwd = opts.cwd ? resolveAbsolutePath(opts.cwd) : path.dirname(scriptOrCmdPath || commandExec);
+  const cwd = resolveWorkingDirectory(opts);
   const restartPolicy = opts.restart || 'on-failure';
 
   const execStartTokens = [commandExec, ...execArgs];
@@ -306,8 +306,7 @@ export function generateScheduleServiceContent(opts) {
     throw new Error('Either "command" or "script" must be provided to generate scheduled unit file.');
   }
 
-  const scriptOrCmdPath = opts.script ? resolveAbsolutePath(opts.script) : (execArgs[0] && (execArgs[0].startsWith('/') || execArgs[0].startsWith('./')) ? resolveAbsolutePath(execArgs[0]) : commandExec);
-  const cwd = opts.cwd ? resolveAbsolutePath(opts.cwd) : path.dirname(scriptOrCmdPath || commandExec);
+  const cwd = resolveWorkingDirectory(opts);
 
   const execStartTokens = [commandExec, ...execArgs];
   const execStartLine = execStartTokens.map(escapeExecArg).join(' ');
@@ -440,7 +439,7 @@ export function writeScheduleUnitFiles(opts) {
   saveScheduleMetadata({
     name: safeName,
     group: opts.group || 'default',
-    runtime: opts.runtime || 'node',
+    runtime: opts.runtime || (opts.command ? 'custom' : 'node'),
     command: opts.command,
     args: opts.args,
     cwd: opts.cwd,

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) : path.dirname(scriptPath || command);
+  const cwd = resolveWorkingDirectory(meta);
 
   // Extract memory resources if present
   const resources = meta.resources || {};
@@ -302,6 +302,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"