feat: add support for public endpoint

Author: syntaxsdev

internal/config/config.go

@@ -11,28 +11,38 @@ import (
 )
 
 type Config struct {
-	Port         string
-	S3Endpoint   string
-	S3Bucket     string
-	S3Region     string
-	AWSAccessKey string
-	AWSSecretKey string
-	CacheMaxAge  string
+	Port             string
+	S3Endpoint       string // Endpoint for internal operations
+	PublicS3Endpoint string // Endpoint for presigned URLs (falls back to S3Endpoint if not set)
+	S3Bucket         string
+	S3Region         string
+	AWSAccessKey     string
+	AWSSecretKey     string
+	CacheMaxAge      string
 	// API authentication
-	APIKey       string
+	APIKey string
 }
 
 func Load() *Config {
+	s3Endpoint := getEnv("S3_ENDPOINT", "")
+	publicEndpoint := getEnv("PUBLIC_S3_ENDPOINT", "")
+
+	// If PUBLIC_S3_ENDPOINT is not set, fall back to S3_ENDPOINT
+	if publicEndpoint == "" {
+		publicEndpoint = s3Endpoint
+	}
+
 	return &Config{
-		Port:         getEnv("PORT", "8080"),
-		S3Endpoint:   getEnv("S3_ENDPOINT", ""),
-		S3Bucket:     getEnv("S3_BUCKET", ""),
-		S3Region:     getEnv("S3_REGION", "us-east-1"),
-		AWSAccessKey: getEnv("AWS_ACCESS_KEY_ID", ""),
-		AWSSecretKey: getEnv("AWS_SECRET_ACCESS_KEY", ""),
-		CacheMaxAge:  getEnv("CACHE_MAX_AGE", "86400"),
+		Port:             getEnv("PORT", "8080"),
+		S3Endpoint:       s3Endpoint,
+		PublicS3Endpoint: publicEndpoint,
+		S3Bucket:         getEnv("S3_BUCKET", ""),
+		S3Region:         getEnv("S3_REGION", "us-east-1"),
+		AWSAccessKey:     getEnv("AWS_ACCESS_KEY_ID", ""),
+		AWSSecretKey:     getEnv("AWS_SECRET_ACCESS_KEY", ""),
+		CacheMaxAge:      getEnv("CACHE_MAX_AGE", "86400"),
 		// API authentication
-		APIKey:       getEnv("API_KEY", ""),
+		APIKey: getEnv("API_KEY", ""),
 	}
 }
 
