monorepo fixes

2025-12-15 22:46:34 +01:00
parent 6108534a12
commit c58dbbe5b0
83 changed files with 2273 additions and 2042 deletions
@@ -1,52 +0,0 @@
-package modules
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/admin-else/strom"
-
-	"github.com/admin-else/queser"
-	"github.com/admin-else/queser/generated/v1_21_8"
-)
-
-type ConfigIgnorer struct {
-	*strom.Conn
-}
-
-func (c *ConfigIgnorer) Default(event any) (err error) {
-	fmt.Printf("%#v\n", event)
-	return
-}
-
-func (c *ConfigIgnorer) OnKnownPacks(packet v1_21_8.PacketCommonSelectKnownPacks) (err error) {
-	return c.Send(packet)
-}
-
-func (c *ConfigIgnorer) OnFinish(packet v1_21_8.ConfigurationToClientPacketFinishConfiguration) (err error) {
-	err = c.Send(v1_21_8.ConfigurationToServerPacketFinishConfiguration{})
-	if err != nil {
-		return
-	}
-	c.State = queser.Play
-	err = strom.HandlerDone
-	return
-}
-
-func (c *ConfigIgnorer) OnPing(packet v1_21_8.ConfigurationToClientPacketPing) (err error) {
-	err = c.Send(v1_21_8.ConfigurationToServerPacketPong(packet))
-	return
-}
-
-func (c *ConfigIgnorer) OnKeepAlive(packet v1_21_8.ConfigurationToClientPacketKeepAlive) (err error) {
-	err = c.Send(v1_21_8.ConfigurationToServerPacketKeepAlive(packet))
-	return
-}
-
-func IgnoreConfig(c *strom.Conn) (err error) {
-	err = c.Start(&ConfigIgnorer{c})
-	if err != nil {
-		err = errors.Join(err, errors.New("failed to ignore config"))
-	}
-	return
-}
@@ -1,181 +0,0 @@
-package modules
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/admin-else/strom"
-
-	"github.com/admin-else/queser"
-	"github.com/admin-else/queser/data"
-	"github.com/admin-else/queser/generated/v1_21_8"
-)
-
-type LoginClient struct {
-	*strom.Conn
-	Account strom.Account
-
-	GivenAccount v1_21_8.LoginToClientPacketSuccess
-}
-
-func (s *LoginClient) Default(event any) (err error) {
-	err = fmt.Errorf("unexpected event: %#v", event)
-	return
-}
-
-func (s *LoginClient) OnCycle(_ strom.OnLoopCycle) (err error) {
-	return
-}
-
-func (s *LoginClient) OnStart(_ strom.OnStart) (err error) {
-	host, portStr, err := net.SplitHostPort(s.RemoteAddr().String())
-	if err != nil {
-		return
-	}
-	versionData, err := data.LookUpProtocolVersionByName(s.Version)
-	if err != nil {
-		return
-	}
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		return
-	}
-	err = s.Send(v1_21_8.HandshakingToServerPacketSetProtocol{
-		ProtocolVersion: queser.VarInt(versionData.Version),
-		ServerHost:      host,
-		ServerPort:      uint16(port),
-		NextState:       queser.VarInt(queser.Login),
-	})
-	if err != nil {
-		return
-	}
-	s.State = queser.Login
-	err = s.Send(v1_21_8.LoginToServerPacketLoginStart{Username: s.Account.Name, PlayerUUID: s.Account.Uuid})
-	return
-}
-
-func (s *LoginClient) OnCompress(compress v1_21_8.LoginToClientPacketCompress) (err error) {
-	s.CompressionThreshold = int32(compress.Threshold)
-	return
-}
-
-func twosComplement(p []byte) []byte {
-	carry := true
-	for i := len(p) - 1; i >= 0; i-- {
-		p[i] = byte(^p[i])
-		if carry {
-			carry = p[i] == 0xff
-			p[i]++
-		}
-	}
-	return p
-}
-
-// AuthDigest stolen from https://gist.github.com/toqueteos/5372776
-func AuthDigest(elems ...[]byte) string {
-	h := sha1.New()
-	for _, elem := range elems {
-		h.Write(elem)
-	}
-	hash := h.Sum(nil)
-
-	negative := (hash[0] & 0x80) == 0x80
-	if negative {
-		hash = twosComplement(hash)
-	}
-
-	res := strings.TrimLeft(hex.EncodeToString(hash), "0")
-	if negative {
-		res = "-" + res
-	}
-
-	return res
-}
-
-func (s *LoginClient) OnEncrypt(packet v1_21_8.LoginToClientPacketEncryptionBegin) (err error) {
-	sharedSecret := make([]byte, 16)
-	_, _ = rand.Read(sharedSecret) //never fails
-
-	if packet.ShouldAuthenticate {
-		if s.Account.Ygg == "" {
-			err = fmt.Errorf("the account has no token so we cant join online servers")
-			return
-		}
-		serverId := AuthDigest([]byte(packet.ServerId), sharedSecret, packet.PublicKey)
-		err = s.Account.JoinServer(serverId)
-		if err != nil {
-			return
-		}
-	}
-
-	pubAny, err := x509.ParsePKIXPublicKey(packet.PublicKey)
-	if err != nil {
-		return
-	}
-	pub, ok := pubAny.(*rsa.PublicKey)
-	if !ok {
-		err = fmt.Errorf("public key is not rsa")
-		return
-	}
-	verifyTokenEnc, err := rsa.EncryptPKCS1v15(rand.Reader, pub, packet.VerifyToken)
-	if err != nil {
-		return
-	}
-
-	sharedSecretEnc, err := rsa.EncryptPKCS1v15(rand.Reader, pub, sharedSecret)
-	if err != nil {
-		return
-	}
-	err = s.Send(v1_21_8.LoginToServerPacketEncryptionBegin{SharedSecret: sharedSecretEnc, VerifyToken: verifyTokenEnc})
-	if err != nil {
-		return
-	}
-
-	var b cipher.Block
-	b, err = aes.NewCipher(sharedSecret)
-	if err != nil {
-		return
-	}
-	s.R = cipher.StreamReader{
-		S: strom.NewCFB8Decrypt(b, sharedSecret),
-		R: s.Conn,
-	}
-	s.W = cipher.StreamWriter{
-		S: strom.NewCFB8Encrypt(b, sharedSecret),
-		W: s.Conn,
-	}
-	return
-
-}
-
-func (s *LoginClient) OnSuccess(success v1_21_8.LoginToClientPacketSuccess) (err error) {
-	s.GivenAccount = success
-	err = s.Send(v1_21_8.LoginToServerPacketLoginAcknowledged{})
-	if err != nil {
-		return
-	}
-	s.State = queser.Configuration
-	err = strom.HandlerDone
-	return
-}
-
-func Login(c *strom.Conn, account strom.Account) (err error) {
-	err = c.Start(&LoginClient{
-		Conn:    c,
-		Account: account,
-	})
-	if err != nil {
-		err = errors.Join(err, errors.New("failed to login"))
-	}
-	return
-}
@@ -1,53 +0,0 @@
-package modules
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/admin-else/strom"
-
-	"github.com/admin-else/queser"
-	"github.com/admin-else/queser/data"
-	"github.com/admin-else/queser/generated/v1_21_8"
-)
-
-type StatusClient struct {
-	*strom.Conn
-	Status string
-}
-
-func (s *StatusClient) Default(event any) (err error) {
-	err = fmt.Errorf("unexpected event: %v", event)
-	return
-}
-
-func (s *StatusClient) OnStart(_ strom.OnStart) (err error) {
-	parts := strings.Split(s.RemoteAddr().String(), ":")
-	versionData, err := data.LookUpProtocolVersionByName(s.Version)
-	if err != nil {
-		return
-	}
-	port, err := strconv.Atoi(parts[1])
-	if err != nil {
-		return
-	}
-	err = s.Send(v1_21_8.HandshakingToServerPacketSetProtocol{
-		ProtocolVersion: queser.VarInt(versionData.Version),
-		ServerHost:      parts[0],
-		ServerPort:      uint16(port),
-		NextState:       queser.VarInt(queser.Status),
-	})
-	if err != nil {
-		return
-	}
-	s.State = queser.Status
-	err = s.Send(v1_21_8.StatusToServerPacketPingStart{})
-	return
-}
-
-func (s *StatusClient) OnStatus(p v1_21_8.StatusToClientPacketServerInfo) (err error) {
-	s.Status = p.Response
-	err = strom.HandlerDone
-	return
-}
@@ -1,63 +0,0 @@
-package modules
-
-import "time"
-
-type IntervalTask struct {
-	F           func() error
-	LastTrigger time.Time
-	Interval    time.Duration
-}
-
-type OnceTask struct {
-	F       func() error
-	Trigger time.Time
-}
-
-type Timer struct {
-	Once     []OnceTask
-	Interval []IntervalTask
-	Active   bool
-}
-
-func (t *Timer) Tick() (err error) {
-	if !t.Active {
-		return
-	}
-	for i, task := range t.Interval {
-		if time.Since(task.LastTrigger) >= task.Interval {
-			task.LastTrigger = time.Now()
-			err = task.F()
-			if err != nil {
-				return
-			}
-		}
-		t.Interval[i] = task
-	}
-	var triggerLater []OnceTask
-	for _, task := range t.Once {
-		if task.Trigger.After(time.Now()) {
-			err = task.F()
-			if err != nil {
-				return
-			}
-		} else {
-			triggerLater = append(triggerLater, task)
-		}
-	}
-	t.Once = triggerLater
-	return
-}
-
-func (t *Timer) Every(interval time.Duration, f func() error) {
-	t.Interval = append(t.Interval, IntervalTask{
-		F:        f,
-		Interval: interval,
-	})
-}
-
-func (t *Timer) In(interval time.Duration, f func() error) {
-	t.Once = append(t.Once, OnceTask{
-		F:       f,
-		Trigger: time.Now().Add(interval),
-	})
-}