Socket Client 적용

ApiTestManager/src/APITester.js

@@ -66,7 +66,7 @@ class APITester {
     return this.servers.filter(server => server.id == serverId)[0].basePath; // == : 타입 비교 없이 값만 비교
   }
 
-  apiRequestTemplate(apiRequest, index) {
+  httpApiRequestTemplate(apiRequest, index) {
     return `
         <div class="tab-pane fade mt-1 api_request" id="api_request_${apiRequest.id}" style="height: 100%;">
             <div><span class="collection_name">${apiRequest.collectionName}</span> &gt; <span class="api_name">${apiRequest.name}</span></div>
@@ -226,6 +226,106 @@ class APITester {
         `;
   }
 
+  tcpApiRequestTemplate(apiRequest, index) {
+    return `
+        <div class="tab-pane fade mt-1 api_request" id="api_request_${apiRequest.id}" style="height: 100%;">
+            <div><span class="collection_name">${apiRequest.collectionName}</span> &gt; <span class="api_name">${apiRequest.name}</span></div>
+            <div class="d-flex api_request_info">
+                <div class="form-floating">
+                    ${this.renderServers(apiRequest.server)}
+                    <label class="form-label must">Server</label>
+                </div>
+                <button class="btn btn-primary send me-1">Send</button>
+                <button class="btn btn-primary save" data-index="${index}" style="height: 58px;">저장</button>
+            </div>
+            <div class="api_request d-flex flex-column" style="height:100%;">
+              <div class="api_request_body">
+                <ul class="nav nav-tabs mt-1" role="tablist">
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link btn_request_body_tab" data-bs-toggle="tab"
+                                type="button" role="tab" aria-controls="requestBody" data-bs-target="#requestBodyTab_${apiRequest.id}"
+                                aria-selected="false">Body
+                        </button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link btn_prerequest_tab" data-bs-toggle="tab"
+                                type="button" role="tab" aria-controls="preScrit" data-bs-target="#preRequestTab_${apiRequest.id}"
+                                aria-selected="false">Pre-Request
+                        </button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link btn_postrequest_tab" data-bs-toggle="tab"
+                                type="button" role="tab" aria-controls="postScript" data-bs-target="#postRequestTab_${apiRequest.id}"
+                                aria-selected="false">Post-Request
+                        </button>
+                    </li>
+                </ul>
+                <div class="tab-content" style="height: 100%;">
+                    <div class="tab-pane fade request_body_tab" role="tabpanel" id="requestBodyTab_${apiRequest.id}" aria-labelledby="requestBody-tab">
+                      <div class="d-flex flex-column">
+                        <select class="form-select mt-1 request_body_type" name="request_type">
+                            <option value="">text/plain</option>
+                        </select>
+                        <div class="request_body mt-1" style="width:100%;height: 300px; border:1px solid grey;"></div>
+                      </div>
+                    </div>
+                    <div class="tab-pane fade pre_script_tab" role="tabpanel" id="preRequestTab_${apiRequest.id}" aria-labelledby="preScrit-tab">
+                        <div class="d-flex flex-row">
+                            <div style="width:calc(100% - 200px);">
+                                <div class="pre-request mt-1" style="height:300px;border:1px solid grey;"></div>
+                            </div>
+                            <div style="width: 200px;">
+                                <div class="pre-request-variable">
+                                </div>
+                            </div> 
+                        </div>
+                    </div>
+                    <div class="tab-pane fade post_script_tab" role="tabpanel" id="postRequestTab_${apiRequest.id}"
+                         aria-labelledby="postScrit-tab">
+                         <div class="d-flex flex-row">
+                           <div style="width:calc(100% - 200px);">
+                             <div class="post-request mt-1" style="height:300px;border:1px solid grey;"></div>
+                           </div>
+                           <div style="width: 200px;">
+                             <div class="post-request-variable">
+                             </div>
+                           </div> 
+                        </div>
+                    </div>
+                </div>
+              </div>
+              <div class="api_response" style="flex: 1">
+                <div class="mt-1">
+                  <span>Response</span>
+                  <span class="response_status"></span>
+                  <span class="response_time"></span>
+                  <span class="response_size"></span>
+                </div>
+                <ul class="nav nav-tabs mt-1" role="tablist">
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#responseBodyTab_${apiRequest.id}" type="button" role="tab" aria-controls="responseBody" aria-selected="false">Body</button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#consoleTab_${apiRequest.id}" type="button" role="tab" aria-controls="consoleTab" aria-selected="false">Console</button>
+                    </li>
+                </ul>
+                <div class="tab-content border-bottom" style="min-height: 250px;">
+                  <div class="tab-pane fade show active" id="responseBodyTab_${apiRequest.id}" role="tabpanel"
+                       aria-labelledby="responseParams-tab">
+                      <div class="response_body mt-1" style="width:100%;height:250px;border:1px solid grey;"></div>
+                  </div>
+                  <div class="tab-pane fade" id="consoleTab_${apiRequest.id}" role="tabpanel"
+                       aria-labelledby="console-tab">
+                      <div class="console mt-1" style="width:100%;height:250px;border:1px solid grey;"></div>
+                  </div>
+                </div>
+            </div>
+            </div>
+        </div>
+       
+        `;
+  }
+
   headerTemplate(header, index) {
     return `
             <tr data-index="${index}">
@@ -555,53 +655,47 @@ class APITester {
     let apiRequestTabContent = $(this.apiTabContentTarget);
     let model = this.apiRequests[index];
 
-    apiRequestTabContent.append(this.apiRequestTemplate(model, index));
+    if (model.type ==='HTTP'){
-
+      apiRequestTabContent.append(this.httpApiRequestTemplate(model, index));
-    let editableInput = new EditableInput({
+      let editableInput = new EditableInput({
-      name: 'path',
+        name: 'path',
-      value: model.path
+        value: model.path
-    });
-
-    let queryParamTable = new PropertyTable({
-      propertyName: 'queryParams',
-      properties: model.queryParams
-    });
-
-    let headerTable = new PropertyTable({
-      propertyName: 'headers',
-      properties: model.headers
-    });
-
-    queryParamTable.init(apiRequestTabContent.find(`#api_request_${model.id}`).find('.query_params')[0], (properties) => {
-      model.queryParams = properties;
-      console.log(model.queryParams);
-      this.buildPath(model);
-      editableInput.setValue(model.path);
-      $('span.variable').off('mouseover');
-      $('span.variable').off('mouseout');
-      document.querySelectorAll('span.variable').forEach(element => {
-        let text = element.innerText;
-        element.addEventListener('mouseover', () => me.showPopper(element, text));
-        element.addEventListener('mouseout', () => me.hidePopper(element));
       });
-    });
 
