meshcore-dev/meshcore.js
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore.js.git synced 2026-04-20 22:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

clear timeouts on success or error for repeater login and status requests

Browse source
This commit is contained in:
liamcottle 2025-04-08 14:05:21 +12:00
parent 0544dbb805
commit db5e5bd76f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/connection/connection.js
View file

@ -1363,6 +1363,7 @@ class Connection extends EventEmitter {
const publicKeyPrefix = contactPublicKey.subarray(0, 6); const publicKeyPrefix = contactPublicKey.subarray(0, 6);
// listen for sent response so we can get estimated timeout // listen for sent response so we can get estimated timeout
var timeoutHandler = null;
const onSent = (response) => { const onSent = (response) => {
// remove error listener since we received sent response // remove error listener since we received sent response
@ -1370,7 +1371,7 @@ class Connection extends EventEmitter {
// reject login request as timed out after estimated delay, plus a bit extra // reject login request as timed out after estimated delay, plus a bit extra
const estTimeout = response.estTimeout + extraTimeoutMillis; const estTimeout = response.estTimeout + extraTimeoutMillis;
setTimeout(() => { timeoutHandler = setTimeout(() => {
reject("timeout"); reject("timeout");
}, estTimeout); }, estTimeout);
@ -1386,6 +1387,7 @@ class Connection extends EventEmitter {
} }
// login successful // login successful
clearTimeout(timeoutHandler);
this.off(Constants.ResponseCodes.Err, onErr); this.off(Constants.ResponseCodes.Err, onErr);
this.off(Constants.ResponseCodes.Sent, onSent); this.off(Constants.ResponseCodes.Sent, onSent);
this.off(Constants.PushCodes.LoginSuccess, onLoginSuccess); this.off(Constants.PushCodes.LoginSuccess, onLoginSuccess);
@ -1395,6 +1397,7 @@ class Connection extends EventEmitter {
// reject promise when we receive err // reject promise when we receive err
const onErr = () => { const onErr = () => {
clearTimeout(timeoutHandler);
this.off(Constants.ResponseCodes.Err, onErr); this.off(Constants.ResponseCodes.Err, onErr);
this.off(Constants.ResponseCodes.Sent, onSent); this.off(Constants.ResponseCodes.Sent, onSent);
this.off(Constants.PushCodes.LoginSuccess, onLoginSuccess); this.off(Constants.PushCodes.LoginSuccess, onLoginSuccess);
@ -1423,6 +1426,7 @@ class Connection extends EventEmitter {
const publicKeyPrefix = contactPublicKey.subarray(0, 6); const publicKeyPrefix = contactPublicKey.subarray(0, 6);
// listen for sent response so we can get estimated timeout // listen for sent response so we can get estimated timeout
var timeoutHandler = null;
const onSent = (response) => { const onSent = (response) => {
// remove error listener since we received sent response // remove error listener since we received sent response
@ -1430,7 +1434,7 @@ class Connection extends EventEmitter {
// reject login request as timed out after estimated delay, plus a bit extra // reject login request as timed out after estimated delay, plus a bit extra
const estTimeout = response.estTimeout + extraTimeoutMillis; const estTimeout = response.estTimeout + extraTimeoutMillis;
setTimeout(() => { timeoutHandler = setTimeout(() => {
reject("timeout"); reject("timeout");
}, estTimeout); }, estTimeout);
@ -1446,6 +1450,7 @@ class Connection extends EventEmitter {
} }
// status request successful // status request successful
clearTimeout(timeoutHandler);
this.off(Constants.ResponseCodes.Err, onErr); this.off(Constants.ResponseCodes.Err, onErr);
this.off(Constants.ResponseCodes.Sent, onSent); this.off(Constants.ResponseCodes.Sent, onSent);
this.off(Constants.PushCodes.StatusResponse, onStatusResponsePush); this.off(Constants.PushCodes.StatusResponse, onStatusResponsePush);
@ -1477,6 +1482,7 @@ class Connection extends EventEmitter {
// reject promise when we receive err // reject promise when we receive err
const onErr = () => { const onErr = () => {
clearTimeout(timeoutHandler);
this.off(Constants.ResponseCodes.Err, onErr); this.off(Constants.ResponseCodes.Err, onErr);
this.off(Constants.ResponseCodes.Sent, onSent); this.off(Constants.ResponseCodes.Sent, onSent);
this.off(Constants.PushCodes.StatusResponse, onStatusResponsePush); this.off(Constants.PushCodes.StatusResponse, onStatusResponsePush);