pywebexec 1.4.7__tar.gz → 1.4.9__tar.gz

{pywebexec-1.4.7/pywebexec.egg-info → pywebexec-1.4.9}/PKG-INFO

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

{pywebexec-1.4.7 → pywebexec-1.4.9}/pywebexec/pywebexec.py

@@ -655,6 +655,7 @@ def list_commands():
 @app.route('/command_output/<command_id>', methods=['GET'])
 def get_command_output(command_id):
     offset = int(request.args.get('offset', 0))
+    maxsize = int(request.args.get('maxsize', 10485760))
     output_file_path = get_output_file_path(command_id)
     if os.path.exists(output_file_path):
         with open(output_file_path, 'rb') as output_file:
@@ -665,10 +666,10 @@ def get_command_output(command_id):
         token = app.config.get("TOKEN_URL")
         token_param = f"&token={token}" if token else ""
         response = {
-            'output': output,
+            'output': output[-maxsize:],
             'status': status_data.get("status"),
             'links': {
-                'next': f'{request.url_root}command_output/{command_id}?offset={new_offset}{token_param}'
+                'next': f'{request.url_root}command_output/{command_id}?offset={new_offset}&maxsize={maxsize}{token_param}'
             }
         }
         if request.headers.get('Accept') == 'text/plain':

{pywebexec-1.4.7 → pywebexec-1.4.9}/pywebexec/static/js/popup.js

@@ -1,10 +1,12 @@
+const maxScrollback = 99999;
+const maxSize = 10485760; // 10MB
 let terminal = new Terminal({
     cursorBlink: false,
     cursorInactiveStyle: 'none',
     disableStdin: true,
     convertEol: true,
     fontFamily: 'Consolas NF, monospace, courier-new, courier',
-    scrollback: 999999,
+    scrollback: maxScrollback,
     theme: {
         background: '#111412',
         black: '#111412',
@@ -16,6 +18,7 @@ let terminal = new Terminal({
         cyan: "#00a7aa",
         brightBlack: "#243C4F",
         brightBlue: "#5584b1",
+        brightGreen: "#18Ed93",
     },
     customGlyphs: false,
     rescaleOverlappingGlyphs: true,
@@ -31,6 +34,8 @@ let outputInterval = null;
 let nextOutputLink = null;
 let fullOutput = '';
 let outputLength = 0;
+let title = null;
+let slider = null;
 
 function getTokenParam() {
     const urlParams = new URLSearchParams(window.location.search);
@@ -49,9 +54,10 @@ async function fetchOutput(url) {
             terminal.write(data.error);
             clearInterval(outputInterval);
         } else {
-            slider = document.getElementById('outputSlider')
             percentage = slider.value;
             fullOutput += data.output;
+            if (fullOutput.length > maxSize)
+                fullOutput = fullOutput.slice(-maxSize);
             if (percentage == 100)
                 terminal.write(data.output);
             else {
@@ -61,6 +67,7 @@ async function fetchOutput(url) {
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
+                title.innerText = `${data.status} ${title.innerText.split(' ').slice(1).join(' ')}`;
                 clearInterval(outputInterval);
             }
         }
@@ -70,7 +77,7 @@ async function fetchOutput(url) {
 }
 
 async function viewOutput(command_id) {
-    document.getElementById('outputSlider').value = 100;
+    slider.value = 100;
     adjustOutputHeight();
     currentCommandId = command_id;
     nextOutputLink = `/command_output/${command_id}${urlToken}`;
@@ -84,7 +91,7 @@ async function viewOutput(command_id) {
             return;
         }
         const data = await response.json();
-        document.getElementsByTagName('title')[0].innerText = `${data.command} ${data.status}`;
+        title.innerText = `${data.status} ${data.command} ${data.params.join(' ')}`;
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';
         else
@@ -107,10 +114,10 @@ function adjustOutputHeight() {
     const maxHeight = windowHeight - outputTop - 60; // Adjusted for slider height
     outputDiv.style.height = `${maxHeight}px`;
     fitAddon.fit();
+    sliderUpdateOutput();
 }
 
 function sliderUpdateOutput() {
-    const slider = document.getElementById('outputSlider');
     const percentage = slider.value;
     outputLength = Math.floor((fullOutput.length * percentage) / 100);
     const limitedOutput = fullOutput.slice(0, outputLength);
@@ -120,10 +127,12 @@ function sliderUpdateOutput() {
     document.getElementById('outputPercentage').innerText = `${percentage}%`;
 }
 
-document.getElementById('outputSlider').addEventListener('input', sliderUpdateOutput);
 
 window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', () => {
+    title = document.getElementById('outputTitle');
+    slider = document.getElementById('outputSlider');
+    slider.addEventListener('input', sliderUpdateOutput);
     const commandId = window.location.pathname.split('/').slice(-1)[0];
     viewOutput(commandId);
 });

{pywebexec-1.4.7 → pywebexec-1.4.9}/pywebexec/static/js/script.js

@@ -3,6 +3,8 @@ let outputInterval = null;
 let nextOutputLink = null;
 let fullOutput = '';
 let outputLength = 0;
+const maxScrollback = 99999;
+const maxSize = 10485760; // 10MB
 
 function initTerminal()
 {
@@ -12,7 +14,7 @@ function initTerminal()
         disableStdin: true,
         convertEol: true,
         fontFamily: 'Consolas NF, monospace, courier-new, courier',
-        scrollback: 999999,
+        scrollback: maxScrollback,
         theme: {
             background: '#111412',
             black: '#111412',
@@ -24,6 +26,7 @@ function initTerminal()
             cyan: "#00a7aa",
             brightBlack: "#243C4F",
             brightBlue: "#5584b1",
+            brightGreen: "#18Ed93",
         },
         customGlyphs: false,
         rescaleOverlappingGlyphs: true,
@@ -137,6 +140,8 @@ async function fetchOutput(url) {
             slider = document.getElementById('outputSlider')
             percentage = slider.value;
             fullOutput += data.output;
+            if (fullOutput.length > maxSize)
+                fullOutput = fullOutput.slice(-maxSize);
             if (percentage == 100)
                 terminal.write(data.output); //.replace(/ \r/g, "\r\n")); tty size mismatch
             else {
@@ -187,7 +192,7 @@ async function viewOutput(command_id) {
 
 async function openPopup(command_id) {
     const popupUrl = `/popup/${command_id}${urlToken}`;
-    window.open(popupUrl, '_blank', 'width=800,height=600');
+    window.open(popupUrl, '_blank', 'width=1000,height=600');
 }
 
 async function relaunchCommand(command_id, event) {

{pywebexec-1.4.7 → pywebexec-1.4.9}/pywebexec/templates/popup.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/static/images/favicon.svg" type="image/svg+xml">
-    <title>Command Output</title>
+    <title id="outputTitle">Command Output</title>
     <link rel="stylesheet" href="/static/css/style.css">
     <link rel="stylesheet" href="/static/css/xterm.css">
 </head>

{pywebexec-1.4.7 → pywebexec-1.4.9}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.7'
-__version_tuple__ = version_tuple = (1, 4, 7)
+__version__ = version = '1.4.9'
+__version_tuple__ = version_tuple = (1, 4, 9)

{pywebexec-1.4.7 → pywebexec-1.4.9/pywebexec.egg-info}/PKG-INFO

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