github-mirrors/netris-cli
1
0
Fork 0
mirror of https://github.com/nestriness/cli.git synced 2025-12-10 11:25:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: github-mirrors:a4e0a70181cfd3521c16f311285eed4eea1dc714
Branches Tags
github-mirrors:main github-mirrors:dependabot/github_actions/actions/checkout-6 github-mirrors:dependabot/github_actions/amannn/action-semantic-pull-request-6.1.1 github-mirrors:feat/run
...
compare: github-mirrors:5f11ba105b80bdb88edc9a9e1387b28ea0736c24
Branches Tags
github-mirrors:dependabot/github_actions/actions/checkout-6 github-mirrors:dependabot/github_actions/amannn/action-semantic-pull-request-6.1.1 github-mirrors:main github-mirrors:feat/run

2 Commits
a4e0a70181 ... 5f11ba105b

Author SHA1 Message Date
Wanjohi Ryan
5f11ba105b ✨ feat: Use last argument to contain game executable 2024-07-07 11:59:20 +03:00
Wanjohi Ryan
e50cf8fc13 fix: I do not remember 2024-07-07 10:59:29 +03:00
3 changed files with 394 additions and 343 deletions
Expand all files Collapse all files

133
cmd/root.go
View File

@@ -4,7 +4,6 @@ Copyright © 2024 Nestri <>
package cmd
import (
"context"
_ "embed"
"fmt"
"os"
@@ -13,9 +12,6 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/lipgloss/table"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
"github.com/docker/docker/pkg/stdcopy"
"github.com/muesli/termenv"
"github.com/spf13/cobra"
)
@@ -23,6 +19,17 @@ import (
//go:embed nestri.ascii
var art string
type GameConfig struct {
Directory string
Executable string
GPU int
Vendor string
Resolution struct {
Height int
Width int
}
}
// rootCmd represents the base command when called without any subcommands
var rootCmd = &cobra.Command{
Use: "nestri",
@@ -80,7 +87,7 @@ var neoFetchCmd = &cobra.Command{
// this is the "nestri run" subcommand, takes no arguments for now
var runCmd = &cobra.Command{
Use: "run",
Use: "run [options] [game]",
Short: "Run a game using nestri",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
@@ -90,6 +97,50 @@ var runCmd = &cobra.Command{
return nil
}
//The main job here is to:
//1. look for an exe in a certain directory,
//2. mount the directory inside the container
//3. Run the nestri docker container
//4. SSH into the container and set up everything
//5. Run the game
//6. Provide the URL to play or throw an error otherwise.
// The last argument is the game to run
game := args[len(args)-1]
// Load game configuration
// var gameConfig GameConfig
// if err := viper.UnmarshalKey(fmt.Sprintf("games.%s", game), &gameConfig); err != nil {
// return fmt.Errorf("error parsing game configuration: %w", err)
// }
// // Override config with command-line flags
// cmd.Flags().Visit(func(f *pflag.Flag) {
// switch f.Name {
// case "directory":
// gameConfig.Directory = viper.GetString(f.Name)
// case "executable":
// gameConfig.Executable = viper.GetString(f.Name)
// case "gpu":
// gameConfig.GPU = viper.GetInt(f.Name)
// case "vendor":
// gameConfig.Vendor = viper.GetString(f.Name)
// case "resolution-height":
// gameConfig.Resolution.Height = viper.GetInt(f.Name)
// case "resolution-width":
// gameConfig.Resolution.Width = viper.GetInt(f.Name)
// }
// })
fmt.Printf("Running game: %s\n\n", game)
// cli, err := client.NewClientWithOpts(client.FromEnv)
// if err != nil {
// return fmt.Errorf("error creating Docker client: %w", err)
// }
// ctx := context.Background()
// var game string
// if len(args) > 0 {
// game = args[0]
@@ -107,48 +158,48 @@ var runCmd = &cobra.Command{
// fmt.Printf("Running game: %s\n\n", game)
cli, err := client.NewClientWithOpts()
if err != nil {
panic(err)
}
// cli, err := client.NewClientWithOpts()
// if err != nil {
// panic(err)
// }
ctx := context.Background()
resp, err := cli.ContainerCreate(ctx, &container.Config{
Image: "hello-world",
}, nil, nil, nil, "hello-world")
// ctx := context.Background()
// resp, err := cli.ContainerCreate(ctx, &container.Config{
// Image: "hello-world",
// }, nil, nil, nil, "hello-world")
if err != nil {
panic(err)
}
// if err != nil {
// panic(err)
// }
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
panic(err)
}
// if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
// panic(err)
// }
// Attach to the container to get logs
out, err := cli.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true, ShowStderr: true, Follow: true})
if err != nil {
fmt.Printf("Error attaching to container logs: %s\n", err)
}
defer out.Close()
// // Attach to the container to get logs
// out, err := cli.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true, ShowStderr: true, Follow: true})
// if err != nil {
// fmt.Printf("Error attaching to container logs: %s\n", err)
// }
// defer out.Close()
// Copy the logs to stdout and stderr
stdcopy.StdCopy(os.Stdout, os.Stderr, out)
// // Copy the logs to stdout and stderr
// stdcopy.StdCopy(os.Stdout, os.Stderr, out)
// Wait for the container to finish
statusCh, errCh := cli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
select {
case err := <-errCh:
if err != nil {
fmt.Printf("Error waiting for container: %s\n", err)
}
case <-statusCh:
fmt.Println("Container finished")
}
// Clean up the container
if err := cli.ContainerRemove(ctx, resp.ID, container.RemoveOptions{}); err != nil {
fmt.Printf("Error removing container: %s\n", err)
}
// // Wait for the container to finish
// statusCh, errCh := cli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
// select {
// case err := <-errCh:
// if err != nil {
// fmt.Printf("Error waiting for container: %s\n", err)
// }
// case <-statusCh:
// fmt.Println("Container finished")
// }
// // Clean up the container
// if err := cli.ContainerRemove(ctx, resp.ID, container.RemoveOptions{}); err != nil {
// fmt.Printf("Error removing container: %s\n", err)
// }
// if gpu > 0 {
// fmt.Print("Using gpu %s\n", gpu)
// }

302
root.go
View File

@@ -1,302 +0,0 @@
/*
Copyright © 2024 Nestri <>
*/
package cmd
import (
_ "embed"
"fmt"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"time"
"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/lipgloss/table"
"github.com/muesli/termenv"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
//go:embed nestri.ascii
var art string
var (
gpu int
hdr bool
)
// rootCmd represents the base command when called without any subcommands
// For a good reference point, start here: https://github.com/charmbracelet/taskcli/blob/main/cmds.go
var rootCmd = &cobra.Command{
Use: "nestri",
Short: "A CLI tool to manage your cloud gaming service",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
return cmd.Help()
},
}
// this is for the "nestri neofetch" subcommand, has no arguments
var neoFetchCmd = &cobra.Command{
Use: "neofetch",
Short: "Show important system information",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
lipgloss.SetColorProfile(termenv.TrueColor)
baseStyle := lipgloss.NewStyle().
PaddingTop(1).
PaddingRight(4).
PaddingBottom(1).
PaddingLeft(4)
var (
b strings.Builder
lines = strings.Split(art, "\n")
colors = []string{"#F8481C", "#F74127", "#F53B30", "#F23538", "#F02E40"}
step = len(lines) / len(colors)
)
for i, l := range lines {
n := clamp(0, len(colors)-1, i/step)
b.WriteString(colorize(colors[n], l))
b.WriteRune('\n')
}
t := table.New().
Border(lipgloss.HiddenBorder())
t.Row(baseStyle.Render(b.String()), baseStyle.Render("System Info goes here"))
fmt.Print(t)
return nil
},
}
// this is the "nestri run" subcommand, takes no arguments for now
var runCmd = &cobra.Command{
Use: "run",
Short: "Run a game using nestri",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if runtime.GOOS != "linux" {
//make sure os is linux
fmt.Println("This command is only supported on Linux.")
return nil
}
var game string
if len(args) > 0 {
game = args[0]
viper.Set("game", game)
viper.WriteConfig()
} else {
game = viper.GetString("game")
if filepath.Ext(game) != ".exe" {
return fmt.Errorf("Make sure the game is a .exe")
}
if game == "" {
return fmt.Errorf("no game specified and no previous game selected")
}
}
fmt.Printf("Running game: %s\n\n", game)
if gpu > 0 {
fmt.Print("Using gpu %s\n", gpu)
}
if hdr {
fmt.Println("Enabling HDR mode")
}
//get linux version
versionCmd := exec.Command("grep", "VERSION", "/etc/os-release")
versionOutput, err := versionCmd.CombinedOutput()
if err != nil {
return fmt.Errorf("error getting linux version:")
}
fmt.Printf("Linux version:\n%s\n", string(versionOutput))
//Step 1: change to games dir
fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir
HomeDir, err := os.UserHomeDir()
if err != nil {
return fmt.Errorf("error getting home directory %v\n", err)
}
err = os.Chdir(fmt.Sprintf("%s/game", HomeDir))
if err != nil {
return fmt.Errorf("error changing directory: %v\n", err)
}
//verify we are in game dir
dir, err := os.Getwd()
if err != nil {
return fmt.Errorf("error getting current directory: %v\n", err)
}
fmt.Printf("Current directory: %s\n\n", dir)
//list games dir
listDir := exec.Command("ls", "-la", ".")
listDirOutput, err := listDir.CombinedOutput()
if err != nil {
fmt.Errorf("error listing games: %v\n")
}
fmt.Printf("List of Games: \n%s\n", listDirOutput)
//step 2: Generate a Session ID
//generate id
SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16")
//save output to variable
output, err := SID.Output()
if err != nil {
fmt.Errorf("Error generating Session ID: %v\n", err)
}
sessionID := strings.TrimSpace(string(output))
fmt.Printf("Your Session ID is: %s\n\n", sessionID)
//step 3: Launch netris server
fmt.Println("Installing Netris/Launching Netris Server\n")
checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris")
containerId, err := checkRunning.Output()
if err != nil {
return fmt.Errorf("error checking running Docker container: %v", err)
}
if len(containerId) == 0 {
checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris")
containerId, err = checkExisting.Output()
if err != nil {
return fmt.Errorf("error checking for existing docker container: %v", err)
}
if len(containerId) == 0 {
installCmd := exec.Command(
"sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri",
"--name", "netris", "-it", "--entrypoint", "/bin/bash",
"-e", fmt.Sprintf("SESSION_ID=%s", sessionID),
"-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp",
"--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly",
)
installCmd.Stdout = os.Stdout
installCmd.Stderr = os.Stderr
if err := installCmd.Run(); err != nil {
return fmt.Errorf("error running docker command: %v", err)
}
} else {
startContainer := exec.Command("sudo", "docker", "start", "netris")
startContainer.Stdout = os.Stdout
startContainer.Stderr = os.Stderr
if err := startContainer.Run(); err != nil {
return fmt.Errorf("error starting existing Docker container: %v", err)
}
}
}
//main part of step 4:
//start netris server
fmt.Println("starting netris server\n\n")
checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp")
output, err = checkFileCmd.Output()
if err != nil {
return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err)
}
if !strings.Contains(string(output), ".X11-unix") {
startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&")
startupCmd.Stdout = os.Stdout
startupCmd.Stderr = os.Stderr
if err := startupCmd.Run(); err != nil {
return fmt.Errorf("error running startup command: %v\n", err)
}
for {
time.Sleep(7 * time.Minute)
output, err := checkFileCmd.Output()
if err != nil {
return fmt.Errorf("error checking /tmp directory in container: %v\n", err)
}
if strings.Contains(string(output), ".X11-unix") {
break
}
}
}
gameCmd := fmt.Sprintf("netris-proton -pr %s", game)
execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd)
execCmd.Stdout = os.Stdout
execCmd.Stderr = os.Stderr
if err := execCmd.Run(); err != nil {
return fmt.Errorf("error executing game command in docker container: %v\n", err)
}
return nil
},
}
// Execute adds all child commands to the root command and sets flags appropriately.
// This is called by main.main(). It only needs to happen once to the rootCmd.
func Execute() {
err := rootCmd.Execute()
if err != nil {
os.Exit(1)
}
}
func init() {
rootCmd.AddCommand(neoFetchCmd)
rootCmd.AddCommand(runCmd)
runCmd.Flags().IntVar(&gpu, "gpu", 0, "Specify GPU index")
runCmd.Flags().BoolVar(&hdr, "hdr", false, "Enable HDR mode")
viper.SetConfigName("config")
viper.SetConfigType("yaml")
viper.AddConfigPath(".")
if err := viper.ReadInConfig(); err != nil {
if _, ok := err.(viper.ConfigFileNotFoundError); ok {
} else {
fmt.Println("error reading config file: %v(you should be able to ignore this)", err)
}
}
//If you want to add subcommands to run for example "netri run -fsr" do it like this
// runCmd.Flags().BoolP("fsr", "f", false, "Run the Game with FSR enabled or not")
}
func colorize(c, s string) string {
return lipgloss.NewStyle().Foreground(lipgloss.Color(c)).Render(s)
}
func clamp(v, low, high int) int {
if high < low {
low, high = high, low
}
return min(high, max(low, v))
}
func min(a, b int) int {
if a < b {
return a
}
return b
}
func max(a, b int) int {
if a > b {
return a
}
return b
}

302
root.go.txt Normal file
View File

@@ -0,0 +1,302 @@
// /*
// Copyright © 2024 Nestri <>
// */
// package main
// import (
// _ "embed"
// "fmt"
// "os"
// "os/exec"
// "path/filepath"
// "runtime"
// "strings"
// "time"
// "github.com/charmbracelet/lipgloss"
// "github.com/charmbracelet/lipgloss/table"
// "github.com/muesli/termenv"
// "github.com/spf13/cobra"
// "github.com/spf13/viper"
// )
// //go:embed nestri.ascii
// var art string
// var (
// gpu int
// hdr bool
// )
// // rootCmd represents the base command when called without any subcommands
// // For a good reference point, start here: https://github.com/charmbracelet/taskcli/blob/main/cmds.go
// var rootCmd = &cobra.Command{
// Use: "nestri",
// Short: "A CLI tool to manage your cloud gaming service",
// Args: cobra.NoArgs,
// RunE: func(cmd *cobra.Command, args []string) error {
// return cmd.Help()
// },
// }
// // this is for the "nestri neofetch" subcommand, has no arguments
// var neoFetchCmd = &cobra.Command{
// Use: "neofetch",
// Short: "Show important system information",
// Args: cobra.NoArgs,
// RunE: func(cmd *cobra.Command, args []string) error {
// lipgloss.SetColorProfile(termenv.TrueColor)
// baseStyle := lipgloss.NewStyle().
// PaddingTop(1).
// PaddingRight(4).
// PaddingBottom(1).
// PaddingLeft(4)
// var (
// b strings.Builder
// lines = strings.Split(art, "\n")
// colors = []string{"#F8481C", "#F74127", "#F53B30", "#F23538", "#F02E40"}
// step = len(lines) / len(colors)
// )
// for i, l := range lines {
// n := clamp(0, len(colors)-1, i/step)
// b.WriteString(colorize(colors[n], l))
// b.WriteRune('\n')
// }
// t := table.New().
// Border(lipgloss.HiddenBorder())
// t.Row(baseStyle.Render(b.String()), baseStyle.Render("System Info goes here"))
// fmt.Print(t)
// return nil
// },
// }
// // this is the "nestri run" subcommand, takes no arguments for now
// var runCmd = &cobra.Command{
// Use: "run",
// Short: "Run a game using nestri",
// Args: cobra.MaximumNArgs(1),
// RunE: func(cmd *cobra.Command, args []string) error {
// if runtime.GOOS != "linux" {
// //make sure os is linux
// fmt.Println("This command is only supported on Linux.")
// return nil
// }
// var game string
// if len(args) > 0 {
// game = args[0]
// viper.Set("game", game)
// viper.WriteConfig()
// } else {
// game = viper.GetString("game")
// if filepath.Ext(game) != ".exe" {
// return fmt.Errorf("Make sure the game is a .exe")
// }
// if game == "" {
// return fmt.Errorf("no game specified and no previous game selected")
// }
// }
// fmt.Printf("Running game: %s\n\n", game)
// if gpu > 0 {
// fmt.Print("Using gpu %s\n", gpu)
// }
// if hdr {
// fmt.Println("Enabling HDR mode")
// }
// //get linux version
// versionCmd := exec.Command("grep", "VERSION", "/etc/os-release")
// versionOutput, err := versionCmd.CombinedOutput()
// if err != nil {
// return fmt.Errorf("error getting linux version:")
// }
// fmt.Printf("Linux version:\n%s\n", string(versionOutput))
// //Step 1: change to games dir
// fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir
// HomeDir, err := os.UserHomeDir()
// if err != nil {
// return fmt.Errorf("error getting home directory %v\n", err)
// }
// err = os.Chdir(fmt.Sprintf("%s/game", HomeDir))
// if err != nil {
// return fmt.Errorf("error changing directory: %v\n", err)
// }
// //verify we are in game dir
// dir, err := os.Getwd()
// if err != nil {
// return fmt.Errorf("error getting current directory: %v\n", err)
// }
// fmt.Printf("Current directory: %s\n\n", dir)
// //list games dir
// listDir := exec.Command("ls", "-la", ".")
// listDirOutput, err := listDir.CombinedOutput()
// if err != nil {
// fmt.Errorf("error listing games: %v\n")
// }
// fmt.Printf("List of Games: \n%s\n", listDirOutput)
// //step 2: Generate a Session ID
// //generate id
// SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16")
// //save output to variable
// output, err := SID.Output()
// if err != nil {
// fmt.Errorf("Error generating Session ID: %v\n", err)
// }
// sessionID := strings.TrimSpace(string(output))
// fmt.Printf("Your Session ID is: %s\n\n", sessionID)
// //step 3: Launch netris server
// fmt.Println("Installing Netris/Launching Netris Server\n")
// checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris")
// containerId, err := checkRunning.Output()
// if err != nil {
// return fmt.Errorf("error checking running Docker container: %v", err)
// }
// if len(containerId) == 0 {
// checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris")
// containerId, err = checkExisting.Output()
// if err != nil {
// return fmt.Errorf("error checking for existing docker container: %v", err)
// }
// if len(containerId) == 0 {
// installCmd := exec.Command(
// "sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri",
// "--name", "netris", "-it", "--entrypoint", "/bin/bash",
// "-e", fmt.Sprintf("SESSION_ID=%s", sessionID),
// "-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp",
// "--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly",
// )
// installCmd.Stdout = os.Stdout
// installCmd.Stderr = os.Stderr
// if err := installCmd.Run(); err != nil {
// return fmt.Errorf("error running docker command: %v", err)
// }
// } else {
// startContainer := exec.Command("sudo", "docker", "start", "netris")
// startContainer.Stdout = os.Stdout
// startContainer.Stderr = os.Stderr
// if err := startContainer.Run(); err != nil {
// return fmt.Errorf("error starting existing Docker container: %v", err)
// }
// }
// }
// //main part of step 4:
// //start netris server
// fmt.Println("starting netris server\n\n")
// checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp")
// output, err = checkFileCmd.Output()
// if err != nil {
// return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err)
// }
// if !strings.Contains(string(output), ".X11-unix") {
// startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&")
// startupCmd.Stdout = os.Stdout
// startupCmd.Stderr = os.Stderr
// if err := startupCmd.Run(); err != nil {
// return fmt.Errorf("error running startup command: %v\n", err)
// }
// for {
// time.Sleep(7 * time.Minute)
// output, err := checkFileCmd.Output()
// if err != nil {
// return fmt.Errorf("error checking /tmp directory in container: %v\n", err)
// }
// if strings.Contains(string(output), ".X11-unix") {
// break
// }
// }
// }
// gameCmd := fmt.Sprintf("netris-proton -pr %s", game)
// execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd)
// execCmd.Stdout = os.Stdout
// execCmd.Stderr = os.Stderr
// if err := execCmd.Run(); err != nil {
// return fmt.Errorf("error executing game command in docker container: %v\n", err)
// }
// return nil
// },
// }
// // Execute adds all child commands to the root command and sets flags appropriately.
// // This is called by main.main(). It only needs to happen once to the rootCmd.
// func Execute() {
// err := rootCmd.Execute()
// if err != nil {
// os.Exit(1)
// }
// }
// func init() {
// rootCmd.AddCommand(neoFetchCmd)
// rootCmd.AddCommand(runCmd)
// runCmd.Flags().IntVar(&gpu, "gpu", 0, "Specify GPU index")
// runCmd.Flags().BoolVar(&hdr, "hdr", false, "Enable HDR mode")
// viper.SetConfigName("config")
// viper.SetConfigType("yaml")
// viper.AddConfigPath(".")
// if err := viper.ReadInConfig(); err != nil {
// if _, ok := err.(viper.ConfigFileNotFoundError); ok {
// } else {
// fmt.Println("error reading config file: %v(you should be able to ignore this)", err)
// }
// }
// //If you want to add subcommands to run for example "netri run -fsr" do it like this
// // runCmd.Flags().BoolP("fsr", "f", false, "Run the Game with FSR enabled or not")
// }
// func colorize(c, s string) string {
// return lipgloss.NewStyle().Foreground(lipgloss.Color(c)).Render(s)
// }
// func clamp(v, low, high int) int {
// if high < low {
// low, high = high, low
// }
// return min(high, max(low, v))
// }
// func min(a, b int) int {
// if a < b {
// return a
// }
// return b
// }
// func max(a, b int) int {
// if a > b {
// return a
// }
// return b
// }