From a664f1a869f8342985c07a26eb88c37bb1cc07e8 Mon Sep 17 00:00:00 2001 From: Syngnat Date: Thu, 4 Jun 2026 17:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(driver):=20=E7=B2=BE?= =?UTF-8?q?=E7=AE=80=E9=A9=B1=E5=8A=A8=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 驱动代理 revision 校验失败时不再在内外层重复拼接同一下载来源。 统一安装尝试错误格式，并折叠完全相同的失败条目。 补充 URL 前缀去重和安装尝试错误去重回归测试。 --- internal/app/methods_driver.go | 53 ++++++++++++++++----- internal/app/methods_driver_version_test.go | 24 ++++++++++ 2 files changed, 65 insertions(+), 12 deletions(-) diff --git a/internal/app/methods_driver.go b/internal/app/methods_driver.go index ed94eb0..ba845d3 100644 --- a/internal/app/methods_driver.go +++ b/internal/app/methods_driver.go @@ -3374,15 +3374,12 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut if a != nil { a.emitDriverDownloadProgress(driverType, "downloading", 10, 100, planMessage) } - validateInstalledCandidateRevision := func(source string) error { + validateInstalledCandidateRevision := func() error { if _, revisionErr := verifyInstalledOptionalDriverAgentRevision(driverType, executablePath, selectedVersion); revisionErr != nil { _ = os.Remove(executablePath) for _, supportName := range optionalDriverSupportFileNames(driverType) { _ = os.Remove(filepath.Join(filepath.Dir(executablePath), supportName)) } - if strings.TrimSpace(source) != "" { - return fmt.Errorf("%s: %w", source, revisionErr) - } return revisionErr } return nil @@ -3400,8 +3397,8 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut if hashErr != nil { return "", "", fmt.Errorf("计算预置 %s 驱动代理摘要失败：%w", displayName, hashErr) } - if revisionErr := validateInstalledCandidateRevision(sourcePath); revisionErr != nil { - return "", "", fmt.Errorf("预置 %s 驱动代理 revision 校验失败：%w", displayName, revisionErr) + if revisionErr := validateInstalledCandidateRevision(); revisionErr != nil { + return "", "", fmt.Errorf("预置 %s 驱动代理 revision 校验失败（来源：%s）：%w", displayName, sourcePath, revisionErr) } return "file://" + sourcePath, hash, nil } @@ -3437,15 +3434,15 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut } hash, dlErr := downloadOptionalDriverAgentBinary(a, definition, candidateURL, executablePath) if dlErr == nil { - if revisionErr := validateInstalledCandidateRevision(candidateURL); revisionErr != nil { + if revisionErr := validateInstalledCandidateRevision(); revisionErr != nil { logger.Warnf("预编译 %s 驱动代理 revision 校验失败，url=%s err=%v", displayName, candidateURL, revisionErr) - downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", candidateURL, strings.TrimSpace(revisionErr.Error()))) + downloadErrs = appendOptionalDriverAttemptError(downloadErrs, candidateURL, revisionErr) continue } return candidateURL, hash, nil } logger.Warnf("下载预编译 %s 驱动代理失败，url=%s err=%v", displayName, candidateURL, dlErr) - downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", candidateURL, strings.TrimSpace(dlErr.Error()))) + downloadErrs = appendOptionalDriverAttemptError(downloadErrs, candidateURL, dlErr) } } if len(bundleURLs) > 0 { @@ -3460,15 +3457,15 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut } source, hash, bundleErr := downloadOptionalDriverAgentFromBundle(a, definition, bundleURL, executablePath) if bundleErr == nil { - if revisionErr := validateInstalledCandidateRevision(source); revisionErr != nil { + if revisionErr := validateInstalledCandidateRevision(); revisionErr != nil { logger.Warnf("驱动总包 %s 代理 revision 校验失败，source=%s err=%v", displayName, source, revisionErr) - downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", source, strings.TrimSpace(revisionErr.Error()))) + downloadErrs = appendOptionalDriverAttemptError(downloadErrs, source, revisionErr) continue } return source, hash, nil } logger.Warnf("从驱动总包提取 %s 驱动代理失败，url=%s err=%v", displayName, bundleURL, bundleErr) - downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", bundleURL, strings.TrimSpace(bundleErr.Error()))) + downloadErrs = appendOptionalDriverAttemptError(downloadErrs, bundleURL, bundleErr) } } else if len(downloadURLs) > 0 || restrictToExplicitArtifact { fallbackMessage := buildOptionalDriverFallbackProgressMessage(displayName, len(downloadURLs), 0, restrictToExplicitArtifact) @@ -3501,6 +3498,38 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut return "", "", errors.New(strings.Join(parts, "；")) } +func appendOptionalDriverAttemptError(entries []string, source string, err error) []string { + text := formatOptionalDriverAttemptError(source, err) + if text == "" { + return entries + } + for _, existing := range entries { + if existing == text { + return entries + } + } + return append(entries, text) +} + +func formatOptionalDriverAttemptError(source string, err error) string { + message := errorMessage(err) + if message == "" { + return "" + } + source = strings.TrimSpace(source) + if source == "" { + return message + } + duplicatedPrefix := source + ":" + if strings.HasPrefix(message, duplicatedPrefix) { + message = strings.TrimSpace(strings.TrimPrefix(message, duplicatedPrefix)) + } + if message == "" { + return source + } + return source + ": " + message +} + func shouldUseOptionalDriverBundleFallback(driverType string, restrictToExplicitArtifact bool, directURLCount int) bool { if restrictToExplicitArtifact { return false diff --git a/internal/app/methods_driver_version_test.go b/internal/app/methods_driver_version_test.go index 16269fa..9432fbd 100644 --- a/internal/app/methods_driver_version_test.go +++ b/internal/app/methods_driver_version_test.go @@ -227,6 +227,30 @@ func TestShouldUseOptionalDriverBundleFallbackKeepsBundleWhenDirectAssetMissing( } } +func TestFormatOptionalDriverAttemptErrorRemovesDuplicatedSourcePrefix(t *testing.T) { + source := "https://github.com/Syngnat/GoNavi-DriverAgents/releases/download/dev-latest/kingbase-driver-agent-darwin-arm64" + err := fmt.Errorf("%s: kingbase 驱动代理 revision 不匹配（已安装：src-old，当前需要：src-new），请安装当前版本对应的 driver-agent", source) + + got := formatOptionalDriverAttemptError(source, err) + if strings.Count(got, source) != 1 { + t.Fatalf("expected source to appear once, got %q", got) + } + if !strings.Contains(got, "kingbase 驱动代理 revision 不匹配") { + t.Fatalf("expected revision mismatch detail, got %q", got) + } +} + +func TestAppendOptionalDriverAttemptErrorDeduplicatesIdenticalEntries(t *testing.T) { + source := "https://github.com/Syngnat/GoNavi-DriverAgents/releases/latest/download/GoNavi-DriverAgents.zip#MacOS/kingbase-driver-agent-darwin-arm64" + err := fmt.Errorf("kingbase 驱动代理 revision 不匹配（已安装：src-old，当前需要：src-new），请安装当前版本对应的 driver-agent") + + entries := appendOptionalDriverAttemptError(nil, source, err) + entries = appendOptionalDriverAttemptError(entries, source, err) + if len(entries) != 1 { + t.Fatalf("expected duplicate driver attempt error to be collapsed, got %d entries: %v", len(entries), entries) + } +} + func TestResolveDriverInstallVersionUsesPinnedVersionForBuiltinActivateURL(t *testing.T) { definition, ok := resolveDriverDefinition("sqlserver") if !ok {