@@ -47,17 +57,17 @@ type Profile struct {
 	TokenTTLSeconds      int64    `yaml:"token_ttl_seconds"`
 	StoragePath          string   `yaml:"storage_path"`
 	EnableSharding       bool     `yaml:"enable_sharding"`
-	
+
 	// Processing configuration (shared)
-	ThumbFolder   string   `yaml:"thumb_folder,omitempty"`
-	Quality       int      `yaml:"quality,omitempty"`
-	CacheDuration int      `yaml:"cache_duration,omitempty"` // in seconds
-	
+	ThumbFolder   string `yaml:"thumb_folder,omitempty"`
+	Quality       int    `yaml:"quality,omitempty"`
+	CacheDuration int    `yaml:"cache_duration,omitempty"` // in seconds
+
 	// Processing configuration (images)
 	Sizes       []string `yaml:"sizes,omitempty"`
 	DefaultSize string   `yaml:"default_size,omitempty"`
 	ConvertTo   string   `yaml:"convert_to,omitempty"`
-	
+
 	// Processing configuration (videos)
 	ProxyFolder string   `yaml:"proxy_folder,omitempty"`
 	Formats     []string `yaml:"formats,omitempty"`
@@ -138,24 +148,22 @@ func (sc *StorageConfig) GetProfile(profileName string) *Profile {
 	return nil
 }
 
-
 func DefaultProfile() *Profile {
 	return &Profile{
 		Kind:                 "image",
 		AllowedMimes:         []string{"image/jpeg", "image/png"},
 		SizeMaxBytes:         10485760, // 10MB
 		MultipartThresholdMB: 15,
-		PartSizeMB:          8,
-		TokenTTLSeconds:     900,
-		StoragePath:         "originals/{shard?}/{key_base}",
-		EnableSharding:      true,
-		ThumbFolder:         "thumbnails",
-		Sizes:               []string{"256", "512", "1024"},
-		Quality:             90,
+		PartSizeMB:           8,
+		TokenTTLSeconds:      900,
+		StoragePath:          "originals/{shard?}/{key_base}",
+		EnableSharding:       true,
+		ThumbFolder:          "thumbnails",
+		Sizes:                []string{"256", "512", "1024"},
+		Quality:              90,
 	}
 }
 
-
 func getEnv(key, defaultValue string) string {
 	if value := os.Getenv(key); value != "" {
 		return value

internal/s3/client.go

@@ -16,12 +16,12 @@ import (
 )
 
 type Client struct {
-	s3Client   *s3.Client
-	bucket     string
-	presigner  *s3.PresignClient
+	s3Client  *s3.Client
+	bucket    string
+	presigner *s3.PresignClient
 }
 
-func NewClient(ctx context.Context, region, bucket, accessKey, secretKey, endpoint string) (*Client, error) {
+func NewClient(ctx context.Context, region, bucket, accessKey, secretKey, endpoint, publicEndpoint string) (*Client, error) {
 	var cfg aws.Config
 	var err error
 
@@ -40,14 +40,27 @@ func NewClient(ctx context.Context, region, bucket, accessKey, secretKey, endpoi
 		utils.Shutdown(fmt.Sprintf("🚨 Failed to load AWS config: %v", err))
 	}
 
+	// Create S3 client for internal operations
 	s3Client := s3.NewFromConfig(cfg, func(o *s3.Options) {
 		if endpoint != "" {
 			o.BaseEndpoint = aws.String(endpoint)
 			o.UsePathStyle = true
 		}
 	})
 
-	presigner := s3.NewPresignClient(s3Client)
+	// Create presigner - use public endpoint if different from internal
+	var presigner *s3.PresignClient
+	if publicEndpoint != "" && publicEndpoint != endpoint {
+		// Create a separate S3 client for presigning with the public endpoint
+		publicS3Client := s3.NewFromConfig(cfg, func(o *s3.Options) {
+			o.BaseEndpoint = aws.String(publicEndpoint)
+			o.UsePathStyle = true
+		})
+		presigner = s3.NewPresignClient(publicS3Client)
+	} else {
+		// Use the same client for presigning
+		presigner = s3.NewPresignClient(s3Client)
+	}
 
 	return &Client{
 		s3Client:  s3Client,

internal/service/image.go

@@ -31,6 +31,7 @@ func NewImageService(cfg *config.Config) *ImageService {
 		cfg.AWSAccessKey,
 		cfg.AWSSecretKey,
 		cfg.S3Endpoint,
+		cfg.PublicS3Endpoint,
 	)
 	if err != nil {
 		panic(fmt.Sprintf("Failed to create S3 client: %v", err))
@@ -52,18 +53,18 @@ func (s *ImageService) buildStoragePath(template, filename string, enableShardin
 	if len(parts) > 1 {
 		ext = parts[len(parts)-1]
 	}
-	
+
 	// Generate shard if sharding is enabled
 	shard := ""
 	if enableSharding {
 		shard = s.generateShard(keyBase)
 	}
-	
+
 	// Template replacement for image retrieval
 	path := template
 	path = strings.ReplaceAll(path, "{key_base}", keyBase)
 	path = strings.ReplaceAll(path, "{ext}", ext)
-	
+
 	// Handle shard placeholders
 	if shard != "" {
 		path = strings.ReplaceAll(path, "{shard?}", shard)
@@ -74,7 +75,7 @@ func (s *ImageService) buildStoragePath(template, filename string, enableShardin
 		path = strings.ReplaceAll(path, "{shard?}/", "")
 		path = strings.ReplaceAll(path, "{shard?}", "")
 	}
-	
+
 	return path
 }
 
@@ -87,7 +88,7 @@ func (s *ImageService) generateShard(keyBase string) string {
 func (s *ImageService) UploadImage(ctx context.Context, profile *config.Profile, imageData []byte, thumbType, imagePath string) error {
 	orig_path := s.buildStoragePath(profile.StoragePath, imagePath, profile.EnableSharding)
 	convertType := profile.ConvertTo
-	
+
 	// Upload original image in parallel with thumbnail generation
 	origUploadChan := make(chan error, 1)
 	go func() {
@@ -106,10 +107,10 @@ func (s *ImageService) UploadImage(ctx context.Context, profile *config.Profile,
 		path    string
 		err     error
 	}
-	
+
 	thumbJobs := make(chan thumbnailJob, len(profile.Sizes))
 	uploadErrors := make(chan error, len(profile.Sizes))
-	
+
 	// Generate thumbnails in parallel
 	for _, sizeStr := range profile.Sizes {
 		go func(size string) {
@@ -127,7 +128,7 @@ func (s *ImageService) UploadImage(ctx context.Context, profile *config.Profile,
 
 			thumbSizePath := s.createThumbnailPathForSize(imagePath, size, convertType)
 			thumbFullPath := fmt.Sprintf("%s/%s", profile.ThumbFolder, thumbSizePath)
-			
+
 			thumbJobs <- thumbnailJob{
 				sizeStr: size,
 				data:    thumbnailData,
@@ -145,7 +146,7 @@ func (s *ImageService) UploadImage(ctx context.Context, profile *config.Profile,
 				uploadErrors <- job.err
 				return
 			}
-			
+
 			err := s.S3Client.PutObject(ctx, job.path, bytes.NewReader(job.data))
 			if err != nil {
 				uploadErrors <- fmt.Errorf("failed to upload thumbnail for size %s: %w", job.sizeStr, err)
@@ -175,25 +176,25 @@ func (s *ImageService) generateThumbnail(imageData []byte, width, quality int, c
 		Width:   width,
 		Quality: quality,
 	}
-	
+
 	// Set output format
 	switch convertTo {
 	case "webp":
 		options.Type = bimg.WEBP
 	case "jpeg", "jpg":
-		options.Type = bimg.JPEG  
+		options.Type = bimg.JPEG
 	case "png":
 		options.Type = bimg.PNG
 	default:
 		// Default to JPEG if format is unknown (fallback)
 		options.Type = bimg.JPEG
 	}
-	
+
 	resizedData, err := bimg.NewImage(imageData).Process(options)
 	if err != nil {
 		return nil, fmt.Errorf("failed to process image with bimg: %w", err)
 	}
-	
+
 	return resizedData, nil
 }