Merge branch 'main' into distributed-deployment-orchestrator

lib/nerves_hub/devices.ex

@@ -778,7 +778,7 @@ defmodule NervesHub.Devices do
       |> Ecto.Changeset.put_change(:deployment_id, deployment.id)
       |> Repo.update!()
 
-    _ = broadcast(device, "devices/updated")
+    _ = broadcast(device, "devices/deployment-updated", %{deployment_id: deployment.id})
 
     Map.put(device, :deployment, deployment)
   end
@@ -791,7 +791,7 @@ defmodule NervesHub.Devices do
       |> Ecto.Changeset.put_change(:deployment_id, nil)
       |> Repo.update!()
 
-    _ = broadcast(device, "devices/updated")
+    _ = broadcast(device, "devices/deployment-cleared")
 
     Map.put(device, :deployment, nil)
   end
@@ -1230,11 +1230,15 @@ defmodule NervesHub.Devices do
     end
   end
 
-  defp broadcast(%Device{id: id}, event) do
+  defp broadcast(device, event), do: broadcast(device, event, %{})
+
+  defp broadcast(%Device{id: id}, event, payload) do
+    topic = "device:#{id}"
+
     Phoenix.PubSub.broadcast(
       NervesHub.PubSub,
-      "device:#{id}",
-      %Phoenix.Socket.Broadcast{topic: "device:#{id}", event: event}
+      topic,
+      %Phoenix.Socket.Broadcast{topic: topic, event: event, payload: payload}
     )
   end
 

lib/nerves_hub_web/channels/device_channel.ex

@@ -194,12 +194,22 @@ defmodule NervesHubWeb.DeviceChannel do
     {:noreply, socket}
   end
 
-  @decorate with_span("Channels.DeviceChannel.handle_info:clear-deployment")
+  @decorate with_span("Channels.DeviceChannel.handle_info:deployment-cleared")
   def handle_info(
-        %Broadcast{event: "devices/clear-deployment"},
+        %Broadcast{event: "devices/deployment-cleared"},
         %{assigns: %{device: device}} = socket
       ) do
-    device = %{device | deployment_id: nil, deployment: nil}
+    device = %{device | deployment_id: nil}
+
+    {:noreply, update_device(socket, device)}
+  end
+
+  @decorate with_span("Channels.DeviceChannel.handle_info:deployment-updated")
+  def handle_info(
+        %Broadcast{event: "devices/deployment-updated", payload: %{deployment_id: deployment_id}},
+        %{assigns: %{device: device}} = socket
+      ) do
+    device = %{device | deployment_id: deployment_id}
 
     {:noreply, update_device(socket, device)}
   end
@@ -411,15 +421,19 @@ defmodule NervesHubWeb.DeviceChannel do
     :ok
   end
 
-  defp subscribe(topic) do
+  defp subscribe(topic) when not is_nil(topic) do
     _ = Phoenix.PubSub.subscribe(NervesHub.PubSub, topic)
     :ok
   end
 
-  defp unsubscribe(topic) do
+  defp subscribe(nil), do: :ok
+
+  defp unsubscribe(topic) when not is_nil(topic) do
     Phoenix.PubSub.unsubscribe(NervesHub.PubSub, topic)
   end
 
+  defp unsubscribe(nil), do: :ok
+
   defp device_internal_broadcast!(socket, device, event, payload) do
     topic = "device:#{device.identifier}:internal"
     socket.endpoint.broadcast_from!(self(), topic, event, payload)
@@ -495,8 +509,6 @@ defmodule NervesHubWeb.DeviceChannel do
   defp deployment_channel(device) do
     if device.deployment_id do
       "deployment:#{device.deployment_id}"
-    else
-      "deployment:none"
     end
   end