fix CDN finally!

Author: scooterthedev

app/controllers/api/v1/uploads_controller.rb

@@ -14,6 +14,9 @@ def create
     render json: { url: cdn_url }
   rescue CdnUploadService::InvalidFileError => e
     render json: { error: e.message }, status: :unprocessable_entity
+  rescue CdnUploadService::QuotaExceededError => e
+    Rails.logger.error("CDN quota exceeded: #{e.message}")
+    render json: { error: "Storage quota exceeded. Please contact support." }, status: :payment_required
   rescue CdnUploadService::UploadError => e
     Rails.logger.error("CDN upload error: #{e.message}")
     render json: { error: "Upload failed. Please try again." }, status: :service_unavailable

app/services/cdn_upload_service.rb

@@ -8,10 +8,10 @@ class CdnUploadService
     video/quicktime
   ].freeze
   MAX_FILE_SIZE = 50.megabytes
-  CDN_API_TOKEN = "beans".freeze
 
   class UploadError < StandardError; end
   class InvalidFileError < StandardError; end
+  class QuotaExceededError < StandardError; end
 
   def initialize(file)
     @file = file
@@ -24,6 +24,10 @@ def upload!
 
   private
 
+  def cdn_api_token
+    Rails.application.credentials&.cdn || ENV["CDN"]
+  end
+
   def validate_file!
     raise InvalidFileError, "No file provided" unless @file.present?
     raise InvalidFileError, "File too large (max 50MB)" if @file.size > MAX_FILE_SIZE
@@ -62,23 +66,32 @@ def validate_file_signature!
 
   def upload_to_cdn
     @file.rewind
-    file_data = @file.read
-    base64_data = Base64.strict_encode64(file_data)
-    data_url = "data:#{@file.content_type};base64,#{base64_data}"
-
-    response = Faraday.post("https://cdn.hackclub.com/api/v3/new") do |req|
-      req.headers["Authorization"] = "Bearer #{CDN_API_TOKEN}"
-      req.headers["Content-Type"] = "application/json"
-      req.body = [ data_url ].to_json
-    end
-
-    raise UploadError, "CDN upload failed: #{response.status}" unless response.success?
 
-    result = JSON.parse(response.body)
-    files = result["files"]
+    conn = Faraday.new do |f|
+      f.request :multipart
+      f.adapter Faraday.default_adapter
+    end
 
-    raise UploadError, "No files returned from CDN" if files.blank?
+    response = conn.post("https://cdn.hackclub.com/api/v4/upload") do |req|
+      req.headers["Authorization"] = "Bearer #{cdn_api_token}"
+      req.body = {
+        file: Faraday::Multipart::FilePart.new(
+          @file.tempfile,
+          @file.content_type,
+          @file.original_filename
+        )
+      }
+    end
 
-    files.first["deployedUrl"]
+    case response.status
+    when 200, 201
+      result = JSON.parse(response.body)
+      result["url"]
+    when 402
+      result = JSON.parse(response.body)
+      raise QuotaExceededError, "Storage quota exceeded: #{result.dig('quota', 'percentage_used')}% used"
+    else
+      raise UploadError, "CDN upload failed: #{response.status}"
+    end
   end
 end