fly.io-rails 0.1.8-x86_64-darwin → 0.1.9-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce440a38fa715c0fc500a9f8ac9a786f9d5af692529f8d0d0871049975a09ae
-  data.tar.gz: 456c18b7093380ac1a156d7b2edf84e78c667d8f13e885c235f1b3d43d62b11e
+  metadata.gz: 5e21d219815cad34716d1d4dc5d9e48eea66c60a68c7bf7f4a3f7865214be5bb
+  data.tar.gz: 1158bbf8df8f47383070cabab7cbd3a6212139a5f52100ec4d9c1695cd097ec9
 SHA512:
-  metadata.gz: 9d346f39c48682dda7081f92af5050f7c6f473122768ef1cd85679975bb96a56a1807f1a8d6e36fe5b8bc79610ca647e425b853728b1496917b9a80c1b1efc65
-  data.tar.gz: ddc5573c5ae99f6d46a963fca3a7b43deaf007d26b576bddc743411a2a2818c8e4e3b32cb8af2437d92bcbf2ee1ce576e39d96eb2cba16fdb24404b6fc140198
+  metadata.gz: 5bc2e74ec196734a511d791c59ddea29c9c4b2121265729f7bfef5a0f5a9e608841137e4ef4510d2f24c74372ff66dada52aad2aecd2d3eed3daf10c2103797a
+  data.tar.gz: 390e7bb1f74ce4cf093182764198f396becff0ed93befab3fbce6ae28fdf0fd92ea0e4c00c0805069609e3704c3f3b6d99af5684c68564f741683cf8954d0090

data/lib/fly.io-rails/actions.rb

@@ -24,6 +24,7 @@ module Fly
       # extract options
       self.app = app
       regions = options[:region]&.flatten || []
+      @avahi = options[:avahi]
       @litefs = options[:litefs]
       @nomad = options[:nomad]
       @passenger = options[:passenger]
@@ -58,11 +59,43 @@ module Fly
 
       # set additional variables based on application source
       scan_rails_app
+      @redis = :internal if options[:redis]
+      if File.exist? 'Procfile.fly'
+        @redis = :internal if IO.read('Procfile.fly') =~ /^redis/
+      end
+
+      if options[:anycable] and not @anycable
+        # read and remove original config
+        original_config = YAML.load_file 'config/cable.yml'
+        File.unlink 'config/cable.yml'
+
+        # add and configure anycable-rails
+        say_status :run, 'bundle add anycable-rails'
+        Bundler.with_original_env do
+          system 'bundle add anycable-rails'
+          system 'bin/rails generate anycable:setup --skip-heroku --skip-procfile-dev --skip-jwt --devenv=skip'
+        end
+
+        # insert action_cable_meta_tag
+        insert_into_file 'app/views/layouts/application.html.erb',
+          "    <%= action_cable_meta_tag %>\n",
+          after: "<%= csp_meta_tag %>\n"
+
+        # copy production environment to original config
+        anycable_config = YAML.load_file 'config/cable.yml'
+        original_config['production'] = anycable_config['production']
+        File.write 'config/cable.yml', YAML.dump(original_config)
+
+        @anycable = true
+      end
 
       # determine processes
       @procs = {web: 'bin/rails server'}
       @procs[:web] = "nginx -g 'daemon off;'" if @passenger
       @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
+      @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis
+      @procs.merge! 'anycable-rpc': 'bundle exec anycable',
+        'anycable-go': '/usr/local/bin/anycable-go --port=8082' if @anycable
     end
 
     def app
@@ -143,7 +176,9 @@ module Fly
     end
 
     def generate_patches
-      if @redis_cable and not File.exist? 'config/initializers/action_cable.rb'
+      if @redis_cable and not @anycable and @redis != :internal and
+        not File.exist? 'config/initializers/action_cable.rb'
+
         app
         template 'patches/action_cable.rb', 'config/initializers/action_cable.rb'
       end
@@ -266,7 +301,7 @@ module Fly
         end
       end
 
-      if @redis and not secrets.include? 'REDIS_URL'
+      if @redis and @redis != :internal and not secrets.include? 'REDIS_URL'
         # Set eviction policy to true if a cache provider, else false.
         eviction = @redis_cache ? '--enable-eviction' : '--disable-eviction'
 
