Add retry for network condition check

Juniper · Oct 24, 2024 · dd40903 · dd40903
1 parent d106f19
commit dd40903
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 7 deletions.
diff --git a/jccm/package.json b/jccm/package.json
@@ -2,7 +2,7 @@
     "name": "jccm",
     "productName": "Juniper Cloud Connection Manager",
     "description": "Juniper Cloud Connection Manager",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "main": ".webpack/main",
     "scripts": {
         "start": "pkill -9 node; nodemon --watch ./src --ext js,json --ignore ./src/Frontend/ --exec 'electron-forge start'",

diff --git a/jccm/src/Frontend/Layout/InventoryTreeMenuLocal.js b/jccm/src/Frontend/Layout/InventoryTreeMenuLocal.js
@@ -811,6 +811,19 @@ const InventoryTreeMenuLocal = () => {
                     : 'No network condition test result available';
             const isConnectable = result.dns && result.route && result.access;
 
+            const TooltipContent = ({ message, extraMessage = '' }) => (
+                <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-start' }}>
+                    <Text size={200} weight="regular" style={{ color: tokens.colorPaletteRedForeground3 }}>
+                        {message}
+                    </Text>
+                    {extraMessage && (
+                        <Text size={200} weight="regular" style={{ color: tokens.colorPaletteRedForeground3 }}>
+                            {extraMessage}
+                        </Text>
+                    )}
+                </div>
+            );
+
             return (
                 <div
                     style={{

diff --git a/jccm/src/Services/ApiServer.js b/jccm/src/Services/ApiServer.js
@@ -45,6 +45,9 @@ import {
 
 import { CloudInfo } from '../config';
 import { commitJunosSetConfig, executeJunosCommand, getDeviceFacts, getDeviceNetworkCondition } from './Device';
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
 const sshSessions = {};
 
 const serverGetCloudInventory = async (targetOrgs = null, ignoreCaseInName = false) => {
@@ -718,9 +721,10 @@ export const setupApiHandlers = () => {
     ipcMain.handle('saGetDeviceFacts', async (event, args) => {
         console.log('main: saGetDeviceFacts');
 
+        const { address, port, username, password, timeout, upperSerialNumber, bastionHost } = args;
+
         try {
-            const { address, port, username, password, timeout, upperSerialNumber, bastionHost } = args;
-            const reply = await getDeviceFacts(
+            let reply = await getDeviceFacts(
                 address,
                 port,
                 username,
@@ -730,8 +734,24 @@ export const setupApiHandlers = () => {
                 bastionHost
             );
 
+            if (reply?.message?.toLowerCase().includes('reset by peer')) {
+                console.log('Connection reset by peer, retrying in 3 seconds...');
+                await sleep(3000); // Wait for 3 seconds before retrying
+
+                reply = await getDeviceFacts(
+                    address,
+                    port,
+                    username,
+                    password,
+                    timeout,
+                    upperSerialNumber,
+                    bastionHost
+                );
+            }
+
             return { facts: true, reply };
         } catch (error) {
+            console.error('Error getting device facts:', error);
             return { facts: false, reply: error };
         }
     });
@@ -1037,10 +1057,10 @@ export const setupApiHandlers = () => {
     ipcMain.handle('get-device-network-condition', async (event, args) => {
         console.log('main: saGetDeviceNetworkCondition');
 
-        try {
-            const { address, port, username, password, timeout, bastionHost, termServer, termPort } = args;
+        const { address, port, username, password, timeout, bastionHost, termServer, termPort } = args;
 
-            const reply = await getDeviceNetworkCondition(
+        try {
+            let reply = await getDeviceNetworkCondition(
                 address,
                 port,
                 username,
@@ -1051,12 +1071,41 @@ export const setupApiHandlers = () => {
                 termPort
             );
 
+            if (reply?.message?.toLowerCase().includes('timed out')) {
+                console.log('Timeout detected, retrying in 3 seconds...');
+                await sleep(3000);
+                reply = await getDeviceNetworkCondition(
+                    address,
+                    port,
+                    username,
+                    password,
+                    timeout,
+                    bastionHost,
+                    termServer,
+                    termPort
+                );
+            } else if (reply?.message?.toLowerCase().includes('reset by peer')) {
+                console.log('Connection reset by peer detected, retrying in 3 seconds...');
+                await sleep(3000);
+                reply = await getDeviceNetworkCondition(
+                    address,
+                    port,
+                    username,
+                    password,
+                    timeout,
+                    bastionHost,
+                    termServer,
+                    termPort
+                );
+            }
+
             return { networkConditionCollect: true, reply };
         } catch (error) {
+            console.error('Network condition error:', error);
             return { networkConditionCollect: false, reply: error };
         }
     });
-
+    
     ipcMain.on('restart-app', () => {
         console.log('Received restart-app request...');
         app.relaunch(); // Relaunch the Electron app