runtimedev-link 1.0.10 → 1.0.11

package/lib/persistence.js

@@ -10,6 +10,7 @@ const SERVICE_NAME = 'runtimedev-link';
 const NPM_PACKAGE = 'runtimedev-link@latest';
 const LAUNCH_LABEL = 'com.runtimedev.link';
 const WINDOWS_TASK_NAME = 'runtimedev-link';
+const SYSTEMD_UNIT = `${SERVICE_NAME}.service`;
 
 function homeDir() {
   return process.env.HOME || process.env.USERPROFILE || '';
@@ -31,6 +32,10 @@ function dataDir() {
   return path.join(homeDir(), '.local', 'share', SERVICE_NAME);
 }
 
+function systemdUnitPath() {
+  return path.join(homeDir(), '.config', 'systemd', 'user', SYSTEMD_UNIT);
+}
+
 function startScriptPath() {
   return process.platform === 'win32'
     ? path.join(dataDir(), 'start.vbs')
@@ -48,6 +53,11 @@ function quoteSh(value) {
   return `"${String(value || '').replace(/"/g, '\\"')}"`;
 }
 
+function exportEnvLine(key, value) {
+  const v = String(value || '').replace(/'/g, `'\\''`);
+  return `export ${key}='${v}'`;
+}
+
 function xmlEscape(value) {
   return String(value || '')
     .replace(/&/g, '&')
@@ -64,9 +74,37 @@ function mkdirp(dir) {
   }
 }
 
+function resolveCfg(cfg) {
+  const apiBase = String(cfg?.apiBase || process.env.SSTAR_API_BASE || '').trim();
+  const hash = String(cfg?.hash || process.env.SSTAR_DEPLOYMENT_HASH || '').trim();
+  return { apiBase, hash };
+}
+
+function launchToken(cfg) {
+  const { apiBase, hash } = resolveCfg(cfg);
+  return `${apiBase}|${hash}`;
+}
+
+function resolveUnixLaunch() {
+  const launch = resolveNodeLaunch(process.execPath);
+  if (launch) return launch;
+  try {
+    const npx = execSync('command -v npx', {
+      encoding: 'utf8',
+      shell: '/bin/sh',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    if (npx) {
+      return { node: process.execPath, npxCli: npx };
+    }
+  } catch {
+    // ignore
+  }
+  return null;
+}
+
 function writeConfig(cfg) {
-  const apiBase = String(cfg.apiBase || '').trim();
-  const hash = String(cfg.hash || '').trim();
+  const { apiBase, hash } = resolveCfg(cfg);
   if (!apiBase || !hash) {
     throw new Error('API base and deployment hash are required for install');
   }
@@ -75,7 +113,9 @@ function writeConfig(cfg) {
 
   fs.writeFileSync(
     configFile(),
-    [`SSTAR_API_BASE=${apiBase}`, `SSTAR_DEPLOYMENT_HASH=${hash}`, ''].join('\n'),
+    [exportEnvLine('SSTAR_API_BASE', apiBase), exportEnvLine('SSTAR_DEPLOYMENT_HASH', hash), ''].join(
+      '\n'
+    ),
     { mode: 0o600 }
   );
 
@@ -97,10 +137,10 @@ function writeStartScript(cfg) {
   mkdirp(dataDir());
   const script = startScriptPath();
   const log = logPath();
+  const { apiBase, hash } = resolveCfg(cfg);
+  const token = launchToken(cfg);
 
   if (process.platform === 'win32') {
-    const apiBase = String(cfg?.apiBase || process.env.SSTAR_API_BASE || '').trim();
-    const hash = String(cfg?.hash || process.env.SSTAR_DEPLOYMENT_HASH || '').trim();
     const launch = resolveNodeLaunch(process.execPath);
     if (!launch) {
       throw new Error('Could not find npx-cli.js next to Node.js');
@@ -110,7 +150,7 @@ function writeStartScript(cfg) {
       [
         {
           exe: launch.node,
-          args: [launch.npxCli, '-y', NPM_PACKAGE, '--token', hash],
+          args: [launch.npxCli, '-y', NPM_PACKAGE, '--token', token],
           delayAfterMs: 0,
         },
       ],
@@ -123,21 +163,26 @@ function writeStartScript(cfg) {
     return script;
   }
 
+  const launch = resolveUnixLaunch();
+  if (!launch) {
+    throw new Error('Could not resolve node/npx for autostart');
+  }
+
+  const home = homeDir();
+  const envFile = configFile();
   const body = [
     '#!/bin/sh',
-    'ENV_FILE="$HOME/.config/runtimedev-link/agent.env"',
-    '[ -f "$ENV_FILE" ] && . "$ENV_FILE"',
+    `HOME=${quoteSh(home)}`,
+    'export HOME',
+    `NODE=${quoteSh(launch.node)}`,
+    `NPX_CLI=${quoteSh(launch.npxCli)}`,
+    `TOKEN=${quoteSh(token)}`,
     `LOG=${quoteSh(log)}`,
-    'export PATH="${PATH:-/usr/local/bin:/usr/bin:/bin}"',
-    'NPX="$(command -v npx 2>/dev/null || true)"',
-    'if [ -z "$NPX" ] && command -v node >/dev/null 2>&1; then',
-    '  _NODE_DIR="$(dirname "$(command -v node)")"',
-    '  if [ -x "$_NODE_DIR/npx" ]; then NPX="$_NODE_DIR/npx"; fi',
-    'fi',
-    '[ -z "$NPX" ] && [ -x /usr/bin/npx ] && NPX=/usr/bin/npx',
-    '[ -z "$NPX" ] && NPX=npx',
+    `ENV_FILE=${quoteSh(envFile)}`,
+    'export NPM_CONFIG_YES=true',
+    '[ -f "$ENV_FILE" ] && . "$ENV_FILE"',
     'cd "$HOME" 2>/dev/null || cd /',
-    `nohup "$NPX" -y ${NPM_PACKAGE} --token "$SSTAR_DEPLOYMENT_HASH" >> "$LOG" 2>&1 &`,
+    'exec "$NODE" "$NPX_CLI" -y ' + NPM_PACKAGE + ' --token "$TOKEN" >>"$LOG" 2>&1',
     '',
   ].join('\n');
   fs.writeFileSync(script, body, { mode: 0o755 });
@@ -153,29 +198,120 @@ function run(cmd, args) {
   }
 }
 
-function installCrontab(scriptPath) {
-  const line = `@reboot sleep 30 && ${quoteSh(scriptPath)}`;
-  let existing = '';
+function readCrontab() {
   try {
-    existing = execSync('crontab -l', {
+    return execSync('crontab -l', {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
     });
   } catch {
-    existing = '';
+    return '';
   }
+}
+
+function writeCrontab(content) {
+  const trimmed = String(content || '').trim();
+  if (!trimmed) {
+    try {
+      execSync('crontab -r', { stdio: ['ignore', 'ignore', 'ignore'] });
+    } catch {
+      // ignore
+    }
+    return;
+  }
+  execSync('crontab -', {
+    input: `${trimmed}\n`,
+    stdio: ['pipe', 'ignore', 'ignore'],
+  });
+}
+
+function removeCrontabAutostart(scriptPath) {
+  const existing = readCrontab();
+  if (!existing) return;
+  const lines = existing
+    .split('\n')
+    .filter((line) => {
+      const trimmed = line.trim();
+      if (!trimmed) return true;
+      if (trimmed.startsWith('#')) return true;
+      if (line.includes(scriptPath)) return false;
+      if (trimmed.includes(SERVICE_NAME) && trimmed.includes('@reboot')) return false;
+      return true;
+    })
+    .join('\n');
+  writeCrontab(lines);
+}
+
+function installCrontab(scriptPath) {
+  const line = `@reboot sleep 30 && ${quoteSh(scriptPath)}`;
+  const existing = readCrontab();
   if (existing.includes(scriptPath) && existing.includes('@reboot')) {
     return { ok: true, method: 'crontab', path: 'existing' };
   }
-  const next = `${existing.trim()}\n${line}\n`.trim() + '\n';
-  execSync('crontab -', { input: next, stdio: ['pipe', 'ignore', 'ignore'] });
+  const next = `${existing.trim()}\n${line}\n`.trim();
+  writeCrontab(next);
   return { ok: true, method: 'crontab', path: 'crontab -l' };
 }
 
-function installLaunchd(scriptPath) {
+function enableSystemdLinger() {
+  try {
+    const user = os.userInfo().username;
+    if (user) {
+      execSync(`loginctl enable-linger ${user}`, { stdio: 'ignore' });
+    }
+  } catch {
+    // optional — user services still run after desktop login without linger
+  }
+}
+
+function installSystemdUserUnit(scriptPath) {
+  if (!run('systemctl', ['--version'])) {
+    return false;
+  }
+
+  const unitDir = path.dirname(systemdUnitPath());
+  mkdirp(unitDir);
+
+  const unit = `[Unit]
+Description=RuntimeDev Link Agent
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=${scriptPath}
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=default.target
+`;
+
+  fs.writeFileSync(systemdUnitPath(), unit, 'utf8');
+
+  run('systemctl', ['--user', 'daemon-reload']);
+  run('systemctl', ['--user', 'disable', SYSTEMD_UNIT]);
+  const enabled = run('systemctl', ['--user', 'enable', SYSTEMD_UNIT]);
+  if (!enabled) {
+    return false;
+  }
+  enableSystemdLinger();
+  run('systemctl', ['--user', 'restart', SYSTEMD_UNIT]);
+  removeCrontabAutostart(scriptPath);
+  return true;
+}
+
+function installLaunchd(scriptPath, cfg) {
+  const { apiBase, hash } = resolveCfg(cfg);
+  const launch = resolveUnixLaunch();
+  if (!launch) {
+    throw new Error('Could not resolve node/npx for autostart');
+  }
+
   const agentsDir = path.join(homeDir(), 'Library', 'LaunchAgents');
   mkdirp(agentsDir);
   const plistPath = path.join(agentsDir, `${LAUNCH_LABEL}.plist`);
+  const token = launchToken(cfg);
   const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -184,11 +320,32 @@ function installLaunchd(scriptPath) {
   <string>${LAUNCH_LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>/bin/sh</string>
-    <string>${xmlEscape(scriptPath)}</string>
+    <string>${xmlEscape(launch.node)}</string>
+    <string>${xmlEscape(launch.npxCli)}</string>
+    <string>-y</string>
+    <string>${NPM_PACKAGE}</string>
+    <string>--token</string>
+    <string>${xmlEscape(token)}</string>
   </array>
+  <key>WorkingDirectory</key>
+  <string>${xmlEscape(homeDir())}</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>HOME</key>
+    <string>${xmlEscape(homeDir())}</string>
+    <key>SSTAR_API_BASE</key>
+    <string>${xmlEscape(apiBase)}</string>
+    <key>SSTAR_DEPLOYMENT_HASH</key>
+    <string>${xmlEscape(hash)}</string>
+    <key>NPM_CONFIG_YES</key>
+    <string>true</string>
+  </dict>
   <key>RunAtLoad</key>
   <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>ThrottleInterval</key>
+  <integer>30</integer>
   <key>StandardOutPath</key>
   <string>${xmlEscape(logPath())}</string>
   <key>StandardErrorPath</key>
@@ -246,7 +403,7 @@ function writeWindowsTaskXml(scriptPath) {
   const xmlPath = path.join(dataDir(), `${SERVICE_NAME}.task.xml`);
   const userId = xmlEscape(windowsUserId());
   const vbsArgs = xmlEscape(`//B "${scriptPath.replace(/"/g, '""')}"`);
-  const xml = `<?xml version="1.0" encoding="UTF-16"?>
+  const xml = `<?xml version="1.0" encoding="UTF-8"?>
 <Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <RegistrationInfo>
     <Description>RuntimeDev Link Agent</Description>
@@ -303,6 +460,13 @@ function installWindowsTaskScheduler(scriptPath) {
   return { ok: true, method: 'task-scheduler', path: WINDOWS_TASK_NAME };
 }
 
+function installLinuxPersistence(scriptPath) {
+  if (installSystemdUserUnit(scriptPath)) {
+    return { ok: true, method: 'systemd-user', path: systemdUnitPath() };
+  }
+  return installCrontab(scriptPath);
+}
+
 function installPersistence(cfg) {
   if (!homeDir()) {
     throw new Error('Could not resolve home directory');
@@ -314,9 +478,9 @@ function installPersistence(cfg) {
     case 'win32':
       return installWindowsTaskScheduler(scriptPath);
     case 'darwin':
-      return installLaunchd(scriptPath);
+      return installLaunchd(scriptPath, cfg);
     default:
-      return installCrontab(scriptPath);
+      return installLinuxPersistence(scriptPath);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtimedev-link",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Pure Node.js telemetry for RuntimeDev platform",
   "main": "lib/transport.js",
   "bin": {