From 0e4fe2eecb6e86e0cf3546c8a8a536588177cfb7 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 9 Sep 2017 21:33:01 +0100 Subject: [PATCH] Update GlidingSquirrel version --- Nibriboard/Client/HttpClientSettingsHandler.cs | 7 +++++-- Nibriboard/Client/HttpEmbeddedFileHandler.cs | 5 +++-- Nibriboard/NibriboardServer.cs | 4 +--- Nibriboard/lib/GlidingSquirrel | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Nibriboard/Client/HttpClientSettingsHandler.cs b/Nibriboard/Client/HttpClientSettingsHandler.cs index 9b9d5df..a191cd9 100644 --- a/Nibriboard/Client/HttpClientSettingsHandler.cs +++ b/Nibriboard/Client/HttpClientSettingsHandler.cs @@ -1,11 +1,14 @@ using System; -using IotWeb.Common.Http; using System.IO; + +using SBRL.GlidingSquirrel.Http; +using SBRL.GlidingSquirrel.Websocket; + using Newtonsoft.Json; namespace Nibriboard.Client { - public class HttpClientSettingsHandler : IHttpRequestHandler + public class HttpClientSettingsHandler : WebsocketServer { private ClientSettings settings; diff --git a/Nibriboard/Client/HttpEmbeddedFileHandler.cs b/Nibriboard/Client/HttpEmbeddedFileHandler.cs index 388e580..c2619e3 100644 --- a/Nibriboard/Client/HttpEmbeddedFileHandler.cs +++ b/Nibriboard/Client/HttpEmbeddedFileHandler.cs @@ -1,15 +1,16 @@ using System; using System.IO; -using IotWeb.Common.Http; using MimeSharp; +using SBRL.GlidingSquirrel.Websocket; + using SBRL.Utilities; using System.Collections.Generic; using System.Reflection; namespace Nibriboard.Client { - public class HttpEmbeddedFileHandler : IHttpRequestHandler + public class HttpEmbeddedFileHandler : WebsocketsServer { private string filePrefix; diff --git a/Nibriboard/NibriboardServer.cs b/Nibriboard/NibriboardServer.cs index 56cef25..f44901c 100644 --- a/Nibriboard/NibriboardServer.cs +++ b/Nibriboard/NibriboardServer.cs @@ -2,8 +2,6 @@ using System.Threading.Tasks; using System.Threading; -using IotWeb.Server; -using IotWeb.Common.Http; using Nibriboard.RippleSpace; using Nibriboard.Client; @@ -20,7 +18,7 @@ namespace Nibriboard public class NibriboardServer { private TcpListener commandServer; - private HttpServer httpServer; + private WebsocketsServer httpServer; private ClientSettings clientSettings; private RippleSpaceManager planeManager; diff --git a/Nibriboard/lib/GlidingSquirrel b/Nibriboard/lib/GlidingSquirrel index c0e4dee..e219ad1 160000 --- a/Nibriboard/lib/GlidingSquirrel +++ b/Nibriboard/lib/GlidingSquirrel @@ -1 +1 @@ -Subproject commit c0e4deec452e5d8c9273679c166437205835a70d +Subproject commit e219ad112d256e00563eca76f13691ebe486e3bd