Bugfix: shutdown the agent if agent info has been used (#587)

* shutdown the agent if agent info has been used

* Bugfix: use the constant to equal variable

Author: zhou9584

agent/agent_installer/Windows/restartAgent.bat

@@ -17,7 +17,7 @@ set newfile=%1
 ::stop hydra lab agent service
 net stop "Hydra Lab Agent Service"
 ::kill hydra lab agent java process
-::Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
+Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
 if "%newfile%"=="" ( echo "No need to update" ) else (
     if not exist "%newfile%" ( echo "%newfile% not exist" ) else (
         echo "Updating"

agent/agent_installer/Windows/restartAgent_WindowsService.bat

@@ -17,7 +17,7 @@ set newfile=%1
 ::stop hydra lab agent service
 net stop "Hydra Lab Agent Service"
 ::kill hydra lab agent java process
-::Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
+Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
 if "%newfile%"=="" ( echo "No need to update" ) else (
     if not exist "%newfile%" ( echo "%newfile% not exist" ) else (
         echo "Updating"

agent/agent_installer/Windows/restartAgent_WindowsTaskScheduler.bat

@@ -16,8 +16,8 @@ echo newfile = %1
 set newfile=%1
 ::stop hydra lab agent service
 ::net stop "Hydra Lab Agent Service"
-kill hydra lab agent java process
-::Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
+::kill hydra lab agent java process
+Powershell -Command "& {Get-WmiObject Win32_Process -Filter \"name like '%%java%%' and CommandLine like '%%agent%%'\" | Select-Object ProcessId -OutVariable pids;if(-not $pids -eq '' ) {stop-process -id $pids.ProcessId}}"
 if "%newfile%"=="" ( echo "No need to update" ) else (
     if not exist "%newfile%" ( echo "%newfile% not exist" ) else (
         echo "Updating"

agent/src/main/java/com/microsoft/hydralab/agent/scheduled/ScheduledDeviceControlTasks.java

@@ -36,9 +36,6 @@ public void scheduledCheckWebSocketConnection() {
         if (agentWebSocketClient.isConnectionActive()) {
             return;
         }
-        if (!agentWebSocketClient.shouldRetryConnection()) {
-            return;
-        }
         logger.info("Try reconnecting the WS server");
         agentWebSocketClient.reconnect();
     }

agent/src/main/java/com/microsoft/hydralab/agent/service/TestTaskEngineService.java

@@ -135,7 +135,7 @@ protected Set<TestRunDevice> chooseDevices(TestTask testTask) {
         }
 
         String runningType = testTask.getRunningType();
-        if (((runningType.equals(TestTask.TestRunningType.APPIUM_CROSS)) || (runningType.equals(TestTask.TestRunningType.T2C_JSON_TEST))) && devices.size() > 1) {
+        if (((TestTask.TestRunningType.APPIUM_CROSS.equals(runningType)) || (TestTask.TestRunningType.T2C_JSON_TEST.equals(runningType))) && devices.size() > 1) {
             Optional<DeviceInfo> mainDeviceInfo = devices.stream().filter(deviceInfo -> !DeviceType.WINDOWS.name().equals(deviceInfo.getType())).findFirst();
             Assert.isTrue(mainDeviceInfo.isPresent(), "There are more than 1 device, but all of them is windows device!");
             devices.remove(mainDeviceInfo.get());

agent/src/main/java/com/microsoft/hydralab/agent/socket/AgentWebSocketClient.java

@@ -6,6 +6,7 @@
 import com.microsoft.hydralab.agent.service.AgentWebSocketClientService;
 import com.microsoft.hydralab.common.entity.common.Message;
 import com.microsoft.hydralab.common.util.Const;
+import com.microsoft.hydralab.common.util.FlowUtil;
 import com.microsoft.hydralab.common.util.SerializeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
@@ -20,7 +21,6 @@ public class AgentWebSocketClient extends WebSocketClient {
     private final AgentWebSocketClientService agentWebSocketClientService;
 
     private boolean connectionActive = false;
-    private boolean shouldRetryConnection = true;
     private int reconnectTime = 0;
 
     public AgentWebSocketClient(URI serverUri, AgentWebSocketClientService agentWebSocketClientService) {
@@ -29,7 +29,14 @@ public AgentWebSocketClient(URI serverUri, AgentWebSocketClientService agentWebS
         agentWebSocketClientService.setSendMessageCallback(message -> {
             byte[] data = SerializeUtil.messageToByteArr(message);
             log.info("send, path: {}, message data len: {}", message.getPath(), data.length);
-            AgentWebSocketClient.this.send(data);
+            try {
+                FlowUtil.retryAndSleepWhenException(3, 10, () -> {
+                    AgentWebSocketClient.this.send(data);
+                    return true;
+                });
+            } catch (Exception e) {
+                log.error("send message to center error, message path is {}", message.getPath(), e);
+            }
         });
     }
 
@@ -58,11 +65,13 @@ public void onMessage(String message) {
 
     @Override
     public void onClose(int code, String reason, boolean remote) {
-        log.info("onClose {}, {}, {}", code, reason, remote);
+        log.error("onClose {}, {}, {}", code, reason, remote);
         reconnectTime++;
         connectionActive = false;
-        // The remote server has stopped, we need to try reconnecting at certain frequency.
-        shouldRetryConnection = code != CloseReason.CloseCodes.CANNOT_ACCEPT.getCode();
+        // if the connection is closed by server with 1008,1003, exit the agent
+        if (code == CloseReason.CloseCodes.CANNOT_ACCEPT.getCode() || code == CloseReason.CloseCodes.VIOLATED_POLICY.getCode()) {
+            System.exit(code);
+        }
     }
 
     @Override
@@ -76,10 +85,6 @@ public boolean isConnectionActive() {
         return connectionActive;
     }
 
-    public boolean shouldRetryConnection() {
-        return shouldRetryConnection;
-    }
-
     public int getReconnectTime() {
         return reconnectTime;
     }

center/src/main/java/com/microsoft/hydralab/center/controller/DeviceGroupController.java

@@ -21,6 +21,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.CurrentSecurityContext;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -61,7 +62,7 @@ public Result<DeviceGroup> createGroup(@CurrentSecurityContext SysUser requestor
         if (team == null) {
             return Result.error(HttpStatus.BAD_REQUEST.value(), "Team doesn't exist.");
         }
-        if (groupName == null || "".equals(groupName)) {
+        if (StringUtils.isEmpty(groupName)) {
             return Result.error(HttpStatus.BAD_REQUEST.value(), "groupName is required");
         }
         if (deviceGroupService.isGroupNameIllegal(groupName)) {

center/src/main/java/com/microsoft/hydralab/center/service/DeviceAgentManagementService.java

@@ -189,13 +189,13 @@ public void onMessage(Message message, @NotNull Session session) throws IOExcept
         AgentUser agentUser = searchQualifiedAgent(message);
         if (agentUser == null) {
             log.warn("Session {} is not registered agent, associated agent {}", session.getId(), message.getBody());
-            session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Not permitted"));
+            session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Agent Info is not correct!"));
             return;
         }
 
         if (agentDeviceGroups.get(agentUser.getId()) != null && checkIsSessionAliveByAgentId(agentUser.getId())) {
             log.warn("Session {} is already connected under another agent, associated agent {}", session.getId(), message.getBody());
-            session.close(new CloseReason(CloseReason.CloseCodes.VIOLATED_POLICY, "AgentID has been used"));
+            session.close(new CloseReason(CloseReason.CloseCodes.VIOLATED_POLICY, "AgentID has been used!"));
             return;
         }
 

center/src/main/java/com/microsoft/hydralab/center/socket/CenterDeviceSocketEndpoint.java

@@ -54,7 +54,7 @@ public void onMessage(ByteBuffer message, Session session) {
             formattedMessage = SerializeUtil.byteArrToMessage(message.array());
         } catch (Exception e) {
             try {
-                session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Message format error"));
+                session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Message format error, please update your agent."));
             } catch (IOException ex) {
                 throw new RuntimeException(ex);
             }

common/src/main/java/com/microsoft/hydralab/common/management/device/impl/AndroidDeviceDriver.java

@@ -90,7 +90,7 @@ public void deviceConnected(IDevice device) {
                     if (deviceInfo == null) {
                         return;
                     }
-                    if (device.getState().equals(DeviceState.ONLINE)) {
+                    if (DeviceState.ONLINE.equals(device.getState())) {
                         agentManagementService.getDeviceStatusListenerManager().onDeviceConnected(deviceInfo);
                     } else {
                         agentManagementService.getDeviceStatusListenerManager().onDeviceInactive(deviceInfo);
@@ -133,7 +133,7 @@ public void deviceChanged(IDevice device, int changeMask) {
                         return;
                     }
 
-                    if (device.getState().equals(DeviceState.ONLINE)) {
+                    if (DeviceState.ONLINE.equals(device.getState())) {
                         agentManagementService.getDeviceStatusListenerManager().onDeviceConnected(deviceInfo);
                     } else {
                         agentManagementService.getDeviceStatusListenerManager().onDeviceInactive(deviceInfo);