Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-27 05:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close websocket if request times out

Browse Source
This commit is contained in:
trevor-signal
2024-04-18 13:16:05 -04:00
committed by GitHub
parent 187fe08816
commit d31a4d5d91
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ts/textsecure/WebsocketResources.ts
View File

@@ -656,13 +656,10 @@ export default class WebSocketResource
strictAssert(!this.shuttingDown, 'Cannot send request, shutting down');
this.addActive(idString);
const promise = new Promise<SendRequestResult>((resolve, reject) => {
const sentAt = Date.now();
let timedOut = false;
let timer = options.timeout
? Timers.setTimeout(() => {
timedOut = true;
this.removeActive(idString);
this.close(3001, 'Request timed out');
reject(new Error(`Request timed out; id: [${idString}]`));
}, options.timeout)
: undefined;
@@ -672,16 +669,8 @@ export default class WebSocketResource
Timers.clearTimeout(timer);
timer = undefined;
}
if (timedOut) {
log.warn(
`${this.logId}: Response received after timeout; ` +
`id: [${idString}], path: [${options.path}], ` +
`response time: ${Date.now() - sentAt}ms`
);
} else {
// Reset keepalive when an on-time response arrives
this.keepalive?.reset();
}
this.keepalive?.reset();
this.removeActive(idString);
resolve(result);
});