jester/zlh-agent
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

updates 4-19-26

Browse Source
This commit is contained in:
jester 2026-04-19 21:51:00 +00:00
parent 08aba389e4
commit 2517a41ddf
12 changed files with 42 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/files/files.go
View File

@ -717,13 +717,6 @@ func sourceForPath(root, rel string) *string {
return &source
}
func min(a, b int) int {
if a < b {
return a
}
return b
}
func normalizeAndCheckVisibleRel(rel string) (string, error) {
normalizedRel, err := normalizeRelativePath(rel)
if err != nil {

59
internal/http/agent.go
View File

@ -8,7 +8,6 @@ import (
"net/http"
"os"
"path/filepath"
"strconv"
"strings"
"time"
@ -293,7 +292,7 @@ func ensureProvisioned(cfg *state.Config) error {
}
func ensureDevCodeServer(cfg *state.Config) error {
if cfg == nil || !devCodeServerRequested(*cfg) {
if cfg == nil || !provision.CodeServerRequested(*cfg) {
return nil
}
@ -316,18 +315,6 @@ func ensureDevCodeServer(cfg *state.Config) error {
return nil
}
func devCodeServerRequested(cfg state.Config) bool {
if cfg.EnableCodeServer {
return true
}
for _, addon := range cfg.Addons {
if strings.EqualFold(addon, "codeserver") {
return true
}
}
return false
}
/*
--------------------------------------------------------------------------
/config — the REAL provisioning trigger (async)
@ -864,49 +851,13 @@ func handleGamePlayers(w http.ResponseWriter, r *http.Request) {
return
}
ports := make([]int, 0, 3)
propsPath := filepath.Join(provision.ServerDir(*cfg), "server.properties")
if b, err := os.ReadFile(propsPath); err == nil {
lines := strings.Split(string(b), "\n")
for _, l := range lines {
if strings.HasPrefix(l, "server-port=") {
if p, err := strconv.Atoi(strings.TrimPrefix(l, "server-port=")); err == nil && p > 0 {
ports = append(ports, p)
}
break
}
}
}
if len(cfg.Ports) > 0 && cfg.Ports[0] > 0 {
ports = append(ports, cfg.Ports[0])
}
ports = append(ports, 25565)
seenPorts := make(map[int]struct{}, len(ports))
uniqPorts := make([]int, 0, len(ports))
for _, p := range ports {
if _, ok := seenPorts[p]; ok {
continue
}
seenPorts[p] = struct{}{}
uniqPorts = append(uniqPorts, p)
}
protocols := []int{mcstatus.ProtocolForVersion(cfg.Version), 767, 765, 763, 762, 754}
seenProtocols := make(map[int]struct{}, len(protocols))
uniqProtocols := make([]int, 0, len(protocols))
for _, pr := range protocols {
if _, ok := seenProtocols[pr]; ok {
continue
}
seenProtocols[pr] = struct{}{}
uniqProtocols = append(uniqProtocols, pr)
}
ports := mcstatus.CandidatePorts(*cfg)
protocols := mcstatus.CandidateProtocols(cfg.Version)
var status mcstatus.StatusResponse
var lastErr error
for _, port := range uniqPorts {
for _, protocol := range uniqProtocols {
for _, port := range ports {
for _, protocol := range protocols {
s, err := mcstatus.QueryStatus("127.0.0.1", port, protocol)
if err != nil {
lastErr = err

19
internal/minecraft/readiness.go
View File

@ -15,9 +15,8 @@ import (
func WaitUntilReady(cfg state.Config, timeout, interval time.Duration) error {
start := time.Now()
ports := candidatePorts(cfg)
protocols := []int{ProtocolForVersion(cfg.Version), 767, 765, 763, 762, 754}
protocols = dedupeInts(protocols)
ports := CandidatePorts(cfg)
protocols := CandidateProtocols(cfg.Version)
attempt := 0
deadline := start.Add(timeout)
@ -50,14 +49,14 @@ func WaitUntilReady(cfg state.Config, timeout, interval time.Duration) error {
}
}
func candidatePorts(cfg state.Config) []int {
func CandidatePorts(cfg state.Config) []int {
ports := make([]int, 0, 3)
propsPath := filepath.Join(provision.ServerDir(cfg), "server.properties")
if b, err := os.ReadFile(propsPath); err == nil {
lines := strings.Split(string(b), "\n")
for _, l := range lines {
if strings.HasPrefix(l, "server-port=") {
if p, err := strconv.Atoi(strings.TrimPrefix(l, "server-port=")); err == nil && p > 0 {
lines := strings.SplitSeq(string(b), "\n")
for l := range lines {
if after, ok := strings.CutPrefix(l, "server-port="); ok {
if p, err := strconv.Atoi(after); err == nil && p > 0 {
ports = append(ports, p)
}
break
@ -71,6 +70,10 @@ func candidatePorts(cfg state.Config) []int {
return dedupeInts(ports)
}
func CandidateProtocols(version string) []int {
return dedupeInts([]int{ProtocolForVersion(version), 767, 765, 763, 762, 754})
}
func dedupeInts(in []int) []int {
seen := make(map[int]struct{}, len(in))
out := make([]int, 0, len(in))

2
internal/minecraft/status.go
View File

@ -45,7 +45,7 @@ func ProtocolForVersion(version string) int {
}
func QueryStatus(host string, port int, protocol int) (StatusResponse, error) {
addr := fmt.Sprintf("%s:%d", host, port)
addr := net.JoinHostPort(host, fmt.Sprintf("%d", port))
conn, err := net.DialTimeout("tcp", addr, 3*time.Second)
if err != nil {
return StatusResponse{}, err

12
internal/mods/installer.go
View File

@ -307,8 +307,8 @@ func validateExpectedHash(v string) error {
func normalizeExpectedHash(raw string, expectedLen int, prefix string) (string, error) {
v := strings.TrimSpace(strings.ToLower(raw))
if strings.HasPrefix(v, prefix+":") {
v = strings.TrimPrefix(v, prefix+":")
if after, ok := strings.CutPrefix(v, prefix+":"); ok {
v = after
}
if len(v) != expectedLen {
return "", fmt.Errorf("%s must include %d hex characters", prefix, expectedLen)
@ -407,12 +407,12 @@ func uniqueRemovedPath(dir, filename string) string {
}
base := filename
ext := ""
if strings.HasSuffix(filename, ".disabled") {
base = strings.TrimSuffix(filename, ".disabled")
if before, ok := strings.CutSuffix(filename, ".disabled"); ok {
base = before
ext = ".disabled"
}
if strings.HasSuffix(base, ".jar") {
base = strings.TrimSuffix(base, ".jar")
if before, ok := strings.CutSuffix(base, ".jar"); ok {
base = before
ext = ".jar" + ext
}
ts := time.Now().UTC().Format("20060102T150405")

8
internal/mods/metadata.go
View File

@ -123,8 +123,8 @@ func mergeFabricMetadata(out *jarMetadata, b []byte) {
}
func mergeModsTOMLMetadata(out *jarMetadata, b []byte) {
lines := strings.Split(string(b), "\n")
for _, raw := range lines {
lines := strings.SplitSeq(string(b), "\n")
for raw := range lines {
line := strings.TrimSpace(raw)
if line == "" || strings.HasPrefix(line, "#") {
continue
@ -182,8 +182,8 @@ func mergeModInfoMap(out *jarMetadata, obj map[string]any) {
}
func mergePluginYAMLMetadata(out *jarMetadata, b []byte) {
lines := strings.Split(string(b), "\n")
for _, raw := range lines {
lines := strings.SplitSeq(string(b), "\n")
for raw := range lines {
line := strings.TrimSpace(raw)
if line == "" || strings.HasPrefix(line, "#") {
continue

5
internal/provision/devcontainer/common.go
View File

@ -10,6 +10,7 @@ import (
"os/exec"
"os/user"
"path/filepath"
"slices"
"strconv"
"strings"
"time"
@ -154,12 +155,10 @@ func ValidateRuntimeSelection(cfg state.Config) error {
for _, runtime := range catalog.Runtimes {
if strings.EqualFold(runtime.ID, runtimeID) {
for _, candidate := range runtime.Versions {
if candidate == version {
if slices.Contains(runtime.Versions, version) {
log.Printf("[provision] action=validate_runtime runtime=%s version=%s status=ok", runtimeID, version)
return nil
}
}
return fmt.Errorf("unsupported %s version: %s", runtimeID, version)
}
}

5
internal/provision/files.go
View File

@ -95,10 +95,7 @@ func WriteStartScript(cfg state.Config) error {
}
xmx := mem
xms := mem / 2
if xms < 512 {
xms = 512
}
xms := max(mem/2, 512)
if xms > xmx {
xms = xmx
}

5
internal/provision/minecraft/fabric_proxy.go
View File

@ -300,10 +300,7 @@ func parseVersion(raw string) ([]int, error) {
}
func compareVersionSlices(a, b []int) int {
maxLen := len(a)
if len(b) > maxLen {
maxLen = len(b)
}
maxLen := max(len(b), len(a))
for i := 0; i < maxLen; i++ {
ai := 0

4
internal/provision/provision.go
View File

@ -151,7 +151,7 @@ func ProvisionAll(cfg state.Config) error {
/* ---------------------------------------------------------
ADDONS (OPTIONAL, ROLE-AGNOSTIC)
--------------------------------------------------------- */
if strings.EqualFold(cfg.ContainerType, "dev") && codeServerRequested(cfg) {
if strings.EqualFold(cfg.ContainerType, "dev") && CodeServerRequested(cfg) {
seen := false
for _, addon := range cfg.Addons {
if strings.EqualFold(addon, "codeserver") {
@ -173,7 +173,7 @@ func ProvisionAll(cfg state.Config) error {
return nil
}
func codeServerRequested(cfg state.Config) bool {
func CodeServerRequested(cfg state.Config) bool {
if cfg.EnableCodeServer {
return true
}

14
internal/system/process.go
View File

@ -182,10 +182,7 @@ func minecraftHeap(memoryMB int) (xms int, xmx int) {
mem = 2048
}
xmx = mem
xms = mem / 2
if xms < 512 {
xms = 512
}
xms = max(mem/2, 512)
if xms > xmx {
xms = xmx
}
@ -411,8 +408,8 @@ func GetConsolePTY(cfg *state.Config) (*os.File, error) {
}
func WriteConsoleInput(cfg *state.Config, input string) error {
if strings.HasSuffix(input, "\n") {
input = strings.TrimSuffix(input, "\n")
if before, ok := strings.CutSuffix(input, "\n"); ok {
input = before
}
payload := []byte(input + "\n")
@ -469,10 +466,7 @@ func buildCrashInfo(cfg *state.Config, waitErr error, startedAt time.Time) *stat
exitCode, signal := extractExitDetails(waitErr)
uptime := int64(0)
if !startedAt.IsZero() {
uptime = int64(time.Since(startedAt).Seconds())
if uptime < 0 {
uptime = 0
}
uptime = max(int64(time.Since(startedAt).Seconds()), 0)
}
logTail := tailLogLines(cfg, 40)

6
state/update.json
View File

@ -1,6 +1,6 @@
{
"status": "error",
"status": "available",
"current": "0.0.0-dev",
"error": "Get \"http://zlh-artifacts.internal.zlh:8080/agents/manifest.json\": context deadline exceeded (Client.Timeout exceeded while awaiting headers)",
"checked_at_utc": "2026-04-19T11:18:03Z"
"target": "1.0.68",
"checked_at_utc": "2026-04-19T21:48:03Z"
}