mnet 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2024e36584d9a17b0671a60776e00d4cee60c0fae82fc940f293566a07f471c7
-  data.tar.gz: 06d1487cb7206d21b62311c89f7e2419785346ebceb86995e79c185f698640e7
+  metadata.gz: 28c7a4caaa839184e561f720b57548ce98528405577180cd36419aaaad7f573d
+  data.tar.gz: 88a321feeed9a003e4dac10dceefa786d179d064b54c048235aaf0433ae95dd8
 SHA512:
-  metadata.gz: 31c53f20db9e19f677e85452477000197e1f615bbf615a95d14faac1d84e9aa3045821eaa67302ebf6cf68f0ca3ed2e02f0af96b5e732affb84babe396296289
-  data.tar.gz: f06da08c602b9f4bba472e2778cdba7fd1d4e163c0c09d4aa244f04d6d22ba3cacc29b11939e95d986b199991b2b33af98a6e4f17bd0b5a0cd85705dc73cb3db
+  metadata.gz: 1de03ebb7e9318e8e4b8867246c38ab80fa1570ce15465cfa0e649075db61dbf2e956e632b86c8693c1f5512570877e061e03e77bbc978427c3af6da13c22e90
+  data.tar.gz: a5c553a57c24bf513111b10656eef1bc2e48faa9fb79a8aae8ced04ab3c372a2718c7573e200d6feeb901cb83db8daf7f846d05e563d37f197c5214081bd739c

data/lib/mnet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mnet
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/mnet.rb

@@ -43,6 +43,9 @@ module Mnet
   # delayed packets (mosh: MAX_OLD_SOCKET_AGE = 60000ms).
   MAX_OLD_SOCKET_AGE = 60.0
 
+  # 非阻塞发送标志：POSIX 有 MSG_DONTWAIT，Windows 没有（用 nonblock 模式兜底）。
+  MSG_DONTWAIT = Socket.const_defined?(:MSG_DONTWAIT) ? Socket::MSG_DONTWAIT : 0
+
   # Message types (mirrors the enum-message-types pattern from tmux-protocol.h).
   TYPE_SYN    = 0x01
   TYPE_SYNACK = 0x02
@@ -110,7 +113,7 @@ module Mnet
   # socketpair is unavailable (Windows).
   def socket_pair
     Socket.pair(:UNIX, :STREAM, 0)
-  rescue Errno::EAFNOSUPPORT, Errno::EOPNOTSUPP, Errno::EPROTONOSUPPORT, Errno::ENOTSUP, NotImplementedError
+  rescue SystemCallError, NotImplementedError
     server = TCPServer.new("127.0.0.1", 0)
     port   = server.addr[1]
     client = TCPSocket.new("127.0.0.1", port)
@@ -971,11 +974,9 @@ module Mnet
     def send_raw(data, ip, port)
       sock = @socks.last[0]
       @send_mutex.synchronize do
-        sock.send(data, Socket::MSG_DONTWAIT, ip, port)
+        sock.send(data, Mnet::MSG_DONTWAIT, ip, port)
         true
-      rescue IO::EAGAINWaitWritable, Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ENOBUFS
-        false
-      rescue IOError, Errno::EBADF, Errno::ECONNRESET, Errno::ECONNREFUSED
+      rescue IO::WaitWritable, IO::WaitReadable, SystemCallError, IOError
         false
       end
     end
@@ -999,6 +1000,9 @@ module Mnet
 
     def configure_socket(sock)
       sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+      # Windows 没有 MSG_DONTWAIT，用 nonblock 模式让 send 在缓冲满时返回错误
+      # 而非阻塞（避免发送端死锁）。
+      sock.nonblock = true if Mnet::MSG_DONTWAIT == 0
       # Request buffers sized for the receive window. Linux clamps these to
       # net.core.rmem_max/wmem_max, so read back the real value and cap the
       # flow-control window to what the kernel can actually buffer -- otherwise
@@ -1038,7 +1042,7 @@ module Mnet
         break if socks.empty?
         begin
           ready = IO.select(socks, nil, nil, 0.5)
-        rescue IOError, Errno::EBADF
+        rescue IOError, SystemCallError
           break
         end
         next unless ready
@@ -1055,9 +1059,7 @@ module Mnet
       cap.times do
         data, addr = sock.recvfrom_nonblock(65_535)
         dispatch(data, addr)
-      rescue IO::WaitReadable, Errno::EAGAIN, Errno::EWOULDBLOCK
-        break
-      rescue IOError, Errno::EBADF, Errno::ECONNRESET
+      rescue IO::WaitReadable, SystemCallError, IOError
         break
       rescue => e
         warn "mnet: #{e.class}: #{e.message}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mnet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mnet developers