Add missing UserID to VoiceProcessingData

balancer.go

@@ -0,0 +1,51 @@
+package gavalink
+
+import (
+	"math"
+	"sort"
+)
+
+type balancePenalty struct {
+	node    *Node
+	penalty int
+}
+
+func BestNodeByPenalties(nodes []*Node) (*Node, error) {
+	penalties := make([]balancePenalty, len(nodes))
+
+	var playerPenalty, cpuPenalty, deficitFramePenalty, nullFramePenalty int
+
+	for i, node := range nodes {
+		playerPenalty = 0
+		cpuPenalty = 0
+		deficitFramePenalty = 0
+		nullFramePenalty = 0
+
+		if node.stats != nil {
+			playerPenalty = node.stats.ActivePlayers
+			cpuPenalty = int(math.Pow(1.05, 100*node.stats.Cpu.SystemLoad)*10 - 10)
+
+			if node.stats.Frames != nil && node.stats.Frames.Deficit != -1 {
+				deficitFramePenalty = int(math.Pow(1.03, 500*float64(node.stats.Frames.Deficit/3000))*600 - 600)
+				nullFramePenalty = int(math.Pow(1.03, 500*float64(node.stats.Frames.Nulled/3000))*300 - 300)
+				nullFramePenalty *= 2
+			}
+		}
+
+		penalties[i] = balancePenalty{node, playerPenalty + cpuPenalty + deficitFramePenalty + nullFramePenalty}
+	}
+
+	sort.SliceStable(penalties, func(i, j int) bool {
+		return penalties[i].penalty < penalties[j].penalty
+	})
+
+	return penalties[0].node, nil
+}
+
+func BestNodeByLoad(n []*Node) (*Node, error) {
+	sort.SliceStable(n, func(i, j int) bool {
+		return n[i].stats.Cpu.LavalinkLoad < n[j].stats.Cpu.LavalinkLoad
+	})
+
+	return n[0], nil
+}

lavalink.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"sort"
 	"time"
 )
 
@@ -24,6 +23,8 @@ type Lavalink struct {
 	nodes   []*Node
 	players map[string]*Player
 
+	capabilities map[string]interface{}
+
 	BestNodeFunc func([]*Node) (*Node, error)
 }
 
@@ -44,7 +45,7 @@ func NewLavalink(shards string, userID string) *Lavalink {
 		userID:  userID,
 		players: make(map[string]*Player),
 
-		BestNodeFunc: BestNodeByLoad,
+		BestNodeFunc: BestNodeByPenalties,
 	}
 }
 
@@ -135,10 +136,11 @@ func (lavalink *Lavalink) GetPlayer(guild string) (*Player, error) {
 	return p, nil
 }
 
-func BestNodeByLoad(n []*Node) (*Node, error) {
-	sort.SliceStable(n, func(i, j int) bool {
-		return n[i].load < n[j].load
-	})
+// Add capabilities mappings to the client, letting the server know what we support
+func (lavalink *Lavalink) AddCapability(key string, i interface{}) {
+	if lavalink.capabilities == nil {
+		lavalink.capabilities = make(map[string]interface{})
+	}
 
-	return n[0], nil
+	lavalink.capabilities[key] = i
 }

model.go

@@ -91,6 +91,7 @@ type VoiceProcessingData struct {
 	io.ReadCloser
 
 	Client *http.Client
+	UserID string
 	URL    string
 	File   string
 

node.go

@@ -6,6 +6,7 @@ import (
 	"github.com/valyala/fastjson"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/gorilla/websocket"
 )
@@ -29,12 +30,41 @@ type NodeConfig struct {
 // Node wraps a Lavalink Node
 type Node struct {
 	config  NodeConfig
-	load    float32
+	stats   *RemoteStats
 	manager *Lavalink
 	wsConn  *websocket.Conn
 	client  *http.Client
 }
 
+type RemoteStats struct {
+	Op            string       `json:"op"`
+	Players       int          `json:"players"`
+	ActivePlayers int          `json:"playingPlayers"`
+	Uptime        int64        `json:"uptime"`
+	Memory        *MemoryStats `json:"memory"`
+	Cpu           *CpuStats    `json:"cpu"`
+	Frames        *FrameStats  `json:"frameStats"`
+}
+
+type MemoryStats struct {
+	Free        uint64 `json:"free"`
+	Used        uint64 `json:"used"`
+	Allocated   uint64 `json:"allocated"`
+	Reserveable uint64 `json:"reserveable"`
+}
+
+type CpuStats struct {
+	Cores        int     `json:"cores"`
+	SystemLoad   float64 `json:"systemLoad"`
+	LavalinkLoad float64 `json:"lavalinkLoad"`
+}
+
+type FrameStats struct {
+	Sent    int `json:"sent"`
+	Nulled  int `json:"nulled"`
+	Deficit int `json:"deficit"`
+}
+
 func (node *Node) open() error {
 	header := http.Header{}
 
@@ -42,6 +72,22 @@ func (node *Node) open() error {
 	header.Set("Num-Shards", node.manager.shards)
 	header.Set("User-Id", node.manager.userID)
 
+	if node.manager.capabilities != nil {
+		v := make([]string, 0)
+
+		for k, vals := range node.manager.capabilities {
+			b, err := json.Marshal(vals)
+
+			if err != nil {
+				continue
+			}
+
+			v = append(v, k+"="+string(b))
+		}
+
+		header.Set("Capabilities", strings.Join(v, ";"))
+	}
+
 	ws, resp, err := websocket.DefaultDialer.Dial(node.config.WebSocket, header)
 
 	if err != nil {
@@ -108,16 +154,25 @@ func (node *Node) listen() {
 			continue
 		}
 
-		node.onEvent(v)
+		node.onEvent(v, msg)
 	}
 }
 
-func (node *Node) onEvent(v *fastjson.Value) error {
+func (node *Node) onEvent(v *fastjson.Value, msg []byte) error {
 	op := jsonStringValue(v, "op")
 
 	switch op {
+	case opStats:
+		node.stats = &RemoteStats{}
+
+		err := json.Unmarshal(msg, &node.stats)
+
+		if err != nil {
+			return err
+		}
 	case opPlayerUpdate:
 		player, err := node.manager.GetPlayer(jsonStringValue(v, "guildId"))
+
 		if err != nil {
 			return err
 		}
@@ -153,13 +208,13 @@ func (node *Node) onEvent(v *fastjson.Value) error {
 		track := jsonStringValue(v, "track")
 
 		data := &VoiceProcessingData{
-			URL:  fmt.Sprintf("%s/audio/%s", node.config.REST, track),
-			File: track,
+			Client: node.client,
+			UserID: jsonStringValue(v, "userId"),
+			URL:    fmt.Sprintf("%s/audio/%s", node.config.REST, track),
+			File:   track,
 		}
 
 		return player.handler.OnVoiceProcessed(player, data, v.GetBool("hotword"), v.GetBool("override"))
-	case opStats:
-		node.load = float32(v.GetFloat64("cpu", "lavalinkLoad"))
 	default:
 		return errUnknownPayload
 	}