make conhost.rb console startup waiting method the same way as terminal.rb

Author: YO4

lib/yamatanooroti/windows/conhost.rb

@@ -15,10 +15,11 @@ def initialize(height, width, wait, timeout, name)
 
     @console_process_id = DL.create_console(CONSOLE_KEEPING_COMMAND.sub("NAME", name), show_console_param())
 
+    sleep 0.1 if Yamatanooroti.options.windows == :"legacy-conhost" # ad-hoc
+
     # wait for console startup complete
-    8.times do |n|
-      break if attach_terminal(open: false, exception: false) { true }
-      sleep 0.01 * 2**n
+    with_timeout("Console process startup timed out.") do
+      attach_terminal(open: false, exception: false) { true }
     end
 
     attach_terminal do |conin, conout|

lib/yamatanooroti/windows/terminal.rb

@@ -51,16 +51,6 @@ def pid_from_windowtitle(name)
     do_tasklist("WINDOWTITLE eq #{name}")
   end
 
-  private def with_timeout(timeout_message, timeout = @timeout, &block)
-    wait_until = Time.now + timeout
-    loop do
-      result = block.call
-      break result if result
-      raise timeout_message if wait_until < Time.now
-      sleep @wait
-    end
-  end
-
   private def invoke_wt_process(command, marker, keeper_name)
     DL.create_console(command, show_console_param())
     # default timeout seems to be too short

lib/yamatanooroti/windows/windows.rb

@@ -212,6 +212,16 @@ module Yamatanooroti::WindowsTermMixin
     map.fetch(Yamatanooroti.options.show_console ? :show : :hide)
   end
 
+  private def with_timeout(timeout_message, timeout = @timeout, &block)
+    wait_until = Time.now + timeout
+    loop do
+      result = block.call
+      break result if result
+      raise timeout_message if wait_until < Time.now
+      sleep @wait
+    end
+  end
+
   private def attach_terminal(open: true, exception: true)
     stderr = $stderr
     $stderr = StringIO.new