expect-pty 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472fea69b87e58d9b08004f799da6d584508c87832227da3385301953a20070f
-  data.tar.gz: fc6720abad1ee0daff9943e9c0f19dc144e949bb543a67b590a32500a1088688
+  metadata.gz: 1052a03b9bb9ac46051468e651c168d714f6be11aabd4bd8e2171dd390e2065a
+  data.tar.gz: 7c178220cc65517015144b2711679a3a26739efe1156dd144a26cb64fdfd6b46
 SHA512:
-  metadata.gz: 8074ccf919b4f5a8d73d55a6acf8c40c3069a253cc5cd4e4acacec17f5277b157a62235987430519c2204d783b736d134b92963d29994aea56d639ceab1d3dd3
-  data.tar.gz: 9b8879d3c0291ceeedb77624d352c8fa2f13a04412f777d45b6d4b0ed2dea3e32cb56cef041c65e297bc4687515a8772e29d42ca8a45993ae1ba21d7a7289b21
+  metadata.gz: 31b82ff772bc59ec35a4e3318be96b2b9c4b240898395c1bd8c543ed67515461d9ba282da415a1e208fbd9fb8f03390445cec132725873a039b3d75181fc552d
+  data.tar.gz: 1a7d7adfd64345c4e0d405657edd252e841430f65c335dc638708f43cdf20c4c12b4b8da28fe70b235801f8af50905595a6f982035a5ff73e9baafd02c8453d3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.7.6 - 2026-10-09
+
+- 修复会话关闭时日志异常覆盖原始错误的问题，保留进程等待、线程中断或句柄关闭的失败原因，并继续尝试完成诊断与 transcript 收尾。
+- 优化长秘密的流尾脱敏和长字面转义扫描，减少近似前缀输入下的耗时与临时对象，保持分片、重叠和部分秘密的过滤行为。
+
 ## 0.7.5 - 2026-10-08
 
 - 修复 PTY、启动错误管道和工厂初始化的异步中断交接窗口；线程中断或终止后立即关闭已取得的句柄，保持用户初始化协议可中断。

data/lib/expect/interaction.rb

@@ -2,6 +2,7 @@
 
 require_relative "relay_writer"
 require_relative "relay"
+require_relative "literal_prefix"
 
 # 为会话补充人工接管和多路 IO 转接；核心会话定义位于 session.rb。
 module Expect
@@ -179,59 +180,12 @@ module Expect
       sequences.each_key do |key|
         next if key.is_a?(Regexp)
 
-        prefix_length = literal_prefix_suffix(buffer, key, prefix_tables)
+        prefix_length = LiteralPrefix.length(buffer, key, prefix_tables)
         held = prefix_length if prefix_length > held
       end
       held
     end
 
-    # KMP 在缓冲尾部寻找规则前缀，长规则只扫描相关字节一次，避免逐短前缀反复复制和比较。
-    # 短规则使用原生字符串操作，避免为小输入建立前缀表。
-    def self.literal_prefix_suffix(buffer, key, prefix_tables = {})
-      maximum = [key.bytesize - 1, buffer.bytesize].min
-      return 0 unless maximum.positive?
-      return short_literal_prefix_suffix(buffer, key, maximum) if maximum < 64
-
-      failure = key.frozen? ? (prefix_tables[key] ||= []) : []
-      literal_prefix_failure_table(key, failure, maximum)
-      matched = 0
-      index = buffer.bytesize - maximum
-      while index < buffer.bytesize
-        byte = buffer.getbyte(index)
-        matched = failure[matched - 1] while matched.positive? && byte != key.getbyte(matched)
-        matched += 1 if byte == key.getbyte(matched)
-        index += 1
-      end
-      matched
-    end
-
-    def self.literal_prefix_failure_table(key, failure, length)
-      failure << 0 if failure.empty?
-      matched = failure.last
-      index = failure.length
-      while index < length
-        byte = key.getbyte(index)
-        if byte == key.getbyte(matched)
-          matched += 1
-          failure << matched
-          index += 1
-        elsif matched.positive?
-          matched = failure[matched - 1]
-        else
-          failure << 0
-          index += 1
-        end
-      end
-      failure
-    end
-
-    def self.short_literal_prefix_suffix(buffer, key, maximum)
-      maximum.downto(1) do |length|
-        return length if buffer.end_with?(key.byteslice(0, length))
-      end
-      0
-    end
-
     # 已转发历史有界保留，固定 UTF-8 正则不能从续字节开始匹配。
     def self.trim_history(history, data, limit:, utf8:)
       history << data
