mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Import log instead of using it off of window

Browse source
This commit is contained in:
Josh Perez 2021-09-17 14:27:53 -04:00 • committed by GitHub
parent 8eb0dd3116
commit 65ddf0a9e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
155 changed files with 3654 additions and 3433 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ts/textsecure/WebsocketResources.ts
View file

@ -34,6 +34,7 @@ import { strictAssert } from '../util/assert';
import { normalizeNumber } from '../util/normalizeNumber';
import * as Errors from '../types/errors';
import { SignalService as Proto } from '../protobuf';
import * as log from '../logging/log';
const THIRTY_SECONDS = 30 * durations.SECOND;
@ -143,7 +144,7 @@ export default class WebSocketResource extends EventTarget {
socket.on('message', () => keepalive.reset());
socket.on('close', () => keepalive.stop());
socket.on('error', (error: Error) => {
window.log.warn(
log.warn(
'WebSocketResource: WebSocket error',
Errors.toLogFormat(error)
);
@ -153,7 +154,7 @@ export default class WebSocketResource extends EventTarget {
socket.on('close', (code, reason) => {
this.closed = true;
window.log.warn('WebSocketResource: Socket closed');
log.warn('WebSocketResource: Socket closed');
this.dispatchEvent(new CloseEvent(code, reason || 'normal'));
});
@ -231,7 +232,7 @@ export default class WebSocketResource extends EventTarget {
return;
}
window.log.info('WebSocketResource.close()');
log.info('WebSocketResource.close()');
if (this.keepalive) {
this.keepalive.stop();
}
@ -248,9 +249,7 @@ export default class WebSocketResource extends EventTarget {
return;
}
window.log.warn(
'WebSocketResource: Dispatching our own socket close event'
);
log.warn('WebSocketResource: Dispatching our own socket close event');
this.dispatchEvent(new CloseEvent(code, reason || 'normal'));
}, 5000);
}
@ -261,20 +260,20 @@ export default class WebSocketResource extends EventTarget {
}
if (this.activeRequests.size === 0) {
window.log.info('WebSocketResource: no active requests, closing');
log.info('WebSocketResource: no active requests, closing');
this.close(3000, 'Shutdown');
return;
}
this.shuttingDown = true;
window.log.info('WebSocketResource: shutting down');
log.info('WebSocketResource: shutting down');
this.shutdownTimer = setTimeout(() => {
if (this.closed) {
return;
}
window.log.warn('WebSocketResource: Failed to shutdown gracefully');
log.warn('WebSocketResource: Failed to shutdown gracefully');
this.close(3000, 'Shutdown');
}, THIRTY_SECONDS);
}
@ -357,7 +356,7 @@ export default class WebSocketResource extends EventTarget {
private removeActive(request: IncomingWebSocketRequest | number): void {
if (!this.activeRequests.has(request)) {
window.log.warn('WebSocketResource: removing unknown request');
log.warn('WebSocketResource: removing unknown request');
return;
}
@ -374,7 +373,7 @@ export default class WebSocketResource extends EventTarget {
this.shutdownTimer = undefined;
}
window.log.info('WebSocketResource: shutdown complete');
log.info('WebSocketResource: shutdown complete');
this.close(3000, 'Shutdown');
}
}
@ -422,7 +421,7 @@ class KeepAlive {
this.clearTimers();
if (isOlderThan(this.lastAliveAt, MAX_KEEPALIVE_INTERVAL_MS)) {
window.log.info('WebSocketResources: disconnecting due to stale state');
log.info('WebSocketResources: disconnecting due to stale state');
this.wsr.close(
3001,
`Last keepalive request was too far in the past: ${this.lastAliveAt}`
@ -433,7 +432,7 @@ class KeepAlive {
if (this.disconnect) {
// automatically disconnect if server doesn't ack
this.disconnectTimer = setTimeout(() => {
window.log.info('WebSocketResources: disconnecting due to no response');
log.info('WebSocketResources: disconnecting due to no response');
this.clearTimers();
this.wsr.close(3001, 'No response to keepalive request');
@ -442,7 +441,7 @@ class KeepAlive {
this.reset();
}
window.log.info('WebSocketResources: Sending a keepalive message');
log.info('WebSocketResources: Sending a keepalive message');
const { status } = await this.wsr.sendRequest({
verb: 'GET',
path: this.path,