Merge branch 'file-proxy'

This commit is contained in:
Chris McCord 2022-01-27 09:36:18 -05:00
commit bfb0c07330
13 changed files with 145 additions and 15 deletions

View file

@ -96,6 +96,7 @@ Hooks.AudioPlayer = {
mounted(){ mounted(){
this.playbackBeganAt = null this.playbackBeganAt = null
this.player = this.el.querySelector("audio") this.player = this.el.querySelector("audio")
this.playerDuration = 0
this.currentTime = this.el.querySelector("#player-time") this.currentTime = this.el.querySelector("#player-time")
this.duration = this.el.querySelector("#player-duration") this.duration = this.el.querySelector("#player-duration")
this.progress = this.el.querySelector("#player-progress") this.progress = this.el.querySelector("#player-progress")
@ -115,9 +116,10 @@ Hooks.AudioPlayer = {
this.play() this.play()
} }
}) })
this.handleEvent("play", ({url, token, elapsed}) => { this.handleEvent("play", ({url, token, duration, elapsed}) => {
this.playbackBeganAt = nowSeconds() - elapsed this.playbackBeganAt = nowSeconds() - elapsed
let currentSrc = this.player.src.split("?")[0] let currentSrc = this.player.src.split("?")[0]
this.playerDuration = duration
if(currentSrc === url && this.player.paused){ if(currentSrc === url && this.player.paused){
this.play({sync: true}) this.play({sync: true})
} else if(currentSrc !== url) { } else if(currentSrc !== url) {
@ -156,14 +158,15 @@ Hooks.AudioPlayer = {
}, },
updateProgress(){ updateProgress(){
if(isNaN(this.player.duration)){ return false } if(this.playerDuration === 0){ return false }
if(this.player.currentTime >= this.player.duration){ if(Math.ceil(this.player.currentTime) >= Math.floor(this.playerDuration)){
this.playerDuration = 0
this.pushEvent("next_song_auto") this.pushEvent("next_song_auto")
clearInterval(this.progressTimer) clearInterval(this.progressTimer)
return return
} }
this.progress.style.width = `${(this.player.currentTime / (this.player.duration) * 100)}%` this.progress.style.width = `${(this.player.currentTime / (this.playerDuration) * 100)}%`
this.duration.innerText = this.formatTime(this.player.duration) this.duration.innerText = this.formatTime(this.playerDuration)
this.currentTime.innerText = this.formatTime(this.player.currentTime) this.currentTime.innerText = this.formatTime(this.player.currentTime)
}, },

View file

@ -2,7 +2,8 @@ import Config
config :live_beats, :files, config :live_beats, :files,
uploads_dir: Path.expand("../priv/uploads", __DIR__), uploads_dir: Path.expand("../priv/uploads", __DIR__),
host: [scheme: "http", host: "localhost", port: 4000] host: [scheme: "http", host: "localhost", port: 4000],
server_ip: "127.0.0.1"
config :live_beats, :github, config :live_beats, :github,
client_id: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_ID"), client_id: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_ID"),

View file

@ -22,6 +22,10 @@ if config_env() == :prod do
host = System.get_env("PHX_HOST") || "example.com" host = System.get_env("PHX_HOST") || "example.com"
ecto_ipv6? = System.get_env("ECTO_IPV6") == "true" ecto_ipv6? = System.get_env("ECTO_IPV6") == "true"
app_name =
System.get_env("FLY_APP_NAME") ||
raise "FLY_APP_NAME not available"
config :live_beats, LiveBeats.Repo, config :live_beats, LiveBeats.Repo,
# ssl: true, # ssl: true,
socket_options: if(ecto_ipv6?, do: [:inet6], else: []), socket_options: if(ecto_ipv6?, do: [:inet6], else: []),
@ -49,9 +53,26 @@ if config_env() == :prod do
config :live_beats, :files, config :live_beats, :files,
uploads_dir: "/app/uploads", uploads_dir: "/app/uploads",
host: [scheme: "https", host: host, port: 443] host: [scheme: "https", host: host, port: 443],
server_ip: System.fetch_env!("LIVE_BEATS_SERVER_IP"),
hostname: "livebeats.local",
transport_opts: [inet6: true]
config :live_beats, :github, config :live_beats, :github,
client_id: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_ID"), client_id: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_ID"),
client_secret: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_SECRET") client_secret: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_SECRET")
config :libcluster,
debug: true,
topologies: [
fly6pn: [
strategy: Cluster.Strategy.DNSPoll,
config: [
polling_interval: 5_000,
query: "#{app_name}.internal",
node_basename: app_name
]
]
]
end end

View file

@ -1,9 +1,10 @@
import Config import Config
config :live_beats, :files, [ config :live_beats, :files,
uploads_dir: Path.expand("../tmp/test-uploads", __DIR__), uploads_dir: Path.expand("../tmp/test-uploads", __DIR__),
host: [scheme: "http", host: "localhost", port: 4000], host: [scheme: "http", host: "localhost", port: 4000],
] server_ip: "127.0.0.1"
# Configure your database # Configure your database
# #
# The MIX_TEST_PARTITION environment variable can be used # The MIX_TEST_PARTITION environment variable can be used

View file

@ -8,8 +8,10 @@ defmodule LiveBeats.Application do
@impl true @impl true
def start(_type, _args) do def start(_type, _args) do
LiveBeats.MediaLibrary.attach() LiveBeats.MediaLibrary.attach()
topologies = Application.get_env(:libcluster, :topologies) || []
children = [ children = [
{Cluster.Supervisor, [topologies, [name: LiveBeats.ClusterSupervisor]]},
{Task.Supervisor, name: LiveBeats.TaskSupervisor}, {Task.Supervisor, name: LiveBeats.TaskSupervisor},
# Start the Ecto repository # Start the Ecto repository
LiveBeats.Repo, LiveBeats.Repo,

View file

@ -158,6 +158,7 @@ defmodule LiveBeats.MediaLibrary do
chset chset
|> Song.put_user(user) |> Song.put_user(user)
|> Song.put_mp3_path() |> Song.put_mp3_path()
|> Song.put_server_ip()
Ecto.Multi.insert(acc, {:song, ref}, chset) Ecto.Multi.insert(acc, {:song, ref}, chset)
end) end)

View file

@ -19,6 +19,7 @@ defmodule LiveBeats.MediaLibrary.Song do
field :mp3_url, :string field :mp3_url, :string
field :mp3_filepath, :string field :mp3_filepath, :string
field :mp3_filename, :string field :mp3_filename, :string
field :server_ip, EctoNetwork.INET
belongs_to :user, Accounts.User belongs_to :user, Accounts.User
belongs_to :genre, LiveBeats.MediaLibrary.Genre belongs_to :genre, LiveBeats.MediaLibrary.Genre
@ -68,6 +69,11 @@ defmodule LiveBeats.MediaLibrary.Song do
end end
end end
def put_server_ip(%Ecto.Changeset{} = changeset) do
server_ip = LiveBeats.config([:files, :server_ip])
Ecto.Changeset.cast(changeset, %{server_ip: server_ip}, [:server_ip])
end
defp mp3_url(filename) do defp mp3_url(filename) do
%{scheme: scheme, host: host, port: port} = Enum.into(LiveBeats.config([:files, :host]), %{}) %{scheme: scheme, host: host, port: port} = Enum.into(LiveBeats.config([:files, :host]), %{})
URI.to_string(%URI{scheme: scheme, host: host, port: port, path: "/files/#{filename}"}) URI.to_string(%URI{scheme: scheme, host: host, port: port, path: "/files/#{filename}"})

View file

@ -6,11 +6,27 @@ defmodule LiveBeatsWeb.FileController do
alias LiveBeats.MediaLibrary alias LiveBeats.MediaLibrary
require Logger
def show(conn, %{"id" => filename_uuid, "token" => token}) do def show(conn, %{"id" => filename_uuid, "token" => token}) do
case Phoenix.Token.verify(conn, "file", token, max_age: :timer.minutes(1)) do path = MediaLibrary.local_filepath(filename_uuid)
{:ok, ^filename_uuid} -> do_send_file(conn, MediaLibrary.local_filepath(filename_uuid)) mime_type = MIME.from_path(path)
{:ok, _} -> send_resp(conn, :unauthorized, "")
{:error, _} -> send_resp(conn, :unauthorized, "") case Phoenix.Token.decrypt(conn, "file", token, max_age: :timer.minutes(1)) do
{:ok, %{uuid: ^filename_uuid, ip: ip}} ->
if local_file?(filename_uuid, ip) do
Logger.info("serving file from #{server_ip()}")
do_send_file(conn, path)
else
Logger.info("proxying file to #{ip} from #{server_ip()}")
proxy_file(conn, ip, mime_type)
end
{:ok, _} ->
send_resp(conn, :unauthorized, "")
{:error, _} ->
send_resp(conn, :unauthorized, "")
end end
end end
@ -21,4 +37,60 @@ defmodule LiveBeatsWeb.FileController do
|> put_resp_header("accept-ranges", "bytes") |> put_resp_header("accept-ranges", "bytes")
|> send_file(200, path) |> send_file(200, path)
end end
defp proxy_file(conn, ip, mime_type) do
uri = conn |> request_url() |> URI.parse()
port = LiveBeatsWeb.Endpoint.config(:http)[:port]
path = uri.path <> "?" <> uri.query <> "&from=#{server_ip()}"
{:ok, ipv6} = :inet.parse_address(String.to_charlist(ip))
{:ok, req} = Mint.HTTP.connect(:http, ipv6, port, file_server_opts())
{:ok, req, request_ref} = Mint.HTTP.request(req, "GET", path, [], "")
conn
|> put_resp_header("content-type", mime_type)
|> put_resp_header("accept-ranges", "bytes")
|> put_resp_header("transfer-encoding", "chunked")
|> send_chunked(200)
|> stream(req, request_ref)
end
defp stream(conn, req, ref) do
receive do
{:tcp, _, _} = msg ->
{:ok, req, responses} = Mint.HTTP.stream(req, msg)
new_conn =
Enum.reduce(responses, conn, fn
{:data, ^ref, data}, acc -> chunk!(acc, data)
{:done, ^ref}, acc -> halt(acc)
{:status, ^ref, 200}, acc -> acc
{:headers, ^ref, _}, acc -> acc
end)
if new_conn.halted do
new_conn
else
stream(new_conn, req, ref)
end
end
end
defp chunk!(conn, data) do
{:ok, conn} = chunk(conn, data)
conn
end
defp local_file?(_filename_uuid, ip) do
# TODO cache locally
ip == server_ip()
end
defp server_ip, do: LiveBeats.config([:files, :server_ip])
defp file_server_opts do
[
hostname: LiveBeats.config([:files, :hostname]) || "localhost",
transport_opts: LiveBeats.config([:files, :transport_opts]) || []
]
end
end end

View file

@ -297,11 +297,17 @@ defmodule LiveBeatsWeb.PlayerLive do
end end
defp push_play(socket, %Song{} = song, elapsed) do defp push_play(socket, %Song{} = song, elapsed) do
token = Phoenix.Token.sign(socket.endpoint, "file", song.mp3_filename) token =
Phoenix.Token.encrypt(socket.endpoint, "file", %{
vsn: 1,
ip: to_string(song.server_ip),
uuid: song.mp3_filename
})
push_event(socket, "play", %{ push_event(socket, "play", %{
paused: Song.paused?(song), paused: Song.paused?(song),
elapsed: elapsed, elapsed: elapsed,
duration: song.duration,
token: token, token: token,
url: song.mp3_url url: song.mp3_url
}) })

View file

@ -36,6 +36,7 @@ defmodule LiveBeats.MixProject do
{:phoenix, github: "phoenixframework/phoenix", override: true}, {:phoenix, github: "phoenixframework/phoenix", override: true},
{:phoenix_ecto, "~> 4.4"}, {:phoenix_ecto, "~> 4.4"},
{:ecto_sql, "~> 3.6"}, {:ecto_sql, "~> 3.6"},
{:ecto_network, "~> 1.3.0"},
{:postgrex, ">= 0.0.0"}, {:postgrex, ">= 0.0.0"},
{:phoenix_html, "~> 3.0"}, {:phoenix_html, "~> 3.0"},
{:phoenix_live_reload, "~> 1.2", only: :dev}, {:phoenix_live_reload, "~> 1.2", only: :dev},
@ -52,7 +53,8 @@ defmodule LiveBeats.MixProject do
{:mint, "~> 1.0"}, {:mint, "~> 1.0"},
{:heroicons, "~> 0.2.2"}, {:heroicons, "~> 0.2.2"},
{:castore, "~> 0.1.13"}, {:castore, "~> 0.1.13"},
{:tailwind, "~> 0.1"} {:tailwind, "~> 0.1"},
{:libcluster, "~> 3.3.1"}
] ]
end end