@@ -243,9 +197,7 @@ module Expect
       history.slice!(0) while (byte = history.getbyte(0)) && (0x80..0xBF).cover?(byte)
     end
 
-    private_class_method :expired?, :handle_escape, :scan_sequences, :hold_literal_prefix,
-                         :literal_prefix_suffix, :literal_prefix_failure_table,
-                         :short_literal_prefix_suffix, :trim_history
+    private_class_method :expired?, :handle_escape, :scan_sequences, :hold_literal_prefix, :trim_history
 
     # 为当前数据块冻结目标选择并各建一个发送游标；此后修改 outputs 只影响后续数据。
     # 调用方须先排空旧游标；显示转换也只做一次，短写重试时不能重复转换 CRLF。

data/lib/expect/literal_prefix.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Expect
+  # 计算字节窗口尾部与规则真前缀重合的最长长度；转义暂存和流尾脱敏使用同一边界判断。
+  # 不持有输入或修改缓冲，调用方可为冻结规则提供前缀表缓存；短规则不建立表。
+  # @api private
+  module LiteralPrefix
+    def self.length(buffer, pattern, prefix_tables = nil)
+      maximum = [pattern.bytesize - 1, buffer.bytesize].min
+      return 0 unless maximum.positive?
+
+      # 尾字节不在候选前缀内时无需扫描；最长候选本身命中时也不必构造 KMP 表。
+      ending = pattern.rindex(buffer.byteslice(-1, 1), maximum - 1)
+      return 0 unless ending
+
+      maximum = ending + 1
+      return maximum if buffer.end_with?(pattern.byteslice(0, maximum))
+      return short_length(buffer, pattern, maximum - 1) if maximum < 64
+
+      failure = prefix_tables && pattern.frozen? ? (prefix_tables[pattern] ||= []) : []
+      extend_failure_table(pattern, failure, maximum)
+      matched = 0
+      index = buffer.bytesize - maximum
+      while index < buffer.bytesize
+        byte = buffer.getbyte(index)
+        matched = failure[matched - 1] while matched.positive? && byte != pattern.getbyte(matched)
+        matched += 1 if byte == pattern.getbyte(matched)
+        index += 1
+      end
+      matched
+    end
+
+    def self.extend_failure_table(pattern, failure, length)
+      failure << 0 if failure.empty?
+      matched = failure.last
+      index = failure.length
+      while index < length
+        byte = pattern.getbyte(index)
+        if byte == pattern.getbyte(matched)
+          matched += 1
+          failure << matched
+          index += 1
+        elsif matched.positive?
+          matched = failure[matched - 1]
+        else
+          failure << 0
+          index += 1
+        end
+      end
+    end
+
+    def self.short_length(buffer, pattern, maximum)
+      maximum.downto(1) do |length|
+        return length if buffer.end_with?(pattern.byteslice(0, length))
+      end
+      0
+    end
+
+    private_class_method :extend_failure_table, :short_length
+  end
+
+  private_constant :LiteralPrefix
+end

data/lib/expect/logging.rb

@@ -87,6 +87,12 @@ module Expect
 
     private
 
+    # 关闭时两种记录都要尝试完成；后续 writer 的常规异常不能覆盖先发生的诊断异常。
+    # 不关闭借用目标，新的 Interrupt/SystemExit 仍由 Cleanup 原样传播。
+    def finish_logging
+      Cleanup.always(-> { self.transcript = nil }) { flush_diagnostics }
+    end
+
     # 向目标写入并在支持时立即 flush，使日志和终端输出及时可见。
     # 这里遵循同步写入协议，不受 Matcher 的 IO 等待期限中断；慢目标转接应使用 Relay。
     # 短写只推进已确认的字节数；目标抛错时不猜测它是否已经产生副作用。

