huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge doubling

This commit is contained in:
Ryan Brandenburg 2019-02-20 16:35:52 -08:00
parent b2ee8e6b66
commit 918f3d3c40
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts
View File

@ -4,8 +4,10 @@
import { Buffer } from "buffer"; import { Buffer } from "buffer";
import * as msgpack5 from "msgpack5"; import * as msgpack5 from "msgpack5";
import { CancelInvocationMessage, CompletionMessage, HubMessage, IHubProtocol, ILogger, InvocationMessage, import {
LogLevel, MessageHeaders, MessageType, NullLogger, StreamInvocationMessage, StreamItemMessage, TransferFormat } from "@aspnet/signalr"; CancelInvocationMessage, CompletionMessage, HubMessage, IHubProtocol, ILogger, InvocationMessage,
LogLevel, MessageHeaders, MessageType, NullLogger, StreamInvocationMessage, StreamItemMessage, TransferFormat
} from "@aspnet/signalr";
import { BinaryMessageFormat } from "./BinaryMessageFormat"; import { BinaryMessageFormat } from "./BinaryMessageFormat";
import { isArrayBuffer } from "./Utils"; import { isArrayBuffer } from "./Utils";
@ -267,13 +269,6 @@ export class MessagePackHubProtocol implements IHubProtocol {
return BinaryMessageFormat.write(payload.slice()); return BinaryMessageFormat.write(payload.slice());
} }
private writeCancelInvocation(cancelInvocationMessage: CancelInvocationMessage): ArrayBuffer {
const msgpack = msgpack5();
const payload = msgpack.encode([MessageType.CancelInvocation, cancelInvocationMessage.headers || {}, cancelInvocationMessage.invocationId]);
return BinaryMessageFormat.write(payload.slice());
}
private readHeaders(properties: any): MessageHeaders { private readHeaders(properties: any): MessageHeaders {
const headers: MessageHeaders = properties[1] as MessageHeaders; const headers: MessageHeaders = properties[1] as MessageHeaders;
if (typeof headers !== "object") { if (typeof headers !== "object") {