@@ -324,18 +359,20 @@ module Fly
           STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
           exit 1
         end
+      end
 
-        # start proxy, if necessary
-        endpoint = Fly::Machines::fly_api_hostname!
+      # start proxy, if necessary
+      endpoint = Fly::Machines::fly_api_hostname!
 
-        # stop previous instances - list will fail on first run
-        stdout, stderr, status = Open3.capture3('fly machines list --json')
-        unless stdout.empty?
-          JSON.parse(stdout).each do |list|
-            next if list['id'] == machine
-            system "fly machines remove --force #{list['id']}"
-          end
-        end
+      # stop previous instances - list will fail on first run
+      stdout, stderr, status = Open3.capture3('fly machines list --json')
+      unless stdout.empty?
+	JSON.parse(stdout).each do |list|
+	  next if list['id'] == machine or list['state'] == 'destroyed'
+	  cmd = "fly machines remove --force #{list['id']}"
+	  say_status :run, cmd
+	  system cmd
+	end
       end
 
       # configure sqlite3 (can be overridden by fly.toml)
@@ -363,23 +400,38 @@ module Fly
       end
 
       # start app
+      machines = {}
       say_status :fly, "start #{app}"
-      start = Fly::Machines.create_and_start_machine(app, config: config)
-      machine = start[:id]
+      if not toml['processes']
+        start = Fly::Machines.create_and_start_machine(app, config: config)
+        machines['app'] = start[:id] 
+      else
+        config[:env] ||= {}
+        toml['processes'].each do |name, entrypoint|
+          config[:env]['SERVER_COMMAND'] = entrypoint
+          start = Fly::Machines.create_and_start_machine(app, config: config)
+          machines[name] = start[:id] 
+        end
+      end
 
-      if !machine
+      if machines.empty?
         STDERR.puts 'Error starting application'
         PP.pp start, STDERR
         exit 1
       end
 
-      5.times do
-        status = Fly::Machines.wait_for_machine app, machine,
-          timeout: 60, status: 'started'
-        return if status[:ok]
+      timeout = Time.now + 300
+      while Time.now < timeout and not machines.empty?
+        machines.each do |name, machine|
+          status = Fly::Machines.wait_for_machine app, machine,
+           timeout: 10, status: 'started'
+          machines.delete name if status[:ok]
+        end
       end
 
-      STDERR.puts 'Timeout waiting for application to start'
+      unless machines.empty?
+        STDERR.puts 'Timeout waiting for application to start'
+      end
     end
 
     def terraform(app, image) 

data/lib/fly.io-rails/scanner.rb

@@ -12,7 +12,9 @@ module Fly
         @postgresql = true
       end
 
-      @sidekiq = IO.read('Gemfile').include? 'sidekiq' rescue false
+      gemfile = IO.read('Gemfile') rescue ''
+      @sidekiq = gemfile.include? 'sidekiq'
+      @anycable = gemfile.include? 'anycable'
 
       @cable = ! Dir['app/channels/*.rb'].empty?
 

data/lib/fly.io-rails/utils.rb

@@ -29,6 +29,8 @@ module FlyIoRails
     end
 
     def create_app(name: nil, org: 'personal', regions: [], nomad: false, **rest)
+      return if File.exist? 'fly.toml'
+
       cmd = if name
         "flyctl apps create #{name.inspect} --org #{org.inspect} --machines"
       else

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/generators/fly/app_generator.rb

@@ -9,7 +9,10 @@ class AppGenerator < Rails::Generators::Base
   class_option :region, type: :array, repeatable: true, default: []
   class_option :nomad, type: :boolean, default: false
 
+  class_option :anycable, type: :boolean, default: false
+  class_option :avahi, type: :boolean, default: false
   class_option :litefs, type: :boolean, default: false
+  class_option :redis, type: :boolean, default: false
   class_option :passenger, type: :boolean, default: false
   class_option :serverless, type: :boolean, default: false
 

data/lib/generators/templates/Dockerfile.erb

