feat: support packer config

boot/src/main/java/com/reajason/javaweb/boot/api/GlobalExceptionHandler.java

@@ -29,6 +29,12 @@ public class GlobalExceptionHandler {
         return new ErrorResponse(exception.getMessage());
     }
 
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ErrorResponse handleIllegalArgumentException(IllegalArgumentException exception) {
+        return new ErrorResponse(exception.getMessage());
+    }
+
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler(Throwable.class)
     public ErrorResponse handleThrowable(Throwable throwable) {

boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java

@@ -34,10 +34,24 @@ public class ConfigController {
     }
 
     @RequestMapping("/packers")
-    public List<String> getPackers() {
-        return Arrays.stream(Packers.values())
-                .filter(packers -> packers.getParentPacker() == null)
-                .map(Packers::name).toList();
+    public List<PackerCategoryDTO> getPackers() {
+        List<PackerCategoryDTO> result = new ArrayList<>();
+        for (Map.Entry<String, List<Packers>> entry : Packers.groupedPackers().entrySet()) {
+            PackerCategoryDTO category = new PackerCategoryDTO();
+            category.setName(entry.getKey());
+            List<PackerOptionDTO> options = new ArrayList<>();
+            for (Packers packer : entry.getValue()) {
+                PackerOptionDTO option = new PackerOptionDTO();
+                option.setName(packer.name());
+                option.setOutputKind(packer.getOutputKind());
+                option.setCategoryAnchor(packer.hasChildren());
+                option.setSchema(packer.getSchema());
+                options.add(option);
+            }
+            category.setPackers(options);
+            result.add(category);
+        }
+        return result;
     }
 
     @RequestMapping
@@ -66,4 +80,64 @@ public class ConfigController {
         commandConfigVO.setImplementationClasses(Arrays.stream(CommandConfig.ImplementationClass.values()).toList());
         return commandConfigVO;
     }
-}
+
+    public static class PackerCategoryDTO {
+        private String name;
+        private List<PackerOptionDTO> packers;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public List<PackerOptionDTO> getPackers() {
+            return packers;
+        }
+
+        public void setPackers(List<PackerOptionDTO> packers) {
+            this.packers = packers;
+        }
+    }
+
+    public static class PackerOptionDTO {
+        private String name;
+        private String outputKind;
+        private boolean categoryAnchor;
+        private Object schema;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getOutputKind() {
+            return outputKind;
+        }
+
+        public void setOutputKind(String outputKind) {
+            this.outputKind = outputKind;
+        }
+
+        public boolean isCategoryAnchor() {
+            return categoryAnchor;
+        }
+
+        public void setCategoryAnchor(boolean categoryAnchor) {
+            this.categoryAnchor = categoryAnchor;
+        }
+
+        public Object getSchema() {
+            return schema;
+        }
+
+        public void setSchema(Object schema) {
+            this.schema = schema;
+        }
+    }
+}

boot/src/main/java/com/reajason/javaweb/boot/controller/MemShellGeneratorController.java

@@ -7,9 +7,11 @@ import com.reajason.javaweb.memshell.MemShellResult;
 import com.reajason.javaweb.memshell.config.InjectorConfig;
 import com.reajason.javaweb.memshell.config.ShellConfig;
 import com.reajason.javaweb.memshell.config.ShellToolConfig;
-import com.reajason.javaweb.packer.AggregatePacker;
+import com.reajason.javaweb.packer.ClassPackerConfig;
 import com.reajason.javaweb.packer.JarPacker;
+import com.reajason.javaweb.packer.JarPackerConfig;
 import com.reajason.javaweb.packer.Packer;
+import com.reajason.javaweb.packer.Packers;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Base64;
@@ -22,19 +24,24 @@ import java.util.Base64;
 @RequestMapping("/api/memshell/generate")
 @CrossOrigin("*")
 public class MemShellGeneratorController {
+
     @PostMapping
     public MemShellGenerateResponse generate(@RequestBody MemShellGenerateRequest request) {
         ShellConfig shellConfig = request.getShellConfig();
         ShellToolConfig shellToolConfig = request.parseShellToolConfig();
         InjectorConfig injectorConfig = request.getInjectorConfig();
         MemShellResult generateResult = MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);
-        Packer packer = request.getPacker().getInstance();
-        if (packer instanceof AggregatePacker) {
-            return new MemShellGenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
+        if (request.getPackerSpec() == null) {
+            throw new IllegalArgumentException("packerSpec is required");
         }
+        Packers packers = Packers.fromName(request.getPackerSpec().getName());
+        Packer<?> packer = packers.getInstance();
         if (packer instanceof JarPacker) {
-            return new MemShellGenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(generateResult.toJarPackerConfig())));
+            JarPackerConfig<?> jarPackerConfig = generateResult.toJarPackerConfig();
+            return new MemShellGenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(jarPackerConfig)));
         }
-        return new MemShellGenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
+        ClassPackerConfig classPackerConfig = generateResult.toClassPackerConfig();
+        classPackerConfig.setCustomConfig(packer.resolveCustomConfig(request.getPackerSpec().getConfig()));
+        return new MemShellGenerateResponse(generateResult, packer.pack(classPackerConfig));
     }
-}
+}

boot/src/main/java/com/reajason/javaweb/boot/controller/ProbeShellGeneratorController.java

@@ -2,8 +2,9 @@ package com.reajason.javaweb.boot.controller;
 
 import com.reajason.javaweb.boot.dto.ProbeShellGenerateRequest;
 import com.reajason.javaweb.boot.dto.ProbeShellGenerateResponse;
-import com.reajason.javaweb.packer.AggregatePacker;
+import com.reajason.javaweb.packer.ClassPackerConfig;
 import com.reajason.javaweb.packer.Packer;
+import com.reajason.javaweb.packer.Packers;
 import com.reajason.javaweb.probe.ProbeShellGenerator;
 import com.reajason.javaweb.probe.ProbeShellResult;
 import com.reajason.javaweb.probe.config.ProbeConfig;
@@ -23,11 +24,13 @@ public class ProbeShellGeneratorController {
         ProbeConfig probeConfig = request.getProbeConfig();
         ProbeContentConfig probeContentConfig = request.parseProbeContentConfig();
         ProbeShellResult generateResult = ProbeShellGenerator.generate(probeConfig, probeContentConfig);
-        Packer packer = request.getPacker().getInstance();
-        if (packer instanceof AggregatePacker) {
-            return new ProbeShellGenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
-        } else {
-            return new ProbeShellGenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
+        if (request.getPackerSpec() == null) {
+            throw new IllegalArgumentException("packerSpec is required");
         }
+        Packers packers = Packers.fromName(request.getPackerSpec().getName());
+        Packer packer = packers.getInstance();
+        ClassPackerConfig classPackerConfig = generateResult.toClassPackerConfig();
+        classPackerConfig.setCustomConfig(packer.resolveCustomConfig(request.getPackerSpec().getConfig()));
+        return new ProbeShellGenerateResponse(generateResult, packer.pack(classPackerConfig));
     }
 }

boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java

@@ -1,7 +1,6 @@
 package com.reajason.javaweb.boot.dto;
 
 import com.reajason.javaweb.memshell.config.*;
-import com.reajason.javaweb.packer.Packers;
 import lombok.Data;
 
 import static com.reajason.javaweb.memshell.ShellTool.*;
@@ -15,7 +14,7 @@ public class MemShellGenerateRequest {
     private ShellConfig shellConfig;
     private ShellToolConfigDTO shellToolConfig;
     private InjectorConfig injectorConfig;
-    private Packers packer;
+    private PackerRequestSpecDTO packerSpec;
 
     @Data
     public static class ShellToolConfigDTO {
@@ -84,4 +83,4 @@ public class MemShellGenerateRequest {
             default -> throw new UnsupportedOperationException("unknown shell tool " + shellConfig.getShellTool());
         };
     }
-}
+}

boot/src/main/java/com/reajason/javaweb/boot/dto/PackerRequestSpecDTO.java

@@ -0,0 +1,25 @@
+package com.reajason.javaweb.boot.dto;
+
+import com.reajason.javaweb.packer.spec.PackerRequestSpec;
+import lombok.Data;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Packer selection request payload.
+ */
+@Data
+public class PackerRequestSpecDTO {
+    private String name;
+    private Map<String, Object> config = new LinkedHashMap<>();
+
+    public PackerRequestSpec toPackerRequestSpec() {
+        PackerRequestSpec spec = new PackerRequestSpec();
+        spec.setName(name);
+        if (config != null) {
+            spec.setConfig(config);
+        }
+        return spec;
+    }
+}

