portok 1.0.2 → 1.0.3

package/README.md

@@ -197,6 +197,7 @@ portok <command> [options]
 Management Commands:
   init            Initialize portok directories (/etc/portok, /var/lib/portok)
   add <name>      Create a new service instance
+  remove <name>   Remove a service instance (stops, disables, deletes config/state)
   list            List all configured instances and their status
 
 Service Control Commands:
@@ -226,6 +227,10 @@ Options for 'add' command:
   --health <path>   Health check path (default: /health)
   --force           Overwrite existing config
 
+Options for 'remove' command:
+  --force           Skip confirmation prompt
+  --keep-state      Keep state file (/var/lib/portok/<name>.json)
+
 Options for 'logs' command:
   --follow, -f      Follow log output
   --lines, -n       Number of lines to show (default: 50)
@@ -275,6 +280,10 @@ sudo portok restart api
 sudo portok enable api    # Enable at boot
 sudo portok disable api   # Disable at boot
 
+# Remove a service (stops, disables, removes config and state)
+sudo portok remove api --force
+sudo portok remove api --force --keep-state  # Keep state file
+
 # View logs
 portok logs api
 portok logs api --follow  # Follow log output

package/bench/baseline.bench.js

@@ -4,7 +4,7 @@
  */
 
 const autocannon = require('autocannon');
