activematrix 0.0.0 → 0.0.2

data/lib/active_matrix/agent_registry.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'concurrent'
+
+module ActiveMatrix
+  # Thread-safe registry for managing running bot agents
+  class AgentRegistry
+    include Singleton
+    include ActiveMatrix::Logging
+
+    def initialize
+      @agents = Concurrent::Hash.new
+      @mutex = Mutex.new
+    end
+
+    # Register a running agent
+    def register(agent_record, bot_instance)
+      @mutex.synchronize do
+        raise AgentAlreadyRunningError, "Agent #{agent_record.name} is already running" if @agents.key?(agent_record.id)
+
+        @agents[agent_record.id] = {
+          record: agent_record,
+          instance: bot_instance,
+          thread: Thread.current,
+          started_at: Time.current
+        }
+
+        logger.info "Registered agent: #{agent_record.name} (#{agent_record.id})"
+      end
+    end
+
+    # Unregister an agent
+    def unregister(agent_record)
+      @mutex.synchronize do
+        entry = @agents.delete(agent_record.id)
+        logger.info "Unregistered agent: #{agent_record.name} (#{agent_record.id})" if entry
+        entry
+      end
+    end
+
+    # Get a running agent by ID
+    def get(agent_id)
+      @agents[agent_id]
+    end
+
+    # Get agent by name
+    def get_by_name(name)
+      @agents.values.find { |entry| entry[:record].name == name }
+    end
+
+    # Get all running agents
+    def all
+      @agents.values
+    end
+
+    # Get all agent records
+    def all_records
+      @agents.values.map { |entry| entry[:record] }
+    end
+
+    # Get all bot instances
+    def all_instances
+      @agents.values.map { |entry| entry[:instance] }
+    end
+
+    # Check if an agent is running
+    def running?(agent_record)
+      @agents.key?(agent_record.id)
+    end
+
+    # Get agents by state
+    def by_state(state)
+      @agents.values.select { |entry| entry[:record].state == state.to_s }
+    end
+
+    # Get agents by bot class
+    def by_class(bot_class)
+      class_name = bot_class.is_a?(Class) ? bot_class.name : bot_class.to_s
+      @agents.values.select { |entry| entry[:record].bot_class == class_name }
+    end
+
+    # Get agents by homeserver
+    def by_homeserver(homeserver)
+      @agents.values.select { |entry| entry[:record].homeserver == homeserver }
+    end
+
+    # Broadcast to all agents
+    def broadcast
+      all_instances.each do |instance|
+        yield instance
+      rescue StandardError => e
+        logger.error "Error broadcasting to agent: #{e.message}"
+      end
+    end
+
+    # Broadcast to specific agents
+    def broadcast_to(selector)
+      agents = case selector
+               when Symbol
+                 by_state(selector)
+               when String
+                 by_name_pattern(selector)
+               when Class
+                 by_class(selector)
+               when Proc
+                 @agents.values.select { |entry| selector.call(entry[:record]) }
+               else
+                 []
+               end
+
+      agents.each do |entry|
+        yield entry[:instance]
+      rescue StandardError => e
+        logger.error "Error broadcasting to agent #{entry[:record].name}: #{e.message}"
+      end
+    end
+
+    # Get count of running agents
+    def count
+      @agents.size
+    end
+
+    # Clear all agents (used for testing)
+    def clear!
+      @mutex.synchronize do
+        @agents.clear
+      end
+    end
+
+    # Get health status of all agents
+    def health_status
+      @agents.map do |id, entry|
+        {
+          id: id,
+          name: entry[:record].name,
+          state: entry[:record].state,
+          thread_alive: entry[:thread]&.alive?,
+          uptime: Time.current - entry[:started_at],
+          last_active: entry[:record].last_active_at
+        }
+      end
+    end
+
+    private
+
+    def by_name_pattern(pattern)
+      regex = Regexp.new(pattern, Regexp::IGNORECASE)
+      @agents.values.select { |entry| entry[:record].name =~ regex }
+    end
+  end
+
+  class AgentAlreadyRunningError < StandardError; end
+end