boot/src/main/java/com/reajason/javaweb/boot/dto/ProbeShellGenerateRequest.java

@@ -1,6 +1,5 @@
 package com.reajason.javaweb.boot.dto;
 
-import com.reajason.javaweb.packer.Packers;
 import com.reajason.javaweb.probe.config.*;
 import lombok.Data;
 
@@ -12,7 +11,7 @@ import lombok.Data;
 public class ProbeShellGenerateRequest {
     private ProbeConfig probeConfig;
     private ProbeContentConfigDTO probeContentConfig;
-    private Packers packer;
+    private PackerRequestSpecDTO packerSpec;
 
     @Data
     static class ProbeContentConfigDTO {

boot/src/test/java/com/reajason/javaweb/boot/controller/ConfigControllerIntegrationTest.java

@@ -9,9 +9,12 @@ import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author ReaJason
@@ -37,11 +40,4 @@ public class ConfigControllerIntegrationTest {
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
     }
-
-    @Test
-    public void testConfigPackersEndpoint() {
-        ResponseEntity<List> response = restTemplate.getForEntity("/api/config/packers", List.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertNotNull(response.getBody());
-    }
-}
+}

boot/src/test/java/com/reajason/javaweb/boot/controller/MemShellGeneratorControllerTest.java

@@ -3,11 +3,11 @@ package com.reajason.javaweb.boot.controller;
 import com.reajason.javaweb.Server;
 import com.reajason.javaweb.boot.dto.MemShellGenerateRequest;
 import com.reajason.javaweb.boot.dto.MemShellGenerateResponse;
+import com.reajason.javaweb.boot.dto.PackerRequestSpecDTO;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
 import com.reajason.javaweb.memshell.config.InjectorConfig;
 import com.reajason.javaweb.memshell.config.ShellConfig;
-import com.reajason.javaweb.packer.Packers;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,6 +15,8 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.util.Map;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -30,6 +32,23 @@ class MemShellGeneratorControllerTest {
 
     @Test
     void generateShell() {
+        MemShellGenerateRequest request = buildRequest("ScriptEngine", null);
+        ResponseEntity<MemShellGenerateResponse> response = restTemplate.postForEntity(
+                "/api/memshell/generate", request, MemShellGenerateResponse.class);
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertNotNull(response.getBody());
+    }
+
+    @Test
+    void generateJspxShellWithCustomConfig() {
+        MemShellGenerateRequest request = buildRequest("JSPX", Map.of("unicode", true));
+        ResponseEntity<MemShellGenerateResponse> response = restTemplate.postForEntity(
+                "/api/memshell/generate", request, MemShellGenerateResponse.class);
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertNotNull(response.getBody());
+    }
+
+    private static MemShellGenerateRequest buildRequest(String packerName, Map<String, Object> packerConfig) {
         MemShellGenerateRequest request = new MemShellGenerateRequest();
         request.setShellConfig(ShellConfig.builder()
                 .server(Server.Tomcat)
@@ -43,16 +62,18 @@ class MemShellGeneratorControllerTest {
         request.setInjectorConfig(InjectorConfig.builder()
                 .urlPattern("/*")
                 .build());
-        request.setPacker(Packers.ScriptEngine);
+        PackerRequestSpecDTO packerRequestSpecDTO = new PackerRequestSpecDTO();
+        packerRequestSpecDTO.setName(packerName);
+        if (packerConfig != null) {
+            packerRequestSpecDTO.setConfig(packerConfig);
+        }
+        request.setPackerSpec(packerRequestSpecDTO);
         MemShellGenerateRequest.ShellToolConfigDTO shellToolConfigDTO = new MemShellGenerateRequest.ShellToolConfigDTO();
         shellToolConfigDTO.setGodzillaKey("key");
         shellToolConfigDTO.setGodzillaPass("pass");
         shellToolConfigDTO.setHeaderName("User-Agent");
         shellToolConfigDTO.setHeaderValue("hello");
         request.setShellToolConfig(shellToolConfigDTO);
-        ResponseEntity<MemShellGenerateResponse> response = restTemplate.postForEntity(
-                "/api/memshell/generate", request, MemShellGenerateResponse.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertNotNull(response.getBody());
+        return request;
     }
-}
+}