feat: multi-select UX improvements and permanent PCAP merge (#188)

NotYuSheng · claude · web-flow · commit d36b2c4a8566 · 2026-04-11T11:55:15.000+08:00
* feat: multi-select UX improvements and permanent PCAP merge - Clicking a completed file row now toggles its checkbox - "Compare selected" opens a modal asking to Analyze Together or Permanently Merge - Analyze Together navigates to the existing /compare joint topology view - Permanently Merge calls POST /api/files/merge, shows a loading overlay, then navigates to the new file's analysis page on success - Merged filename is auto-generated (max 3 source names × 20 chars) and editable by the user before confirming; .pcap extension is enforced - Backend: new MergeFilesRequest DTO, FileService#mergeFiles, and POST /api/files/merge endpoint; uses mergecap to combine PCAPs, uploads result to MinIO, triggers normal analysis pipeline - Fix hover text colour on action modal buttons in light mode Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: stream merge output for hash/upload, add timeout, add validation - Replace Files.readAllBytes + uploadBytes with streaming SHA-256 hash (DigestInputStream) and streaming MinIO upload (new StorageService#uploadFile overload taking a File) to avoid OOM on large PCAPs - Add 5-minute timeout to mergecap via process.waitFor(5, MINUTES) with a daemon drain thread for stdout/stderr; forcibly destroy on timeout - Add @notempty + @SiZe(min=2) to MergeFilesRequest#fileIds and @Valid to the controller endpoint to reject bad requests before the service layer - Null-safe log in FileController#mergeFiles Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/backend/src/main/java/com/tracepcap/file/controller/FileController.java b/backend/src/main/java/com/tracepcap/file/controller/FileController.java
@@ -2,9 +2,11 @@
 
 import com.tracepcap.file.dto.FileMetadataDto;
 import com.tracepcap.file.dto.FileUploadResponse;
+import com.tracepcap.file.dto.MergeFilesRequest;
 import com.tracepcap.file.service.FileService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import java.io.InputStream;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -101,4 +103,22 @@ public ResponseEntity<Void> deleteFile(@PathVariable String fileId) {
 
     return ResponseEntity.noContent().build();
   }
+
+  @PostMapping("/merge")
+  @Operation(
+      summary = "Merge PCAP files",
+      description = "Merge two or more PCAP files into a single new file and trigger analysis")
+  public ResponseEntity<FileUploadResponse> mergeFiles(
+      @Valid @RequestBody MergeFilesRequest request,
+      @RequestParam(value = "enableNdpi", defaultValue = "true") boolean enableNdpi,
+      @RequestParam(value = "enableFileExtraction", defaultValue = "true")
+          boolean enableFileExtraction) {
+
+    log.info("Received merge request for {} files", request.getFileIds() != null ? request.getFileIds().size() : 0);
+
+    FileUploadResponse response =
+        fileService.mergeFiles(request.getFileIds(), request.getMergedFileName(), enableNdpi, enableFileExtraction);
+
+    return ResponseEntity.status(HttpStatus.CREATED).body(response);
+  }
 }
diff --git a/backend/src/main/java/com/tracepcap/file/dto/MergeFilesRequest.java b/backend/src/main/java/com/tracepcap/file/dto/MergeFilesRequest.java
@@ -0,0 +1,19 @@
+package com.tracepcap.file.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+import java.util.UUID;
+import lombok.Data;
+
+/** Request body for merging multiple PCAP files */
+@Data
+public class MergeFilesRequest {
+
+  @NotEmpty(message = "At least two file IDs are required")
+  @Size(min = 2, message = "At least two file IDs are required")
+  private List<UUID> fileIds;
+
+  /** Optional user-supplied name for the merged file (without extension). */
+  private String mergedFileName;
+}
diff --git a/backend/src/main/java/com/tracepcap/file/service/FileService.java b/backend/src/main/java/com/tracepcap/file/service/FileService.java
@@ -4,6 +4,7 @@
 import com.tracepcap.file.dto.FileUploadResponse;
 import com.tracepcap.file.entity.FileEntity;
 import java.io.InputStream;
+import java.util.List;
 import java.util.UUID;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -67,4 +68,14 @@ FileUploadResponse uploadFile(
    * @return file entity
    */
   FileEntity getFileById(UUID fileId);
+
+  /**
+   * Merge multiple PCAP files into a single new file and trigger analysis.
+   *
+   * @param fileIds ordered list of file IDs to merge
+   * @param enableNdpi whether to run nDPI on the merged file
+   * @param enableFileExtraction whether to run file extraction on the merged file
+   * @return upload response for the newly created merged file
+   */
+  FileUploadResponse mergeFiles(List<UUID> fileIds, String mergedFileName, boolean enableNdpi, boolean enableFileExtraction);
 }
