fly.io-rails 0.1.13-x86_64-darwin → 0.1.14-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcfaec6d850537e8996be5433afdb03535220ac28e220476eda290f007db8869
-  data.tar.gz: 425394a56bef440ee2203c68eb23b45fee353448184bbd8007d4037b145ab316
+  metadata.gz: e9f2574745e0ea8f2edbac0856d08111f2bcd5832883ef5bedb8cfc0fafcfcb1
+  data.tar.gz: 41071616ae60e7e10973ff8eb4ca80dc8c959783160da33259cfc1c14055fd7f
 SHA512:
-  metadata.gz: 509ca70e091879017f22dba9b8df8aeaabee3c8f4303c16bfa671e61da82db6b8631eaa311247d0e22cfb692b67b412d192707d6cba4e97a810ae296c051e272
-  data.tar.gz: f3018185e5949ff74abb8969fc1866a2f81a1b042e1ffc79c0490c1d114cdc98e777f4002f5f64fbc0630216c70e190a166a18f9f5a011e258dede717866668b
+  metadata.gz: ccfe3797a1be8049d57c606a0d0b4274c08143fc5b68af6e188797df83f5b8fd9f565b032b0ad36dbbfe8247e9f59e811a732fcf633195d3f693199d83ce662b
+  data.tar.gz: a923ba90ff095ab64dd0500452aebfad5c1c902f7ba064c2c2085fb51e5c880f8e009c3d6ab40680d3edd187c8f0cd7c741ee7634bf976c27ff3cf59726f5d83

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

@@ -26,6 +26,7 @@ module Fly
       regions = options[:region]&.flatten || []
       @avahi = options[:avahi]
       @litefs = options[:litefs]
+      @nats = options[:nats]
       @nomad = options[:nomad]
       @passenger = options[:passenger]
       @serverless = options[:serverless]
@@ -36,6 +37,7 @@ module Fly
       @node = File.exist? 'node_modules'
       @yarn = File.exist? 'yarn.lock'
       @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
+      @yarn_version = @yarn ? `yarn --version`.chomp : 'latest'
       @org = Fly::Machines.org
 
       @set_stage = @nomad ? 'set' : 'set --stage'
@@ -402,15 +404,23 @@ module Fly
       # start app
       machines = {}
       say_status :fly, "start #{app}"
-      if not toml['processes']
+      if not toml['processes'] or toml['processes'].empty?
         start = Fly::Machines.create_and_start_machine(app, config: config)
         machines['app'] = start[:id] 
       else
         config[:env] ||= {}
+        config[:env]['NATS_SERVER'] = 'localhost'
         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] 
+
+          config.delete :mounts
+          config.delete :services
+
+          if config[:env]['NATS_SERVER'] = 'localhost'
+            config[:env]['NATS_SERVER'] = start[:private_ip] 
+          end
         end
       end
 

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/lib/generators/fly/app_generator.rb

@@ -12,6 +12,7 @@ class AppGenerator < Rails::Generators::Base
   class_option :anycable, type: :boolean, default: false
   class_option :avahi, type: :boolean, default: false
   class_option :litefs, type: :boolean, default: false
+  class_option :nats, 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

@@ -25,6 +25,7 @@ LABEL fly_launch_runtime="rails"
 
 <% if @node -%>
 ARG NODE_VERSION=<%= @node_version %>
+ARG YARN_VERSION=<%= @yarn_version %>
 <% end -%>
 ARG BUNDLER_VERSION=<%= @bundler_version %>
 
@@ -50,7 +51,7 @@ RUN mkdir -p tmp/pids
 RUN curl https://get.volta.sh | bash
 ENV VOLTA_HOME /root/.volta
 ENV PATH $VOLTA_HOME/bin:/usr/local/bin:$PATH
-RUN volta install node@${NODE_VERSION} yarn
+RUN volta install node@${NODE_VERSION} yarn@${YARN_VERSION}
 
 <% end -%>
 #######################################################################
@@ -139,10 +140,11 @@ RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl &&
   @deploy_packages << 'libsqlite3-0' if @sqlite3
   @deploy_packages << 'default-mysql-client' if @mysql
   @deploy_packages << 'imagemagick' if @rmagick
