multiSSH3 5.95__py3-none-any.whl → 5.97__py3-none-any.whl

multiSSH3.py

@@ -84,7 +84,7 @@ except Exception:
 	print('Warning: functools.lru_cache is not available, multiSSH3 will run slower without cache.',file=sys.stderr)
 	def cache_decorator(func):
 		return func
-version = '5.95'
+version = '5.97'
 VERSION = version
 __version__ = version
 COMMIT_DATE = '2025-10-21'
@@ -420,6 +420,11 @@ __thread_start_delay = 0
 _encoding = DEFAULT_ENCODING
 __returnZero = DEFAULT_RETURN_ZERO
 __running_threads = set()
+__control_master_string = '''Host *
+  ControlMaster auto
+  ControlPath /run/user/%i/ssh_sockets_%C
+  ControlPersist 3600
+'''
 if __resource_lib_available:
 	# Get the current limits
 	_, __system_nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
@@ -1388,14 +1393,14 @@ def compact_hostnames(Hostnames,verify = True):
 	# 	hostSet = frozenset(Hostnames)
 	# else:
 	# 	hostSet = Hostnames
-	hostSet = frozenset(
+	hostSet = frozenset(expand_hostnames(
 		hostname.strip()
 		for hostnames_str in Hostnames
 		for hostname in hostnames_str.split(',')
-	)
+	))
 	compact_hosts = __compact_hostnames(hostSet)
 	if verify:
-		if set(expand_hostnames(compact_hosts)) != set(expand_hostnames(hostSet)):
+		if frozenset(expand_hostnames(compact_hosts)) != hostSet:
 			if not __global_suppress_printout:
 				eprint(f"Error compacting hostnames: {hostSet} -> {compact_hosts}")
 			compact_hosts = hostSet
