Remove format from connect and only use it in /send

This commit is contained in:
BrennanConroy 2017-01-11 16:17:38 -08:00
parent 3bba46d4d3
commit 3d5fc9493a
6 changed files with 4 additions and 7 deletions

View File

@ -27,7 +27,7 @@ connection.start();
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('new-message').value;
connection.invoke('Send', data, 'json').catch(err => {
connection.invoke('Send', data).catch(err => {
var child = document.createElement('li');
child.style.color = 'red';
child.innerText = err;

View File

@ -278,7 +278,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
private async Task WriteAsync(Connection connection, byte[] data)
{
var buffer = ReadableBuffer.Create(data).Preserve();
var message = new Message(buffer, connection.Metadata.Format, endOfMessage: true);
var message = new Message(buffer, Format.Text, endOfMessage: true);
while (await connection.Transport.Output.WaitToWriteAsync())
{

View File

@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.SignalR
await invocationAdapter.WriteMessageAsync(invocation, stream);
var buffer = ReadableBuffer.Create(stream.ToArray()).Preserve();
var message = new Message(buffer, connection.Metadata.Format, endOfMessage: true);
var message = new Message(buffer, Format.Text, endOfMessage: true);
while (await connection.Transport.Output.WaitToWriteAsync())
{

View File

@ -191,7 +191,7 @@ namespace Microsoft.AspNetCore.SignalR
await invocationAdapter.WriteMessageAsync(result, outStream);
var buffer = ReadableBuffer.Create(outStream.ToArray()).Preserve();
var outMessage = new Message(buffer, connection.Metadata.Format, endOfMessage: true);
var outMessage = new Message(buffer, Format.Text, endOfMessage: true);
while (await connection.Transport.Output.WaitToWriteAsync())
{

View File

@ -10,8 +10,6 @@ namespace Microsoft.AspNetCore.Sockets
{
private ConcurrentDictionary<object, object> _metadata = new ConcurrentDictionary<object, object>();
public Format Format { get; set; } = Format.Text;
public object this[object key]
{
get

View File

@ -153,7 +153,6 @@ namespace Microsoft.AspNetCore.Sockets
{
state.Connection.User = context.User;
state.Connection.Metadata["transport"] = transport;
state.Connection.Metadata.Format = format;
// TODO: this is wrong. + how does the user add their own metadata based on HttpContext
var formatType = (string)context.Request.Query["formatType"];