pywebexec 2.3.8__py3-none-any.whl → 2.3.9__py3-none-any.whl

pywebexec/cmdscript.py

@@ -0,0 +1,150 @@
+import os
+import sys
+import msvcrt
+import shutil
+import time
+import signal
+from datetime import datetime   
+from winpty import PTY, WinptyError
+
+class CmdInteractive:
+    def __init__(self, logfile=None):
+        self.logfile = logfile
+        cols, rows = shutil.get_terminal_size()
+        self.pty = PTY(cols, rows)
+        # Set up Ctrl+C handling
+        signal.signal(signal.SIGINT, self._handle_sigint)
+        self.pid = self.pty.spawn('cmd.exe')
+        if not self.pid:
+            raise RuntimeError("Failed to spawn cmd.exe")
+        self.command_buffer = []
+        self.history = []
+        self.history_index = 0
+        self.cursor_pos = 0  # Track cursor position in command buffer
+
+    def _handle_sigint(self, signum, frame):
+        """Handle Ctrl+C by forwarding it to the child process"""
+        try:
+            self.pty.write('\x03')
+        except:
+            pass
+
+    def log(self, text, direction='>>'):
+        if self.logfile:
+            timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
+            with open(self.logfile, 'a', encoding='utf-8') as f:
+                f.write(f'{timestamp} {direction} {text}')
+
+    def handle_special_key(self, char):
+        """Handle special key sequences"""
+        if char == b'\xe0':  # Extended key
+            key = msvcrt.getch()
+            if key == b'H':  # Up arrow
+                if self.history and self.history_index > 0:
+                    self.history_index -= 1
+                    cmd = self.history[self.history_index]
+                    self._replace_line(cmd)
+            elif key == b'P':  # Down arrow
+                if self.history_index < len(self.history) - 1:
+                    self.history_index += 1
+                    cmd = self.history[self.history_index]
+                    self._replace_line(cmd)
+            elif key == b'K':  # Left arrow
+                if self.cursor_pos > 0:
+                    self.cursor_pos -= 1
+                    self.pty.write('\x1b[D')
+            elif key == b'M':  # Right arrow
+                if self.cursor_pos < len(self.command_buffer):
+                    self.cursor_pos += 1
+                    self.pty.write('\x1b[C')
+            return True
+        return False
+
+    def _replace_line(self, new_text):
+        """Replace current line with new text"""
+        # Clear current line
+        self.pty.write('\r' + ' ' * len(self.command_buffer) + '\r')
+        # Write new line
+        self.command_buffer = list(new_text)
+        self.cursor_pos = len(self.command_buffer)
+        self.pty.write(''.join(self.command_buffer))
+
+    def interact(self):
+        try:
+            while True:
+                try:
+                    try:
+                        output = self.pty.read()
+                        if output:
+                            if isinstance(output, str):
+                                output = output.encode('utf-8')
+                            sys.stdout.buffer.write(output)
+                            sys.stdout.buffer.flush()
+                            self.log(output.decode('utf-8', errors='replace'), '>>')
+                    except (EOFError, WinptyError):
+                        break
+
+                    if msvcrt.kbhit():
+                        char = msvcrt.getch()
+                        if self.handle_special_key(char):
+                            continue
+                        
+                        if char == b'\r':  # Enter
+                            self.pty.write('\r\n')
+                            if self.command_buffer:
+                                cmd = ''.join(self.command_buffer)
+                                self.history.append(cmd)
+                                self.history_index = len(self.history)
+                            self.command_buffer = []
+                            self.cursor_pos = 0
+                        elif char == b'\x08':  # Backspace
+                            if self.cursor_pos > 0:
+                                # Remove character at cursor position
+                                self.command_buffer.pop(self.cursor_pos - 1)
+                                self.cursor_pos -= 1
+                                # Rewrite the line from cursor position
+                                remain = ''.join(self.command_buffer[self.cursor_pos:])
+                                self.pty.write('\x08' + remain + ' ')
+                                # Move cursor back to position
+                                if remain:
+                                    self.pty.write('\x1b[' + str(len(remain)) + 'D')
+                        elif char == b'\x03':  # Ctrl+C
+                            self.pty.write('\x03')
+                            self.command_buffer = []
+                            self.cursor_pos = 0
+                            continue
+                        else:
+                            # Insert character at cursor position
+                            if isinstance(char, bytes):
+                                char = char.decode('cp437', errors='replace')
+                            self.command_buffer.insert(self.cursor_pos, char)
+                            self.cursor_pos += 1
+                            # Write new char and remaining text
+                            remain = ''.join(self.command_buffer[self.cursor_pos-1:])
+                            self.pty.write(remain)
+                            # Move cursor back if needed
+                            if self.cursor_pos < len(self.command_buffer):
+                                self.pty.write('\x1b[' + str(len(remain)-1) + 'D')
+                        self.log(char, '<<')
+
+                except (IOError, OSError) as e:
+                    if "handle is closed" in str(e):
+                        break
+                    raise
+
+        except KeyboardInterrupt:
+            pass
+        finally:
+            self.close()
+
+    def close(self):
+        if hasattr(self, 'pty'):
+            del self.pty
+
+if __name__ == '__main__':
+    log_file = 'cmd_session.log'
+    try:
+        cmd = CmdInteractive(log_file)
+        cmd.interact()
+    except ImportError:
+        print("Please install pywinpty: pip install pywinpty")

pywebexec/cmdscript.py.ok

@@ -0,0 +1,85 @@
+import os
+import sys
+import msvcrt
+import shutil
+import time
+import signal
+from datetime import datetime   
+from winpty import PTY, WinptyError
+
+class CmdInteractive:
+    def __init__(self, logfile=None):
+        self.logfile = logfile
+        cols, rows = shutil.get_terminal_size()
+        self.pty = PTY(cols, rows)
+        # Set up Ctrl+C handling
+        signal.signal(signal.SIGINT, self._handle_sigint)
+        self.pid = self.pty.spawn('cmd.exe')
+        if not self.pid:
+            raise RuntimeError("Failed to spawn cmd.exe")
+
+    def _handle_sigint(self, signum, frame):
+        """Handle Ctrl+C by forwarding it to the child process"""
+        try:
+            self.pty.write('\x03')
+        except:
+            pass
+
+    def log(self, text, direction='>>'):
+        if self.logfile:
+            timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
+            with open(self.logfile, 'a', encoding='utf-8') as f:
+                f.write(f'{timestamp} {direction} {text}')
+
+    def interact(self):
+        try:
+            while True:
+                try:
+                    try:
+                        output = self.pty.read()
+                        if output:
+                            if isinstance(output, str):
+                                output = output.encode('utf-8')
+                            sys.stdout.buffer.write(output)
+                            sys.stdout.buffer.flush()
+                            self.log(output.decode('utf-8', errors='replace'), '>>')
+                    except (EOFError, WinptyError):
+                        break
+
+                    if msvcrt.kbhit():
+                        char = msvcrt.getch()
+                        if char == b'\x03':  # Ctrl+C
+                            # Forward Ctrl+C to child process
+                            self.pty.write('\x03')
+                            continue
+                        if char == b'\x1d':  # Ctrl+]
+                            break
+                        if isinstance(char, bytes):
+                            char = char.decode('cp437', errors='replace')
+                        try:
+                            self.pty.write(char)
+                            self.log(char, '<<')
+                        except (EOFError, WinptyError):
+                            break
+
+                except (IOError, OSError) as e:
+                    if "handle is closed" in str(e):
+                        break
+                    raise
+
+        except KeyboardInterrupt:
+            pass
+        finally:
+            self.close()
+
+    def close(self):
+        if hasattr(self, 'pty'):
+            del self.pty
+
+if __name__ == '__main__':
+    log_file = 'cmd_session.log'
+    try:
+        cmd = CmdInteractive(log_file)
+        cmd.interact()
+    except ImportError:
+        print("Please install pywinpty: pip install pywinpty")

pywebexec/static/css/form.css

@@ -277,11 +277,22 @@
     color: #333;
     padding: 3px 13px;
   }
+  legend {
+    font-weight: bold;
+  }
+  .expandable > legend::before {
+    content: '\25B8';
+    padding-right: 5px;
+  }
+  .expanded > legend::before {
+    content: '\25BE';
+  }
+
   fieldset {
     border: 1px solid #ccc;
     border-radius: 5px;
     padding-top: 9px;
-    width: 100%;
+    /* width: 100%; */
     label {
       padding-right: 5px;
     }
@@ -290,6 +301,11 @@
     /* display: block ruby; */
     padding-bottom: 5px;
   }
+  fieldset.expandable > div {
+    display: inline-flex;
+    gap: 0px 5px;
+    padding-bottom: 5px;
+  }
 }
 
 .swagger-ui textarea {

pywebexec/static/js/schemaform.js

@@ -8,7 +8,12 @@ function adjustInputWidth(input) {
   } else {
     delta = 3;
   }
-  input.style.width = `${input.scrollWidth + delta}px`;
+  if (input.scrollWidth > 0) {
+    input.style.width = `${input.scrollWidth + delta}px`;
+  } else {
+    input.style.width = `${input.value.length * 11 + delta}px`;
+  }
+  
 }
 
 function formInputHandle() {
@@ -30,16 +35,19 @@ function formInputHandle() {
   });
 }
 
-function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
+function extractKeysAndPlaceholders(obj, formkeys, formoptions, prefix = '') {
     let result = [];
   
     for (let key in obj.properties) {
       k = prefix ? `${prefix}.${key}` : key;
+      if (formoptions[k]) {
+        continue;
+      }
       if (obj.properties[key].type === 'object' && obj.properties[key].properties) {
-        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formoptions, k));
+        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formkeys, formoptions, k));
       } else {
-        if (formoptions[k]) {
-          foptions = formoptions[k];
+        if (formkeys[k]) {
+          foptions = formkeys[k];
         } else {
           foptions = {};
         }
@@ -147,15 +155,25 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
     schema_params_options = {};
   }
 
+  formkeys = {};
   formoptions = {};
-  if (schema_options && schema_options.form) {
-    formoptions = schema.schema_options.form;
-  } else if (schema_params_options && schema_params_options.form) {
-    for (let key in schema_params_options.form) {
-      formoptions[`params.${key}`] = schema_params_options.form[key];
+  if (schema_options) {
+    formkeys = schema.schema_options.form || {};
+    formoptions = schema.schema_options.formoptions || {};
+  } else { 
+    if (schema_params_options) {
+      let fkeys = schema_params_options.form || {};
+      let foptions = schema_params_options.formoptions || {};
+      for (let key in fkeys) {
+        formkeys[`params.${key}`] = fkeys[key];
+      }
+      for (let key in foptions) {
+        formoptions[`params.${key}`] = foptions[key];
+      }
     }
   }
-  formDesc = extractKeysAndPlaceholders(schema, formoptions);
+
+  formDesc = extractKeysAndPlaceholders(schema, formkeys, formoptions);
   if (schemaValues[schemaName]) {
     value = schemaValues[schemaName];
     // convert array for textarea formDesc type to string separated by newlines
@@ -233,6 +251,22 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         }
       }
     }
+    if (formoptions) {
+      items = [];
+      for (let key in formoptions) {
+        items.push({
+          key: key,
+          ... formoptions[key],
+        });
+      }
+      formDesc.push({
+        type: 'fieldset',
+        title: 'Options',
+        fieldHtmlClass: 'fieldsetoptions',
+        expandable: true,
+        items: items,
+      });
+    }
     formDesc.push({
       type: 'actions',
       items: [
@@ -246,7 +280,6 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
           title: 'Reset',
           id: 'reset-form',
           onClick: function (evt) {
-            console.log('reset');
             evt.preventDefault();
             evt.stopPropagation();
             evt.stopImmediatePropagation();
@@ -312,6 +345,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
       adjustInputWidth(e.target);
     }
   });
+  divopt = schemaForm.querySelector("fieldset.expandable > div");
   formInputHandle();
   return jsform;
 }

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.8'
-__version_tuple__ = version_tuple = (2, 3, 8)
+__version__ = version = '2.3.9'
+__version_tuple__ = version_tuple = (2, 3, 9)

{pywebexec-2.3.8.dist-info → pywebexec-2.3.9.dist-info}/METADATA

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

{pywebexec-2.3.8.dist-info → pywebexec-2.3.9.dist-info}/RECORD

@@ -1,9 +1,11 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
+pywebexec/cmdscript.py,sha256=TCYfWTPYn5LEWiMPm0zc9iyHm2AV4uH5E-gOL3hGoDc,6182
+pywebexec/cmdscript.py.ok,sha256=nWB11LXjQahCUwJ8jK0XuU1ekoMyN9Zu_FaOdVTpOwk,2859
 pywebexec/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
 pywebexec/pywebexec.py,sha256=1M5CtxKr5YkEMBhuVSrwnMNcVRuf7iQf-uxF4Lf0ouQ,48375
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=3Oc3thyKkSSxKGqu1ruTNsjrUTMaCkmwZoi_w-3OL9M,511
-pywebexec/static/css/form.css,sha256=qzBSq95h3s4qPZEbUD8l2bMBfdWgSWTpk4TEJKZeFxg,6872
+pywebexec/version.py,sha256=xD7sq7tXCC-QKVs2SPi2bsTgQhH6dVLkP6dvZaxMKcA,511
+pywebexec/static/css/form.css,sha256=jScx_gUwW0RyrYZJsn6z6vBsBAAgV-zva63folDPNtA,7160
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=pUmylXwbFIoXrdaJRVOUohlKIhOIilapH97NyIlgGV4,10343
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
@@ -35,7 +37,7 @@ pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_q
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
 pywebexec/static/js/executables.js,sha256=cTgCFHr_F9bFCirtfG_uR32vOY3vNUr4Ih3Wglj5lFc,11988
 pywebexec/static/js/popup.js,sha256=IaKmk2U2hEn-Nv6krf_PPW6LaG8NcpCkJKb7lUX0qZo,11457
-pywebexec/static/js/schemaform.js,sha256=57FeWNWJT1zW9sG3ujZEOG7vLoiHif5ROQZori2QNMg,11131
+pywebexec/static/js/schemaform.js,sha256=oo4G8XqtL-iDCuq_HULgmYx5YOwY-c9166Wi7C1iAWQ,11919
 pywebexec/static/js/script.js,sha256=TI3TSylgBxh_a6QvYWlg4CyJ6LMPxnhFl8WRtRDGD0Y,20810
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
@@ -67,9 +69,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.3.8.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.3.8.dist-info/METADATA,sha256=3Gotnq8hyz6QPF1A6XwAdQX1lRCtTRjXVayFLglXZIo,13015
-pywebexec-2.3.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pywebexec-2.3.8.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.3.8.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.3.8.dist-info/RECORD,,
+pywebexec-2.3.9.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.3.9.dist-info/METADATA,sha256=mapKSx2-T9t0PuRG5sCWF0yaGGLzg081Q8FD75-5hDQ,13015
+pywebexec-2.3.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.3.9.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.3.9.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.3.9.dist-info/RECORD,,