Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit d367bdc

Browse files
authored
Remove message content from JS client logging (#1694)
1 parent a47e105 commit d367bdc

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

clients/ts/signalr/src/HubConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class HubConnection {
9595
this.connection.stop(message.error ? new Error("Server returned an error on close: " + message.error) : null);
9696
break;
9797
default:
98-
this.logger.log(LogLevel.Warning, "Invalid message type: " + data);
98+
this.logger.log(LogLevel.Warning, "Invalid message type: " + message.type);
9999
break;
100100
}
101101
}

clients/ts/signalr/src/Transports.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class WebSocketTransport implements ITransport {
7171
};
7272

7373
webSocket.onmessage = (message: MessageEvent) => {
74-
this.logger.log(LogLevel.Trace, `(WebSockets transport) data received: ${message.data}`);
74+
this.logger.log(LogLevel.Trace, `(WebSockets transport) data received. Length ${getDataLength(message.data)}.`);
7575
if (this.onreceive) {
7676
this.onreceive(message.data);
7777
}
@@ -151,7 +151,7 @@ export class ServerSentEventsTransport implements ITransport {
151151
eventSource.onmessage = (e: MessageEvent) => {
152152
if (this.onreceive) {
153153
try {
154-
this.logger.log(LogLevel.Trace, `(SSE transport) data received: ${e.data}`);
154+
this.logger.log(LogLevel.Trace, `(SSE transport) data received. Length ${getDataLength(e.data)}.`);
155155
this.onreceive(e.data);
156156
} catch (error) {
157157
if (this.onclose) {
@@ -276,7 +276,7 @@ export class LongPollingTransport implements ITransport {
276276
} else {
277277
// Process the response
278278
if (response.content) {
279-
this.logger.log(LogLevel.Trace, `(LongPolling transport) data received: ${response.content}`);
279+
this.logger.log(LogLevel.Trace, `(LongPolling transport) data received. Length ${getDataLength(response.content)}.`);
280280
if (this.onreceive) {
281281
this.onreceive(response.content);
282282
}
@@ -313,6 +313,16 @@ export class LongPollingTransport implements ITransport {
313313
public onclose: TransportClosed;
314314
}
315315

316+
function getDataLength(data: any): number {
317+
let length: number = null;
318+
if (data instanceof ArrayBuffer) {
319+
length = data.byteLength;
320+
} else if (data instanceof String) {
321+
length = data.length;
322+
}
323+
return length;
324+
}
325+
316326
async function send(httpClient: HttpClient, url: string, accessTokenFactory: () => string, content: string | ArrayBuffer): Promise<void> {
317327
let headers;
318328
const token = accessTokenFactory();

0 commit comments

Comments
 (0)