ircinch 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d603bfc62bdd98e5a52cc6f56fea0a5ac42592df0d58c0ccf40a3197f95167b5
-  data.tar.gz: 271c967f694780843b98712454662782efcfc9145a0d015a7a3a5570af7303bd
+  metadata.gz: 3c4b56b78380a166d6ff1806cd237fdb5d08699c8619fa7ad17a4a80cb414b3e
+  data.tar.gz: e7481dbd35a3831e48eb80447ff4a429938dd285677c4e08867c31efb8ad868c
 SHA512:
-  metadata.gz: d192049a5f08179804fb74810d828ab4facfcada4ffbecdbc18c0e3d7474c2151298f7da2b287882fe8b3a71f40ba9e3f23d3e798f731008170fac47456b2174
-  data.tar.gz: 8a7693d15e83fef6b7716e1aca5d0cec0d942aa42ab8a99356a5a98fab1d1a1310f29f9a3d1546981df277f30d0b29fc57ef21b60f64124efaea3d9953f99e5a
+  metadata.gz: e9e7e645ddefb79ea5ab0489cfb2785624a6c33ea80a0d3cd51e5438e57ce6af6516adab7843256a51cc7041c9a4a35dfef4438ea4c5dab92ef1a6fd632c0692
+  data.tar.gz: 6a0e9526b4273cb3a670fc8a739f594f57888b679575d386d2715a767ead935af4c909e6bbad2eac2f2764e1cca2db09d895b2cb9b664842978ce55f71590931

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+* IRCinch 2.4.4, 14 January 2026
+  - Improve performance for high traffic channels
+  - Increase test coverage
+  - Bug fixes
+
 * IRCinch 2.4.3, 27 December 2025
   - Fix SASL auth time out by fixing IRC message parsing expression (fix by @janikrabe)
   - Remove various duplicate methods

data/LICENSE.txt

@@ -1,8 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2010 Lee Jarvis, Dominik Honnef
-Copyright (c) 2011-2019 Dominik Honnef
-Copyright (c) 2022-2025 Matt Sias
+Copyright (c) 2011 Dominik Honnef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/cinch/ban.rb

@@ -40,7 +40,7 @@ module Cinch
     # @raise [Exceptions::UnsupportedFeature] Cinch does not support
     #   Freenode's extended bans
     def match(user)
-      raise UnsupportedFeature, "extended bans are not supported yet" if @extended
+      raise Exceptions::UnsupportedFeature, "extended bans are not supported yet" if @extended
       @mask =~ user
     end
     alias_method :=~, :match

data/lib/cinch/bot.rb

@@ -352,6 +352,8 @@ module Cinch
       @join_handler = nil
       @join_timer = nil
 
+      @irc = IRC.new(self)
+
       super(nil, self)
       instance_eval(&b) if b
     end

data/lib/cinch/configuration.rb

@@ -31,7 +31,7 @@ module Cinch
     def []=(key, value)
       # FIXME also adjust method_missing
       raise ArgumentError, "Unknown option #{key}" unless self.class::KNOWN_OPTIONS.include?(key)
-      modifiable[new_ostruct_member(key)] = value
+      super
     end
 
     # Loads a configuration from a hash by merging the hash with

data/lib/cinch/handler.rb

@@ -75,7 +75,7 @@ module Cinch
       @thread_group.list.each do |thread|
         Thread.new do
           @bot.loggers.debug "[Ending thread] Waiting 10 seconds for #{thread} to finish..."
-          thread.join(10)
+          thread.join(stop_timeout)
           @bot.loggers.debug "[Killing thread] Killing #{thread}"
           thread.kill
         end
@@ -116,5 +116,11 @@ module Cinch
       # TODO maybe add the number of running threads to the output?
       "#<Cinch::Handler @event=#{@event.inspect} pattern=#{@pattern.inspect}>"
     end
+
+    private
+
+    def stop_timeout
+      10
+    end
   end
 end

data/lib/cinch/handler_list.rb

@@ -38,11 +38,23 @@ module Cinch
           return handlers
         end
 
-        handlers = handlers.select { |handler|
-          msg.match(handler.pattern.to_r(msg), type, handler.strip_colors)
-        }.group_by { |handler| handler.group }
-
-        handlers.values_at(*(handlers.keys - [nil])).map(&:first) + (handlers[nil] || [])
+        groups = Set.new
+        handlers.select { |handler|
+          if msg.match(handler.pattern.to_r(msg), type, handler.strip_colors)
+            if handler.group
+              if groups.include?(handler.group)
+                false
+              else
+                groups << handler.group
+                true
+              end
+            else
+              true
+            end
+          else
+            false
+          end
+        }
       end
     end
 

data/lib/cinch/irc.rb

@@ -12,6 +12,11 @@ module Cinch
   class IRC
     include Helpers
 
+    # @api private
+    REGISTRATION_COMMANDS = %w[001 002 003 004 422].freeze
+    # @api private
+    PRIVMSG_NOTICE_COMMANDS = %w[PRIVMSG NOTICE].freeze
+
     # @return [ISupport]
     attr_reader :isupport
 
@@ -236,7 +241,7 @@ module Cinch
       msg = Message.new(input, @bot)
       events = [[:catchall]]
 