data/lib/expect/redactor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "literal_prefix"
+
 module Expect
   # 单个日志字节流的过滤器。保留最长秘密长度减一的尾部，跨 write/read 分片仍可识别。
   # 掩码与原字节一起留存；重叠命中的区间取并集，已经输出的掩码不重复生成。
@@ -78,20 +80,13 @@ module Expect
 
     # 流关闭时无法再等待后续字节，默认隐藏与秘密开头一致的未完成尾部。
     def mark_partial_secrets
-      tail = @pending.byteslice(-1, 1)
-      return unless tail
+      return if @pending.empty?
 
       @patterns.each do |pattern|
-        length = [pattern.bytesize - 1, @pending.bytesize].min
-        # 前缀必须以当前尾字节结束；只收紧最高候选长度，密集候选仍沿用简单倒序扫描。
-        next unless length.positive? && (offset = pattern.rindex(tail, length - 1))
-
-        (offset + 1).downto(1) do |candidate|
-          next unless @pending.end_with?(pattern.byteslice(0, candidate))
+        length = LiteralPrefix.length(@pending, pattern)
+        next unless length.positive?
 
-          @hidden[-candidate, candidate] = "\1" * candidate
-          break
-        end
+        @hidden[-length, length] = "\1" * length
       end
     end
 

data/lib/expect/session.rb

@@ -503,30 +503,26 @@ module Expect
         failure ||= error
         nil
       end
-      # IO 关闭与进程退出独立记录：软关闭可能已经 closed?，但仍保留活跃 PID。
-      cleanup.call { @resources.close_handles }
-      @closed = true
-      @interact_inputs&.delete_if do |_io, input|
-        cleanup.call do
-          input.close(graceful: false)
-          true
+      # 日志收尾是本作用域的清理：不能覆盖进程等待/中断或已记录的句柄错误。
+      Cleanup.always(-> { finish_logging }) do
+        # IO 关闭与进程退出独立记录：软关闭可能已经 closed?，但仍保留活跃 PID。
+        cleanup.call { @resources.close_handles }
+        @closed = true
+        @interact_inputs&.delete_if do |_io, input|
+          cleanup.call do
+            input.close(graceful: false)
+            true
+          end
         end
+        @interact_output = nil
+        @pending_writes&.clear
+        @relay_history&.clear
+        @relay_callback = nil
+        status = close_child(timeout:, term_timeout:, force:)
+        raise failure if failure
+
+        status
       end
-      @interact_output = nil
-      @pending_writes&.clear
-      @relay_history&.clear
-      @relay_callback = nil
-      status = close_child(timeout:, term_timeout:, force:)
-      completed = true
-      status
-    ensure
-      begin
-        cleanup.call { flush_diagnostics }
-      ensure
-        cleanup.call { self.transcript = nil }
-      end
-      # 用本次流程的完成状态判断异常传播，不能误把调用者 rescue 中的异常当成当前错误。
-      raise failure if failure && completed
     end
 
     # 句柄清理失败不改变进程策略；未回收 PID 保留给重复关闭或终结器继续处理。

data/lib/expect/version.rb

@@ -2,5 +2,5 @@
 
 module Expect
   # Gem 与库共用的版本号；独立文件使 gemspec 无需加载完整会话实现。
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: expect-pty
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - expect-pty contributors
 bindir: bin
 cert_chain: []
-date: 2026-10-08 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -67,6 +67,7 @@ files:
 - lib/expect.rb
 - lib/expect/cleanup.rb
 - lib/expect/interaction.rb
+- lib/expect/literal_prefix.rb
 - lib/expect/logging.rb
 - lib/expect/matcher.rb
 - lib/expect/pattern.rb