fix(i18n): use English runtime text and localize system UI

This commit is contained in:
Arthur Koba
2026-10-25 19:44:15 +03:00
parent ada0550571
commit 65a96670d5
289 changed files with 8092 additions and 3426 deletions
@@ -19,7 +19,7 @@ import (
func TestParseAndValidatePagesDownloadURL(t *testing.T) {
_, err := parseAndValidatePagesDownloadURL("")
require.Error(t, err)
assert.Contains(t, err.Error(), "填写")
assert.Contains(t, err.Error(), "enter")
_, err = parseAndValidatePagesDownloadURL("ftp://example.com/a.zip")
require.Error(t, err)
+58 -58
View File
@@ -5,62 +5,62 @@
package pages
const (
errPagesProjectNotFound = "pages 项目不存在"
errPagesSlugExists = "pages 项目标识已存在"
errPagesNameRequired = "pages 项目名称不能为空"
errPagesSlugInvalid = "pages 项目标识只能包含小写字母、数字和连字符"
errPagesDeleteReferenced = "pages 项目已被规则引用,不能删除"
errPagesDeploymentNotFound = "pages 部署不存在"
errPagesDeploymentMismatch = "pages 部署不属于该项目"
errPagesDeleteActiveDeploy = "不能删除当前激活的 Pages 部署"
errPagesPackageMissing = "缺少 Pages 部署包"
errPagesPackageURLRequired = "请填写部署包下载链接"
errPagesPackageURLInvalid = "部署包下载链接无效,仅支持 http/https"
errPagesPackageURLDownloadFailed = "从链接下载部署包失败"
errPagesPackageURLTooLarge = "链接指向的部署包超过大小限制"
errPagesPackageNotZip = "pages 部署包必须是 .zip 文件" // legacy alias kept for tests
errPagesPackageUnsupported = "pages 部署包仅支持 zip、tar.gz、tar.xz、tar.bz2、tar、7z 格式"
errPagesPackageInvalidZip = "pages 部署包不是有效 zip 文件" // legacy alias
errPagesPackageInvalid = "pages 部署包不是有效的压缩文件"
errPagesPackageEmpty = "pages 部署包不能为空"
errPagesPackageExtractedTooLarge = "pages 部署包展开后体积超过限制"
errPagesPackageFileTooLarge = "pages 部署包内文件过大"
errPagesAPIProxyPathRequired = "启用 API 反代时,匹配路径不能为空"
errPagesAPIProxyPathPrefix = "API 反代匹配路径必须以 '/' 开头"
errPagesAPIProxyPassRequired = "启用 API 反代时,后端服务地址不能为空" //nolint:gosec // false positive: this is an error message, not hardcoded credentials
errPagesAPIProxyPassInvalid = "API 反代后端服务地址必须是有效的 HTTP/HTTPS URL" //nolint:gosec // false positive: this is an error message, not hardcoded credentials
errPagesPackagePathEmpty = "pages 部署包路径为空"
errPagesPackageUploadMissing = "pages 部署包上传记录不存在"
errPagesPackageNotInActiveConfig = "pages 部署尚未进入激活配置"
errPagesDeploymentHashMissing = "pages 部署包哈希缺失"
errPagesInvalidSnapshotFormat = "配置快照格式无效"
errPagesActorMissing = "无法识别当前用户"
errPagesEntryFileMissing = "当前激活部署中不存在指定入口文件"
errPagesSourceNotFound = "pages 部署源不存在"
errPagesSourceTypeRequired = "请选择 pages 部署源类型"
errPagesSourceTypeUnsupported = "pages 部署源类型不受支持"
errPagesSourceRemoteFields = "远程地址来源不能包含 GitHub 或自动更新配置"
errPagesSourceRemoteURLRequired = "请提供远程部署包地址"
errPagesSourceRemoteURLInvalid = "远程部署包地址无效,仅支持不含用户信息和片段的 http/https 地址"
errPagesSourceGitHubFields = "GitHub Release 来源不能包含远程地址配置"
errPagesSourceRepositoryInvalid = "GitHub 仓库地址无效,仅支持 https://github.com/{owner}/{repo}"
errPagesSourceSelectorInvalid = "GitHub Release 选择方式无效"
errPagesSourceAssetNameInvalid = "GitHub Release 资源名称必须是安全的文件名"
errPagesSourceCheckInterval = "GitHub latest 检查间隔必须在 5 到 1440 分钟之间"
errPagesSourceAutoNotAvailable = "自动更新将在后续阶段开放,当前必须保持关闭"
errPagesSourceReleaseNotFound = "未找到符合配置的 GitHub Release 资源"
errPagesSourceDigestInvalid = "GitHub Release 资源摘要格式无效"
errPagesSourceDigestMismatch = "GitHub Release 资源摘要校验失败"
errPagesSourceConfirmationNeeded = "检测到同一 Release 的资源已被替换,请刷新并确认当前版本"
errPagesSourceConfirmationStale = "确认的版本已变化,请刷新后重新确认"
errPagesSourceInitialCheckWarning = "部署源已保存,但首次检查任务入队失败,请稍后手动检查"
errPagesSourceCheckUnsupported = "远程地址来源不支持检查更新,请使用立即同步"
errPagesSourceActionBusy = "pages 部署源任务正在执行"
errPagesSourceActionInvalid = "pages 部署源任务参数无效"
errPagesSourceActionStale = "pages 部署源配置已变化,本次任务已跳过"
errPagesSourceLeaseLost = "pages 部署源任务执行权已失效"
errPagesSourceLeaseExpired = "上次 pages 部署源任务租约已过期"
errPagesSourceSyncFailed = "pages 部署源同步失败"
errPagesSourceTaskDispatchFailed = "pages 部署源任务入队失败"
errPagesSourceInternal = "pages 部署源操作失败,请稍后重试"
errPagesProjectNotFound = "pages project was not found"
errPagesSlugExists = "pages project slug already exists"
errPagesNameRequired = "pages project name must not be empty"
errPagesSlugInvalid = "pages project slug may only contain lowercase letters, digits and hyphens"
errPagesDeleteReferenced = "pages project is referenced by rules and cannot be deleted"
errPagesDeploymentNotFound = "pages deployment was not found"
errPagesDeploymentMismatch = "pages deployment does not belong to this project"
errPagesDeleteActiveDeploy = "the active Pages deployment cannot be deleted"
errPagesPackageMissing = "missing Pages deployment archive"
errPagesPackageURLRequired = "enter the deployment archive download URL"
errPagesPackageURLInvalid = "invalid deployment archive URL; only HTTP and HTTPS are supported"
errPagesPackageURLDownloadFailed = "Failed to download deployment archive from URL"
errPagesPackageURLTooLarge = "Deployment archive at the URL exceeds the size limit"
errPagesPackageNotZip = "Pages deployment archive must be a .zip file" // legacy alias kept for tests
errPagesPackageUnsupported = "pages archives support zip, tar.gz, tar.xz, tar.bz2, tar and 7z formats only"
errPagesPackageInvalidZip = "Pages deployment archive is not a valid ZIP file" // legacy alias
errPagesPackageInvalid = "pages deployment archive is not a valid compressed archive"
errPagesPackageEmpty = "pages deployment archive must not be empty"
errPagesPackageExtractedTooLarge = "extracted Pages deployment exceeds the size limit"
errPagesPackageFileTooLarge = "a file in the Pages deployment archive exceeds the size limit"
errPagesAPIProxyPathRequired = "match path is required when the API reverse proxy is enabled"
errPagesAPIProxyPathPrefix = "API reverse proxy match path must start with '/'"
errPagesAPIProxyPassRequired = "backend URL is required when the API reverse proxy is enabled" //nolint:gosec // false positive: this is an error message, not hardcoded credentials
errPagesAPIProxyPassInvalid = "API reverse proxy backend must be a valid HTTP/HTTPS URL" //nolint:gosec // false positive: this is an error message, not hardcoded credentials
errPagesPackagePathEmpty = "Pages deployment archive path is empty"
errPagesPackageUploadMissing = "pages deployment archive upload record was not found"
errPagesPackageNotInActiveConfig = "pages deployment is not included in the active configuration"
errPagesDeploymentHashMissing = "pages deployment archive hash is missing"
errPagesInvalidSnapshotFormat = "invalid configuration snapshot format"
errPagesActorMissing = "Unable to identify the current user"
errPagesEntryFileMissing = "The specified entry file does not exist in the active deployment"
errPagesSourceNotFound = "pages deployment source was not found"
errPagesSourceTypeRequired = "select a Pages deployment source type"
errPagesSourceTypeUnsupported = "unsupported Pages deployment source type"
errPagesSourceRemoteFields = "remote URL sources must not include GitHub or automatic update configuration"
errPagesSourceRemoteURLRequired = "provide the remote deployment archive URL"
errPagesSourceRemoteURLInvalid = "invalid remote archive URL; use HTTP/HTTPS without user information or fragments"
errPagesSourceGitHubFields = "GitHub Release sources must not include remote URL configuration"
errPagesSourceRepositoryInvalid = "invalid GitHub repository URL; use https://github.com/{owner}/{repo}"
errPagesSourceSelectorInvalid = "invalid GitHub Release selection mode"
errPagesSourceAssetNameInvalid = "GitHub Release asset name must be a safe filename"
errPagesSourceCheckInterval = "GitHub latest check interval must be between 5 and 1440 minutes"
errPagesSourceAutoNotAvailable = "Automatic updates will be available in a later stage and must remain disabled for now"
errPagesSourceReleaseNotFound = "no GitHub Release asset matches the configuration"
errPagesSourceDigestInvalid = "invalid GitHub Release asset digest format"
errPagesSourceDigestMismatch = "GitHub Release asset digest verification failed"
errPagesSourceConfirmationNeeded = "an asset in the same release was replaced; refresh and confirm the current version"
errPagesSourceConfirmationStale = "the confirmed version has changed; refresh and confirm again"
errPagesSourceInitialCheckWarning = "Deployment source saved, but the initial check could not be enqueued; run a manual check later"
errPagesSourceCheckUnsupported = "remote URL sources do not support update checks; use Sync now"
errPagesSourceActionBusy = "a Pages deployment source task is already running"
errPagesSourceActionInvalid = "invalid Pages deployment source task parameters"
errPagesSourceActionStale = "Pages deployment source configuration changed; task skipped"
errPagesSourceLeaseLost = "pages deployment source task ownership is no longer valid"
errPagesSourceLeaseExpired = "Previous Pages deployment source task lease expired"
errPagesSourceSyncFailed = "pages deployment source synchronization failed"
errPagesSourceTaskDispatchFailed = "failed to enqueue Pages deployment source task"
errPagesSourceInternal = "Pages deployment source operation failed; please try again later"
)
@@ -80,7 +80,7 @@ func checkGitHubSource(
if snapshot == nil || snapshot.SourceType != PagesSourceTypeGitHubRelease {
return nil, errors.New(errPagesSourceTypeUnsupported)
}
task.AppendLog(ctx, "[check] 正在检查 GitHub Release:repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
task.AppendLog(ctx, "[check] Checking GitHub Release: repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
client := newGitHubReleaseClient()
result, err := client.Resolve(ctx, githubrelease.ResolveRequest{
Repository: snapshot.GitHubRepository,
@@ -111,7 +111,7 @@ func checkGitHubSource(
}
detail, _ := json.Marshal(map[string]string{"revision": revision, pagesDeploymentColumnStatus: status})
return &githubCheckTaskResult{
Message: "GitHub Release 检查完成,内容未变化",
Message: "GitHub Release check completed; content is unchanged",
Detail: string(detail),
Revision: revision,
Status: status,
@@ -140,12 +140,12 @@ func checkGitHubSource(
return nil, err
}
detail, _ := json.Marshal(map[string]string{"revision": target.Revision, pagesDeploymentColumnStatus: status})
message := "GitHub Release 检查完成"
message := "GitHub Release check completed"
switch status {
case pagesSourceStatusUpdateAvailable:
message = "发现新的 GitHub Release 部署包"
message = "A new GitHub Release deployment archive is available"
case pagesSourceStatusAttention:
message = "检测到同一 Release 的资源被替换,需要确认"
message = "An asset in the same release was replaced; confirmation is required"
}
return &githubCheckTaskResult{
Message: message, Detail: string(detail), Revision: target.Revision,
@@ -454,7 +454,7 @@ func activatePreparedGitHubSource(
triggerType string,
prepared *preparedGitHubSource,
) (*sourceSyncOutcome, error) {
task.AppendLog(ctx, "[activate] 正在原子切换 GitHub Release 部署")
task.AppendLog(ctx, "[activate] Atomically switching GitHub Release deployment")
deployment, reused, referenced, err := commitSourceDeploymentWithTrigger(
ctx, snapshot, prepared.target.Revision, prepared.download.SHA256,
prepared.target.Detail, prepared.target.DetailJSON, actor, triggerType, prepared.manifest,
@@ -482,7 +482,7 @@ func resolveAndGuardGitHubSync(
targetRevision string,
confirmedRevision string,
) (*githubSourceTarget, *sourceSyncOutcome, error) {
task.AppendLog(ctx, "[resolve] 正在解析 GitHub Release:repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
task.AppendLog(ctx, "[resolve] Resolving GitHub Release: repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
resolved, err := client.Resolve(ctx, githubrelease.ResolveRequest{
Repository: snapshot.GitHubRepository,
Selector: githubrelease.Selector(snapshot.ReleaseSelector),
@@ -557,7 +557,7 @@ func prepareGitHubSyncPackage(
target *githubSourceTarget,
) (*preparedGitHubSource, error) {
limits := resolvePagesLimits(ctx)
task.AppendLog(ctx, "[download] 正在下载 GitHub Release asset:repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
task.AppendLog(ctx, "[download] Downloading GitHub Release asset: repo=%s asset=%s", snapshot.GitHubRepository, snapshot.AssetName)
download, err := client.Download(ctx, githubrelease.DownloadRequest{
Repository: snapshot.GitHubRepository,
Asset: target.Asset,
@@ -606,7 +606,7 @@ func inspectAndIngestGitHubPackage(
if err != nil {
return nil, err
}
task.AppendLog(ctx, "[verify] 正在校验 GitHub Release 归档与入口")
task.AppendLog(ctx, "[verify] Verifying GitHub Release archive and entry file")
manifest, err := inspectPagesPackage(download.Path, format, rootDir, entryFile, limits)
if err != nil {
return nil, err
@@ -633,7 +633,7 @@ func resolveGitHubSourceIngest(
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, err
}
task.AppendLog(ctx, "[ingest] 正在保存 GitHub Release 部署包")
task.AppendLog(ctx, "[ingest] Saving GitHub Release deployment archive")
result, err := ingestPagesDeploymentPackageWithSource(
ctx, download.Path, download.SHA256, snapshot.ProjectID, snapshot.SourceID, target.Asset.Name, format,
)
+15 -15
View File
@@ -116,11 +116,11 @@ func normalizePagesSlug(raw string) string {
func validateAndNormalizePagesRootDir(raw string) (string, error) {
value := strings.TrimSpace(raw)
if len(value) > pagesMaxPathLength {
return "", errors.New("pages 根目录长度不能超过 512")
return "", errors.New("pages root directory must not exceed 512 characters")
}
normalized, err := pagesarchive.NormalizeLogicalPath(value, true)
if err != nil {
return "", fmt.Errorf("pages 根目录不合法: %w", err)
return "", fmt.Errorf("invalid Pages root directory: %w", err)
}
return normalized, nil
}
@@ -131,33 +131,33 @@ func normalizePagesFallbackPath(raw string) (string, error) {
value = defaultPagesFallbackPath
}
if len(value) > pagesMaxPathLength {
return "", errors.New("spa fallback 回退路径长度不能超过 512")
return "", errors.New("SPA fallback path must not exceed 512 characters")
}
if !strings.HasPrefix(value, "/") {
return "", errors.New("spa fallback 回退路径必须以 / 开头")
return "", errors.New("SPA fallback path must start with /")
}
if value == "/" || strings.HasSuffix(value, "/") {
return "", errors.New("spa fallback 回退路径必须指向具体文件")
return "", errors.New("SPA fallback path must point to a specific file")
}
if strings.Contains(value, "\\") || strings.ContainsAny(value, "\"';") {
return "", errors.New("spa fallback 回退路径包含不支持的字符")
return "", errors.New("SPA fallback path contains unsupported characters")
}
for _, r := range value {
if r <= 0x20 || r == 0x7f {
return "", errors.New("spa fallback 回退路径不能包含空白或控制字符")
return "", errors.New("SPA fallback path must not contain whitespace or control characters")
}
}
for segment := range strings.SplitSeq(value, "/") {
if segment == "." || segment == ".." {
return "", errors.New("spa fallback 回退路径不能包含 . 或 .. 路径段")
return "", errors.New("SPA fallback path must not contain . or .. segments")
}
}
cleaned := path.Clean(value)
if cleaned == "." || !strings.HasPrefix(cleaned, "/") {
return "", errors.New("spa fallback 回退路径不合法")
return "", errors.New("invalid SPA fallback path")
}
if cleaned == "/" || strings.HasSuffix(cleaned, "/") {
return "", errors.New("spa fallback 回退路径必须指向具体文件")
return "", errors.New("SPA fallback path must point to a specific file")
}
return cleaned, nil
}
@@ -176,11 +176,11 @@ func validateAndNormalizePagesEntryFile(raw string) (string, error) {
value = defaultPagesEntryFile
}
if len(value) > pagesMaxPathLength {
return "", errors.New("pages 入口文件长度不能超过 512")
return "", errors.New("pages entry file must not exceed 512 characters")
}
normalized, err := pagesarchive.NormalizeLogicalPath(value, false)
if err != nil {
return "", fmt.Errorf("pages 入口文件不合法: %w", err)
return "", fmt.Errorf("invalid Pages entry file: %w", err)
}
return normalized, nil
}
@@ -209,7 +209,7 @@ func persistPagesUploadTemp(fileHeader *multipart.FileHeader, maxPackageBytes in
}
if written > maxPackageBytes {
_ = os.Remove(temp.Name())
return "", "", 0, "", fmt.Errorf("pages 部署包不能超过 %d MiB", maxPackageBytes/bytesPerMiB)
return "", "", 0, "", fmt.Errorf("pages deployment archive must not exceed %d MiB", maxPackageBytes/bytesPerMiB)
}
return temp.Name(), hex.EncodeToString(hash.Sum(nil)), written, format, nil
}
@@ -337,7 +337,7 @@ func removePagesUploadIfUnreferenced(ctx context.Context, projectID uint, upload
return err
}
if uploadRecord.Type != upload.ReservedPagesDeploymentType {
return fmt.Errorf("pages 部署包上传类型不匹配: %s", uploadRecord.Type)
return fmt.Errorf("pages deployment archive upload type mismatch: %s", uploadRecord.Type)
}
var references int64
@@ -406,7 +406,7 @@ func mapPagesArchiveError(err error) error {
case strings.Contains(message, "missing entry file"):
return err
case strings.Contains(message, "file count exceeds"):
return fmt.Errorf("pages 部署文件数不能超过 %d", pagesMaxDeploymentFiles)
return fmt.Errorf("pages deployment must not contain more than %d files", pagesMaxDeploymentFiles)
case strings.Contains(message, "extracted size exceeds"):
return errors.New(errPagesPackageExtractedTooLarge)
case strings.Contains(message, "file too large"), strings.Contains(message, "size out of bounds"):
+3 -3
View File
@@ -958,7 +958,7 @@ func deploymentPackageHash(ctx context.Context, deployment *model.PagesDeploymen
}
uploadRecord, err := upload.GetActiveUpload(ctx, deployment.UploadID)
if err != nil {
return "", fmt.Errorf("pages 部署包不存在: %w", err)
return "", fmt.Errorf("pages deployment archive was not found: %w", err)
}
hash := strings.TrimSpace(uploadRecord.Hash)
if hash == "" {
@@ -973,7 +973,7 @@ func deploymentPackageHash(ctx context.Context, deployment *model.PagesDeploymen
func openDeploymentPackageFromUpload(ctx context.Context, uploadID uint64, deploymentID uint) (DeploymentPackage, error) {
opened, err := upload.OpenStoredUpload(ctx, uploadID)
if err != nil {
return DeploymentPackage{}, fmt.Errorf("pages 部署包不存在: %w", err)
return DeploymentPackage{}, fmt.Errorf("pages deployment archive was not found: %w", err)
}
contentType := opened.ContentType
if contentType == "" {
@@ -1028,7 +1028,7 @@ func hydrateLegacyDeploymentUpload(
RelativePaths: pagesLegacyRelativeCandidates(project, deployment),
})
if err != nil {
return nil, fmt.Errorf("pages 部署包不存在: %w", err)
return nil, fmt.Errorf("pages deployment archive was not found: %w", err)
}
ingestResult, err := ingestPagesDeploymentPackage(
+2 -2
View File
@@ -163,7 +163,7 @@ func TestCreateProjectRejectsUnsafeFallbackPath(t *testing.T) {
SPAFallbackPath: "/index.html; proxy_pass http://evil",
})
require.Error(t, err)
assert.Contains(t, err.Error(), "回退路径")
assert.Contains(t, err.Error(), "fallback path")
}
func TestCreateProjectRejectsUnsafeContentPaths(t *testing.T) {
@@ -412,7 +412,7 @@ func TestOpenDeploymentPackageRequiresActiveConfigSnapshot(t *testing.T) {
_, err = OpenDeploymentPackage(ctx, deployment.ID)
require.Error(t, err)
assert.Contains(t, err.Error(), "激活配置")
assert.Contains(t, err.Error(), "active configuration")
require.NoError(t, db.DB(ctx).Create(&model.ConfigVersion{
Version: "v2026-001",
@@ -45,7 +45,7 @@ func GetProjectLatestPackageMetadata(ctx context.Context, projectID uint) (*Proj
uploadRecord, err := upload.GetActiveUpload(ctx, deployment.UploadID)
if err != nil {
return nil, fmt.Errorf("pages 部署包不存在: %w", err)
return nil, fmt.Errorf("pages deployment archive was not found: %w", err)
}
hash := strings.TrimSpace(uploadRecord.Hash)
if hash == "" {
+8 -8
View File
@@ -100,7 +100,7 @@ func rebindPagesRouteMaps(ctx context.Context, routes []map[string]json.RawMessa
if siteName == "" {
siteName = "pages"
}
return false, fmt.Errorf("路由 %s %w", siteName, err)
return false, fmt.Errorf("route %s %w", siteName, err)
}
project, activeDeployment, err := loadActivePagesProject(ctx, projectID, siteName)
if err != nil {
@@ -152,7 +152,7 @@ func resolveProjectIDFromRouteMap(route map[string]json.RawMessage) (uint, error
return deployment.ProjectID, nil
}
}
return 0, errors.New("pages 配置无效: 缺少 pages_project_id")
return 0, errors.New("invalid Pages configuration: missing pages_project_id")
}
func loadActivePagesProject(ctx context.Context, projectID uint, siteName string) (*model.PagesProject, *model.PagesDeployment, error) {
@@ -162,28 +162,28 @@ func loadActivePagesProject(ctx context.Context, projectID uint, siteName string
project, err := repository.GetPagesProjectByID(ctx, projectID)
if err != nil {
if errorsIsNotFound(err) {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 项目不存在", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: Pages project was not found", siteName)
}
return nil, nil, err
}
if !project.Enabled {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 项目未启用", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: Pages project is disabled", siteName)
}
if project.ActiveDeploymentID == nil || *project.ActiveDeploymentID == 0 {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 项目没有激活部署", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: Pages project has no active deployment", siteName)
}
activeDeployment, err := repository.GetPagesDeploymentByID(ctx, *project.ActiveDeploymentID)
if err != nil {
if errorsIsNotFound(err) {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 激活部署不存在", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: active Pages deployment was not found", siteName)
}
return nil, nil, err
}
if activeDeployment.ProjectID != project.ID {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 激活部署不匹配", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: active Pages deployment does not match", siteName)
}
if strings.TrimSpace(activeDeployment.Checksum) == "" {
return nil, nil, fmt.Errorf("路由 %s Pages 配置无效: pages 部署校验和缺失", siteName)
return nil, nil, fmt.Errorf("invalid Pages configuration for route %s: Pages deployment checksum is missing", siteName)
}
return project, activeDeployment, nil
}
+2 -2
View File
@@ -86,12 +86,12 @@ func decodeStrictJSON(c *gin.Context, target any, allowEmpty bool) bool {
func deploymentIDParam(c *gin.Context) (uint, bool) {
raw := c.Param("deployment_id")
if raw == "" {
response.AbortBadRequest(c, "无效的 ID")
response.AbortBadRequest(c, "Invalid ID")
return 0, false
}
id64, err := strconv.ParseUint(raw, 10, 64)
if err != nil || id64 == 0 {
response.AbortBadRequest(c, "无效的 ID")
response.AbortBadRequest(c, "Invalid ID")
return 0, false
}
return uint(id64), true
@@ -46,13 +46,13 @@ func (providerError remoteProviderError) Error() string {
}
const (
errRemoteProviderInvalidLimit remoteProviderError = "远程来源部署包大小限制无效"
errRemoteProviderRedirectLimit remoteProviderError = "远程来源重定向次数超过限制"
errRemoteProviderInvalidLimit remoteProviderError = "Invalid remote source archive size limit"
errRemoteProviderRedirectLimit remoteProviderError = "Remote source redirect limit exceeded"
errRemoteProviderDownloadFailed remoteProviderError = errPagesPackageURLDownloadFailed
errRemoteProviderTooLarge remoteProviderError = errPagesPackageURLTooLarge
errRemoteProviderEmpty remoteProviderError = errPagesPackageEmpty
errRemoteProviderUnsupported remoteProviderError = errPagesPackageUnsupported
errRemoteProviderCleanupFailed remoteProviderError = "清理远程来源临时文件失败"
errRemoteProviderCleanupFailed remoteProviderError = "Failed to clean up remote source temporary file"
)
// RemoteSourceRequest describes one immutable Remote URL package fetch.
+10 -10
View File
@@ -30,8 +30,8 @@ const (
var PagesSourceScanMeta = task.TaskMeta{
Type: TaskTypePagesSourceScan,
AsynqTask: PagesSourceScanTask,
Name: "OpenFlare Pages 部署源扫描",
Description: "补偿孤儿部署包、恢复过期执行权并串行检查到期的 GitHub latest 部署源",
Name: "OpenFlare Pages deployment source scan",
Description: "Clean up orphaned archives, recover expired source leases, and check GitHub sources tracking the latest release for updates",
SupportsTime: false,
MaxRetry: 0,
Queue: task.QueueDefault,
@@ -125,7 +125,7 @@ func (handler *SourceScanHandler) Execute(ctx context.Context, payload []byte) (
summary.OrphanCleanup = orphanSummary
task.AppendLog(
ctx,
"[cleanup] orphan 候选=%d,已补偿=%d,仍被引用=%d,lease busy=%d,非法 marker=%d,跳过=%d,失败=%d",
"[cleanup] orphan candidates=%d, compensated=%d, referenced=%d, lease busy=%d, invalid markers=%d, skipped=%d, failed=%d",
orphanSummary.Candidates,
orphanSummary.Reconciled,
orphanSummary.Referenced,
@@ -143,7 +143,7 @@ func (handler *SourceScanHandler) Execute(ctx context.Context, payload []byte) (
return nil, err
}
message := fmt.Sprintf(
"Pages 部署源扫描完成:恢复 %d 个租约,补偿 %d 个孤儿记录,检查 %d 个来源,投递 %d 个自动更新,积压 %d 个",
"Pages source scan completed: recovered %d leases, compensated %d orphan records, checked %d sources, dispatched %d automatic updates, backlog %d",
summary.RecoveredLeases,
summary.OrphanCleanup.Reconciled,
summary.CheckedSources,
@@ -195,7 +195,7 @@ func recoverExpiredPagesSourceLeases(
}
if recovered {
summary.RecoveredLeases++
task.AppendLog(ctx, "[recover] 已恢复过期来源租约:source_id=%d", candidate.SourceID)
task.AppendLog(ctx, "[recover] Recovered expired source lease: source_id=%d", candidate.SourceID)
}
}
return nil
@@ -223,7 +223,7 @@ func scanDueGitHubSources(
summary.SelectedSources = len(candidates)
task.AppendLog(
ctx,
"[scan] 到期来源=%d,本批=%d",
"[scan] Due sources=%d, batch=%d",
summary.DueSources,
summary.SelectedSources,
)
@@ -238,7 +238,7 @@ func scanDueGitHubSources(
return err
}
summary.Backlog = int(remainingDue)
task.AppendLog(ctx, "[scan] 本批处理后仍到期来源=%d", summary.Backlog)
task.AppendLog(ctx, "[scan] Sources still due after this batch=%d", summary.Backlog)
return nil
}
@@ -261,7 +261,7 @@ func scanOneDueGitHubSource(
switch outcome {
case sourceLeaseBusy:
summary.BusySources++
task.AppendLog(ctx, "[check] 来源正在执行其它任务,跳过:source_id=%d", candidate.SourceID)
task.AppendLog(ctx, "[check] Source is running another task; skipping: source_id=%d", candidate.SourceID)
return
case sourceLeaseStale:
summary.StaleSources++
@@ -333,7 +333,7 @@ func recordPagesSourceProviderBackoff(
})
task.AppendLog(
ctx,
"[check] GitHub provider 退避:source_id=%d status=%d retry_at=%s",
"[check] GitHub provider backoff: source_id=%d status=%d retry_at=%s",
sourceID,
domainError.statusCode,
retryAtText,
@@ -369,7 +369,7 @@ func handleCheckedGitHubSource(
if receipt != nil {
task.AppendLog(
ctx,
"[dispatch] 已投递自动更新:source_id=%d execution_id=%s revision=%s",
"[dispatch] Automatic update dispatched: source_id=%d execution_id=%s revision=%s",
snapshot.SourceID,
receipt.ExecutionID,
checkResult.Revision,
+5 -5
View File
@@ -224,7 +224,7 @@ func syncRemoteSourceWithTrigger(
return &sourceSyncOutcome{Stale: true}, nil
}
task.AppendLog(ctx, "[activate] 正在原子切换生产部署")
task.AppendLog(ctx, "[activate] Atomically switching production deployment")
deployment, reused, referenced, err := commitSourceDeploymentWithTrigger(
ctx,
snapshot,
@@ -266,7 +266,7 @@ func prepareRemoteSource(
snapshot *sourceExecutionSnapshot,
limits pagesLimits,
) (*preparedRemoteSource, error) {
task.AppendLog(ctx, "[download] 正在获取远程部署包")
task.AppendLog(ctx, "[download] Fetching remote deployment archive")
candidate, err := FetchRemoteSource(ctx, RemoteSourceRequest{
URL: snapshot.RemoteURL,
AllowInsecure: snapshot.AllowInsecure,
@@ -288,7 +288,7 @@ func prepareRemoteSource(
cleanupFailedRemoteCandidate(ctx, snapshot, candidate)
return nil, err
}
task.AppendLog(ctx, "[verify] 正在校验归档结构与入口文件")
task.AppendLog(ctx, "[verify] Verifying archive structure and entry file")
manifest, err := inspectPagesPackage(candidate.TempPath, candidate.Format, rootDir, entryFile, limits)
if err != nil {
cleanupFailedRemoteCandidate(ctx, snapshot, candidate)
@@ -335,7 +335,7 @@ func resolveSourceIngest(
if !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, err
}
task.AppendLog(ctx, "[ingest] 正在保存受管部署包")
task.AppendLog(ctx, "[ingest] Saving managed deployment archive")
result, err := ingestPagesDeploymentPackageWithSource(
ctx,
prepared.Candidate.TempPath,
@@ -361,7 +361,7 @@ func compensateSourceIngest(
}
cleanupCtx, cancel := sourceCleanupContext(ctx)
defer cancel()
task.AppendLog(cleanupCtx, "[cleanup] 正在补偿未引用的部署包记录")
task.AppendLog(cleanupCtx, "[cleanup] Compensating unreferenced deployment archive records")
if err := removePagesUploadIfUnreferenced(cleanupCtx, snapshot.ProjectID, state.Result.Upload.ID); err != nil {
logger.ErrorF(cleanupCtx,
"[PagesSource] compensate upload failed: project_id=%d source_id=%d upload_id=%d error=%v",
+10 -10
View File
@@ -36,8 +36,8 @@ var errUnexpectedJSONTrailingValue = errors.New("unexpected trailing JSON value"
var PagesSourceActionMeta = task.TaskMeta{
Type: TaskTypePagesSourceAction,
AsynqTask: PagesSourceActionTask,
Name: "OpenFlare Pages 部署源操作",
Description: "检查或同步 Pages 项目部署源",
Name: "OpenFlare Pages deployment source operation",
Description: "Check or synchronize a Pages project deployment source",
SupportsTime: false,
MaxRetry: 2,
Queue: task.QueueDefault,
@@ -138,14 +138,14 @@ func (h *SourceActionHandler) Execute(ctx context.Context, payload []byte) (*tas
source, err := repository.GetPagesProjectSourceByID(ctx, input.SourceID)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
task.AppendLog(ctx, "[resolve] 来源已不存在,本次任务跳过")
task.AppendLog(ctx, "[resolve] Source no longer exists; skipping task")
return &task.TaskResult{Message: errPagesSourceActionStale}, nil
}
logger.ErrorF(ctx, "[PagesSource] load source failed: source_id=%d error=%v", input.SourceID, err)
return nil, errors.New(errPagesSourceSyncFailed)
}
if source.ConfigVersion != input.ConfigVersion {
task.AppendLog(ctx, "[resolve] 来源配置已变化,本次任务跳过")
task.AppendLog(ctx, "[resolve] Source configuration changed; skipping task")
return &task.TaskResult{Message: errPagesSourceActionStale}, nil
}
if input.Action == sourceActionCheck && source.SourceType == PagesSourceTypeRemoteURL {
@@ -159,7 +159,7 @@ func (h *SourceActionHandler) Execute(ctx context.Context, payload []byte) (*tas
return nil, task.PermanentError(errPagesSourceActionInvalid)
}
task.AppendLog(ctx, "[resolve] 正在获取来源执行权")
task.AppendLog(ctx, "[resolve] Acquiring source task ownership")
snapshot, outcome, err := acquireSourceLease(ctx, input.SourceID, input.ConfigVersion, input.Action)
if err != nil {
logger.ErrorF(ctx, "[PagesSource] acquire lease failed: source_id=%d error=%v", input.SourceID, err)
@@ -167,10 +167,10 @@ func (h *SourceActionHandler) Execute(ctx context.Context, payload []byte) (*tas
}
switch outcome {
case sourceLeaseBusy:
task.AppendLog(ctx, "[resolve] 已有来源任务正在执行,本次任务跳过")
task.AppendLog(ctx, "[resolve] Another source task is running; skipping task")
return &task.TaskResult{Message: errPagesSourceActionBusy}, nil
case sourceLeaseStale:
task.AppendLog(ctx, "[resolve] 来源配置或执行权已变化,本次任务跳过")
task.AppendLog(ctx, "[resolve] Source configuration or ownership changed; skipping task")
return &task.TaskResult{Message: errPagesSourceActionStale}, nil
case sourceLeaseAcquired:
// 已获取执行权,继续执行。
@@ -220,12 +220,12 @@ func executeSourceSyncAction(
return nil, errors.New(errPagesSourceSyncFailed)
}
if result == nil || result.Stale {
task.AppendLog(ctx, "[activate] 来源配置或执行权已变化,本次任务未切换部署")
task.AppendLog(ctx, "[activate] Source configuration or ownership changed; deployment was not switched")
return &task.TaskResult{Message: errPagesSourceActionStale}, nil
}
message := "Pages 部署源同步并发布成功"
message := "Pages deployment source synchronized and published successfully"
if result.Reused {
message = "Pages 部署源内容未变化,已重新激活现有部署"
message = "Pages source content is unchanged; existing deployment reactivated"
}
return &task.TaskResult{Message: message, Detail: sourceSyncResultDetail(result)}, nil
}