ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-10 15:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix election timeout bug and tidy up fixes #34

Browse source
This commit is contained in:
Chris Blanchard 2015-09-20 00:48:07 +01:00
parent c0f6f80423
commit 5337789772
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/gather/gather.js
View file

@ -25,9 +25,12 @@ function Gather (options) {
options.onEvent : noop;
this.TEAM_SIZE = 6;
this.gatherers = [];
this.ELECTION_INTERVAL = 120000; // 2 mins
this.REGATHER_THRESHOLD = 6;
this.electionStartTime = null;
this.election = {
INTERVAL: 120000, // 2 mins
startTime: null,
timer: null
};
this.initState();
}
@ -70,17 +73,11 @@ StateMachine.create({
onenterelection: () => {
// Setup timer for elections
let self = this;
self.electionStartTime = new Date();
setTimeout(() => {
if (self.can("electionTimeout")) {
self.electionTimeout();
}
}, self.ELECTION_INTERVAL);
this.startElectionCountdown();
},
onleaveelection: () => {
this.electionStartTime = null;
this.cancelElectionCountdown();
},
// Selection State
@ -282,9 +279,9 @@ Gather.prototype.marines = () => {
return this.retrieveGroup("marine");
};
Gather.prototype.electionTimer = () => {
return (this.electionStartTime === null) ?
null : this.electionStartTime.toISOString();
Gather.prototype.electionStartTime = () => {
return (this.election.startTime === null) ?
null : this.election.startTime.toISOString();
};
Gather.prototype.toJson = () => {
@ -293,8 +290,8 @@ Gather.prototype.toJson = () => {
state: this.current,
pickingTurn: this.pickingTurn(),
election: {
startTime: this.electionTimer(),
interval: this.ELECTION_INTERVAL
startTime: this.electionStartTime(),
interval: this.election.INTERVAL
}
}
};
@ -332,6 +329,21 @@ Gather.prototype.regatherVotes = () => {
if (gatherer.regatherVote) acc++;
return acc;
}, 0);
}
};
// Initiates a timer which will push gather into next state
Gather.prototype.startElectionCountdown = () => {
let self = this;
self.election.startTime = new Date();
this.election.timer = setTimeout(() => {
if (self.can("electionTimeout")) self.electionTimeout();
}, self.election.INTERVAL);
};
Gather.prototype.cancelElectionCountdown = () => {
clearInterval(this.election.timer);
this.election.timer = null;
this.election.startTime = null;
};
module.exports = Gather;