enviroblyd 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbb9c1de2225aad7c7211baf934798dd3a059ce4dabe7efeed4d96b1e804410
-  data.tar.gz: c5eb8ba3ed2880049eb6094c30cdfb8a2514f5c22ba770f5a646027f9368ae7f
+  metadata.gz: 05071a7be6ad5145537f06b8466841984969e4c89759ea929ee0f1a28a6457cf
+  data.tar.gz: 79c5c57647395378dddd409ae90075e888e7e1999c997efd1c1e736b6a871fbb
 SHA512:
-  metadata.gz: fbb457cd2d63bd5565c1b9ea0ceb96de79ad4def5e4674d691595cbee5706da25b339d96059f20e0779f77d76368688d16d3fe64c3a56eae5a8ace9d1ef2add0
-  data.tar.gz: 2ed04fd30d0522315c2e56fd0a03010eb801c78bc2c17175ad1bc3b744e743dbe105486a1cc465a4de731a6099ced61bb18ada8696e477542f4aff2f4ed58f07
+  metadata.gz: 54cdd680ffb67c14da0795fee35ef925e44795fc91876917377b8c7be8e6719b4ecb6c8cb826ad3d941d6856680a7aff6700f7a0de284ec0847e026bc60e1acf
+  data.tar.gz: a71d5071c3bb1001f6f35ef5603a617b88aec4d1a54c338945afd1df43e6a764ce441b2324cc3a932f2b97df5ee5947221136ad86694bd7bae78922b10a5bd9c

data/bin/enviroblyctl

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "enviroblyd"
+
+Enviroblyd::Cli::Main.start(ARGV)

data/bin/enviroblyd

@@ -3,4 +3,4 @@
 
 require "enviroblyd"
 
-Enviroblyd::Cli::Main.start(ARGV)
+Enviroblyd::Daemon.start

data/lib/enviroblyd/cli/main.rb

@@ -1,100 +1,8 @@
 # frozen_string_literal: true
-require "net/http"
-require "uri"
-require "open3"
-require "fileutils"
-require "pathname"
 
 class Enviroblyd::Cli::Main < Enviroblyd::Base
   desc "version", "Show version"
   def version
     puts Enviroblyd::VERSION
   end
-
-  TOKEN_TTL_SECONDS = 30
-  IMDS_HOST = ENV.fetch("ENVIROBLYD_IMDS_HOST", "169.254.169.254")
-  API_HOST = ENV.fetch("ENVIROBLYD_API_HOST", "envirobly.com")
-  WORKING_DIR = Pathname.new ENV.fetch("ENVIROBLYD_WORKING_DIR", "/var/envirobly/daemon")
-  INITIALIZED_FILE = WORKING_DIR.join "initialized"
-  desc "boot", "Start the daemon"
-  def boot
-    # @token = http("http://#{IMDS_HOST}/latest/api/token",
-    #   type: Net::HTTP::Put, headers: { "X-aws-ec2-metadata-token-ttl-seconds" => TOKEN_TTL_SECONDS.to_s }).
-    #   body.chomp("")
-    # puts "token: #{@token} ."
-    # instance_id = http("http://#{IMDS_HOST}/latest/meta-data/instance-id",
-    #   headers: { "X-aws-ec2-metadata-token" => @token }).
-    #   body.chomp("")
-    # puts "instance_id: #{instance_id} ."
-    #
-    # response = http("https://#{API_HOST}/api/v1/boots/#{instance_id}", retry_interval: 3, retries: 5, backoff: :exponential)
-    # puts "/api/v1/boots response code: #{response.code}"
-
-    if File.exist?(INITIALIZED_FILE)
-      puts "Skipping initialization because #{INITIALIZED_FILE} exists."
-    else
-      init_url = ENV.fetch "ENVIROBLYD_INIT_URL"
-      puts "Init URL: #{init_url}"
-      response = http(init_url, type: Net::HTTP::Put, retry_interval: 3, retries: 10, backoff: :exponential)
-      puts "Init response code: #{response.code}"
-
-      if response.code.to_i == 200
-        FileUtils.mkdir_p WORKING_DIR
-        File.write INITIALIZED_FILE, init_url
-      end
-    end
-  end
-
-  private
-    def http(url, type: Net::HTTP::Get, headers: {}, retry_interval: 2, retries: 30, backoff: false, tries: 1)
-      if retries <= tries
-        $stderr.puts "Retried #{tries} times. Aborting."
-        exit 1
-      end
-
-      uri = URI(url)
-      http = Net::HTTP.new uri.host, uri.port
-      http.use_ssl = true if uri.scheme == "https"
-      http.open_timeout = 5
-      http.read_timeout = 5
-
-      request = type.new(uri, default_headers.merge(headers))
-      # request.content_type = CONTENT_TYPE
-
-      yield request if block_given?
-
-      response =
-        begin
-          http.request(request)
-        rescue
-          :retry
-        end
-
-      # https://developers.cloudflare.com/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/
-      if response == :retry || (500..599).include?(response.code.to_i)
-        sleep_time = (backoff == :exponential) ? (retry_interval * tries) : retry_interval
-        $stderr.puts "Retry #{uri} in #{sleep_time}s"
-        sleep sleep_time
-        http(url, type:, retry_interval:, retries:, backoff:, tries: (tries + 1))
-      else
-        response
-      end
-    end
-
-    RUN_TIMEOUT = "5m"
-    def run(script)
-      @stdout = @stderr = @exit_code = nil
-      Open3.popen3("timeout #{RUN_TIMEOUT} /bin/bash") do |stdin, stdout, stderr, thread|
-        stdin.puts script
-        stdin.close
-        @stdout = stdout.read
-        @stderr = stderr.read
-        @exit_code = thread.value.exitstatus
-      end
-    end
-
-    USER_AGENT = "enviroblyd #{Enviroblyd::VERSION}"
-    def default_headers
-      { "User-Agent" => USER_AGENT }
-    end
 end

data/lib/enviroblyd/command.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "open3"
+
+class Enviroblyd::Command
+  DEFAULT_TIMEOUT_SECONDS = 5 * 60
+  DEFAULT_RUNTIME = "/bin/bash"
+
+  def initialize(params)
+    @web = Enviroblyd::Web.new
+    @url = params.fetch "url"
+    @script = params.fetch "script"
+    @runtime = params.fetch "runtime", DEFAULT_RUNTIME
+    @timeout = params.fetch "timeout", DEFAULT_TIMEOUT_SECONDS
+    @stdout = @stderr = @exit_code = nil
+  end
+
+  def run
+    puts "Command #{@url} starting"
+
+    Open3.popen3("timeout #{@timeout} #{@runtime}") do |stdin, stdout, stderr, thread|
+      stdin.puts @script
+      stdin.close
+      @stdout = stdout.read
+      @stderr = stderr.read
+      @exit_code = thread.value.exitstatus
+    end
+
+    puts "Command #{@url} exited with #{@exit_code}"
+    $stdout.flush
+
+    @web.http(@url, type: Net::HTTP::Put, params: to_complete_params)
+  end
+
+  private
+    def to_complete_params
+      {
+        command: {
+          stdout: @stdout,
+          stderr: @stderr,
+          exit_code: @exit_code
+        }
+      }
+    end
+end

data/lib/enviroblyd/daemon.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "socket"
+require "json"
+
+class Enviroblyd::Daemon
+  MAX_MESSAGE_SIZE = 6000 # bytes
+  LISTEN_PORT = ENV.fetch("ENVIROBLYD_PORT", 63106).to_i
+
+  def self.start
+    web = Enviroblyd::Web.new
+    web.register
+
+    daemon = new
+    daemon.listen
+  end
+
+  def listen
+    server = TCPServer.new LISTEN_PORT
+    puts "Listening on port #{LISTEN_PORT}"
+
+    loop do
+      Thread.start(server.accept) do |client|
+        message = client.recv(MAX_MESSAGE_SIZE)
+
+        params =
+          begin
+            JSON.parse message
+          rescue
+            nil
+          end
+
+        if params.nil?
+          client.puts "Error parsing JSON"
+        else
+          puts "Received valid JSON:"
+          puts params
+          client.puts "OK"
+        end
+
+        # TODO: Handle Broken pipe (Errno::EPIPE) (client closing connection before we write back)
+        client.close
+
+        Thread.new do
+          Enviroblyd::Command.new(params).run
+        end
+      end
+    end
+  end
+end

data/lib/enviroblyd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enviroblyd
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

data/lib/enviroblyd/web.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+require "open3"
+require "fileutils"
+require "pathname"
+require "json"
+
+class Enviroblyd::Web
+  USER_AGENT = "enviroblyd #{Enviroblyd::VERSION}"
+  CONTENT_TYPE = "application/json"
+  # TOKEN_TTL_SECONDS = 30
+  # IMDS_HOST = ENV.fetch("ENVIROBLYD_IMDS_HOST", "169.254.169.254")
+  API_HOST = ENV.fetch("ENVIROBLYD_API_HOST", "envirobly.com")
+  WORKING_DIR = Pathname.new ENV.fetch("ENVIROBLYD_WORKING_DIR", "/var/envirobly/daemon")
+  INITIALIZED_FILE = WORKING_DIR.join "initialized"
+
+  def register
+    if File.exist?(INITIALIZED_FILE)
+      puts "Skipping initialization because #{INITIALIZED_FILE} exists."
+    else
+      init_url = ENV.fetch "ENVIROBLYD_INIT_URL"
+      puts "Init URL: #{init_url}"
+      response = http(init_url, type: Net::HTTP::Put, retry_interval: 3, retries: 10, backoff: :exponential)
+      puts "Init response code: #{response.code}"
+
+      if response.code.to_i == 200
+        FileUtils.mkdir_p WORKING_DIR
+        File.write INITIALIZED_FILE, init_url
+      end
+    end
+  end
+
+  def http(url, type: Net::HTTP::Get, headers: {}, retry_interval: 2, retries: 30, backoff: false, tries: 1, params: nil)
+    if retries <= tries
+      $stderr.puts "Retried #{tries} times. Aborting."
+      exit 1
+    end
+
+    uri = URI(url)
+    http = Net::HTTP.new uri.host, uri.port
+    http.use_ssl = true if uri.scheme == "https"
+    http.open_timeout = 5
+    http.read_timeout = 5
+
+    request = type.new(uri, default_headers.merge(headers))
+    request.content_type = CONTENT_TYPE
+
+    unless params.nil?
+      request.body = JSON.dump params
+    end
+
+    response =
+      begin
+        http.request(request)
+      rescue
+        :retry
+      end
+
+    # https://developers.cloudflare.com/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/
+    if response == :retry || (500..599).include?(response.code.to_i)
+      sleep_time = (backoff == :exponential) ? (retry_interval * tries) : retry_interval
+      $stderr.puts "Retry #{uri} in #{sleep_time}s"
+      sleep sleep_time
+      http(url, type:, retry_interval:, retries:, backoff:, tries: (tries + 1))
+    else
+      response
+    end
+  end
+
+  private
+    def default_headers
+      { "User-Agent" => USER_AGENT }
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enviroblyd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Robert Starsi
@@ -55,16 +55,21 @@ dependencies:
 description:
 email: klevo@klevo.sk
 executables:
+- enviroblyctl
 - enviroblyd
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- bin/enviroblyctl
 - bin/enviroblyd
 - lib/enviroblyd.rb
 - lib/enviroblyd/base.rb
 - lib/enviroblyd/cli/main.rb
+- lib/enviroblyd/command.rb
+- lib/enviroblyd/daemon.rb
 - lib/enviroblyd/version.rb
+- lib/enviroblyd/web.rb
 homepage: https://github.com/envirobly/enviroblyd
 licenses:
 - MIT