Initial commit

This commit is contained in:
Chris Marshall
2020-08-02 13:23:17 -04:00
committed by chris
commit ffca54fdb8
60 changed files with 34080 additions and 0 deletions

14
cmd/q3/app/cmd/cmd.go Normal file
View File

@ -0,0 +1,14 @@
package cmd
import "github.com/spf13/cobra"
func NewCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "cmd",
Short: "send remote server commands",
RunE: func(cmd *cobra.Command, args []string) error {
return nil
},
}
return cmd
}

View File

@ -0,0 +1,70 @@
package content
import (
"fmt"
"net/http"
"net/url"
"os"
"path/filepath"
"time"
"github.com/spf13/cobra"
quakecontent "github.com/criticalstack/quake-kube/internal/quake/content"
)
var opts struct {
Addr string
AssetsDir string
SeedContentURL string
}
func NewCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "content",
Short: "q3 content server",
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) (err error) {
if !filepath.IsAbs(opts.AssetsDir) {
opts.AssetsDir, err = filepath.Abs(opts.AssetsDir)
if err != nil {
return err
}
}
if err := os.MkdirAll(opts.AssetsDir, 0755); err != nil {
return err
}
if opts.SeedContentURL != "" {
u, err := url.Parse(opts.SeedContentURL)
if err != nil {
return err
}
if err := quakecontent.CopyAssets(u, opts.AssetsDir); err != nil {
return err
}
}
e, err := quakecontent.NewRouter(&quakecontent.Config{
AssetsDir: opts.AssetsDir,
})
if err != nil {
return err
}
s := &http.Server{
Addr: opts.Addr,
Handler: e,
ReadTimeout: 600 * time.Second,
WriteTimeout: 600 * time.Second,
MaxHeaderBytes: 1 << 20,
}
fmt.Printf("Starting server %s\n", opts.Addr)
return s.ListenAndServe()
},
}
cmd.Flags().StringVarP(&opts.Addr, "addr", "a", ":9090", "address <host>:<port>")
cmd.Flags().StringVarP(&opts.AssetsDir, "assets-dir", "d", "assets", "assets directory")
cmd.Flags().StringVar(&opts.SeedContentURL, "seed-content-url", "", "seed content from another content server")
return cmd
}

46
cmd/q3/app/proxy/proxy.go Normal file
View File

@ -0,0 +1,46 @@
package proxy
import (
"fmt"
"net/http"
"github.com/spf13/cobra"
quakeclient "github.com/criticalstack/quake-kube/internal/quake/client"
netutil "github.com/criticalstack/quake-kube/internal/util/net"
)
var opts struct {
ClientAddr string
ServerAddr string
ContentServer string
}
func NewCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "proxy",
Short: "q3 websocket/udp proxy",
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
if opts.ClientAddr == "" {
hostIPv4, err := netutil.DetectHostIPv4()
if err != nil {
return err
}
opts.ClientAddr = fmt.Sprintf("%s:8080", hostIPv4)
}
p, err := quakeclient.NewProxy(opts.ServerAddr)
if err != nil {
return err
}
s := http.Server{
Addr: opts.ClientAddr,
Handler: p,
}
return s.ListenAndServe()
},
}
cmd.Flags().StringVarP(&opts.ClientAddr, "client-addr", "c", "", "client address <host>:<port>")
cmd.Flags().StringVarP(&opts.ServerAddr, "server-addr", "s", "", "dedicated server <host>:<port>")
return cmd
}

154
cmd/q3/app/server/server.go Normal file
View File

@ -0,0 +1,154 @@
package server
import (
"context"
"fmt"
"io/ioutil"
"net/url"
"path/filepath"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"sigs.k8s.io/yaml"
quakeclient "github.com/criticalstack/quake-kube/internal/quake/client"
"github.com/criticalstack/quake-kube/internal/quake/content"
quakeserver "github.com/criticalstack/quake-kube/internal/quake/server"
netutil "github.com/criticalstack/quake-kube/internal/util/net"
httputil "github.com/criticalstack/quake-kube/internal/util/net/http"
"github.com/criticalstack/quake-kube/public"
)
var opts struct {
ClientAddr string
ServerAddr string
ContentServer string
AcceptEula bool
AssetsDir string
ConfigFile string
Maps string
}
func NewCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "server",
Short: "q3 server",
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
if opts.ClientAddr == "" {
hostIPv4, err := netutil.DetectHostIPv4()
if err != nil {
return err
}
opts.ClientAddr = fmt.Sprintf("%s:8080", hostIPv4)
}
if opts.ServerAddr == "" {
hostIPv4, err := netutil.DetectHostIPv4()
if err != nil {
return err
}
opts.ServerAddr = fmt.Sprintf("%s:27960", hostIPv4)
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
csurl, err := url.Parse(opts.ContentServer)
if err != nil {
return err
}
if !opts.AcceptEula {
fmt.Println(quakeserver.Q3DemoEULA)
return errors.New("You must agree to the EULA to continue")
}
if err := httputil.GetUntil(opts.ContentServer, ctx.Done()); err != nil {
return err
}
if err := content.CopyAssets(csurl, opts.AssetsDir); err != nil {
return err
}
if err := writeDefaultServerConfig(filepath.Join(opts.AssetsDir, "baseq3/server.cfg")); err != nil {
return err
}
if opts.ConfigFile != "" {
data, err := ioutil.ReadFile(opts.ConfigFile)
if err != nil {
return err
}
if err := ioutil.WriteFile(filepath.Join(opts.AssetsDir, "baseq3/server.cfg"), data, 0644); err != nil {
return err
}
}
if err := writeDefaultMapConfig(filepath.Join(opts.AssetsDir, "baseq3/maps.cfg")); err != nil {
return err
}
if opts.Maps != "" {
data, err := ioutil.ReadFile(opts.Maps)
if err != nil {
return err
}
var maps quakeserver.Maps
if err := yaml.Unmarshal(data, &maps); err != nil {
return err
}
data, err = maps.Marshal()
if err != nil {
return err
}
if err := ioutil.WriteFile(filepath.Join(opts.AssetsDir, "baseq3/maps.cfg"), data, 0644); err != nil {
return err
}
}
go func() {
if err := quakeserver.Start(ctx, opts.AssetsDir); err != nil {
panic(err)
}
}()
e, err := quakeclient.NewRouter(&quakeclient.Config{
ContentServerURL: opts.ContentServer,
ServerAddr: opts.ServerAddr,
Files: public.Files,
})
if err != nil {
return err
}
s := &quakeclient.Server{
Addr: opts.ClientAddr,
Handler: e,
ServerAddr: opts.ServerAddr,
}
fmt.Printf("Starting server %s\n", opts.ClientAddr)
return s.ListenAndServe()
},
}
cmd.Flags().StringVarP(&opts.ConfigFile, "config", "c", "", "server configuration file")
cmd.Flags().StringVar(&opts.ContentServer, "content-server", "http://content.quakejs.com", "content server url")
cmd.Flags().BoolVar(&opts.AcceptEula, "agree-eula", false, "agree to the Quake 3 demo EULA")
cmd.Flags().StringVar(&opts.AssetsDir, "assets-dir", "assets", "location for game files")
cmd.Flags().StringVar(&opts.ClientAddr, "client-addr", "", "client address <host>:<port>")
cmd.Flags().StringVar(&opts.ServerAddr, "server-addr", "", "dedicated server <host>:<port>")
cmd.Flags().StringVar(&opts.Maps, "maps", "", "map rotation")
return cmd
}
func writeDefaultMapConfig(path string) error {
maps := quakeserver.Maps{
{Name: "q3dm7", Type: quakeserver.FreeForAll},
{Name: "q3dm17", Type: quakeserver.FreeForAll},
}
data, err := maps.Marshal()
if err != nil {
return err
}
return ioutil.WriteFile(path, data, 0644)
}
func writeDefaultServerConfig(path string) error {
data, err := quakeserver.Default().Marshal()
if err != nil {
return err
}
return ioutil.WriteFile(path, data, 0644)
}

38
cmd/q3/main.go Normal file
View File

@ -0,0 +1,38 @@
package main
import (
"log"
"github.com/spf13/cobra"
q3cmd "github.com/criticalstack/quake-kube/cmd/q3/app/cmd"
q3content "github.com/criticalstack/quake-kube/cmd/q3/app/content"
q3proxy "github.com/criticalstack/quake-kube/cmd/q3/app/proxy"
q3server "github.com/criticalstack/quake-kube/cmd/q3/app/server"
)
var global struct {
Verbosity int
}
func NewRootCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "q3",
Short: "",
}
cmd.AddCommand(
q3cmd.NewCommand(),
q3content.NewCommand(),
q3proxy.NewCommand(),
q3server.NewCommand(),
)
cmd.PersistentFlags().CountVarP(&global.Verbosity, "verbose", "v", "log output verbosity")
return cmd
}
func main() {
if err := NewRootCommand().Execute(); err != nil {
log.Fatal(err)
}
}