remote-deploy-cli 1.1.0 → 1.1.2

package/bin/index.js

@@ -66,14 +66,28 @@ program
       // We'll use a dynamic import or checking for the pm2 binary in a real scenario
       // But here we can just try to spawn 'pm2' command
       
-      const args = ['start', process.argv[1], '--name', 'redep-server', '--', 'listen'];
+      // Use dedicated server entry point for PM2 to avoid CLI/ESM issues
+      // Resolve absolute path to server-entry.js
+      const scriptPath = new URL('../server-entry.js', import.meta.url).pathname.replace(/^\/([A-Za-z]:)/, '$1'); 
+      
+      const args = [
+        'start', 
+        scriptPath,
+        '--name', 'redep-server'
+      ];
+      
+      // We don't pass 'listen' arg because server-entry.js starts immediately
+      // But we do need to ensure env vars are passed if port is customized
+      
+      const env = { ...process.env };
       if (options.port) {
-        args.push('--port', options.port);
+        env.SERVER_PORT = options.port;
       }
 
       const pm2 = spawn('pm2', args, {
         stdio: 'inherit',
-        shell: true // Required to find pm2 in PATH
+        shell: true,
+        env: env // Pass modified env with port
       });
 
       pm2.on('error', () => {
@@ -195,15 +209,15 @@ program
   .description('Start the server to listen for commands')
   .option('-p, --port <port>', 'Port to listen on', 3000)
   .action((options) => {
-    const port = options.port || process.env.SERVER_PORT || getConfig('server_port') || 3000;
-    const secret = process.env.SECRET_KEY || getConfig('secret_key');
+    const port = options.port || getConfig('server_port') || process.env.SERVER_PORT || 3000;
+    const secret = getConfig('secret_key') || process.env.SECRET_KEY;
     
     if (!secret) {
       logger.warn('Warning: No "secret_key" set in config or SECRET_KEY env var. Communication might be insecure or fail if client requires it.');
       logger.info('Run "redep config set secret_key <your-secret>" or set SECRET_KEY env var.');
     }
 
-    const workingDir = process.env.WORKING_DIR || getConfig('working_dir');
+    const workingDir = getConfig('working_dir') || process.env.WORKING_DIR;
     if (!workingDir) {
       logger.error('Error: "working_dir" is not set. Please set it using "redep config set working_dir <path>" or WORKING_DIR env var.');
       process.exit(1);
@@ -217,8 +231,8 @@ program
   .command('deploy <type>')
   .description('Deploy a service (e.g., "fe") to the server machine')
   .action(async (type) => {
-    const serverUrl = process.env.SERVER_URL || getConfig('server_url');
-    const secret = process.env.SECRET_KEY || getConfig('secret_key');
+    const serverUrl = getConfig('server_url') || process.env.SERVER_URL;
+    const secret = getConfig('secret_key') || process.env.SECRET_KEY;
 
     if (!serverUrl) {
       logger.error('Error: "server_url" is not set. Set SERVER_URL env var or run "redep config set server_url <url>"');

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "remote-deploy-cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "index.js",
   "type": "module",
   "bin": {
     "redep": "./bin/index.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "update": "node scripts/update.js"
   },
   "keywords": [],
   "author": "",

package/scripts/update.js

@@ -0,0 +1,90 @@
+import fs from 'fs';
+import { execSync } from 'child_process';
+import path from 'path';
+
+// Get arguments from command line
+// Usage: node scripts/update.js <updateType> <commitMessage>
+const updateType = process.argv[2];
+const commitMessage = process.argv[3];
+
+// Valid update types
+const VALID_TYPES = ['patch', 'minor', 'major'];
+
+// --- Validation ---
+
+if (!updateType || !VALID_TYPES.includes(updateType)) {
+  console.error(`Error: Invalid or missing updateType. Must be one of: ${VALID_TYPES.join(', ')}`);
+  process.exit(1);
+}
+
+if (!commitMessage) {
+  console.error('Error: Missing commitMessage.');
+  process.exit(1);
+}
+
+const packageJsonPath = path.resolve('package.json');
+
+if (!fs.existsSync(packageJsonPath)) {
+  console.error('Error: package.json not found.');
+  process.exit(1);
+}
+
+// --- Version Update Logic ---
+
+try {
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+  if (!packageJson.version) {
+    console.error('Error: package.json does not contain a "version" field.');
+    process.exit(1);
+  }
+
+  const currentVersion = packageJson.version;
+  const versionParts = currentVersion.split('.').map(Number);
+
+  if (versionParts.length !== 3 || versionParts.some(isNaN)) {
+    console.error(`Error: Invalid semantic version format in package.json: ${currentVersion}`);
+    process.exit(1);
+  }
+
+  let [major, minor, patch] = versionParts;
+
+  switch (updateType) {
+    case 'major':
+      major++;
+      minor = 0;
+      patch = 0;
+      break;
+    case 'minor':
+      minor++;
+      patch = 0;
+      break;
+    case 'patch':
+      patch++;
+      break;
+  }
+
+  const newVersion = `${major}.${minor}.${patch}`;
+  packageJson.version = newVersion;
+
+  // Write updated package.json
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+  console.log(`Version updated: ${currentVersion} -> ${newVersion}`);
+
+  // --- Git Operations ---
+
+  console.log('Staging changes...');
+  execSync('git add .', { stdio: 'inherit' });
+
+  console.log(`Committing with message: "${commitMessage}"...`);
+  execSync(`git commit -m "${commitMessage}"`, { stdio: 'inherit' });
+
+  console.log('Pushing to origin main...');
+  execSync('git push origin main', { stdio: 'inherit' });
+
+  console.log('Update process completed successfully!');
+
+} catch (error) {
+  console.error(`Error during update process: ${error.message}`);
+  process.exit(1);
+}

package/server-entry.js

@@ -0,0 +1,22 @@
+import { startServer } from './lib/server/index.js';
+import { logger } from './lib/logger.js';
+import { getConfig } from './lib/config.js';
+import 'dotenv/config';
+
+// Dedicated entry point for PM2 to ensure clean ESM handling
+// PM2 sometimes struggles with CLI binaries directly in ESM mode
+
+const port = process.env.SERVER_PORT || getConfig('server_port') || 3000;
+const secret = process.env.SECRET_KEY || getConfig('secret_key');
+const workingDir = process.env.WORKING_DIR || getConfig('working_dir');
+
+if (!secret) {
+  logger.warn('Warning: No "secret_key" set. Communication might be insecure.');
+}
+
+if (!workingDir) {
+  logger.error('Error: "working_dir" is not set.');
+  process.exit(1);
+}
+
+startServer(port, secret, workingDir);