DEV-570 Merge MacOS branches into master

ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java

@@ -55,7 +55,8 @@ public abstract class ShimmerBluetoothManager{
 	protected static final boolean USE_INFOMEM_CONFIG_METHOD = true;
 	public static final long SLEEP_BETWEEN_GROUP_ACTIONS_MS = 50;
 	public static final String COMPORT_PREFIX = "COM";
-	public static final String COMPORT_PREFIX_MAC = "/dev/";
+//	public static final String COMPORT_PREFIX_MAC = "/dev/"; 	//Commented-out as MacOS is relying on BT device name rather than COM PORT prefix
+	public static final String COMPORT_PREFIX_MAC = "Shimmer";
 	protected int mSyncTrainingIntervalInSeconds = 15;
 	protected int msDelayBetweenSetCommands = 0;
 	protected BluetoothProgressReportAll mProgressReportAll;
@@ -836,7 +837,8 @@ else if(deviceTypeDetected==DEVICE_TYPE.ARDUINO){
 						if (shimmerDevice!=null && !(shimmerDevice instanceof ShimmerShell)){
 							printMessage("Connecting to " + shimmerDevice.getClass().getSimpleName() + " with connection handle = " + (connectThroughComPort? comPort:bluetoothAddress));
 							if(connectThroughComPort){
-								if (!comPort.contains(COMPORT_PREFIX) && !comPort.contains(COMPORT_PREFIX_MAC)) {
+								if (!comPort.contains(COMPORT_PREFIX)) {
+									//Besides Windows, this is used on MacOS to connect Shimmer over BLE, as MacOS does not use BT Classic
 									connectShimmer3BleGrpc(bluetoothDetails);
 								}else {
 									connectExistingShimmer(shimmerDevice, comPort, bluetoothAddress);

ShimmerDriver/build.gradle

@@ -95,7 +95,7 @@ dependencies {
     api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.4.0'
 
     // https://mvnrepository.com/artifact/io.grpc/grpc-all
-    api group: 'io.grpc', name: 'grpc-all', version: '1.32.1'
+    api group: 'io.grpc', name: 'grpc-all', version: '1.71.0'
 
     // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
     api group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.6'
@@ -116,7 +116,7 @@ dependencies {
 
     // https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api
     api("javax.annotation:javax.annotation-api:1.3.2")
-
+    
     // Declare the dependency for your favourite test framework you want to use in your tests.
     // TestNG is also supported by the Gradle Test task. Just change the
     // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
@@ -130,5 +130,11 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.+'
 
     api 'com.parse.bolts:bolts-tasks:1.4.0'
+
+    // https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on
+	implementation("org.bouncycastle:bcpkix-jdk15on:1.61")
+
+    // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
+	implementation("org.bouncycastle:bcprov-jdk15on:1.61")
 } 
 

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/BluetoothDeviceDetails.java

@@ -33,13 +33,18 @@ public BluetoothDeviceDetails(String comPort, String macId, String friendlyName)
 	}
 
 	public void setMacId(String mac){
-
-		mac = mac.replace("-", "");
-
-		if(mac.length()>=12) {
-			mShimmerMacId = mac.toUpperCase();
-			mac = mac.replace(":", "").toUpperCase();
-			mShimmerMacIdParsed = mac.substring(8);
+		if(mac.startsWith("Shimmer") && mac.contains("-")) {
+			//If using device name (e.g. Shimmer3-6813), then leave as is
+			mShimmerMacId = mac;
+			mShimmerMacId = mac;
+		} else {
+			mac = mac.replace("-", "");
+
+			if(mac.length()>=12) {
+				mShimmerMacId = mac.toUpperCase();
+				mac = mac.replace(":", "").toUpperCase();
+				mShimmerMacIdParsed = mac.substring(8);
+			}
 		}
 	}
 

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java

@@ -1368,5 +1368,10 @@ public static int getTimeZoneOffset(){
 //		System.err.println(milliSeconds);
 //		System.err.println(UtilShimmer.bytesToHexStringWithSpacesFormatted(convertMilliSecondsToShimmerRtcDataBytesLSB(milliSeconds)));
 //	}
+
+	public static boolean isOsMac() {
+		return System.getProperty("os.name").toLowerCase().contains("mac");
+	}
+
 
 }

ShimmerDriver/src/main/java/com/shimmerresearch/grpc/GrpcBLERadioByteCommunication.java

@@ -135,7 +135,7 @@ public void connect() throws ShimmerException {
 			@Override
 			public void onNext(StateStatus value) {
 				// TODO Auto-generated method stub
-				System.out.println(value.getMessage() + " " + value.getState().toString());
+//				System.out.println(value.getMessage() + " " + value.getState().toString());
 				if (value.getState().equals(BluetoothState.Connected)) {
 					mConnectTask.setResult(true);
 

ShimmerDriver/src/main/java/com/shimmerresearch/grpc/GrpcBLERadioByteTools.java

@@ -1,31 +1,47 @@
 package com.shimmerresearch.grpc;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.ServerSocket;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.swing.JFrame;
+
+import com.shimmerresearch.driverUtilities.UtilShimmer;
+
 import javax.swing.JButton;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
 public class GrpcBLERadioByteTools {
 
 	private Process runningProcess;
-	String mExeName = "ShimmerBLEGrpc.exe";
-	String mExePath = "C:\\Github\\Shimmer-C-API\\ShimmerAPI\\ShimmerBLEGrpc\\bin\\Debug\\" + mExeName; // Replace with the path to your .exe file
+	String mExeNameWindows = "ShimmerBLEGrpc.exe";
+	String mExePathWindows = "C:\\Github\\Shimmer-C-API\\ShimmerAPI\\ShimmerBLEGrpc\\bin\\Debug\\" + mExeNameWindows; // Replace with the path to your .exe file
 	//String exePath = "C:\\Users\\JC\\Desktop\\testgrpc\\ShimmerBLEGrpc.exe"; // Replace with the path to your .exe file
 
-	public GrpcBLERadioByteTools() {
+	//Below used by Consensys MacOS
+	String userDir = System.getProperty("user.dir").equals("/") ? (getApplicationPath().toString() + "/libs/") : (System.getProperty("user.dir") + "/libs/");
+	String mExeNameMac = "ShimmerBLEGrpc";
+	String mExePathMac = userDir + "ShimmerBLEGrpc/Products/usr/local/bin/" + mExeNameMac;
+
+  public GrpcBLERadioByteTools() {
 
 	}
 
 	public GrpcBLERadioByteTools(String exeName, String exePath) {
-		mExeName = exeName;
-		mExePath = exePath;
+		mExeNameWindows = exeName;
+		mExeNameMac = exeName;
+		mExePathWindows = exePath;
+		mExePathMac = exePath;
 	}
 
 
@@ -67,37 +83,105 @@ public boolean isExeRunning(String exeName) {
 			return false;
 		}
 	}
-	public int startServer() throws Exception {
+
+    public boolean isExeRunningMacOS(String exeName) {
+        try {
+            Process process = Runtime.getRuntime().exec(new String[]{"pgrep", "-x", exeName});
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            boolean found = reader.readLine() != null;
+
+            if (!process.waitFor(5, TimeUnit.SECONDS)) { // Wait up to 5 seconds
+                process.destroy(); // Terminate the process if it doesn't exit
+                System.err.println("pgrep process timed out.");
+                return false; // Consider it not found or an error
+            }
 
+            return found;
+        } catch (IOException e) {
+            System.err.println("Error executing pgrep command: " + e.getMessage());
+            e.printStackTrace();
+            return false;
+        } catch (InterruptedException e) {
+            System.err.println("Thread interrupted while waiting for pgrep process: " + e.getMessage());
+            Thread.currentThread().interrupt(); // Restore the interrupted status
+            return false;
+        }
+    }
 
+	public boolean isServerRunning() {
+		if(UtilShimmer.isOsMac()) {
+			return isExeRunningMacOS(mExeNameMac);
+		} else {
+			return isExeRunning(mExeNameWindows);
+		}
+	}
+
+	public int startServer() throws Exception {
 		int port = getFreePort();
 
 		System.out.println(port + " is free");
 		List<String> command = new ArrayList<>();
 
 		// Add the command itself
-		command.add(mExePath);
+		if(UtilShimmer.isOsMac()) {
+			command.add(mExePathMac);
+			command.add("--port");
+		} else {
+			command.add(mExePathWindows);
+		}
 		command.add(Integer.toString(port));
+
 		ProcessBuilder processBuilder = new ProcessBuilder(command);
 		processBuilder.redirectErrorStream(true); // Redirect standard error to the input stream
 		runningProcess = processBuilder.start();
+
+	    // Add shutdown hook to ensure server is closed when Java app exits
+	    try {
+	        Runtime.getRuntime().addShutdownHook(shutdownHook);
+	    } catch (IllegalStateException ignored) {
+	        // JVM is already shutting down
+	    }
+
 		Thread processThread = new Thread(() -> {
 			try (BufferedReader reader = new BufferedReader(new InputStreamReader(runningProcess.getInputStream()))) {
 				String line;
 				while ((line = reader.readLine()) != null) {
-					System.out.println(line);
+					System.out.println("[BLEGrpcServer] " + line);
 				}
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		});
+		runningProcess.onExit().thenAccept(p -> {
+		    int code = p.exitValue();
+		    System.err.println("[BLEGrpcServer] exited: code=" + code +
+		        (code >= 128 ? " (likely signal " + (code - 128) + ")" : ""));
+		});
 
 		processThread.start();
 		return port;
 		// You can continue with other tasks here
-
 	}
+
+	private final Thread shutdownHook = new Thread(() -> {
+	    Process p = runningProcess;
+	    if (p == null) return;
+
+	    try {
+	        // Try graceful termination first
+	        p.destroy(); // sends SIGTERM on Unix, WM_CLOSE/CTRL_BREAK semantics vary on Windows
+	        if (!p.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) {
+	            // Fall back to force kill
+	            p.destroyForcibly();
+	            p.waitFor(2, java.util.concurrent.TimeUnit.SECONDS);
+	        }
+	    } catch (InterruptedException ie) {
+	        Thread.currentThread().interrupt();
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	    }
+	});
 
 	public void stopServer() {
 		if (runningProcess != null) {
@@ -107,6 +191,18 @@ public void stopServer() {
 			System.err.println("No external process is currently running.");
 		}
 	}
+
+	public static Path getApplicationPath() {
+		try {
+			URL codeSourceUrl = GrpcBLERadioByteTools.class.getProtectionDomain().getCodeSource().getLocation();
+			Path codeSourcePath = Paths.get(codeSourceUrl.toURI());
+			if (codeSourcePath.toFile().isFile())
+				return codeSourcePath.getParent(); 
+			return codeSourcePath;
+		} catch (URISyntaxException e) {
+			throw new IllegalStateException("Failed to determine application path due to a URI syntax error.", e);
+		} 
+	}
 
 	public static void main(String[] args) {
 
@@ -142,7 +238,7 @@ public void actionPerformed(ActionEvent e) {
 		JButton btnCheck = new JButton("checkServerApp");
 		btnCheck.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				if (grpcTools.isExeRunning(grpcTools.mExeName)) {
+				if (grpcTools.isExeRunning(grpcTools.mExeNameWindows)) {
 					System.out.println("EXE RUNNING");	
 				} else {
 					System.out.println("EXE NOT RUNNING");

ShimmerDriverPC/build.gradle

@@ -99,6 +99,12 @@ dependencies {
     // 'test.useTestNG()' to your build script.
     testImplementation 'junit:junit:4.12'
     implementation 'com.parse.bolts:bolts-tasks:1.4.0'
+
+    // https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on
+	implementation("org.bouncycastle:bcpkix-jdk15on:1.61")
+
+    // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
+	implementation("org.bouncycastle:bcprov-jdk15on:1.61")
 }
 
 // Shadow JAR task to create a runnable JAR with dependencies