From 1c8362c1fc8eb160b85573fde70cef5a7b26607c Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Sun, 11 Dec 2016 10:38:23 -0500
Subject: [PATCH] #30 WIP - cleanup

---
 src/audio/broadcast/AudioBroadcaster.java     |  5 ++++
 src/audio/broadcast/BroadcastModel.java       | 10 ++++++++
 src/audio/broadcast/BroadcastState.java       |  2 +-
 .../icecast/IcecastHTTPAudioBroadcaster.java  | 24 +++++++++++++++----
 src/network.java                              | 21 ++++++++++++++++
 5 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 src/network.java

diff --git a/src/audio/broadcast/AudioBroadcaster.java b/src/audio/broadcast/AudioBroadcaster.java
index a5aab5c1..58904a33 100644
--- a/src/audio/broadcast/AudioBroadcaster.java
+++ b/src/audio/broadcast/AudioBroadcaster.java
@@ -92,6 +92,11 @@ public abstract class AudioBroadcaster implements IAudioPacketListener
                 SystemProperties.getInstance().getApplicationFolder(BroadcastModel.TEMPORARY_STREAM_DIRECTORY));
     }
 
+    protected ThreadPoolManager getThreadPoolManager()
+    {
+        return mThreadPoolManager;
+    }
+
     /**
      * Broadcast binary audio data frames or sequences.
      */
diff --git a/src/audio/broadcast/BroadcastModel.java b/src/audio/broadcast/BroadcastModel.java
index 3620fc61..5437a84b 100644
--- a/src/audio/broadcast/BroadcastModel.java
+++ b/src/audio/broadcast/BroadcastModel.java
@@ -365,8 +365,18 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
             DefaultAsyncHttpClientConfig config =
                 new DefaultAsyncHttpClientConfig.Builder()
                     .setReadTimeout(-1)
+                    .setThreadPoolName("audio-broadcast-pool")
+                    .setUserAgent(SystemProperties.getInstance().getApplicationName())
                     .build();
 
+            mLog.debug("Client Config - Request Timeout:" + config.getRequestTimeout());
+            mLog.debug("Client Config - Connection Ttl:" + config.getConnectionTtl());
+            mLog.debug("Client Config - Connect Timeout:" + config.getConnectTimeout());
+            mLog.debug("Client Config - IO Thread Count:" + config.getIoThreadsCount());
+            mLog.debug("Client Config - Pool Conn Idle Timeout:" + config.getPooledConnectionIdleTimeout());
+            mLog.debug("Client Config - Connection Pooling:" + config.getIoThreadsCount());
+
+
             mDefaultAsyncHttpClient = new DefaultAsyncHttpClient(config);
         }
 
diff --git a/src/audio/broadcast/BroadcastState.java b/src/audio/broadcast/BroadcastState.java
index 011636f8..b56dbcc9 100644
--- a/src/audio/broadcast/BroadcastState.java
+++ b/src/audio/broadcast/BroadcastState.java
@@ -38,7 +38,7 @@ public enum BroadcastState
     /**
      * Disconnected from the broadcastAudio server
      */
-    DISCONNECTED("Disconnected", true),
+    DISCONNECTED("Disconnected", false),
 
     /**
      * Invalid password
diff --git a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
index 44dc424f..d2c7788e 100644
--- a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
+++ b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
@@ -42,6 +42,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import properties.SystemProperties;
 
+import java.net.ConnectException;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -248,6 +249,7 @@ public class IcecastHTTPAudioBroadcaster extends AudioBroadcaster implements Pub
             if(canConnect() && System.currentTimeMillis() - mLastConnectionAttempt >= RECONNECT_INTERVAL_MILLISECONDS)
             {
                 mLog.debug("Creating a connection to icecast server");
+                setBroadcastState(BroadcastState.CONNECTING);
                 mLastConnectionAttempt = System.currentTimeMillis();
 
                 Uri uri = new Uri(Uri.HTTP, null, getConfiguration().getHost(), getConfiguration().getPort(),
@@ -299,7 +301,8 @@ public class IcecastHTTPAudioBroadcaster extends AudioBroadcaster implements Pub
 
                 requestBuilder.addHeader(IcecastHeader.EXPECT.getValue(), HTTP_100_CONTINUE);
 
-                ListenableFuture<Response> future = requestBuilder.execute(new AsyncHttpConnectionResponseHandler());
+                requestBuilder.setRequestTimeout(1000);
+                requestBuilder.execute(new AsyncHttpConnectionResponseHandler());
             }
             else
             {
@@ -313,8 +316,19 @@ public class IcecastHTTPAudioBroadcaster extends AudioBroadcaster implements Pub
         @Override
         public void onThrowable(Throwable throwable)
         {
-            mLog.error("BROADCAST error", throwable);
-            setBroadcastState(BroadcastState.BROADCAST_ERROR);
+            mLog.debug("Got a throwable!");
+            if(throwable instanceof ConnectException)
+            {
+                if(throwable.getMessage().contains("Connection refused"))
+                {
+                    setBroadcastState(BroadcastState.NO_SERVER);
+                }
+            }
+            else
+            {
+                mLog.error("Error connecting to remote server - " + throwable.getMessage());
+                setBroadcastState(BroadcastState.BROADCAST_ERROR);
+            }
             mConnecting.compareAndSet(true, false);
         }
 
@@ -393,13 +407,15 @@ public class IcecastHTTPAudioBroadcaster extends AudioBroadcaster implements Pub
         @Override
         public State onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws Exception
         {
+            mLog.debug("Got headers received");
             return State.CONTINUE;
         }
 
         @Override
         public Response onCompleted() throws Exception
         {
-            mLog.debug("We're completed");
+            mLog.debug("Got on completed");
+            setBroadcastState(BroadcastState.DISCONNECTED);
             return null;
         }
     }
diff --git a/src/network.java b/src/network.java
new file mode 100644
index 00000000..b7a93210
--- /dev/null
+++ b/src/network.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2016 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ ******************************************************************************/
+public class network
+{
+}