-const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./run.js');
+const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./helpers.js');
 
 async function run({ duration, adminToken }) {
   const shortDuration = Math.max(2, Math.floor(duration / 2));

package/bench/connections.bench.js

@@ -4,7 +4,7 @@
  */
 
 const autocannon = require('autocannon');
-const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./run.js');
+const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./helpers.js');
 
 async function run({ duration, adminToken }) {
   // Setup

package/bench/helpers.js

@@ -0,0 +1,124 @@
+/**
+ * Benchmark Helpers
+ * Shared utilities for all benchmark files
+ */
+
+const { spawn } = require('node:child_process');
+const http = require('node:http');
+const path = require('node:path');
+
+const ADMIN_TOKEN = process.env.ADMIN_TOKEN || 'bench-token-12345';
+
+function formatNumber(n) {
+  return n.toLocaleString('en-US', { maximumFractionDigits: 2 });
+}
+
+async function getFreePort() {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer();
+    server.listen(0, '127.0.0.1', () => {
+      const port = server.address().port;
+      server.close(() => resolve(port));
+    });
+    server.on('error', reject);
+  });
+}
+
+async function waitFor(condition, timeout = 10000) {
+  const start = Date.now();
+  while (Date.now() - start < timeout) {
+    if (await condition()) return true;
+    await new Promise(r => setTimeout(r, 100));
+  }
+  throw new Error('Timeout waiting for condition');
+}
+
+// =============================================================================
+// Mock Server
+// =============================================================================
+
+async function createMockServer(options = {}) {
+  const { responseDelay = 0, responseSize = 13 } = options;
+  const port = await getFreePort();
+
+  const responseBody = responseSize <= 13
+    ? 'Hello, World!'
+    : 'x'.repeat(responseSize);
+
+  const server = http.createServer((req, res) => {
+    if (req.url === '/health') {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end('{"status":"ok"}');
+      return;
+    }
+
+    if (responseDelay > 0) {
+      setTimeout(() => {
+        res.writeHead(200, { 'Content-Type': 'text/plain' });
+        res.end(responseBody);
+      }, responseDelay);
+    } else {
+      res.writeHead(200, { 'Content-Type': 'text/plain' });
+      res.end(responseBody);
+    }
+  });
+
+  return new Promise((resolve, reject) => {
+    server.listen(port, '127.0.0.1', () => {
+      resolve({
+        port,
+        close: () => new Promise(r => server.close(r)),
+      });
+    });
+    server.on('error', reject);
+  });
+}
+
+// =============================================================================
+// Daemon Starter
+// =============================================================================
+
+async function startDaemon(proxyPort, targetPort, extraEnv = {}) {
+  const daemonPath = path.join(__dirname, '..', 'portokd.js');
+
+  const env = {
+    ...process.env,
+    LISTEN_PORT: String(proxyPort),
+    INITIAL_TARGET_PORT: String(targetPort),
+    ADMIN_TOKEN,
+    DRAIN_MS: '100',
+    ROLLBACK_WINDOW_MS: '1000',
+    ROLLBACK_CHECK_EVERY_MS: '100',
+    ROLLBACK_FAIL_THRESHOLD: '2',
+    ...extraEnv,
+  };
+
+  const daemon = spawn('node', [daemonPath], {
+    env,
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+
+  // Wait for daemon to be ready
+  await waitFor(async () => {
+    try {
+      const res = await fetch(`http://127.0.0.1:${proxyPort}/__status`, {
+        headers: { 'x-admin-token': ADMIN_TOKEN },
+      });
+      return res.ok;
+    } catch {
+      return false;
+    }
+  }, 10000);
+
+  return daemon;
+}
+
+module.exports = {
+  createMockServer,
+  startDaemon,
+  getFreePort,
+  waitFor,
+  formatNumber,
+  ADMIN_TOKEN,
+};
+

package/bench/latency.bench.js

@@ -4,7 +4,7 @@
  */
 
 const autocannon = require('autocannon');
-const { createMockServer, startDaemon, getFreePort } = require('./run.js');
+const { createMockServer, startDaemon, getFreePort } = require('./helpers.js');
 
 async function run({ duration, adminToken }) {
   // Setup

package/bench/run.js

@@ -5,9 +5,6 @@
  * Orchestrates all benchmarks and outputs formatted results
  */
 
-const { spawn } = require('node:child_process');
-const http = require('node:http');
-
 // =============================================================================
 // Configuration
 // =============================================================================
@@ -31,86 +28,6 @@ function log(msg) {
   }
 }
 
-function formatNumber(n) {
-  return n.toLocaleString('en-US', { maximumFractionDigits: 2 });
-}
-
-async function getFreePort() {
-  return new Promise((resolve, reject) => {
-    const server = http.createServer();
-    server.listen(0, '127.0.0.1', () => {
-      const port = server.address().port;
-      server.close(() => resolve(port));
-    });
-    server.on('error', reject);
-  });
-}
-
-async function waitFor(condition, timeout = 10000) {
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    if (await condition()) return true;
-    await new Promise(r => setTimeout(r, 100));
-  }
-  throw new Error('Timeout waiting for condition');
-}
-
-// =============================================================================
-// Mock Server
-// =============================================================================
-
-async function createMockServer(port = 0) {
-  const server = http.createServer((req, res) => {
-    if (req.url === '/health') {
-      res.writeHead(200, { 'Content-Type': 'application/json' });
-      res.end('{"status":"healthy"}');
-      return;
-    }
-    res.writeHead(200, { 'Content-Type': 'text/plain' });
-    res.end('OK');
-  });
-
-  await new Promise(resolve => server.listen(port, '127.0.0.1', resolve));
-  return {
-    port: server.address().port,
-    close: () => new Promise(resolve => server.close(resolve)),
-  };
-}
-
-// =============================================================================
-// Start Daemon
-// =============================================================================
-
-async function startDaemon(listenPort, targetPort) {
-  const proc = spawn('node', ['portokd.js'], {
-    env: {
-      ...process.env,
-      LISTEN_PORT: String(listenPort),
-      INITIAL_TARGET_PORT: String(targetPort),
-      ADMIN_TOKEN,
-      STATE_FILE: `/tmp/portok-bench-${Date.now()}.json`,
-      DRAIN_MS: '1000',
-      ROLLBACK_WINDOW_MS: '60000',
-      ROLLBACK_CHECK_EVERY_MS: '5000',
-      ROLLBACK_FAIL_THRESHOLD: '3',
-    },
-    stdio: 'pipe',
-  });
-
-  await waitFor(async () => {
-    try {
-      const res = await fetch(`http://127.0.0.1:${listenPort}/__status`, {
-        headers: { 'x-admin-token': ADMIN_TOKEN },
-      });
-      return res.ok;
-    } catch {
-      return false;
-    }
-  });
-
-  return proc;
-}
-
 // =============================================================================
 // Run Individual Benchmarks
 // =============================================================================
@@ -206,6 +123,3 @@ main().catch(err => {
   console.error('Benchmark failed:', err);
   process.exit(1);
 });
-
-module.exports = { createMockServer, startDaemon, getFreePort, waitFor, formatNumber, ADMIN_TOKEN };
-

package/bench/switching.bench.js

@@ -4,7 +4,7 @@
  */
 
 const autocannon = require('autocannon');
-const { createMockServer, startDaemon, getFreePort, formatNumber, ADMIN_TOKEN } = require('./run.js');
+const { createMockServer, startDaemon, getFreePort, formatNumber, ADMIN_TOKEN } = require('./helpers.js');
 
 async function run({ duration, adminToken }) {
   // Setup two servers

package/bench/throughput.bench.js

@@ -4,7 +4,7 @@
  */
 
 const autocannon = require('autocannon');
-const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./run.js');
+const { createMockServer, startDaemon, getFreePort, formatNumber } = require('./helpers.js');
 
 async function run({ duration, adminToken }) {
   // Setup

package/docker-compose.yml

@@ -56,7 +56,7 @@ services:
       - ROLLBACK_FAIL_THRESHOLD=3
     ports:
       - "3000:3000"
-    command: ["node", "portokd.mjs"]
+    command: ["node", "portokd.js"]
     tmpfs:
       - /tmp
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portok",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Zero-downtime deployment proxy - routes traffic through a stable port to internal app instances with health-gated switching",
   "main": "portokd.js",
   "bin": {

package/portok.js

@@ -314,6 +314,8 @@ async function cmdSwitch(baseUrl, token, port, options) {
 async function cmdInit(options) {
   const configDir = ENV_FILE_DIR;
   const stateDir = '/var/lib/portok';
+  const systemdDir = '/etc/systemd/system';
+  const serviceFileName = 'portok@.service';
 
   console.log(`${colors.bold}Initializing Portok...${colors.reset}\n`);
 
@@ -351,6 +353,51 @@ async function cmdInit(options) {
     results.push({ path: stateDir, status: 'error', error: err.message });
   }
 
+  // Install systemd template unit
+  const systemdDest = path.join(systemdDir, serviceFileName);
+  try {
+    // Find the service file relative to this script
+    const scriptDir = path.dirname(process.argv[1]);
+    const possiblePaths = [
+      path.join(scriptDir, serviceFileName),
+      path.join(scriptDir, '..', serviceFileName),
+      '/opt/portok/' + serviceFileName,
+    ];
+    
+    let sourceFile = null;
+    for (const p of possiblePaths) {
+      if (fs.existsSync(p)) {
+        sourceFile = p;
+        break;
+      }
+    }
+
+    if (sourceFile) {
+      const content = fs.readFileSync(sourceFile, 'utf-8');
+      const existingContent = fs.existsSync(systemdDest) ? fs.readFileSync(systemdDest, 'utf-8') : null;
+      
+      if (existingContent === content) {
+        results.push({ path: systemdDest, status: 'exists' });
+      } else {
+        fs.writeFileSync(systemdDest, content, { mode: 0o644 });
+        results.push({ path: systemdDest, status: 'created' });
+        
+        // Reload systemd daemon
+        try {
+          const { execSync } = require('child_process');
+          execSync('systemctl daemon-reload', { stdio: 'pipe' });
+          results.push({ path: 'systemctl daemon-reload', status: 'created' });
+        } catch (e) {
+          // Ignore if systemctl not available (e.g., in Docker)
+        }
+      }
+    } else {
+      results.push({ path: systemdDest, status: 'skipped', error: 'Template file not found' });
+    }
+  } catch (err) {
+    results.push({ path: systemdDest, status: 'error', error: err.message });
+  }
+
   if (options.json) {
     console.log(JSON.stringify({ success: true, results }, null, 2));
     return 0;
@@ -360,9 +407,11 @@ async function cmdInit(options) {
   for (const r of results) {
     const icon = r.status === 'created' ? `${colors.green}✓${colors.reset}` :
                  r.status === 'exists' ? `${colors.dim}○${colors.reset}` :
+                 r.status === 'skipped' ? `${colors.yellow}○${colors.reset}` :
                  `${colors.red}✗${colors.reset}`;
     const status = r.status === 'created' ? 'Created' :
                    r.status === 'exists' ? 'Already exists' :
+                   r.status === 'skipped' ? `Skipped: ${r.error}` :
                    `Error: ${r.error}`;
     console.log(`  ${icon} ${r.path} - ${status}`);
   }
@@ -377,7 +426,8 @@ async function cmdInit(options) {
   console.log(`\n${colors.green}Portok initialized successfully!${colors.reset}`);
   console.log(`\nNext steps:`);
   console.log(`  1. Create a service: ${colors.cyan}portok add <name>${colors.reset}`);
-  console.log(`  2. Or manually create: ${colors.dim}${configDir}/<name>.env${colors.reset}`);
+  console.log(`  2. Start service: ${colors.cyan}portok start <name>${colors.reset}`);
+  console.log(`  3. Enable at boot: ${colors.cyan}portok enable <name>${colors.reset}`);
 
   return 0;
 }
@@ -495,6 +545,130 @@ ROLLBACK_FAIL_THRESHOLD=3
   return 0;
 }
 
+async function cmdRemove(name, options) {
+  if (!name) {
+    console.error(`${colors.red}Error:${colors.reset} Service name is required`);
+    console.error('Usage: portok remove <name> [--force] [--keep-state]');
+    return 1;
+  }
+
+  const envFilePath = path.join(ENV_FILE_DIR, `${name}.env`);
+  const stateFilePath = `/var/lib/portok/${name}.json`;
+
+  // Check if service exists
+  if (!fs.existsSync(envFilePath)) {
+    console.error(`${colors.red}Error:${colors.reset} Service '${name}' not found at ${envFilePath}`);
+    return 1;
+  }
+
+  // Confirmation (unless --force)
+  if (!options.force && !options.json) {
+    console.log(`${colors.yellow}Warning:${colors.reset} This will remove service '${name}'`);
+    console.log(`  Config file: ${envFilePath}`);
+    if (fs.existsSync(stateFilePath) && !options['keep-state']) {
+      console.log(`  State file:  ${stateFilePath}`);
+    }
+    console.log(`\nUse ${colors.cyan}--force${colors.reset} to confirm removal.`);
+    return 1;
+  }
+
+  const results = [];
+  const { execSync } = require('child_process');
+
+  // 1. Stop the service if running
+  try {
+    execSync(`systemctl is-active portok@${name}`, { stdio: 'pipe' });
+    // Service is running, stop it
+    try {
+      execSync(`systemctl stop portok@${name}`, { stdio: 'pipe' });
+      results.push({ action: 'stop', status: 'success' });
+    } catch (e) {
+      results.push({ action: 'stop', status: 'error', error: e.message });
+    }
+  } catch {
+    // Service not running, skip
+    results.push({ action: 'stop', status: 'skipped' });
+  }
+
+  // 2. Disable the service
+  try {
+    execSync(`systemctl is-enabled portok@${name}`, { stdio: 'pipe' });
+    // Service is enabled, disable it
+    try {
+      execSync(`systemctl disable portok@${name}`, { stdio: 'pipe' });
+      results.push({ action: 'disable', status: 'success' });
+    } catch (e) {
+      results.push({ action: 'disable', status: 'error', error: e.message });
+    }
+  } catch {
+    // Service not enabled, skip
+    results.push({ action: 'disable', status: 'skipped' });
+  }
+
+  // 3. Remove config file
+  try {
+    fs.unlinkSync(envFilePath);
+    results.push({ action: 'remove-config', status: 'success', path: envFilePath });
+  } catch (err) {
+    results.push({ action: 'remove-config', status: 'error', error: err.message });
+  }
+
+  // 4. Remove state file (unless --keep-state)
+  if (!options['keep-state']) {
+    if (fs.existsSync(stateFilePath)) {
+      try {
+        fs.unlinkSync(stateFilePath);
+        results.push({ action: 'remove-state', status: 'success', path: stateFilePath });
+      } catch (err) {
+        results.push({ action: 'remove-state', status: 'error', error: err.message });
+      }
+    } else {
+      results.push({ action: 'remove-state', status: 'skipped' });
+    }
+  } else {
+    results.push({ action: 'remove-state', status: 'kept' });
+  }
+
+  const hasError = results.some(r => r.status === 'error');
+
+  if (options.json) {
+    console.log(JSON.stringify({ success: !hasError, name, results }, null, 2));
+    return hasError ? 1 : 0;
+  }
+
+  // Display results
+  console.log(`\n${colors.bold}Removing service '${name}'...${colors.reset}\n`);
+  
+  for (const r of results) {
+    const icon = r.status === 'success' ? `${colors.green}✓${colors.reset}` :
+                 r.status === 'skipped' ? `${colors.dim}○${colors.reset}` :
+                 r.status === 'kept' ? `${colors.dim}○${colors.reset}` :
+                 `${colors.red}✗${colors.reset}`;
+    
+    const actionLabel = {
+      'stop': 'Stop service',
+      'disable': 'Disable service',
+      'remove-config': 'Remove config',
+      'remove-state': 'Remove state',
+    }[r.action];
+
+    const statusLabel = r.status === 'success' ? 'Done' :
+                        r.status === 'skipped' ? 'Skipped (not running/enabled)' :
+                        r.status === 'kept' ? 'Kept (--keep-state)' :
+                        `Error: ${r.error}`;
+    
+    console.log(`  ${icon} ${actionLabel.padEnd(16)} ${statusLabel}`);
+  }
+
+  if (hasError) {
+    console.log(`\n${colors.yellow}Warning:${colors.reset} Some operations failed. Check errors above.`);
+    return 1;
+  }
+
+  console.log(`\n${colors.green}✓ Service '${name}' removed successfully!${colors.reset}`);
+  return 0;
+}
+
 async function cmdList(options) {
   const configDir = ENV_FILE_DIR;
 
@@ -728,6 +902,7 @@ ${colors.bold}COMMANDS${colors.reset}
   ${colors.cyan}Management:${colors.reset}
   init            Initialize portok directories (/etc/portok, /var/lib/portok)
   add <name>      Create a new service instance
+  remove <name>   Remove a service instance (config + state)
   list            List all configured instances and their status
 
   ${colors.cyan}Service Control:${colors.reset}
@@ -757,6 +932,10 @@ ${colors.bold}OPTIONS${colors.reset}
   --health <path>   Health check path (default: /health)
   --force           Overwrite existing config
 
+  ${colors.dim}For 'remove' command:${colors.reset}
+  --force           Skip confirmation prompt
+  --keep-state      Keep state file (/var/lib/portok/<name>.json)
+
   ${colors.dim}For 'logs' command:${colors.reset}
   --follow, -f      Follow log output
   --lines, -n       Number of lines to show (default: 50)
@@ -779,6 +958,9 @@ ${colors.bold}EXAMPLES${colors.reset}
   sudo portok restart api
   portok logs api --follow
 
+  ${colors.dim}# Remove a service${colors.reset}
+  sudo portok remove api --force
+
   ${colors.dim}# Check status of an instance${colors.reset}
   portok status --instance api
 
@@ -813,7 +995,7 @@ async function main() {
   }
 
   // Management commands (don't require daemon connection)
-  const managementCommands = ['init', 'add', 'list', 'start', 'stop', 'restart', 'enable', 'disable', 'logs'];
+  const managementCommands = ['init', 'add', 'remove', 'list', 'start', 'stop', 'restart', 'enable', 'disable', 'logs'];
 
   if (managementCommands.includes(args.command)) {
     let exitCode = 1;
@@ -824,6 +1006,9 @@ async function main() {
       case 'add':
         exitCode = await cmdAdd(args.positional[0], args.options);
         break;
+      case 'remove':
+        exitCode = await cmdRemove(args.positional[0], args.options);
+        break;
       case 'list':
         exitCode = await cmdList(args.options);
         break;

package/portok@.service

@@ -29,7 +29,7 @@ Environment=INSTANCE_NAME=%i
 WorkingDirectory=/opt/portok
 
 # Start the daemon
-ExecStart=/usr/bin/node /opt/portok/portokd.mjs
+ExecStart=/usr/bin/node /opt/portok/portokd.js
 
 # Restart policy
 Restart=always

package/test/drain.test.js

@@ -210,25 +210,34 @@ describe('Connection Draining', () => {
 
       await new Promise(resolve => setTimeout(resolve, 100));
 
-      // Start continuous traffic
+      // Start continuous traffic using a more reliable approach
       let requestCount = 0;
       let errorCount = 0;
-
-      const interval = setInterval(async () => {
-        try {
-          const res = await fetch(`http://127.0.0.1:${proxyPort}/`);
-          if (res.ok) {
-            requestCount++;
-          } else {
+      let running = true;
+
+      // Use a loop instead of setInterval for more reliable timing
+      const trafficLoop = async () => {
+        while (running) {
+          try {
+            const res = await fetch(`http://127.0.0.1:${proxyPort}/`);
+            if (res.ok) {
+              requestCount++;
+            } else {
+              errorCount++;
+            }
+          } catch {
             errorCount++;
           }
-        } catch {
-          errorCount++;
+          // Small delay between requests
+          await new Promise(resolve => setTimeout(resolve, 30));
         }
-      }, 50);
+      };
+
+      // Start traffic in background
+      const trafficPromise = trafficLoop();
 
       // Wait a bit, then switch
-      await new Promise(resolve => setTimeout(resolve, 200));
+      await new Promise(resolve => setTimeout(resolve, 150));
 
       await fetch(`http://127.0.0.1:${proxyPort}/__switch?port=${mockServer2.port}`, {
         method: 'POST',
@@ -236,12 +245,15 @@ describe('Connection Draining', () => {
       });
 
       // Continue traffic during switch
-      await new Promise(resolve => setTimeout(resolve, 500));
+      await new Promise(resolve => setTimeout(resolve, 300));
 
-      clearInterval(interval);
+      // Stop traffic
+      running = false;
+      await trafficPromise;
 
       // Should have processed requests with minimal errors
-      assert.ok(requestCount > 5, `Expected at least 5 requests, got ${requestCount}`);
+      // At least 3 requests is enough to verify no drops during switch
+      assert.ok(requestCount >= 3, `Expected at least 3 requests, got ${requestCount}`);
       assert.strictEqual(errorCount, 0, `Expected 0 errors, got ${errorCount}`);
     });
   });