FarmMaps/FarmMapsApiClient
11
0
Fork 3
Code Issues Pull Requests Releases Activity

Seperated eventhub service from api service.

Browse Source 
wip nbs flow.
Changed uploading a bit.
This commit is contained in:
Mark van der Wal 2020-03-25 21:32:28 +01:00
parent e638370ad4
commit 691be2185e
11 changed files with 151 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FarmmapsApi/Extensions.cs
View File

@ -23,12 +23,13 @@ namespace FarmmapsApi
return new DiscoveryCache(configuration.DiscoveryEndpointUrl,
() => httpFactory.CreateClient());
})
.AddSingleton<HttpClientSettings>()
.AddSingleton<FarmmapsEventHub>()
.AddTransient<OpenIdConnectService>()
.AddTransient<FarmmapsAuthenticationHandler>()
.AddHttpClient<FarmmapsApiService>()
.AddHttpMessageHandler<FarmmapsAuthenticationHandler>()
.Services;
;
}
public static async Task PollTask(TimeSpan retryTime, Func<CancellationTokenSource, Task> callback)

6
FarmmapsApi/HttpMessageHandlers/FarmmapsAuthenticationHandler.cs
View File

@ -10,12 +10,12 @@ namespace FarmmapsApi.HttpMessageHandlers
{
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
if (!request.Headers.Authorization.Scheme.Equals(OidcConstants.AuthenticationSchemes.AuthorizationHeaderBearer) ||
string.IsNullOrEmpty(request.Headers.Authorization.Parameter))
if (!OidcConstants.AuthenticationSchemes.AuthorizationHeaderBearer.Equals(request.Headers?.Authorization.Scheme) ||
string.IsNullOrEmpty(request.Headers?.Authorization.Parameter))
{
return new HttpResponseMessage(HttpStatusCode.Unauthorized)
{
Content = new StringContent("You must authenticate before using the API")
Content = new StringContent("You must authenticated before using the API")
};
}
return await base.SendAsync(request, cancellationToken);

7
FarmmapsApi/Models/HttpClientSettings.cs Normal file
View File

@ -0,0 +1,7 @@
namespace FarmmapsApi.Models
{
public class HttpClientSettings
{
public string BearerToken { get; set; }
}
}

18
FarmmapsApi/Models/UploadResults.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
using Google.Apis.Upload;
namespace FarmmapsApi.Models
{
public class UploadResults
{
public IUploadProgress Progress { get; }
public Uri Location { get; }
public UploadResults(IUploadProgress progress, Uri location)
{
Progress = progress;
Location = location;
}
}
}

1
FarmmapsApi/ResourceEndpoints.cs
View File

@ -8,6 +8,7 @@ namespace FarmmapsApi
public const string ITEMS_RESOURCE = "items/{0}";
public const string ITEMS_CREATE_RESOURCE = "items";
public const string ITEMS_DOWNLOAD_RESOURCE = "items/{0}/download";
public const string ITEMS_UPLOAD_RESOURCE = "api/v1/file";
public const string ITEMS_CHILDREN_RESOURCE = "items/{0}/children";
public const string ITEMS_DELETE_RESOURCE = "items/delete";

74
FarmmapsApi/Services/FarmmapsApiService.cs
View File

@ -13,9 +13,6 @@ using FarmmapsApi.Models;
using Google.Apis.Http;
using Google.Apis.Upload;
using IdentityModel;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Winista.Mime;
@ -24,23 +21,28 @@ namespace FarmmapsApi.Services
{
public class FarmmapsApiService
{
private readonly Configuration _configuration;
private readonly HttpClientSettings _httpClientSettings;
private readonly HttpClient _httpClient;
private readonly OpenIdConnectService _openIdConnectService;
private readonly Configuration _configuration;
private HubConnection _hubConnection;
public event Action<EventMessage> EventCallback;
public FarmmapsApiService(HttpClient httpClient,
public FarmmapsApiService(HttpClientSettings httpClientSettings, HttpClient httpClient,
OpenIdConnectService openIdConnectService, Configuration configuration)
{
_configuration = configuration;
_httpClientSettings = httpClientSettings;
_httpClient = httpClient;
_openIdConnectService = openIdConnectService;
_configuration = configuration;
_httpClient.BaseAddress = new Uri(configuration.Endpoint);
_httpClient.DefaultRequestHeaders.Add("Accept", MediaTypeNames.Application.Json);
if (!string.IsNullOrEmpty(_httpClientSettings.BearerToken))
{
_httpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue(OidcConstants.AuthenticationSchemes.AuthorizationHeaderBearer,
_httpClientSettings.BearerToken);
}
}
public async Task AuthenticateAsync()
@ -57,33 +59,10 @@ namespace FarmmapsApi.Services
if (token.IsError)
throw new AuthenticationException(token.Error);
_httpClientSettings.BearerToken = token.AccessToken;
_httpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue(OidcConstants.AuthenticationSchemes.AuthorizationHeaderBearer,
token.AccessToken);
await StartEventHub(token.AccessToken);
}
private async Task StartEventHub(string accessToken)
{
var eventEndpoint = $"{_configuration.Endpoint}/EventHub";
_hubConnection = new HubConnectionBuilder()
.WithUrl(eventEndpoint, HttpTransportType.WebSockets,
options => options.SkipNegotiation = true)
.ConfigureLogging(log => log.AddConsole())
.WithAutomaticReconnect()
.Build();
await _hubConnection.StartAsync();
await AuthenticateEventHub(accessToken);
_hubConnection.Reconnected += async s => await AuthenticateEventHub(accessToken);
_hubConnection.On("event", (EventMessage eventMessage) => EventCallback?.Invoke(eventMessage));
}
private async Task AuthenticateEventHub(string accessToken)
{
await _hubConnection.SendAsync("authenticate", accessToken);
}
public async Task<string> GetCurrentUserCodeAsync()
@ -301,10 +280,11 @@ namespace FarmmapsApi.Services
/// </summary>
/// <param name="filePath"></param>
/// <param name="parentItemCode"></param>
/// <param name="uploadCallback"></param>
/// <param name="progressCallback"></param>
/// <returns></returns>
/// <exception cref="FileNotFoundException"></exception>
public async Task<Uri> UploadFile(string filePath, string parentItemCode, Action<IUploadProgress> uploadCallback)
public async Task<UploadResults> UploadFile(string filePath, string parentItemCode,
Action<IUploadProgress> progressCallback = null)
{
if (!File.Exists(filePath))
throw new FileNotFoundException($"File not found {filePath}");
@ -321,16 +301,17 @@ namespace FarmmapsApi.Services
Size = uploadStream.Length
};
Uri uploadIdentifierUri = null;
using var httpClient = CreateConfigurableHttpClient(_httpClient);
var farmmapsUploader = new FarmmapsUploader(httpClient, uploadStream, request, mimeType.ToString());
var farmmapsUploader = new FarmmapsUploader(httpClient, uploadStream, request,
mimeType.ToString(), ResourceEndpoints.ITEMS_UPLOAD_RESOURCE);
farmmapsUploader.ProgressChanged += uploadCallback;
farmmapsUploader.UploadSessionData += data => uploadIdentifierUri = data.UploadUri;
Uri location = null;
farmmapsUploader.ProgressChanged += progressCallback;
farmmapsUploader.UploadSessionData += data => location = data.UploadUri;
await farmmapsUploader.UploadAsync();
var progress = await farmmapsUploader.UploadAsync();
return uploadIdentifierUri;
return new UploadResults(progress, location);
}
/// <summary>
@ -356,7 +337,8 @@ namespace FarmmapsApi.Services
};
using var httpClient = CreateConfigurableHttpClient(_httpClient);
var farmmapsUploader = new FarmmapsUploader(httpClient, uploadStream, request, string.Empty);
var farmmapsUploader = new FarmmapsUploader(httpClient, uploadStream,
request, string.Empty, ResourceEndpoints.ITEMS_UPLOAD_RESOURCE);
farmmapsUploader.ProgressChanged += uploadCallback;
await farmmapsUploader.ResumeAsync(location);
@ -366,12 +348,14 @@ namespace FarmmapsApi.Services
private ConfigurableHttpClient CreateConfigurableHttpClient(HttpClient parent)
{
var googleHttpClient = new HttpClientFactory().CreateHttpClient(new CreateHttpClientArgs {GZipEnabled = true, ApplicationName = "FarmMaps"});
var googleHttpClient = new HttpClientFactory().CreateHttpClient(new CreateHttpClientArgs
{GZipEnabled = true, ApplicationName = "FarmMaps"});
googleHttpClient.BaseAddress = parent.BaseAddress;
googleHttpClient.DefaultRequestHeaders.Add("Accept", MediaTypeNames.Application.Json);
var authHeader = parent.DefaultRequestHeaders.Authorization;
googleHttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(authHeader.Scheme, authHeader.Parameter);
googleHttpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue(authHeader.Scheme, authHeader.Parameter);
return googleHttpClient;
}

45
FarmmapsApi/Services/FarmmapsEventHub.cs Normal file
View File

@ -0,0 +1,45 @@
using System;
using System.Threading.Tasks;
using FarmmapsApi.Models;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
namespace FarmmapsApi.Services
{
public class FarmmapsEventHub
{
private readonly Configuration _configuration;
private readonly HttpClientSettings _httpClientSettings;
private HubConnection _hubConnection;
public event Action<EventMessage> EventCallback;
public FarmmapsEventHub(HttpClientSettings httpClientSettings, Configuration configuration)
{
_httpClientSettings = httpClientSettings;
_configuration = configuration;
}
public async Task StartEventHub()
{
if(_hubConnection != null)
throw new Exception("EventHub already started");
var eventEndpoint = $"{_configuration.Endpoint}/EventHub";
_hubConnection = new HubConnectionBuilder()
.WithUrl(eventEndpoint, HttpTransportType.WebSockets,
options => options.SkipNegotiation = true)
.ConfigureLogging(log => log.AddConsole())
.WithAutomaticReconnect()
.Build();
await _hubConnection.StartAsync();
await _hubConnection.SendAsync("authenticate", _httpClientSettings.BearerToken);
_hubConnection.Reconnected += async s => await _hubConnection.SendAsync("authenticate", _httpClientSettings.BearerToken);
_hubConnection.On("Event", (EventMessage eventMessage) => EventCallback?.Invoke(eventMessage));
}
}
}

7
FarmmapsApi/Services/FarmmapsUploader.cs
View File

@ -55,7 +55,7 @@ namespace FarmmapsApi.Services
/// completed.
/// Caller is responsible for closing the <paramref name="contentStream"/>.
/// </remarks>
public FarmmapsUploader(ConfigurableHttpClient httpClient, Stream contentStream, FileRequest body, string contentType)
public FarmmapsUploader(ConfigurableHttpClient httpClient, Stream contentStream, FileRequest body, string contentType, string path)
: base(contentStream,
new ResumableUploadOptions
{
@ -69,9 +69,12 @@ namespace FarmmapsApi.Services
_streamLength = ContentStream.CanSeek ? ContentStream.Length : UnknownSize;
var twoMB = 2 * 0x100000;
ChunkSize = twoMB;
body.ChunkSize = ChunkSize;
Body = body;
Path = "api/v1/file";
Path = path;
HttpClient = httpClient;
HttpMethod = HttpConsts.Post;
ContentType = contentType;

1
FarmmapsApiSamples/Constants.cs
View File

@ -5,6 +5,7 @@ namespace FarmmapsApiSamples
public const string USERINPUT_ITEMTYPE = "vnd.farmmaps.itemtype.user.input";
public const string GEOTIFF_ITEMTYPE = "vnd.farmmaps.itemtype.geotiff";
public const string CROPFIELD_ITEMTYPE = "vnd.farmmaps.itemtype.cropfield";
public const string SHAPE_PROCESSED_ITEMTYPE = "vnd.farmmaps.itemtype.shape.processed";
public const string VRANBS_TASK = "vnd.farmmaps.task.vranbs";
}
}

43
FarmmapsApiSamples/NbsApp.cs
View File

@ -15,48 +15,59 @@ namespace FarmmapsApiSamples
{
private readonly ILogger<NbsApp> _logger;
private readonly FarmmapsApiService _farmmapsApiService;
private readonly FarmmapsEventHub _farmmapsEventHub;
private readonly NitrogenService _nitrogenService;
public NbsApp(ILogger<NbsApp> logger, FarmmapsApiService farmmapsApiService,
NitrogenService nitrogenService)
FarmmapsEventHub farmmapsEventHub, NitrogenService nitrogenService)
{
_logger = logger;
_farmmapsApiService = farmmapsApiService;
_farmmapsEventHub = farmmapsEventHub;
_nitrogenService = nitrogenService;
farmmapsApiService.EventCallback += OnEvent;
_farmmapsEventHub.EventCallback += OnEvent;
}
private void OnEvent(EventMessage @event)
{
_logger.LogInformation(@event.EventType);
// _logger.LogInformation(@event.EventType);
}
public async Task RunAsync()
{
try
{
_logger.LogInformation("NBS sample app started");
await _farmmapsApiService.AuthenticateAsync();
_logger.LogInformation("Authenticated client credentials");
var roots = await _farmmapsApiService.GetCurrentUserRootsAsync();
// upload data to Uploaded
var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded");
if (uploadedRoot != null)
{
await _farmmapsApiService.UploadFile(Path.Combine("Data", "Scan_1_20190605.zip"), uploadedRoot.Code,
progress =>
{
_logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}");
if (progress.Status == UploadStatus.Failed)
_logger.LogError($"Uploading failed {progress.Exception.Message}");
});
var dataPath = Path.Combine("Data", "Scan_1_20190605.zip");
var result = await _farmmapsApiService.UploadFile(dataPath, uploadedRoot.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
{
_logger.LogError($"Uploading failed {result.Progress.Exception.Message}");
return;
}
// find file we need to use, we use delay as hack until events work correctly
// await Task.Delay(10000);
// var isariaDataFilter = JObject.Parse(@"");
// var uploadedFilesChildren = await
// _farmmapsApiService.GetItemChildrenAsync(uploadedRoot.Code, SHAPE_PROCESSED_ITEMTYPE);
// need to transform shape data to geotiff
// var shapeToGeotiffRequest = new TaskRequest()
// {
// TaskType = "vnd.farmmaps.task.shapetogeotiff"
// };
// var taskCode = await _farmmapsApiService.QueueTaskAsync(, shapeToGeotiffRequest);
var myDriveRoot = roots.SingleOrDefault(r => r.Name == "My drive");
if (myDriveRoot != null)

13
FarmmapsApiSamples/Program.cs
View File

@ -1,10 +1,11 @@
using System.Threading.Tasks;
using System;
using System.Threading.Tasks;
using FarmmapsApi;
using FarmmapsApi.Models;
using FarmmapsApi.Services;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console;
namespace FarmmapsApiSamples
{
@ -20,17 +21,15 @@ namespace FarmmapsApiSamples
var serviceProvider = new ServiceCollection()
.AddLogging(opts => opts
.AddConsole(c =>
{
c.IncludeScopes = false;
c.Format = ConsoleLoggerFormat.Default;
})
.AddConsole()
.AddFilter("System.Net.Http", LogLevel.Warning))
.AddFarmmapsServices(configuration)
.AddTransient<NitrogenService>()
.AddSingleton<IApp, NbsApp>()
.BuildServiceProvider();
await serviceProvider.GetService<FarmmapsApiService>().AuthenticateAsync();
await serviceProvider.GetService<FarmmapsEventHub>().StartEventHub();
await serviceProvider.GetService<IApp>().RunAsync();
}
}