-      if ["001", "002", "003", "004", "422"].include?(msg.command)
+      if REGISTRATION_COMMANDS.include?(msg.command)
         @registration << msg.command
         if registered?
           events << [:connect]
@@ -245,7 +250,7 @@ module Cinch
         end
       end
 
-      if ["PRIVMSG", "NOTICE"].include?(msg.command)
+      if PRIVMSG_NOTICE_COMMANDS.include?(msg.command)
         events << [:ctcp] if msg.ctcp?
         events << if msg.channel?
           [:channel]
@@ -759,8 +764,9 @@ module Cinch
       end
       @in_lists << :names
 
+      prefix_regex = /^([#{@isupport["PREFIX"].values.join}]+)/
       msg.params[3].split(" ").each do |user|
-        m = user.match(/^([#{@isupport["PREFIX"].values.join}]+)/)
+        m = user.match(prefix_regex)
         if m
           prefixes = m[1].chars.map { |s| @isupport["PREFIX"].key(s) }
           nick = user[prefixes.size..]

data/lib/cinch/logger.rb

@@ -167,5 +167,13 @@ module Cinch
     def format_exception(message)
       message
     end
+
+    def format_fatal(message)
+      message
+    end
+
+    def format_log(message)
+      message
+    end
   end
 end

data/lib/cinch/message.rb

@@ -86,6 +86,8 @@ module Cinch
     # @since 2.3.0
     attr_reader :statusmsg_mode
 
+    MSG_REGEX = /\A(?:@([^ ]+) )?(?::(\S+) )?(\S+)(.*)/
+
     def initialize(msg, bot)
       @raw = msg
       @bot = bot
@@ -99,7 +101,7 @@ module Cinch
     # @api private
     # @return [void]
     def parse
-      match = @raw.match(/\A(?:@([^ ]+) )?(?::(\S+) )?(\S+)(.*)/)
+      match = @raw.match(MSG_REGEX)
       tags, @prefix, @command, raw_params = match.captures
 
       if @bot.irc.network.ngametv?
@@ -280,7 +282,7 @@ module Cinch
 
       class << self
         def to_symbol(string)
-          string.tr(/-/, "_").downcase.to_sym
+          string.tr("-", "_").downcase.to_sym
         end
       end
 
@@ -343,7 +345,7 @@ module Cinch
       chantypes = @bot.irc.isupport["CHANTYPES"]
       statusmsg = @bot.irc.isupport["STATUSMSG"]
       if statusmsg.include?(s[0]) && chantypes.include?(s[1])
-        status = @bot.irc.isupport["PREFIX"].invert[s[0]]
+        status = @bot.irc.isupport["PREFIX"].key(s[0])
         [s[1..], status]
       elsif chantypes.include?(s[0])
         [s, nil]

data/lib/cinch/open_ended_queue.rb

@@ -4,23 +4,55 @@
 # objects.
 #
 # @api private
-class OpenEndedQueue < Queue
-  # @param [Object] obj
-  # @return [void]
+class OpenEndedQueue
+  def initialize
+    @queue = []
+    @mutex = Mutex.new
+    @cv = ConditionVariable.new
+  end
+
+  def <<(obj)
+    push(obj)
+  end
+
+  def push(obj)
+    @mutex.synchronize do
+      @queue.push(obj)
+      @cv.signal
+    end
+  end
+
   def unshift(obj)
-    t = nil
-    @mutex.synchronize {
-      @que.unshift obj
-      begin
-        t = @waiting.shift
-        t&.wakeup
-      rescue ThreadError
-        retry
+    @mutex.synchronize do
+      @queue.unshift(obj)
+      @cv.signal
+    end
+  end
+
+  def pop(non_block = false)
+    @mutex.synchronize do
+      while @queue.empty?
+        raise ThreadError, "queue empty" if non_block
+        @cv.wait(@mutex)
       end
-    }
-    begin
-      t&.run
-    rescue ThreadError
+      @queue.shift
     end
   end
+  alias_method :shift, :pop
+  alias_method :deq, :pop
+  alias_method :enq, :push
+
+  def empty?
+    @mutex.synchronize { @queue.empty? }
+  end
+
+  def size
+    @mutex.synchronize { @queue.size }
+  end
+
+  alias_method :length, :size
+
+  def clear
+    @mutex.synchronize { @queue.clear }
+  end
 end

data/lib/cinch/pattern.rb

@@ -46,9 +46,14 @@ module Cinch
     attr_reader :pattern
     def initialize(prefix, pattern, suffix)
       @prefix, @pattern, @suffix = prefix, pattern, suffix
+      if !@prefix.is_a?(Proc) && !@pattern.is_a?(Proc) && !@suffix.is_a?(Proc)
+        @cached_regex = to_r
+      end
     end
 
     def to_r(msg = nil)
+      return @cached_regex if @cached_regex
+
       pattern = Pattern.resolve_proc(@pattern, msg)
 
       case pattern

data/lib/cinch/rubyext/module.rb

@@ -23,6 +23,6 @@ class Module
   # @api private
   def synced_attr_accessor(attr)
     synced_attr_reader(attr)
-    attr_accessor(attr)
+    attr_writer(attr)
   end
 end

data/lib/cinch/version.rb

@@ -2,5 +2,5 @@
 
 module Cinch
   # Version of the library
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ircinch
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Matt Sias