mkit 0.6.2 → 0.7.0

data/lib/mkit/docker_listener.rb

@@ -1,20 +1,38 @@
 require 'pty'
 require 'mkit/status'
+require "mkit/cmd/shell_client"
 
 #
 # https://docs.docker.com/engine/reference/commandline/events
 require 'mkit/app/helpers/docker_helper'
 module MKIt
+class StopThread < RuntimeError; end
+
   class DockerListener
     include MKIt::DockerHelper
 
     def initialize
-      @consumers = []
+      @queue = Queue.new
+      @listener = ShellClient.new(command: "docker events --format '{{json .}}'")
     end
 
-    def register_consumer(consumer:)
+    def enqueue(msg)
+      @queue << msg
     end
 
+    def start
+      @consumer.run if register_consumer
+      register_listener
+    end
+
+    def stop
+      @listener.unregister if @listener
+      @consumer.raise StopThread.new
+      MKItLogger.info("docker listener stopped")
+    end
+
+    private
+
     def parse_message(msg)
       action = msg['Action'].to_sym
       type = msg['Type'].to_sym
@@ -45,15 +63,17 @@ module MKIt
             MKItLogger.debug("	#{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       when :network
         pod_id = msg.Actor.Attributes.container
-        pod = Pod.find_by(pod_id: pod_id)
+        inspect = inspect_instance(pod_id).to_o
+        pod_name = inspect.Name[1..]
+        pod = Pod.find_by(name: pod_name)
         unless pod.nil?
           case action
           when :connect
-            MKItLogger.info("docker network #{action} received: #{msg}")
+            MKItLogger.info("docker network #{action} received: #{msg} for pod #{pod_name}")
             pod.update_ip
             pod.save
           when :disconnect
@@ -62,35 +82,36 @@ module MKIt
             MKItLogger.debug("  #{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       else
         MKItLogger.info("\t#{type} #{action} <<unknown>>")
       end
     end
 
-    def start
-      @thread ||= Thread.new {
-        cmd = "docker events --format '{{json .}}'"
-        begin
-          PTY.spawn( cmd ) do |stdout, stdin, pid|
-            begin
-              stdout.each { |line| parse_message JSON.parse(line).to_o }
-            rescue Errno::EIO
-              MKItLogger.warn("Errno:EIO error, but this probably just means " +
-                "that the process has finished giving output")
-            end
+    def register_consumer
+      return false unless @consumer.nil?
+
+      @consumer = Thread.new do
+        running = true
+        while running
+          begin
+            parse_message(@queue.pop)
+          rescue StopThread
+            running = false
+            MKItLogger.info("docker consumer ended")
+          rescue => e
+            MKItLogger.error("error while consuming docker notification: #{e}", e.message, e.backtrace.join("\n"))
           end
-        rescue PTY::ChildExited
-          MKItLogger.warn("docker event listener process exited!")
         end
-      }
-      @thread.run
-      MKItLogger.info("docker listener started")
+      end
+      true
     end
-    def stop
-      @thread.exit if @thread
-      MKItLogger.info("docker listener stopped")
+
+    def register_listener
+      @listener.register do |stdout, stdin, pid|
+        stdout.each { |line| enqueue JSON.parse(line).to_o }
+      end
     end
   end
 end

data/lib/mkit/docker_log_listener.rb

@@ -0,0 +1,29 @@
+require "mkit/cmd/shell_client"
+
+module MKIt
+  class DockerLogListener < MKIt::ShellClient
+
+    def initialize(pod, ws, options: {})
+      @pod = pod
+      @ws = ws
+      command = "docker logs"
+      command += " -f" if options[:follow] == 'true'
+      command += " -n #{options[:nr_lines]}" if options[:nr_lines]
+      command += " #{@pod.name}"
+      super(command: command)
+    end
+
+    def register
+      super do |stdout, stdin, pid|
+        stdout.each {
+          |line| @ws.send(line.strip!)
+        }
+      end
+    end
+
+    def close
+      @ws.close_websocket unless @ws.nil?
+    end
+  end
+end
+

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end
 

data/lib/mkit.rb

@@ -9,6 +9,7 @@ require 'ostruct'
 require 'timeout'
 require 'net/http'
 require 'sinatra/base'
+require 'sinatra-websocket'
 require 'mkit/config/environment'
 require 'mkit/app/mkit_server'
 require 'mkit/config/load_default_configs'

data/mkit.gemspec

@@ -32,8 +32,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rubydns',         '~> 2.0', '>= 2.0.2'
   s.add_runtime_dependency 'sinatra',         '~> 3.0', '>= 3.0.5'
   s.add_runtime_dependency 'sinatra-activerecord', '~> 2.0', '>= 2.0.26'
+  s.add_runtime_dependency 'sinatra-websocket', '~> 0.3', '>= 0.3.1'
   s.add_runtime_dependency 'sqlite3', '~> 1.5', '>= 1.5.4'
-  s.add_runtime_dependency 'standalone_migrations', '~> 7.1', '>= 7.1.0'
+  s.add_runtime_dependency 'standalone_migrations', '~> 7.1', '< 7.2.0'
   s.add_runtime_dependency 'thin', '~> 1.8', '>= 1.8.1'
   s.add_runtime_dependency 'text-table', '~> 1.2', '>= 1.2.4'
 end

data/samples/apps/minio.yml

@@ -11,6 +11,6 @@ service:
     MINIO_ACCESS_KEY: minio
     MINIO_SECRET_KEY: minio123
   volumes:
-    #- docker://minio_data:/data
-    - /tmp/minio_data:/data
+    - docker://minio_data:/data
+    #- /tmp/minio_data:/data
 

data/samples/soketi.yaml

@@ -0,0 +1,32 @@
+service:
+  name: soketi
+  image: quay.io/soketi/soketi:0.17-16-alpine
+#  image: giovannedev/soketi:latest
+  ports:
+    #- 80:6001:http:round_robin
+    - 6001:6001:tcp:round_robin
+    - 6002:6001:tcp:round_robin:ssl
+    - 9601:9601:tcp:round_robin
+  resources:
+    max_replicas: 1
+    min_replicas: 1
+  environment:
+    SOKETI_PORT: 6001
+    SOKETI_METRICS_SERVER_PORT: 9601
+    SOKETI_DEBUG: 1
+    SOKETI_MODE: full
+    SOKETI_APP_ID: app-id
+    SOKETI_APP_KEY: app-key
+    SOKETI_APP_SECRET: app-secret
+    # PUSHER_HOST: 127.0.0.1
+    # PUSHER_PORT: 6001
+    # PUSHER_SCHEME: http # or https
+    SOKETI_PORT: 6001
+    SOKETI_SCHEME: http # or https
+    METRICS_SERVER_PORT: 9601
+    SOKETI_DEFAULT_APP_ENABLED: true
+    SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES: true
+    DEFAULT_APP_ENABLE_CLIENT_MESSAGES: true
+    #SOKETI_DB_REDIS_HOST: redis
+    #SOKETI_DB_REDIS_PORT: 6379
+    #SOKETI_DB_REDIS_PASSWORD: password

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Vasco Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns
@@ -230,6 +230,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.26
+- !ruby/object:Gem::Dependency
+  name: sinatra-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -257,9 +277,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.1'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -267,9 +287,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.1'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +343,6 @@ files:
 - ".github/workflows/publish.yml"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -361,6 +380,12 @@ files:
 - lib/mkit/app/templates/docker/docker_run.sh.erb
 - lib/mkit/app/templates/haproxy/0000_defaults.cfg
 - lib/mkit/app/templates/haproxy/xapp_haproxy.cfg.erb
+- lib/mkit/client/command_parser.rb
+- lib/mkit/client/commands.yaml
+- lib/mkit/client/http_client.rb
+- lib/mkit/client/mkitd_client.rb
+- lib/mkit/client/websocket_client.rb
+- lib/mkit/cmd/shell_client.rb
 - lib/mkit/cmd_runner.rb
 - lib/mkit/config/config.rb
 - lib/mkit/config/environment.rb
@@ -370,6 +395,7 @@ files:
 - lib/mkit/config/the_config.yml
 - lib/mkit/ctypes.rb
 - lib/mkit/docker_listener.rb
+- lib/mkit/docker_log_listener.rb
 - lib/mkit/exceptions.rb
 - lib/mkit/job_manager.rb
 - lib/mkit/mkit_dns.rb
@@ -401,6 +427,7 @@ files:
 - samples/apps/redis.yml
 - samples/daemontools/log/run
 - samples/daemontools/run
+- samples/soketi.yaml
 - samples/systemd/mkitd.service
 homepage: https://github.com/valexsantos/mkit
 licenses:

data/Gemfile.lock

@@ -1,140 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      rack (~> 2.0, >= 2.2.4)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    async (1.31.0)
-      console (~> 1.10)
-      nio4r (~> 2.3)
-      timers (~> 4.1)
-    async-dns (1.3.0)
-      async-io (~> 1.15)
-    async-io (1.38.0)
-      async
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    console (1.23.2)
-      fiber-annotation
-      fiber-local
-    crass (1.0.6)
-    daemons (1.4.1)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    erubi (1.12.0)
-    eventmachine (1.2.7)
-    fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    loofah (2.21.4)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    mustermann (3.0.0)
-      ruby2_keywords (~> 0.0.1)
-    net-ping (2.0.8)
-    net_http_unix (0.2.2)
-    nio4r (2.7.0)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.3)
-    rack (2.2.8)
-    rack-protection (3.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.1.0)
-    ruby2_keywords (0.0.5)
-    rubydns (2.0.2)
-      async-dns (~> 1.0)
-    sinatra (3.1.0)
-      mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
-      tilt (~> 2.0)
-    sinatra-activerecord (2.0.27)
-      activerecord (>= 4.1)
-      sinatra (>= 1.0)
-    sqlite3 (1.6.8-x86_64-darwin)
-    sqlite3 (1.6.8-x86_64-linux)
-    standalone_migrations (7.1.2)
-      activerecord (>= 6.0.0, < 7.1.0)
-      nokogiri (~> 1.14)
-      railties (>= 6.0.0, < 7.1.0)
-      rake (>= 10.0)
-    text-table (1.2.4)
-    thin (1.8.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    thor (1.3.0)
-    tilt (2.3.0)
-    timers (4.3.5)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.12)
-
-PLATFORMS
-  x86_64-darwin-22
-  x86_64-linux
-
-DEPENDENCIES
-  async-dns
-  dry-container
-  net-ping
-  net_http_unix
-  pry
-  rack (>= 2.0.6)
-  rake
-  rubydns
-  sinatra
-  sinatra-activerecord
-  sqlite3
-  standalone_migrations
-  text-table
-  thin
-
-BUNDLED WITH
-   2.4.10