channel-worker 1.3.8 → 1.4.0

package/bin/cli.js

@@ -128,9 +128,32 @@ if (cmd === 'pair') {
   // Save merged config for next time
   saveConfig(config);
 
-  const { Daemon } = require('../lib/daemon');
-  const daemon = new Daemon(config);
-  daemon.start();
+  if (args._daemon) {
+    // Actually run the daemon (spawned by ourselves)
+    const { Daemon } = require('../lib/daemon');
+    const daemon = new Daemon(config);
+    daemon.start();
+  } else {
+    // Spawn detached background process and exit
+    const { spawn } = require('child_process');
+    const LOG_FILE = path.join(CONFIG_DIR, 'daemon.log');
+    const logFd = fs.openSync(LOG_FILE, 'a');
+
+    const child = spawn(process.execPath, [__filename, 'start', '--_daemon'], {
+      detached: true,
+      stdio: ['ignore', logFd, logFd],
+      cwd: os.homedir(),
+    });
+    child.unref();
+
+    // Save PID for stop command
+    const pidFile = path.join(CONFIG_DIR, 'daemon.pid');
+    fs.writeFileSync(pidFile, String(child.pid));
+
+    console.log(`[channel-worker] Daemon started (PID: ${child.pid})`);
+    console.log(`[channel-worker] Logs: ${LOG_FILE}`);
+    process.exit(0);
+  }
 
 } else if (cmd === 'update') {
   const { checkAndUpdate, getLocalVersion } = require('../lib/updater');
@@ -150,6 +173,55 @@ if (cmd === 'pair') {
     }
   })();
 
+} else if (cmd === 'stop') {
+  const pidFile = path.join(CONFIG_DIR, 'daemon.pid');
+  if (!fs.existsSync(pidFile)) {
+    console.log('[channel-worker] No daemon running (no PID file).');
+    process.exit(0);
+  }
+  const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+  try {
+    process.kill(pid, 'SIGTERM');
+    fs.unlinkSync(pidFile);
+    console.log(`[channel-worker] Daemon stopped (PID: ${pid})`);
+  } catch (err) {
+    if (err.code === 'ESRCH') {
+      fs.unlinkSync(pidFile);
+      console.log(`[channel-worker] Daemon was not running (stale PID: ${pid}). Cleaned up.`);
+    } else {
+      console.error(`[channel-worker] Failed to stop: ${err.message}`);
+      process.exit(1);
+    }
+  }
+
+} else if (cmd === 'logs') {
+  const LOG_FILE = path.join(CONFIG_DIR, 'daemon.log');
+  if (!fs.existsSync(LOG_FILE)) {
+    console.log('[channel-worker] No log file found.');
+    process.exit(0);
+  }
+  const lines = parseInt(args.lines || '50', 10);
+  const content = fs.readFileSync(LOG_FILE, 'utf-8');
+  const tail = content.split('\n').slice(-lines).join('\n');
+  console.log(tail);
+
+} else if (cmd === 'restart') {
+  // Stop existing daemon, then start new one
+  const pidFile = path.join(CONFIG_DIR, 'daemon.pid');
+  if (fs.existsSync(pidFile)) {
+    const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+    try { process.kill(pid, 'SIGTERM'); } catch { /* already dead */ }
+    fs.unlinkSync(pidFile);
+    console.log(`[channel-worker] Stopped old daemon (PID: ${pid})`);
+  }
+  // Re-invoke start
+  const { spawn } = require('child_process');
+  const child = spawn(process.execPath, [__filename, 'start'], {
+    stdio: 'inherit',
+    cwd: process.cwd(),
+  });
+  child.on('exit', (code) => process.exit(code));
+
 } else if (cmd === 'config') {
   const config = loadConfig();
   // Hide token in display
@@ -164,7 +236,10 @@ channel-worker — Channel Manager worker daemon
 Commands:
   pair     Pair with dashboard using a one-time code (recommended)
   init     Configure worker manually
-  start    Start the daemon (auto-checks for updates every 5min)
+  start    Start the daemon in background
+  stop     Stop the daemon
+  restart  Restart the daemon
+  logs     Show recent daemon logs (--lines <n>, default 50)
   update   Check and install updates manually
   config   Show current config
 
@@ -182,6 +257,8 @@ Options:
 Examples:
   channel-worker pair --code A3F1B2 --api https://api.channel.tunasm.art
   channel-worker start
+  channel-worker logs --lines 100
+  channel-worker stop
   `);
 }
 

package/lib/api-client.js

@@ -29,8 +29,11 @@ class ApiClient {
     return this.request('POST', '/workers/register', workerData);
   }
 
-  async heartbeat(workerId) {
-    return this.request('POST', '/workers/heartbeat', { worker_id: workerId });
+  async heartbeat(workerId, version, extensionVersion) {
+    const body = { worker_id: workerId };
+    if (version) body.version = version;
+    if (extensionVersion) body.extension_version = extensionVersion;
+    return this.request('POST', '/workers/heartbeat', body);
   }
 
   // Jobs

package/lib/daemon.js

@@ -9,7 +9,7 @@ class Daemon {
   constructor(config) {
     this.config = config;
     this.api = new ApiClient(config.api_url, config.worker_token);
-    this.heartbeat = new Heartbeat(this.api, config.worker_id);
+    this.heartbeat = new Heartbeat(this.api, config.worker_id, 30000, config);
     this.poller = new JobPoller(this.api, config);
     this.commandPoller = new CommandPoller(this.api, config);
     this.updateChecker = new UpdateChecker(5 * 60 * 1000); // check every 5min

package/lib/heartbeat.js

@@ -1,8 +1,12 @@
+const { getLocalVersion } = require('./updater');
+const { getLocalExtensionVersion } = require('./extension-updater');
+
 class Heartbeat {
-  constructor(api, workerId, intervalMs = 30000) {
+  constructor(api, workerId, intervalMs = 30000, config = {}) {
     this.api = api;
     this.workerId = workerId;
     this.intervalMs = intervalMs;
+    this.config = config;
     this.timer = null;
   }
 
@@ -20,7 +24,9 @@ class Heartbeat {
 
   async send() {
     try {
-      await this.api.heartbeat(this.workerId);
+      const version = getLocalVersion();
+      const extVersion = getLocalExtensionVersion(this.config.extension_path);
+      await this.api.heartbeat(this.workerId, version, extVersion);
     } catch (err) {
       console.error(`[heartbeat] Failed: ${err.message}`);
     }

package/lib/updater.js

@@ -43,15 +43,31 @@ async function checkAndUpdate({ autoRestart = false } = {}) {
   installUpdate(latest);
 
   if (autoRestart) {
-    console.log('[updater] Restarting daemon...');
-    // Spawn detached process with same args, then exit current
+    console.log('[updater] Restarting daemon with new version...');
     const { spawn } = require('child_process');
-    const child = spawn(process.argv[0], process.argv.slice(1), {
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+
+    const CONFIG_DIR = path.join(os.homedir(), '.channel-worker');
+    const pidFile = path.join(CONFIG_DIR, 'daemon.pid');
+    const LOG_FILE = path.join(CONFIG_DIR, 'daemon.log');
+    const logFd = fs.openSync(LOG_FILE, 'a');
+
+    // Spawn new daemon using global binary (picks up new version)
+    const isWindows = process.platform === 'win32';
+    const binName = isWindows ? 'channel-worker.cmd' : 'channel-worker';
+    const child = spawn(binName, ['start'], {
       detached: true,
-      stdio: 'ignore',
-      cwd: process.cwd(),
+      stdio: ['ignore', logFd, logFd],
+      cwd: os.homedir(),
+      shell: isWindows,
     });
     child.unref();
+
+    // Update PID file
+    fs.writeFileSync(pidFile, String(child.pid));
+
     process.exit(0);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {