pywebexec 1.4.17__py3-none-any.whl → 1.4.19__py3-none-any.whl

pywebexec/pywebexec.py

@@ -48,7 +48,7 @@ CONFDIR = os.path.expanduser("~/").rstrip('/')
 if os.path.isdir(f"{CONFDIR}/.config"):
     CONFDIR += '/.config'
 CONFDIR += "/.pywebexec"
-
+COMMAND_ID = str(uuid.uuid4())
 
 # In-memory cache for command statuses
 command_status_cache = {}
@@ -291,17 +291,27 @@ def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
             except Exception as e:
                 print(e)
 
-def start_term(command_id):
+def start_term():
     os.environ["PYWEBEXEC"] = " (shared)"
     os.chdir(CWD)
     start_time = datetime.now().isoformat()
     user = pwd.getpwuid(os.getuid())[0]
-    print(f"Starting terminal session for {user} : {command_id}")
-    update_command_status(command_id, 'running', command="term", params=[user,os.ttyname(sys.stdout.fileno())], start_time=start_time, user=user)
-    output_file_path = get_output_file_path(command_id)
+    print(f"Starting terminal session for {user} : {COMMAND_ID}")
+    update_command_status(COMMAND_ID, {
+        'status': 'running',
+        'command': 'term',
+        'params': [user, os.ttyname(sys.stdout.fileno())],
+        'start_time': start_time,
+        'user': user
+    })
+    output_file_path = get_output_file_path(COMMAND_ID)
     res = script(output_file_path)
     end_time = datetime.now().isoformat()
-    update_command_status(command_id, status="success", end_time=end_time, exit_code=res)
+    update_command_status(COMMAND_ID, {
+        'status': 'success',
+        'end_time': end_time,
+        'exit_code': res
+    })
     print("Terminal session ended")
     return res
 
@@ -371,7 +381,7 @@ def parseargs():
         os.mkdir(COMMAND_STATUS_DIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
-        sys.exit(start_term(str(uuid.uuid4())))
+        sys.exit(start_term())
 
     (hostname, ip) = resolve(gethostname()) if args.listen == '0.0.0.0' else resolve(args.listen)
 
@@ -409,25 +419,11 @@ def get_status_file_path(command_id):
 def get_output_file_path(command_id):
     return os.path.join(COMMAND_STATUS_DIR, f'{command_id}_output.txt')
 
-def update_command_status(command_id, status, command=None, params=None, start_time=None, end_time=None, exit_code=None, pid=None, user=None):
+def update_command_status(command_id, updates):
     status_file_path = get_status_file_path(command_id)
     status_data = read_command_status(command_id) or {}
-    status_data['status'] = status
-    if command is not None:
-        status_data['command'] = command
-    if params is not None:
-        status_data['params'] = params
-    if start_time is not None:
-        status_data['start_time'] = start_time
-    if end_time is not None:
-        status_data['end_time'] = end_time
-    if exit_code is not None:
-        status_data['exit_code'] = exit_code
-    if pid is not None:
-        status_data['pid'] = pid
-    if user is not None:
-        status_data['user'] = user
-    if status != 'running':
+    status_data.update(updates)
+    if status_data['status'] != 'running':
         output_file_path = get_output_file_path(command_id)
         if os.path.exists(output_file_path):
             status_data['last_output_line'] = get_last_non_empty_line_of_file(output_file_path)
@@ -435,7 +431,7 @@ def update_command_status(command_id, status, command=None, params=None, start_t
         json.dump(status_data, f)
     
     # Update cache if status is not "running"
-    if status != 'running':
+    if status_data['status'] != 'running':
         command_status_cache[command_id] = status_data
     elif command_id in command_status_cache:
         del command_status_cache[command_id]
@@ -463,8 +459,12 @@ def read_command_status(command_id):
 def sigwinch_passthrough(sig, data):
     s = struct.pack("HHHH", 0, 0, 0, 0)
     a = struct.unpack('hhhh', fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, s))
-    global p
+    global p, COMMAND_ID
     p.setwinsize(a[0], a[1])
+    update_command_status(COMMAND_ID, {
+        'rows': a[0],
+        'cols': a[1],
+    })
 
 
 def script(output_file):
@@ -481,12 +481,22 @@ def script(output_file):
 
 def run_command(command, params, command_id, user):
     start_time = datetime.now().isoformat()
-    update_command_status(command_id, 'running', command=command, params=params, start_time=start_time, user=user)
+    update_command_status(command_id, {
+        'status': 'running',
+        'command': command,
+        'params': params,
+        'start_time': start_time,
+        'user': user
+    })
     output_file_path = get_output_file_path(command_id)
     try:
         with open(output_file_path, 'wb') as fd:
             p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None)