-  @deploy_packages << 'nodejs' if not @node and @boostrap
+  @deploy_packages << 'nodejs' if not @node and @bootstrap
   @deploy_packages << 'fuse' if @litefs
   @deploy_packages << 'ruby-foreman' if @procs.length > 1
   @deploy_packages << 'redis-server' if @redis == :internal
+  @deploy_packages << 'gettext-base' if @nats
   @deploy_packages += %w(avahi-daemon avahi-utils libnss-mdns) if @avahi
 -%>
 ARG DEPLOY_PACKAGES=<%= @deploy_packages.join(' ').inspect %>
@@ -187,6 +189,14 @@ ADD config/litefs.yml /etc/litefs.yml
 
 # Create mount point
 RUN mkdir /data
+
+<% end -%>
+<% if @nats -%>
+# install nats
+RUN mkdir /etc/nats
+COPY --from=nats:latest /nats-server /usr/local/bin/nats-server
+COPY --from=nats:latest /nats-server.conf /etc/nats/nats-server.conf
+
 <% end -%>
 #######################################################################
 <% if @avahi -%>
@@ -197,7 +207,9 @@ RUN sed -i 's/mdns4_minimal/mdns_minimal/' /etc/nsswitch.conf
 <% if @passenger -%>
 
 # configure nginx/passenger
+<% unless @avahi or @nats -%>
 COPY config/nginx.conf /etc/nginx/sites-available/rails.conf
+<% end -%>
 RUN rm /etc/nginx/sites-enabled/default && \
     ln -s /etc/nginx/sites-available/rails.conf /etc/nginx/sites-enabled/ && \
     sed -i 's/user .*;/user root;/' /etc/nginx/nginx.conf && \

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

@@ -18,10 +18,16 @@ namespace :fly do
   <%- end -%>
 
 <% end -%>
-<% if @avahi -%>
+<% if @avahi or @nats -%>
   task :env do
 <% if @redis -%>
-    ENV['REDIS_URL'] = "redis://#{ENV['FLY_REGION']}-redis.local:6379/1"
+    if ENV['NATS_SERVER']
+      redis_host = "#{ENV['FLY_REGION']}-redis.local"
+    else
+      redis_host = 'localhost'
+    end
+
+    ENV['REDIS_URL'] = "redis://#{redis_host}:6379/1"
 <% end -%>
 <% if @anycable -%>
     ENV['ANYCABLE_GO_RPC_HOST'] = "#{ENV['FLY_REGION']}-anycable-rpc.local:50051"
@@ -46,13 +52,18 @@ namespace :fly do
     end
   end %>
   <%- if @procs.length > 1 -%>
-    formation = args[:formation] || <%= @procs.keys.map {|key| "#{key}=1"}.join(';').inspect %>
-    formation.gsub! ';', ','
+    <%- if @passenger and (@avahi or @nats) -%>
+    sh 'envsubst < config/nginx.conf > /etc/nginx/sites-available/rails.conf'
+    <%- end -%>
+    formation = args[:formation].gsub!(';', ',')
     <%- if @avahi -%>
     Rake::Task['fly:avahi_publish'].invoke(formation)
     <%- end -%>
+    <%- if @nats -%>
+    Rake::Task['fly:nats_publish'].invoke(formation) if ENV['NATS_SERVER']
+    <%- end -%>
     Bundler.with_original_env do
-      <%- if @avahi -%>
+      <%- if @avahi or @nats -%>
       Rake::Task['fly:env'].invoke
       <%- end -%>
       sh "foreman start --procfile=Procfile.fly --formation=#{formation}"

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

@@ -1,7 +1,7 @@
 app = "<%= @app %>"
 kill_signal = "SIGINT"
 kill_timeout = 5
-<% unless @avahi -%>
+<% unless @avahi or @nats -%>
 processes = []
 <% end -%>
 
@@ -25,10 +25,10 @@ processes = []
 <% else -%>
   DATABASE_URL = "sqlite3:///mnt/volume/production.sqlite3"
 <% end -%>
-<% if @avahi -%>
+<% if @avahi or @nats -%>
 
 [processes]
