feat(desktop): add client release updater
Desktop Client Build / Resolve Build Metadata (push) Successful in 19s
Frontend CI / Frontend (push) Successful in 3m20s
Backend CI / Backend (push) Successful in 16m48s
Desktop Client Build / Build Desktop Client (push) Successful in 24m46s
Desktop Client Build / Publish Client Artifacts to NAS (push) Successful in 37s

This commit is contained in:
2026-05-25 19:23:49 +08:00
parent 41b4a765ac
commit 5f6e9f11da
46 changed files with 5508 additions and 160 deletions
+105 -1
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"strings"
"time"
"github.com/aliyun/aliyun-oss-go-sdk/oss"
"go.uber.org/zap"
@@ -106,11 +107,20 @@ func (c *aliyunClient) PutBytes(ctx context.Context, objectKey string, content [
return fmt.Errorf("get aliyun bucket: %w", err)
}
if err := bucket.PutObject(objectKey, bytes.NewReader(content), oss.ContentType(contentType)); err != nil {
options, err := aliyunPutObjectOptions(c.cfg, contentType)
if err != nil {
return err
}
if err := bucket.PutObject(objectKey, bytes.NewReader(content), options...); err != nil {
c.logError(ctx, "aliyun put object failed",
zap.String("bucket", c.bucket),
zap.String("object_key", objectKey),
zap.Int("content_size", len(content)),
zap.String("object_acl", strings.TrimSpace(c.cfg.ObjectACL)),
zap.String("content_type", contentType),
zap.String("aliyun_error_code", aliyunErrorCode(err)),
zap.String("aliyun_request_id", aliyunRequestID(err)),
zap.Int("aliyun_status_code", aliyunStatusCode(err)),
zap.Error(err),
)
return fmt.Errorf("put aliyun object: %w", err)
@@ -119,6 +129,47 @@ func (c *aliyunClient) PutBytes(ctx context.Context, objectKey string, content [
return nil
}
func aliyunPutObjectOptions(cfg config.ObjectStorageConfig, contentType string) ([]oss.Option, error) {
options := []oss.Option{oss.ContentType(contentType)}
acl := strings.ToLower(strings.TrimSpace(cfg.ObjectACL))
switch acl {
case "", "default":
return options, nil
case "private":
return append(options, oss.ObjectACL(oss.ACLPrivate)), nil
case "public-read":
return append(options, oss.ObjectACL(oss.ACLPublicRead)), nil
case "public-read-write":
return append(options, oss.ObjectACL(oss.ACLPublicReadWrite)), nil
default:
return nil, fmt.Errorf("unsupported aliyun oss object_acl %q", cfg.ObjectACL)
}
}
func aliyunErrorCode(err error) string {
serviceErr, ok := err.(oss.ServiceError)
if !ok {
return ""
}
return serviceErr.Code
}
func aliyunRequestID(err error) string {
serviceErr, ok := err.(oss.ServiceError)
if !ok {
return ""
}
return serviceErr.RequestID
}
func aliyunStatusCode(err error) int {
serviceErr, ok := err.(oss.ServiceError)
if !ok {
return 0
}
return serviceErr.StatusCode
}
func (c *aliyunClient) GetBytes(ctx context.Context, objectKey string) ([]byte, error) {
if err := c.Validate(); err != nil {
return nil, err
@@ -235,9 +286,62 @@ func (c *aliyunClient) PublicURL(objectKey string) (string, error) {
if err := c.Validate(); err != nil {
return "", err
}
publicRead, err := c.isPublicReadable()
if err != nil {
return "", err
}
if !publicRead {
return c.signedURL(objectKey)
}
return buildPublicURL(c.cfg, objectKey, true)
}
func (c *aliyunClient) isPublicReadable() (bool, error) {
objectACL := strings.ToLower(strings.TrimSpace(c.cfg.ObjectACL))
if isPublicReadACL(objectACL) {
return true, nil
}
if objectACL != "" && objectACL != "default" {
return false, nil
}
bucketACL := strings.ToLower(strings.TrimSpace(c.cfg.BucketACL))
if bucketACL != "" {
return isPublicReadACL(bucketACL), nil
}
result, err := c.client.GetBucketACL(c.bucket)
if err != nil {
return false, fmt.Errorf("get aliyun bucket acl: %w", err)
}
return isPublicReadACL(result.ACL), nil
}
func (c *aliyunClient) signedURL(objectKey string) (string, error) {
objectKey = normalizeObjectKeyPath(objectKey)
if objectKey == "" {
return "", fmt.Errorf("object key is required")
}
bucket, err := c.client.Bucket(c.bucket)
if err != nil {
return "", fmt.Errorf("get aliyun bucket: %w", err)
}
ttl := c.cfg.SignedURLTTL
if ttl <= 0 {
ttl = 30 * time.Minute
}
return bucket.SignURL(objectKey, oss.HTTPGet, int64(ttl.Seconds()))
}
func isPublicReadACL(acl string) bool {
switch strings.ToLower(strings.TrimSpace(acl)) {
case "public-read", "public-read-write":
return true
default:
return false
}
}
func (c *aliyunClient) logError(ctx context.Context, msg string, fields ...zap.Field) {
if c == nil || c.logger == nil {
return
@@ -0,0 +1,56 @@
package objectstorage
import (
"testing"
"github.com/geo-platform/tenant-api/internal/shared/config"
)
func TestAliyunPutObjectOptionsAcceptsSupportedObjectACL(t *testing.T) {
t.Parallel()
for _, acl := range []string{"", "default", "private", "public-read", "public-read-write"} {
acl := acl
t.Run(acl, func(t *testing.T) {
t.Parallel()
options, err := aliyunPutObjectOptions(config.ObjectStorageConfig{ObjectACL: acl}, "application/zip")
if err != nil {
t.Fatalf("aliyunPutObjectOptions(%q) error = %v", acl, err)
}
if len(options) == 0 {
t.Fatalf("expected at least content type option")
}
})
}
}
func TestAliyunPutObjectOptionsRejectsUnsupportedObjectACL(t *testing.T) {
t.Parallel()
_, err := aliyunPutObjectOptions(config.ObjectStorageConfig{ObjectACL: "authenticated-read"}, "application/zip")
if err == nil {
t.Fatal("expected unsupported object acl error")
}
}
func TestIsPublicReadACL(t *testing.T) {
t.Parallel()
for _, tc := range []struct {
acl string
want bool
}{
{acl: "", want: false},
{acl: "default", want: false},
{acl: "private", want: false},
{acl: "public-read", want: true},
{acl: "public-read-write", want: true},
{acl: " PUBLIC-READ ", want: true},
} {
got := isPublicReadACL(tc.acl)
if got != tc.want {
t.Fatalf("isPublicReadACL(%q) = %v, want %v", tc.acl, got, tc.want)
}
}
}
+24 -6
View File
@@ -95,12 +95,9 @@ func joinEscapedPath(basePath string, extra ...string) string {
return
}
for _, segment := range strings.Split(value, "/") {
segment = strings.TrimSpace(segment)
if segment == "" {
continue
}
segments = append(segments, url.PathEscape(segment))
normalized := normalizeObjectKeyPath(value)
if normalized != "" {
segments = append(segments, strings.Split(normalized, "/")...)
}
}
@@ -114,3 +111,24 @@ func joinEscapedPath(basePath string, extra ...string) string {
}
return "/" + strings.Join(segments, "/")
}
func normalizeObjectKeyPath(value string) string {
segments := make([]string, 0)
value = strings.TrimSpace(value)
value = strings.Trim(value, "/")
if value == "" {
return ""
}
for _, segment := range strings.Split(value, "/") {
segment = strings.TrimSpace(segment)
if segment == "" {
continue
}
if decoded, err := url.PathUnescape(segment); err == nil {
segment = decoded
}
segments = append(segments, segment)
}
return strings.Join(segments, "/")
}
@@ -0,0 +1,53 @@
package objectstorage
import (
"testing"
"github.com/geo-platform/tenant-api/internal/shared/config"
)
func TestBuildPublicURLDoesNotDoubleEscapeEncodedObjectKey(t *testing.T) {
t.Parallel()
got, err := buildPublicURL(config.ObjectStorageConfig{
Endpoint: "https://oss-cn-shanghai.aliyuncs.com",
Bucket: "shengxintui",
UseSSL: true,
}, "desktop-client/releases/stable/darwin/arm64/0.1.1/20260525015204-%E7%9C%81%E5%BF%83%E6%8E%A8-mac-0.1.19.zip", true)
if err != nil {
t.Fatal(err)
}
want := "https://shengxintui.oss-cn-shanghai.aliyuncs.com/desktop-client/releases/stable/darwin/arm64/0.1.1/20260525015204-%E7%9C%81%E5%BF%83%E6%8E%A8-mac-0.1.19.zip"
if got != want {
t.Fatalf("url = %q, want %q", got, want)
}
}
func TestBuildPublicURLEscapesRawUnicodeObjectKeyOnce(t *testing.T) {
t.Parallel()
got, err := buildPublicURL(config.ObjectStorageConfig{
Endpoint: "https://oss-cn-shanghai.aliyuncs.com",
Bucket: "shengxintui",
UseSSL: true,
}, "desktop-client/releases/stable/darwin/arm64/0.1.1/20260525015204-省心推-mac-0.1.19.zip", true)
if err != nil {
t.Fatal(err)
}
want := "https://shengxintui.oss-cn-shanghai.aliyuncs.com/desktop-client/releases/stable/darwin/arm64/0.1.1/20260525015204-%E7%9C%81%E5%BF%83%E6%8E%A8-mac-0.1.19.zip"
if got != want {
t.Fatalf("url = %q, want %q", got, want)
}
}
func TestNormalizeObjectKeyPathDecodesEncodedSegments(t *testing.T) {
t.Parallel()
got := normalizeObjectKeyPath("/desktop-client/releases/%E7%9C%81%E5%BF%83%E6%8E%A8.zip")
want := "desktop-client/releases/省心推.zip"
if got != want {
t.Fatalf("object key = %q, want %q", got, want)
}
}