@@ -30,9 +30,12 @@ ARG BUNDLER_VERSION=<%= @bundler_version %>
 
 ARG RAILS_ENV=production
 ENV RAILS_ENV=${RAILS_ENV}
-
-ENV RAILS_SERVE_STATIC_FILES true
+<% if @anycable or not @passenger -%>
 ENV RAILS_LOG_TO_STDOUT true
+<% end -%>
+<% unless @passenger -%>
+ENV RAILS_SERVE_STATIC_FILES true
+<% end -%>
 
 ARG BUNDLE_WITHOUT=development:test
 ARG BUNDLE_PATH=vendor/bundle
@@ -81,9 +84,6 @@ RUN gem update --system --no-document && \
 
 COPY Gemfile* ./
 RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
-<% if @procs.length > 1 -%>
-RUN gem install foreman
-<% end -%>
 
 <% if @node -%>
 #######################################################################
@@ -113,23 +113,27 @@ FROM flyio/litefs:pr-109 AS litefs
 
 FROM base
 
+<% if @passenger -%>
+# add passenger repository
+RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl && \
+  curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | \
+    gpg --dearmor > /etc/apt/trusted.gpg.d/phusion.gpg && \
+  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bullseye main > /etc/apt/sources.list.d/passenger.list'
+
+<% end -%>
 <%
   @deploy_packages = %w(file vim curl gzip)
   @deploy_packages += %w(nginx passenger libnginx-mod-http-passenger) if @passenger
   @deploy_packages << 'postgresql-client' if @postgresql
   @deploy_packages << 'libsqlite3-0' if @sqlite3
   @deploy_packages << 'fuse' if @litefs
+  @deploy_packages << 'ruby-foreman' if @procs.length > 1
+  @deploy_packages << 'redis-server' if @redis == :internal
+  @deploy_packages += %w(avahi-daemon avahi-utils libnss-mdns) if @avahi
 -%>
 ARG DEPLOY_PACKAGES=<%= @deploy_packages.join(' ').inspect %>
 ENV DEPLOY_PACKAGES=${DEPLOY_PACKAGES}
 
-<% if @passenger -%>
-RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl && \
-  curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | \
-    gpg --dearmor > /etc/apt/trusted.gpg.d/phusion.gpg && \
-  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bullseye main > /etc/apt/sources.list.d/passenger.list'
-
-<% end -%>
 RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
     --mount=type=cache,id=prod-apt-lib,sharing=locked,target=/var/lib/apt \
     apt-get update -qq && \
@@ -137,6 +141,17 @@ RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
     ${DEPLOY_PACKAGES} \
     && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
+<% if @anycable -%>
+# install anycable
+RUN curl -L https://github.com/anycable/anycable-go/releases/download/v1.2.1/anycable-go-linux-amd64 -o /usr/local/bin/anycable-go && chmod 755 /usr/local/bin/anycable-go
+
+<% end -%>
+<% if @redis == :internal -%>
+# configure redis
+RUN sed -i 's/^daemonize yes/daemonize no/' /etc/redis/redis.conf &&\
+  sed -i 's/^logfile/# logfile/' /etc/redis/redis.conf 
+
+<% end -%>
 # copy installed gems
 COPY --from=gems /app /app
 COPY --from=gems /usr/lib/fullstaq-ruby/versions /usr/lib/fullstaq-ruby/versions
@@ -158,15 +173,32 @@ ADD config/litefs.yml /etc/litefs.yml
 RUN mkdir /data
 <% end -%>
 #######################################################################
+<% if @avahi -%>
+
+# configure avahi for ipv6
+RUN sed -i 's/mdns4_minimal/mdns_minimal/' /etc/nsswitch.conf
+<% end -%>
 <% if @passenger -%>
 
 # configure nginx/passenger
 COPY config/nginx.conf /etc/nginx/sites-available/rails.conf
 RUN rm /etc/nginx/sites-enabled/default && \
