Merge pull request #119 from akira/live-socket

respect live_socket_path config option
akira · Jun 22, 2022 · 936467f · 936467f
2 parents 7d561d7 + b30db29
commit 936467f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/assets/js/app.js b/assets/js/app.js
@@ -25,7 +25,10 @@ import { Timestamp } from "./hooks/timestamp";
 let csrfToken = document
   .querySelector("meta[name='csrf-token']")
   .getAttribute("content");
-let liveSocket = new LiveSocket("/live", Socket, {
+let socketPath =
+  document.querySelector("html").getAttribute("phx-socket") || "/live";
+
+let liveSocket = new LiveSocket(socketPath, Socket, {
   params: { _csrf_token: csrfToken },
   hooks: {
     Table: Table,

diff --git a/dev.exs b/dev.exs
@@ -41,7 +41,7 @@ defmodule DemoWeb.Router do
   scope "/", DemoWeb do
     pipe_through :browser
 
-    live_exq_ui("/exq")
+    live_exq_ui("/exq", live_socket_path: "/exq/live")
   end
 end
 
@@ -54,7 +54,9 @@ defmodule DemoWeb.Endpoint do
     signing_salt: "Y3AT90O7"
   ]
 
-  socket "/live", Phoenix.LiveView.Socket, websocket: [connect_info: [session: @session_options]]
+  socket "/exq/live", Phoenix.LiveView.Socket,
+    websocket: [connect_info: [session: @session_options]]
+
   socket "/phoenix/live_reload/socket", Phoenix.LiveReloader.Socket
   plug Phoenix.LiveReloader
   plug Phoenix.CodeReloader

diff --git a/lib/exq_ui_web/templates/layout/root.html.heex b/lib/exq_ui_web/templates/layout/root.html.heex
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" phx-socket={live_socket_path(@conn)}>
   <head>
     <meta charset="utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>

diff --git a/lib/exq_ui_web/views/layout_view.ex b/lib/exq_ui_web/views/layout_view.ex
@@ -13,4 +13,8 @@ defmodule ExqUIWeb.LayoutView do
 
   def render("app.js", _), do: @app_js
   def render("app.css", _), do: @app_css
+
+  def live_socket_path(conn) do
+    [Enum.map(conn.script_name, &["/" | &1]) | conn.private.live_socket_path]
+  end
 end
diff --git a/priv/static/js/app.js b/priv/static/js/app.js