diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gateway/shard.rs | 16 | ||||
| -rw-r--r-- | src/model/event.rs | 13 |
2 files changed, 20 insertions, 9 deletions
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs index fbe1572..7e81813 100644 --- a/src/gateway/shard.rs +++ b/src/gateway/shard.rs @@ -434,16 +434,17 @@ impl Shard { self.autoreconnect().and(Ok(None)) } }, - Ok(GatewayEvent::InvalidateSession) => { + Ok(GatewayEvent::InvalidateSession(resumable)) => { info!( - "[Shard {:?}] Received session invalidation; re-identifying", - self.shard_info + "[Shard {:?}] Received session invalidation", + self.shard_info, ); - self.seq = 0; - self.session_id = None; - - self.identify().and(Ok(None)) + if resumable { + self.resume().and(Ok(None)) + } else { + self.identify().and(Ok(None)) + } }, Ok(GatewayEvent::Reconnect) => self.reconnect().and(Ok(None)), Err(Error::Gateway(GatewayError::Closed(data))) => { @@ -981,6 +982,7 @@ impl Shard { self.heartbeat_instants = (Some(Instant::now()), None); self.heartbeat_interval = None; self.last_heartbeat_acknowledged = true; + self.session_id = None; self.stage = ConnectionStage::Disconnected; self.seq = 0; } diff --git a/src/model/event.rs b/src/model/event.rs index 7278bbb..fe65269 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -1060,7 +1060,8 @@ pub enum GatewayEvent { Dispatch(u64, Event), Heartbeat(u64), Reconnect, - InvalidateSession, + /// Whether the session can be resumed. + InvalidateSession(bool), Hello(u64), HeartbeatAck, } @@ -1096,7 +1097,15 @@ impl GatewayEvent { GatewayEvent::Heartbeat(s) }, OpCode::Reconnect => GatewayEvent::Reconnect, - OpCode::InvalidSession => GatewayEvent::InvalidateSession, + OpCode::InvalidSession => { + let resumable = map.remove("d") + .ok_or_else(|| { + DeError::custom("expected gateway invalid session d") + }) + .and_then(bool::deserialize)?; + + GatewayEvent::InvalidateSession(resumable) + }, OpCode::Hello => { let mut d = map.remove("d") .ok_or_else(|| DeError::custom("expected gateway hello d")) |