Remove format from connect and only use it in /send
This commit is contained in:
parent
3bba46d4d3
commit
3d5fc9493a
|
|
@ -27,7 +27,7 @@ connection.start();
|
||||||
document.getElementById('sendmessage').addEventListener('submit', event => {
|
document.getElementById('sendmessage').addEventListener('submit', event => {
|
||||||
let data = document.getElementById('new-message').value;
|
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');
|
var child = document.createElement('li');
|
||||||
child.style.color = 'red';
|
child.style.color = 'red';
|
||||||
child.innerText = err;
|
child.innerText = err;
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
|
||||||
private async Task WriteAsync(Connection connection, byte[] data)
|
private async Task WriteAsync(Connection connection, byte[] data)
|
||||||
{
|
{
|
||||||
var buffer = ReadableBuffer.Create(data).Preserve();
|
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())
|
while (await connection.Transport.Output.WaitToWriteAsync())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.SignalR
|
||||||
await invocationAdapter.WriteMessageAsync(invocation, stream);
|
await invocationAdapter.WriteMessageAsync(invocation, stream);
|
||||||
|
|
||||||
var buffer = ReadableBuffer.Create(stream.ToArray()).Preserve();
|
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())
|
while (await connection.Transport.Output.WaitToWriteAsync())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ namespace Microsoft.AspNetCore.SignalR
|
||||||
await invocationAdapter.WriteMessageAsync(result, outStream);
|
await invocationAdapter.WriteMessageAsync(result, outStream);
|
||||||
|
|
||||||
var buffer = ReadableBuffer.Create(outStream.ToArray()).Preserve();
|
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())
|
while (await connection.Transport.Output.WaitToWriteAsync())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,6 @@ namespace Microsoft.AspNetCore.Sockets
|
||||||
{
|
{
|
||||||
private ConcurrentDictionary<object, object> _metadata = new ConcurrentDictionary<object, object>();
|
private ConcurrentDictionary<object, object> _metadata = new ConcurrentDictionary<object, object>();
|
||||||
|
|
||||||
public Format Format { get; set; } = Format.Text;
|
|
||||||
|
|
||||||
public object this[object key]
|
public object this[object key]
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,6 @@ namespace Microsoft.AspNetCore.Sockets
|
||||||
{
|
{
|
||||||
state.Connection.User = context.User;
|
state.Connection.User = context.User;
|
||||||
state.Connection.Metadata["transport"] = transport;
|
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
|
// TODO: this is wrong. + how does the user add their own metadata based on HttpContext
|
||||||
var formatType = (string)context.Request.Query["formatType"];
|
var formatType = (string)context.Request.Query["formatType"];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue