Add PiShockHttp
Change order of instructor variables for HttpShockers Add default Endpoints for OpenShock and PiShock
This commit is contained in:
parent
a6e2bef231
commit
895f8c528d
@ -7,7 +7,7 @@
|
|||||||
<Authors>Glax</Authors>
|
<Authors>Glax</Authors>
|
||||||
<RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
|
<RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<Version>1.1.11</Version>
|
<Version>1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -45,7 +45,7 @@ public class OpenShockHttp : HttpShocker
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public OpenShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, ShockerApi.OpenShockHttp, logger)
|
public OpenShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string endpoint = "https://api.shocklink.net", ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, ShockerApi.OpenShockHttp, logger)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,6 @@
|
|||||||
using CShocker.Ranges;
|
using System.Net.Http.Headers;
|
||||||
|
using System.Text;
|
||||||
|
using CShocker.Ranges;
|
||||||
using CShocker.Shockers.Abstract;
|
using CShocker.Shockers.Abstract;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
@ -6,13 +8,44 @@ namespace CShocker.Shockers.APIS;
|
|||||||
|
|
||||||
public class PiShockHttp : HttpShocker
|
public class PiShockHttp : HttpShocker
|
||||||
{
|
{
|
||||||
public PiShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, ShockerApi.PiShockHttp, logger)
|
public String Username, ShareCode;
|
||||||
|
public PiShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string username, string shareCode, string endpoint = "https://do.pishock.com/api/apioperate", ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, ShockerApi.PiShockHttp, logger)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
this.Username = username;
|
||||||
|
this.ShareCode = shareCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
|
protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
HttpRequestMessage request = new (HttpMethod.Post, $"{Endpoint}")
|
||||||
|
{
|
||||||
|
Headers =
|
||||||
|
{
|
||||||
|
UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
|
||||||
|
Accept = { new MediaTypeWithQualityHeaderValue("text/plain") }
|
||||||
|
},
|
||||||
|
Content = new StringContent("{" +
|
||||||
|
$"\"Username\":\"{Username}\"," +
|
||||||
|
"\"Name\":\"CShocker\"," +
|
||||||
|
$"\"Code\":\"{ShareCode}\"," +
|
||||||
|
$"\"Intensity\":\"{intensity}\"," +
|
||||||
|
$"\"Duration\":\"{duration/1000}\"," + //duration is in seconds no ms
|
||||||
|
$"\"Apikey\":\"{ApiKey}\"," +
|
||||||
|
$"\"Op\":\"{ControlActionToByte(action)}\"" +
|
||||||
|
"}", Encoding.UTF8, new MediaTypeHeaderValue("application/json"))
|
||||||
|
};
|
||||||
|
HttpResponseMessage response = HttpClient.Send(request);
|
||||||
|
this.Logger?.Log(LogLevel.Debug, $"{request.RequestUri} response: {response.StatusCode} {response.Content.ReadAsStringAsync()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte ControlActionToByte(ControlAction action)
|
||||||
|
{
|
||||||
|
return action switch
|
||||||
|
{
|
||||||
|
ControlAction.Beep => 2,
|
||||||
|
ControlAction.Vibrate => 1,
|
||||||
|
ControlAction.Shock => 0,
|
||||||
|
_ => 2
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -9,7 +9,7 @@ public abstract class HttpShocker : Shocker
|
|||||||
public string Endpoint { get; init; }
|
public string Endpoint { get; init; }
|
||||||
public string ApiKey { get; init; }
|
public string ApiKey { get; init; }
|
||||||
|
|
||||||
protected HttpShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ShockerApi apiType, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiType, logger)
|
protected HttpShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string endpoint, ShockerApi apiType, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiType, logger)
|
||||||
{
|
{
|
||||||
Endpoint = endpoint;
|
Endpoint = endpoint;
|
||||||
ApiKey = apiKey;
|
ApiKey = apiKey;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user