portok 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portok",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "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

@@ -353,83 +353,67 @@ async function cmdInit(options) {
     results.push({ path: stateDir, status: 'error', error: err.message });
   }
 
-  // Install systemd template unit (embedded content)
+  // Install systemd template unit from external file
   const systemdDest = path.join(systemdDir, serviceFileName);
-  const serviceContent = `# Portok systemd template unit for multi-instance deployments
-# Auto-generated by: portok init
-
-[Unit]
-Description=Portok Zero-Downtime Proxy (%i)
-After=network.target
-Documentation=https://github.com/nicatdursunlu/portok
-
-[Service]
-Type=simple
-User=www-data
-Group=www-data
-
-# Instance configuration from env file
-EnvironmentFile=/etc/portok/%i.env
-
-# Set instance name automatically from systemd specifier
-Environment=INSTANCE_NAME=%i
-
-# Working directory
-WorkingDirectory=/opt/portok
-
-# Start the daemon
-ExecStart=/usr/bin/node /opt/portok/portokd.js
-
-# Restart policy
-Restart=always
-RestartSec=5
-StartLimitBurst=5
-StartLimitIntervalSec=60
-
-# Logging
-StandardOutput=journal
-StandardError=journal
-SyslogIdentifier=portok-%i
-
-# Security hardening
-NoNewPrivileges=true
-ProtectSystem=strict
-ProtectHome=true
-PrivateTmp=true
-ProtectKernelTunables=true
-ProtectKernelModules=true
-ProtectControlGroups=true
-
-# Allow writing to state directory
-ReadWritePaths=/var/lib/portok
-
-# Network access (required for proxying)
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
-
-[Install]
-WantedBy=multi-user.target
-`;
+  
+  // Find portok@.service file relative to this script
+  const scriptDir = path.dirname(process.argv[1]);
+  const possibleServicePaths = [
+    path.join(scriptDir, serviceFileName),
+    path.join(scriptDir, '..', serviceFileName),
+    path.join(__dirname, serviceFileName),
+    path.join(__dirname, '..', serviceFileName),
+  ];
+  
+  let serviceSourcePath = null;
+  for (const p of possibleServicePaths) {
+    if (fs.existsSync(p)) {
+      serviceSourcePath = p;
+      break;
+    }
+  }
 
-  try {
-    const existingContent = fs.existsSync(systemdDest) ? fs.readFileSync(systemdDest, 'utf-8') : null;
-    
-    if (existingContent === serviceContent) {
-      results.push({ path: systemdDest, status: 'exists' });
-    } else {
-      fs.writeFileSync(systemdDest, serviceContent, { mode: 0o644 });
-      results.push({ path: systemdDest, status: 'created' });
+  // Check if systemd directory exists
+  if (!fs.existsSync(systemdDir)) {
+    results.push({ path: systemdDest, status: 'skipped', error: 'systemd not available' });
+  } else if (!serviceSourcePath) {
+    results.push({ path: systemdDest, status: 'error', error: `${serviceFileName} not found in package` });
+  } else {
+    try {
+      // Read template and replace placeholders with actual paths
+      let serviceContent = fs.readFileSync(serviceSourcePath, 'utf-8');
       
-      // 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)
+      // Get actual node path (supports nvm, fnm, volta, etc.)
+      const nodePath = process.execPath;
+      
+      // Get actual portok installation directory
+      const portokDir = path.dirname(serviceSourcePath);
+      
+      // Replace hardcoded paths with actual paths
+      serviceContent = serviceContent.replace(/\/usr\/bin\/node/g, nodePath);
+      serviceContent = serviceContent.replace(/WorkingDirectory=\/opt\/portok/g, `WorkingDirectory=${portokDir}`);
+      serviceContent = serviceContent.replace(/\/opt\/portok\/portokd\.js/g, `${portokDir}/portokd.js`);
+      
+      const existingContent = fs.existsSync(systemdDest) ? fs.readFileSync(systemdDest, 'utf-8') : null;
+      
+      if (existingContent && existingContent.trim() === serviceContent.trim()) {
+        results.push({ path: systemdDest, status: 'exists' });
+      } else {
+        fs.writeFileSync(systemdDest, serviceContent, { 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) {
+          results.push({ path: 'systemctl daemon-reload', status: 'skipped', error: 'systemctl failed' });
+        }
       }
+    } catch (err) {
+      results.push({ path: systemdDest, status: 'error', error: err.message });
     }
-  } catch (err) {
-    results.push({ path: systemdDest, status: 'error', error: err.message });
   }
 
   if (options.json) {

package/portok@.service

@@ -1,5 +1,9 @@
 # Portok systemd template unit for multi-instance deployments
-# Place this file at /etc/systemd/system/portok@.service
+#
+# This file is used as a template by 'portok init'.
+# The following paths are automatically replaced:
+#   - /usr/bin/node        -> actual node path (supports nvm, fnm, volta)
+#   - /opt/portok          -> actual portok installation directory
 #
 # Usage:
 #   systemctl start portok@api      # Start instance "api"