Update client copy in android project

mythz · mythz · commit 55a1c1539749 · 2017-02-11T04:37:35.000-05:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonUtils.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonUtils.java
@@ -1,5 +1,7 @@
 package net.servicestack.client;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -53,4 +55,12 @@ public static long asLong(JsonObject obj, String key, long defaultValue) {
             ? val.getAsLong()
             : defaultValue;
     }
+
+    public static Gson getGson(){
+        return new GsonBuilder().disableHtmlEscaping().create();
+    }
+
+    public static <T> T fromJson(String json, Class<?> cls) {
+        return (T)getGson().fromJson(json, cls);
+    }
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java
@@ -16,6 +16,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -823,12 +825,15 @@ public static String addQueryParam(String url, String key, String value) {
     public static String addQueryParam(String url, String key, String val, boolean encode) {
         if (url == null || url.length() == 0)
             return null;
+        if (val == null)
+            val = "";
+
         String prefix = "";
         if (!url.endsWith("?") && !url.endsWith("&")) {
             prefix = url.indexOf('?') == -1 ? "?" : "&";
         }
         try {
-            return url + prefix + key + "=" + (encode && val != null ? URLEncoder.encode(val, "UTF-8") : val);
+            return url + prefix + key + "=" + (encode ? URLEncoder.encode(val, "UTF-8") : val);
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }
@@ -883,4 +888,10 @@ public static String join(final Iterator<?> iterator, final String separator) {
         }
         return buf.toString();
     }
+
+    public static String getStackTrace(Exception ex) {
+        StringWriter sw = new StringWriter();
+        ex.printStackTrace(new PrintWriter(sw));
+        return sw.toString();
+    }
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventCommand.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventCommand.java
@@ -69,4 +69,15 @@ protected void populate(JsonObject obj) {
         if (!Utils.isNullOrEmpty(channels))
             this.channels = channels.split(",");
     }
+
+    @Override
+    public String toString() {
+        return "(" + this.getClass().getSimpleName() +
+                "\n eventId: " + eventId +
+                "\n userId: " + userId +
+                "\n displayName: " + displayName +
+                "\n profileUrl: " + profileUrl +
+                "\n isAuthenticated: " + isAuthenticated +
+                "\n channels: " + Utils.join(channels, ",") + "\n)";
+    }
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java
@@ -8,6 +8,7 @@
 import net.servicestack.client.Utils;
 
 import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -21,12 +22,13 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by mythz on 2/9/2017.
  */
 
-public class ServerEventsClient {
+public class ServerEventsClient implements AutoCloseable {
     private String baseUri;
     private String[] channels;
     private String eventStreamPath;
@@ -47,11 +49,12 @@ public class ServerEventsClient {
 
     private Date lastPulseAt;
     private Thread bgThread;
-    private boolean stopped;
+    private final AtomicBoolean stopped = new AtomicBoolean(false);
 
     static int BufferSize = 1024 * 64;
     static int DefaultHeartbeatMs = 10 * 1000;
     static int DefaultIdleTimeoutMs = 30 * 1000;
+    public static String UnknownChannel = "*";
 
     public ServerEventsClient(String baseUri, String[] channels) {
         setBaseUri(baseUri);
@@ -66,6 +69,10 @@ public ServerEventsClient(String baseUrl, String channel) {
         this(baseUrl, new String[]{ channel });
     }
 
+    public ServerEventsClient(String baseUrl) {
+        this(baseUrl, new String[]{});
+    }
+
     public String getBaseUri() {
         return baseUri;
     }
@@ -84,8 +91,8 @@ public String[] getChannels() {
     }
 
     public void setChannels(String[] channels) {
-        if (channels == null || channels.length == 0)
-            throw new IllegalArgumentException("channels is empty");
+        if (channels == null)
+            channels = new String[0];
 
         this.channels = channels;
         buildEventStreamUri();
@@ -99,6 +106,10 @@ public String getEventStreamUri() {
         return eventStreamUri;
     }
 
+    public JsonServiceClient getServiceClient() {
+        return this.serviceClient;
+    }
+
     public ServerEventsClient setOnConnect(ServerEventConnectCallback onConnect) {
         this.onConnect = onConnect;
         return this;
@@ -150,6 +161,12 @@ public ServerEventConnect getConnectionInfo() {
         return connectionInfo;
     }
 
+    public String getSubscriptionId(){
+        return connectionInfo != null
+            ? connectionInfo.getId()
+            : null;
+    }
+
     public String getConnectionDisplayName() {
         return connectionInfo != null
             ? connectionInfo.getDisplayName()
@@ -162,6 +179,7 @@ public ServerEventsClient start(){
             bgThread = null;
         }
 
+        stopped.set(false);
         bgThread = new Thread(new EventStream(this));
         bgThread.start();
         lastPulseAt = new Date();
@@ -173,7 +191,7 @@ public synchronized void restart() {
         try {
             internalStop();
 
-            if (stopped)
+            if (stopped.get())
                 return;
 
             try {
@@ -185,6 +203,7 @@ public synchronized void restart() {
 
         } catch (Exception ex){
             Log.e("[SSE-CLIENT] Error whilst restarting: " + ex.getMessage(), ex);
+            ex.printStackTrace();
         }
     }
 
@@ -210,13 +229,13 @@ private void sleepBackOffMultiplier(int continuousErrorsCount) throws Interrupte
     }
 
     public synchronized void stop(){
-        stopped = true;
+        stopped.set(true);
         internalStop();
     }
 
     private synchronized void internalStop() {
         if (Log.isDebugEnabled())
-            Log.d("Stop()");
+            Log.d("Stop() " + getConnectionDisplayName());
 
         if (connectionInfo != null && connectionInfo.getUnRegisterUrl() != null) {
             try {
@@ -225,7 +244,9 @@ private synchronized void internalStop() {
         }
 
         connectionInfo = null;
-        bgThread.interrupt();
+        if (bgThread != null)
+            bgThread.interrupt();
+
         bgThread = null;
     }
 
@@ -269,6 +290,9 @@ protected void onExceptionReceived(Exception ex) {
         Log.e("[SSE-CLIENT] OnExceptionReceived: "
                 + ex.getMessage() + " on #" + getConnectionDisplayName(), ex);
 
+        if (Log.isDebugEnabled())
+            Log.d(Utils.getStackTrace(ex));
+
         if (onException != null)
             onException.execute(ex);
 
@@ -283,10 +307,10 @@ private void onConnectReceived() {
                     connectionInfo.getId(),
                     Utils.join(channels, ",")));
 
-        startNewHeartbeat();
-
         if (onConnect != null)
             onConnect.execute(connectionInfo);
+
+        startNewHeartbeat();
     }
 
     Timer heratbeatTimer;
@@ -295,16 +319,19 @@ private void startNewHeartbeat() {
         if (connectionInfo == null || connectionInfo.getHeartbeatUrl() == null)
             return;
 
-        if (heratbeatTimer != null)
-            heratbeatTimer.cancel();
+        if (stopped.get())
+            return;
+
+        if (heratbeatTimer == null)
+            heratbeatTimer = new Timer("ServerEventsClient Heartbeat");
 
-        heratbeatTimer = new Timer();
+        //reschedule timer on every heartbeat
         heratbeatTimer.schedule(new TimerTask() {
             @Override
             public void run() {
                 Heartbeat();
             }
-        }, 0, connectionInfo.getHeartbeatIntervalMs());
+        }, connectionInfo.getHeartbeatIntervalMs(), Integer.MAX_VALUE);
     }
 
     public void Heartbeat(){
@@ -314,6 +341,9 @@ public void Heartbeat(){
         if (connectionInfo == null)
             return;
 
+        if (stopped.get())
+            return;
+
         long elapsedMs = (new Date().getTime() - lastPulseAt.getTime());
         if (elapsedMs > connectionInfo.getIdleTimeoutMs())
         {
@@ -330,7 +360,16 @@ public void Heartbeat(){
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Sending Heartbeat...");
 
-            String response = Utils.readToEnd(conn);
+            try {
+                String response = Utils.readToEnd(conn.getInputStream(), "UTF-8");
+            } catch (FileNotFoundException notFound) {
+
+                if (stopped.get())
+                    return;
+
+                Log.e(conn.getResponseMessage(), notFound);
+                throw notFound;
+            }
 
             if (Log.isDebugEnabled())
                 Log.d("[SSE-CLIENT] Heartbeat sent to: " + heartbeatUrl);
@@ -382,6 +421,11 @@ private void processOnHeartbeatMessage(ServerEventMessage e) {
         onHeartbeatReceived(new ServerEventHeartbeat().populate(e, JsonUtils.toJsonObject(e.getJson())));
     }
 
+    @Override
+    public void close() throws Exception {
+        stop();
+    }
+
     class EventStream implements Runnable {
 
         ServerEventsClient client;
@@ -400,56 +444,52 @@ public void run() {
                 InputStream is = new BufferedInputStream(req.getInputStream());
                 readStream(is);
             } catch (IOException e) {
-                e.printStackTrace();
+                Log.e("Error reading from event-stream", e);
+                Log.e(Utils.getStackTrace(e));
+            } finally {
+                client.restart();
             }
         }
 
-        private void readStream(InputStream inputStream) {
+        private void readStream(InputStream inputStream) throws IOException {
             byte[] buffer = new byte[BufferSize];
             String overflowText = "";
 
-            try {
-                int len = 0;
-                while (true) {
-                    len = inputStream.read(buffer);
-                    if (len <= 0)
-                        break;
+            int len = 0;
+            while (true) {
+                len = inputStream.read(buffer);
+                if (len <= 0)
+                    break;
 
-                    String text = overflowText + new String(buffer, 0, len, "UTF-8");
+                String text = overflowText + new String(buffer, 0, len, "UTF-8");
 
-                    int pos;
-                    while ((pos = text.indexOf('\n')) >= 0) {
-                        if (pos == 0) {
-                            if (currentMsg != null)
-                                processEventMessage(currentMsg);
-                            currentMsg = null;
+                int pos;
+                while ((pos = text.indexOf('\n')) >= 0) {
+                    if (pos == 0) {
+                        if (currentMsg != null)
+                            processEventMessage(currentMsg);
+                        currentMsg = null;
 
-                            text = text.substring(pos + 1);
+                        text = text.substring(pos + 1);
 
-                            if (!Utils.isEmpty(text))
-                                continue;
+                        if (!Utils.isEmpty(text))
+                            continue;
 
-                            break;
-                        }
-
-                        String line = text.substring(0, pos);
-                        if (!Utils.isNullOrWhiteSpace(line))
-                            processLine(line);
-                        if (text.length() > pos + 1)
-                            text = text.substring(pos + 1);
+                        break;
                     }
 
-                    overflowText = text;
+                    String line = text.substring(0, pos);
+                    if (!Utils.isNullOrWhiteSpace(line))
+                        processLine(line);
+                    if (text.length() > pos + 1)
+                        text = text.substring(pos + 1);
                 }
 
-                if (Log.isDebugEnabled())
-                    Log.d("Connection ended on " + client.getConnectionDisplayName());
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                client.restart();
+                overflowText = text;
             }
+
+            if (Log.isDebugEnabled())
+                Log.d("Connection ended on " + client.getConnectionDisplayName());
         }
 
         private void processLine(String line) {
