feat(server): asset gzip upload

reearth · Jan 20, 2025 · 544406b · 544406b
1 parent e04cebf
commit 544406b
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 79 deletions.
diff --git a/server/internal/adapter/integration/asset.go b/server/internal/adapter/integration/asset.go
@@ -90,6 +90,7 @@ func (s *Server) AssetCreate(ctx context.Context, request AssetCreateRequestObje
 			Size:    inp.File.FileSize(),
 			// ContentType: inp.File.ContentType(),
 			ContentType: "",
+			Gzip:        lo.FromPtr(inp.Gzip),
 		}
 		skipDecompression = lo.FromPtrOr(inp.SkipDecompression, false)
 	}
@@ -173,6 +174,7 @@ func (s *Server) AssetUploadCreate(ctx context.Context, request AssetUploadCreat
 		ProjectID:     request.ProjectId,
 		Filename:      lo.FromPtr(request.Body.Name),
 		ContentLength: int64(lo.FromPtr(request.Body.ContentLength)),
+		Gzip:          lo.FromPtr(request.Body.Gzip),
 		Cursor:        lo.FromPtr(request.Body.Cursor),
 	}, op)
 

diff --git a/server/internal/adapter/integration/server.gen.go b/server/internal/adapter/integration/server.gen.go
diff --git a/server/internal/infrastructure/gcp/file.go b/server/internal/infrastructure/gcp/file.go
@@ -117,7 +117,7 @@ func (f *fileRepo) UploadAsset(ctx context.Context, file *file.File) (string, in
 		return "", 0, gateway.ErrInvalidFile
 	}
 
-	size, err := f.upload(ctx, p, file.Content)
+	size, err := f.upload(ctx, p, file.ContentType, file.Gzip, file.Content)
 	if err != nil {
 		return "", 0, err
 	}
@@ -154,6 +154,9 @@ func (f *fileRepo) IssueUploadAssetLink(ctx context.Context, param gateway.Issue
 		Expires:     param.ExpiresAt,
 		ContentType: contentType,
 	}
+	if param.Gzip {
+		opt.Headers = []string{"Content-Encoding: gzip"}
+	}
 	uploadURL, err := bucket.SignedURL(p, opt)
 	if err != nil {
 		log.Warnf("gcs: failed to issue signed url: %v", err)
@@ -164,6 +167,7 @@ func (f *fileRepo) IssueUploadAssetLink(ctx context.Context, param gateway.Issue
 		ContentType:   contentType,
 		ContentLength: param.ContentLength,
 		Next:          "",
+		Gzip:          param.Gzip,
 	}, nil
 }
 
@@ -208,11 +212,15 @@ func (f *fileRepo) read(ctx context.Context, filename string) (io.ReadCloser, er
 	return reader, nil
 }
 
-func (f *fileRepo) upload(ctx context.Context, filename string, content io.Reader) (int64, error) {
+func (f *fileRepo) upload(ctx context.Context, filename, contentType string, gzip bool, content io.Reader) (int64, error) {
 	if filename == "" {
 		return 0, gateway.ErrInvalidFile
 	}
 
+	if gzip {
+		filename = strings.TrimSuffix(filename, ".gz")
+	}
+
 	bucket, err := f.bucket(ctx)
 	if err != nil {
 		log.Errorf("gcs: upload bucket err: %+v\n", err)
@@ -227,9 +235,17 @@ func (f *fileRepo) upload(ctx context.Context, filename string, content io.Reade
 
 	writer := object.NewWriter(ctx)
 	writer.ObjectAttrs.CacheControl = f.cacheControl
-	ct := getContentType(filename)
-	if ct != "" {
-		writer.ObjectAttrs.ContentType = ct
+	if contentType == "" {
+		contentType = getContentType(filename)
+	}
+	if contentType != "" {
+		writer.ObjectAttrs.ContentType = contentType
+	}
+	if gzip {
+		writer.ObjectAttrs.ContentEncoding = "gzip"
+		if writer.ObjectAttrs.ContentType == "" || writer.ObjectAttrs.ContentType == "application/gzip" {
+			writer.ObjectAttrs.ContentType = "application/octet-stream"
+		}
 	}
 
 	if _, err := io.Copy(writer, content); err != nil {

diff --git a/server/internal/usecase/gateway/file.go b/server/internal/usecase/gateway/file.go
@@ -33,13 +33,15 @@ type UploadAssetLink struct {
 	ContentType   string
 	ContentLength int64
 	Next          string
+	Gzip          bool
 }
 
 type IssueUploadAssetParam struct {
 	UUID          string
 	Filename      string
 	ContentLength int64
 	ExpiresAt     time.Time
+	Gzip          bool
 
 	Cursor string
 }

diff --git a/server/internal/usecase/interactor/asset.go b/server/internal/usecase/interactor/asset.go
@@ -110,6 +110,10 @@ func (i *Asset) Create(ctx context.Context, inp interfaces.CreateAssetParam, op
 		return nil, nil, interfaces.ErrFileNotIncluded
 	}
 
+	if inp.File.Gzip {
+		inp.File.Name = strings.TrimSuffix(inp.File.Name, ".gz")
+	}
+
 	prj, err := i.repos.Project.FindByID(ctx, inp.ProjectID)
 	if err != nil {
 		return nil, nil, err
@@ -304,6 +308,10 @@ func (i *Asset) CreateUpload(ctx context.Context, inp interfaces.CreateAssetUplo
 		return nil, interfaces.ErrInvalidOperator
 	}
 
+	if inp.Gzip {
+		inp.Filename = strings.TrimSuffix(inp.Filename, ".gz")
+	}
+
 	var param *gateway.IssueUploadAssetParam
 	if inp.Cursor == "" {
 		if inp.Filename == "" {
@@ -319,6 +327,7 @@ func (i *Asset) CreateUpload(ctx context.Context, inp interfaces.CreateAssetUplo
 			ContentLength: inp.ContentLength,
 			ExpiresAt:     expiresAt,
 			Cursor:        "",
+			Gzip:          inp.Gzip,
 		}
 	} else {
 		wrapped, err := parseWrappedUploadCursor(inp.Cursor)
@@ -338,6 +347,7 @@ func (i *Asset) CreateUpload(ctx context.Context, inp interfaces.CreateAssetUplo
 			ContentLength: au.ContentLength(),
 			ExpiresAt:     au.ExpiresAt(),
 			Cursor:        wrapped.Cursor,
+			Gzip:          inp.Gzip,
 		}
 	}
 
@@ -375,6 +385,7 @@ func (i *Asset) CreateUpload(ctx context.Context, inp interfaces.CreateAssetUplo
 		ContentType:   uploadLink.ContentType,
 		ContentLength: uploadLink.ContentLength,
 		Next:          wrapUploadCursor(param.UUID, uploadLink.Next),
+		Gzip:          inp.Gzip,
 	}, nil
 }
 

diff --git a/server/internal/usecase/interfaces/asset.go b/server/internal/usecase/interfaces/asset.go
@@ -33,6 +33,7 @@ type CreateAssetUploadParam struct {
 
 	Filename      string
 	ContentLength int64
+	Gzip          bool
 
 	Cursor string
 }
@@ -54,6 +55,7 @@ type AssetUpload struct {
 	ContentType   string
 	ContentLength int64
 	Next          string
+	Gzip          bool
 }
 
 type Asset interface {

diff --git a/server/pkg/file/file.go b/server/pkg/file/file.go
@@ -19,6 +19,7 @@ type File struct {
 	Name        string
 	Size        int64
 	ContentType string
+	Gzip        bool
 }
 
 func FromMultipart(multipartReader *multipart.Reader, formName string) (*File, error) {

diff --git a/server/pkg/integrationapi/types.gen.go b/server/pkg/integrationapi/types.gen.go
diff --git a/server/schemas/integration.yml b/server/schemas/integration.yml
@@ -1403,6 +1403,9 @@ paths:
                 skipDecompression:
                   type: boolean
                   default: false
+                gzip:
+                  type: boolean
+                  default: false
           application/json:
             schema:
               type: object
@@ -1415,6 +1418,10 @@ paths:
                   type: boolean
                   nullable: true
                   default: false
+                gzip:
+                  type: boolean
+                  nullable: true
+                  default: false
       responses:
         '200':
           description: assets
@@ -1436,7 +1443,7 @@ paths:
       security:
         - bearerAuth: []
       summary: Upload an asset.
-      description: Issue a URL and a token to upload an asset.
+      description: Issue an URL and a token to upload an asset.
       parameters:
         - $ref: '#/components/parameters/projectIdParam'
       requestBody:
@@ -1451,6 +1458,9 @@ paths:
                   type: integer
                 cursor:
                   type: string
+                gzip:
+                  type: boolean
+                  default: false
       responses:
         '200':
           description: asset upload