Merge pull request #5 from SEPIA-Framework/dev

Update to 2.1.0
- adjustments to core tools update
- improved errorMessage handler

Author: fquirin

pom.xml

@@ -80,7 +80,7 @@
         <dependency>
 	        <groupId>net.b07z.sepia.server.core</groupId>
 	        <artifactId>sepia-core-tools</artifactId>
-	        <version>2.0.1</version>
+	        <version>2.1.0</version>
 	    </dependency>
         <dependency>
             <groupId>com.j2html</groupId>

src/main/java/net/b07z/sepia/websockets/client/SocketClientHandler.java

@@ -1,6 +1,7 @@
 package net.b07z.sepia.websockets.client;
 import java.net.URI;
 
+import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -41,8 +42,9 @@ public SocketClientHandler(SocketClient socket){
 		if (SocketConfig.isSSL){													
 			SslContextFactory sslContextFactory = new SslContextFactory();
 		    sslContextFactory.setKeyStorePath("Xtensions/SSL/ssl-keystore.jks");
-		    sslContextFactory.setKeyStorePassword(SocketConfig.keystorePwd); 		
-		    client = new WebSocketClient(sslContextFactory);
+		    sslContextFactory.setKeyStorePassword(SocketConfig.keystorePwd);
+		    client = new WebSocketClient(new HttpClient(sslContextFactory));
+		    //replaced for sparkjava: client = new WebSocketClient(sslContextFactory);
 		}else{
 			client = new WebSocketClient();
 		}

src/main/java/net/b07z/sepia/websockets/common/SocketConfig.java

@@ -20,7 +20,7 @@ public class SocketConfig {
 	public static final String SERVERNAME = "SEPIA-Websocket-Server"; 	//this is to identify the server (in client as well)
 	public static String localName = "sepia-websocket-server";			//**user defined local server name
 	public static String localSecret = "123456";						//**user defined secret to validate local server
-	public static final String apiVersion = "v2.0.0";
+	public static final String apiVersion = "v1.1.0";
 	public static String privacyPolicyLink = "";						//Link to privacy policy
 
 	public static final boolean allowCORS = true;

src/main/java/net/b07z/sepia/websockets/common/SocketMessage.java

@@ -35,7 +35,7 @@ public static enum DataType{
 		assistAnswer,		//has data for assistant communication
 		directCmd,			//has a direct cmd for assistant
 		remoteAction,		//has a remote action like ASR trigger or hotkey submit
-		errorMessage		//tbd
+		errorMessage		//combined with TextType.status this message will be displayed as error line in channel (ignores normal status msg settings)
 	}
 	public static enum SenderType{
 		user,

src/main/java/net/b07z/sepia/websockets/server/SepiaSocketHandler.java

@@ -208,6 +208,12 @@ public void onMessage(Session userSession, String message) {
 						){
 					preBroadcastAction(user, msg, false, false, false);
 					broadcastMessage(msg);
+					
+				//error broadcast
+				}else if (dataType.equals(DataType.errorMessage.name())){
+					msg.textType = TextType.status.name(); 			//force status text
+					preBroadcastAction(user, msg, false, false, false);
+					broadcastMessage(msg);
 
 				//broadcast default welcome and byebye
 				/* -- has been disabled, for now only server is allowed to send it --

src/main/java/net/b07z/sepia/websockets/server/StartWebSocketServer.java

@@ -135,10 +135,10 @@ public static void main(String[] args) {
         SocketServer server = new SepiaSocketHandler();
         AbstractSocketHandler.server = server;
 
-        webSocket("/messages", AbstractSocketHandler.class);
+        webSocket("/messages/", AbstractSocketHandler.class); 		//NOTE: it HAS TO end with "/"
         webSocketIdleTimeoutMillis(SocketConfig.IDLE_TIMEOUT);
-        
         //init(); //only needed when no REST end-points follow
+        
         get("/online", (request, response) -> 			CoreEndpoints.onlineCheck(request, response));
 		get("/ping", (request, response) -> 			CoreEndpoints.ping(request, response, SocketConfig.SERVERNAME));
 		get("/validate", (request, response) -> 		CoreEndpoints.validateServer(request, response,	SocketConfig.SERVERNAME,