+ <.input
+ type="number"
+ field={f[:terminal_line_height]}
+ class="form-control"
+ min={1.0}
+ max={2.0}
+ step="any"
+ placeholder="1.33333"
+ />
+ <.error form={f} field={:terminal_line_height} />
+
+ Relative to font size. Lowering it ~1.1 helps with alignment of block characters like â–€ â–„ â–ˆ
+
+
+
+
+
+ <.label for={f[:terminal_font_family]} class="col-sm-4 col-md-3 col-lg-3 col-form-label">
+ Terminal font family
+
+
+ <.input
+ type="select"
+ field={f[:terminal_font_family]}
+ options={terminal_font_family_options()}
+ class="form-control"
+ prompt="Default (web safe, platform specific)"
+ />
+
+ Choose one of Nerd Font variants if icons or other symbols in your recording are not visible.
+
+
- <% end %>
+
<%= if error = assigns[:error] do %>
-
+
<%= error %>
<% end %>
-
+
-
First time here?
+
<.info_outline_icon /> First time here?
<%= if sign_up_enabled?(@conn) do %>
We use email-based, passwordless login process. Enter your email
@@ -34,15 +38,14 @@
you'll get in, and you'll be able to pick your username.
<% else %>
Public sign up on this site hasn't been enabled. Bummer! Try contacting the
- administrator.
+ administrator.
<% end %>
-
Coming back?
+
<.info_outline_icon /> Coming back?
If you already have an account then enter either your username, or the
email address you used for the first time here. We'll send you an email
with a one-time login link.
-
diff --git a/lib/asciinema_web/templates/login/sent.html.eex b/lib/asciinema_web/controllers/login/sent.html.heex
similarity index 70%
rename from lib/asciinema_web/templates/login/sent.html.eex
rename to lib/asciinema_web/controllers/login/sent.html.heex
index 73084d8fd..cb9d44139 100644
--- a/lib/asciinema_web/templates/login/sent.html.eex
+++ b/lib/asciinema_web/controllers/login/sent.html.heex
@@ -1,8 +1,11 @@
-
Check your inbox
-
+
+ <.envelope_outline_icon /> Check your inbox
+
+
+
We've sent an email with one-time login link to your email address.
@@ -12,7 +15,7 @@
If the email doesn't show up in your inbox, check your spam folder,
- or try again.
+ or try again.
diff --git a/lib/asciinema_web/controllers/login_controller.ex b/lib/asciinema_web/controllers/login_controller.ex
index bda7a5b90..ec4315f07 100644
--- a/lib/asciinema_web/controllers/login_controller.ex
+++ b/lib/asciinema_web/controllers/login_controller.ex
@@ -1,40 +1,38 @@
defmodule AsciinemaWeb.LoginController do
- use AsciinemaWeb, :controller
- alias Asciinema.Accounts
+ use AsciinemaWeb, :new_controller
plug :clear_main_class
def new(conn, _params) do
- render(conn, "new.html")
+ render(conn, :new)
end
- def create(conn, %{"login" => %{"email" => email_or_username}}) do
- email_or_username = String.trim(email_or_username)
+ def create(conn, %{"login" => %{"email" => identifier}}) do
+ identifier = String.trim(identifier)
result =
- Accounts.send_login_email(
- email_or_username,
- &AsciinemaWeb.signup_url/1,
- &AsciinemaWeb.login_url/1,
- Map.get(conn.assigns, :cfg_sign_up_enabled?, true)
+ Asciinema.send_login_email(
+ identifier,
+ Map.get(conn.assigns, :cfg_sign_up_enabled?, true),
+ AsciinemaWeb
)
case result do
:ok ->
- redirect(conn, to: Routes.login_path(conn, :sent))
+ redirect(conn, to: ~p"/login/sent")
{:error, :user_not_found} ->
- render(conn, "new.html", error: "No user found for given username.")
+ render(conn, :new, error: "No user found for given username.")
{:error, :email_invalid} ->
- render(conn, "new.html", error: "This doesn't look like a correct email address.")
+ render(conn, :new, error: "This doesn't look like a correct email address.")
{:error, :email_missing} ->
- redirect(conn, to: Routes.login_path(conn, :sent))
+ redirect(conn, to: ~p"/login/sent")
end
end
def sent(conn, _params) do
- render(conn, "sent.html")
+ render(conn, :sent)
end
end
diff --git a/lib/asciinema_web/controllers/login_html.ex b/lib/asciinema_web/controllers/login_html.ex
new file mode 100644
index 000000000..fd58ed2e9
--- /dev/null
+++ b/lib/asciinema_web/controllers/login_html.ex
@@ -0,0 +1,5 @@
+defmodule AsciinemaWeb.LoginHTML do
+ use AsciinemaWeb, :html
+
+ embed_templates "login/*"
+end
diff --git a/lib/asciinema_web/controllers/recording_controller.ex b/lib/asciinema_web/controllers/recording_controller.ex
index 18dcea60c..e10d1605f 100644
--- a/lib/asciinema_web/controllers/recording_controller.ex
+++ b/lib/asciinema_web/controllers/recording_controller.ex
@@ -2,6 +2,7 @@ defmodule AsciinemaWeb.RecordingController do
use AsciinemaWeb, :controller
alias Asciinema.{Recordings, PngGenerator, Accounts}
alias Asciinema.Recordings.Asciicast
+ alias AsciinemaWeb.PlayerOpts
plug :clear_main_class
plug :load_asciicast when action in [:show, :edit, :update, :delete, :iframe]
@@ -12,7 +13,7 @@ defmodule AsciinemaWeb.RecordingController do
category = params[:category]
order = if params["order"] == "popularity", do: :popularity, else: :date
- page = Recordings.paginate_asciicasts(category, order, params["page"], 12)
+ page = Recordings.paginate_asciicasts(category, order, params["page"], 14)
assigns = [
page_title: String.capitalize("#{category} recordings"),
@@ -60,7 +61,7 @@ defmodule AsciinemaWeb.RecordingController do
"show.html",
page_title: AsciinemaWeb.RecordingView.title(asciicast),
asciicast: asciicast,
- playback_options: playback_options(conn.params),
+ player_opts: player_opts(conn.params),
actions: asciicast_actions(asciicast, conn.assigns.current_user),
author_asciicasts: Recordings.other_public_asciicasts(asciicast)
)
@@ -190,7 +191,7 @@ defmodule AsciinemaWeb.RecordingController do
|> put_status(410)
|> render("archived.html")
else
- render(conn, "iframe.html", playback_options: playback_options(params))
+ render(conn, "iframe.html", player_opts: player_opts(params))
end
end
@@ -217,8 +218,8 @@ defmodule AsciinemaWeb.RecordingController do
{:ok, asciicast} ->
public_id = to_string(asciicast.id)
- case {asciicast.private, get_format(conn), id == public_id} do
- {false, "html", false} ->
+ case {asciicast.private, action_name(conn), get_format(conn), id == public_id} do
+ {false, :show, "html", false} ->
conn
|> redirect(to: Routes.recording_path(conn, :show, asciicast))
|> halt()
@@ -274,7 +275,7 @@ defmodule AsciinemaWeb.RecordingController do
defp put_archival_info_flash(conn, asciicast) do
with true <- asciicast.archivable,
- days when not is_nil(days) <- Recordings.gc_days(),
+ days when not is_nil(days) <- Asciinema.recording_gc_days(),
%{} = user <- asciicast.user,
true <- Accounts.temporary_user?(user),
true <- Timex.before?(asciicast.inserted_at, Timex.shift(Timex.now(), days: -days)) do
@@ -289,9 +290,9 @@ defmodule AsciinemaWeb.RecordingController do
end
end
- defp playback_options(params) do
+ defp player_opts(params) do
params
|> Ext.Map.rename(%{"t" => "startAt", "i" => "idleTimeLimit"})
- |> Recordings.PlaybackOpts.parse()
+ |> PlayerOpts.parse(:recording)
end
end
diff --git a/lib/asciinema_web/controllers/session_controller.ex b/lib/asciinema_web/controllers/session_controller.ex
index 221a93a84..5787f132c 100644
--- a/lib/asciinema_web/controllers/session_controller.ex
+++ b/lib/asciinema_web/controllers/session_controller.ex
@@ -1,6 +1,5 @@
defmodule AsciinemaWeb.SessionController do
use AsciinemaWeb, :controller
- alias Asciinema.Accounts
alias AsciinemaWeb.Auth
alias Asciinema.Accounts.User
@@ -18,7 +17,7 @@ defmodule AsciinemaWeb.SessionController do
login_token = get_session(conn, :login_token)
conn = delete_session(conn, :login_token)
- case Accounts.verify_login_token(login_token) do
+ case Asciinema.verify_login_token(login_token) do
{:ok, user} ->
conn
|> Auth.log_in(user)
diff --git a/lib/asciinema_web/controllers/user_controller.ex b/lib/asciinema_web/controllers/user_controller.ex
index 2f08da051..a0fa68a0b 100644
--- a/lib/asciinema_web/controllers/user_controller.ex
+++ b/lib/asciinema_web/controllers/user_controller.ex
@@ -19,10 +19,10 @@ defmodule AsciinemaWeb.UserController do
end
def create(conn, _params) do
- signup_token = get_session(conn, :signup_token)
+ token = get_session(conn, :signup_token)
conn = delete_session(conn, :signup_token)
- case Accounts.verify_signup_token(signup_token) do
+ case Asciinema.create_user_from_signup_token(token) do
{:ok, user} ->
conn
|> Auth.log_in(user)
@@ -67,7 +67,7 @@ defmodule AsciinemaWeb.UserController do
{user.id, filter},
:date,
params["page"],
- 15
+ 14
)
conn
diff --git a/lib/asciinema_web/endpoint.ex b/lib/asciinema_web/endpoint.ex
index 37b0e347b..b8d1d9ad6 100644
--- a/lib/asciinema_web/endpoint.ex
+++ b/lib/asciinema_web/endpoint.ex
@@ -8,12 +8,17 @@ defmodule AsciinemaWeb.Endpoint do
@session_options [
store: :cookie,
key: "_asciinema_key",
- signing_salt: "qJL+3s0T"
+ signing_salt: "qJL+3s0T",
+ same_site: "Lax"
]
- # socket "/live", Phoenix.LiveView.Socket, websocket: [connect_info: [session: @session_options]]
+ socket "/live", Phoenix.LiveView.Socket, websocket: [connect_info: [session: @session_options]]
- # socket "/socket", AsciinemaWeb.UserSocket, websocket: true
+ # compress helps at all?
+ socket "/ws/S/:producer_token", AsciinemaWeb.LiveStreamProducerSocket,
+ websocket: [path: "", compress: true]
+
+ socket "/ws/s/:id", AsciinemaWeb.LiveStreamConsumerSocket, websocket: [path: "", compress: true]
# Serve at "/" the static files from "priv/static" directory.
#
@@ -23,7 +28,7 @@ defmodule AsciinemaWeb.Endpoint do
at: "/",
from: :asciinema,
gzip: true,
- only: ~w(css fonts images js favicon.ico robots.txt)
+ only: AsciinemaWeb.static_paths()
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
@@ -42,11 +47,11 @@ defmodule AsciinemaWeb.Endpoint do
pass: ["*/*"],
json_decoder: Phoenix.json_library()
+ plug RemoteIp
plug Sentry.PlugContext
plug Plug.MethodOverride
plug Plug.Head
plug Plug.Session, @session_options
- plug RemoteIp
plug AsciinemaWeb.PlugAttack
plug AsciinemaWeb.Router
end
diff --git a/lib/asciinema_web/live/live_stream_status_live.ex b/lib/asciinema_web/live/live_stream_status_live.ex
new file mode 100644
index 000000000..71c2f423c
--- /dev/null
+++ b/lib/asciinema_web/live/live_stream_status_live.ex
@@ -0,0 +1,152 @@
+defmodule AsciinemaWeb.LiveStreamStatusLive do
+ alias Asciinema.Streaming
+ alias Asciinema.Streaming.{LiveStreamServer, ViewerTracker}
+ use AsciinemaWeb, :live_view
+
+ @info_timeout 1_000
+ @duration_update_interval 60_000
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+ <%= case {@online, @started_at} do %>
+ <% {true, _} -> %>
+
+ <.live_icon />
+
+ <%= if @duration do %>
+ Streaming for <%= @duration %>
+ <% else %>
+ Stream just started
+ <% end %>
+
+
+
+ <.eye_solid_icon /> <%= @viewer_count %> watching
+
+ <% {false, nil} -> %>
+
+ <.offline_icon /> Stream hasn't started
+
+ <% {false, _} -> %>
+
+ <.offline_icon /> Stream ended
+
+ <% end %>
+
+ """
+ end
+
+ @impl true
+ def mount(_params, %{"stream_id" => stream_id}, socket) do
+ if connected?(socket) do
+ LiveStreamServer.subscribe(stream_id, :status)
+ LiveStreamServer.request_info(stream_id)
+ ViewerTracker.subscribe(stream_id)
+ Process.send_after(self(), :info_timeout, @info_timeout)
+ end
+
+ stream = Streaming.get_live_stream(stream_id)
+
+ socket =
+ socket
+ |> assign(
+ online: stream.online,
+ confirmed: false,
+ started_at: stream.last_started_at,
+ duration: nil,
+ viewer_count: stream.current_viewer_count
+ )
+ |> update_duration()
+
+ {:ok, socket}
+ end
+
+ @impl true
+ def handle_info(:info_timeout, socket) do
+ if socket.assigns.confirmed do
+ {:noreply, socket}
+ else
+ {:noreply, assign(socket, :online, false)}
+ end
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :info, data: {_, _, time}}, socket) do
+ started_at = Timex.shift(Timex.now(), milliseconds: -round(time * 1000.0))
+
+ socket =
+ socket
+ |> assign(online: true, started_at: started_at, confirmed: true)
+ |> update_duration()
+
+ {:noreply, socket}
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :status, data: :online}, socket) do
+ if socket.assigns.online do
+ {:noreply, socket}
+ else
+ socket =
+ socket
+ |> assign(online: true, started_at: Timex.now())
+ |> update_duration()
+
+ {:noreply, socket}
+ end
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :status, data: :offline}, socket) do
+ if socket.assigns.online do
+ {:noreply, assign(socket, online: false)}
+ else
+ {:noreply, socket}
+ end
+ end
+
+ def handle_info(%ViewerTracker.Update{viewer_count: c}, socket) do
+ {:noreply, assign(socket, :viewer_count, c)}
+ end
+
+ def handle_info(:update_duration, socket) do
+ {:noreply, update_duration(socket)}
+ end
+
+ defp update_duration(socket) do
+ socket = assign(socket, :duration, format_duration(socket.assigns.started_at))
+
+ if connected?(socket) do
+ if timer = socket.assigns[:update_timer] do
+ Process.cancel_timer(timer)
+ end
+
+ timer = Process.send_after(self(), :update_duration, @duration_update_interval)
+
+ assign(socket, :update_timer, timer)
+ else
+ socket
+ end
+ end
+
+ defp format_duration(nil), do: nil
+
+ defp format_duration(time) do
+ diff = Timex.diff(Timex.now(), time, :seconds)
+
+ if diff < 60 do
+ nil
+ else
+ diff
+ |> Timex.Duration.from_seconds()
+ |> Timex.format_duration(:humanized)
+ |> String.split(", ")
+ |> then(fn parts ->
+ case length(parts) do
+ l when l in [1, 2] -> Enum.take(parts, 1)
+ _ -> Enum.take(parts, 2)
+ end
+ end)
+ |> Enum.join(", ")
+ end
+ end
+end
diff --git a/lib/asciinema_web/live_stream_consumer_socket.ex b/lib/asciinema_web/live_stream_consumer_socket.ex
new file mode 100644
index 000000000..c83dc2c9e
--- /dev/null
+++ b/lib/asciinema_web/live_stream_consumer_socket.ex
@@ -0,0 +1,168 @@
+defmodule AsciinemaWeb.LiveStreamConsumerSocket do
+ alias Asciinema.Streaming
+ alias Asciinema.Streaming.{LiveStreamServer, ViewerTracker}
+ require Logger
+
+ @behaviour Phoenix.Socket.Transport
+
+ @info_timeout 1_000
+ @ping_interval 15_000
+
+ # Callbacks
+
+ @impl true
+ def child_spec(_opts) do
+ # We won't spawn any process, so let's return a dummy task
+ %{id: __MODULE__, start: {Task, :start_link, [fn -> :ok end]}, restart: :transient}
+ end
+
+ @impl true
+ def connect(state) do
+ id = state.params["id"]
+ Logger.info("consumer/#{id}: connected")
+
+ {:ok, %{stream_id: id}}
+ end
+
+ @impl true
+ def init(state) do
+ state =
+ case Streaming.get_live_stream(state.stream_id) do
+ nil ->
+ Logger.warn("consumer: stream not found for ID #{state.stream_id}")
+ send(self(), :not_found)
+
+ state
+
+ live_stream ->
+ send(self(), :push_alis_header)
+ LiveStreamServer.subscribe(live_stream.id, :stream)
+ LiveStreamServer.subscribe(live_stream.id, :status)
+ LiveStreamServer.request_info(live_stream.id)
+ ViewerTracker.track(live_stream.id)
+ Process.send_after(self(), :info_timeout, @info_timeout)
+ Process.send_after(self(), :ping, @ping_interval)
+
+ %{stream_id: live_stream.id, reset: false}
+ end
+
+ {:ok, state}
+ end
+
+ @impl true
+ def handle_in({_text, _opts}, state) do
+ {:ok, state}
+ end
+
+ @impl true
+ def handle_info(:not_found, state) do
+ {:stop, :not_found, state}
+ end
+
+ def handle_info(:push_alis_header, state) do
+ Logger.debug("consumer/#{state.stream_id}: sending alis header")
+
+ {:push, header_message(), state}
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: e, data: data}, state)
+ when e in [:info, :reset] do
+ {{cols, rows}, _, _} = data
+ Logger.info("consumer/#{state.stream_id}: reset (#{cols}x#{rows})")
+
+ {:push, reset_message(data), %{state | reset: true}}
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :feed, data: data}, %{reset: true} = state) do
+ {:push, feed_message(data), state}
+ end
+
+ def handle_info(%LiveStreamServer.Update{}, %{reset: false} = state) do
+ {:ok, state}
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :status, data: :offline}, state) do
+ {:push, offline_message(), state}
+ end
+
+ def handle_info(%LiveStreamServer.Update{event: :status, data: :online}, state) do
+ {:ok, state}
+ end
+
+ def handle_info(:ping, state) do
+ Process.send_after(self(), :ping, @ping_interval)
+
+ {:push, {:ping, ""}, state}
+ end
+
+ def handle_info(:info_timeout, %{reset: false} = state) do
+ {:push, offline_message(), state}
+ end
+
+ def handle_info(:info_timeout, %{reset: true} = state), do: {:ok, state}
+
+ @impl true
+ def terminate(reason, state) do
+ Logger.info("consumer/#{state.stream_id}: terminating (#{inspect(reason)})")
+ Logger.debug("consumer/#{state.stream_id}: state: #{inspect(state)}")
+ ViewerTracker.untrack(state.stream_id)
+
+ :ok
+ end
+
+ # Private
+
+ @alis_version 1
+ @compression_algo_none 0
+
+ @msg_type_reset 0x01
+ @msg_type_output ?o
+ @msg_type_offline 0x04
+
+ defp header_message do
+ msg = <<
+ "ALiS"::binary,
+ @alis_version::unsigned-8,
+ @compression_algo_none::unsigned-8,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0x00
+ >>
+
+ {:binary, msg}
+ end
+
+ defp reset_message({{cols, rows}, init, time}) do
+ init = init || ""
+ init_len = byte_size(init)
+
+ msg = <<
+ @msg_type_reset,
+ cols::little-16,
+ rows::little-16,
+ time::little-float-32,
+ init_len::little-32,
+ init::binary
+ >>
+
+ {:binary, msg}
+ end
+
+ defp feed_message({time, data}) do
+ data_len = byte_size(data)
+
+ msg = <<
+ @msg_type_output,
+ time::little-float-32,
+ data_len::little-32,
+ data::binary
+ >>
+
+ {:binary, msg}
+ end
+
+ defp offline_message do
+ {:binary, <<@msg_type_offline>>}
+ end
+end
diff --git a/lib/asciinema_web/live_stream_producer_socket.ex b/lib/asciinema_web/live_stream_producer_socket.ex
new file mode 100644
index 000000000..43b94229b
--- /dev/null
+++ b/lib/asciinema_web/live_stream_producer_socket.ex
@@ -0,0 +1,239 @@
+defmodule AsciinemaWeb.LiveStreamProducerSocket do
+ alias Asciinema.Streaming
+ alias Asciinema.Streaming.{LiveStreamServer, LiveStreamSupervisor, Parser}
+ require Logger
+
+ @behaviour Phoenix.Socket.Transport
+
+ @parser_check_timeout 5_000
+ @ping_interval 15_000
+ @heartbeat_interval 15_000
+ @default_bucket_fill_interval 100
+ @default_bucket_fill_amount 10_000
+ @default_bucket_size 60_000_000
+
+ # Callbacks
+
+ @impl true
+ def child_spec(_opts) do
+ # We won't spawn any process, so let's return a dummy task
+ %{id: __MODULE__, start: {Task, :start_link, [fn -> :ok end]}, restart: :transient}
+ end
+
+ @impl true
+ def connect(state) do
+ token = state.params["producer_token"]
+
+ case Streaming.find_live_stream_by_producer_token(token) do
+ nil ->
+ Logger.warn("producer: stream not found for producer token #{token}")
+
+ :error
+
+ live_stream ->
+ state = %{
+ stream_id: live_stream.id,
+ status: :new,
+ parser: nil,
+ bucket: %{
+ size: config(:bucket_size, @default_bucket_size),
+ tokens: config(:bucket_size, @default_bucket_size),
+ fill_interval: config(:bucket_fill_interval, @default_bucket_fill_interval),
+ fill_amount: config(:bucket_fill_amount, @default_bucket_fill_amount)
+ }
+ }
+
+ {:ok, state}
+ end
+ end
+
+ @impl true
+ def init(state) do
+ Logger.info("producer/#{state.stream_id}: connected")
+ Process.send_after(self(), :parser_check, @parser_check_timeout)
+ Process.send_after(self(), :ping, @ping_interval)
+ Process.send_after(self(), :fill_bucket, state.bucket.fill_interval)
+ Process.send_after(self(), :heartbeat, @heartbeat_interval)
+
+ {:ok, state}
+ end
+
+ @impl true
+ def handle_in({"ALiS" <> _, [opcode: :binary]} = message, %{parser: nil} = state) do
+ Logger.info("producer/#{state.stream_id}: activating ALiS parser")
+ handle_in(message, %{state | parser: Parser.get(:alis)})
+ end
+
+ def handle_in({_, [opcode: :binary]} = message, %{parser: nil} = state) do
+ Logger.info("producer/#{state.stream_id}: activating raw text parser")
+ handle_in(message, %{state | parser: Parser.get(:raw)})
+ end
+
+ def handle_in({_, [opcode: :text]} = message, %{parser: nil} = state) do
+ Logger.info("producer/#{state.stream_id}: activating json parser")
+ handle_in(message, %{state | parser: Parser.get(:json)})
+ end
+
+ def handle_in({payload, _} = message, %{parser: parser} = state) do
+ with {:ok, commands, new_parser_state} <- run_parser(parser, message),
+ {:ok, state} <- run_commands(commands, state),
+ {:ok, state} <- drain_bucket(state, byte_size(payload)) do
+ {:ok, put_in(state, [:parser, :state], new_parser_state)}
+ else
+ {:error, :not_a_leader} ->
+ Logger.info("producer/#{state.stream_id}: stream taken over by another producer")
+
+ {:stop, :normal, state}
+
+ {:error, {:invalid_vt_size, {cols, rows}}} ->
+ Logger.info("producer/#{state.stream_id}: invalid vt size: #{cols}x#{rows}")
+
+ {:stop, :normal, state}
+
+ {:error, :bucket_empty} ->
+ Logger.info("producer/#{state.stream_id}: byte budget exceeded")
+
+ # TODO use reason other than :normal to make producer reconnect
+ {:stop, :normal, state}
+
+ {:error, {:parser, reason}} ->
+ Logger.debug("producer/#{state.stream_id}: message: #{inspect(payload)}")
+ Logger.warn("producer/#{state.stream_id}: parser error: #{reason}")
+
+ {:stop, :normal, state}
+ end
+ end
+
+ defp run_parser(%{impl: impl, state: state}, message) do
+ with {:error, reason} <- impl.parse(message, state) do
+ {:error, {:parser, reason}}
+ end
+ end
+
+ defp run_commands(commands, state) do
+ Enum.reduce(commands, {:ok, state}, fn command, prev_result ->
+ with {:ok, state} <- prev_result do
+ run_command(command, state)
+ end
+ end)
+ end
+
+ @max_cols 720
+ @max_rows 200
+
+ defp run_command({:reset, %{size: {cols, rows}, init: init, time: time}}, state)
+ when cols > 0 and rows > 0 and cols <= @max_cols and rows <= @max_rows do
+ Logger.info("producer/#{state.stream_id}: reset (#{cols}x#{rows})")
+
+ state = ensure_server(state)
+
+ with :ok <- LiveStreamServer.reset(state.stream_id, {cols, rows}, init, time) do
+ {:ok, state}
+ end
+ end
+
+ defp run_command({:reset, %{size: {cols, rows}}}, _state) do
+ {:error, {:invalid_vt_size, {cols, rows}}}
+ end
+
+ defp run_command({:feed, {time, data}}, %{status: :online} = state) do
+ with :ok <- LiveStreamServer.feed(state.stream_id, {time, data}) do
+ {:ok, state}
+ end
+ end
+
+ defp run_command({:status, :offline}, %{status: :new} = state) do
+ {:ok, state}
+ end
+
+ defp run_command({:status, :offline}, %{status: :online} = state) do
+ Logger.info("producer/#{state.stream_id}: stream went offline, stopping server")
+ LiveStreamServer.stop(state.stream_id)
+
+ {:ok, %{state | status: :offline}}
+ end
+
+ defp ensure_server(%{status: :online} = state), do: state
+
+ defp ensure_server(state) do
+ Logger.info("producer/#{state.stream_id}: stream went online, starting server")
+ {:ok, _pid} = LiveStreamSupervisor.ensure_child(state.stream_id)
+ :ok = LiveStreamServer.lead(state.stream_id)
+ Process.send_after(self(), :heartbeat, @heartbeat_interval)
+
+ %{state | status: :online}
+ end
+
+ @impl true
+ def handle_info(:ping, state) do
+ Process.send_after(self(), :ping, @ping_interval)
+
+ {:push, {:ping, ""}, state}
+ end
+
+ def handle_info(:heartbeat, state) do
+ Process.send_after(self(), :heartbeat, @heartbeat_interval)
+
+ send_heartbeat(state)
+ end
+
+ def handle_info(:parser_check, %{parser: nil} = state) do
+ Logger.info("producer/#{state.stream_id}: initial message timeout")
+
+ {:stop, :parser_timeout, state}
+ end
+
+ def handle_info(:parser_check, state), do: {:ok, state}
+
+ def handle_info(:fill_bucket, %{bucket: bucket} = state) do
+ tokens = min(bucket.size, bucket.tokens + bucket.fill_amount)
+
+ if tokens > bucket.tokens && tokens < bucket.size do
+ Logger.debug("producer/#{state.stream_id}: fill to #{tokens}")
+ end
+
+ Process.send_after(self(), :fill_bucket, bucket.fill_interval)
+
+ {:ok, put_in(state, [:bucket, :tokens], tokens)}
+ end
+
+ defp send_heartbeat(%{status: :online} = state) do
+ case LiveStreamServer.heartbeat(state.stream_id) do
+ :ok ->
+ {:ok, state}
+
+ {:error, :not_a_leader} ->
+ Logger.info("producer/#{state.stream_id}: stream taken over by another producer")
+
+ {:stop, :normal, state}
+ end
+ end
+
+ defp send_heartbeat(state), do: {:ok, state}
+
+ @impl true
+ def terminate(reason, state) do
+ Logger.info("producer/#{state.stream_id}: terminating (#{inspect(reason)})")
+ Logger.debug("producer/#{state.stream_id}: state: #{inspect(state)}")
+
+ if reason == :remote do
+ LiveStreamServer.stop(state.stream_id)
+ end
+
+ :ok
+ end
+
+ defp drain_bucket(state, drain_amount) do
+ tokens = state.bucket.tokens - drain_amount
+
+ if tokens < 0 do
+ {:error, :bucket_empty}
+ else
+ {:ok, put_in(state, [:bucket, :tokens], tokens)}
+ end
+ end
+
+ defp config(key, default) do
+ Application.get_env(:asciinema, :"live_stream_producer_#{key}", default)
+ end
+end
diff --git a/lib/asciinema/recordings/playback_opts.ex b/lib/asciinema_web/player_opts.ex
similarity index 89%
rename from lib/asciinema/recordings/playback_opts.ex
rename to lib/asciinema_web/player_opts.ex
index ca27bed65..6498603bc 100644
--- a/lib/asciinema/recordings/playback_opts.ex
+++ b/lib/asciinema_web/player_opts.ex
@@ -1,4 +1,4 @@
-defmodule Asciinema.Recordings.PlaybackOpts do
+defmodule AsciinemaWeb.PlayerOpts do
use Ecto.Schema
import Ecto.Changeset
@@ -70,10 +70,18 @@ defmodule Asciinema.Recordings.PlaybackOpts do
field :theme, :string
end
- def parse(attrs) do
+ def parse(attrs, :recording) do
+ parse(attrs, __MODULE__.__schema__(:fields))
+ end
+
+ def parse(attrs, :live_stream) do
+ parse(attrs, [:autoplay, :cols, :poster, :rows, :theme])
+ end
+
+ def parse(attrs, fields) when is_list(fields) do
changeset =
%__MODULE__{}
- |> cast(attrs, __MODULE__.__schema__(:fields))
+ |> cast(attrs, fields)
|> validate_number(:speed, greater_than: 0.0)
|> validate_number(:startAt, greater_than: 0)
|> validate_number(:idleTimeLimit, greater_than_or_equal_to: 0.5)
diff --git a/lib/asciinema_web/router.ex b/lib/asciinema_web/router.ex
index f0fa0fa64..fcf2b93f9 100644
--- a/lib/asciinema_web/router.ex
+++ b/lib/asciinema_web/router.ex
@@ -67,6 +67,8 @@ defmodule AsciinemaWeb.Router do
get "/a/:id/iframe", RecordingController, :iframe
get "/a/:id/example", RecordingController, :example
+ resources "/s", LiveStreamController, only: [:show, :edit, :update]
+
get "/docs", DocController, :index
get "/docs/:topic", DocController, :show
@@ -93,7 +95,7 @@ defmodule AsciinemaWeb.Router do
end
scope "/dev" do
- if Mix.env() == :dev do
+ if Application.compile_env(:asciinema, :dev_routes) do
forward "/mailbox", Bamboo.SentEmailViewerPlug
end
end
diff --git a/lib/asciinema_web/templates/doc/embedding.html.md b/lib/asciinema_web/templates/doc/embedding.html.md
index a8172ce45..aea9e2bf4 100644
--- a/lib/asciinema_web/templates/doc/embedding.html.md
+++ b/lib/asciinema_web/templates/doc/embedding.html.md
@@ -148,10 +148,11 @@ to a theme set by the asciicast author (or to "asciinema" if not set by the
author). The available themes are:
* asciinema
-* tango
+* monokai
+* nord
* solarized-dark
* solarized-light
-* monokai
+* tango
### **cols**
diff --git a/lib/asciinema_web/templates/doc/installation.html.md b/lib/asciinema_web/templates/doc/installation.html.md
index ffc3a3444..795f7f35c 100644
--- a/lib/asciinema_web/templates/doc/installation.html.md
+++ b/lib/asciinema_web/templates/doc/installation.html.md
@@ -7,7 +7,7 @@ There are several ways to get asciinema recorder:
- [Installing on macOS](#installing-on-macos)
- [Installing on FreeBSD](#installing-on-freebsd)
- [Installing on OpenBSD](#installing-on-openbsd)
-- [Running in Docker container](#running-in-docker-container)
+- [Running in a container](#running-in-a-container)
- [Running from source](#running-from-source)
If you use other operating system and you can build a native package for it then
@@ -96,30 +96,54 @@ For Fedora >= 22:
pkg_add asciinema
-## Running in Docker container
-{: #running-in-docker-container}
+## Running in a container
+{: #running-in-a-container}
-asciinema Docker image is based on Ubuntu 16.04 and has the latest version of
+asciinema Docker image is based on [Ubuntu
+22.04](https://releases.ubuntu.com/22.04/) and has the latest version of
asciinema recorder pre-installed.
- docker pull asciinema/asciinema
+```sh
+docker pull ghcr.io/asciinema/asciinema
+```
When running it don't forget to allocate a pseudo-TTY (`-t`), keep STDIN open
(`-i`) and mount config directory volume (`-v`):
- docker run --rm -ti -v "$HOME/.config/asciinema":/root/.config/asciinema asciinema/asciinema
+```sh
+docker run --rm -it -v "${HOME}/.config/asciinema:/root/.config/asciinema" ghcr.io/asciinema/asciinema rec
+```
-Default command run in a container is `asciinema rec`.
+Container's entrypoint is set to `/usr/local/bin/asciinema` so you can run the
+container with any arguments you would normally pass to `asciinema` binary (see
+Usage section for commands and options).
There's not much software installed in this image though. In most cases you may
want to install extra programs before recording. One option is to derive new
image from this one (start your custom Dockerfile with `FROM
-asciinema/asciinema`). Another option is to start the container with `/bin/bash`
-as the command, install extra packages and manually start `asciinema rec`:
-
- docker run --rm -ti -v "$HOME/.config/asciinema":/root/.config/asciinema asciinema/asciinema /bin/bash
- root@6689517d99a1:~# apt-get install foobar
- root@6689517d99a1:~# asciinema rec
+ghcr.io/asciinema/asciinema`). Another option is to start the container with
+`/bin/bash` as the entrypoint, install extra packages and manually start
+`asciinema rec`:
+
+```console
+docker run --rm -it -v "${HOME}/.config/asciinema:/root/.config/asciinema" --entrypoint=/bin/bash ghcr.io/asciinema/asciinema rec
+root@6689517d99a1:~# apt-get install foobar
+root@6689517d99a1:~# asciinema rec
+```
+
+It is also possible to run the docker container as a non-root user, which has
+security benefits. You can specify a user and group id at runtime to give the
+application permission similar to the calling user on your host.
+
+```sh
+docker run --rm -it \
+ --env=ASCIINEMA_CONFIG_HOME="/run/user/$(id -u)/.config/asciinema" \
+ --user="$(id -u):$(id -g)" \
+ --volume="${HOME}/.config/asciinema:/run/user/$(id -u)/.config/asciinema:rw" \
+ --volume="${PWD}:/data:rw" \
+ --workdir='/data' \
+ ghcr.io/asciinema/asciinema rec
+```
## Running from source
{: #running-from-source}
diff --git a/lib/asciinema_web/templates/layout/_flash.html.heex b/lib/asciinema_web/templates/layout/_flash.html.heex
index 5785013b9..47ee3effc 100644
--- a/lib/asciinema_web/templates/layout/_flash.html.heex
+++ b/lib/asciinema_web/templates/layout/_flash.html.heex
@@ -1,7 +1,11 @@
-<%= if message = get_flash(@conn, :info) do %>
-
<%= message %>
+<%= if message = Phoenix.Flash.get(@flash, :info) do %>
+
+
<%= message %>
+
<% end %>
-<%= if message = get_flash(@conn, :error) do %>
-
<%= message %>
+<%= if message = Phoenix.Flash.get(@flash, :error) do %>
+
+
<%= message %>
+
<% end %>
diff --git a/lib/asciinema_web/templates/layout/_header.html.heex b/lib/asciinema_web/templates/layout/_header.html.heex
index 9dee42c02..958c2998a 100644
--- a/lib/asciinema_web/templates/layout/_header.html.heex
+++ b/lib/asciinema_web/templates/layout/_header.html.heex
@@ -2,49 +2,61 @@