diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index d6a777d40..4868a5295 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,7 @@
<% @page_title = "Home" %>
<% @header_class = "header--events" %>
-<%= render "filters/broadcasts", filter: @filter %>
+<%= render "cards/broadcasts", records: @day_timeline.events %>
<% content_for :header do %>
<%= render "filters/menu" %>
diff --git a/app/views/filters/_broadcasts.html.erb b/app/views/filters/_broadcasts.html.erb
deleted file mode 100644
index a432280e6..000000000
--- a/app/views/filters/_broadcasts.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if filter.collections.any? %>
- <% filter.collections.each do |collection| %>
- <%= turbo_stream_from collection %>
- <% end %>
-<% else %>
- <%= turbo_stream_from :collections %>
-<% end %>
diff --git a/app/views/filters/settings/_manage.html.erb b/app/views/filters/settings/_manage.html.erb
index 4a3e8dc17..8a13490ad 100644
--- a/app/views/filters/settings/_manage.html.erb
+++ b/app/views/filters/settings/_manage.html.erb
@@ -3,7 +3,7 @@
<%= render "filters/filter_toggle", filter: filter %>
- <%= link_to no_filtering_url, class: "btn btn--remove txt-x-small" do %>
+ <%= link_to no_filtering_url, class: "btn btn--remove txt-x-small", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click"} do %>
<%= icon_tag "close" %>
Clear all
<% end %>
diff --git a/app/views/filters/settings/_terms.html.erb b/app/views/filters/settings/_terms.html.erb
index 0d2f48b4e..dbc005b02 100644
--- a/app/views/filters/settings/_terms.html.erb
+++ b/app/views/filters/settings/_terms.html.erb
@@ -1,8 +1,9 @@
-<%= form.search_field "terms[]", placeholder: "Filter these cards…", class: "filter__terms input txt-x-small",
+<%= form.search_field "terms[]", placeholder: "Filter these cards… [F]", class: "filter__terms input txt-x-small",
autofocus: false, autocomplete: :off, autocorrect: "off", data: {
"1p-ignore": "true",
+ controller: "hotkey",
filter_settings_target: "field",
- action: "input->filter-settings#resetIfNoFiltering input->form#debouncedSubmit keydown.enter->form#submitToTopTarget" } %>
+ action: "keydown.f@document->hotkey#focus input->filter-settings#resetIfNoFiltering input->form#debouncedSubmit keydown.enter->form#submitToTopTarget" } %>
<% if filter.terms.present? %>
<% filter.terms.each do |term| %>
diff --git a/app/views/layouts/shared/_head.html.erb b/app/views/layouts/shared/_head.html.erb
index 25b06cae9..4c88b0190 100644
--- a/app/views/layouts/shared/_head.html.erb
+++ b/app/views/layouts/shared/_head.html.erb
@@ -2,7 +2,10 @@
<%= page_title_tag %>
-
+
+ <% unless @disable_view_transition %>
+
+ <% end %>
diff --git a/app/views/public/collections/show/_stream.html.erb b/app/views/public/collections/show/_stream.html.erb
index 1d22d0c7b..346c5c309 100644
--- a/app/views/public/collections/show/_stream.html.erb
+++ b/app/views/public/collections/show/_stream.html.erb
@@ -3,7 +3,7 @@
- The Stream
+ The Stream
<% if page.used? %>
diff --git a/bin/beamer-testbed b/bin/beamer-testbed
new file mode 100755
index 000000000..401f1720d
--- /dev/null
+++ b/bin/beamer-testbed
@@ -0,0 +1,231 @@
+#!/usr/bin/env bash
+
+set -e
+
+COMPOSE_OPTIONS="-f docker-compose.beamer-testbed.yml"
+
+# Show usage
+show_usage() {
+ echo "Usage: $0 {start|stop|logs|console|bash|server|run-migrations} [options]"
+ echo ""
+ echo "Commands:"
+ echo " start Build and start all services"
+ echo " stop Stop all services"
+ echo " logs Show logs (pass -f to follow)"
+ echo " console [node] Open Rails console (default: fizzy-01)"
+ echo " bash [node] Open bash shell (default: fizzy-01)"
+ echo " server Start web server and beamer using foreman"
+ echo " run-migrations Wait for beamer, then run migrations if primary"
+ exit 1
+}
+
+# Get all fizzy-* services from docker compose
+get_fizzy_services() {
+ fizzy_services=$(docker compose $COMPOSE_OPTIONS config --services | grep '^fizzy-' | sort)
+
+ if [ -z "$fizzy_services" ]; then
+ echo "Error: No fizzy-* services found in docker-compose file"
+ exit 1
+ fi
+
+ echo "$fizzy_services"
+}
+
+# Function to wait for a container to be healthy
+wait_for_container() {
+ local container=$1
+ local max_attempts=60
+ local attempt=0
+
+ echo "Waiting for $container to be ready..."
+
+ while [ $attempt -lt $max_attempts ]; do
+ if docker compose $COMPOSE_OPTIONS exec -T "$container" curl -f -s http://localhost:3000/up >/dev/null 2>&1; then
+ echo "$container is ready!"
+ return 0
+ fi
+ attempt=$((attempt + 1))
+ echo "$container isn't yet ready on attempt $attempt/$max_attempts"
+ sleep 2
+ done
+
+ echo "Error: $container failed to become ready after $max_attempts attempts"
+ return 1
+}
+
+# Function to configure kamal-proxy
+# TODO: set up the other containers as read targets
+configure_proxy() {
+ local writer=$1
+ local readers=${@:2}
+
+ echo "Configuring kamal-proxy..."
+
+ local writer_target="$writer:3000"
+ local reader_target=""
+ for reader in $readers; do
+ if [ -n "$reader_target" ]; then
+ reader_target+=","
+ fi
+ reader_target+="$reader:3000"
+ done
+
+ docker compose $COMPOSE_OPTIONS exec -T kamal-proxy \
+ kamal-proxy deploy fizzy \
+ --target $writer_target \
+ --read-target $reader_target \
+ --host fizzy.localhost
+
+ echo "Configured kamal-proxy with target=${writer_target} and read-target=${reader_target}"
+}
+
+# Start command
+cmd_start() {
+ local fizzy_services=$(get_fizzy_services)
+ local first_fizzy=$(echo "$fizzy_services" | head -n 1)
+
+ # Get GitHub token from gh CLI
+ echo "Getting GitHub token from gh CLI..."
+ export GITHUB_TOKEN=$(gh auth token)
+
+ if [ -z "$GITHUB_TOKEN" ]; then
+ echo "Error: Failed to get GitHub token from gh CLI"
+ echo "Make sure you're authenticated with: gh auth login"
+ exit 1
+ fi
+
+ # Create tmp directories with proper permissions
+ echo "Creating temporary directories..."
+ for service in $fizzy_services; do
+ mkdir -p "./tmp/beamer-testbed/$service/storage"
+ mkdir -p "./tmp/beamer-testbed/$service/tmp"
+ done
+
+ echo "Building Docker image for $first_fizzy..."
+ docker compose $COMPOSE_OPTIONS build "$first_fizzy"
+
+ echo "Starting services in detached mode..."
+ docker compose $COMPOSE_OPTIONS down
+ docker compose $COMPOSE_OPTIONS up -d
+
+ # Wait for and register each fizzy container
+ for container in $fizzy_services; do
+ wait_for_container "$container"
+ done
+ configure_proxy $fizzy_services
+
+ echo ""
+ echo "All containers are ready and registered!"
+ echo "You can access the application at: http://fizzy.localhost:3006"
+}
+
+# Stop command
+cmd_stop() {
+ echo "Stopping services..."
+ docker compose $COMPOSE_OPTIONS down
+ echo "Services stopped."
+}
+
+# Logs command
+cmd_logs() {
+ docker compose $COMPOSE_OPTIONS logs "$@"
+}
+
+# Console command
+cmd_console() {
+ local node="${1:-fizzy-01}"
+
+ echo "Opening Rails console in $node..."
+ docker compose $COMPOSE_OPTIONS exec "$node" bin/rails console
+}
+
+# Bash command
+cmd_bash() {
+ local node="${1:-fizzy-01}"
+
+ echo "Opening bash shell in $node..."
+ docker compose $COMPOSE_OPTIONS exec "$node" bash
+}
+
+# Server command (runs inside container)
+cmd_server() {
+ # Check if foreman is installed
+ if ! command -v foreman >/dev/null 2>&1; then
+ echo "Foreman not found, installing..."
+ gem install foreman
+ fi
+
+ # Clean up any stale .beamer.sock files
+ echo "Cleaning up stale socket files..."
+ find . -path '*/.beamer/*/.beamer.sock' -type s -delete 2>/dev/null || true
+
+ mkdir -p ./storage/tenants
+ mkdir -p ./storage/untenanted
+
+ echo "Starting web server and beamer with foreman..."
+ exec foreman start -f Procfile.beamer-testbed
+}
+
+# Run migrations command (runs inside container)
+cmd_run_migrations() {
+ # Store all arguments as BEAMER_OPTIONS
+ BEAMER_OPTIONS="$*"
+
+ echo "Waiting for beamer to be ready..."
+
+ # Wait for beamer status to succeed
+ while ! beamer $BEAMER_OPTIONS status >/dev/null 2>&1; do
+ echo "Beamer not ready yet, waiting..."
+ sleep 1
+ done
+
+ echo "Beamer is ready!"
+ sleep 1
+
+ # Check if this is the primary node
+ if beamer $BEAMER_OPTIONS is-primary; then
+ echo "This is the primary node, running migrations..."
+ ./bin/rails db:prepare
+ echo "Migrations complete!"
+ else
+ echo "This is not the primary node, skipping migrations."
+ fi
+
+ # Wait indefinitely until interrupted
+ echo "Waiting indefinitely (press Ctrl-C to exit)..."
+ while true; do
+ sleep 3600
+ done
+}
+
+# Main command dispatch
+case "${1:-}" in
+start)
+ cmd_start
+ ;;
+stop)
+ cmd_stop
+ ;;
+logs)
+ shift
+ cmd_logs "$@"
+ ;;
+console)
+ shift
+ cmd_console "$@"
+ ;;
+bash)
+ shift
+ cmd_bash "$@"
+ ;;
+server)
+ cmd_server
+ ;;
+run-migrations)
+ shift
+ cmd_run_migrations "$@"
+ ;;
+*)
+ show_usage
+ ;;
+esac
diff --git a/bin/setup b/bin/setup
index 1abc9b0cc..c1466d58c 100755
--- a/bin/setup
+++ b/bin/setup
@@ -21,23 +21,13 @@ if ! command -v gum &> /dev/null; then
fi
step() {
- local no_spin=false
- if [[ "$1" == "--no-spin" ]]; then
- no_spin=true
- shift
- fi
-
local step_name="$1"
shift
gum style --foreground 135 --bold "▸ $step_name"
gum style --foreground 240 "$*"
- if $no_spin; then
- "$@"
- else
- gum spin --spinner dot --title "" --show-output -- "$@"
- fi
+ "$@"
local exit_code=$?
echo
@@ -49,7 +39,7 @@ gum style --foreground 153 " ˚ ∘ ∘ ˚ "
gum style --foreground 111 --bold " ∘˚˳°∘° 𝒻𝒾𝓏𝓏𝓎 °∘°˳˚∘ "
echo
-step --no-spin "Installing Ruby" mise install --yes
+step "Installing Ruby" mise install --yes
eval "$(mise hook-env)"
if which pacman >/dev/null 2>&1; then
diff --git a/config/database.yml b/config/database.yml
index d0b4e53ab..78a8c31fe 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -14,11 +14,15 @@ default: &default
development:
primary:
<<: *default
- database: storage/tenants/<%= Rails.env %>/%{tenant}/db/main.sqlite3
+ <% database_path = "storage/tenants/#{Rails.env}/%{tenant}/db/main.sqlite3" %>
+ <% database_path = "file:#{database_path}?vfs=beamer" if %w[1 true].include?(ENV["BEAMER"]&.downcase) %>
+ database: <%= database_path %>
tenanted: true
untenanted:
<<: *default
- database: storage/untenanted/development.sqlite3
+ <% database_path = "storage/untenanted/development.sqlite3" %>
+ <% database_path = "file:#{database_path}?vfs=beamer" if %w[1 true].include?(ENV["BEAMER"]&.downcase) %>
+ database: <%= database_path %>
migrations_paths: db/untenanted_migrate
cable:
<<: *default
diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml
index 711730945..8dfb783ff 100644
--- a/config/deploy.beta.yml
+++ b/config/deploy.beta.yml
@@ -1,13 +1,13 @@
servers:
web:
hosts:
- - fizzy-beta-app-01
- - fizzy-beta-app-101
+ - fizzy-beta-app-01.sc-chi-int.37signals.com
+ - fizzy-beta-app-101.df-iad-int.37signals.com
labels:
otel_scrape_enabled: true
jobs:
hosts:
- - fizzy-beta-app-01
+ - fizzy-beta-app-01.sc-chi-int.37signals.com
labels:
otel_scrape_enabled: true
@@ -42,12 +42,12 @@ accessories:
- fizzy:/home/beamer
cmd: beamer run --retention=1h --metrics-port=9000
hosts:
- - fizzy-beta-app-01
- - fizzy-beta-app-101
+ - fizzy-beta-app-01.sc-chi-int.37signals.com
+ - fizzy-beta-app-101.df-iad-int.37signals.com
load-balancer:
image: basecamp/kamal-proxy:lb
- host: fizzy-beta-lb-01
+ host: fizzy-beta-lb-01.sc-chi-int.37signals.com
options:
publish:
- 80:80
diff --git a/config/deploy.production.yml b/config/deploy.production.yml
index b21749c26..2699d0e05 100644
--- a/config/deploy.production.yml
+++ b/config/deploy.production.yml
@@ -1,13 +1,17 @@
servers:
web:
hosts:
- - fizzy-app-101
- - fizzy-app-102
+ - fizzy-app-101.df-iad-int.37signals.com
+ - fizzy-app-102.df-iad-int.37signals.com
labels:
otel_scrape_enabled: true
jobs:
hosts:
- - fizzy-app-101
+ - fizzy-app-101.df-iad-int.37signals.com
+ options:
+ # NFS mount for backups
+ # See https://3.basecamp.com/2914079/buckets/37331921/todos/9175385847
+ mount: type=volume,src=backups,dst=/backups,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/fizzy-production-backups,"volume-opt=o=addr=purestorage.sc-chi-int.37signals.com,nfsvers=3,rw,noatime,nconnect=8,soft,timeo=30,retrans=2"
labels:
otel_scrape_enabled: true
@@ -42,12 +46,12 @@ accessories:
- fizzy:/home/beamer
cmd: beamer run --retention=1h --metrics-port=9000
hosts:
- - fizzy-app-101
- - fizzy-app-102
+ - fizzy-app-101.df-iad-int.37signals.com
+ - fizzy-app-102.df-iad-int.37signals.com
load-balancer:
image: basecamp/kamal-proxy:lb
- host: fizzy-lb-101
+ host: fizzy-lb-101.df-iad-int.37signals.com
labels:
otel_role: load-balancer
otel_service: fizzy-load-balancer
diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml
index 7335abd97..c6cf2df65 100644
--- a/config/deploy.staging.yml
+++ b/config/deploy.staging.yml
@@ -1,13 +1,17 @@
servers:
web:
hosts:
- - fizzy-staging-app-01
- - fizzy-staging-app-101
+ - fizzy-staging-app-01.sc-chi-int.37signals.com
+ - fizzy-staging-app-02.sc-chi-int.37signals.com
+ - fizzy-staging-app-101.df-iad-int.37signals.com
+ - fizzy-staging-app-102.df-iad-int.37signals.com
+ - fizzy-staging-app-401.df-ams-int.37signals.com
+ - fizzy-staging-app-402.df-ams-int.37signals.com
labels:
otel_scrape_enabled: true
jobs:
hosts:
- - fizzy-staging-app-01
+ - fizzy-staging-app-01.sc-chi-int.37signals.com
labels:
otel_scrape_enabled: true
@@ -42,12 +46,19 @@ accessories:
- fizzy:/home/beamer
cmd: beamer run --retention=1h --metrics-port=9000
hosts:
- - fizzy-staging-app-01
- - fizzy-staging-app-101
+ - fizzy-staging-app-01.sc-chi-int.37signals.com
+ - fizzy-staging-app-02.sc-chi-int.37signals.com
+ - fizzy-staging-app-101.df-iad-int.37signals.com
+ - fizzy-staging-app-102.df-iad-int.37signals.com
+ - fizzy-staging-app-401.df-ams-int.37signals.com
+ - fizzy-staging-app-402.df-ams-int.37signals.com
load-balancer:
image: basecamp/kamal-proxy:lb
- host: fizzy-staging-lb-01
+ hosts:
+ - fizzy-staging-lb-01.sc-chi-int.37signals.com
+ - fizzy-staging-lb-101.df-iad-int.37signals.com
+ - fizzy-staging-lb-401.df-ams-int.37signals.com
labels:
otel_role: load-balancer
otel_service: fizzy-load-balancer
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3d202d140..4606d6e6d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -76,7 +76,7 @@ Rails.application.configure do
config.action_mailer.raise_delivery_errors = false
end
- config.hosts = %w[ fizzy.localhost localhost 127.0.0.1 ]
+ config.hosts = %w[ fizzy.localhost localhost 127.0.0.1 ] + [ /^fizzy-\d+(:\d+)$/ ]
# Set host to be used by links generated in mailer and notification view templates.
config.action_controller.default_url_options = { host: config.hosts.first, port: 3006 }
diff --git a/config/initializers/beamer.rb b/config/initializers/beamer.rb
index 9bc841182..7b5cc182e 100644
--- a/config/initializers/beamer.rb
+++ b/config/initializers/beamer.rb
@@ -9,11 +9,17 @@
# file will be removed.
Rails.application.config.after_initialize do
- beamer_extension_path = Rails.root.join("bin/lib/beamer.so")
+ paths = [
+ Rails.root.join("bin/lib/beamer.so"),
+ Pathname("/usr/local/lib/beamer/beamer.so")
+ ]
- if beamer_extension_path.exist?
- db = SQLite3::Database.new ":memory:"
- db.enable_load_extension(true)
- db.load_extension(beamer_extension_path)
+ paths.each do |beamer_extension_path|
+ if beamer_extension_path.exist?
+ db = SQLite3::Database.new ":memory:"
+ db.enable_load_extension(true)
+ db.load_extension(beamer_extension_path)
+ break
+ end
end
end
diff --git a/config/initializers/yabeda.rb b/config/initializers/yabeda.rb
index cf1adbd4f..cad88f80a 100644
--- a/config/initializers/yabeda.rb
+++ b/config/initializers/yabeda.rb
@@ -8,3 +8,8 @@ Yabeda::ActiveJob.install!
require "yabeda/solid_queue"
Yabeda::SolidQueue.install!
+
+Yabeda::ActionCable.configure do |config|
+ # Fizzy relies primarily on Turbo::StreamsChannel
+ config.channel_class_name = "ActionCable::Channel::Base"
+end
diff --git a/config/queue.yml b/config/queue.yml
index 8b04d23f8..aaed725e0 100644
--- a/config/queue.yml
+++ b/config/queue.yml
@@ -4,8 +4,8 @@ default: &default
batch_size: 500
workers:
- queues: [ "default", "solid_queue_recurring", "backend", "webhooks" ]
- threads: 3
- processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
+ threads: 1
+ processes: <%= ENV.fetch("JOB_CONCURRENCY", Concurrent.physical_processor_count) %>
polling_interval: 0.1
development: *default
diff --git a/config/recurring.yml b/config/recurring.yml
index 14d058592..dd8b5a1e5 100644
--- a/config/recurring.yml
+++ b/config/recurring.yml
@@ -1,31 +1,41 @@
production: &production
- auto_postpone_all_due:
- class: Card::AutoPostponeAllDueJob
- schedule: every hour
- remove_abandoned_creations:
- class: RemoveAbandonedCreationsJob
- schedule: every hour
- sqlite_backups:
- class: SQLiteBackupsJob
- schedule: every day at 05:00
- delete_unused_tags:
- class: DeleteUnusedTagsJob
- schedule: every day at 04:00
- clear_solid_queue_finished_jobs:
- command: "SolidQueue::Job.clear_finished_in_batches(sleep_between_batches: 0.3)"
- schedule: every hour at minute 12
- clear_solid_queue_recurring_executions:
- command: "SolidQueue::RecurringExecution.clear_in_batches"
- schedule: every hour at minute 52
+ # Application functionality: notifications and highlights
deliver_bundled_notifications:
command: "Notification::Bundle.deliver_all_later"
schedule: every 30 minutes
generate_weekly_highlights:
command: "User.generate_all_weekly_highlights_later"
schedule: every sunday at noon
+
+ # Application cleanup
+ auto_postpone_all_due:
+ class: Card::AutoPostponeAllDueJob
+ schedule: every hour
+ remove_abandoned_creations:
+ class: RemoveAbandonedCreationsJob
+ schedule: every hour
+ delete_unused_tags:
+ class: DeleteUnusedTagsJob
+ schedule: every day at 04:00
+
+ # Operations cleanup and backups
+ clear_solid_queue_finished_jobs:
+ command: "SolidQueue::Job.clear_finished_in_batches(sleep_between_batches: 0.3)"
+ schedule: every hour at minute 12
+ clear_solid_queue_recurring_executions:
+ command: "SolidQueue::RecurringExecution.clear_in_batches"
+ schedule: every hour at minute 52
cleanup_webhook_deliveries:
- command: "Webhook::CleanupDeliveriesJob"
+ class: Webhook::CleanupDeliveriesJob
schedule: every 4 hours
+ sqlite_backups:
+ class: SQLiteBackupsJob
+ schedule: every day at 05:00
+
+ # Metrics
+ yabeda_actioncable:
+ command: "Yabeda::ActionCable.measure"
+ schedule: every 60 seconds
beta: *production
staging: *production
diff --git a/docker-compose.beamer-testbed.yml b/docker-compose.beamer-testbed.yml
new file mode 100644
index 000000000..5b034c64c
--- /dev/null
+++ b/docker-compose.beamer-testbed.yml
@@ -0,0 +1,54 @@
+x-app: &app
+ image: "basecamp/fizzy:dev"
+ build:
+ context: .
+ dockerfile: Dockerfile.dev
+ secrets:
+ - GITHUB_TOKEN
+ volumes:
+ - .:/rails
+ extra_hosts:
+ - queenbee.localhost:host-gateway
+ environment:
+ - RAILS_ENV=development
+ - BINDING=0.0.0.0
+ - BEAMER=true
+ - BEAMER_PRIMARY=fizzy-01
+ - SECRET_KEY_BASE=beamer_testbed_shared_secret_key_base_for_development_only
+ command: [ "./bin/beamer-testbed", "server" ]
+
+services:
+ kamal-proxy:
+ image: basecamp/kamal-proxy:next
+ ports:
+ - 127.0.0.1:3006:80
+ - 127.0.0.1:443:443
+ command: [ "kamal-proxy", "run", "--debug" ]
+
+ fizzy-01:
+ <<: *app
+ hostname: fizzy-01
+ volumes:
+ - .:/rails
+ - ./tmp/beamer-testbed/fizzy-01/storage:/rails/storage
+ - ./tmp/beamer-testbed/fizzy-01/tmp:/rails/tmp
+
+ fizzy-02:
+ <<: *app
+ hostname: fizzy-02
+ volumes:
+ - .:/rails
+ - ./tmp/beamer-testbed/fizzy-02/storage:/rails/storage
+ - ./tmp/beamer-testbed/fizzy-02/tmp:/rails/tmp
+
+ fizzy-03:
+ <<: *app
+ hostname: fizzy-03
+ volumes:
+ - .:/rails
+ - ./tmp/beamer-testbed/fizzy-03/storage:/rails/storage
+ - ./tmp/beamer-testbed/fizzy-03/tmp:/rails/tmp
+
+secrets:
+ GITHUB_TOKEN:
+ environment: GITHUB_TOKEN