View file

@ -7,6 +7,7 @@
"db_connection": {:hex, :db_connection, "2.4.0", "d04b1b73795dae60cead94189f1b8a51cc9e1f911c234cc23074017c43c031e5", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ad416c21ad9f61b3103d254a71b63696ecadb6a917b36f563921e0de00d7d7c8"}, "db_connection": {:hex, :db_connection, "2.4.0", "d04b1b73795dae60cead94189f1b8a51cc9e1f911c234cc23074017c43c031e5", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ad416c21ad9f61b3103d254a71b63696ecadb6a917b36f563921e0de00d7d7c8"},
"decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"}, "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
"ecto": {:hex, :ecto, "3.7.1", "a20598862351b29f80f285b21ec5297da1181c0442687f9b8329f0445d228892", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d36e5b39fc479e654cffd4dbe1865d9716e4a9b6311faff799b6f90ab81b8638"}, "ecto": {:hex, :ecto, "3.7.1", "a20598862351b29f80f285b21ec5297da1181c0442687f9b8329f0445d228892", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d36e5b39fc479e654cffd4dbe1865d9716e4a9b6311faff799b6f90ab81b8638"},
"ecto_network": {:hex, :ecto_network, "1.3.0", "1e77fa37c20e0f6a426d3862732f3317b0fa4c18f123d325f81752a491d7304e", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:phoenix_html, ">= 0.0.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.14.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "053a5e46ef2837e8ea5ea97c82fa0f5494699209eddd764e663c85f11b2865bd"},
"ecto_sql": {:hex, :ecto_sql, "3.7.0", "2fcaad4ab0c8d76a5afbef078162806adbe709c04160aca58400d5cbbe8eeac6", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.4.0 or ~> 0.5.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a26135dfa1d99bf87a928c464cfa25bba6535a4fe761eefa56077a4febc60f70"}, "ecto_sql": {:hex, :ecto_sql, "3.7.0", "2fcaad4ab0c8d76a5afbef078162806adbe709c04160aca58400d5cbbe8eeac6", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.4.0 or ~> 0.5.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a26135dfa1d99bf87a928c464cfa25bba6535a4fe761eefa56077a4febc60f70"},
"erlog": {:git, "git://github.com/segun/erlog.git", "76825e0500b6b62b99f28411933dc15a1cb2817f", [ref: "master"]}, "erlog": {:git, "git://github.com/segun/erlog.git", "76825e0500b6b62b99f28411933dc15a1cb2817f", [ref: "master"]},
"erlp3tags": {:git, "https://github.com/segun/erlp3tags.git", "9b6c72da9057b9e00c7711148ce10e6cdbacae18", []}, "erlp3tags": {:git, "https://github.com/segun/erlp3tags.git", "9b6c72da9057b9e00c7711148ce10e6cdbacae18", []},
@ -18,6 +19,7 @@
"html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"}, "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
"id3": {:hex, :id3, "1.0.1", "344840dee445c19be4b6dca9c70f0a7cd5dd03cb4260bae8ad9a21457ef12813", [:mix], [{:rustler, "~> 0.21.0", [hex: :rustler, repo: "hexpm", optional: false]}], "hexpm", "07ee2a284414065920751a528f237e77dc2aeed222a75302f909f3c07fd867e1"}, "id3": {:hex, :id3, "1.0.1", "344840dee445c19be4b6dca9c70f0a7cd5dd03cb4260bae8ad9a21457ef12813", [:mix], [{:rustler, "~> 0.21.0", [hex: :rustler, repo: "hexpm", optional: false]}], "hexpm", "07ee2a284414065920751a528f237e77dc2aeed222a75302f909f3c07fd867e1"},
"jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"}, "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
"libcluster": {:hex, :libcluster, "3.3.1", "e7a4875cd1290cee7a693d6bd46076863e9e433708b01339783de6eff5b7f0aa", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b575ca63c1cd84e01f3fa0fc45e6eb945c1ee7ae8d441d33def999075e9e5398"},
"mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"}, "mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"},
"mint": {:hex, :mint, "1.3.0", "396b3301102f7b775e103da5a20494b25753aed818d6d6f0ad222a3a018c3600", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "a9aac960562e43ca69a77e5176576abfa78b8398cec5543dd4fb4ab0131d5c1e"}, "mint": {:hex, :mint, "1.3.0", "396b3301102f7b775e103da5a20494b25753aed818d6d6f0ad222a3a018c3600", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "a9aac960562e43ca69a77e5176576abfa78b8398cec5543dd4fb4ab0131d5c1e"},
"phoenix": {:git, "https://github.com/phoenixframework/phoenix.git", "8d2b33ac9691bd624ede602088d213f89600d233", []}, "phoenix": {:git, "https://github.com/phoenixframework/phoenix.git", "8d2b33ac9691bd624ede602088d213f89600d233", []},

View file

@ -0,0 +1,9 @@
defmodule LiveBeats.Repo.Migrations.AddServerIpToSongs do
use Ecto.Migration
def change do
alter table(:songs) do
add :server_ip, :inet
end
end
end

4
rel/env.sh.eex Normal file
View file

@ -0,0 +1,4 @@
ip=$(grep fly-local-6pn /etc/hosts | cut -f 1)
export RELEASE_DISTRIBUTION=name
export RELEASE_NODE=$FLY_APP_NAME@$ip
export LIVE_BEATS_SERVER_IP=$ip