Merge branch 'feature/sharding' of https://github.com/b1naryth1ef/discordgo into b1naryth1ef-feature/sharding

discord.go

@@ -40,6 +40,8 @@ func New(args ...interface{}) (s *Session, err error) {
 		StateEnabled:           true,
 		Compress:               true,
 		ShouldReconnectOnError: true,
+		ShardID:                0,
+		NumShards:              1,
 	}
 
 	// If no arguments are passed return the empty Session interface.

structs.go

@@ -39,6 +39,10 @@ type Session struct {
 	// Should the session request compressed websocket data.
 	Compress bool
 
+	// Sharding
+	ShardID   int
+	NumShards int
+
 	// Should state tracking be enabled.
 	// State tracking is the best way for getting the the users
 	// active guilds and the members of the guilds.

wsapi.go

@@ -39,6 +39,7 @@ type handshakeData struct {
 	Properties     handshakeProperties `json:"properties"`
 	LargeThreshold int                 `json:"large_threshold"`
 	Compress       bool                `json:"compress"`
+	Shard          [2]int              `json:"shard"`
 }
 
 type handshakeOp struct {
@@ -72,6 +73,16 @@ func (s *Session) Open() (err error) {
 		return
 	}
 
+	if s.NumShards <= 0 {
+		err = errors.New("NumShards must be greater or equal to 1")
+		return
+	}
+
+	if s.ShardID >= s.NumShards {
+		err = errors.New("ShardID must be less than NumShards")
+		return
+	}
+
 	if s.VoiceConnections == nil {
 		s.log(LogInformational, "creating new VoiceConnections map")
 		s.VoiceConnections = make(map[string]*VoiceConnection)
@@ -130,6 +141,7 @@ func (s *Session) Open() (err error) {
 				},
 				250,
 				s.Compress,
+				[2]int{s.ShardID, s.NumShards},
 			},
 		}
 		s.log(LogInformational, "sending identify packet to gateway")
@@ -373,7 +385,15 @@ func (s *Session) onEvent(messageType int, message []byte) {
 
 		s.log(LogInformational, "sending identify packet to gateway in response to Op9")
 		s.wsMutex.Lock()
-		err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, 250, s.Compress}})
+		err = s.wsConn.WriteJSON(handshakeOp{
+			2,
+			handshakeData{
+				s.Token,
+				handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""},
+				250,
+				s.Compress,
+				[2]int{s.ShardID, s.NumShards},
+			}})
 		s.wsMutex.Unlock()
 		if err != nil {
 			s.log(LogWarning, "error sending gateway identify packet, %s, %s", s.gateway, err)