Update to support electric 1.4

- Fix invalid protocol typing
- Support more esoteric version tuples

Author: magnetised

.gitignore

@@ -24,3 +24,5 @@ electric_phoenix-*.tar
 
 # Temporary files, for example, from tests.
 /tmp/
+.claude
+

apps/phoenix_sync_example/mix.exs

@@ -50,7 +50,7 @@ defmodule PhoenixSyncExample.MixProject do
       {:dns_cluster, "~> 0.1.1"},
       {:bandit, "~> 1.5"},
       {:phoenix_sync, path: "../.."},
-      {:electric, "~> 1.1.0"}
+      {:electric, "~> 1.0"}
     ]
   end
 

apps/phoenix_sync_example/mix.lock

@@ -26,7 +26,7 @@ defmodule PlugSync.MixProject do
       {:bandit, "~> 1.0"},
       {:postgrex, "~> 0.21"},
       {:ecto_sql, "~> 3.0"},
-      {:electric, "~> 1.1.2"},
+      {:electric, "~> 1.0"},
       {:phoenix_sync, [path: "../..", override: true]},
       {:igniter, "~> 0.6"}
     ]

apps/plug_sync/mix.exs

@@ -22,7 +22,7 @@ defmodule TXIDMatch.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:electric, "~> 1.1.1", override: true},
+      {:electric, "~> 1.0", override: true},
       {:electric_client, "~> 0.7", override: true},
       {:nimble_options, "~> 1.1"},
       {:phoenix_live_view, "~> 1.0", optional: true},

apps/plug_sync/mix.lock

@@ -300,7 +300,7 @@ if Code.ensure_loaded?(Igniter) do
     defp required_electric_version do
       Phoenix.Sync.MixProject.project()
       |> Keyword.fetch!(:deps)
-      |> Enum.find(&match?({:electric, _, _}, &1))
+      |> Enum.find(&(elem(&1, 0) == :electric))
       |> elem(1)
     end
 

apps/txid_match/mix.exs

@@ -640,8 +640,9 @@ defmodule Phoenix.Sync.Electric do
   end
 end
 
-if Code.ensure_loaded?(Electric.Shapes.Api) &&
-     Code.ensure_loaded?(Phoenix.Sync.Electric.ApiAdapter) do
+if Code.ensure_loaded?(Electric.Shapes.Api) do
+  Code.ensure_loaded(Phoenix.Sync.Electric.ApiAdapter)
+
   defimpl Phoenix.Sync.Adapter.PlugApi, for: Electric.Shapes.Api do
     alias Electric.Shapes
 
@@ -701,7 +702,7 @@ if Code.ensure_loaded?(Electric.Shapes.Api) &&
       end
     end
 
-    def send_response(%ApiAdapter{}, conn, {request, response}) do
+    def send_response(_api, conn, {request, response}) do
       conn
       |> content_type()
       |> Plug.Conn.assign(:request, request)

lib/mix/tasks/phoenix_sync.install.ex

@@ -13,10 +13,12 @@ defmodule Phoenix.Sync.Plug.CORS do
   @electric_headers [
     "electric-cursor",
     "electric-handle",
+    "electric-has-data",
     "electric-offset",
     "electric-schema",
     "electric-up-to-date",
-    "electric-internal-known-error"
+    "electric-internal-known-error",
+    "retry-after"
   ]
 
   @expose_headers ["transfer-encoding" | @electric_headers]

lib/phoenix/sync/electric.ex

@@ -253,13 +253,14 @@ if Phoenix.Sync.sandbox_enabled?() do
 
           :ok = maybe_set_shared_mode(owner, stack_id, opts)
 
-          # give the inspector access to the sandboxed connection
-          Ecto.Adapters.SQL.Sandbox.allow(repo, owner, Sandbox.Inspector.name(stack_id))
-
           # mark the stack as ready
           Electric.StatusMonitor.mark_pg_lock_acquired(stack_id, owner)
           Electric.StatusMonitor.mark_replication_client_ready(stack_id, owner)
-          Electric.StatusMonitor.mark_connection_pool_ready(stack_id, owner)
+          Electric.StatusMonitor.mark_connection_pool_ready(stack_id, :admin, owner)
+          Electric.StatusMonitor.mark_connection_pool_ready(stack_id, :snapshot, owner)
+          Electric.StatusMonitor.mark_integrety_checks_passed(stack_id, owner)
+          Electric.StatusMonitor.mark_shape_log_collector_ready(stack_id, owner)
+          Electric.StatusMonitor.mark_supervisor_processes_ready(stack_id, owner)
 
           api_config = Sandbox.Stack.config(stack_id, repo)
           api = Electric.Application.api(api_config)
@@ -292,7 +293,8 @@ if Phoenix.Sync.sandbox_enabled?() do
     defp generate_stack_id(opts) do
       tags = Keyword.get(opts, :tags, %{})
       # with parameterised tests the same file:line can be running simultaneously
-      uid = System.unique_integer() |> to_string()
+      uid = System.unique_integer([:positive, :monotonic]) |> to_string()
+      now = System.monotonic_time(:microsecond)
 
       suffix =
         case Map.fetch(tags, :line) do
@@ -306,7 +308,7 @@ if Phoenix.Sync.sandbox_enabled?() do
           :error -> ""
         end
 
-      "#{inspect(__MODULE__.Stack)}#{uid}#{prefix}#{suffix}"
+      "#{inspect(__MODULE__.Stack)}#{now}-#{uid}#{prefix}#{suffix}"
     end
 
     defp maybe_set_shared_mode(owner, stack_id, opts) do