@oussema_mili/test-pkg-123 1.1.25 → 1.1.26

package/cli-commands.js

@@ -417,13 +417,11 @@ function setupCLICommands(program, startServerFunction) {
   serviceCommand
     .command("stop")
     .description("stop the running daemon")
-    .option("-f, --force", "force kill if graceful shutdown fails")
-    .action(async (options) => {
+    .action(async () => {
       const spinner = ora("Stopping Fenwave Agent daemon...").start();
 
       try {
         const stopped = await stopDaemon({
-          force: options.force,
           timeout: 10000,
         });
 

package/daemon/agentRunner.js

@@ -315,10 +315,72 @@ export async function runAgent(options = {}) {
     log('Starting agent without container...');
   }
 
-  // Create HTTP server
+  // Create HTTP server with download endpoint handler
   const agentId = uuidv4();
   const existingWsToken = readWsToken();
-  const server = http.createServer();
+  const backupDir = path.join(os.homedir(), 'volume-backups');
+  
+  const server = http.createServer((req, res) => {
+    // Handle backup download requests
+    if (req.method === 'GET' && req.url?.startsWith('/api/download')) {
+      const url = new URL(req.url, `http://${req.headers.host}`);
+      const backupPath = url.searchParams.get('path');
+      
+      if (!backupPath) {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Missing backup path' }));
+        return;
+      }
+      
+      // Security check: only allow downloads from the backup directory
+      const normalizedBackupPath = path.resolve(backupPath);
+      const normalizedBackupDir = path.resolve(backupDir);
+      
+      if (
+        !normalizedBackupPath.startsWith(normalizedBackupDir) ||
+        !path.basename(backupPath).includes('-backup-') ||
+        !backupPath.endsWith('.tar')
+      ) {
+        res.writeHead(403, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Invalid backup path' }));
+        return;
+      }
+      
+      // Check if file exists
+      if (!fs.existsSync(normalizedBackupPath)) {
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Backup file not found' }));
+        return;
+      }
+      
+      // Stream the file to the client
+      const stat = fs.statSync(normalizedBackupPath);
+      const filename = path.basename(normalizedBackupPath);
+      
+      res.writeHead(200, {
+        'Content-Type': 'application/x-tar',
+        'Content-Length': stat.size,
+        'Content-Disposition': `attachment; filename="${filename}"`,
+      });
+      
+      const readStream = fs.createReadStream(normalizedBackupPath);
+      readStream.pipe(res);
+      
+      readStream.on('error', (err) => {
+        log(`Error streaming backup file: ${err.message}`, 'error');
+        if (!res.headersSent) {
+          res.writeHead(500, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Failed to download backup' }));
+        }
+      });
+      
+      return;
+    }
+    
+    // For non-download requests, return 404 (WebSocket handles the rest)
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Not found' }));
+  });
 
   return new Promise((resolve, reject) => {
     server.listen(actualPort, async () => {

package/daemon/daemonManager.js

@@ -99,12 +99,11 @@ export async function startDaemon(options = {}) {
 /**
  * Stop the running daemon
  * @param {Object} options - Stop options
- * @param {boolean} options.force - Force kill if graceful fails
  * @param {number} options.timeout - Timeout in ms to wait for graceful shutdown
  * @returns {Promise<boolean>} True if stopped
  */
 export async function stopDaemon(options = {}) {
-  const { force = false, timeout = 10000 } = options;
+  const { timeout = 10000 } = options;
 
   const pid = getDaemonPid();
   if (!pid) {
@@ -151,27 +150,23 @@ export async function stopDaemon(options = {}) {
     }
   }
 
-  // Timeout reached, try SIGKILL if force option
-  if (force) {
-    console.log(chalk.yellow('Graceful shutdown timed out, forcing...'));
-    try {
-      process.kill(pid, 'SIGKILL');
-      await new Promise((resolve) => setTimeout(resolve, 1000));
+  // Timeout reached, force kill (always happens automatically now)
+  console.log(chalk.yellow('Graceful shutdown timed out, forcing stop...'));
+  try {
+    process.kill(pid, 'SIGKILL');
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    clearDaemonPid();
+    clearDaemonState();
+    console.log(chalk.green('Daemon stopped'));
+    return true;
+  } catch (error) {
+    if (error.code === 'ESRCH') {
       clearDaemonPid();
       clearDaemonState();
-      console.log(chalk.green('Daemon force killed'));
       return true;
-    } catch (error) {
-      if (error.code === 'ESRCH') {
-        clearDaemonPid();
-        clearDaemonState();
-        return true;
-      }
-      throw error;
     }
+    throw error;
   }
-
-  throw new Error('Daemon did not stop within timeout. Use --force to kill it.');
 }
 
 /**

package/docker-actions/volumes.js

@@ -4,10 +4,28 @@ import { exec } from 'child_process';
 import util from 'util';
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
+import { loadConfig } from '../store/configStore.js';
+import { getDaemonState } from '../store/daemonStore.js';
 
 const execPromise = util.promisify(exec);
 const fsPromises = fs.promises;
 
+// Get the backup directory in the user's home directory
+function getBackupDir() {
+  return path.join(os.homedir(), 'volume-backups');
+}
+
+// Get the agent's HTTP port (from daemon state or config)
+function getAgentPort() {
+  const state = getDaemonState();
+  if (state?.port) {
+    return state.port;
+  }
+  const config = loadConfig();
+  return config.wsPort || 3001;
+}
+
 // Cache for docker system df result to avoid concurrent operations
 let dfCache = null;
 let dfCacheTime = 0;
@@ -331,9 +349,8 @@ async function handleBackupVolume(ws, payload = {}) {
       throw new Error('Missing volume name.');
     }
 
-
-    // Create proper backup directory (relative to the parent directory)
-    const backupDir = path.join(process.cwd(), '..', 'volume-backups');
+    // Create backup directory in user's home directory
+    const backupDir = getBackupDir();
 
     try {
       await fsPromises.mkdir(backupDir, { recursive: true });
@@ -432,8 +449,8 @@ async function handleListVolumeBackups(ws, payload = {}) {
   try {
     const { requestId } = payload;
 
-    // Use the same backup directory as backup creation (relative to parent directory)
-    const backupDir = path.join(process.cwd(), '..', 'volume-backups');
+    // Use the same backup directory as backup creation
+    const backupDir = getBackupDir();
     const backups = [];
 
     try {
@@ -600,9 +617,8 @@ async function handleDeleteVolumeBackup(ws, payload = {}) {
       throw new Error('Missing backup path');
     }
 
-
-    // Security check: only allow deletion from the backup directory (relative to parent)
-    const backupDir = path.join(process.cwd(), '..', 'volume-backups');
+    // Security check: only allow deletion from the backup directory
+    const backupDir = getBackupDir();
     const normalizedBackupPath = path.resolve(backupPath);
     const normalizedBackupDir = path.resolve(backupDir);
 
@@ -647,9 +663,8 @@ async function handleGetBackupDownloadUrl(ws, payload = {}) {
       throw new Error('Missing backup path');
     }
 
-
-    // Security check: only allow downloads from the backup directory (relative to parent)
-    const backupDir = path.join(process.cwd(), '..', 'volume-backups');
+    // Get backup directory from home directory
+    const backupDir = getBackupDir();
     const normalizedBackupPath = path.resolve(backupPath);
     const normalizedBackupDir = path.resolve(backupDir);
 
@@ -668,7 +683,9 @@ async function handleGetBackupDownloadUrl(ws, payload = {}) {
       throw new Error('Backup file not found');
     }
 
-    const downloadUrl = `/api/download?path=${encodeURIComponent(backupPath)}`;
+    // Return the download URL pointing to the agent's HTTP server
+    const agentPort = getAgentPort();
+    const downloadUrl = `http://localhost:${agentPort}/api/download?path=${encodeURIComponent(backupPath)}`;
 
     ws.send(
       JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oussema_mili/test-pkg-123",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",

package/utils/envSetup.js

@@ -1,7 +1,6 @@
 import fs from "fs";
 import path from "path";
 import os from "os";
-import chalk from "chalk";
 
 /**
  * Ensures environment files exist with default values
@@ -32,9 +31,7 @@ REGISTRIES_DIR=registries
 AUTH_TIMEOUT_MS=60000
 `;
     fs.writeFileSync(agentEnvPath, defaultAgentEnv, { mode: 0o600 });
-    console.log(chalk.green("📄 Created .env.agent with default values"));
   } else if (showFoundMessages) {
-    console.log(chalk.green("📄 Found existing .env.agent file"));
   }
 
   // Note: DevApp runs as a Docker container from GHCR with environment variables