-    headerTable.init(apiRequestTabContent.find(`#api_request_${model.id}`).find('.request_headers')[0], (properties) => {
+      let queryParamTable = new PropertyTable({
-      model.headers = properties;
+        propertyName: 'queryParams',
-      $('span.variable').off('mouseover');
+        properties: model.queryParams
-      $('span.variable').off('mouseout');
-      document.querySelectorAll('span.variable').forEach(element => {
-        let text = element.innerText;
-        element.addEventListener('mouseover', () => me.showPopper(element, text));
-        element.addEventListener('mouseout', () => me.hidePopper(element));
       });
-    });
 
-    apiRequestTabContent.find(`#api_request_${model.id}`).find('.api_request_info').find('.path').each(function() {
+      let headerTable = new PropertyTable({
-      editableInput.init(this, (value) => {
+        propertyName: 'headers',
-        model.path = value;
+        properties: model.headers
-        model.queryParams = me.parseParam(model.path);
+      });
-        queryParamTable.setProperties(model.queryParams);
+
+      apiRequestTabContent.find(`#api_request_${model.id}`).find('.api_request_info').find('.path').each(function() {
+        editableInput.init(this, (value) => {
+          model.path = value;
+          model.queryParams = me.parseParam(model.path);
+          queryParamTable.setProperties(model.queryParams);
+          $('span.variable').off('mouseover');
+          $('span.variable').off('mouseout');
+          document.querySelectorAll('span.variable').forEach(element => {
+            let text = element.innerText;
+            element.addEventListener('mouseover', () => me.showPopper(element, text));
+            element.addEventListener('mouseout', () => me.hidePopper(element));
+          });
+        });
+
+        $(this).append(`<label>Path</label>`);
+
+        $('span.variable').off('mouseover');
+        $('span.variable').off('mouseout');
+      });
+      queryParamTable.init(apiRequestTabContent.find(`#api_request_${model.id}`).find('.query_params')[0], (properties) => {
+        model.queryParams = properties;
+        console.log(model.queryParams);
+        this.buildPath(model);
+        editableInput.setValue(model.path);
         $('span.variable').off('mouseover');
         $('span.variable').off('mouseout');
         document.querySelectorAll('span.variable').forEach(element => {
@@ -611,14 +705,23 @@ class APITester {
         });
       });
 
-      $(this).append(`<label>Path</label>`);
+      headerTable.init(apiRequestTabContent.find(`#api_request_${model.id}`).find('.request_headers')[0], (properties) => {
+        model.headers = properties;
+        $('span.variable').off('mouseover');
+        $('span.variable').off('mouseout');
+        document.querySelectorAll('span.variable').forEach(element => {
+          let text = element.innerText;
+          element.addEventListener('mouseover', () => me.showPopper(element, text));
+          element.addEventListener('mouseout', () => me.hidePopper(element));
+        });
+      });
+    }
 
-      $('span.variable').off('mouseover');
+    if (model.type ==='TCP'){
-      $('span.variable').off('mouseout');
+      apiRequestTabContent.append(this.tcpApiRequestTemplate(model, index));
-    });
+    }
 
     document.querySelectorAll('.variable').forEach(element => {
-
       let text = element.innerText;
       element.addEventListener('mouseover', () => me.showPopper(element, text));
       element.addEventListener('mouseout', () => me.hidePopper(element));
@@ -626,10 +729,11 @@ class APITester {
 
     this.openTab(model.id);
     let target = $('#api_request_' + model.id);
+    let language = model.type ==='TCP'? 'text': 'json';
 
     let requestBodyEditor = monaco.editor.create(target.find('.request_body')[0], {
       value: model.requestBody,
-      language: 'json',
+      language: language,
       automaticLayout: true
     });
 
@@ -665,7 +769,7 @@ class APITester {
 
     let responseBodyEditor = monaco.editor.create(target.find('.response_body')[0], {
       value: '',
-      language: 'json',
+      language: language,
       automaticLayout: true,
       quickSuggestions: false
     });
@@ -1076,6 +1180,10 @@ class APITester {
     if (newApiName === '') {
       newApiName = '새로운 API';
     }
+    let newApiType = $('#new_api_type').val();
+    if (newApiType === '') {
+      newApiType = 'HTTP';
+    }
 
     const collection = this.collections.filter(function(collection) {
       return collection.id === collectionId;
@@ -1087,6 +1195,7 @@ class APITester {
       method: 'GET',
       name: newApiName,
       path: '',
+      type : newApiType,
       headers: [],
       queryParams: [],
       requestBody: '',

src/main/java/com/eactive/testmaster/client/controller/ApiClientController.java

@@ -2,23 +2,23 @@ package com.eactive.testmaster.client.controller;
 
 import com.eactive.testmaster.client.dto.ApiRequestDTO;
 import com.eactive.testmaster.client.dto.ApiResponse;
-import com.eactive.testmaster.client.service.NettyApiClient;
+import com.eactive.testmaster.client.service.ApiClient;
+import com.eactive.testmaster.client.service.ApiClientFactory;
+import java.util.concurrent.ExecutionException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Validator;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.concurrent.ExecutionException;
-
 @RestController
 public class ApiClientController {
 
-    private final NettyApiClient nettyApiClient;
+    private final ApiClientFactory apiClientFactory;
     private final Validator validator;
 
-    public ApiClientController(NettyApiClient nettyApiClient, Validator validator) {
+    public ApiClientController(ApiClientFactory apiClientFactory, Validator validator) {
-        this.nettyApiClient = nettyApiClient;
+        this.apiClientFactory = apiClientFactory;
         this.validator = validator;
     }
 
@@ -31,6 +31,8 @@ public class ApiClientController {
             throw new IllegalArgumentException(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
 
-        return nettyApiClient.handleRequest(request).get();
+        ApiClient client = apiClientFactory.getClient(request);
+        return client.handleRequest(request).get();
     }
+
 }

src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java

@@ -16,6 +16,8 @@ public class ApiRequestDTO implements Serializable {
     private String path;
     private String method;
 
+    private String type;
+
     @NotNull(message = "서버를 선택해주세요.")
     private Long server;
 
@@ -69,6 +71,14 @@ public class ApiRequestDTO implements Serializable {
         return method;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public void setMethod(String method) {
         this.method = method;
     }
@@ -121,11 +131,11 @@ public class ApiRequestDTO implements Serializable {
         this.postRequestScript = postRequestScript;
     }
 
-    public long getSentBytes() {
+//    public long getSentBytes() {
-        return sentBytes;
+//        return sentBytes;
-    }
+//    }
-
+//
-    public void setSentBytes(long sentBytes) {
+//    public void setSentBytes(long sentBytes) {
-        this.sentBytes = sentBytes;
+//        this.sentBytes = sentBytes;
-    }
+//    }
 }

src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java

@@ -28,6 +28,8 @@ public class ApiRequestInfo {
 
     private String path;
 
+    private String type; //API TYPE : HTTP, TCP
+
     @Lob
     private String headers;
 
@@ -143,6 +145,14 @@ public class ApiRequestInfo {
         this.postRequestScript = postRequestScript;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

src/main/java/com/eactive/testmaster/client/service/ApiClient.java

@@ -0,0 +1,11 @@
+package com.eactive.testmaster.client.service;
+
+
+import com.eactive.testmaster.client.dto.ApiRequestDTO;
+import com.eactive.testmaster.client.dto.ApiResponse;
+import java.util.concurrent.CompletableFuture;
+
+public interface ApiClient {
+
+    CompletableFuture<ApiResponse> handleRequest(ApiRequestDTO apiRequest);
+}

src/main/java/com/eactive/testmaster/client/service/ApiClientFactory.java

@@ -0,0 +1,27 @@
+package com.eactive.testmaster.client.service;
+
+import com.eactive.testmaster.client.dto.ApiRequestDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ApiClientFactory {
+
+    private final NettyHttpApiClient httpApiClient;
+    private final NettyTcpApiClient tcpApiClient;
+
+    public ApiClientFactory(NettyHttpApiClient httpApiClient, NettyTcpApiClient tcpApiClient) {
+        this.httpApiClient = httpApiClient;
+        this.tcpApiClient = tcpApiClient;
+    }
+
+    public ApiClient getClient(ApiRequestDTO request) {
+        switch (request.getType().toUpperCase()) {
+            case "HTTP":
+                return httpApiClient;
+            case "TCP":
+                return tcpApiClient;
+            default:
+                throw new IllegalArgumentException("Unsupported client type: " + request.getType());
+        }
+    }
+}

src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java

@@ -46,10 +46,9 @@ public class ApiRequestMigrationService {
         }
 
         apiRequestRepository.findAll().forEach(apiRequest -> {
-
+            if(apiRequest.getType() == null){
-            apiRequest.setHeaders(apiRequest.getHeaders().replace("=", "::"));
+                apiRequest.setType("HTTP");
-            apiRequest.setQueryParams(apiRequest.getQueryParams().replace("=", "::"));
+            }
-
             apiRequestRepository.save(apiRequest);
         });
 

src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java

@@ -30,8 +30,9 @@ import javax.net.ssl.SSLException;
 import java.util.concurrent.CompletableFuture;
 
 @Service
-public class NettyApiClient {
+public class NettyHttpApiClient implements ApiClient {
-    private static final Logger logger = LoggerFactory.getLogger(NettyApiClient.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(NettyHttpApiClient.class);
 
     @Autowired
     ServerRepository serverRepository;
@@ -43,29 +44,30 @@ public class NettyApiClient {
 
         CompletableFuture<ApiResponse> responseFuture = new CompletableFuture<>();
         EventLoopGroup group = new NioEventLoopGroup();
+
         try {
             Bootstrap b = new Bootstrap()
-                    .group(group)
+                .group(group)
-                    .channel(NioSocketChannel.class)
+                .channel(NioSocketChannel.class)
-                    .option(ChannelOption.TCP_NODELAY, true)
+                .option(ChannelOption.TCP_NODELAY, true)
-                    .handler(new ChannelInitializer<Channel>() {
+                .handler(new ChannelInitializer<Channel>() {
-                        @Override
+                    @Override
-                        public void initChannel(Channel ch) throws SSLException {
+                    public void initChannel(Channel ch) throws SSLException {
-                            if (server.getScheme().equalsIgnoreCase("https")) {
+                        if (server.getScheme().equalsIgnoreCase("https")) {
-                                final SslContext sslCtx = SslContextBuilder.forClient()
+                            final SslContext sslCtx = SslContextBuilder.forClient()
-                                        .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+                                .trustManager(InsecureTrustManagerFactory.INSTANCE).build();
-                                ch.pipeline().addLast(sslCtx.newHandler(ch.alloc(), host, port));// Add SSL handler
+                            ch.pipeline().addLast(sslCtx.newHandler(ch.alloc(), host, port));// Add SSL handler
-                            }
-
-                            ch.pipeline().addLast(new HttpClientCodec());
-                            ch.pipeline().addLast(new HttpObjectAggregator(65536));
-                            ch.pipeline().addLast(new HttpContentDecompressor());
-                            ch.pipeline().addLast(new HttpHandler(responseFuture));
                         }
-                    });
+
+                        ch.pipeline().addLast(new HttpClientCodec());
+                        ch.pipeline().addLast(new HttpObjectAggregator(65536));
+                        ch.pipeline().addLast(new HttpContentDecompressor());
+                        ch.pipeline().addLast(new HttpHandler(responseFuture));
+                    }
+                });
 
             Channel ch = b.connect(host, port).sync().channel();
-            ByteBuf content = null;
+            ByteBuf content;
             if (StringUtils.isNotEmpty(apiRequest.getRequestBody())) {
                 content = Unpooled.copiedBuffer(apiRequest.getRequestBody(), CharsetUtil.UTF_8);
             } else {
@@ -94,7 +96,7 @@ public class NettyApiClient {
                 request.headers().add(customHeaders);
             }
 
-            apiRequest.setSentBytes(request.toString().length());
+//            apiRequest.setSentBytes(request.toString().length());
 
             ch.writeAndFlush(request);
             ch.closeFuture().sync();

src/main/java/com/eactive/testmaster/client/service/NettyTcpApiClient.java

@@ -0,0 +1,106 @@
+package com.eactive.testmaster.client.service;
+
+import com.eactive.testmaster.client.dto.ApiRequestDTO;
+import com.eactive.testmaster.client.dto.ApiResponse;
+import com.eactive.testmaster.common.exception.ServerNotFoundException;
+import com.eactive.testmaster.server.entity.Server;
+import com.eactive.testmaster.server.entity.ServerRepository;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NettyTcpApiClient implements ApiClient {
+
+    private static final Logger logger = LoggerFactory.getLogger(NettyTcpApiClient.class);
+
+    private final ServerRepository serverRepository;
+
+    public NettyTcpApiClient(ServerRepository serverRepository) {
+        this.serverRepository = serverRepository;
+    }
+
+    public CompletableFuture<ApiResponse> handleRequest(ApiRequestDTO apiRequest) {
+        Server server = serverRepository.findById(apiRequest.getServer()).orElseThrow(() -> new ServerNotFoundException("Server not found"));
+        String host = server.getHostname();
+        int port = server.getPort();
+
+        CompletableFuture<ApiResponse> responseFuture = new CompletableFuture<>();
+        EventLoopGroup group = new NioEventLoopGroup();
+        try {
+            String response = sendMessage(host, port, group, apiRequest.getRequestBody());
+            ApiResponse apiResponse = new ApiResponse();
+            apiResponse.setBody(response);
+            responseFuture.complete(apiResponse);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            ApiResponse response = new ApiResponse();
+            response.setBody("An error occurred: " + e.getMessage());
+            return CompletableFuture.completedFuture(response);
+        } finally {
+            group.shutdownGracefully();
+        }
+        return responseFuture;
+    }
+
+    public String sendMessage(String host, int port, EventLoopGroup group, final String message) throws InterruptedException {
+        final BlockingQueue<String> answer = new ArrayBlockingQueue<>(1);
+        Bootstrap b = new Bootstrap();
+        b.group(group)
+            .channel(NioSocketChannel.class)
+            .handler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                protected void initChannel(SocketChannel ch) {
+                    ch.pipeline().addLast(new StringDecoder(), new StringEncoder(), new SimpleChannelInboundHandler<String>() {
+                        @Override
+                        protected void channelRead0(ChannelHandlerContext ctx, String msg) {
+                            answer.offer(msg);
+                            ctx.close();
+                        }
+
+                        @Override
+                        public void channelActive(ChannelHandlerContext ctx) {
+                            ctx.writeAndFlush(message);
+                            // Send message on activation, consider thread safety
+                        }
+                    });
+                }
+            });
+
+        // Connect to the server
+        ChannelFuture f = b.connect(host, port).sync();
+        f.channel().closeFuture().sync();
+
+        // Wait for the response
+        return answer.take(); // This will block until a message is available
+    }
+
+
+//    public static void main(String[] args) {
+//        NettyTcpApiClient client = new NettyTcpApiClient();
+//        try {
+//            String response = client.sendMessage("localhost", 30913, "00340000BASICTST010134567890ABCDEF");
+//            System.out.println("Server replied: " + response);
+//        } catch (InterruptedException e) {
+//            Thread.currentThread().interrupt();
+//            e.printStackTrace();
+//        } finally {
+//            client.shutdown();
+//        }
+//    }
+
+}

src/main/java/com/eactive/testmaster/loadtest/service/LoadTestService.java

@@ -6,7 +6,7 @@ import com.eactive.testmaster.client.entity.ApiRequestInfo;
 import com.eactive.testmaster.client.entity.ApiScenario;
 import com.eactive.testmaster.client.mapper.ApiRequestMapper;
 import com.eactive.testmaster.client.mapper.ApiScenarioMapper;
-import com.eactive.testmaster.client.service.NettyApiClient;
+import com.eactive.testmaster.client.service.ApiClientFactory;
 import com.eactive.testmaster.loadtest.dto.ApiRequestEvent;
 import com.eactive.testmaster.loadtest.dto.LoadTestDTO;
 import com.eactive.testmaster.loadtest.dto.LoadTestRequestAndResponse;
@@ -42,20 +42,19 @@ public class LoadTestService extends TextWebSocketHandler {
 
     private LoadTestMonitorMap loadTestMonitorMap;
 
-    private NettyApiClient nettyApiClient;
+    private ApiClientFactory apiClientFactory;
-
     private ApiScenarioMapper apiScenarioMapper;
 
     private ApiRequestMapper apiRequestMapper;
 
     private final RingBuffer<ApiRequestEvent> ringBuffer;
 
-    public LoadTestService(SimpMessagingTemplate template, LoadTestMonitorMap loadTestMonitorMap, NettyApiClient nettyApiClient, ApiScenarioMapper apiScenarioMapper, ApiRequestMapper apiRequestMapper) {
+    public LoadTestService(SimpMessagingTemplate template, LoadTestMonitorMap loadTestMonitorMap,ApiClientFactory apiClientFactory, ApiScenarioMapper apiScenarioMapper, ApiRequestMapper apiRequestMapper) {
         this.template = template;
         this.loadTestMonitorMap = loadTestMonitorMap;
-        this.nettyApiClient = nettyApiClient;
         this.apiScenarioMapper = apiScenarioMapper;
         this.apiRequestMapper = apiRequestMapper;
+        this.apiClientFactory = apiClientFactory;
 
         Disruptor<ApiRequestEvent> disruptor = new Disruptor<>(ApiRequestEvent::new, 1024, Executors.defaultThreadFactory());
         disruptor.handleEventsWith(this::processApiRequestEvent);
@@ -137,7 +136,7 @@ public class LoadTestService extends TextWebSocketHandler {
         List<ScheduledFuture<?>> scheduledFutures = new ArrayList<>();
         List<VirtualUser> virtualUsers = new ArrayList<>();
         for (int i = 0; i < numberOfUsers; i++) {
-            final VirtualUser virtualUser = new VirtualUser(loadTestDTO.getId(), maxCount, scenario, this, nettyApiClient, latch);
+            final VirtualUser virtualUser = new VirtualUser(loadTestDTO.getId(), maxCount, scenario, this, apiClientFactory, latch);
             virtualUsers.add(virtualUser);
 
             Instant startTime = Instant.now().plusMillis(i * rampUpTimeMillis);

src/main/java/com/eactive/testmaster/loadtest/service/VirtualUser.java

@@ -4,7 +4,7 @@ import com.eactive.testmaster.client.dto.ApiRequestDTO;
 import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO;
 import com.eactive.testmaster.client.dto.ApiResponse;
 import com.eactive.testmaster.client.dto.internal.ScenarioNode;
-import com.eactive.testmaster.client.service.NettyApiClient;
+import com.eactive.testmaster.client.service.ApiClientFactory;
 import com.eactive.testmaster.loadtest.dto.LoadTestRequestAndResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,7 +36,7 @@ public class VirtualUser implements Runnable {
     private Thread runningThread;
 
     private final LoadTestService loadTestService;
-    private final NettyApiClient nettyApiClient;
+    private final ApiClientFactory apiClientFactory;
 
     private static Map<String, String> globals = new ConcurrentHashMap<>();
     private Map<String, String> variables = new ConcurrentHashMap<>();
@@ -49,12 +49,12 @@ public class VirtualUser implements Runnable {
 
     private CountDownLatch latch;
 
-    public VirtualUser(String testId, int maxCount, ScenarioNode scenarioDTO, LoadTestService loadTestService, NettyApiClient nettyApiClient, CountDownLatch latch) {
+    public VirtualUser(String testId, int maxCount, ScenarioNode scenarioDTO, LoadTestService loadTestService, ApiClientFactory apiClientFactory, CountDownLatch latch) {
         this.testId = testId;
         this.scenario = scenarioDTO;
         this.loadTestService = loadTestService;
-        this.nettyApiClient = nettyApiClient;
         this.maxCount = maxCount;
+        this.apiClientFactory = apiClientFactory;
         this.latch = latch;
 
     }
@@ -151,7 +151,7 @@ public class VirtualUser implements Runnable {
                 ApiRequestDTO replaced = replacePlaceHoldersWithVariables(cloned);
 
                 long startTime = System.currentTimeMillis();
-                ApiResponse response = nettyApiClient.handleRequest(replaced).get();
+                ApiResponse response = apiClientFactory.getClient(replaced).handleRequest(replaced).get();
                 long endTime = System.currentTimeMillis();
                 long responseTime = endTime - startTime;
 

src/main/resources/templates/page/tester/apiCollection.html

@@ -85,11 +85,21 @@
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
-                    <select class="form-select" id="modal_collection"></select>
+                    <div class="form-floating">
+                        <select class="form-select" id="modal_collection"></select>
+                        <label for="modal_collection">컬렉션 선택</label>
+                    </div>
                     <div class="input-group mt-2">
                         <span class="input-group-text">API 이름</span>
                         <input type="text" class="form-control" id="new_api_name">
                     </div>
+                    <div class="form-floating">
+                        <select name="type" class="mt-2 form-select method" id="new_api_type">
+                            <option value="HTTP">HTTP</option>
+                            <option value="TCP">TCP</option>
+                        </select>
+                        <label for="new_api_type">API유형</label>
+                    </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>