@@ -2892,12 +2897,13 @@ def mergeOutput(merging_hostnames,outputs_by_hostname,output,diff_display_thresh
 def mergeOutputs(outputs_by_hostname, merge_groups, remaining_hostnames, diff_display_threshold, line_length):
 	output = []
 	output.append(('┌'+'─'*(line_length-2) + '┐'))
+	hostnameWrapper = textwrap.TextWrapper(width=line_length - 1, tabsize=4, replace_whitespace=False, drop_whitespace=False, break_on_hyphens=False,initial_indent='├─ ', subsequent_indent='│- ')
+	hostnameWrapper.wordsep_simple_re = re.compile(r'([,]+)')
 	for merging_hostnames in merge_groups:
 		mergeOutput(merging_hostnames, outputs_by_hostname, output, diff_display_threshold,line_length)
 		output.append('\033[0m├'+'─'*(line_length-2) + '┤')
 	for hostname in remaining_hostnames:
-		hostnameLines = textwrap.wrap(hostname, width=line_length-1, tabsize=4, replace_whitespace=False, drop_whitespace=False, 
-									initial_indent='├─ ', subsequent_indent='│- ')
+		hostnameLines = hostnameWrapper.wrap(','.join(compact_hostnames([hostname])))
 		output.extend(line.ljust(line_length - 1) + '│' for line in hostnameLines)
 		output.extend(line.ljust(line_length - 1) + '│' for line in outputs_by_hostname[hostname])
 		output.append('\033[0m├'+'─'*(line_length-2) + '┤')
@@ -2917,7 +2923,7 @@ def pre_merge_hosts(hosts):
 	# Create merged hosts
 	merged_hosts = []
 	for group in output_groups.values():
-		group[0].name = ','.join(host.name for host in group)
+		group[0].name = ','.join(compact_hostnames(host.name for host in group))
 		merged_hosts.append(group[0])
 	return merged_hosts
 
@@ -2930,6 +2936,7 @@ def get_host_raw_output(hosts, terminal_width):
 	max_length = 20
 	hosts = pre_merge_hosts(hosts)
 	for host in hosts:
+		max_length = max(max_length, len(max(host.name.split(','), key=len)) + 3)
 		hostPrintOut = ["│█ EXECUTED COMMAND:"]
 		for line in host.command.splitlines():
 			hostPrintOut.extend(text_wrapper.wrap(line))
@@ -2948,7 +2955,7 @@ def get_host_raw_output(hosts, terminal_width):
 			lineBag.add((prevLine,1))
 			lineBag.add((1,host.stdout[0]))
 			if len(host.stdout) > 1:
-				lineBag.update(itertools.pairwise(host.stdout))
+				lineBag.update(zip(host.stdout, host.stdout[1:]))
 			lineBag.update(host.stdout)
 			prevLine = host.stdout[-1]
 		if host.stderr:
@@ -2970,7 +2977,7 @@ def get_host_raw_output(hosts, terminal_width):
 				lineBag.add((2,host.stderr[0]))
 				lineBag.update(host.stderr)
 				if len(host.stderr) > 1:
-					lineBag.update(itertools.pairwise(host.stderr))
+					lineBag.update(zip(host.stderr, host.stderr[1:]))
 				prevLine = host.stderr[-1]
 		hostPrintOut.append(f"│░ RETURN CODE: {host.returncode}")
 		lineBag.add((prevLine,f"{host.returncode}"))
@@ -3757,7 +3764,7 @@ def get_parser():
 	parser.add_argument('-ea','--extraargs',type=str,help=f'Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.Use "=" ! Ex. -ea="--delete" (default: {DEFAULT_EXTRA_ARGS})',default=DEFAULT_EXTRA_ARGS)
 	parser.add_argument("-11",'--oneonone', action='store_true', help=f"Run one corresponding command on each host. (default: {DEFAULT_ONE_ON_ONE})", default=DEFAULT_ONE_ON_ONE)
 	parser.add_argument("-f","--file", action='append', help="The file to be copied to the hosts. Use -f multiple times to copy multiple files")
-	parser.add_argument('-s','-fs','--file_sync', action='store_true', help=f'Operate in file sync mode, sync path in <COMMANDS> from this machine to <HOSTS>. Treat --file <FILE> and <COMMANDS> both as source and source and destination will be the same in this mode. Infer destination from source path. (default: {DEFAULT_FILE_SYNC})', default=DEFAULT_FILE_SYNC)
+	parser.add_argument('-s','-fs','--file_sync',nargs='?', action='append', help=f'Operate in file sync mode, sync path in <COMMANDS> from this machine to <HOSTS>. Treat --file <FILE> and <COMMANDS> both as source and source and destination will be the same in this mode. Infer destination from source path. (default: {DEFAULT_FILE_SYNC})',const=True, default=[DEFAULT_FILE_SYNC])
 	parser.add_argument('-W','--scp', action='store_true', help=f'Use scp for copying files instead of rsync. Need to use this on windows. (default: {DEFAULT_SCP})', default=DEFAULT_SCP)
 	parser.add_argument('-G','-gm','--gather_mode', action='store_true', help='Gather files from the hosts instead of sending files to the hosts. Will send remote files specified in <FILE> to local path specified in <COMMANDS>  (default: False)', default=False)
 	#parser.add_argument("-d",'-c',"--destination", type=str, help="The destination of the files. Same as specify with commands. Added for compatibility. Use #HOST# or #HOSTNAME# to replace the host name in the destination")
@@ -3799,6 +3806,7 @@ def get_parser():
 	parser.add_argument('-e','--encoding', type=str, help=f'The encoding to use for the output. (default: {DEFAULT_ENCODING})', default=DEFAULT_ENCODING)
 	parser.add_argument('-dt','--diff_display_threshold', type=float, help=f'The threshold of lines to display the diff when files differ. {{0-1}} Set to 0 to always display the diff. Set to 1 to disable diff. (Only merge same) (default: {DEFAULT_DIFF_DISPLAY_THRESHOLD})', default=DEFAULT_DIFF_DISPLAY_THRESHOLD)
 	parser.add_argument('--force_truecolor', action='store_true', help=f'Force truecolor output even when not in a truecolor terminal. (default: {FORCE_TRUECOLOR})', default=FORCE_TRUECOLOR)
+	parser.add_argument('--add_control_master_config', action='store_true', help='Add ControlMaster configuration to ~/.ssh/config to speed up multiple connections to the same host.')
 	parser.add_argument("-V","--version", action='version', version=f'%(prog)s {version} @ {COMMIT_DATE} with [ {", ".join(_binPaths.keys())} ] by {AUTHOR} ({AUTHOR_EMAIL})')
 	return parser
 
@@ -3828,7 +3836,18 @@ def process_args(args = None):
 		args.no_history = True
 		args.greppable = True
 		args.error_only = True
-
+	
+	if args.file_sync:
+		for path in args.file_sync:
+			if path and isinstance(path, str):
+				if args.file:
+					if path not in args.file:
+						args.file.append(path)
+				else:
+					args.file = [path]
+		args.file_sync = any(args.file_sync)
+	else:
+		args.file_sync = False
 	if args.unavailable_host_expiry <= 0:
 		eprint(f"Warning: The unavailable host expiry time {args.unavailable_host_expiry} is less than 0, setting it to 10 seconds.")
 		args.unavailable_host_expiry = 10
@@ -3847,7 +3866,7 @@ def process_config_file(args):
 		else:
 			configFileToWriteTo = args.config_file
 		write_default_config(args,configFileToWriteTo)
-		if not args.commands:
+		if not args.commands and not args.file:
 			if configFileToWriteTo:
 				with open(configFileToWriteTo,'r') as f:
 					eprint(f"Config file content: \n{f.read()}")
@@ -3889,6 +3908,35 @@ def process_keys(args):
 				eprint(f"Warning: Identity file {args.key!r} not found. Passing to ssh anyway. Proceed with caution.")
 	return args
 
+def process_control_master_config(args):
+	global __control_master_string
+	if args.add_control_master_config:
+		try:
+			if not os.path.exists(os.path.expanduser('~/.ssh')):
+				os.makedirs(os.path.expanduser('~/.ssh'),mode=0o700)
+			ssh_config_file = os.path.expanduser('~/.ssh/config')
+			if not os.path.exists(ssh_config_file):
+				with open(ssh_config_file,'w') as f:
+					f.write(__control_master_string)
+				os.chmod(ssh_config_file,0o644)
+			else:
+				with open(ssh_config_file,'r') as f:
+					ssh_config_content = f.readlines()
+				if set(map(str.strip,ssh_config_content)).issuperset(set(map(str.strip,__control_master_string.splitlines()))):
+					eprint("ControlMaster configuration already exists in ~/.ssh/config, skipping adding:")
+					eprint(__control_master_string)
+				else:
+					with open(ssh_config_file,'a') as f:
+						f.write('\n# Added by multiSSH3.py to speed up subsequent connections\n')
+						f.write(__control_master_string)
+					eprint("ControlMaster configuration added to ~/.ssh/config.")
+		except Exception as e:
+			eprint(f"Error adding ControlMaster configuration: {e}")
+			import traceback
+			traceback.print_exc()
+		if not args.commands and not args.file:
+			_exit_with_code(0, "Done configuring ControlMaster.")
+	return args
 
 def set_global_with_args(args):
 	global _emo
@@ -3925,6 +3973,7 @@ def main():
 	args = process_config_file(args)
 	args = process_commands(args)
 	args = process_keys(args)
+	args = process_control_master_config(args)
 	set_global_with_args(args)
 	
 	if args.use_script_timeout:

{multissh3-5.95.dist-info → multissh3-5.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 5.95
+Version: 5.97
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

multissh3-5.97.dist-info/RECORD

@@ -0,0 +1,6 @@
+multiSSH3.py,sha256=AXZqfsQ3c0O0qIGUedwGChpLnkxPX_pDtDEtBj_L7Rk,181554
+multissh3-5.97.dist-info/METADATA,sha256=26GBKHydWcT4nR5HO3St3ubhaH6zp2-_ajR6RvOX6rI,18093
+multissh3-5.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+multissh3-5.97.dist-info/entry_points.txt,sha256=xi2rWWNfmHx6gS8Mmx0rZL2KZz6XWBYP3DWBpWAnnZ0,143
+multissh3-5.97.dist-info/top_level.txt,sha256=tUwttxlnpLkZorSsroIprNo41lYSxjd2ASuL8-EJIJw,10
+multissh3-5.97.dist-info/RECORD,,

multissh3-5.95.dist-info/RECORD

@@ -1,6 +0,0 @@
-multiSSH3.py,sha256=PWEXxU31f8mCRPzHqrWyG7DJcKXn99jmyTCT5mfuZoQ,179383
-multissh3-5.95.dist-info/METADATA,sha256=GfNp-SWNCY8KyBjmuiK7JWbJWURo0oZ5ltBRAYlC4dw,18093
-multissh3-5.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-multissh3-5.95.dist-info/entry_points.txt,sha256=xi2rWWNfmHx6gS8Mmx0rZL2KZz6XWBYP3DWBpWAnnZ0,143
-multissh3-5.95.dist-info/top_level.txt,sha256=tUwttxlnpLkZorSsroIprNo41lYSxjd2ASuL8-EJIJw,10
-multissh3-5.95.dist-info/RECORD,,