ruby_native 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d5f9a36897b60216aa1be47dff449c2df67714bb2e5126a328c338880c08ca
-  data.tar.gz: f34ad47417b280405eeaed9ece9a76fca2d3205968040d5064513fa04ec801ea
+  metadata.gz: 48ed2ba9df701df93f8e2f323e2de1a7fd3eecb5bb110be14ca31f2e411e9c36
+  data.tar.gz: 79506084ad07267d3536c30ff281a65bd7c0c20a8851a20556b5a5ba49d165aa
 SHA512:
-  metadata.gz: ce0bbd95aef443ed74c8b7990d988ff8afe2d78b8bf02b3284f7bc0ad7989629b1f31cc1f1ae5750efcbf7c6f4c8afe67aa8249694682b0760f0486406e7b12f
-  data.tar.gz: 5430d11acfdf0e8ff79b7b4e3f72af61dea68a881650bea745058335fa891349c30b64662650578c689d4cc15c43ff6b3b77de2ccf4ff83df724705ae745f16c
+  metadata.gz: 1953585bc5fc67ad9d2d86de072497695239ec5873d58a7cb8dfa8191b1abfd94173ace3036a7b6442ef04b213f28be7f76ca1ebc6a2c7adf5edd8587cb406e7
+  data.tar.gz: d7cd25a3cc33a9ce35a815f2b9d5a627b8e479d2ebaa6d25ab9ea23b5ebeb759b4e679e412ca347721c9c86a9c78a25848c065fe38a2619f171c509bec83466b

data/lib/ruby_native/cli/preview.rb

@@ -1,15 +1,16 @@
 require "open3"
+require "net/http"
+require "uri"
+require "resolv"
 
 module RubyNative
   class CLI
     class Preview
       TUNNEL_URL_PATTERN = %r{https://[a-z0-9-]+\.trycloudflare\.com}
-
-      BLACK_BG = "\033[40m"
-      WHITE_BG = "\033[107m"
-      BLACK_FG = "\033[30m"
-      WHITE_FG = "\033[97m"
-      RESET = "\033[0m"
+      CONFIG_PATH = "/native/config.json"
+      TUNNEL_READY_TIMEOUT = 60
+      TUNNEL_POLL_INTERVAL = 1
+      PUBLIC_NAMESERVERS = ["1.1.1.1", "8.8.8.8"].freeze
 
       def initialize(argv)
         @port = parse_port(argv)
@@ -17,11 +18,87 @@ module RubyNative
 
       def run
         check_cloudflared!
+        check_local_server!
         start_tunnel
       end
 
       private
 
+      def check_local_server!
+        uri = URI("http://localhost:#{@port}#{CONFIG_PATH}")
+        response = fetch_config_response(uri)
+
+        return if response.is_a?(Net::HTTPSuccess)
+
+        puts "Rails server is running on port #{@port}, but #{CONFIG_PATH} returned #{response.code}."
+        puts ""
+        puts "Make sure the ruby_native gem is installed and mounted:"
+        puts "  https://rubynative.com/docs/install"
+        exit 1
+      rescue Errno::ECONNREFUSED
+        puts "Nothing is running on port #{@port}."
+        puts ""
+        puts "Start your Rails server in another terminal:"
+        puts "  bin/rails server -p #{@port}"
+        exit 1
+      rescue => e
+        puts "Could not reach http://localhost:#{@port}#{CONFIG_PATH}: #{e.message}"
+        exit 1
+      end
+
+      def fetch_config_response(uri, ip: nil)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.ipaddr = ip if ip
+        http.use_ssl = (uri.scheme == "https")
+        http.open_timeout = 2
+        http.read_timeout = 5
+        http.start { http.get(uri.request_uri) }
+      end
+
+      def wait_for_tunnel(url)
+        uri = URI("#{url}#{CONFIG_PATH}")
+        deadline = monotonic_now + TUNNEL_READY_TIMEOUT
+        ip = nil
+
+        print "Waiting for tunnel..."
+        loop do
+          begin
+            ip ||= resolve_via_public_dns(uri.host)
+            response = fetch_config_response(uri, ip: ip)
+            if response.is_a?(Net::HTTPSuccess)
+              puts " ready."
+              return
+            end
+          rescue Resolv::ResolvError, Resolv::ResolvTimeout, StandardError
+            # Keep polling.
+          end
+
+          if monotonic_now >= deadline
+            puts ""
+            puts "Tunnel did not respond within #{TUNNEL_READY_TIMEOUT}s at #{url}."
+            puts "Showing the URL anyway. It may take a few more seconds before scanning works."
+            return
+          end
+
+          print "."
+          sleep TUNNEL_POLL_INTERVAL
+        end
+      end
+
+      def resolve_via_public_dns(host)
+        resolver = Resolv::DNS.new(nameserver: PUBLIC_NAMESERVERS)
+        resolver.timeouts = [2, 4]
+        addresses = resolver.getaddresses(host)
+        raise Resolv::ResolvError, "no A/AAAA record for #{host}" if addresses.empty?
+        addresses.first.to_s
+      ensure
+        resolver&.close
+      end
+
+      def monotonic_now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
       def parse_port(argv)
         index = argv.index("--port")
         if index
@@ -61,6 +138,7 @@ module RubyNative
         stdout_err.each_line do |line|
           if line =~ TUNNEL_URL_PATTERN
             tunnel_url = line[TUNNEL_URL_PATTERN]
+            wait_for_tunnel(tunnel_url)
             display_qr(tunnel_url)
           end
         end
@@ -73,39 +151,26 @@ module RubyNative
       def display_qr(url)
         require "rqrcode"
 
-        qr = RQRCode::QRCode.new(url)
+        qr = RQRCode::QRCode.new(url, level: :l)
         modules = qr.modules
+        size = modules.length
+        quiet_h = 4
+        quiet_v = 2
 
-        puts "\n\n"
+        dark = "██"
+        light = "  "
 
-        # Use Unicode half-block characters to render two QR rows per
-        # terminal row, cutting the height in half for square proportions.
-        quiet = 1
-        size = modules.length
-        total = size + quiet * 2
-
-        lines = []
-
-        (0...total).step(2) do |r|
-          line = ""
-          total.times do |c|
-            top = pixel_dark?(modules, r, c, quiet, size)
-            bottom = pixel_dark?(modules, r + 1, c, quiet, size)
-
-            if top && bottom
-              line << "#{BLACK_BG} #{RESET}"
-            elsif top
-              line << "#{BLACK_BG}#{WHITE_FG}\u2584#{RESET}"
-            elsif bottom
-              line << "#{WHITE_BG}#{BLACK_FG}\u2584#{RESET}"
-            else
-              line << "#{WHITE_BG} #{RESET}"
-            end
+        puts ""
+        (0...(size + quiet_v * 2)).each do |r|
+          line = +""
+          (0...(size + quiet_h * 2)).each do |c|
+            mr = r - quiet_v
+            mc = c - quiet_h
+            inside = mr >= 0 && mr < size && mc >= 0 && mc < size
+            line << (inside && modules[mr][mc] ? dark : light)
           end
-          lines << line
+          puts line
         end
-
-        puts lines.join("\n")
         puts ""
         puts url
         puts ""
@@ -128,12 +193,6 @@ module RubyNative
       rescue Errno::ESRCH, Errno::ECHILD
         # Process already exited.
       end
-
-      def pixel_dark?(modules, row, col, quiet, size)
-        r = row - quiet
-        c = col - quiet
-        r >= 0 && r < size && c >= 0 && c < size && modules[r][c]
-      end
     end
   end
 end

data/lib/ruby_native/tunnel_cookie_middleware.rb

@@ -36,10 +36,8 @@ module RubyNative
     def strip_cookie_domain!(headers)
       raw = headers["set-cookie"]
       cookies = raw.is_a?(Array) ? raw : raw.split("\n")
-
-      headers["set-cookie"] = cookies.map { |cookie|
-        cookie.gsub(/;\s*domain=[^;]*/i, "")
-      }.join("\n")
+      stripped = cookies.map { |cookie| cookie.gsub(/;\s*domain=[^;]*/i, "") }
+      headers["set-cookie"] = (stripped.length == 1) ? stripped.first : stripped
     end
   end
 end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Joe Masilotti