refactor connection handling

Author: BuckarooBanzay

client_handler.go

@@ -61,6 +61,18 @@ func (c *CommandClient) AddListener(ch chan commands.Command) {
 	c.listeners = append(c.listeners, ch)
 }
 
+func (c *CommandClient) RemoveListener(ch chan commands.Command) {
+	c.listener_lock.Lock()
+	defer c.listener_lock.Unlock()
+	newlisteners := make([]chan commands.Command, 0)
+	for _, l := range c.listeners {
+		if l != ch {
+			newlisteners = append(newlisteners, l)
+		}
+	}
+	c.listeners = newlisteners
+}
+
 func (c *CommandClient) emitCommand(cmd commands.Command) {
 	c.listener_lock.RLock()
 	defer c.listener_lock.RUnlock()

commandclient/client.go

@@ -0,0 +1,34 @@
+package commandclient
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/minetest-go/minetest_client/commands"
+)
+
+func ClientReady(cc *CommandClient) error {
+	ch := make(chan commands.Command, 100)
+	cc.AddListener(ch)
+	defer cc.RemoveListener(ch)
+
+	for o := range ch {
+		switch o.(type) {
+		case *commands.ServerCSMRestrictionFlags:
+			fmt.Println("Server sends csm restriction flags")
+
+			fmt.Println("Sending CLIENT_READY")
+			err := cc.SendCommand(commands.NewClientReady(5, 5, 5, "mt-bot", 4))
+			if err != nil {
+				return err
+			}
+
+			fmt.Println("Sending PLAYERPOS")
+			ppos := commands.NewClientPlayerPos()
+			err = cc.SendCommand(ppos)
+			return err
+		}
+	}
+
+	return errors.New("channel closed")
+}

commandclient/clientready.go

@@ -0,0 +1,49 @@
+package commandclient
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/minetest-go/minetest_client/commands"
+)
+
+func DebugHandler(cc *CommandClient) error {
+	ch := make(chan commands.Command, 100)
+	cc.AddListener(ch)
+	defer cc.RemoveListener(ch)
+
+	for o := range ch {
+		switch cmd := o.(type) {
+		case *commands.ServerBlockData:
+			gotblocks := commands.NewClientGotBlocks()
+			gotblocks.AddBlock(cmd.Pos)
+
+			err := cc.SendCommand(gotblocks)
+			if err != nil {
+				return err
+			}
+		case *commands.ServerTimeOfDay:
+			fmt.Printf("Time of day: %d\n", cmd.TimeOfDay)
+		case *commands.ServerChatMessage:
+			fmt.Printf("Chat: %s\n", cmd)
+		case *commands.ServerMovePlayer:
+			fmt.Printf("Move player: '%s'\n", cmd)
+
+			time.Sleep(time.Second * 2)
+			fmt.Printf("Sending player pos command\n")
+			ppos := commands.NewClientPlayerPos()
+			ppos.PosX = uint32(cmd.X)
+			ppos.PosY = uint32(cmd.Y) + 50
+			ppos.PosZ = uint32(cmd.Z) + 50
+			ppos.FOV = 149
+			ppos.RequestViewRange = 13
+			err := cc.SendOriginalCommand(ppos)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return errors.New("channel closed")
+}

commandclient/debughandler.go

@@ -0,0 +1,79 @@
+package commandclient
+
+import (
+	"errors"
+	"fmt"
+	"os"
+
+	"github.com/minetest-go/minetest_client/commands"
+)
+
+func FetchMedia(cc *CommandClient) error {
+	ch := make(chan commands.Command, 1000)
+	cc.AddListener(ch)
+	defer cc.RemoveListener(ch)
+	received_count := 0
+	expected_count := 0
+
+	for o := range ch {
+		switch cmd := o.(type) {
+
+		case *commands.ServerAnnounceMedia:
+			fmt.Printf("Server announces media: %d assets\n", cmd.FileCount)
+
+			_, err := os.Stat("media")
+			if os.IsNotExist(err) {
+				err := os.Mkdir("media", 0755)
+				if err != nil {
+					return err
+				}
+			}
+
+			fmt.Printf("Sending REQUEST_MEDIA len=%d\n", len(cmd.Hashes))
+			files := make([]string, 0)
+			for name := range cmd.Hashes {
+				//fmt.Printf("Name: '%s'\n", name)
+
+				_, err := os.Stat("media/" + name)
+				if os.IsNotExist(err) {
+					files = append(files, name)
+					expected_count++
+				}
+
+			}
+
+			if len(files) > 0 {
+				reqmedia_cmd := commands.NewClientRequestMedia(files)
+				err = cc.SendCommand(reqmedia_cmd)
+				if err != nil {
+					return err
+				}
+			} else {
+				// nothing to fetch
+				return nil
+			}
+
+		case *commands.ServerMedia:
+			fmt.Printf("Server media: %s\n", cmd)
+			received_count += int(cmd.NumFiles)
+
+			for name, data := range cmd.Files {
+				_, err := os.Stat("media/" + name)
+				if os.IsNotExist(err) {
+					err = os.WriteFile("media/"+name, data, 0644)
+					if err != nil {
+						return err
+					}
+				}
+			}
+
+			fmt.Printf("Media status: received=%d, expected=%d\n", received_count, expected_count)
+			if received_count >= expected_count {
+				fmt.Println("Received all media files")
+				return nil
+			}
+		}
+	}
+
+	return errors.New("channel closed")
+}