-    ln -s /etc/nginx/sites-available/rails.conf /etc/nginx/sites-enabled/
+    ln -s /etc/nginx/sites-available/rails.conf /etc/nginx/sites-enabled/ && \
+    sed -i 's/user .*;/user root;/' /etc/nginx/nginx.conf && \
+    sed -i '/^include/i include /etc/nginx/main.d/*.conf;' /etc/nginx/nginx.conf && \
+    mkdir /etc/nginx/main.d && \
+    echo 'env RAILS_MASTER_KEY;' >> /etc/nginx/main.d/env.conf &&\
+<% if @redis -%>
+    echo 'env REDIS_URL;' >> /etc/nginx/main.d/env.conf &&\
+<% end -%>
+<% if @anycable -%>
+    echo 'env ANYCABLE_RPC_HOST;' >> /etc/nginx/main.d/env.conf &&\
+    echo 'env CABLE_URL;' >> /etc/nginx/main.d/env.conf &&\
+<% end -%>
+    echo 'env RAILS_LOG_TO_STDOUT;' >> /etc/nginx/main.d/env.conf
 <% if @serverless -%>
 COPY config/hook_detached_process /etc/nginx/
-<% end -%> 
+<% end -%>
 <% end -%>
 
 # Deploy your application

data/lib/generators/templates/fly.rake.erb

@@ -17,20 +17,46 @@ namespace :fly do
   task :release => 'db:migrate'
   <%- end -%>
 
