From 368de74820c090071e262af94f791d2c92c3e262 Mon Sep 17 00:00:00 2001
From: Markus Bender <locxion.m@googlemail.com>
Date: Mon, 26 Feb 2024 04:47:47 +0100
Subject: [PATCH] Removed Example Console Project

Removed Old Api Classes
Added new Http Api Service and Classes
TODO Dynamic Effect Methods
---
 GoveeCSharpConnector.sln                      |   6 -
 GoveeCSharpConnector.sln.DotSettings          |   3 +-
 ...oveeApiService.cs => IGoveeHttpService.cs} |  55 ++---
 GoveeCSharpConnector/Objects/ApiResponse.cs   |   7 -
 GoveeCSharpConnector/Objects/Data.cs          |   8 -
 .../Objects/GoveeApiCommand.cs                |  14 --
 .../Objects/GoveeApiDevice.cs                 |  17 --
 GoveeCSharpConnector/Objects/GoveeApiState.cs |  16 --
 .../Objects/GoveeHttpDevice.cs                |  14 ++
 .../Objects/GoveeHttpState.cs                 |  16 ++
 GoveeCSharpConnector/Objects/GoveeResponse.cs |   6 -
 .../Objects/Misc/ApiResponse.cs               |  13 ++
 .../Objects/Misc/Capability.cs                |  13 ++
 GoveeCSharpConnector/Objects/Misc/Field.cs    |  21 ++
 GoveeCSharpConnector/Objects/Misc/Option.cs   |  11 +
 .../Objects/Misc/Parameters.cs                |  17 ++
 GoveeCSharpConnector/Objects/Misc/Payload.cs  |  13 ++
 .../Objects/{ => Misc}/Properties.cs          |   8 +-
 GoveeCSharpConnector/Objects/Misc/Range.cs    |  13 ++
 .../Objects/Misc/ServiceResponse.cs           |   8 +
 GoveeCSharpConnector/Objects/Misc/State.cs    |   9 +
 .../Services/GoveeApiService.cs               |  86 -------
 .../Services/GoveeHttpService.cs              | 214 ++++++++++++++++++
 23 files changed, 388 insertions(+), 200 deletions(-)
 rename GoveeCSharpConnector/Interfaces/{IGoveeApiService.cs => IGoveeHttpService.cs} (59%)
 delete mode 100644 GoveeCSharpConnector/Objects/ApiResponse.cs
 delete mode 100644 GoveeCSharpConnector/Objects/Data.cs
 delete mode 100644 GoveeCSharpConnector/Objects/GoveeApiCommand.cs
 delete mode 100644 GoveeCSharpConnector/Objects/GoveeApiDevice.cs
 delete mode 100644 GoveeCSharpConnector/Objects/GoveeApiState.cs
 create mode 100644 GoveeCSharpConnector/Objects/GoveeHttpDevice.cs
 create mode 100644 GoveeCSharpConnector/Objects/GoveeHttpState.cs
 delete mode 100644 GoveeCSharpConnector/Objects/GoveeResponse.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/ApiResponse.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Capability.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Field.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Option.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Parameters.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Payload.cs
 rename GoveeCSharpConnector/Objects/{ => Misc}/Properties.cs (50%)
 create mode 100644 GoveeCSharpConnector/Objects/Misc/Range.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/ServiceResponse.cs
 create mode 100644 GoveeCSharpConnector/Objects/Misc/State.cs
 delete mode 100644 GoveeCSharpConnector/Services/GoveeApiService.cs
 create mode 100644 GoveeCSharpConnector/Services/GoveeHttpService.cs

