diff --git a/docs/docs.go b/docs/docs.go index 5fa15687..18485d3a 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -2360,7 +2360,7 @@ const docTemplate = `{ "SessionCookie": [] } ], - "description": "返回系统中所有已上传文件所拥有的业务类型，并合并默认内置类型（avatar, attachment, doc, generic）", + "description": "返回数据库中所有已上传文件实际拥有的业务类型列表", "produces": [ "application/json" ], @@ -3454,6 +3454,18 @@ const docTemplate = `{ "name": "id", "in": "path", "required": true + }, + { + "type": "string", + "description": "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)", + "name": "compress", + "in": "query" + }, + { + "type": "string", + "description": "压缩质量等级 (low, medium, high)，默认为 high", + "name": "level", + "in": "query" } ], "responses": { @@ -4228,6 +4240,18 @@ const docTemplate = `{ "name": "id", "in": "path", "required": true + }, + { + "type": "string", + "description": "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)", + "name": "compress", + "in": "query" + }, + { + "type": "string", + "description": "压缩质量等级 (low, medium, high)，默认为 high", + "name": "level", + "in": "query" } ], "responses": { diff --git a/docs/swagger.json b/docs/swagger.json index cde5fbf3..327e9422 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -2353,7 +2353,7 @@ "SessionCookie": [] } ], - "description": "返回系统中所有已上传文件所拥有的业务类型，并合并默认内置类型（avatar, attachment, doc, generic）", + "description": "返回数据库中所有已上传文件实际拥有的业务类型列表", "produces": [ "application/json" ], @@ -3447,6 +3447,18 @@ "name": "id", "in": "path", "required": true + }, + { + "type": "string", + "description": "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)", + "name": "compress", + "in": "query" + }, + { + "type": "string", + "description": "压缩质量等级 (low, medium, high)，默认为 high", + "name": "level", + "in": "query" } ], "responses": { @@ -4221,6 +4233,18 @@ "name": "id", "in": "path", "required": true + }, + { + "type": "string", + "description": "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)", + "name": "compress", + "in": "query" + }, + { + "type": "string", + "description": "压缩质量等级 (low, medium, high)，默认为 high", + "name": "level", + "in": "query" } ], "responses": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 200b97ff..df818eec 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2418,7 +2418,7 @@ paths: - admin /api/v1/admin/uploads/types: get: - description: 返回系统中所有已上传文件所拥有的业务类型，并合并默认内置类型（avatar, attachment, doc, generic） + description: 返回数据库中所有已上传文件实际拥有的业务类型列表 produces: - application/json responses: @@ -3067,6 +3067,14 @@ paths: name: id required: true type: string + - description: 是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略) + in: query + name: compress + type: string + - description: 压缩质量等级 (low, medium, high)，默认为 high + in: query + name: level + type: string produces: - application/octet-stream responses: @@ -3533,6 +3541,14 @@ paths: name: id required: true type: string + - description: 是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略) + in: query + name: compress + type: string + - description: 压缩质量等级 (low, medium, high)，默认为 high + in: query + name: level + type: string produces: - application/octet-stream responses: diff --git a/go.mod b/go.mod index 588f6336..d5582303 100644 --- a/go.mod +++ b/go.mod @@ -36,9 +36,9 @@ require ( go.opentelemetry.io/otel/sdk v1.36.0 go.opentelemetry.io/otel/trace v1.36.0 go.uber.org/zap v1.27.0 - golang.org/x/crypto v0.47.0 + golang.org/x/crypto v0.51.0 golang.org/x/oauth2 v0.32.0 - golang.org/x/sync v0.19.0 + golang.org/x/sync v0.21.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/postgres v1.6.0 gorm.io/driver/sqlite v1.6.0 @@ -75,6 +75,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/deepteams/webp v1.2.3 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -152,12 +153,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/arch v0.22.0 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sys v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/image v0.42.0 // indirect + golang.org/x/mod v0.36.0 // indirect + golang.org/x/net v0.54.0 // indirect + golang.org/x/sys v0.44.0 // indirect + golang.org/x/text v0.38.0 // indirect golang.org/x/time v0.14.0 // indirect - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.45.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect google.golang.org/grpc v1.72.1 // indirect diff --git a/go.sum b/go.sum index dc894274..7b203b2e 100644 --- a/go.sum +++ b/go.sum @@ -74,6 +74,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/deepteams/webp v1.2.3 h1:TedmP3+U8/xBrC0dTkbd3+wbmnM4EIaMowQJpLz6UqU= +github.com/deepteams/webp v1.2.3/go.mod h1:J8Ap+HAixxpKKRN9IpEeSKlfvhsef1v43jKTO7m3f4c= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= @@ -357,11 +359,17 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/image v0.42.0 h1:1gSs6ehNWXLbkHBIPcWztk3D/6aIA/8hauiAYtlodVY= +golang.org/x/image v0.42.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= +golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -372,6 +380,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= +golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -381,6 +391,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -393,6 +405,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= +golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -403,6 +417,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= +golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -412,6 +428,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= +golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/apps/upload/constants.go b/internal/apps/upload/constants.go index ad1c41f3..4ca4ad55 100644 --- a/internal/apps/upload/constants.go +++ b/internal/apps/upload/constants.go @@ -8,4 +8,6 @@ const ( detectContentBytes = 512 // http.DetectContentType 需要的最小字节数 uploadDirPerm = 0755 // 上传目录权限 uploadFilePerm = 0644 // 上传文件权限 + cacheDirPerm = 0750 // 缓存目录权限 (gosec) + cacheFilePerm = 0600 // 缓存文件权限 (gosec) ) diff --git a/internal/apps/upload/file_server.go b/internal/apps/upload/file_server.go index d9e45b90..a9275c96 100644 --- a/internal/apps/upload/file_server.go +++ b/internal/apps/upload/file_server.go @@ -5,15 +5,22 @@ package upload import ( + "bytes" + "context" "encoding/json" "errors" + "fmt" + "io" "net/http" + "os" + "path/filepath" "strconv" "strings" "github.com/Rain-kl/Wavelet/internal/apps/oauth" "github.com/Rain-kl/Wavelet/internal/common" "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/logger" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/storage" "github.com/gin-gonic/gin" @@ -26,6 +33,8 @@ import ( // @Tags upload // @Produce octet-stream // @Param id path string true "文件 ID" +// @Param compress query string false "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)" +// @Param level query string false "压缩质量等级 (low, medium, high)，默认为 high" // @Success 200 {file} file "成功获取文件内容" // @Failure 400 {object} util.ResponseAny "文件 ID 格式错误" // @Failure 401 {object} util.ResponseAny "未登录" @@ -33,24 +42,16 @@ import ( // @Failure 500 {object} util.ResponseAny "服务内部错误" // @Router /f/{id} [get] func ServeFileByID(c *gin.Context) { - c.Header("X-Content-Type-Options", "nosniff") - c.Header("Content-Security-Policy", "sandbox") - - idStr := c.Param("id") - uploadID, err := strconv.ParseUint(idStr, 10, 64) + upload, err := getUploadRecordByID(c) if err != nil { - c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid upload ID"}) - return - } - - var upload model.Upload - if err := db.DB(c.Request.Context()). - Where("id = ? AND status IN (?, ?)", uploadID, model.UploadStatusPending, model.UploadStatusUsed). - First(&upload).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { c.AbortWithStatus(http.StatusNotFound) return } + if _, ok := err.(*strconv.NumError); ok { + c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid upload ID"}) + return + } c.AbortWithStatus(http.StatusInternalServerError) return } @@ -61,6 +62,87 @@ func ServeFileByID(c *gin.Context) { return } + ServeUpload(c, upload) +} + +// getUploadRecordByID 从请求路径参数中解析文件 ID 并从数据库中检索处于 Pending 或 Used 状态的上传记录。 +// 同时会自动设置通用的安全响应头。 +func getUploadRecordByID(c *gin.Context) (*model.Upload, error) { + c.Header("X-Content-Type-Options", "nosniff") + c.Header("Content-Security-Policy", "sandbox") + + idStr := c.Param("id") + uploadID, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return nil, err + } + + var upload model.Upload + if err := db.DB(c.Request.Context()). + Where("id = ? AND status IN (?, ?)", uploadID, model.UploadStatusPending, model.UploadStatusUsed). + First(&upload).Error; err != nil { + return nil, err + } + + return &upload, nil +} + +// ServeUpload 将已存在的文件内容读取并流式响应给客户端，支持本地和 S3/CDN 驱动，并可选支持 WebP 图片压缩与本地缓存。 +func ServeUpload(c *gin.Context, upload *model.Upload) { + compressStr := c.Query("compress") + isImage := strings.HasPrefix(strings.ToLower(upload.MimeType), "image/") || isImageExtension(strings.ToLower(upload.Extension)) + + if compressStr == "" || !isImage { + serveOriginal(c, upload) + return + } + + // Map level parameter to standard options + level := strings.ToLower(c.Query("level")) + if level != "low" && level != "medium" && level != "high" { + level = "high" + } + + // Local cache path for the compressed webp image + cachePath := filepath.Join("uploads", "cache", fmt.Sprintf("compressed_%d_%s.webp", upload.ID, level)) + + // Check if the compressed file already exists in cache + if _, err := os.Stat(cachePath); err == nil { + c.Header("Content-Type", "image/webp") + c.File(cachePath) + return + } + + // Cache miss: retrieve original file content + origBytes, err := getOriginalFileBytes(c.Request.Context(), upload) + if err != nil { + logger.ErrorF(c.Request.Context(), "failed to retrieve original file bytes for compression: %v", err) + serveOriginal(c, upload) + return + } + + // Compress to WebP + webpBytes, err := CompressImageToWebP(bytes.NewReader(origBytes), level) + if err != nil { + logger.ErrorF(c.Request.Context(), "failed to compress image to WebP: %v", err) + serveOriginal(c, upload) + return + } + + // Ensure cache directory exists and write cached file + if err := os.MkdirAll(filepath.Dir(cachePath), cacheDirPerm); err != nil { + logger.ErrorF(c.Request.Context(), "failed to create cache directory: %v", err) + } else if err := os.WriteFile(cachePath, webpBytes, cacheFilePerm); err != nil { + logger.ErrorF(c.Request.Context(), "failed to write compressed cache file: %v", err) + } + + // Serve compressed WebP + c.Header("Content-Type", "image/webp") + c.Data(http.StatusOK, "image/webp", webpBytes) +} + +// serveOriginal 原始文件的流式响应逻辑 +func serveOriginal(c *gin.Context, upload *model.Upload) { if upload.StorageDriver == "local" || (upload.StorageDriver == "" && !storage.IsEnabled()) { c.File(upload.FilePath) return @@ -86,6 +168,27 @@ func ServeFileByID(c *gin.Context) { c.DataFromReader(http.StatusOK, obj.ContentLength, obj.ContentType, obj.Body, nil) } +// getOriginalFileBytes 获取原始文件所有字节 +func getOriginalFileBytes(ctx context.Context, upload *model.Upload) ([]byte, error) { + if upload.StorageDriver == "local" || (upload.StorageDriver == "" && !storage.IsEnabled()) { + return os.ReadFile(upload.FilePath) + } + + // Retrieve file from S3 (via CDN if configured) + obj, err := storage.GetObjectViaCache(ctx, upload.FilePath) + if err != nil { + return nil, err + } + + // Cachefile + if obj.CachePath != "" { + return os.ReadFile(obj.CachePath) + } + + defer func() { _ = obj.Body.Close() }() + return io.ReadAll(obj.Body) +} + // checkFileAccessPermission 校验文件是否可以被当前请求访问 func checkFileAccessPermission(c *gin.Context, uploadType string) error { var sc model.SystemConfig diff --git a/internal/apps/upload/file_server_test.go b/internal/apps/upload/file_server_test.go index cc5de305..e60cc6c8 100644 --- a/internal/apps/upload/file_server_test.go +++ b/internal/apps/upload/file_server_test.go @@ -5,10 +5,15 @@ package upload import ( + "bytes" "encoding/json" + "image" + "image/color" + "image/png" "net/http" "net/http/httptest" "os" + "path/filepath" "testing" "github.com/Rain-kl/Wavelet/internal/common" @@ -195,3 +200,122 @@ func TestGetDistinctUploadTypes(t *testing.T) { t.Errorf("expected only custom_type_xyz in types list, got: %v", resp.Data) } } + +func TestImageCompression(t *testing.T) { + dbConn, _, cleanup := testhelper.SetupTestEnvironment(t) + defer cleanup() + + // Ensure uploads dir is cleaned up + defer func() { + _ = os.RemoveAll("uploads") + }() + + // Create test user + user := model.User{ + ID: 555, + Username: "compress_tester", + IsActive: true, + } + dbConn.Create(&user) + + // Create a 1x1 pixel PNG image + img := image.NewRGBA(image.Rect(0, 0, 1, 1)) + img.Set(0, 0, color.RGBA{R: 255, G: 0, B: 0, A: 255}) + var pngBuf bytes.Buffer + if err := png.Encode(&pngBuf, img); err != nil { + t.Fatalf("failed to encode test png: %v", err) + } + + _ = os.MkdirAll("uploads", 0755) + filePath := "uploads/test_image.png" + if err := os.WriteFile(filePath, pngBuf.Bytes(), 0644); err != nil { + t.Fatalf("failed to write test png: %v", err) + } + + // Save upload record to DB + uploadRecord := model.Upload{ + ID: 3001, + UserID: user.ID, + FileName: "test_image.png", + FilePath: filePath, + FileSize: int64(pngBuf.Len()), + MimeType: "image/png", + Extension: "png", + StorageDriver: "local", + Type: "avatar", // Whitelisted by default + Status: model.UploadStatusUsed, + } + dbConn.Create(&uploadRecord) + + // Setup Router + gin.SetMode(gin.TestMode) + r := gin.New() + r.GET("/f/:id", ServeFileByID) + + t.Run("serve original file without compress parameter", func(t *testing.T) { + req, _ := http.NewRequest("GET", "/f/3001", nil) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + + if w.Code != http.StatusOK { + t.Fatalf("expected status 200, got %d", w.Code) + } + // Content-Type should be image/png (default local serving type) + if w.Header().Get("Content-Type") != "image/png" { + t.Errorf("expected Content-Type image/png, got %s", w.Header().Get("Content-Type")) + } + if len(w.Body.Bytes()) != pngBuf.Len() { + t.Errorf("expected body size %d, got %d", pngBuf.Len(), len(w.Body.Bytes())) + } + }) + + t.Run("serve compressed WebP file with compress=true", func(t *testing.T) { + req, _ := http.NewRequest("GET", "/f/3001?compress=true&level=medium", nil) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + + if w.Code != http.StatusOK { + t.Fatalf("expected status 200, got %d. Body: %s", w.Code, w.Body.String()) + } + // Content-Type should be image/webp + if w.Header().Get("Content-Type") != "image/webp" { + t.Errorf("expected Content-Type image/webp, got %s", w.Header().Get("Content-Type")) + } + + // Check if local cache file was created + cachePath := filepath.Join("uploads", "cache", "compressed_3001_medium.webp") + if _, err := os.Stat(cachePath); os.IsNotExist(err) { + t.Errorf("expected cached webp file to be created at %s, but it doesn't exist", cachePath) + } + + // Subsequent request should hit the cache (modify the cached file to verify) + testBytes := []byte("cached webp content") + if err := os.WriteFile(cachePath, testBytes, 0644); err != nil { + t.Fatalf("failed to write test bytes to cache: %v", err) + } + + w2 := httptest.NewRecorder() + r.ServeHTTP(w2, req) + if w2.Code != http.StatusOK { + t.Fatalf("expected status 200, got %d", w2.Code) + } + if string(w2.Body.Bytes()) != "cached webp content" { + t.Errorf("expected cached content, got %s", string(w2.Body.Bytes())) + } + }) + + t.Run("serve compressed with default quality high", func(t *testing.T) { + req, _ := http.NewRequest("GET", "/f/3001?compress=true", nil) + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + + if w.Code != http.StatusOK { + t.Fatalf("expected status 200, got %d", w.Code) + } + // Check if local cache file with "high" was created + cachePath := filepath.Join("uploads", "cache", "compressed_3001_high.webp") + if _, err := os.Stat(cachePath); os.IsNotExist(err) { + t.Errorf("expected cached webp file to be created at %s for default level", cachePath) + } + }) +} diff --git a/internal/apps/upload/routers.go b/internal/apps/upload/routers.go index 9bec0422..57141b77 100644 --- a/internal/apps/upload/routers.go +++ b/internal/apps/upload/routers.go @@ -174,6 +174,8 @@ func UploadFile(c *gin.Context) { // @Tags upload // @Produce octet-stream // @Param id path string true "文件 ID" +// @Param compress query string false "是否启用压缩 (传任意非空值代表启用，非图片文件将被忽略)" +// @Param level query string false "压缩质量等级 (low, medium, high)，默认为 high" // @Security SessionCookie // @Success 200 {file} file "成功下载文件" // @Failure 400 {object} util.ResponseAny "参数错误" @@ -181,52 +183,36 @@ func UploadFile(c *gin.Context) { // @Failure 500 {object} util.ResponseAny "服务内部错误" // @Router /api/v1/upload/download/{id} [get] func DownloadFile(c *gin.Context) { - c.Header("X-Content-Type-Options", "nosniff") - c.Header("Content-Security-Policy", "sandbox") - - ctx := c.Request.Context() - idStr := c.Param("id") - uploadID, err := strconv.ParseUint(idStr, 10, 64) + upload, err := getUploadRecordByID(c) if err != nil { - c.JSON(http.StatusOK, util.Err(ErrInvalidFileID)) - return - } - - var upload model.Upload - if err := db.DB(ctx).Where("id = ? AND status IN (?, ?)", uploadID, model.UploadStatusPending, model.UploadStatusUsed).First(&upload).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { c.AbortWithStatus(http.StatusNotFound) return } + if _, ok := err.(*strconv.NumError); ok { + c.JSON(http.StatusOK, util.Err(ErrInvalidFileID)) + return + } c.JSON(http.StatusOK, util.Err(ErrQueryUploadRecordFailed)) return } + fileName := upload.FileName + compressStr := c.Query("compress") + isImage := strings.HasPrefix(strings.ToLower(upload.MimeType), "image/") || isImageExtension(strings.ToLower(upload.Extension)) + + if compressStr != "" && isImage { + ext := filepath.Ext(fileName) + if ext != "" { + fileName = strings.TrimSuffix(fileName, ext) + ".webp" + } else { + fileName += ".webp" + } + } + // 设置下载 Attachment 响应头 (支持 UTF-8 中文文件名转义) - c.Header("Content-Disposition", fmt.Sprintf("attachment; filename*=UTF-8''%s", url.PathEscape(upload.FileName))) - c.Header("Content-Type", upload.MimeType) - c.Header("Content-Length", strconv.FormatInt(upload.FileSize, 10)) - - // 根据存储驱动类型提供流式文件服务 - if upload.StorageDriver == "local" || (upload.StorageDriver == "" && !storage.IsEnabled()) { - c.File(upload.FilePath) - return - } - - // 从 S3/CDN 加载并返回 - obj, err := storage.GetObjectViaCache(ctx, upload.FilePath) - if err != nil { - c.AbortWithStatus(http.StatusNotFound) - return - } - - if obj.CachePath != "" { - c.File(obj.CachePath) - return - } - - defer func() { _ = obj.Body.Close() }() - _, _ = io.Copy(c.Writer, obj.Body) + c.Header("Content-Disposition", fmt.Sprintf("attachment; filename*=UTF-8''%s", url.PathEscape(fileName))) + ServeUpload(c, upload) } // BatchDownloadFiles 批量打包 ZIP 下载接口 diff --git a/internal/apps/upload/routers_test.go b/internal/apps/upload/routers_test.go index 16b4b0d9..00a2f717 100644 --- a/internal/apps/upload/routers_test.go +++ b/internal/apps/upload/routers_test.go @@ -371,8 +371,8 @@ func TestDownloadFile(t *testing.T) { t.Errorf("expected Content-Disposition header %q, got %q", expectedDisp, contentDisp) } - if w.Header().Get("Content-Type") != "text/plain" { - t.Errorf("expected Content-Type text/plain, got %s", w.Header().Get("Content-Type")) + if !strings.HasPrefix(w.Header().Get("Content-Type"), "text/plain") { + t.Errorf("expected Content-Type starting with text/plain, got %s", w.Header().Get("Content-Type")) } }) diff --git a/internal/apps/upload/utils.go b/internal/apps/upload/utils.go index 6f38abc9..c30ba64c 100644 --- a/internal/apps/upload/utils.go +++ b/internal/apps/upload/utils.go @@ -5,9 +5,18 @@ package upload import ( + "bytes" "errors" "fmt" + "image" + _ "image/gif" // Register GIF decoder for image.Decode + _ "image/jpeg" // Register JPEG decoder for image.Decode + _ "image/png" // Register PNG decoder for image.Decode + "io" "strings" + + "github.com/deepteams/webp" + _ "golang.org/x/image/webp" // Register WebP decoder for image.Decode ) const maxS3KeyLength = 1024 @@ -32,3 +41,38 @@ func ValidateS3Key(key string) error { return nil } + +// CompressImageToWebP decodes an image from srcReader and encodes it into WebP format +// using the specified quality level (low -> 60, medium -> 75, high -> 85). +func CompressImageToWebP(srcReader io.Reader, qualityLevel string) ([]byte, error) { + // Decode the image + img, format, err := image.Decode(srcReader) + if err != nil { + return nil, fmt.Errorf("failed to decode image (format: %s): %w", format, err) + } + + // Determine quality + var quality float32 + switch strings.ToLower(qualityLevel) { + case "low": + quality = 60 + case "medium": + quality = 75 + case "high", "": + quality = 85 + default: + quality = 85 + } + + // Encode to WebP + var buf bytes.Buffer + err = webp.Encode(&buf, img, &webp.EncoderOptions{ + Quality: quality, + Method: 4, // Default method + }) + if err != nil { + return nil, fmt.Errorf("failed to encode WebP: %w", err) + } + + return buf.Bytes(), nil +}