diff --git a/src/Comm/FINISH CommStatic.cs b/src/Comm/FINISH CommStatic.cs
deleted file mode 100644
index 70f105e..0000000
--- a/src/Comm/FINISH CommStatic.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Core
-{
- ///
- /// Background class that manages debug features for sockets
- ///
- public static class CommStatic
- {
- static List Sockets = new List();
-
- ///
- /// Sets up the backing class. Adds console commands for S#Pro programs
- ///
- static CommStatic()
- {
- if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
- {
- CrestronConsole.AddNewConsoleCommand(SocketCommand, "socket", "socket commands: list, send, connect, disco",
- ConsoleAccessLevelEnum.AccessOperator);
- }
- }
-
- static void SocketCommand(string s)
- {
- // 0 1 2
- //socket command number/key/all param
- //socket list
- //socket send 4 ver -v\n
-
- if (string.IsNullOrEmpty(s))
- return;
- var tokens = s.Split(' ');
- if (tokens.Length == 0)
- return;
- var command = tokens[0].ToLower();
- if(command == "connect")
- {
-
- }
- else if(command == "disco")
- {
-
- }
- else if(command =="list")
- {
- CrestronConsole.ConsoleCommandResponse("{0} sockets", Sockets.Count);
- if(Sockets.Count == 0)
- return;
- // get the longest key name, for formatting
- var longestLength = Sockets.Aggregate("",
- (max, cur) => max.Length > cur.Key.Length ? max : cur.Key).Length;
- for(int i = 0; i < Sockets.Count; i++)
- {
- var sock = Sockets[i];
- CrestronConsole.ConsoleCommandResponse("{0} {1} {2} {3}",
- i, sock.Key, GetSocketType(sock), sock.ClientStatus);
- }
- }
- else if(command == "send")
- {
-
- }
- }
-
- ///
- /// Helper for socket list, to show types
- ///
- static string GetSocketType(ISocketStatus sock)
- {
- if (sock is GenericSshClient)
- return "SSH";
- else if (sock is GenericTcpIpClient)
- return "TCP-IP";
- else
- return "?";
- }
-
-
- ///
- ///
- ///
- ///
- public static void AddSocket(ISocketStatus socket)
- {
- if(!Sockets.Contains(socket))
- Sockets.Add(socket);
- }
-
- ///
- ///
- ///
- ///
- public static void RemoveSocket(ISocketStatus socket)
- {
- if (Sockets.Contains(socket))
- Sockets.Remove(socket);
- }
- }
-}
\ No newline at end of file
diff --git a/src/Comm/GenericHttpSseClient.cs b/src/Comm/GenericHttpSseClient.cs
deleted file mode 100644
index 6992ef7..0000000
--- a/src/Comm/GenericHttpSseClient.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Net.Http;
-
-namespace PepperDash.Core
-{
- ///
- /// Client for communicating with an HTTP Server Side Event pattern
- ///
- public class GenericHttpSseClient : ICommunicationReceiver
- {
- ///
- /// Notifies when bytes have been received
- ///
- public event EventHandler BytesReceived;
- ///
- /// Notifies when text has been received
- ///
- public event EventHandler TextReceived;
-
- ///
- /// Indicates connection status
- ///
- public bool IsConnected
- {
- get;
- private set;
- }
-
- ///
- /// Unique identifier for the instance
- ///
- public string Key
- {
- get;
- private set;
- }
-
- ///
- /// Name for the instance
- ///
- public string Name
- {
- get;
- private set;
- }
-
- ///
- /// URL of the server
- ///
- public string Url { get; set; }
-
- HttpClient Client;
- HttpClientRequest Request;
-
- ///
- /// Constructor
- ///
- ///
- ///
- public GenericHttpSseClient(string key, string name)
- {
- Key = key;
- Name = name;
- }
-
- ///
- /// Connects to the server. Requires Url to be set first.
- ///
- public void Connect()
- {
- InitiateConnection(Url);
- }
-
- ///
- /// Disconnects from the server
- ///
- public void Disconnect()
- {
- CloseConnection(null);
- }
-
- ///
- /// Initiates connection to the server
- ///
- ///
- public void InitiateConnection(string url)
- {
- CrestronInvoke.BeginInvoke(o =>
- {
- try
- {
- if(string.IsNullOrEmpty(url))
- {
- Debug.Console(0, this, "Error connecting to Server. No URL specified");
- return;
- }
-
- Client = new HttpClient();
- Request = new HttpClientRequest();
- Client.Verbose = true;
- Client.KeepAlive = true;
- Request.Url.Parse(url);
- Request.RequestType = RequestType.Get;
- Request.Header.SetHeaderValue("Accept", "text/event-stream");
-
- // In order to get a handle on the response stream, we have to get
- // the request stream first. Boo
- Client.BeginGetRequestStream(GetRequestStreamCallback, Request, null);
- CrestronConsole.PrintLine("Request made!");
- }
- catch (Exception e)
- {
- ErrorLog.Notice("Exception occured in AsyncWebPostHttps(): " + e.ToString());
- }
- });
- }
-
- ///
- /// Closes the connection to the server
- ///
- ///
- public void CloseConnection(string s)
- {
- if (Client != null)
- {
- Client.Abort();
- IsConnected = false;
-
- Debug.Console(1, this, "Client Disconnected");
- }
- }
-
- private void GetRequestStreamCallback(HttpClientRequest request, HTTP_CALLBACK_ERROR error, object status)
- {
-
- try
- {
- // End the the async request operation and return the data stream
- Stream requestStream = request.ThisClient.EndGetRequestStream(request, null);
- // If this were something other than a GET we could write to the stream here
-
- // Closing makes the request happen
- requestStream.Close();
-
- // Get a handle on the response stream.
- request.ThisClient.BeginGetResponseStream(GetResponseStreamCallback, request, status);
- }
- catch (Exception e)
- {
- ErrorLog.Notice("Exception occured in GetSecureRequestStreamCallback(): " + e.ToString());
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- private void GetResponseStreamCallback(HttpClientRequest request, HTTP_CALLBACK_ERROR error, object status)
- {
- try
- {
- // This closes up the GetResponseStream async
- var response = request.ThisClient.EndGetResponseStream(request);
-
- response.DataConnection.OnBytesReceived += new EventHandler(DataConnection_OnBytesReceived);
-
- IsConnected = true;
-
- Debug.Console(1, this, "Client Disconnected");
-
- Stream streamResponse = response.ContentStream;
- // Object containing various states to be passed back to async callback below
- RequestState asyncState = new RequestState();
- asyncState.Request = request;
- asyncState.Response = response;
- asyncState.StreamResponse = streamResponse;
- asyncState.HttpClient = request.ThisClient;
-
- // This processes the ongoing data stream
- Crestron.SimplSharp.CrestronIO.IAsyncResult asyncResult = null;
- do
- {
- asyncResult = streamResponse.BeginRead(asyncState.BufferRead, 0, RequestState.BUFFER_SIZE,
- new Crestron.SimplSharp.CrestronIO.AsyncCallback(ReadCallBack), asyncState);
- }
- while (asyncResult.CompletedSynchronously && !asyncState.Done);
-
- //Console.WriteLine("\r\nExit Response Callback\r\n");
- }
- catch (Exception e)
- {
- ErrorLog.Notice("Exception occured in GetSecureRequestStreamCallback(): " + e.ToString());
- }
- }
-
- void DataConnection_OnBytesReceived(object sender, EventArgs e)
- {
- Debug.Console(1, this, "DataConnection OnBytesReceived Fired");
- }
-
- private void ReadCallBack(Crestron.SimplSharp.CrestronIO.IAsyncResult asyncResult)
- {
- //we are getting back everything here, so cast the state from the call
- RequestState requestState = asyncResult.AsyncState as RequestState;
- Stream responseStream = requestState.StreamResponse;
-
- int read = responseStream.EndRead(asyncResult);
- // Read the HTML page and then print it to the console.
- if (read > 0)
- {
- var bytes = requestState.BufferRead;
-
- var bytesHandler = BytesReceived;
- if (bytesHandler != null)
- bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
- var textHandler = TextReceived;
- if (textHandler != null)
- {
- var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
- textHandler(this, new GenericCommMethodReceiveTextArgs(str));
- }
-
- //requestState.RequestData.Append(Encoding.ASCII.GetString(requestState.BufferRead, 0, read));
- //CrestronConsole.PrintLine(requestState.RequestData.ToString());
-
- //clear the byte array buffer used.
- Array.Clear(requestState.BufferRead, 0, requestState.BufferRead.Length);
-
- if (asyncResult.CompletedSynchronously)
- {
- return;
- }
-
- Crestron.SimplSharp.CrestronIO.IAsyncResult asynchronousResult;
- do
- {
- asynchronousResult = responseStream.BeginRead(requestState.BufferRead, 0, RequestState.BUFFER_SIZE,
- new Crestron.SimplSharp.CrestronIO.AsyncCallback(ReadCallBack), requestState);
- }
- while (asynchronousResult.CompletedSynchronously && !requestState.Done);
- }
- else
- {
- requestState.Done = true;
- }
- }
- }
-
- ///
- /// Stores the state of the request
- ///
- public class RequestState
- {
- ///
- ///
- ///
- public const int BUFFER_SIZE = 10000;
- ///
- ///
- ///
- public byte[] BufferRead;
- ///
- ///
- ///
- public HttpClient HttpClient;
- ///
- ///
- ///
- public HttpClientRequest Request;
- ///
- ///
- ///
- public HttpClientResponse Response;
- ///
- ///
- ///
- public Stream StreamResponse;
- ///
- ///
- ///
- public bool Done;
-
- ///
- /// Constructor
- ///
- public RequestState()
- {
- BufferRead = new byte[BUFFER_SIZE];
- HttpClient = null;
- Request = null;
- Response = null;
- StreamResponse = null;
- Done = false;
- }
- }
-
- ///
- /// Waithandle for main thread.
- ///
- public class StreamAsyncTest
- {
- ///
- ///
- ///
- public CEvent wait_for_response = new CEvent(true, false);
- }
-}
\ No newline at end of file