pywebexec 1.6.7__py3-none-any.whl → 1.6.9__py3-none-any.whl

pywebexec/static/js/popup.js

@@ -55,6 +55,18 @@ const fitAddon = new FitAddon.FitAddon();
 terminal.loadAddon(fitAddon);
 terminal.open(document.getElementById('output'));
 fitAddon.fit();
+terminal.onTitleChange((title) => {
+    document.getElementById('commandInfo').innerText = title;
+})
+terminal.onSelectionChange(() => {
+    const selectionText = terminal.getSelection();
+    if (selectionText) {
+        navigator.clipboard.writeText(selectionText).catch(err => {
+            console.error('Failed to copy text to clipboard:', err);
+        });
+    }
+});
+
 
 let currentCommandId = null;
 let outputInterval = null;
@@ -72,14 +84,12 @@ function getTokenParam() {
 }
 const urlToken = getTokenParam();
 
-function extractTitle(output) {
-    const titleindex = output.lastIndexOf('\x1b]0;');
-    if (titleindex < 0) return null;
-    const endindex = output.slice(titleindex+4).indexOf('\x07');
-    if (endindex < 0) return null;
-    return output.slice(titleindex+4, titleindex+4+endindex);
+
+function setCommandStatus(status) {
+    document.getElementById("commandStatus").className = `status-icon status-${status}`;
 }
 
+
 async function fetchOutput(url) {
     if (isPaused) return;
     try {
@@ -112,15 +122,10 @@ async function fetchOutput(url) {
                 clearInterval(outputInterval);
                 document.title = document.title.replace('[running]',`[${data.status}]`);
                 toggleButton.style.display = 'none';
-                document.getElementById('commandStatus').classList.remove('status-running');
-                document.getElementById('commandStatus').classList.add(`status-${data.status}`);
+                setCommandStatus(data.status)
             } else {
                 toggleButton.style.display = 'block';
-                const title = extractTitle(data.output);
-                if (title) {
-                    document.title = `${title} - [running]`;
-                    document.getElementById('commandInfo').innerHTML = `<span id="commandStatus" class="status-icon status-running"></span>${title}`;
-                }
+                setCommandStatus(data.status)
             }
         }
     } catch (error) {
@@ -146,7 +151,8 @@ async function viewOutput(command_id) {
         const data = await response.json();
         const commandInfo = document.getElementById('commandInfo');
         const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
-        commandInfo.innerHTML = `<span id="commandStatus" class="status-icon status-${data.status}"></span>${command}`;
+        setCommandStatus(data.status);
+        commandInfo.innerText = command;
         commandInfo.setAttribute('title', command);
         document.title = `${data.command} ${data.params.join(' ')} - [${data.status}]`;
         if (data.command == 'term')

pywebexec/static/js/script.js

@@ -18,7 +18,7 @@ function initTerminal()
         cursorBlink: false,
         cursorInactiveStyle: 'none',
         disableStdin: true,
-        convertEol: true,
+        //convertEol: true,
         fontFamily: '"Consolas NF", "Fira Code", monospace, "Powerline Extra Symbols", courier-new, courier',
         fontSize: fontSize,
         scrollback: maxScrollback,
@@ -76,11 +76,17 @@ 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.onTitleChange((title) => {
+    document.getElementById('commandInfo').innerText = title;
+})
+
+/*terminal.onResize((evt) => {
+    const terminal_size = {
+        Width: evt.cols,
+        Height: evt.rows,
+    };
+    console.log(terminal_size);
+})*/
 
 terminal.onSelectionChange(() => {
     const selectionText = terminal.getSelection();
@@ -91,6 +97,13 @@ terminal.onSelectionChange(() => {
     }
 });
 
+function getTokenParam() {
+    const urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get('token') ? `?token=${urlParams.get('token')}` : '';
+}
+const urlToken = getTokenParam();
+
+
 document.getElementById('launchForm').addEventListener('submit', async (event) => {
     event.preventDefault();
     const commandName = document.getElementById('commandName').value;
@@ -175,14 +188,6 @@ async function fetchCommands(hide=false) {
     }
 }
 
-function extractTitle(output) {
-    const titleindex = output.lastIndexOf('\x1b]0;');
-    if (titleindex < 0) return null;
-    const endindex = output.slice(titleindex+4).indexOf('\x07');
-    if (endindex < 0) return null;
-    return output.slice(titleindex+4, titleindex+4+endindex);
-}
-
 async function fetchOutput(url) {
     if (isPaused) return;
     try {
@@ -212,15 +217,11 @@ async function fetchOutput(url) {
             if (data.status != 'running') {
                 clearInterval(outputInterval);
                 toggleButton.style.display = 'none';
-                document.getElementById('commandStatus').classList.remove('status-running');
-                document.getElementById('commandStatus').classList.add(`status-${data.status}`);
+                setCommandStatus(data.status);
                 fetchCommands();
             } else {
                 toggleButton.style.display = 'block';
-                const title = extractTitle(data.output);
-                if (title) {
-                    document.getElementById('commandInfo').innerHTML = `<span id="commandStatus" class="status-icon status-running"></span>${title}`;
-                }
+                setCommandStatus(data.status);
             }
         }
     } catch (error) {
@@ -228,6 +229,10 @@ async function fetchOutput(url) {
     }
 }
 
+function setCommandStatus(status) {
+    document.getElementById("commandStatus").className = `status-icon status-${status}`;
+}
+
 async function viewOutput(command_id) {
     slider.value = 100;
     outputPercentage.innerText = '100%';
@@ -246,7 +251,8 @@ async function viewOutput(command_id) {
         const data = await response.json();
         const commandInfo = document.getElementById('commandInfo');
         const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
-        commandInfo.innerHTML = `<span id="commandStatus" class="status-icon status-${data.status}"></span>${command}`;
+        setCommandStatus(data.status)
+        commandInfo.innerText = command;
         commandInfo.setAttribute('title', command);
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';

pywebexec/templates/index.html

@@ -46,7 +46,7 @@
     <div id="output" class="output"></div>
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
-        <span id="commandInfo" class="command-info"></span>
+        <span class="command-info"><span id="commandStatus" class="status-icon"></span><span id="commandInfo"></span></span>
         <input type="range" id="outputSlider" min="0" max="100" value="100">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>

pywebexec/templates/popup.html

@@ -14,7 +14,7 @@
     <div id="output" class="output"></div>
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
-        <span id="commandInfo" class="command-info"></span>
+        <span class="command-info"><span id="commandStatus"></span><span id="commandInfo"></span></span>
         <input type="range" id="outputSlider" min="0" max="100" value="100">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.7'
-__version_tuple__ = version_tuple = (1, 6, 7)
+__version__ = version = '1.6.9'
+__version_tuple__ = version_tuple = (1, 6, 9)

{pywebexec-1.6.7.dist-info → pywebexec-1.6.9.dist-info}/METADATA

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

{pywebexec-1.6.7.dist-info → pywebexec-1.6.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
 pywebexec/pywebexec.py,sha256=L47T3dB78GvW2CD09kRFncjaNjLxJ_NqB4VvOftSodo,31719
-pywebexec/version.py,sha256=UBH9kvxesdE0svvcKwHfK8rz5bJUzNXPBHo7APqVEfk,411
+pywebexec/version.py,sha256=H4tpGbuK5q1tqtuUh1Nr2Buwsz8VycRrcpqeBxyquBg,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=MJHUBpjWL4sLxM7a7DxypmPKaFJQbmA_ESNXsbLviNI,8201
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -19,8 +19,8 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/js/commands.js,sha256=h2fkd9qpypLBxvhEEbay23nwuqUwcKJA0vHugcyL8pU,7961
-pywebexec/static/js/popup.js,sha256=TCzGoPVS_EvwzGc544SvRgLYG7XWXRF8tIQGfu3atrU,8533
-pywebexec/static/js/script.js,sha256=mGY_-A1rZNjgpTU8FsVH0j6Tj7v4pHpSaREPbTttvEs,17376
+pywebexec/static/js/popup.js,sha256=I5TLYUm5s2p12a0VfFONOxxzhXLBmnpVzM-B5W-GPis,8294
+pywebexec/static/js/script.js,sha256=8CcIn-O4I1ojbiAYOeQl3yTnykn0Lj3xdWdx6m6HyNs,17085
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/addon-canvas.js,sha256=ez6QTVvsmLVNJmdJlM-ZQ5bErwlxAQ_9DUmDIptl2TM,94607
 pywebexec/static/js/xterm/addon-canvas.js.map,sha256=ECBA4B-BqUpdFeRzlsEWLSQnudnhLP-yPQJ8_hKquMo,379537
@@ -31,11 +31,11 @@ pywebexec/static/js/xterm/addon-unicode11.js.map,sha256=paDj5KKtTIUGedQn2x7CaUTD
 pywebexec/static/js/xterm/xterm.js,sha256=H5kaw7Syg-v5bmCuI6AKUnZd06Lkb6b92p8aqwMvdJU,289441
 pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCfN0U_OI6Zw,1118392
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=3XAXlpluzmTxC75KLzHDI4aJvQyQrOShB_weJ27PE2U,2815
-pywebexec/templates/popup.html,sha256=6FfzMjxuAC_xwyMGPf3p5tm6iPVY0QCsqY80eotD0z8,1362
-pywebexec-1.6.7.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.6.7.dist-info/METADATA,sha256=6CuS17ptfqw8Xm5GB-KADbxnr3CSIo0koygGIA_BHIc,7801
-pywebexec-1.6.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.6.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.6.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.6.7.dist-info/RECORD,,
+pywebexec/templates/index.html,sha256=5h8kLyzAhbvUDU9sEwrGIvD6FxAMcDZLXlN-ldlO8KU,2880
+pywebexec/templates/popup.html,sha256=3ZqQcE9mYs-RXv0Lfb24zntOlvR137ZYI9mtCZNVAo0,1407
+pywebexec-1.6.9.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.6.9.dist-info/METADATA,sha256=ECfHWHQFub3yEsBHe32T47A2mpHgqXTs0bX10WAmdOs,7801
+pywebexec-1.6.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.6.9.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.6.9.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.6.9.dist-info/RECORD,,