Merge pull request ari4java#53 from grahambrown11/master

l3nz · web-flow · commit 47ea77b60a41 · 2016-10-17T10:18:09.000+02:00
Auto reconnect and websocket ping - Release 0.4.1
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ def env = System.getenv()
 
 project.ext {
   webapp_name    = 'ari4java'
-  app_version    = '0.4.0'
+  app_version    = '0.5.0'
   build_number   = env["BUILD_NUMBER"]  
   version_class  = 'ch/loway/oss/ari4java/BUILD.java'
   build_time     = "" + new Date()
diff --git a/classes/ch/loway/oss/ari4java/ARI.java b/classes/ch/loway/oss/ari4java/ARI.java
@@ -99,6 +99,11 @@ public String getUrl() {
     @SuppressWarnings("unchecked")
     public <T> T getActionImpl(Class<T> klazz) throws ARIException {
 
+        // use the events method as we ref it for cleanup
+        if (klazz == ActionEvents.class) {
+            return (T) events();
+        }
+
         BaseAriAction action = (BaseAriAction) buildConcreteImplementation(klazz);
         action.setHttpClient(this.httpClient);
         action.setWsClient(this.wsClient);
@@ -363,11 +368,18 @@ private static String findVersionString(String response) throws ARIException {
     public void cleanup() throws ARIException {
 
         if ( liveActionEvent != null ) {
-            closeAction( liveActionEvent );
+            try {
+                closeAction(liveActionEvent);
+            } catch (ARIException e) {
+                // ignore on cleanup...
+            }
+            liveActionEvent = null;
         }
 
         destroy( wsClient );
-        destroy( httpClient );
+        if (wsClient != httpClient) {
+            destroy(httpClient);
+        }
 
         wsClient = null;
         httpClient = null;
@@ -410,8 +422,7 @@ public MessageQueue getWebsocketQueue() throws ARIException {
 
         final MessageQueue q = new MessageQueue();
 
-        ActionEvents ae = events();
-        ae.eventWebsocket( appName, new AriCallback<Message>() {
+        events().eventWebsocket( appName, new AriCallback<Message>() {
 
             @Override
             public void onSuccess(Message result) {                
@@ -424,8 +435,6 @@ public void onFailure(RestException e) {
             }
         });
 
-        // register the AE so we can disconnectWs it when the erorr goes down
-        liveActionEvent = ae;
         return q;
 
     }
@@ -492,7 +501,9 @@ public ActionEndpoints endpoints() {
      * @return an Events object.
      */
     public ActionEvents events() {
-        return (ActionEvents) setupAction(version.builder().actionEvents());
+        if (liveActionEvent == null)
+            liveActionEvent = (ActionEvents) setupAction(version.builder().actionEvents());
+        return liveActionEvent;
     }
 
     /**
diff --git a/classes/ch/loway/oss/ari4java/tools/AriAsyncHandler.java b/classes/ch/loway/oss/ari4java/tools/AriAsyncHandler.java
@@ -12,6 +12,7 @@ public class AriAsyncHandler<T> implements HttpResponseHandler {
     private final AriCallback<? super T> callback;
     private Class<T> klazz;
     private TypeReference<T> klazzType;
+    private long lastResponseTime = 0;
 
     public AriAsyncHandler(AriCallback<? super T> callback, Class<T> klazz) {
         this.callback = callback;
@@ -45,12 +46,12 @@ void handleResponse(String json) {
 
     @Override
     public void onChReadyToWrite() {
-        // Client connected. That's good.
+        lastResponseTime = System.currentTimeMillis();
     }
 
     @Override
     public void onResponseReceived() {
-        // not sure what should go here...
+        lastResponseTime = System.currentTimeMillis();
     }
 
     @Override
@@ -69,6 +70,11 @@ public void onFailure(Throwable e) {
         this.callback.onFailure(new RestException(e));
     }
 
+    @Override
+    public long getLastResponseTime() {
+        return lastResponseTime;
+    }
+
 }
 
 // $Log$
diff --git a/classes/ch/loway/oss/ari4java/tools/BaseAriAction.java b/classes/ch/loway/oss/ari4java/tools/BaseAriAction.java
@@ -203,10 +203,6 @@ public static Message deserializeEvent(String json, Class<?> klazz) throws RestE
      * @throws RestException
      */
     public synchronized void disconnectWs() throws RestException {
-        System.out.println("Closing WS connection");
-        if (wsUpgrade && wsConnection == null) {
-            throw new RestException("No WebSocket connection is open");
-        }
         wsConnection.disconnect();
         wsConnection = null;
     }
diff --git a/classes/ch/loway/oss/ari4java/tools/HttpResponseHandler.java b/classes/ch/loway/oss/ari4java/tools/HttpResponseHandler.java
@@ -35,4 +35,11 @@ public interface HttpResponseHandler {
      * @param e
      */
     void onFailure(Throwable e);
+
+    /**
+     * The last time in epoch since last response
+     *
+     * @return epoch
+     */
+    long getLastResponseTime();
 }
diff --git a/classes/ch/loway/oss/ari4java/tools/WsClientAutoReconnect.java b/classes/ch/loway/oss/ari4java/tools/WsClientAutoReconnect.java
@@ -0,0 +1,11 @@
+package ch.loway.oss.ari4java.tools;
+
+/**
+ * Interface to pluggable WebSocket reconnect implementation
+ * 
+ * @author grahambrown11
+ *
+ */
+public interface WsClientAutoReconnect {
+	void reconnectWs();
+}
diff --git a/classes/ch/loway/oss/ari4java/tools/http/NettyHttpClient.java b/classes/ch/loway/oss/ari4java/tools/http/NettyHttpClient.java
diff --git a/classes/ch/loway/oss/ari4java/tools/http/NettyWSClientHandler.java b/classes/ch/loway/oss/ari4java/tools/http/NettyWSClientHandler.java