diff --git a/GoveeCSharpConnector.sln b/GoveeCSharpConnector.sln
index a2ab44f..1f1ef23 100644
--- a/GoveeCSharpConnector.sln
+++ b/GoveeCSharpConnector.sln
@@ -2,8 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoveeCSharpConnector", "GoveeCSharpConnector\GoveeCSharpConnector.csproj", "{EDF67B3A-9EBF-4C76-92E2-0AACD6B8081B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoveeCsharpConnector.Example", "GoveeCsharpConnector.Example\GoveeCsharpConnector.Example.csproj", "{E487B84B-F619-430A-A0D3-80D44FE9EE3F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -14,9 +12,5 @@ Global
 		{EDF67B3A-9EBF-4C76-92E2-0AACD6B8081B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDF67B3A-9EBF-4C76-92E2-0AACD6B8081B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDF67B3A-9EBF-4C76-92E2-0AACD6B8081B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E487B84B-F619-430A-A0D3-80D44FE9EE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E487B84B-F619-430A-A0D3-80D44FE9EE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E487B84B-F619-430A-A0D3-80D44FE9EE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E487B84B-F619-430A-A0D3-80D44FE9EE3F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/GoveeCSharpConnector.sln.DotSettings b/GoveeCSharpConnector.sln.DotSettings
index da83716..78725b5 100644
--- a/GoveeCSharpConnector.sln.DotSettings
+++ b/GoveeCSharpConnector.sln.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Govee/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Govee/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=reauired/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Interfaces/IGoveeApiService.cs b/GoveeCSharpConnector/Interfaces/IGoveeHttpService.cs
similarity index 59%
rename from GoveeCSharpConnector/Interfaces/IGoveeApiService.cs
rename to GoveeCSharpConnector/Interfaces/IGoveeHttpService.cs
index e2c682c..8f2f108 100644
--- a/GoveeCSharpConnector/Interfaces/IGoveeApiService.cs
+++ b/GoveeCSharpConnector/Interfaces/IGoveeHttpService.cs
@@ -1,48 +1,37 @@
 using GoveeCSharpConnector.Objects;
+using GoveeCSharpConnector.Objects.Misc;
 
 namespace GoveeCSharpConnector.Interfaces;
-    [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
 
-public interface IGoveeApiService
+public interface IGoveeHttpService
 {
     /// <summary>
     /// Sets the required Api Key for the Govee Api.
     /// Request Api Key in the Mobile Phone App.
     /// </summary>
     /// <param name="apiKey">Api Key as String</param>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
     void SetApiKey(string apiKey);
-
     /// <summary>
     /// Returns current set Govee Api Key
     /// </summary>
     /// <returns>Govee Api Key as String</returns>
     string GetApiKey();
-
     /// <summary>
     /// Removes the Set Api Key and resets the HTTP Header
     /// </summary>
     void RemoveApiKey();
-
     /// <summary>
     /// Requests all Devices registered to Api Key Govee Account
     /// </summary>
-    /// <returns>List of GoveeApiDevices</returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
-    Task<List<GoveeApiDevice>> GetDevices();
-
+    /// <returns>List of GoveeHttpDevices</returns>
+    Task<ServiceResponse<List<GoveeHttpDevice>>> GetDevices();
     /// <summary>
     /// Requests the State of a single Govee Device
     /// </summary>
     /// <param name="deviceId">Device Id Guid as string</param>
     /// <param name="deviceModel">Device Model Number as string</param>
-    /// <returns>GoveeApiStat Object</returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
-    Task<GoveeApiState> GetDeviceState(string deviceId, string deviceModel);
-
+    /// <returns>GoveeHttpState Object</returns>
+    Task<ServiceResponse<GoveeHttpState>> GetDeviceState(string deviceId, string deviceModel);
     /// <summary>
     /// Sets the On/Off state of a single Govee Device
     /// </summary>
@@ -50,21 +39,7 @@ public interface IGoveeApiService
     /// <param name="deviceModel">Device Model Number as string</param>
     /// <param name="on"></param>
     /// <returns></returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
-    Task ToggleState(string deviceId, string deviceModel, bool on);
-
-    /// <summary>
-    /// Sets the Brightness in Percent of a single Govee Device
-    /// </summary>
-    /// <param name="deviceId">Device Id Guid as string</param>
-    /// <param name="deviceModel">Device Model Number as string</param>
-    /// <param name="value">Brightness in Percent as Int</param>
-    /// <returns></returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
-    Task SetBrightness(string deviceId, string deviceModel, int value);
-
+    Task<ServiceResponse<bool>> SetOnOff(string deviceId, string deviceModel, bool on);
     /// <summary>
     /// Sets a Rgb Color of a single Govee Device
     /// </summary>
@@ -72,10 +47,7 @@ public interface IGoveeApiService
     /// <param name="deviceModel">Device Model Number as string</param>
     /// <param name="color">Rgb Color</param>
     /// <returns></returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-
-    Task SetColor(string deviceId, string deviceModel, RgbColor color);
-
+    Task<ServiceResponse<bool>> SetColor(string deviceId, string deviceModel, RgbColor color);
     /// <summary>
     /// Sets the Color Temperature of a single Govee Device
     /// </summary>
@@ -83,7 +55,14 @@ public interface IGoveeApiService
     /// <param name="deviceModel">Device Model Number as string</param>
     /// <param name="value">Color Temp in Kelvin as Int</param>
     /// <returns></returns>
-        [Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
+    Task<ServiceResponse<bool>> SetColorTemp(string deviceId, string deviceModel, int value);
+    /// <summary>
+    /// Sets the Brightness of a single Govee Device
+    /// </summary>
+    /// <param name="deviceId">Device Id Guid as string</param>
+    /// <param name="deviceModel">Device Model Number as string</param>
+    /// <param name="value">Value 1-100</param>
+    /// <returns></returns>
+    Task<ServiceResponse<bool>> SetBrightness(string deviceId, string deviceModel, int value);
 
-    Task SetColorTemp(string deviceId, string deviceModel, int value);
 }
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/ApiResponse.cs b/GoveeCSharpConnector/Objects/ApiResponse.cs
deleted file mode 100644
index 5639aab..0000000
--- a/GoveeCSharpConnector/Objects/ApiResponse.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace GoveeCSharpConnector.Objects;
-
-public class ApiResponse
-{
-    public string? Message { get; set; }
-    public int Code { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Data.cs b/GoveeCSharpConnector/Objects/Data.cs
deleted file mode 100644
index 044a900..0000000
--- a/GoveeCSharpConnector/Objects/Data.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace GoveeCSharpConnector.Objects;
-
-public class Data
-{
-    public List<GoveeApiDevice> Devices { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeApiCommand.cs b/GoveeCSharpConnector/Objects/GoveeApiCommand.cs
deleted file mode 100644
index d364ccd..0000000
--- a/GoveeCSharpConnector/Objects/GoveeApiCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace GoveeCSharpConnector.Objects;
-
-public class GoveeApiCommand
-{
-    public string Device { get; set; }
-    public string Model { get; set; }
-    public Command Cmd { get; set; }
-}
-
-public class Command
-{
-    public string Name { get; set; }
-    public object Value { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeApiDevice.cs b/GoveeCSharpConnector/Objects/GoveeApiDevice.cs
deleted file mode 100644
index 19e2c24..0000000
--- a/GoveeCSharpConnector/Objects/GoveeApiDevice.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace GoveeCSharpConnector.Objects;
-
-public class GoveeApiDevice
-{
-    [JsonPropertyName("device")]
-    public string DeviceId { get; set; }
-    public string Model { get; set; }
-    public string DeviceName { get; set; }
-    public bool Controllable { get; set; }
-    public bool Retrievable { get; set; }
-    [JsonPropertyName("supportCmds")]
-    public List<string> SupportedCommands { get; set; }
-    public Properties Properties { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeApiState.cs b/GoveeCSharpConnector/Objects/GoveeApiState.cs
deleted file mode 100644
index 586439e..0000000
--- a/GoveeCSharpConnector/Objects/GoveeApiState.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace GoveeCSharpConnector.Objects;
-
-public class GoveeApiState
-{
-    [JsonPropertyName("device")]
-    public string DeviceId { get; set; }
-
-    public string Model { get; set; }
-    
-    public string Name { get; set; }
-    
-    [JsonIgnore]
-    public Properties Properties { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeHttpDevice.cs b/GoveeCSharpConnector/Objects/GoveeHttpDevice.cs
new file mode 100644
index 0000000..f84e402
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/GoveeHttpDevice.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+using GoveeCSharpConnector.Objects.Misc;
+
+namespace GoveeCSharpConnector.Objects;
+
+public class GoveeHttpDevice
+{
+    [JsonPropertyName("sku")]
+    public string Model { get; set; }
+    [JsonPropertyName("device")]
+    public string Device { get; set; }
+    [JsonPropertyName("capabilities")]
+    public List<Capability> Capabilities { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeHttpState.cs b/GoveeCSharpConnector/Objects/GoveeHttpState.cs
new file mode 100644
index 0000000..b388391
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/GoveeHttpState.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+using GoveeCSharpConnector.Objects.Misc;
+
+namespace GoveeCSharpConnector.Objects;
+
+public class GoveeHttpState
+{
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; }
+    [JsonPropertyName("msg")] 
+    public string Msg { get; set; }
+    [JsonPropertyName("code")] 
+    public long Code { get; set; }
+    [JsonPropertyName("payload")] 
+    public Payload Payload { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/GoveeResponse.cs b/GoveeCSharpConnector/Objects/GoveeResponse.cs
deleted file mode 100644
index e9ad04f..0000000
--- a/GoveeCSharpConnector/Objects/GoveeResponse.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace GoveeCSharpConnector.Objects;
-
-public class GoveeResponse : ApiResponse
-{
-    public Data Data { get; set; }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/ApiResponse.cs b/GoveeCSharpConnector/Objects/Misc/ApiResponse.cs
new file mode 100644
index 0000000..f7c4d67
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/ApiResponse.cs
@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class ApiResponse
+{
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+    [JsonPropertyName("message")]
+    public string Message { get; set; }
+    [JsonPropertyName("data")]
+    public List<object> Data { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Capability.cs b/GoveeCSharpConnector/Objects/Misc/Capability.cs
new file mode 100644
index 0000000..0f28eb6
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Capability.cs
@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Capability
+{
+    [JsonPropertyName("type")]
+    public string Type { get; set; }
+    [JsonPropertyName("instance")]
+    public string Instance { get; set; }
+    [JsonPropertyName("state")]
+    public State State { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Field.cs b/GoveeCSharpConnector/Objects/Misc/Field.cs
new file mode 100644
index 0000000..a011bc4
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Field.cs
@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Field
+{
+    [JsonPropertyName("fieldName")]
+    public string FieldName { get; set; }
+    [JsonPropertyName("dataType")]
+    public string DataType { get; set; }
+    [JsonPropertyName("options")]
+    public List<Option> Options { get; set; }
+    [JsonPropertyName("required")]
+    public bool Required { get; set; }
+    [JsonPropertyName("range")]
+    public Range Range { get; set; }
+    [JsonPropertyName("unit")]
+    public string Unit { get; set; }
+    [JsonPropertyName("reauired")]
+    public bool? Reauired { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Option.cs b/GoveeCSharpConnector/Objects/Misc/Option.cs
new file mode 100644
index 0000000..1a8563b
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Option.cs
@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Option
+{
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+    [JsonPropertyName("value")]
+    public int Value { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Parameters.cs b/GoveeCSharpConnector/Objects/Misc/Parameters.cs
new file mode 100644
index 0000000..6affd60
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Parameters.cs
@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Parameters
+{
+    [JsonPropertyName("dataType")]
+    public string DataType { get; set; }
+    [JsonPropertyName("options")]
+    public List<Option> Options { get; set; }
+    [JsonPropertyName("unit")]
+    public string Unit { get; set; }
+    [JsonPropertyName("range")]
+    public Range Range { get; set; }
+    [JsonPropertyName("fields")]
+    public List<Field> Fields { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Payload.cs b/GoveeCSharpConnector/Objects/Misc/Payload.cs
new file mode 100644
index 0000000..f640f4c
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Payload.cs
@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Payload
+{
+    [JsonPropertyName("sku")]
+    public string Model { get; set; }
+    [JsonPropertyName("device")]
+    public string Device { get; set; }
+    [JsonPropertyName("capabilities")]
+    public List<Capability> Capabilities { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Properties.cs b/GoveeCSharpConnector/Objects/Misc/Properties.cs
similarity index 50%
rename from GoveeCSharpConnector/Objects/Properties.cs
rename to GoveeCSharpConnector/Objects/Misc/Properties.cs
index 7ecd558..2797897 100644
--- a/GoveeCSharpConnector/Objects/Properties.cs
+++ b/GoveeCSharpConnector/Objects/Misc/Properties.cs
@@ -1,12 +1,18 @@
+using System.Text.Json.Serialization;
 using GoveeCSharpConnector.Enums;
 
-namespace GoveeCSharpConnector.Objects;
+namespace GoveeCSharpConnector.Objects.Misc;
 
 public class Properties
 {
+    [JsonPropertyName("online")]
     public bool Online { get; set; }
+    [JsonPropertyName("powerState")]
     public PowerState PowerState { get; set; }
+    [JsonPropertyName("brightness")]
     public int Brightness { get; set; }
+    [JsonPropertyName("colorTemp")]
     public int ColorTemp { get; set; }
+    [JsonPropertyName("color")]
     public RgbColor Color { get; set; }
 }
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/Range.cs b/GoveeCSharpConnector/Objects/Misc/Range.cs
new file mode 100644
index 0000000..82a1dbe
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/Range.cs
@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class Range
+{
+    [JsonPropertyName("min")]
+    public int Min { get; set; }
+    [JsonPropertyName("max")]
+    public int Max { get; set; }
+    [JsonPropertyName("precision")]
+    public int Precision { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/ServiceResponse.cs b/GoveeCSharpConnector/Objects/Misc/ServiceResponse.cs
new file mode 100644
index 0000000..20261a7
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/ServiceResponse.cs
@@ -0,0 +1,8 @@
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class ServiceResponse<T>
+{
+    public T? Data { get; set; }
+    public bool Success { get; set; } = true;
+    public string Message { get; set; } = string.Empty;
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Objects/Misc/State.cs b/GoveeCSharpConnector/Objects/Misc/State.cs
new file mode 100644
index 0000000..c13371b
--- /dev/null
+++ b/GoveeCSharpConnector/Objects/Misc/State.cs
@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace GoveeCSharpConnector.Objects.Misc;
+
+public class State
+{
+    [JsonPropertyName("value")]
+    public object Value { get; set; }
+}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Services/GoveeApiService.cs b/GoveeCSharpConnector/Services/GoveeApiService.cs
deleted file mode 100644
index 5772d0c..0000000
--- a/GoveeCSharpConnector/Services/GoveeApiService.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Net.Http.Json;
-using System.Text;
-using System.Text.Json;
-using GoveeCSharpConnector.Interfaces;
-using GoveeCSharpConnector.Objects;
-
-namespace GoveeCSharpConnector.Services;
-
-[Obsolete("New Api Reference: https://developer.govee.com/reference/" ,true)]
-public class GoveeApiService : IGoveeApiService
-{
-    private string _apiKey = string.Empty;
-    private const string GoveeApiAddress = "https://developer-api.govee.com/v1";
-    private readonly HttpClient _httpClient = new();
-    private readonly JsonSerializerOptions? _jsonOptions = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-    };
-    /// <inheritdoc/>
-    public void SetApiKey(string apiKey)
-    {
-        _apiKey = apiKey;
-        _httpClient.DefaultRequestHeaders.Add("Govee-API-Key", _apiKey);
-    }
-    /// <inheritdoc/>
-    public string GetApiKey()
-    {
-        return _apiKey;
-    }
-    /// <inheritdoc/>
-    public void RemoveApiKey()
-    {
-        _apiKey = string.Empty;
-        _httpClient.DefaultRequestHeaders.Remove("Govee-Api-Key");
-    }
-    /// <inheritdoc/>
-    public async Task<List<GoveeApiDevice>> GetDevices()
-    {
-        var response = await _httpClient.GetFromJsonAsync<GoveeResponse>($"{GoveeApiAddress}/devices");
-        
-        return response.Data.Devices;
-    }
-    /// <inheritdoc/>
-    public async Task<GoveeApiState> GetDeviceState(string deviceId, string deviceModel)
-    {
-        return await _httpClient.GetFromJsonAsync<GoveeApiState>($"{GoveeApiAddress}/devices/state?device={deviceId}&model={deviceModel}");
-    }
-    /// <inheritdoc/>
-    public async Task ToggleState(string deviceId, string deviceModel, bool on)
-    {
-        await SendCommand(deviceId, deviceModel, "turn", on ? "on" : "off");
-    }
-    /// <inheritdoc/>
-    public async Task SetBrightness(string deviceId, string deviceModel, int value)
-    {
-        await SendCommand(deviceId, deviceModel, "brightness", value);
-    }
-    /// <inheritdoc/>
-    public async Task SetColor(string deviceId, string deviceModel, RgbColor color)
-    {
-        await SendCommand(deviceId, deviceModel, "color", color);
-    }
-    /// <inheritdoc/>
-    public async Task SetColorTemp(string deviceId, string deviceModel, int value)
-    {
-        await SendCommand(deviceId, deviceModel, "colorTem", value);
-    }
-
-    private async Task SendCommand(string deviceId, string deviceModel, string command, object commandObject)
-    {
-        var commandRequest = new GoveeApiCommand()
-        {
-            Device = deviceId,
-            Model = deviceModel,
-            Cmd = new Command()
-            {
-                Name = command,
-                Value = commandObject
-            }
-        };
-        var httpContent = new StringContent(JsonSerializer.Serialize(commandRequest, _jsonOptions), Encoding.UTF8, "application/json");
-        var response = await _httpClient.PutAsync($"{GoveeApiAddress}/devices/control", httpContent);
-        if (!response.IsSuccessStatusCode)
-            throw new Exception($"Govee Api Request failed. Status code: {response.StatusCode}, Message: {response.Content}");
-    }
-}
\ No newline at end of file
diff --git a/GoveeCSharpConnector/Services/GoveeHttpService.cs b/GoveeCSharpConnector/Services/GoveeHttpService.cs
new file mode 100644
index 0000000..37012ea
--- /dev/null
+++ b/GoveeCSharpConnector/Services/GoveeHttpService.cs
@@ -0,0 +1,214 @@
+using System.Net.Http.Json;
+using System.Text;
+using System.Text.Json;
+using GoveeCSharpConnector.Interfaces;
+using GoveeCSharpConnector.Objects;
+using GoveeCSharpConnector.Objects.Misc;
+
+namespace GoveeCSharpConnector.Services;
+
+public class GoveeHttpService : IGoveeHttpService
+{
+    private string _apiKey = string.Empty;
+    private const string GoveeApiAddress = "https://openapi.api.govee.com";
+    private const string GoveeDevicesEndpoint = "/router/api/v1/user/devices";
+    private const string GoveeControlEndpoint = "/router/api/v1/device/control";
+    private const string GoveeStateEndpoint = "/router/api/v1/device/state";
+    private readonly HttpClient _httpClient = new();
+    private readonly JsonSerializerOptions? _jsonOptions = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+    };
+
+    public GoveeHttpService()
+    {
+        _httpClient.DefaultRequestHeaders.Add("Content-Type", "application/json");
+    }
+    /// <inheritdoc/>
+    public void SetApiKey(string apiKey)
+    {
+        _apiKey = apiKey;
+        _httpClient.DefaultRequestHeaders.Add("Govee-API-Key", _apiKey);
+    }
+    /// <inheritdoc/>
+    public string GetApiKey()
+    {
+        return _apiKey;
+    }
+    /// <inheritdoc/>
+    public void RemoveApiKey()
+    {
+        _apiKey = string.Empty;
+        _httpClient.DefaultRequestHeaders.Remove("Govee-API-Key");
+    }
+    /// <inheritdoc/>
+    public async Task<ServiceResponse<List<GoveeHttpDevice>>> GetDevices()
+    {
+        var serviceResponse = new ServiceResponse<List<GoveeHttpDevice>>();
+        var response = await _httpClient.GetFromJsonAsync<ApiResponse>($"{GoveeApiAddress}{GoveeDevicesEndpoint}");
+        if (response.Code != 200)
+        {
+            if (response.Code == 429)
+            {
+                serviceResponse.Success = false;
+                serviceResponse.Message = "Api Limit reached! 10000/Account/Day";
+                return serviceResponse;
+            }
+            serviceResponse.Success = false;
+            serviceResponse.Message = response.Message;
+            return serviceResponse;
+        }
+        var allDevices = response.Data.OfType<GoveeHttpDevice>().ToList();
+
+        var devices = (from device in allDevices where device.Capabilities.Exists(x => x.Type == "devices.capabilities.on_off")
+            where device.Capabilities.Exists(x => x.Type == "devices.capabilities.color_setting")
+            where device.Capabilities.Exists(x => x.Type == "devices.capabilities.range")
+            where device.Capabilities.Exists(x => x.Type == "devices.capabilities.dynamic_scene")
+            select device).ToList();
+
+        serviceResponse.Success = true;
+        serviceResponse.Data = devices;
+        serviceResponse.Message = "Request Successful";
+        return serviceResponse;
+    }
+    /// <inheritdoc/>
+    public async Task<ServiceResponse<GoveeHttpState>> GetDeviceState(string deviceId, string deviceModel)
+    {
+        var serviceResponse = new ServiceResponse<GoveeHttpState>();
+
+        var jsonPayload = $@"
+        {{
+            ""requestId"": ""uuid"",
+            ""payload"": {{
+                ""sku"": ""{deviceModel}"",
+                ""device"": ""{deviceId}""
+            }}
+        }}";
+        
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+        var response = await _httpClient.PostAsync($"{GoveeApiAddress}{GoveeStateEndpoint}", content);
+        if (!response.IsSuccessStatusCode)
+        {
+            serviceResponse.Success = false;
+            serviceResponse.Message = response.ReasonPhrase;
+            return serviceResponse;
+        }
+
+        var state = await response.Content.ReadFromJsonAsync<GoveeHttpState>();
+        serviceResponse.Success = true;
+        serviceResponse.Message = "";
+        serviceResponse.Data = state;
+        return serviceResponse;
+    }
+    /// <inheritdoc/>
+    public async Task<ServiceResponse<bool>> SetOnOff(string deviceId, string deviceModel, bool on)
+    {
+        var serviceResponse = new ServiceResponse<bool>();
+
+        var value = "0";
+        if (on)
+        {
+            value = "1";
+        }
+        
+        var jsonPayload = $@"
+        {{
+            ""requestId"": ""uuid"",
+            ""payload"": {{
+                ""sku"": ""{deviceModel}"",
+                ""device"": ""{deviceId}"",
+                ""capability"": {{
+                    ""type"": ""devices.capabilities.on_off"",
+                    ""instance"": ""powerSwitch"",
+                    ""value"": {value}
+                }}
+            }}
+        }}";
+        
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+        var response = await _httpClient.PostAsync($"{GoveeApiAddress}{GoveeStateEndpoint}", content);
+        if (!response.IsSuccessStatusCode)
+        {
+            serviceResponse.Success = false;
+            serviceResponse.Message = response.ReasonPhrase;
+            return serviceResponse;
+        }
+
+        serviceResponse.Success = true;
+        serviceResponse.Message = "";
+        return serviceResponse;
+    }
+    /// <inheritdoc/>
+    public async Task<ServiceResponse<bool>> SetColor(string deviceId, string deviceModel, RgbColor color)
+    {
+        var serviceResponse = new ServiceResponse<bool>();
+
+        var value = ((color.R & 0xFF) << 16) | ((color.G & 0xFF) << 8) | (color.B & 0xFF);
+        
+        var jsonPayload = $@"
+        {{
+            ""requestId"": ""uuid"",
+            ""payload"": {{
+                ""sku"": ""{deviceModel}"",
+                ""device"": ""{deviceId}"",
+                ""capability"": {{
+                    ""type"": ""devices.capabilities.color_setting"",
+                    ""instance"": ""colorRgb"",
+                    ""value"": {value}
+                }}
+            }}
+        }}";
+        
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+        var response = await _httpClient.PostAsync($"{GoveeApiAddress}{GoveeStateEndpoint}", content);
+        if (!response.IsSuccessStatusCode)
+        {
+            serviceResponse.Success = false;
+            serviceResponse.Message = response.ReasonPhrase;
+            return serviceResponse;
+        }
+
+        serviceResponse.Success = true;
+        serviceResponse.Message = "";
+        return serviceResponse;
+    }
+
+    public Task<ServiceResponse<bool>> SetColorTemp(string deviceId, string deviceModel, int value)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public async Task<ServiceResponse<bool>> SetBrightness(string deviceId, string deviceModel, int value)
+    {
+        var serviceResponse = new ServiceResponse<bool>();
+        
+        var jsonPayload = $@"
+        {{
+            ""requestId"": ""uuid"",
+            ""payload"": {{
+                ""sku"": ""{deviceModel}"",
+                ""device"": ""{deviceId}"",
+                ""capability"": {{
+                    ""type"": ""devices.capabilities.range"",
+                    ""instance"": ""brightness"",
+                    ""value"": {value}
+                }}
+            }}
+        }}";
+        
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+        var response = await _httpClient.PostAsync($"{GoveeApiAddress}{GoveeStateEndpoint}", content);
+        if (!response.IsSuccessStatusCode)
+        {
+            serviceResponse.Success = false;
+            serviceResponse.Message = response.ReasonPhrase;
+            return serviceResponse;
+        }
+
+        serviceResponse.Success = true;
+        serviceResponse.Message = "";
+        return serviceResponse;
+    }
+
+}
\ No newline at end of file