pywebexec 1.3.1__tar.gz → 1.3.3__tar.gz

{pywebexec-1.3.1/pywebexec.egg-info → pywebexec-1.3.3}/PKG-INFO

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

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec/pywebexec.py

@@ -17,6 +17,7 @@ from socket import gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet
 import ssl
 import re
 import pwd
+import platform
 from secrets import token_urlsafe
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
@@ -327,7 +328,12 @@ def parseargs():
         user = pwd.getpwuid(os.getuid())[0]
         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)
-        res = os.system(f"script -f {output_file_path}")
+        if platform.system() == 'Darwin':
+            script_opt = '-F'
+        else:
+            script_opt = '-f'
+        res = os.system(f"script {script_opt} {output_file_path}")
+
         end_time = datetime.now().isoformat()
         update_command_status(command_id, status="success", end_time=end_time, exit_code=res)
         sys.exit(res)

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec/static/css/style.css

@@ -1,3 +1,9 @@
+@font-face {
+    font-family: 'Consolas NF';
+    src: url('/static/css/Consolas NF.ttf');
+    font-weight: 400;
+    font-style: normal;
+}
 body {
     font-family: Arial, sans-serif;
     overflow: hidden;
@@ -256,4 +262,13 @@ body.dimmed * {
 span {
     letter-spacing: -0.03px !important;
 }
+.slider-container {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-top: 10px;
+}
+#outputSlider {
+    width: 100%;
+}
 

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec/static/js/script.js

@@ -1,39 +1,46 @@
 let currentCommandId = null;
 let outputInterval = null;
 let nextOutputLink = null;
+let fullOutput = '';
+
+
+function initTerminal()
+{
+    return new Terminal({
+        cursorBlink: false,
+        cursorHidden: true,
+        disableStdin: true,
+        convertEol: true,
+        fontFamily: 'Consolas NF, monospace, courier-new, courier',
+        scrollback: 999999,
+        theme: {
+            background: '#111412',
+            black: '#111412',
+            green: '#088a5b',
+            blue: "#2760aa",
+            red: '#ba1611',
+            yellow: "#cf8700",
+            magenta: "#4c3d80",
+            cyan: "#00a7aa",
+            brightBlack: "#243C4F",
+            brightBlue: "#5584b1",
+        },
+        rescaleOverlappingGlyphs: true,
+    });
+}
+let terminal = initTerminal()
 
-const terminal = new Terminal({
-    cursorBlink: false,
-    cursorHidden: true,
-    disableStdin: true,
-    convertEol: true,
-    fontFamily: 'Consolas NF, monospace, courier-new, courier',
-    scrollback: 999999,
-    theme: {
-        background: '#111412',
-        black: '#111412',
-        green: '#088a5b',
-        blue: "#2760aa",
-        red: '#ba1611',
-        yellow: "#cf8700",
-        magenta: "#4c3d80",
-        cyan: "#00a7aa",
-        brightBlack: "#243C4F",
-        brightBlue: "#5584b1",
-    },
-    rescaleOverlappingGlyphs: true,
-});
 const fitAddon = new FitAddon.FitAddon();
 terminal.loadAddon(fitAddon);
 terminal.open(document.getElementById('output'));
 fitAddon.fit();
+
 function getTokenParam() {
     const urlParams = new URLSearchParams(window.location.search);
     return urlParams.get('token') ? `?token=${urlParams.get('token')}` : '';
 }
 const urlToken = getTokenParam();
 
-
 terminal.onSelectionChange(() => {
     const selectionText = terminal.getSelection();
     if (selectionText) {
@@ -43,7 +50,6 @@ terminal.onSelectionChange(() => {
     }
 });
 
-
 document.getElementById('launchForm').addEventListener('submit', async (event) => {
     event.preventDefault();
     const commandName = document.getElementById('commandName').value;
@@ -122,7 +128,8 @@ async function fetchOutput(url) {
             terminal.write(data.error);
             clearInterval(outputInterval);
         } else {
-            terminal.write(data.output);
+            fullOutput += data.output;
+            updateTerminalOutput();
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
                 clearInterval(outputInterval);
@@ -134,11 +141,14 @@ async function fetchOutput(url) {
 }
 
 async function viewOutput(command_id) {
+    document.getElementById('outputSlider').value = 100;
     adjustOutputHeight();
     currentCommandId = command_id;
     nextOutputLink = `/command_output/${command_id}${urlToken}`;
     clearInterval(outputInterval);
     terminal.clear();
+    terminal.reset();
+    fullOutput = '';
     try {
         const response = await fetch(`/command_status/${command_id}${urlToken}`);
         if (!response.ok) {
@@ -246,7 +256,7 @@ function adjustOutputHeight() {
     const outputDiv = document.getElementById('output');
     const windowHeight = window.innerHeight;
     const outputTop = outputDiv.getBoundingClientRect().top;
-    const maxHeight = windowHeight - outputTop - 30; // 20px for padding/margin
+    const maxHeight = windowHeight - outputTop - 60; // Adjusted for slider height
     outputDiv.style.height = `${maxHeight}px`;
     fitAddon.fit();
 }
@@ -274,6 +284,19 @@ function initResizer() {
     }
 }
 
+function updateTerminalOutput() {
+    const slider = document.getElementById('outputSlider');
+    const percentage = slider.value;
+    const outputLength = Math.floor((fullOutput.length * percentage) / 100);
+    const limitedOutput = fullOutput.slice(0, outputLength);
+    terminal.clear();
+    terminal.reset();
+    terminal.write(limitedOutput);
+    document.getElementById('outputPercentage').innerText = `${percentage}%`;
+}
+
+document.getElementById('outputSlider').addEventListener('input', updateTerminalOutput);
+
 window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', initResizer);
 

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec/templates/index.html

@@ -44,6 +44,10 @@
         <div class="resizer" id="resizer"></div>
     </div>
     <div id="output" class="output"></div>
+    <div class="slider-container">
+        <input type="range" id="outputSlider" min="0" max="100" value="100">
+        <label for="outputSlider"><span id="outputPercentage">100%</span></label>
+    </div>
     <script src="/static/js/xterm/ansi_up.min.js"></script>
     <script src="/static/js/xterm/xterm.js"></script>
     <script src="/static/js/xterm/xterm-addon-fit.js"></script>

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.1'
-__version_tuple__ = version_tuple = (1, 3, 1)
+__version__ = version = '1.3.3'
+__version_tuple__ = version_tuple = (1, 3, 3)

{pywebexec-1.3.1 → pywebexec-1.3.3/pywebexec.egg-info}/PKG-INFO

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

{pywebexec-1.3.1 → pywebexec-1.3.3}/pywebexec.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ pywebexec.egg-info/dependency_links.txt
 pywebexec.egg-info/entry_points.txt
 pywebexec.egg-info/requires.txt
 pywebexec.egg-info/top_level.txt
+pywebexec/static/css/Consolas NF.ttf
 pywebexec/static/css/style.css
 pywebexec/static/css/xterm.css
 pywebexec/static/images/aborted.svg