+<% end -%>
+<% if @avahi -%>
+  task :env do
+<% if @redis -%>
+    ENV['REDIS_URL'] = "redis://#{ENV['FLY_REGION']}-redis.local:6379/1"
+<% end -%>
+<% if @anycable -%>
+    ENV['ANYCABLE_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
+    ENV['CABLE_URL'] = "#{ENV['FLY_REGION']}-anycable-go.local"
+<% end -%>
+  end
+
 <% end -%>
   # SERVER step:
   #  - changes to the filesystem made here are deployed
   #  - full access to secrets, databases
   #  - failures here result in VM being stated, shutdown, and rolled back
   #    to last successful deploy (if any).
-  <%- if @sqlite3 -%>
-  task :server => [:swapfile, 'db:migrate'] do
-  <%- else -%>
-  task :server => :swapfile do
-  <%- end -%>
+  <%= begin
+    deps = [:swapfile]
+    deps << 'db:migrate' if @sqlite3
+    deps = deps.first if deps.length == 1
+
+    if @procs.length > 1 ? ':server, [:formation]' : ':server'
+      "task :server, [:formation] => #{deps.inspect} do |task, args|"
+    else
+      "task :server => #{deps.inspect} do"
+    end
+  end %>
   <%- if @procs.length > 1 -%>
+    formation = args[:formation] || <%= @procs.keys.map {|key| "#{key}=1"}.join(';').inspect %>
+    formation.gsub! ';', ','
+    <%- if @avahi -%>
+    Rake::Task['fly:avahi_publish'].invoke(formation)
+    <%- end -%>
     Bundler.with_original_env do
-      sh 'foreman start --procfile=Procfile.fly'
+      <%- if @avahi -%>
+      # Rake::Task['fly:env'].invoke
+      <%- end -%>
+      sh "foreman start --procfile=Procfile.fly --formation=#{formation}"
     end
   <%- else -%>
     sh <%= @procs.values.first.inspect %>
@@ -53,5 +79,8 @@ namespace :fly do
     sh 'mkswap /swapfile'
     sh 'echo 10 > /proc/sys/vm/swappiness'
     sh 'swapon /swapfile'
+<% if @redis == :internal -%>
+    sh 'echo 1 > /proc/sys/vm/overcommit_memory'
+<% end -%>
   end
 end

data/lib/generators/templates/fly.toml.erb

@@ -1,7 +1,9 @@
 app = "<%= @app %>"
 kill_signal = "SIGINT"
 kill_timeout = 5
+<% unless @avahi -%>
 processes = []
+<% end -%>
 
 [build]
   [build.args]
@@ -23,6 +25,11 @@ processes = []
 <% else -%>
   DATABASE_URL = "sqlite3:///mnt/volume/production.sqlite3"
 <% end -%>
+<% if @avahi -%>
+
+[processes]
+app = "bin/rails fly:server[<%= @procs.keys.map {|key| "#{key}=1"}.join(';') %>]"
+<% end -%>
 
 [mounts]
   source = <%= "#{app.gsub('-', '_')}_volume".inspect %>

data/lib/generators/templates/hook_detached_process.erb

@@ -3,9 +3,5 @@
 status = `passenger-status`
 
 processes = status[/^Processes\s*:\s*(\d*)/, 1].to_i
-<% if @cable -%>
-cable = status[/^<%= @app %>-cable.*?\n\n/m]
-processes -= 1 if cable and cable =~ /Sessions:\s*[1-9]/
-<% end -%>
 
-system 'nginx -s stop' if processes == 0
+system 'nginx -s stop' if processes == 0

data/lib/generators/templates/nginx.conf.erb

@@ -4,26 +4,44 @@ passenger_min_instances 0;
 passenger_pool_idle_time 300;
 
 <% end -%>
+passenger_log_file /dev/stdout;
+passenger_default_user root;
+
 server {
-    listen 8080;
+    listen 8080 default_server;
+    listen [::]:8080 default_server;
     server_name <%= @app %>.fly.dev;
     root /app/public;
 
+    access_log /dev/stdout;
+    error_log /dev/stdout info;
+
     passenger_enabled on;
     passenger_ruby /usr/lib/fullstaq-ruby/versions/<%= @ruby_version %>-jemalloc/bin/ruby;
 
-<% if @cable -%>
-location / {
-  passenger_app_group_name <%= @app%>;
-}
+<% if @anycable -%>
+   location /cable {
+        proxy_pass http://localhost:8082/cable;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+    }
 
-location /cable {
-  passenger_app_group_name <%= @app%>-cable;
-  passenger_force_max_concurrent_requests_per_process 0;
-}
+<% elsif @cable -%>
+    location /cable {
+        passenger_app_group_name <%= @app %>-cable;
+        passenger_force_max_concurrent_requests_per_process 0;
+    }
 
 <% end -%>
+    location / {
+        passenger_app_group_name <%= @app %>;
+        passenger_env_var RAILS_SERVE_STATIC_FILES true;
+        passenger_env_var RAILS_LOG_TO_STDOUT true;
+    }
+
     # Nginx has a default limit of 1 MB for request bodies, which also applies
     # to file uploads. The following line enables uploads of up to 50 MB:
     client_max_body_size 50M;
-}
+}

data/lib/tasks/fly.rake

@@ -50,6 +50,30 @@ namespace :fly do
       end
     end
   end
+
+  desc 'dbus daemon - used for IPC'
+  task :dbus_deamon do
+    IO.write '/var/lib/dbus/machine-id', `hostname`
+    mkdir_p '/var/run/dbus'
+    sh 'dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address'
+  end
+
+  desc 'Zeroconf/avahi/bonjour discovery'
+  task :avahi_publish, [:formation] => :dbus_deamon do |task, args|
+    pids = []
+    pids << spawn('avahi-daemon')
+    sleep 0.1
+
+    ip = IPSocket.getaddress(Socket.gethostname)
+    args[:formation].scan(/([-\w]+)=(\d+)/).each do |name, count|
+      next if count.to_i == 0
+      pids << spawn("avahi-publish -a -R #{ENV['FLY_REGION']}-#{name}.local #{ip}")
+    end
+
+    at_exit do
+      pids.each {|pid| Process.kill 7, pid}
+    end
+  end
 end
 
 # Alias, for convenience

data/lib/tasks/mock.rake

@@ -0,0 +1,17 @@
+require 'rack'
+require 'rack/handler/puma'
+
+namespace :mock do
+  desc 'Mock server - useful for debugging startup issues'
+  task :server do
+    handler = Rack::Handler::Puma
+
+    class RackApp
+      def call(env)
+        [200, {"Content-Type" => "text/plain"}, ["Hello from Fly.io"]]
+      end
+    end
+
+    handler.run RackApp.new, Port: ENV['PORT'] || 8080
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: x86_64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -74,6 +74,7 @@ files:
 - lib/generators/templates/nginx.conf.erb
 - lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake
+- lib/tasks/mock.rake
 homepage: https://github.com/rubys/fly.io-rails
 licenses:
 - Apache-2.0