mirror of
https://github.com/nestriness/nestri.git
synced 2025-12-11 00:05:36 +02:00
## Description Oops.. another massive PR 🥲 This PR contains multiple improvements and changes. Firstly, thanks gst-wayland-display's PR [here](https://github.com/games-on-whales/gst-wayland-display/pull/20). NVIDIA path is now way more efficient than before. Secondly, adding controller support was a massive hurdle, requiring me to start another project [vimputti](https://github.com/DatCaptainHorse/vimputti) - which allows simple virtual controller inputs in isolated containers. Well, it's not simple, it includes LD_PRELOAD shims and other craziness, but the library API is simple to use.. Thirdly, split runner image into 3 separate stages, base + build + runtime, should help keep things in check in future, also added GitHub Actions CI builds for v2 to v4 builds (hopefully they pass..). Fourth, replaced the runner's runtime Steam patching with better and simpler bubblewrap patch, massive thanks to `games-on-whales` to figuring it out better! Fifth, relay for once needed some changes, the new changes are still mostly WIP, but I'll deal with them next time I have energy.. I'm spent now. Needed to include these changes as relay needed a minor change to allow rumble events to flow back to client peer. Sixth.. tons of package updates, minor code improvements and the usual. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * End-to-end gamepad/controller support (attach/detach, buttons, sticks, triggers, rumble) with client/server integration and virtual controller plumbing. * Optional Prometheus metrics endpoint and WebTransport support. * Background vimputti manager process added for controller handling. * **Improvements** * Multi-variant container image builds and streamlined runtime images. * Zero-copy video pipeline and encoder improvements for lower latency. * Updated Steam compat mapping and dependency/toolchain refreshes. * **Bug Fixes** * More robust GPU detection, input/fullscreen lifecycle, startup/entrypoint, and container runtime fixes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>
109 lines
2.8 KiB
Go
109 lines
2.8 KiB
Go
package core
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"relay/internal/shared"
|
|
|
|
"github.com/libp2p/go-libp2p/core/network"
|
|
"github.com/oklog/ulid/v2"
|
|
)
|
|
|
|
// --- Room Management ---
|
|
|
|
// GetRoomByID retrieves a local Room struct by its ULID
|
|
func (r *Relay) GetRoomByID(id ulid.ULID) *shared.Room {
|
|
if room, ok := r.LocalRooms.Get(id); ok {
|
|
return room
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetRoomByName retrieves a local Room struct by its name
|
|
func (r *Relay) GetRoomByName(name string) *shared.Room {
|
|
for _, room := range r.LocalRooms.Copy() {
|
|
if room.Name == name {
|
|
return room
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// CreateRoom creates a new local Room struct with the given name
|
|
func (r *Relay) CreateRoom(name string) *shared.Room {
|
|
roomID := ulid.Make()
|
|
room := shared.NewRoom(name, roomID, r.ID)
|
|
r.LocalRooms.Set(room.ID, room)
|
|
slog.Debug("Created new local room", "room", name, "id", room.ID)
|
|
return room
|
|
}
|
|
|
|
// DeleteRoomIfEmpty checks if a local room struct is inactive and can be removed
|
|
func (r *Relay) DeleteRoomIfEmpty(room *shared.Room) {
|
|
if room == nil {
|
|
return
|
|
}
|
|
if room.Participants.Len() == 0 && r.LocalRooms.Has(room.ID) {
|
|
slog.Debug("Deleting empty room without participants", "room", room.Name)
|
|
r.LocalRooms.Delete(room.ID)
|
|
err := room.PeerConnection.Close()
|
|
if err != nil {
|
|
slog.Error("Failed to close Room PeerConnection", "room", room.Name, "err", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetRemoteRoomByName returns room from mesh by name
|
|
func (r *Relay) GetRemoteRoomByName(roomName string) *shared.RoomInfo {
|
|
for _, room := range r.Rooms.Copy() {
|
|
if room.Name == roomName && room.OwnerID != r.ID {
|
|
// Make sure connection is alive
|
|
if r.Host.Network().Connectedness(room.OwnerID) == network.Connected {
|
|
return &room
|
|
}
|
|
|
|
slog.Debug("Removing stale peer, owns a room without connection", "room", roomName, "peer", room.OwnerID)
|
|
r.onPeerDisconnected(room.OwnerID)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// --- State Publishing ---
|
|
|
|
// publishRoomStates publishes the state of all rooms currently owned by *this* relay
|
|
func (r *Relay) publishRoomStates(ctx context.Context) error {
|
|
if r.pubTopicState == nil {
|
|
slog.Warn("Cannot publish room states: topic is nil")
|
|
return nil
|
|
}
|
|
|
|
var statesToPublish []shared.RoomInfo
|
|
r.LocalRooms.Range(func(id ulid.ULID, room *shared.Room) bool {
|
|
// Only publish state for rooms owned by this relay
|
|
if room.OwnerID == r.ID {
|
|
statesToPublish = append(statesToPublish, shared.RoomInfo{
|
|
ID: room.ID,
|
|
Name: room.Name,
|
|
OwnerID: r.ID,
|
|
})
|
|
}
|
|
return true // Continue iteration
|
|
})
|
|
|
|
if len(statesToPublish) == 0 {
|
|
return nil
|
|
}
|
|
|
|
data, err := json.Marshal(statesToPublish)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal local room states: %w", err)
|
|
}
|
|
if pubErr := r.pubTopicState.Publish(ctx, data); pubErr != nil {
|
|
slog.Error("Failed to publish room states message", "err", pubErr)
|
|
}
|
|
return nil
|
|
}
|