-            update_command_status(command_id, 'running', pid=p.pid, user=user)
+            update_command_status(command_id, {
+                'status': 'running',
+                'pid': p.pid,
+                'user': user
+            })
             p.setwinsize(24, 125)
             p.logfile = fd
             p.expect(pexpect.EOF)
@@ -496,16 +506,36 @@ def run_command(command, params, command_id, user):
             # Update the status based on the result
             if status is None:
                 exit_code = -15
-                update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
+                update_command_status(command_id, {
+                    'status': 'aborted',
+                    'end_time': end_time,
+                    'exit_code': exit_code,
+                    'user': user
+                })
             else:
                 exit_code = status
                 if exit_code == 0:
-                    update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
+                    update_command_status(command_id, {
+                        'status': 'success',
+                        'end_time': end_time,
+                        'exit_code': exit_code,
+                        'user': user
+                    })
                 else:
-                    update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
+                    update_command_status(command_id, {
+                        'status': 'failed',
+                        'end_time': end_time,
+                        'exit_code': exit_code,
+                        'user': user
+                    })
     except Exception as e:
         end_time = datetime.now().isoformat()
-        update_command_status(command_id, 'failed', end_time=end_time, exit_code=1, user=user)
+        update_command_status(command_id, {
+            'status': 'failed',
+            'end_time': end_time,
+            'exit_code': 1,
+            'user': user
+        })
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
 
@@ -618,14 +648,16 @@ def run_command_endpoint():
     except ValueError as e:
         return jsonify({'error': str(e)}), 400
 
-    # Generate a unique command_id
-    command_id = str(uuid.uuid4())
-
     # Get the user from the session
     user = session.get('username', '-')
-
+    command_id = str(uuid.uuid4())
     # Set the initial status to running and save command details
-    update_command_status(command_id, 'running', command, params, user=user)
+    update_command_status(command_id, {
+        'status': 'running',
+        'command': command,
+        'params': params,
+        'user': user
+    })
 
     # Run the command in a separate thread
     thread = threading.Thread(target=run_command, args=(command_path, params, command_id, user))
@@ -698,6 +730,7 @@ def get_command_output(command_id):
         response = {
             'output': output[-maxsize:],
             'status': status_data.get("status"),
+            'cols': status_data.get("cols"),
             'links': {
                 'next': f'{request.url_root}command_output/{command_id}?offset={new_offset}&maxsize={maxsize}{token_param}'
             }
@@ -735,9 +768,8 @@ def main():
         sys.argv.remove("shareterm")
         with open(basef + ".log", "ab+") as log:
             pywebexec = subprocess.Popen([sys.executable] + sys.argv, stdout=log, stderr=log)
-            command_id = str(uuid.uuid4())
-            print_urls(command_id)
-            res = start_term(command_id)
+            print_urls(COMMAND_ID)
+            res = start_term()
             print("Stopping server")
             time.sleep(1)
             pywebexec.terminate()

pywebexec/static/js/popup.js

@@ -55,6 +55,9 @@ async function fetchOutput(url) {
             terminal.write(data.error);
             clearInterval(outputInterval);
         } else {
+            if (data.cols) {
+                terminal.resize(data.cols, terminal.rows);
+            } else fitAddon.fit();
             percentage = slider.value;
             fullOutput += data.output;
             if (fullOutput.length > maxSize)

pywebexec/static/js/script.js

@@ -32,6 +32,10 @@ function initTerminal()
         },
         customGlyphs: false,
         rescaleOverlappingGlyphs: true,
+        // windowsPty: {
+        //     backend: 'conpty',
+        //     buildnumber: 21376,
+        // }
     });
 }
 let terminal = initTerminal()