-app = "bin/rails fly:server[<%= @procs.keys.map {|key| "#{key}=1"}.join(';') %>]"
+  app = "bin/rails fly:server[<%= @procs.keys.map {|key| "#{key}=1"}.join(';') %>]"
 <% end -%>
 
 [mounts]

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

@@ -21,11 +21,19 @@ server {
 
 <% if @anycable -%>
    location /cable {
+      <%- if @passenger and (@avahi or @nats) -%>
+        proxy_pass http://${FLY_REGION}-anycable-go.local:8082/cable;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $${_0_}http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $${_0_}host;
+      <%- else -%>
         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;
+      <%- end -%>
     }
 
 <% elsif @cable -%>

data/lib/tasks/fly.rake

@@ -2,6 +2,7 @@ require 'fly.io-rails/machines'
 require 'fly.io-rails/hcl'
 require 'fly.io-rails/actions'
 require 'toml'
+require 'json'
 
 namespace :fly do
   desc 'Deploy fly application'
@@ -58,6 +59,72 @@ namespace :fly do
     sh 'dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address'
   end
 
+  desc 'nats based service discovery'
+  task :nats_publish, [:formation] do |task, args|
+    nats_server = ENV['NATS_SERVER']
+
+    # start nats server
+    if nats_server == 'localhost'
+      pid = spawn('nats-server')
+      at_exit { Process.kill 7, pid }
+    else
+      open('/etc/hosts', 'a') do |file|
+        host = "#{ENV['FLY_REGION']}-nats-server.local"
+        file.puts "#{nats_server}\t#{host}"
+        nats_server = host
+      end
+    end
+
+    # determine our local 6pn network address
+    address = IPSocket.getaddress('fly-local-6pn')
+
+    # Determine which applications we need addresses for and
+    # which applications we can provide addresses for.
+    hosts = {}
+    needs = []
+    args[:formation].scan(/([-\w]+)=(\d+)/).each do |name, count|
+      dnsname = "#{ENV['FLY_REGION']}-#{name}.local"
+      needs << dnsname
+      hosts[dnsname] = address unless count.to_i == 0
+    end
+
+    # share and collect hosts
+    require 'nats/client'
+    nats = NATS.connect(nats_server)
+
+    nats.subscribe('query_hosts') do |msg|
+      msg.respond hosts.to_json
+    end
+
+    update_hosts = Proc.new do |msg|
+      addresses = JSON.parse(msg.data)
+
+      open('/etc/hosts', 'r+') do |file|
+        file.flock(File::LOCK_EX)
+        contents = file.read
+
+        addresses.each do |dnsname, address|
+          file.puts "#{address}\t#{dnsname}" unless contents.include? dnsname
+        end
+      end
+
+      needs -= hosts.keys
+    end
+
+    nats.request('query_hosts', &update_hosts)
+    nats.subscribe('advertise_hosts', &update_hosts)
+
+    nats.publish('advertise_hosts', hosts.to_json)
+
+    at_exit { nats.close }
+
+    # wait for dependencies to be available
+    600.times do
+      break if needs.empty?
+      sleep 0.1
+    end
+  end
+
   desc 'Zeroconf/avahi/bonjour discovery'
   task :avahi_publish, [:formation] => :dbus_deamon do |task, args|
     pids = []
@@ -70,6 +137,29 @@ namespace :fly do
       pids << spawn("avahi-publish -a -R #{ENV['FLY_REGION']}-#{name}.local #{ip}")
     end
 
+    require 'resolv'
+    100.times do
+      begin
+        map = {}
+        args[:formation].scan(/([-\w]+)=(\d+)/).each do |name, count|
+          dnsname = "#{ENV['FLY_REGION']}-#{name}.local"
+          resolve = `avahi-resolve-host-name #{dnsname}`
+          raise Resolv::ResolvError.new if $?.exitstatus > 0 or resolve.empty?
+          map[dnsname] = resolve.split.last
+        end
+
+        open('/etc/hosts', 'a') do |hosts|
+          map.each do |dnsname, address|
+            hosts.puts "#{address} #{dnsname}"
+          end
+        end
+
+        break
+      rescue Resolv::ResolvError
+        sleep 0.1
+      end
+    end
+
     at_exit do
       pids.each {|pid| Process.kill 7, pid}
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: x86_64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nats-pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: rubys@intertwingly.net
 executables: