enviroblyd 0.4.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8467f960365419e9f02f14d3d3186a511787dff28798fd8883ac328a2443e9c
-  data.tar.gz: 2f39dbca93e49cf69ab2bb9aaed76fe89ed2ebd7867baebba640c8ea665082ae
+  metadata.gz: cf14c9c81dfe5bf5842d0cfca53466605c2c053149096a74c955a506132ae30a
+  data.tar.gz: 45c8f5812463f757a9a56ab906d1a15e61fb3ed5ae6c84fc123b86b12e887f74
 SHA512:
-  metadata.gz: dc3ea42ebc9125f88ec1828b4ebdf9032ba2482d1db359860b9b7c117ae0cb12eb57369531bd760cb54b2563f64c63e3afb89a304a574c23fa19bc7ff4334214
-  data.tar.gz: 3c9baed9045d458595627b186f5be800abe5da2df36beea47e22fd478bc28e25e984814de9731118040b4a65f16fabea10923d06daaa0f419639ace81f0be67f
+  metadata.gz: a2c0a0d8077062a6149ad420e2e1a3769bc5ce16c47815bf65f4b96ab3ef15f5c7e3d1f93c5eb7ba862e822dbbb8cfb39c2c42122a823298e54e9a9c82e314cc
+  data.tar.gz: c82f027d69d99d30a3aa17b51adc6ed26e0474910aa89041747091193ddcd2ec8c2bb548c91574a4bbfd8eeb429b679c7b351f5cfdc5be71ae84e47ade290034

data/bin/enviroblyd

@@ -3,4 +3,12 @@
 
 require "enviroblyd"
 
-Enviroblyd::Daemon.start
+daemon = Enviroblyd::Daemon.new
+
+trap "INT" do
+  puts "Gracefully shutting down..."
+  daemon&.shutdown
+  exit
+end
+
+daemon.listen

data/lib/enviroblyd/command.rb

@@ -2,6 +2,8 @@
 
 require "open3"
 require "json"
+require "zlib"
+require "base64"
 
 class Enviroblyd::Command
   DEFAULT_TIMEOUT_SECONDS = 5 * 60
@@ -10,7 +12,7 @@ class Enviroblyd::Command
   def initialize(message)
     params = parse_message message
     @url = params.fetch "url"
-    @script = params.fetch "script"
+    @script = decode_and_decompress params.fetch("script")
     @runtime = params.fetch "runtime", DEFAULT_RUNTIME
     @timeout = params.fetch "timeout", DEFAULT_TIMEOUT_SECONDS
     @stdout = @stderr = @exit_code = nil
@@ -54,4 +56,8 @@ class Enviroblyd::Command
     rescue
       nil
     end
+
+    def decode_and_decompress(encoded_data)
+      Zlib::Inflate.inflate Base64.decode64(encoded_data)
+    end
 end

data/lib/enviroblyd/daemon.rb

@@ -6,29 +6,25 @@ class Enviroblyd::Daemon
   MAX_MESSAGE_SIZE = 6000 # bytes
   PORT = ENV.fetch("ENVIROBLYD_PORT", 63106).to_i
 
-  def self.start
+  def initialize
     imds = Enviroblyd::IMDS.new
-    host = imds.private_ipv4
-    daemon = new(host)
-    daemon.listen
-  end
-
-  def initialize(host)
-    @host = host
+    @host = imds.private_ipv4
+    @threads = []
+    @shutdown = false
   end
 
   def listen
-    server = TCPServer.new @host, PORT
+    @server = TCPServer.new @host, PORT
     puts "Listening on #{@host}:#{PORT}"
     Enviroblyd::Web.register
 
-    loop do
-      Thread.start(server.accept) do |client|
+    until @shutdown do
+      @threads << Thread.start(@server.accept) do |client|
         message = client.recv(MAX_MESSAGE_SIZE)
         command = Enviroblyd::Command.new message
 
         unless command.valid?
-          $stderr.puts "Invalid message received: #{message}"
+          puts "Invalid message received: #{message}"
           client.puts "Invalid message"
           next
         end
@@ -38,11 +34,23 @@ class Enviroblyd::Daemon
         command.run
       ensure
         client.close
-        command = nil
-        message = nil
-        client = nil
-        GC.start
       end
+
+      delete_dead_threads
+      GC.start
+      GC.compact
     end
   end
+
+  def shutdown
+    @threads.each(&:join)
+  end
+
+  private
+    def delete_dead_threads
+      @threads.each do |thread|
+        next if thread.alive?
+        @threads.delete thread
+      end
+    end
 end

data/lib/enviroblyd/version.rb

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

data/lib/enviroblyd/web.rb

@@ -2,7 +2,6 @@
 
 require "net/http"
 require "uri"
-require "open3"
 require "fileutils"
 require "pathname"
 require "json"
@@ -10,7 +9,6 @@ require "json"
 class Enviroblyd::Web
   USER_AGENT = "enviroblyd #{Enviroblyd::VERSION}"
   CONTENT_TYPE = "application/json"
-  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"
 
@@ -33,8 +31,8 @@ class Enviroblyd::Web
 
     def http(url, type: Net::HTTP::Get, params: nil, headers: {}, retry_interval: 3, retries: 10, backoff: :exponential, tries: 1)
       if retries <= tries
-        $stderr.puts "Retried #{tries} times. Aborting."
-        exit 1
+        puts "Retried #{url} #{tries} times. Aborting."
+        return
       end
 
       uri = URI(url)
@@ -56,7 +54,7 @@ class Enviroblyd::Web
 
       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"
+        puts "Retry #{uri} in #{sleep_time}s"
         sleep sleep_time
         http(url, type:, params:, retry_interval:, retries:, backoff:, tries: (tries + 1))
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enviroblyd
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor