pywebexec 1.4.11__py3-none-any.whl → 1.4.13__py3-none-any.whl

pywebexec/pywebexec.py

@@ -9,6 +9,7 @@ import argparse
 import random
 import string
 from datetime import datetime, timezone, timedelta
+import time
 import shlex
 from gunicorn.app.base import Application
 import ipaddress
@@ -43,7 +44,7 @@ app.config['LDAP_BIND_PASSWORD'] = os.environ.get('PYWEBEXEC_LDAP_BIND_PASSWORD'
 # Directory to store the command status and output
 CWD = os.getcwd()
 COMMAND_STATUS_DIR = '.web_status'
-CONFDIR = os.path.expanduser("~/")
+CONFDIR = os.path.expanduser("~/").rstrip('/')
 if os.path.isdir(f"{CONFDIR}/.config"):
     CONFDIR += '/.config'
 CONFDIR += "/.pywebexec"
@@ -285,6 +286,7 @@ def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
                 print(e)
 
 def start_term():
+    os.environ["PYWEBEXEC"] = " (shared)"
     os.chdir(CWD)
     command_id = str(uuid.uuid4())
     start_time = datetime.now().isoformat()
@@ -309,7 +311,7 @@ def parseargs():
         "-p", "--port", type=int, default=8080, help="HTTP server listen port"
     )
     parser.add_argument(
-        "-d", "--dir", type=str, default=os.getcwd(), help="Serve target directory"
+        "-d", "--dir", type=str, help=f"Serve target directory. default {CONFDIR}"
     )
     parser.add_argument(
         "-t",
@@ -326,6 +328,9 @@ def parseargs():
                         choices=["start","stop","restart","status","shareterm", "term"])
 
     args = parser.parse_args()
+    if not os.path.exists(CONFDIR):
+        os.mkdir(CONFDIR, mode=0o700)
+    args.dir = args.dir or CONFDIR
     if os.path.isdir(args.dir):
         try:
             os.chdir(args.dir)
@@ -336,9 +341,7 @@ def parseargs():
         print(f"Error: {args.dir} not found", file=sys.stderr)
         sys.exit(1)
     if not os.path.exists(COMMAND_STATUS_DIR):
-        os.makedirs(COMMAND_STATUS_DIR)
-    if not os.path.exists(CONFDIR):
-        os.mkdir(CONFDIR, mode=0o700)
+        os.mkdir(COMMAND_STATUS_DIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
         sys.exit(start_term())
@@ -454,7 +457,6 @@ def script(output_file):
         sigwinch_passthrough(None, None)
         signal.signal(signal.SIGWINCH, sigwinch_passthrough)
         p.interact()
-
     
 
 def run_command(command, params, command_id, user):
@@ -703,6 +705,7 @@ def main():
         with open(basef + ".log", "ab+") as log:
             pywebexec = subprocess.Popen([sys.executable] + sys.argv[:-1], stdout=log, stderr=log)
             start_term()
+            time.sleep(1)
             pywebexec.terminate()
         sys.exit()
 

pywebexec/static/css/style.css

@@ -267,14 +267,12 @@ span {
     width: 100%;
 }
 .popup-button {
-    background: none;
-    border: none;
+    background-color: transparent;
+    background-image: url("/static/images/popup.svg");
     cursor: pointer;
+    border: none;
     padding: 0;
-    margin-left: 5px;
     vertical-align: middle;
-}
-.popup-button img {
     width: 16px;
     height: 16px;
 }

pywebexec/static/js/popup.js

@@ -47,6 +47,7 @@ async function fetchOutput(url) {
     try {
         const response = await fetch(url);
         if (!response.ok) {
+            document.getElementById('dimmer').style.display = 'none';
             return;
         }
         const data = await response.json();
@@ -72,6 +73,7 @@ async function fetchOutput(url) {
             }
         }
     } catch (error) {
+        document.getElementById('dimmer').style.display = 'block';
         console.log('Error fetching output:', error);
     }
 }

pywebexec/static/js/script.js

@@ -111,9 +111,7 @@ async function fetchCommands() {
                     ${command.command.startsWith('term') ? '' : command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
                 </td>
                 <td class="monospace outcol">
-                    <button class="popup-button" onclick="openPopup('${command.command_id}', event)">
-                        <img src="/static/images/popup.svg" alt="Popup">
-                    </button>
+                    <button class="popup-button" onclick="openPopup('${command.command_id}', event)"></button>
                     ${command.last_output_line || ''}
                 </td>
             `;

pywebexec/templates/popup.html

@@ -8,6 +8,9 @@
     <link rel="stylesheet" href="/static/css/xterm.css">
 </head>
 <body>
+    <div id="dimmer" class="dimmer">
+        <div class="dimmer-text">Server not available</div>
+    </div>
     <div id="output" class="output"></div>
     <div class="slider-container">
         <input type="range" id="outputSlider" min="0" max="100" value="100">

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.11'
-__version_tuple__ = version_tuple = (1, 4, 11)
+__version__ = version = '1.4.13'
+__version_tuple__ = version_tuple = (1, 4, 13)

{pywebexec-1.4.11.dist-info → pywebexec-1.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.11
+Version: 1.4.13
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -76,8 +76,14 @@ $ pip install pywebexec
 
 ## Quick start
 
-* put in a directory the scripts/commands/links to commands you want to expose
-* start http server serving current directory executables listening on 0.0.0.0 port 8080
+* share terminal
+```shell
+$ pywebexec shareterm
+```
+
+* serve executables
+  * put in a directory the scripts/commands/links to commands you want to expose
+  * start http server serving current directory executables listening on 0.0.0.0 port 8080
 ```shell
 $ pywebexec -d <dir>
 ```

{pywebexec-1.4.11.dist-info → pywebexec-1.4.13.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=gZNUbNeFI2TWimUXmHva9ABHv8S4QH_xiUXOWKlswJM,26843
-pywebexec/version.py,sha256=CiEe7E8jVlrB3YZUumeEso6PXucVNqiDDQfL8kleYok,413
+pywebexec/pywebexec.py,sha256=KNRO31L0ArCxkS9Ph98YKzMumn0j41-ocr9TkQgKMmQ,26977
+pywebexec/version.py,sha256=bhORB-auReBqhWH8Z8Dx1LQ8cW3mTgChFk4qt6yE3rs,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=sDBhZ-csW5THIKfTDsHqxCSg6rIJ91Oh15sjw_HjJo4,5702
+pywebexec/static/css/style.css,sha256=cGJHPFj23SQ_bFpesfUaFA3VFxhXtpRUOL_zzx3x_X8,5726
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -14,18 +14,18 @@ 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=VdkDXEIwd4IawhDIWew6poWhpE7sAReVn0MopdSx5wY,4519
-pywebexec/static/js/script.js,sha256=QlYuIdvolTwxkJtgp7-X1IRM9Hr8D08iQCyCzZjv3hk,12255
+pywebexec/static/js/popup.js,sha256=i7BPBh6oS0Q6H528DwP6KwJ8CKh7ULwm1rLHSbyvDhk,4656
+pywebexec/static/js/script.js,sha256=x3YJn61YOpV5bSum3nrV7MRP7lMAAWv1-mhWBJen2nE,12161
 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
 pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeohphBo,283371
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
-pywebexec/templates/popup.html,sha256=6kmZKb0tGJ7jsr9DqDEriSMlbkW-PJTtCiUE9U5_FOE,837
-pywebexec-1.4.11.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.11.dist-info/METADATA,sha256=g3K50Awl5n3qkU5zltFdfS_d5w7GbV_pRbhrsKO2HPo,7724
-pywebexec-1.4.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.11.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.11.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.11.dist-info/RECORD,,
+pywebexec/templates/popup.html,sha256=T6_tAOUoA58sA1oxB5pb8i42RenoMdCsH8T86Gccb6Q,945
+pywebexec-1.4.13.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.13.dist-info/METADATA,sha256=vbf7BnbahIuCrkt8wGfyAo25vU5PqIGHgaor4L8uV2Y,7801
+pywebexec-1.4.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.13.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.13.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.13.dist-info/RECORD,,