io-metrics 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef189b6c38ef215409837bfe6d596116856ee48177fe67c63f6926f32e58e611
-  data.tar.gz: a62a323790464b1ef965cfbf1ff1aba63e329e025f0f3b0b93696a809aa7095a
+  metadata.gz: db027cfe8e839feaf2916d7359836f34e182d899d69441abea2c88098af5b3be
+  data.tar.gz: 81f6b5d0c4569e3110b64bfdee6e7c0ebdc5b6eb1687c0d0980b5e09c449dd72
 SHA512:
-  metadata.gz: b763b526aa7e8e82428206ba4b0a7d652fa3dd89ba4f3d8a0db7677af8c4e19171d459d6fd750f0b2f43aa3ac99461821c6f6fae61f1ac9c5024a569bb4af6ec
-  data.tar.gz: 79e05df4f9d528c29cc1030c59623efeb6b3147f029e6361133e1a5e0660fc9a46a78d8ff7baa5026bc2db892a8ac29bbfe99b6a310314bfaa96a84fd144e02b
+  metadata.gz: 97cbf5f85aa49ccdb0da457b101e4375615f3ba46ca7f7b7a0366d4dded4b326de500080fb2d31583cf71157ad4758239b592dd87e7fb71bebd438af94f257d6
+  data.tar.gz: fba22c314ebb96e5f0ba624e1d37e9c9012555ce3c66fb842b57f433f2ae9d9fbb321ef303e5caee46155b9501818932821d9578e8a4909bd9f3e0e732b0077a

checksums.yaml.gz.sig

@@ -1,5 +1 @@
-��+%���xH@.�o�}�[L�$>r�e<�ƺW%�$�x��FǷI���h��r�݁!�d�tR�x�qrD�(���+�~;����2�/?~ܹ�y��(�;py1zD��+&+�Z��M��_2
-��K��+-�
-��\ε�n}��abX��5��b2���^X�����|��<�}T����+bV��[��?s}`��%W�F۪�`ͦfJ=xsw�����~8�<ߙ���l��^L'T
-�_�R
-0Uq=����7�Ԫk=���5R
+&�V�C��|%���Dٹ�8���	.l���Z$��^�AH��=��wpА�'�ES��چ!vB�_UL1a�b

data/lib/io/metrics/listener/darwin.rb

@@ -17,7 +17,8 @@ class IO
 			end
 			
 			# Parse an address from netstat format to Addrinfo (TCP, numeric port).
-			# @parameter address [String] Address string from netstat, e.g. "127.0.0.1.50876" or "*.63703".
+			# @parameter address [String] Address string from netstat, e.g. "127.0.0.1.50876", "*.63703",
+			#   "[::1].8080", or "::1.8080" (bare IPv6, no brackets, as macOS netstat outputs).
 			# @returns [Addrinfo | Nil] Addrinfo for the listener, or nil if the line cannot be parsed.
 			def self.parse_address(address)
 				# Handle wildcard addresses: *.port -> 0.0.0.0:port
@@ -26,20 +27,28 @@ class IO
 					return Addrinfo.tcp("0.0.0.0", port)
 				end
 				
-				# Handle IPv4 addresses: ip.port -> ip:port
-				if address =~ /^([0-9.]+)\.(\d+)$/
-					ip = $1
-					port = $2.to_i
-					return Addrinfo.tcp(ip, port)
-				end
-				
-				# Handle IPv6: [::1].8080, [fe80::1%lo0].8080, [::].8080
+				# Handle bracketed IPv6: [::1].8080, [fe80::1%lo0].8080, [::].8080
 				if address =~ /\A\[([^\]]+)\]\.(\d+)\z/
 					ip = $1.sub(/%.*\z/, "")  # strip zone ID (e.g. %lo0)
 					port = $2.to_i
 					return Addrinfo.tcp(ip, port)
 				end
 				
+				# Split at the last dot; everything after must be a numeric port.
+				# This handles both IPv4 (127.0.0.1.PORT) and bare IPv6 (::1.PORT, fe80::1%lo0.PORT).
+				if (dot_idx = address.rindex(".")) && address[dot_idx + 1..].match?(/\A\d+\z/)
+					ip = address[0, dot_idx]
+					port = address[dot_idx + 1..].to_i
+					
+					if ip.include?(":")
+						# IPv6: strip zone ID (e.g. fe80::1%lo0 → fe80::1)
+						ip = ip.sub(/%.*\z/, "")
+						return Addrinfo.tcp(ip, port)
+					else
+						return Addrinfo.tcp(ip, port)
+					end
+				end
+				
 				nil
 			end
 			
@@ -52,47 +61,54 @@ class IO
 				end
 			end
 			
-			# Parse netstat -L output and extract listener statistics.
+			# Parse a single netstat -L output stream and accumulate into +listeners+.
+			# @parameter io [IO] Open pipe from netstat.
+			# @parameter listeners [Hash] Accumulator keyed by listener address string.
+			# @parameter address_filter [Set | Nil] Optional downcased address filter.
+			def self.parse_netstat_output(io, listeners, address_filter)
+				io.each_line do |line|
+					next if line.start_with?("Current") || line.start_with?("Listen") || line.strip.empty?
+					
+					# Format: "queue_length/incomplete_queue_length/maximum_queue_length    Local Address"
+					fields = line.split(/\s+/)
+					next if fields.size < 2
+					
+					queue_statistics = fields[0]
+					local_address_raw = fields[1]
+					
+					# Parse queue statistics: "queue_length/incomplete_queue_length/maximum_queue_length"
+					next unless queue_statistics =~ /^(\d+)\/(\d+)\/(\d+)$/
+					queue_length = $1.to_i
+					# incomplete_queue_length = $2.to_i  # incomplete connections (SYN_RECV)
+					# maximum_queue_length = $3.to_i  # maximum queue size
+					
+					addrinfo = parse_address(local_address_raw)
+					next unless addrinfo
+					
+					key = tcp_listener_key(addrinfo)
+					next if address_filter && !address_filter.include?(key.downcase)
+					
+					listeners[key] ||= Listener.new(addrinfo, 0, 0, 0, 0, 0)
+					# Accumulate rather than overwrite: macOS shows both IPv4 and IPv6 wildcard
+					# sockets as "*.PORT", so multiple LISTEN rows can share the same key.
+					listeners[key].queued_count += queue_length
+					# active_count and close_wait_count are 0 (netstat -L doesn't expose connection states)
+					listeners[key].active_count = 0
+					listeners[key].close_wait_count = 0
+				end
+			end
+			
+			# Parse netstat -L output and extract listener statistics for IPv4 and IPv6.
 			# @parameter addresses [Array(String) | Nil] Optional filter for specific addresses.
 			# @returns [Array(Listener)] One entry per listening socket reported by netstat.
 			def self.capture_tcp(addresses = nil)
 				listeners = {}
 				address_filter = addresses ? addresses.map{|address| address.downcase}.to_set : nil
 				
+				# A single `netstat -L -an -p tcp` invocation reports both IPv4 and IPv6
+				# listeners on macOS — no separate tcp6 pass is needed.
 				IO.popen([NETSTAT, "-L", "-an", "-p", "tcp"], "r") do |io|
-					# Skip header lines
-					io.each_line do |line|
-						# Skip header and empty lines
-						next if line.start_with?("Current") || line.start_with?("Listen") || line.strip.empty?
-						
-						# Format: "queue_length/incomplete_queue_length/maximum_queue_length    Local Address"
-						fields = line.split(/\s+/)
-						next if fields.size < 2
-						
-						queue_statistics = fields[0]
-						local_address_raw = fields[1]
-						
-						# Parse queue statistics: "queue_length/incomplete_queue_length/maximum_queue_length"
-						if queue_statistics =~ /^(\d+)\/(\d+)\/(\d+)$/
-							queue_length = $1.to_i
-							# incomplete_queue_length = $2.to_i  # incomplete connections (SYN_RECV)
-							# maximum_queue_length = $3.to_i  # maximum queue size
-							
-							addrinfo = parse_address(local_address_raw)
-							next unless addrinfo
-							
-							key = tcp_listener_key(addrinfo)
-							# Apply filter if specified
-							next if address_filter && !address_filter.include?(key.downcase)
-							
-							listeners[key] ||= Listener.new(addrinfo, 0, 0, 0, 0, 0)
-							listeners[key].queued_count = queue_length
-							
-							# active_count and close_wait_count set to 0 (netstat -L doesn't expose connection states)
-							listeners[key].active_count = 0
-							listeners[key].close_wait_count = 0
-						end
-					end
+					parse_netstat_output(io, listeners, address_filter)
 				end
 				
 				return listeners.values

data/lib/io/metrics/version.rb

@@ -7,6 +7,6 @@
 class IO
 	# @namespace
 	module Metrics
-		VERSION = "0.4.0"
+		VERSION = "0.4.1"
 	end
 end

data/readme.md

@@ -14,6 +14,10 @@ Please see the [project documentation](https://socketry.github.io/io-metrics/) f
 
 Please see the [project releases](https://socketry.github.io/io-metrics/releases/index) for all releases.
 
+### v0.4.1
+
+  - Fix parsing of IPv6 addresses on Darwin.
+
 ### v0.4.0
 
   - Introduce `Listener#fin_wait_count`: connections in `FIN_WAIT1` or `FIN_WAIT2` state — server has sent FIN (initiated close) and is waiting for the peer to finish closing. Symmetric counterpart to `close_wait_count`.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.4.1
+
+  - Fix parsing of IPv6 addresses on Darwin.
+
 ## v0.4.0
 
   - Introduce `Listener#fin_wait_count`: connections in `FIN_WAIT1` or `FIN_WAIT2` state — server has sent FIN (initiated close) and is waiting for the peer to finish closing. Symmetric counterpart to `close_wait_count`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-metrics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Samuel Williams