channel-worker 1.0.33 → 1.1.1

package/bin/cli.js

@@ -37,35 +37,88 @@ function saveConfig(config) {
 const args = parseArgs(process.argv.slice(2));
 const cmd = args._cmd || 'start';
 
-if (cmd === 'init') {
+if (cmd === 'pair') {
+  // Pair with dashboard using one-time code
+  const code = args.code;
+  const apiUrl = args.api || 'https://api.channel.tunasm.art';
+  const nstKey = args['nst-key'] || '';
+  const extensionPath = args.extension || '';
+  const maxConcurrent = parseInt(args.concurrent || '2', 10);
+
+  if (!code) {
+    console.error('[channel-worker] Error: --code required. Get a pairing code from the dashboard.');
+    process.exit(1);
+  }
+
+  (async () => {
+    try {
+      console.log(`[channel-worker] Pairing with code: ${code}`);
+      const res = await fetch(`${apiUrl}/workers/pair`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          code,
+          ip_address: getLocalIP(),
+          max_concurrent: maxConcurrent,
+        }),
+      });
+      const json = await res.json();
+
+      if (!json.success) {
+        console.error(`[channel-worker] Pairing failed: ${json.message}`);
+        process.exit(1);
+      }
+
+      const config = {
+        worker_id: json.data.worker_id,
+        worker_token: json.data.worker_token,
+        api_url: apiUrl,
+        max_concurrent: maxConcurrent,
+        nst_api_key: nstKey,
+        extension_path: extensionPath,
+      };
+      saveConfig(config);
+
+      console.log(`[channel-worker] Paired successfully!`);
+      console.log(`  Worker ID: ${config.worker_id}`);
+      console.log(`  Config saved to: ${CONFIG_FILE}`);
+      console.log(`\nRun: channel-worker start`);
+    } catch (err) {
+      console.error(`[channel-worker] Error: ${err.message}`);
+      process.exit(1);
+    }
+  })();
+
+} else if (cmd === 'init') {
   const config = {
     worker_id: args.id || `worker-${os.hostname()}`,
     api_url: args.api || 'http://localhost:3001',
     max_concurrent: parseInt(args.concurrent || '2', 10),
     nst_api_key: args['nst-key'] || '',
     extension_path: args.extension || '',
+    worker_token: args.token || '',
   };
   saveConfig(config);
   console.log(`[channel-worker] Config saved to ${CONFIG_FILE}`);
   console.log(JSON.stringify(config, null, 2));
   console.log('\nRun: channel-worker start');
   process.exit(0);
-}
 
-if (cmd === 'start') {
+} else if (cmd === 'start') {
   // Merge CLI args over saved config
   const saved = loadConfig();
   const config = {
     worker_id: args.id || saved.worker_id || `worker-${os.hostname()}`,
-    api_url: args.api || saved.api_url || 'http://localhost:3001',
+    api_url: args.api || saved.api_url || 'https://api.channel.tunasm.art',
     max_concurrent: parseInt(args.concurrent || saved.max_concurrent || '2', 10),
     nst_api_key: args['nst-key'] || saved.nst_api_key || '',
     extension_path: args.extension || saved.extension_path || '',
+    worker_token: args.token || saved.worker_token || '',
     verbose: !!args.verbose,
   };
 
-  if (!config.worker_id) {
-    console.error('[channel-worker] Error: --id required. Run: channel-worker init --id <name> --api <url>');
+  if (!config.worker_token) {
+    console.error('[channel-worker] Error: No worker token. Run: channel-worker pair --code <CODE> --api <URL>');
     process.exit(1);
   }
 
@@ -78,28 +131,44 @@ if (cmd === 'start') {
 
 } else if (cmd === 'config') {
   const config = loadConfig();
-  console.log(JSON.stringify(config, null, 2));
+  // Hide token in display
+  const display = { ...config };
+  if (display.worker_token) display.worker_token = display.worker_token.slice(0, 8) + '...';
+  console.log(JSON.stringify(display, null, 2));
 
 } else {
   console.log(`
 channel-worker — Channel Manager worker daemon
 
 Commands:
-  init     Configure worker (saves to ~/.channel-worker/config.json)
+  pair     Pair with dashboard using a one-time code (recommended)
+  init     Configure worker manually
   start    Start the daemon
   config   Show current config
 
+Pairing (recommended):
+  channel-worker pair --code <CODE> --api <URL>
+
 Options:
-  --id <name>        Worker ID (unique name)
-  --api <url>        Dashboard API URL (http://host:3001)
-  --concurrent <n>   Max concurrent browser instances (default: 2)
+  --code <code>      Pairing code from dashboard (for pair command)
+  --api <url>        API URL (default: https://api.channel.tunasm.art)
+  --concurrent <n>   Max concurrent browsers (default: 2)
   --nst-key <key>    Nstbrowser API key
   --extension <path> Path to content-creator extension
   --verbose          Enable verbose logging
 
 Examples:
-  channel-worker init --id win-worker --api http://192.168.1.52:3001
+  channel-worker pair --code A3F1B2 --api https://api.channel.tunasm.art
   channel-worker start
-  channel-worker start --id win-worker --api http://192.168.1.52:3001
   `);
 }
+
+function getLocalIP() {
+  const interfaces = os.networkInterfaces();
+  for (const name of Object.keys(interfaces)) {
+    for (const iface of interfaces[name]) {
+      if (iface.family === 'IPv4' && !iface.internal) return iface.address;
+    }
+  }
+  return '127.0.0.1';
+}

package/lib/api-client.js

@@ -1,13 +1,17 @@
 class ApiClient {
-  constructor(baseUrl) {
+  constructor(baseUrl, workerToken) {
     this.baseUrl = baseUrl.replace(/\/$/, '');
+    this.workerToken = workerToken || '';
   }
 
   async request(method, path, body = null) {
     const url = `${this.baseUrl}${path}`;
     const options = {
       method,
-      headers: { 'Content-Type': 'application/json' },
+      headers: {
+        'Content-Type': 'application/json',
+        'x-worker-token': this.workerToken,
+      },
     };
     if (body) options.body = JSON.stringify(body);
 

package/lib/command-poller.js

@@ -117,6 +117,7 @@ class CommandPoller {
           fs.writeFileSync(path.join(uniqueExtPath, 'config.json'), JSON.stringify({
             channelManagerApi: 'https://api.channel.tunasm.art',
             profileId: profile_id,
+            workerToken: this.config.worker_token || '',
           }));
           extensionPath = uniqueExtPath;
           console.log(`[commands] Extension dir: ${uniqueExtPath}`);

package/lib/daemon.js

@@ -7,7 +7,7 @@ const os = require('os');
 class Daemon {
   constructor(config) {
     this.config = config;
-    this.api = new ApiClient(config.api_url);
+    this.api = new ApiClient(config.api_url, config.worker_token);
     this.heartbeat = new Heartbeat(this.api, config.worker_id);
     this.poller = new JobPoller(this.api, config);
     this.commandPoller = new CommandPoller(this.api, config);

package/package.json

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