fix(v3:obfuscation): address CodeRabbit review feedback on garble PR

taliesin-ai · multica-agent · taliesin-ai · commit 4d8a37444bcb · 2026-05-15T23:47:50.000+10:00
- Pin garble install to @v0.16.0 in all three platform Taskfiles to avoid incompatibility with Go versions outside the garble-supported range - Normalize obfuscated-output path via filepath.Abs before self-package lookup in resolveObfuscatedOutput, fixing the relative-path bug that caused empty selfPkgPath and invalid self-imports - Reserve "application" alias in buildPackageAliases to prevent alias collision when a service package is also named "application" - Add UnregisterBindingMethodID for test-cleanup and use it in TestRegisteredBindingMethodID to keep the global registry hermetic Fixes coderabbitai review threads 1-4 on PR wailsapp#5337. Co-authored-by: multica-agent <github@multica.ai>
diff --git a/v3/internal/commands/build_assets/darwin/Taskfile.yml b/v3/internal/commands/build_assets/darwin/Taskfile.yml
@@ -44,7 +44,7 @@ tasks:
       - task: common:generate:icons
     preconditions:
       - sh: '{{if eq .OBFUSCATED "true"}}command -v garble >/dev/null 2>&1{{else}}true{{end}}'
-        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@latest"
+        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@v0.16.0 (requires Go 1.24+). See https://github.com/burrowers/garble/releases for version/toolchain compatibility."
     cmds:
       - '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o "{{.OUTPUT}}"'
     vars:
diff --git a/v3/internal/commands/build_assets/linux/Taskfile.yml b/v3/internal/commands/build_assets/linux/Taskfile.yml
@@ -55,7 +55,7 @@ tasks:
       - task: generate:dotdesktop
     preconditions:
       - sh: '{{if eq .OBFUSCATED "true"}}command -v garble >/dev/null 2>&1{{else}}true{{end}}'
-        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@latest"
+        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@v0.16.0 (requires Go 1.24+). See https://github.com/burrowers/garble/releases for version/toolchain compatibility."
     cmds:
       - '{{if eq .OBFUSCATED "true"}}garble {{.GARBLE_ARGS}} build{{else}}go build{{end}} {{.BUILD_FLAGS}} -o {{.OUTPUT}}'
     vars:
diff --git a/v3/internal/commands/build_assets/windows/Taskfile.yml b/v3/internal/commands/build_assets/windows/Taskfile.yml
@@ -46,7 +46,7 @@ tasks:
       - task: common:generate:icons
     preconditions:
       - sh: '{{if eq .OBFUSCATED "true"}}command -v garble >/dev/null 2>&1{{else}}true{{end}}'
-        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@latest"
+        msg: "garble is required for obfuscated builds. Install it with: go install mvdan.cc/garble@v0.16.0 (requires Go 1.24+). See https://github.com/burrowers/garble/releases for version/toolchain compatibility."
     cmds:
       - task: generate:syso
         vars:
diff --git a/v3/internal/generator/binding_ids.go b/v3/internal/generator/binding_ids.go
@@ -90,7 +90,14 @@ func (generator *Generator) resolveObfuscatedOutput() (dir, packageName string,
 		)
 	}
 
-	packageName, err := resolveTargetPackageName(dir)
+	absDir, err := filepath.Abs(dir)
+	if err != nil {
+		generator.logger.Errorf("obfuscated bindings: resolve output dir %s: %v", dir, err)
+		return "", "", false
+	}
+	dir = absDir
+
+	packageName, err = resolveTargetPackageName(dir)
 	if err != nil {
 		fallback := filepath.Base(dir)
 		generator.logger.Warningf(
@@ -235,7 +242,9 @@ func writeMetadataInit(buf *bytes.Buffer, registrations []bindingIDRegistration,
 // to without an import.
 func buildPackageAliases(registrations []bindingIDRegistration, selfPkgPath string) map[string]string {
 	aliases := make(map[string]string)
-	used := make(map[string]bool)
+	used := map[string]bool{
+		"application": true,
+	}
 
 	seen := make(map[string]string)
 	var paths []string
diff --git a/v3/pkg/application/bindings.go b/v3/pkg/application/bindings.go
@@ -103,6 +103,16 @@ func RegisterBindingMethodID(method any, id uint32) {
 	registeredBindingMethodIDs.Store(value.Pointer(), id)
 }
 
+// UnregisterBindingMethodID removes the stable binding ID for a service method.
+// Intended for use in tests to restore global state after calling RegisterBindingMethodID.
+func UnregisterBindingMethodID(method any) {
+	value := reflect.ValueOf(method)
+	if value.Kind() != reflect.Func {
+		return
+	}
+	registeredBindingMethodIDs.Delete(value.Pointer())
+}
+
 func getRegisteredBindingMethodID(method reflect.Method) (uint32, bool) {
 	id, ok := registeredBindingMethodIDs.Load(method.Func.Pointer())
 	if !ok {
diff --git a/v3/pkg/application/bindings_test.go b/v3/pkg/application/bindings_test.go
@@ -197,6 +197,7 @@ func TestRegisteredBindingMethodID(t *testing.T) {
 	_ = application.New(application.Options{})
 
 	application.RegisterBindingMethodID((*TestService).String, stableID)
+	t.Cleanup(func() { application.UnregisterBindingMethodID((*TestService).String) })
 
 	bindings := application.NewBindings(nil, nil)
 	if err := bindings.Add(application.NewService(&TestService{})); err != nil {
