integrated websocket and porting fc80d8e

Author: fatshotty

pom.xml

@@ -29,9 +29,9 @@
     </dependency>
 
     <dependency>
-      <groupId>de.roderick</groupId>
-      <artifactId>weberknecht</artifactId>
-      <version>0.1.1</version>
+      <groupId>org.java_websocket</groupId>
+      <artifactId>WebSocket</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

src/main/java/io/socket/IOConnection.java

@@ -27,7 +27,7 @@
 import java.util.logging.Logger;
 
 import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.SSLContext;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -70,8 +70,7 @@ class IOConnection implements IOCallback {
   public static final String SOCKET_IO_1 = "/socket.io/1/";
 
   /** The SSL socket factory for HTTPS connections */
-  private static SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory
-      .getDefault();
+  private static SSLContext sslContext = null;
 
   /** All available connections. */
   private static HashMap<String, List<IOConnection>> connections = new HashMap<String, List<IOConnection>>();
@@ -209,10 +208,19 @@ public void run() {
   /**
    * Set the socket factory used for SSL connections.
    * 
-   * @param socketFactory
+   * @param sslContext
    */
-  public static void setDefaultSSLSocketFactory(SSLSocketFactory socketFactory) {
-    sslSocketFactory = socketFactory;
+  public static void setSslContext(SSLContext sslContext) {
+    IOConnection.sslContext = sslContext;
+  }
+  
+  /**
+   * Get the socket factory used for SSL connections.
+   * 
+   * @return socketFactory
+   */
+  public static SSLContext getSslContext() {
+    return sslContext;
   }
 
   /**
@@ -294,7 +302,7 @@ private void handshake() {
       connection = url.openConnection();
       if (connection instanceof HttpsURLConnection) {
         ((HttpsURLConnection) connection)
-            .setSSLSocketFactory(sslSocketFactory);
+            .setSSLSocketFactory(sslContext.getSocketFactory());
       }
       connection.setConnectTimeout(connectTimeout);
       connection.setReadTimeout(connectTimeout);
@@ -355,17 +363,20 @@ else if (_id.endsWith("+") == false)
     final String id = _id;
     final String endPoint = message.getEndpoint();
     return new IOAcknowledge() {
+      @Override
       public void ack(JsonElement... args) {
         JsonArray array = new JsonArray();
         for (JsonElement o : args) {
           try {
             array.add(o);
-            // array.put(o == null ? JSONObject.NULL : o);
           } catch (Exception e) {
-            error(new SocketIOException( "You can only put values in IOAcknowledge.ack() which can be handled by JSONArray.put()", e));
+            error(new SocketIOException(
+                "You can only put values in IOAcknowledge.ack() which can be handled by JSONArray.put()",
+                e));
           }
         }
-        IOMessage ackMsg = new IOMessage(IOMessage.TYPE_ACK, endPoint, id + array.toString());
+        IOMessage ackMsg = new IOMessage(IOMessage.TYPE_ACK, endPoint,
+            id + array.toString());
         sendPlain(ackMsg.toString());
       }
     };
@@ -686,7 +697,8 @@ public void transportMessage(String text) {
           argsArray = new JsonElement[0];
         String eventName = event.get("name").getAsString();
         try {
-          findCallback(message).on(eventName, remoteAcknowledge(message), argsArray);
+          findCallback(message).on(eventName,
+              remoteAcknowledge(message), argsArray);
         } catch (Exception e) {
           error(new SocketIOException(
               "Exception was thrown in on(String, JSONObject[]).\n"
@@ -724,7 +736,8 @@ public void transportMessage(String text) {
       break;
     case IOMessage.TYPE_ERROR:
       try {
-        findCallback(message).onError( new SocketIOException(message.getData()));
+        findCallback(message).onError(
+            new SocketIOException(message.getData()));
       } catch (SocketIOException e) {
         error(e);
       }
@@ -824,6 +837,7 @@ public void emit(SocketIO socket, String event, IOAcknowledge ack, Object... arg
         }
       }
 
+      
       JsonObject jobj = new JsonObject();
       jobj.add("name", new JsonPrimitive(event));
       jobj.add("args", jarray);
@@ -833,7 +847,7 @@ public void emit(SocketIO socket, String event, IOAcknowledge ack, Object... arg
       sendPlain(message.toString());
 
     } catch (JsonParseException e) {
-      error(new SocketIOException("Error while emitting an event. Make sure you only try to send arguments, which can be serialized into JSON.") );
+      error(new SocketIOException("Error while emitting an event. Make sure you only try to send arguments, which can be serialized into JSON."));
     }
 
   }

src/main/java/io/socket/SocketIO.java

@@ -12,7 +12,7 @@
 import java.net.URL;
 import java.util.Properties;
 
-import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.SSLContext;
 
 import com.google.gson.JsonObject;
 
@@ -127,8 +127,8 @@ public SocketIO(final URL url) {
    * Set the socket factory used for SSL connections.
    * @param socketFactory
    */
-  public static void setDefaultSSLSocketFactory(SSLSocketFactory socketFactory) {
-    IOConnection.setDefaultSSLSocketFactory(socketFactory);
+  public static void setDefaultSSLSocketFactory(SSLContext sslContext) {
+    IOConnection.setSslContext(sslContext);
   }
 
   /**
@@ -339,7 +339,7 @@ public void reconnect() {
    *         not connected or currently connecting
    */
   public boolean isConnected() {
-    return this.connection.isConnected();
+    return this.connection != null && this.connection.isConnected();
   }
 
   /**

src/main/java/io/socket/WebsocketTransport.java

@@ -1,72 +1,36 @@
-/*
- * socket.io-java-client WebsocketTransport.java
- *
- * Copyright (c) 2012, Enno Boland
- * socket.io-java-client is a implementation of the socket.io protocol in Java.
- * 
- * See LICENSE file for more information
- */
 package io.socket;
 
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.util.regex.Pattern;
 
-import de.roderick.weberknecht.WebSocketConnection;
-import de.roderick.weberknecht.WebSocketEventHandler;
-import de.roderick.weberknecht.WebSocketException;
-import de.roderick.weberknecht.WebSocketMessage;
+import javax.net.ssl.SSLContext;
 
-/**
- * The Class WebsocketTransport.
- */
-class WebsocketTransport implements IOTransport, WebSocketEventHandler {
-  
-  WebSocketConnection websocket;
+import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+
+class WebsocketTransport extends WebSocketClient implements IOTransport {
 
-  /** Pattern used to replace http:// by ws:// respectively https:// by wss:// */
   private final static Pattern PATTERN_HTTP = Pattern.compile("^http");
-  
-  /** The String to identify this Transport */
   public static final String TRANSPORT_NAME = "websocket";
 
-  /** The IOConnection of this transport. */
   private IOConnection connection;
 
-  /**
-   * Creates a new Transport for the given url an {@link IOConnection}.
-   *
-   * @param url the url
-   * @param connection the connection
-   * @return the iO transport
-   */
   public static IOTransport create(URL url, IOConnection connection) {
-    URI uri = URI.create(
-        PATTERN_HTTP.matcher(url.toString()).replaceFirst("ws")
-        + IOConnection.SOCKET_IO_1 + TRANSPORT_NAME
-        + "/" + connection.getSessionId());
+    URI uri = URI.create( PATTERN_HTTP.matcher(url.toString()).replaceFirst("ws") + IOConnection.SOCKET_IO_1 + TRANSPORT_NAME + "/" + connection.getSessionId());
 
     return new WebsocketTransport(uri, connection);
   }
-  
-  /**
-   * Instantiates a new websocket transport.
-   *
-   * @param uri the uri
-   * @param connection the connection
-   * @throws WebSocketException 
-   */
+
   public WebsocketTransport(URI uri, IOConnection connection) {
-    try {
-      websocket = new WebSocketConnection(uri);
-    } catch (WebSocketException e) {
-      connection.transportError(e);
-      return;
-    }
+    super(uri);
     this.connection = connection;
-    websocket.setEventHandler(this);
+    SSLContext context = IOConnection.getSslContext();
+    if("wss".equals(uri.getScheme()) && context != null) {
+	    this.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(context));
+    }
   }
 
   /* (non-Javadoc)
@@ -75,7 +39,7 @@ public WebsocketTransport(URI uri, IOConnection connection) {
   @Override
   public void disconnect() {
     try {
-      websocket.close();
+      this.close();
     } catch (Exception e) {
       connection.transportError(e);
     }
@@ -106,39 +70,31 @@ public void invalidate() {
   }
 
   @Override
-  public void onClose() {
+  public void onClose(int code, String reason, boolean remote) {
     if(connection != null)
       connection.transportDisconnected();
   }
 
   @Override
-  public void onMessage(WebSocketMessage arg0) {
+  public void onMessage(String text) {
     if(connection != null)
-      connection.transportMessage(arg0.getText());
+      connection.transportMessage(text);
   }
 
   @Override
-  public void onOpen() {
+  public void onOpen(ServerHandshake handshakedata) {
     if(connection != null)
       connection.transportConnected();
   }
 
   @Override
-  public void connect() {
-    try {
-      websocket.connect();
-    } catch (Exception e) {
-      connection.transportError(e);
-    }
+  public String getName() {
+    return TRANSPORT_NAME;
   }
 
   @Override
-  public void send(String text) throws Exception {
-    websocket.send(text);
-  }
+  public void onError(Exception ex) {
+    // TODO Auto-generated method stub
 
-  @Override
-  public String getName() {
-    return TRANSPORT_NAME;
   }
-}
+}

src/main/java/io/socket/XhrTransport.java

@@ -20,6 +20,9 @@
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+
 /**
  * The Class XhrTransport.
  */
@@ -76,6 +79,10 @@ public void run() {
           URL url = new URL(XhrTransport.this.url.toString() + "?t="
               + System.currentTimeMillis());
           urlConnection = (HttpURLConnection) url.openConnection();
+          SSLContext context = IOConnection.getSslContext();
+          if(urlConnection instanceof HttpsURLConnection && context != null) {
+            ((HttpsURLConnection)urlConnection).setSSLSocketFactory(context.getSocketFactory());
+          }
           if (!queue.isEmpty()) {
             urlConnection.setDoOutput(true);
             OutputStream output = urlConnection.getOutputStream();

src/test/java/io/socket/AbstractTestSocketIO.java

@@ -40,7 +40,7 @@ public abstract class AbstractTestSocketIO implements IOCallback {
 	private static final String REQUEST_ACKNOWLEDGE = "requestAcknowledge";
 
 	/** The Constant to the node executable */
-	private final static String NODE = "node";
+	private final static String NODE = "/usr/local/bin/node";
 
 	/** The port of this test, randomly choosed */
 	private int port = -1;