data/lib/{matrix_sdk → active_matrix}/api.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'matrix_sdk'
-
 require 'erb'
 require 'net/http'
 require 'openssl'
 require 'uri'
 
-module MatrixSdk
+module ActiveMatrix
   class Api
-    extend MatrixSdk::Extensions
-    include MatrixSdk::Logging
+    extend ActiveMatrix::Extensions
+    include ActiveMatrix::Logging
 
-    USER_AGENT = "Ruby Matrix SDK v#{MatrixSdk::VERSION}"
+    USER_AGENT = "Ruby Matrix SDK v#{ActiveMatrix::VERSION}".freeze
     DEFAULT_HEADERS = {
       'accept' => 'application/json',
       'user-agent' => USER_AGENT
@@ -72,7 +70,7 @@ module MatrixSdk
       self.threadsafe = params.fetch(:threadsafe, :multithread)
 
       ([params.fetch(:protocols, [:CS])].flatten - protocols).each do |proto|
-        self.class.include MatrixSdk::Protocols.const_get(proto)
+        self.class.include ActiveMatrix::Protocols.const_get(proto)
       end
 
       login(user: @homeserver.user, password: @homeserver.password) if @homeserver.user && @homeserver.password && !@access_token && !params[:skip_login] && protocol?(:CS)
@@ -84,7 +82,7 @@ module MatrixSdk
     # This will follow the server discovery spec for client-server and federation
     #
     # @example Opening a Matrix API connection to a homeserver
-    #   hs = MatrixSdk::API.new_for_domain 'example.com'
+    #   hs = ActiveMatrix::API.new_for_domain 'example.com'
     #   hs.connection_address
     #   # => 'matrix.example.com'
     #   hs.connection_port
@@ -97,10 +95,10 @@ module MatrixSdk
     # @return [API] The API connection
     def self.new_for_domain(domain, target: :client, keep_wellknown: false, ssl: true, **params)
       domain, port = domain.split(':')
-      uri = URI("http#{ssl ? 's' : ''}://#{domain}")
+      uri = URI("http#{'s' if ssl}://#{domain}")
       well_known = nil
       target_uri = nil
-      logger = ::Logging.logger[self]
+      logger = ActiveMatrix.logger
       logger.debug "Resolving #{domain}"
 
       if !port.nil? && !port.empty?
@@ -171,17 +169,15 @@ module MatrixSdk
 
       new(
         uri,
-        **params.merge(
-          address: target_uri.host,
-          port: target_uri.port
-        )
+        **params, address: target_uri.host,
+                  port: target_uri.port
       )
     end
 
     # Get a list of enabled protocols on the API client
     #
     # @example
-    #   MatrixSdk::Api.new_for_domain('matrix.org').protocols
+    #   ActiveMatrix::Api.new_for_domain('matrix.org').protocols
     #   # => [:IS, :CS]
     #
     # @return [Symbol[]] An array of enabled APIs
@@ -189,7 +185,7 @@ module MatrixSdk
       self
         .class.included_modules
         .reject { |m| m&.name.nil? }
-        .select { |m| m.name.start_with? 'MatrixSdk::Protocols::' }
+        .select { |m| m.name.start_with? 'ActiveMatrix::Protocols::' }
         .map { |m| m.name.split('::').last.to_sym }
     end
 
@@ -343,7 +339,7 @@ module MatrixSdk
             logger.error "Received non-parsable data in 200 response; #{response.body.inspect}"
             raise MatrixConnectionError, response
           end
-          return MatrixSdk::Response.new self, data
+          return ActiveMatrix::Response.new self, data
         end
         raise MatrixRequestError.new_by_code(data, response.code) if data
 
@@ -394,11 +390,11 @@ module MatrixSdk
       return unless logger.debug?
 
       if http.is_a? Net::HTTPRequest
-        dir = "#{id ? "#{id} : " : nil}>"
+        dir = "#{"#{id} : " if id}>"
         logger.debug "#{dir} Sending a #{http.method} request to `#{http.path}`:"
       else
-        dir = "#{id ? "#{id} : " : nil}<"
-        logger.debug "#{dir} Received a #{http.code} #{http.message} response:#{duration ? " [#{(duration * 1000).to_i}ms]" : nil}"
+        dir = "#{"#{id} : " if id}<"
+        logger.debug "#{dir} Received a #{http.code} #{http.message} response:#{" [#{(duration * 1000).to_i}ms]" if duration}"
       end
       http.to_hash.map { |k, v| "#{k}: #{k == 'authorization' ? '[ REDACTED ]' : v.join(', ')}" }.each do |h|
         logger.debug "#{dir} #{h}"
@@ -424,8 +420,8 @@ module MatrixSdk
     def http
       return @http if @http&.active?
 
-      host = (@connection_address || homeserver.host)
-      port = (@connection_port || homeserver.port)
+      host = @connection_address || homeserver.host
+      port = @connection_port || homeserver.port
 
       connection = @http unless @threadsafe == :multithread
       connection ||= if proxy_uri

data/lib/{matrix_sdk → active_matrix}/bot/base.rb

@@ -2,9 +2,10 @@
 
 require 'shellwords'
 
-module MatrixSdk::Bot
+module ActiveMatrix::Bot
   class Base
-    extend MatrixSdk::Extensions
+    extend ActiveMatrix::Extensions
+    include ActiveMatrix::Logging
 
     RequestHandler = Struct.new('RequestHandler', :command, :type, :proc, :data) do
       def command?
@@ -29,14 +30,14 @@ module MatrixSdk::Bot
 
     def initialize(hs_url, **params)
       @client = case hs_url
-                when MatrixSdk::Api
-                  MatrixSdk::Client.new hs_url
-                when MatrixSdk::Client
+                when ActiveMatrix::Api
+                  ActiveMatrix::Client.new hs_url
+                when ActiveMatrix::Client
                   hs_url
                 when %r{^https?://.*}
-                  MatrixSdk::Client.new hs_url, **params
+                  ActiveMatrix::Client.new hs_url, **params
                 else
-                  MatrixSdk::Client.new_for_domain hs_url, **params
+                  ActiveMatrix::Client.new_for_domain hs_url, **params
                 end
 
       @client.on_event.add_handler { |ev| _handle_event(ev) }
@@ -59,30 +60,23 @@ module MatrixSdk::Bot
     end
 
     def self.logger
-      Logging.logger[self].tap do |l|
-        begin
-          l.level = :debug if MatrixSdk::Bot::PARAMS_CONFIG[:logging]
-        rescue NameError
-          # Not running as instance
-        end
-        l.level = settings.log_level unless settings.logging?
-      end
+      @logger ||= ActiveMatrix.logger
     end
 
     # Register a command during runtime
     #
     # @param command [String] The command to register
     # @see Base.command for full parameter information
-    def register_command(command, **params, &block)
-      self.class.command(command, **params, &block)
+    def register_command(command, **params, &)
+      self.class.command(command, **params, &)
     end
 
     # Register an event during runtime
     #
     # @param event [String] The event to register
     # @see Base.event for full parameter information
-    def register_event(event, **params, &block)
-      self.class.event(event, **params, &block)
+    def register_event(event, **params, &)
+      self.class.event(event, **params, &)
     end
 
     # Removes a registered command during runtime
@@ -149,7 +143,7 @@ module MatrixSdk::Bot
       attr_reader :handlers
 
       CALLERS_TO_IGNORE = [
-        /\/matrix_sdk\/.+\.rb$/,                            # all MatrixSdk code
+        /\/matrix_sdk\/.+\.rb$/,                            # all ActiveMatrix code
         /^\(.*\)$/,                                         # generated code
         /rubygems\/(custom|core_ext\/kernel)_require\.rb$/, # rubygems require hacks
         /bundler(\/(?:runtime|inline))?\.rb/,               # bundler require hacks
@@ -252,16 +246,16 @@ module MatrixSdk::Bot
       # @note Due to the way blocks are handled, required parameters won't block execution.
       #   If your command requires all parameters to be valid, you will need to check for nil yourself.
       #
-      # @note Execution will be performed with a MatrixSdk::Bot::Request object as self.
-      #   To access the bot instance, use MatrixSdk::Bot::Request#bot
+      # @note Execution will be performed with a ActiveMatrix::Bot::Request object as self.
+      #   To access the bot instance, use ActiveMatrix::Bot::Request#bot
       #
       # @param command [String] The command to register, will be routed based on the prefix and bot NameError
       # @param desc [String] A human-readable description for the command
       # @param only [Symbol,Proc,Array[Symbol,Proc]] What limitations does this command have?
       #   Can use :DM, :Admin, :Mod
       # @option params
-      def command(command, desc: nil, notes: nil, only: nil, **params, &block)
-        args = params[:args] || convert_to_lambda(&block).parameters.map do |type, name|
+      def command(command, desc: nil, notes: nil, only: nil, **params, &)
+        args = params[:args] || convert_to_lambda(&).parameters.map do |type, name|
           case type
           when :req
             name.to_s.upcase
@@ -281,7 +275,7 @@ module MatrixSdk::Bot
           desc: desc,
           notes: notes,
           only: [only].flatten.compact,
-          &block
+          &
         )
       end
 
@@ -292,14 +286,14 @@ module MatrixSdk::Bot
       # @param event [String] The ID for the event to register
       # @param only [Symbol,Proc,Array[Symbol,Proc]] The limitations to when the event should be handled
       # @option params
-      def event(event, only: nil, **_params, &block)
+      def event(event, only: nil, **_params, &)
         logger.debug "Registering event #{event}"
 
         add_handler(
           event.to_s,
           type: :event,
           only: [only].flatten.compact,
-          &block
+          &
         )
       end
 
@@ -404,7 +398,7 @@ module MatrixSdk::Bot
       # Starts the bot up
       #
       # @param options [Hash] Settings to apply using Base.set
-      def run!(options = {}, &block)
+      def run!(options = {}, &)
         return if running?
 
         set options
@@ -423,7 +417,7 @@ module MatrixSdk::Bot
                               end
 
         begin
-          start_bot(bot_settings, &block)
+          start_bot(bot_settings, &)
         ensure
           quit!
         end
@@ -442,9 +436,9 @@ module MatrixSdk::Bot
 
       def start_bot(bot_settings, &block)
         cl = if homeserver =~ %r{^https?://}
-               MatrixSdk::Client.new homeserver
+               ActiveMatrix::Client.new homeserver
              else
-               MatrixSdk::Client.new_for_domain homeserver
+               ActiveMatrix::Client.new_for_domain homeserver
              end
 
         auth = bot_settings.delete :auth
@@ -476,7 +470,7 @@ module MatrixSdk::Bot
           begin
             data = bot.client.api.get_account_data(bot.client.mxid, "dev.ananace.ruby-sdk.#{bot_name}")
             bot.client.sync_token = data[:sync_token]
-          rescue MatrixSdk::MatrixNotFoundError
+          rescue ActiveMatrix::MatrixNotFoundError
             # Valid
           rescue StandardError => e
             bot.logger.error "Failed to restore old sync token, #{e.class}: #{e}"
@@ -539,7 +533,7 @@ module MatrixSdk::Bot
       return true if (handler.data[:only] || []).empty?
 
       # Avoid modifying input data for a checking method
-      @event = MatrixSdk::Response.new(client.api, event.dup)
+      @event = ActiveMatrix::Response.new(client.api, event.dup)
       return false if [handler.data[:only]].flatten.compact.any? do |only|
         if only.is_a? Proc
           !instance_exec(&only)
@@ -569,7 +563,7 @@ module MatrixSdk::Bot
       return true if (handler.data[:only] || []).empty?
 
       # Avoid modifying input data for a checking method
-      @event = MatrixSdk::Response.new(client.api, event.dup)
+      @event = ActiveMatrix::Response.new(client.api, event.dup)
       return false if [handler.data[:only]].flatten.compact.any? do |only|
         if only.is_a? Proc
           instance_exec(&only)
@@ -640,7 +634,7 @@ module MatrixSdk::Bot
       return if in_event?
       return if settings.ignore_own? && client.mxid == event[:sender]
 
-      event = event.data if event.is_a? MatrixSdk::MatrixEvent
+      event = event.data if event.is_a? ActiveMatrix::MatrixEvent
 
       logger.debug "Received event #{event}"
       return _handle_message(event) if event[:type] == 'm.room.message'
@@ -651,7 +645,7 @@ module MatrixSdk::Bot
 
       logger.info "Handling event #{event[:sender]}/#{event[:room_id]} => #{event[:type]}"
 
-      @event = MatrixSdk::Response.new(client.api, event)
+      @event = ActiveMatrix::Response.new(client.api, event)
       instance_exec(&handler.proc)
     # Argument errors are likely to be a "friendly" error, so don't direct the user to the log
     rescue ArgumentError => e
@@ -703,7 +697,7 @@ module MatrixSdk::Bot
 
       logger.info "Handling command #{event[:sender]}/#{event[:room_id]}: #{settings.command_prefix}#{command}"
 
-      @event = MatrixSdk::Response.new(client.api, event)
+      @event = ActiveMatrix::Response.new(client.api, event)
       arity = handler.arity
       case arity
       when 0
@@ -826,8 +820,17 @@ module MatrixSdk::Bot
         info += "\n  #{handler.data[:notes].split("\n").join("\n  ")}" if !command.nil? && handler.data[:notes]
         info = nil if info.empty?
 
+        prefix = if handler.command == 'help'
+                   # Help command is always accessible without bot name prefix
+                   "#{settings.command_prefix}#{handler.command}"
+                 elsif room.dm?
+                   "#{settings.command_prefix}#{handler.command}"
+                 else
+                   "#{expanded_prefix}#{handler.command}"
+                 end
+
         [
-          room.dm? ? "#{settings.command_prefix}#{handler.command}" : "#{expanded_prefix}#{handler.command}",
+          prefix,
           info
         ].compact
       end
@@ -840,7 +843,7 @@ module MatrixSdk::Bot
           room.send_notice("Help for #{command};\n#{commands}")
         end
       else
-        room.send_notice("#{settings.help_preamble? ? "#{settings.help_preamble}\n\n" : ''}Usage:\n\n#{commands}")
+        room.send_notice("#{"#{settings.help_preamble}\n\n" if settings.help_preamble?}Usage:\n\n#{commands}")
       end
     end
   end

data/lib/{matrix_sdk → active_matrix}/bot/main.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MatrixSdk::Bot
+module ActiveMatrix::Bot
   PARAMS_CONFIG = {} # rubocop:disable Style/MutableConstant Intended
 
   require 'optparse'
@@ -21,14 +21,13 @@ module MatrixSdk::Bot
     PARAMS_CONFIG[:optparse_error] = e
   end
 
-  MatrixSdk.logger.appenders.each do |log|
+  ActiveMatrix.logger.appenders.each do |log|
     log.layout = Logging::Layouts.pattern(
       pattern: "%d|%.1l %c : %m\n"
     )
   end
-  MatrixSdk.debug! if ENV['MATRIX_DEBUG'] == '1'
+  ActiveMatrix.debug! if ENV['MATRIX_DEBUG'] == '1'
 
-  require 'matrix_sdk/bot/base'
   class Instance < Base
     set :logging, true
     set :log_level, :info
@@ -76,4 +75,4 @@ module MatrixSdk::Bot
   end
 end
 
-extend MatrixSdk::Bot::Delegator # rubocop:disable Style/MixinUsage Intended
+extend ActiveMatrix::Bot::Delegator # rubocop:disable Style/MixinUsage Intended