Fix progress bar

Author: ericmj

lib/hex/api/release.ex

@@ -11,11 +11,14 @@ defmodule Hex.API.Release do
 
   def publish(repo, tar, auth, progress \\ fn _ -> nil end, replace \\ false)
 
-  def publish(repo, tar, auth, _progress, replace?) do
+  def publish(repo, tar, auth, progress, replace?) do
     config = build_config(repo, auth)
-    params = [{:replace, replace?}]
 
-    # TODO: Progress callback needs to be handled differently with hex_core
+    # Pass progress callback through adapter config
+    adapter_config = %{progress_callback: progress}
+    config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
+
+    params = [{:replace, replace?}]
     :mix_hex_api_release.publish(config, tar, params)
   end
 

lib/hex/api/release_docs.ex

@@ -5,24 +5,51 @@ defmodule Hex.API.ReleaseDocs do
 
   def get(repo, name, version) do
     config = build_config(repo, [])
-    path = :mix_hex_api.build_repository_path(config, ["packages", to_string(name), "releases", to_string(version), "docs"])
+
+    path =
+      :mix_hex_api.build_repository_path(config, [
+        "packages",
+        to_string(name),
+        "releases",
+        to_string(version),
+        "docs"
+      ])
 
     :mix_hex_api.get(config, path)
   end
 
-  def publish(repo, name, version, tar, auth, _progress \\ fn _ -> nil end) do
+  def publish(repo, name, version, tar, auth, progress \\ fn _ -> nil end) do
     config = build_config(repo, auth)
-    path = :mix_hex_api.build_repository_path(config, ["packages", to_string(name), "releases", to_string(version), "docs"])
+
+    # Pass progress callback through adapter config
+    adapter_config = %{progress_callback: progress}
+    config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
+
+    path =
+      :mix_hex_api.build_repository_path(config, [
+        "packages",
+        to_string(name),
+        "releases",
+        to_string(version),
+        "docs"
+      ])
 
     body = {"application/octet-stream", tar}
 
-    # TODO: Progress callback needs to be handled differently
     :mix_hex_api.post(config, path, body)
   end
 
   def delete(repo, name, version, auth) do
     config = build_config(repo, auth)
-    path = :mix_hex_api.build_repository_path(config, ["packages", to_string(name), "releases", to_string(version), "docs"])
+
+    path =
+      :mix_hex_api.build_repository_path(config, [
+        "packages",
+        to_string(name),
+        "releases",
+        to_string(version),
+        "docs"
+      ])
 
     :mix_hex_api.delete(config, path)
   end
@@ -32,5 +59,4 @@ defmodule Hex.API.ReleaseDocs do
     opts = if auth, do: Keyword.merge(opts, auth), else: opts
     Client.config(opts)
   end
-
 end

lib/hex/api/short_url.ex

@@ -9,6 +9,7 @@ defmodule Hex.API.ShortURL do
     case :mix_hex_api_short_url.create(config, to_string(url)) do
       {:ok, {201, _headers, %{"url" => short_url}}} ->
         {:ok, short_url}
+
       _error ->
         :error
     end

lib/hex/http.ex

@@ -47,6 +47,11 @@ defmodule Hex.HTTP do
         Hex.State.fetch!(:http_timeout, fn val -> if is_integer(val), do: val * 1000 end) ||
         @request_timeout
 
+    # Handle progress callback for uploads
+    progress_callback = Map.get(adapter_config, :progress_callback)
+    {body, extra_headers} = wrap_body_with_progress(body, progress_callback)
+    headers = Map.merge(headers, extra_headers)
+
     http_opts = build_http_opts(url, timeout)
     opts = [body_format: :binary]
     request = build_request(url, headers, body)
@@ -389,4 +394,37 @@ defmodule Hex.HTTP do
         headers
     end
   end
+
+  @chunk_size 10_000
+
+  defp wrap_body_with_progress(body, progress_callback) do
+    case body do
+      {content_type, binary_body}
+      when is_binary(binary_body) and is_function(progress_callback, 1) ->
+        # Create streaming function for httpc chunked upload - match old API pattern exactly
+        total_size = byte_size(binary_body)
+        # Initialize progress bar
+        progress_callback.(0)
+
+        body_fn = fn
+          size when size < total_size ->
+            new_size = min(size + @chunk_size, total_size)
+            chunk = new_size - size
+            progress_callback.(new_size)
+            {:ok, :binary.part(binary_body, size, chunk), new_size}
+
+          _size ->
+            :eof
+        end
+
+        # Return chunked body AND content-length header (required for chunked uploads)
+        body_result = {content_type, {body_fn, 0}}
+        headers = %{"content-length" => Integer.to_string(total_size)}
+        {body_result, headers}
+
+      _other ->
+        # No progress callback or not a binary body, use as-is
+        {body, %{}}
+    end
+  end
 end

lib/hex/registry/server.ex

@@ -360,7 +360,6 @@ defmodule Hex.Registry.Server do
 
   defp write_result({:ok, {code, headers, %{releases: releases}}}, repo, package, %{ets: tid})
        when code in 200..299 do
-
     delete_package(repo, package, tid)
     now = :calendar.universal_time()
 

lib/hex/repo.ex

@@ -225,7 +225,6 @@ defmodule Hex.Repo do
     :mix_hex_repo.get_hex_installs(config)
   end
 
-
   def find_new_version_from_csv(body) do
     body
     |> parse_csv()
@@ -238,7 +237,6 @@ defmodule Hex.Repo do
     config.url <> "/tarballs/#{URI.encode(package)}-#{URI.encode(version)}.tar"
   end
 
-
   defp parse_csv(body) do
     body
     |> :binary.split("\n", [:global, :trim])
@@ -351,11 +349,12 @@ defmodule Hex.Repo do
         http_user_agent_fragment: user_agent_fragment()
     }
 
-    config = if repo.auth_key && Map.get(repo, :trusted, true) do
-      Map.put(config, :repo_key, repo.auth_key)
-    else
-      config
-    end
+    config =
+      if repo.auth_key && Map.get(repo, :trusted, true) do
+        Map.put(config, :repo_key, repo.auth_key)
+      else
+        config
+      end
 
     if etag do
       Map.put(config, :http_etag, etag)

lib/mix/tasks/hex.user.ex

@@ -287,8 +287,10 @@ defmodule Mix.Tasks.Hex.User do
                 item when is_map(item) -> Map.get(item, "authing_key") == true
                 _ -> false
               end)
+
             is_map(body) ->
               Map.get(body, "authing_key") == true
+
             true ->
               false
           end