mirror of https://github.com/jetkvm/kvm.git
0e040a9b54
This merge integrates the latest dev branch changes while preserving all multi-session functionality. Key changes include: ## Dev branch changes integrated: - Network stack refactoring: migrated from internal/network to pkg/nmlite - New NetworkManager architecture with jetdhcpc client - Function-based config pattern to avoid shared pointer bugs - Reboot state management via WebSocket reconnection - Updated UI components for network settings - GitHub workflow and PR templates ## Multi-session functionality preserved: - Updated RPC event broadcasting from single-session to multi-session - network.go: Changed networkStateChanged to use broadcastJSONRPCEvent - network.go: Changed willReboot event to broadcast to all sessions - jsonrpc.go: Updated rpcReboot to broadcast willReboot event - config.go: Retained MultiSession and SessionSettings fields - devices.$id.tsx: Combined video rendering logic preserving nickname/pending state ## Conflict resolutions: 1. config.go: Combined multi-session fields with dev's network refactoring 2. network.go: Adopted dev's nmlite stack and updated multi-session broadcasts 3. devices.$id.tsx: Preserved conditional video rendering for multi-session UX 4. jsonrpc.go: Fixed undefined currentSession reference All linters pass with 0 errors and 0 warnings. |
||
|---|---|---|
| .. | ||
| ip.ts | ||
| jsonrpc.ts | ||
| nicknameGenerator.ts | ||