From 9242c474bdb570fd5f97897e5a240c69c92b3d0e Mon Sep 17 00:00:00 2001 From: Casper Warden <216465704+casperwardensl@users.noreply.github.com> Date: Fri, 12 Oct 2018 09:41:35 +0100 Subject: [PATCH] Fix handling of waitForMessages timeout --- dist/classes/Circuit.js | 8 ++++++-- dist/classes/Circuit.js.map | 2 +- dist/classes/TimeoutError.d.ts | 4 ++++ dist/classes/TimeoutError.js | 6 ++++++ dist/classes/TimeoutError.js.map | 1 + dist/classes/commands/GridCommands.js | 3 ++- dist/classes/commands/GridCommands.js.map | 2 +- lib/classes/Circuit.ts | 8 ++++++-- lib/classes/TimeoutError.ts | 5 +++++ lib/classes/commands/GridCommands.ts | 3 ++- 10 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 dist/classes/TimeoutError.d.ts create mode 100644 dist/classes/TimeoutError.js create mode 100644 dist/classes/TimeoutError.js.map create mode 100644 lib/classes/TimeoutError.ts diff --git a/dist/classes/Circuit.js b/dist/classes/Circuit.js index 040734b..27d3b8a 100644 --- a/dist/classes/Circuit.js +++ b/dist/classes/Circuit.js @@ -9,6 +9,7 @@ const operators_1 = require("rxjs/operators"); const FilterResponse_1 = require("../enums/FilterResponse"); const Subject_1 = require("rxjs/internal/Subject"); const __1 = require(".."); +const TimeoutError_1 = require("./TimeoutError"); class Circuit { constructor(clientEvents) { this.client = null; @@ -121,7 +122,10 @@ class Circuit { const timeoutFunc = () => { if (handleObj.subscription !== null) { handleObj.subscription.unsubscribe(); - reject(new Error('Timeout waiting for message of type ' + id)); + const err = new TimeoutError_1.TimeoutError('Timeout waiting for message of type ' + id); + err.timeout = true; + err.waitingForMessage = id; + reject(err); } }; handleObj.timeout = setTimeout(timeoutFunc, timeout); @@ -223,7 +227,7 @@ class Circuit { if (this.receivedPackets[packet.sequenceNumber]) { clearTimeout(this.receivedPackets[packet.sequenceNumber]); this.receivedPackets[packet.sequenceNumber] = setTimeout(this.expireReceivedPacket.bind(this, packet.sequenceNumber), 10000); - console.log('Ignoring duplicate packet: ' + packet.message.name); + console.log('Ignoring duplicate packet: ' + packet.message.name + ' sequenceID: ' + packet.sequenceNumber); return; } this.receivedPackets[packet.sequenceNumber] = setTimeout(this.expireReceivedPacket.bind(this, packet.sequenceNumber), 10000); diff --git a/dist/classes/Circuit.js.map b/dist/classes/Circuit.js.map index de245aa..5d48ddf 100644 --- a/dist/classes/Circuit.js.map +++ b/dist/classes/Circuit.js.map @@ -1 +1 @@ -{"version":3,"file":"Circuit.js","sourceRoot":"","sources":["../../lib/classes/Circuit.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Circuit.js","sourceRoot":"","sources":["../../lib/classes/Circuit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/classes/TimeoutError.d.ts b/dist/classes/TimeoutError.d.ts new file mode 100644 index 0000000..33edfd1 --- /dev/null +++ b/dist/classes/TimeoutError.d.ts @@ -0,0 +1,4 @@ +export declare class TimeoutError extends Error { + timeout: true; + waitingForMessage: number; +} diff --git a/dist/classes/TimeoutError.js b/dist/classes/TimeoutError.js new file mode 100644 index 0000000..4121661 --- /dev/null +++ b/dist/classes/TimeoutError.js @@ -0,0 +1,6 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +class TimeoutError extends Error { +} +exports.TimeoutError = TimeoutError; +//# sourceMappingURL=TimeoutError.js.map \ No newline at end of file diff --git a/dist/classes/TimeoutError.js.map b/dist/classes/TimeoutError.js.map new file mode 100644 index 0000000..be14364 --- /dev/null +++ b/dist/classes/TimeoutError.js.map @@ -0,0 +1 @@ +{"version":3,"file":"TimeoutError.js","sourceRoot":"","sources":["../../lib/classes/TimeoutError.ts"],"names":[],"mappings":";;AAAA,MAAa,YAAa,SAAQ,KAAK;CAItC;AAJD,oCAIC"} \ No newline at end of file diff --git a/dist/classes/commands/GridCommands.js b/dist/classes/commands/GridCommands.js index 3573ce2..dbd4685 100644 --- a/dist/classes/commands/GridCommands.js +++ b/dist/classes/commands/GridCommands.js @@ -13,6 +13,7 @@ const MapNameRequest_1 = require("../messages/MapNameRequest"); const GridLayerType_1 = require("../../enums/GridLayerType"); const MapBlock_1 = require("../MapBlock"); const __1 = require("../.."); +const TimeoutError_1 = require("../TimeoutError"); class GridCommands extends CommandsBase_1.CommandsBase { getRegionByName(regionName) { return new Promise((resolve, reject) => { @@ -191,7 +192,7 @@ class GridCommands extends CommandsBase_1.CommandsBase { return FilterResponse_1.FilterResponse.NoMatch; }).then((ignore) => { }).catch((err) => { - if (err.message === 'Timeout') { + if (err instanceof TimeoutError_1.TimeoutError && err.timeout === true) { resolve(response); } else { diff --git a/dist/classes/commands/GridCommands.js.map b/dist/classes/commands/GridCommands.js.map index 523f84c..dcf0f83 100644 --- a/dist/classes/commands/GridCommands.js.map +++ b/dist/classes/commands/GridCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"GridCommands.js","sourceRoot":"","sources":["../../../lib/classes/commands/GridCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"GridCommands.js","sourceRoot":"","sources":["../../../lib/classes/commands/GridCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/classes/Circuit.ts b/lib/classes/Circuit.ts index c317216..7156acb 100644 --- a/lib/classes/Circuit.ts +++ b/lib/classes/Circuit.ts @@ -14,6 +14,7 @@ import {ClientEvents} from './ClientEvents'; import {FilterResponse} from '../enums/FilterResponse'; import {Subject} from 'rxjs/internal/Subject'; import {PacketFlags} from '..'; +import {TimeoutError} from './TimeoutError'; export class Circuit { @@ -200,7 +201,10 @@ export class Circuit if (handleObj.subscription !== null) { handleObj.subscription.unsubscribe(); - reject(new Error('Timeout waiting for message of type ' + id)); + const err = new TimeoutError('Timeout waiting for message of type ' + id); + err.timeout = true; + err.waitingForMessage = id; + reject(err); } }; @@ -350,7 +354,7 @@ export class Circuit { clearTimeout(this.receivedPackets[packet.sequenceNumber]); this.receivedPackets[packet.sequenceNumber] = setTimeout(this.expireReceivedPacket.bind(this, packet.sequenceNumber), 10000); - console.log('Ignoring duplicate packet: ' + packet.message.name); + console.log('Ignoring duplicate packet: ' + packet.message.name + ' sequenceID: ' + packet.sequenceNumber); return; } this.receivedPackets[packet.sequenceNumber] = setTimeout(this.expireReceivedPacket.bind(this, packet.sequenceNumber), 10000); diff --git a/lib/classes/TimeoutError.ts b/lib/classes/TimeoutError.ts new file mode 100644 index 0000000..93a0975 --- /dev/null +++ b/lib/classes/TimeoutError.ts @@ -0,0 +1,5 @@ +export class TimeoutError extends Error +{ + timeout: true; + waitingForMessage: number; +} diff --git a/lib/classes/commands/GridCommands.ts b/lib/classes/commands/GridCommands.ts index 205303b..57f9f4c 100644 --- a/lib/classes/commands/GridCommands.ts +++ b/lib/classes/commands/GridCommands.ts @@ -16,6 +16,7 @@ import {MapNameRequestMessage} from '../messages/MapNameRequest'; import {GridLayerType} from '../../enums/GridLayerType'; import {MapBlock} from '../MapBlock'; import {MapInfoRangeReplyEvent, MapInfoReplyEvent, PacketFlags, RegionInfoReplyEvent} from '../..'; +import {TimeoutError} from '../TimeoutError'; export class GridCommands extends CommandsBase { getRegionByName(regionName: string) @@ -236,7 +237,7 @@ export class GridCommands extends CommandsBase }).catch((err) => { - if (err.message === 'Timeout') + if (err instanceof TimeoutError && err.timeout === true) { resolve(response); }