@@ -137,6 +141,9 @@ async function fetchOutput(url) {
             terminal.write(data.error);
             clearInterval(outputInterval);
         } else {
+            if (data.cols) {
+                terminal.resize(data.cols, terminal.rows);
+            } else fitAddon.fit();
             fullOutput += data.output;
             if (fullOutput.length > maxSize)
                 fullOutput = fullOutput.slice(-maxSize);

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.17'
-__version_tuple__ = version_tuple = (1, 4, 17)
+__version__ = version = '1.4.19'
+__version_tuple__ = version_tuple = (1, 4, 19)

{pywebexec-1.4.17.dist-info → pywebexec-1.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.17
+Version: 1.4.19
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.4.17.dist-info → pywebexec-1.4.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=095dLydKEtrihG4ld78yqy5QIbFIWO_JdugtHj10FzI,28134
-pywebexec/version.py,sha256=SWUyms4VxRCFHq27p43L6ONua9907mV6gcqRfpenKW8,413
+pywebexec/pywebexec.py,sha256=hacpB6OnS_ZN1SBmuReTUkvAuenl6czD6aD_yV8wusY,28462
+pywebexec/version.py,sha256=uoD5RETbNPgiYh3HM3h7SS3IHV8yYSaVY1iOmNCumf8,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=cGJHPFj23SQ_bFpesfUaFA3VFxhXtpRUOL_zzx3x_X8,5726
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -14,8 +14,8 @@ pywebexec/static/images/popup.svg,sha256=0Bl9A_v5cBsMPn6FnOlVWlAQKgd2zqiWQbhjcL9
 pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUNZa7cpw,25696
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
 pywebexec/static/js/commands.js,sha256=8JDb3Q55EJOYf2Q9Uy6qEuqAnn1oGjM0RndgQ4aOjqo,7725
-pywebexec/static/js/popup.js,sha256=i7BPBh6oS0Q6H528DwP6KwJ8CKh7ULwm1rLHSbyvDhk,4656
-pywebexec/static/js/script.js,sha256=kHfJuQQs1H9kfHGruuDnECV5O71keuMc21JPX9l1jss,12046
+pywebexec/static/js/popup.js,sha256=JdBHm09MBYpbh5It_LYj0DH_MXj5Z407-AXscHOny4Y,4779
+pywebexec/static/js/script.js,sha256=KSYOWNHtRrGZX4UZ60BzEK-06SgLonDpxU6EEhdeiQo,12276
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/ansi_up.min.js,sha256=KNGV0vEr30hNqKQimTAvGVy-icD5A1JqMQTtvYtKR2Y,13203
 pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4QlWwA0pxOH53Gck,1460
@@ -23,9 +23,9 @@ pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeo
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
 pywebexec/templates/popup.html,sha256=T6_tAOUoA58sA1oxB5pb8i42RenoMdCsH8T86Gccb6Q,945
-pywebexec-1.4.17.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.17.dist-info/METADATA,sha256=kNMbOsvL81CZzPgQuZMIvn_zInRVbb0mWygCjYiH7J8,7801
-pywebexec-1.4.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.17.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.17.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.17.dist-info/RECORD,,
+pywebexec-1.4.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.19.dist-info/METADATA,sha256=bAlOxVzchw1tY4ocEf-FriPyY990xvl3S1dIrb2vEb4,7801
+pywebexec-1.4.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.19.dist-info/RECORD,,