a first file was sent by websocket

This commit is contained in:
Paul Schneider 2019-06-25 17:11:16 +01:00
commit 9f4d0b3aef
6 changed files with 86 additions and 35 deletions

View file

@ -49,6 +49,7 @@ namespace cli {
private async Task <int> DoExecute()
{
if (_fileOption.HasValue()){
var fi = new FileInfo(_fileOption.Value());
if (!fi.Exists) {
@ -57,6 +58,7 @@ namespace cli {
}
using (var stream = fi.OpenRead())
{
_logger.LogInformation("DoExecute from given file");
await DoStream(stream);
}
return 0;
@ -65,6 +67,7 @@ namespace cli {
{
using(var stream = Console.OpenStandardInput())
{
_logger.LogInformation("DoExecute from standard input");
await DoStream(stream);
}
return 0;
@ -72,20 +75,39 @@ namespace cli {
}
async Task DoStream (Stream stream)
{
_tokenSource = new CancellationTokenSource();
await _client.ConnectAsync(
new Uri(_cxSettings.StreamingUrl+"/"+_flowIdArg.Value),
_tokenSource.Token);
var url = _cxSettings.StreamingUrl+"/"+_flowIdArg.Value;
_logger.LogInformation("Connecting to "+url);
await _client.ConnectAsync(new Uri(url), _tokenSource.Token);
_logger.LogInformation("Connected");
const int bufLen = Constants.WebSocketsMaxBufLen;
byte [] buffer = new byte[bufLen];
const int offset=0;
int read = 0;
/*
var reciving = Task.Run(async ()=> {
byte [] readbuffer = new byte[bufLen];
var rb = new ArraySegment<byte>(readbuffer, 0, bufLen);
bool continueReading = false;
do {
var result = await _client.ReceiveAsync(rb, _tokenSource.Token);
_logger.LogInformation($"received {result.Count} bytes");
continueReading = !result.CloseStatus.HasValue;
} while (continueReading);
} ); */
do {
read = await stream.ReadAsync(buffer, offset, bufLen);
var segment = new ArraySegment<byte>(buffer, offset, read);
await _client.SendAsync(new ArraySegment<byte>(buffer),
WebSocketMessageType.Binary, false, _tokenSource.Token);
} while (read>0);
bool end = read < bufLen;
await _client.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Binary, end, _tokenSource.Token);
_logger.LogInformation($"sent {read} bytes end:{end} ");
} while (read>0 && stream.CanRead );
// reciving.Wait();
await _client.CloseAsync(WebSocketCloseStatus.NormalClosure, "EOF", _tokenSource.Token);
}
}
}

View file

@ -105,6 +105,8 @@ namespace cli
// calling a Startup sequence
var appBuilder = ConfigureApplication();
var loggerFactory = appBuilder.ApplicationServices.GetRequiredService<ILoggerFactory>();
var cxSettings = appBuilder.ApplicationServices.GetRequiredService<IOptions<ConnectionSettings>>();
var usercxSettings = appBuilder.ApplicationServices.GetRequiredService<IOptions<UserConnectionSettings>>();
CommandOption rootCommandHelpOption = cliapp.HelpOption("-? | -h | --help");
@ -113,6 +115,7 @@ namespace cli
(new AuthCommander(loggerFactory)).Integrate(cliapp);
(new CiBuildCommand()).Integrate(cliapp);
(new GenerationCommander()).Integrate(cliapp);
(new Streamer(loggerFactory, cxSettings, usercxSettings )).Integrate(cliapp);
if (args.Length == 0)
{

View file

@ -3,6 +3,7 @@ namespace cli
using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using Yavsc;
public class ConnectionSettings
{
@ -38,8 +39,8 @@ namespace cli
[NotMapped]
[JsonIgnore]
public string StreamingUrl { get {
return Port==0 ? $"{SiteAccessSheme}://{Authority}/ws":
$"{SiteAccessSheme}://{Authority}:{Port}/ws";
return Port==0 ? $"ws://{Authority}"+Constants.LivePath:
$"ws://{Authority}:{Port}"+Constants.LivePath;
} }
}
}