multiSSH3 5.48__tar.gz → 5.51__tar.gz

{multissh3-5.48 → multissh3-5.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.48
+Version: 5.51
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -9,6 +9,8 @@ License: GPLv3+
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: argparse

{multissh3-5.48 → multissh3-5.51}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.48
+Version: 5.51
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -9,6 +9,8 @@ License: GPLv3+
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: argparse

{multissh3-5.48 → multissh3-5.51}/multiSSH3.py

@@ -1,4 +1,11 @@
 #!/usr/bin/env python3
+# /// script
+# requires-python = ">=3.6"
+# dependencies = [
+#     "argparse",
+#     "ipaddress",
+# ]
+# ///
 __curses_available = False
 __resource_lib_available = False
 try:
@@ -47,8 +54,9 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.48'
+version = '5.51'
 VERSION = version
+__version__ = version
 COMMIT_DATE = '2025-01-30'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
@@ -1358,7 +1366,7 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 			# Monitor the subprocess and terminate it after the timeout
 			host.lastUpdateTime = time.time()
 			timeoutLineAppended = False
-			sleep_interval = 1.0e-8 # 10 nanoseconds 
+			sleep_interval = 1.0e-7 # 100 nanoseconds 
 			while proc.poll() is None:  # while the process is still running
 				if timeout > 0:
 					if time.time() - host.lastUpdateTime > timeout:
@@ -2175,18 +2183,7 @@ def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_C
 		#time.sleep(0.25)
 
 # ------------ Generate Output Block ----------------
-def print_output(hosts,usejson = False,quiet = False,greppable = False):
-	'''
-	Print / generate the output of the hosts to the terminal
-
-	Args:
-		hosts (list): A list of Host objects
-		usejson (bool, optional): Whether to print the output in JSON format. Defaults to False.
-		quiet (bool, optional): Whether to print the output. Defaults to False.
-
-	Returns:
-		str: The pretty output generated 
-	'''
+def generate_output(hosts, usejson = False, greppable = False):
 	global __keyPressesIn
 	global __global_suppress_printout
 	hosts = [dict(host) for host in hosts]
@@ -2251,6 +2248,21 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 			__keyPressesIn = [[]]
 		if __global_suppress_printout and not outputs:
 			rtnStr += 'Success'
+		return rtnStr
+
+def print_output(hosts,usejson = False,quiet = False,greppable = False):
+	'''
+	Print / generate the output of the hosts to the terminal
+
+	Args:
+		hosts (list): A list of Host objects
+		usejson (bool, optional): Whether to print the output in JSON format. Defaults to False.
+		quiet (bool, optional): Whether to print the output. Defaults to False.
+
+	Returns:
+		str: The pretty output generated 
+	'''
+	rtnStr = generate_output(hosts,usejson,greppable)
 	if not quiet:
 		print(rtnStr)
 	return rtnStr
@@ -2259,13 +2271,27 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 def processRunOnHosts(timeout, password, max_connections, hosts, returnUnfinished, nowatch, json, called, greppable,unavailableHosts,willUpdateUnreachableHosts,curses_min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, curses_min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,single_window = DEFAULT_SINGLE_WINDOW):
 	global __globalUnavailableHosts
 	global _no_env
+	sleep_interval =  1.0e-7 # 0.1 microseconds
 	threads = start_run_on_hosts(hosts, timeout=timeout,password=password,max_connections=max_connections)
-	if __curses_available and not nowatch and threads and not returnUnfinished and any([thread.is_alive() for thread in threads]) and sys.stdout.isatty() and os.get_terminal_size() and os.get_terminal_size().columns > 10:
-		curses.wrapper(curses_print, hosts, threads, min_char_len = curses_min_char_len, min_line_len = curses_min_line_len, single_window = single_window)
+	if __curses_available and not nowatch and threads and not returnUnfinished  and sys.stdout.isatty() and os.get_terminal_size() and os.get_terminal_size().columns > 10:
+		total_sleeped = 0
+		while any([host.returncode is None for host in hosts]):
+			time.sleep(sleep_interval)  # avoid busy-waiting
+			total_sleeped += sleep_interval
+			if sleep_interval < 0.001:
+				sleep_interval *= 2
+			elif sleep_interval < 0.01:
+				sleep_interval *= 1.1
+			if total_sleeped > 0.1:
+				break
+		if any([host.returncode is None for host in hosts]):
+			curses.wrapper(curses_print, hosts, threads, min_char_len = curses_min_char_len, min_line_len = curses_min_line_len, single_window = single_window)
 	if not returnUnfinished:
 		# wait until all hosts have a return code
 		while any([host.returncode is None for host in hosts]):
-			time.sleep(0.01)
+			time.sleep(sleep_interval)  # avoid busy-waiting
+			if sleep_interval < 0.01:
+				sleep_interval *= 1.1
 		for thread in threads:
 			thread.join(timeout=3)
 	# update the unavailable hosts and global unavailable hosts
@@ -2448,6 +2474,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 	global __DEBUG_MODE
 	global __thread_start_delay
 	global __max_connections_nofile_limit_supported
+	global __keyPressesIn
 	_emo = False
 	_no_env = no_env
 	if os.path.exists(os.path.join(tempfile.gettempdir(),'__multiSSH3_UNAVAILABLE_HOSTS.csv')):
@@ -2511,6 +2538,8 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 			unavailableHosts = __globalUnavailableHosts
 		else:
 			unavailableHosts = set()
+		# set global input to empty
+		__keyPressesIn = [[]]
 	else:
 		# if run in command line ( or emulating running in command line, we default to skip unreachable hosts within one command call )
 		if skipUnreachable:

{multissh3-5.48 → multissh3-5.51}/setup.py

@@ -28,6 +28,8 @@ setup(
         'Programming Language :: Python :: 3',
         'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Operating System :: POSIX :: Linux',
+        'Operating System :: MacOS',
+        'Operating System :: Microsoft :: Windows',
     ],
     python_requires='>=3.6',
 	license='GPLv3+',