diff --git a/backend/src/main/java/com/tracepcap/file/service/FileServiceImpl.java b/backend/src/main/java/com/tracepcap/file/service/FileServiceImpl.java
@@ -9,9 +9,17 @@
 import com.tracepcap.file.event.FileUploadedEvent;
 import com.tracepcap.file.mapper.FileMapper;
 import com.tracepcap.file.repository.FileRepository;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.security.DigestInputStream;
 import java.security.MessageDigest;
+import java.util.concurrent.TimeUnit;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HexFormat;
 import java.util.List;
@@ -198,6 +206,165 @@ private String getFileExtension(String filename) {
     return lastDotIndex > 0 ? filename.substring(lastDotIndex) : "";
   }
 
+  @Override
+  @Transactional
+  public FileUploadResponse mergeFiles(
+      List<UUID> fileIds, String mergedFileName, boolean enableNdpi, boolean enableFileExtraction) {
+    if (fileIds == null || fileIds.size() < 2) {
+      throw new InvalidFileException("At least two files are required for merging");
+    }
+
+    log.info("Starting PCAP merge for {} files: {}", fileIds.size(), fileIds);
+
+    List<File> tempInputs = new ArrayList<>();
+    File tempOutput = null;
+
+    try {
+      // Download each source file to a local temp file
+      for (UUID fileId : fileIds) {
+        FileEntity entity = getFileById(fileId);
+        File tmp = File.createTempFile("merge-input-" + fileId, ".pcap");
+        storageService.downloadFileToLocal(entity.getMinioPath(), tmp);
+        tempInputs.add(tmp);
+      }
+
+      // Build mergecap command
+      tempOutput = File.createTempFile("merge-output-", ".pcap");
+      List<String> cmd = new ArrayList<>();
+      cmd.add("mergecap");
+      cmd.add("-w");
+      cmd.add(tempOutput.getAbsolutePath());
+      for (File f : tempInputs) {
+        cmd.add(f.getAbsolutePath());
+      }
+
+      log.info("Running mergecap: {}", cmd);
+      Process process = new ProcessBuilder(cmd)
+          .redirectErrorStream(true)
+          .start();
+
+      // Drain stdout/stderr in a background thread to prevent blocking
+      final StringBuilder processOutput = new StringBuilder();
+      Thread drainThread = new Thread(() -> {
+        try {
+          processOutput.append(new String(process.getInputStream().readAllBytes()));
+        } catch (IOException ignored) {}
+      });
+      drainThread.setDaemon(true);
+      drainThread.start();
+
+      boolean finished = process.waitFor(5, TimeUnit.MINUTES);
+      drainThread.join(5000);
+      if (!finished) {
+        process.destroyForcibly();
+        throw new InvalidFileException("mergecap timed out after 5 minutes");
+      }
+      int exitCode = process.exitValue();
+      if (exitCode != 0) {
+        throw new InvalidFileException("mergecap failed (exit " + exitCode + "): " + processOutput);
+      }
+
+      // Compute hash by streaming the merged file (avoids loading it fully into memory)
+      String fileHash = computeSha256FromFile(tempOutput);
+
+      Optional<FileEntity> existing =
+          fileRepository.findFirstByFileHashOrderByUploadedAtDesc(fileHash);
+      if (existing.isPresent()) {
+        throw new DuplicateFileException(existing.get().getId());
+      }
+
+      // Use caller-supplied name or auto-generate from source names
+      String mergedName = (mergedFileName != null && !mergedFileName.isBlank())
+          ? sanitizeMergedFileName(mergedFileName)
+          : buildAutoMergedName(fileIds);
+
+      // Stream-upload the merged file to MinIO (avoids loading it fully into memory)
+      UUID newFileId = UUID.randomUUID();
+      String storedName = newFileId + ".pcap";
+      storageService.uploadFile(tempOutput, storedName, "application/vnd.tcpdump.pcap");
+
+      // Persist metadata
+      FileEntity fileEntity =
+          FileEntity.builder()
+              .id(newFileId)
+              .fileName(mergedName)
+              .fileSize(tempOutput.length())
+              .minioPath(storedName)
+              .uploadedAt(LocalDateTime.now())
+              .status(FileEntity.FileStatus.PROCESSING)
+              .fileHash(fileHash)
+              .enableNdpi(enableNdpi)
+              .enableFileExtraction(enableFileExtraction)
+              .build();
+
+      fileEntity = fileRepository.save(fileEntity);
+      log.info("Merged PCAP saved: {} (ID: {})", mergedName, newFileId);
+
+      // Trigger async analysis
+      eventPublisher.publishEvent(new FileUploadedEvent(this, newFileId));
+
+      return fileMapper.toUploadResponse(fileEntity);
+
+    } catch (InvalidFileException | DuplicateFileException e) {
+      throw e;
+    } catch (Exception e) {
+      log.error("Failed to merge PCAP files", e);
+      throw new InvalidFileException("Failed to merge files: " + e.getMessage(), e);
+    } finally {
+      for (File f : tempInputs) {
+        try { Files.deleteIfExists(f.toPath()); } catch (IOException ignored) {}
+      }
+      if (tempOutput != null) {
+        try { Files.deleteIfExists(tempOutput.toPath()); } catch (IOException ignored) {}
+      }
+    }
+  }
+
+  private String buildAutoMergedName(List<UUID> fileIds) {
+    final int MAX_PART = 20;
+    final int MAX_SHOWN = 3;
+    List<String> parts = new ArrayList<>();
+    for (int i = 0; i < Math.min(MAX_SHOWN, fileIds.size()); i++) {
+      try {
+        String base = getFileById(fileIds.get(i)).getFileName().replaceFirst("\\.[^.]+$", "");
+        parts.add(base.length() > MAX_PART ? base.substring(0, MAX_PART) : base);
+      } catch (Exception ignored) {
+        parts.add(fileIds.get(i).toString().substring(0, 8));
+      }
+    }
+    String joined = String.join("+", parts);
+    if (fileIds.size() > MAX_SHOWN) {
+      joined += "+" + (fileIds.size() - MAX_SHOWN) + "_more";
+    }
+    return "merged_" + joined + ".pcap";
+  }
+
+  private String sanitizeMergedFileName(String name) {
+    // Strip any path separators and control characters, ensure .pcap extension
+    String safe = name.replaceAll("[/\\\\<>:\"|?*\\p{Cntrl}]", "_").trim();
+    if (safe.isBlank()) {
+      safe = "merged";
+    }
+    // Ensure it ends with .pcap
+    if (!safe.toLowerCase().endsWith(".pcap")) {
+      safe = safe + ".pcap";
+    }
+    return safe;
+  }
+
+  private String computeSha256FromFile(File file) {
+    try {
+      MessageDigest digest = MessageDigest.getInstance("SHA-256");
+      try (InputStream is = new DigestInputStream(new BufferedInputStream(new FileInputStream(file)), digest)) {
+        byte[] buf = new byte[8192];
+        while (is.read(buf) != -1) { /* drain to feed the digest */ }
+      }
+      return HexFormat.of().formatHex(digest.digest());
+    } catch (Exception e) {
+      throw new InvalidFileException("Could not compute hash of merged file", e);
+    }
+  }
+
   /** Compute SHA-256 hex digest of the uploaded file using a streaming approach */
   private String computeSha256(MultipartFile file) {
     try {
diff --git a/backend/src/main/java/com/tracepcap/file/service/StorageService.java b/backend/src/main/java/com/tracepcap/file/service/StorageService.java
@@ -64,4 +64,14 @@ public interface StorageService {
    * @return the storage path
    */
   String uploadBytes(byte[] data, String path, String contentType);
+
+  /**
+   * Upload a local file to storage via streaming (avoids loading the whole file into memory).
+   *
+   * @param source the local file to upload
+   * @param path the destination path in storage
+   * @param contentType MIME type of the content
+   * @return the storage path
+   */
+  String uploadFile(java.io.File source, String path, String contentType);
 }
diff --git a/backend/src/main/java/com/tracepcap/file/service/StorageServiceImpl.java b/backend/src/main/java/com/tracepcap/file/service/StorageServiceImpl.java
@@ -4,8 +4,10 @@
 import com.tracepcap.config.MinioConfig;
 import io.minio.*;
 import io.minio.http.Method;
+import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
@@ -134,6 +136,25 @@ public String uploadBytes(byte[] data, String path, String contentType) {
     }
   }
 
+  @Override
+  public String uploadFile(File source, String path, String contentType) {
+    try {
+      ensureBucketExists();
+      try (InputStream stream = new BufferedInputStream(new FileInputStream(source))) {
+        minioClient.putObject(
+            PutObjectArgs.builder().bucket(minioConfig.getBucket()).object(path).stream(
+                    stream, source.length(), -1)
+                .contentType(contentType != null ? contentType : "application/octet-stream")
+                .build());
+      }
+      log.info("Successfully streamed file to MinIO: {}", path);
+      return path;
+    } catch (Exception e) {
+      log.error("Failed to stream file to MinIO: {}", path, e);
+      throw new StorageException("Failed to upload file to storage", e);
+    }
+  }
+
   /** Ensure the bucket exists, create if it doesn't */
   private void ensureBucketExists() {
     try {
diff --git a/frontend/src/components/upload/FileList/FileList.css b/frontend/src/components/upload/FileList/FileList.css
@@ -1,3 +1,9 @@
+/* Multi-select action modal buttons */
+.multiselect-action-btn:hover .text-muted,
+.multiselect-action-btn:hover small {
+  color: inherit !important;
+}
+
 /* File List Card Styles */
 .file-list-card {
   box-shadow: 0 2px 4px rgb(0 0 0 / 10%);
diff --git a/frontend/src/components/upload/FileList/FileList.tsx b/frontend/src/components/upload/FileList/FileList.tsx
diff --git a/frontend/src/services/api/endpoints.ts b/frontend/src/services/api/endpoints.ts
