pywebexec 1.7.19__py3-none-any.whl → 1.8.1__py3-none-any.whl

pywebexec/pywebexec.py

@@ -404,13 +404,15 @@ def get_output_file_path(command_id):
 
 def update_command_status(command_id, updates):
     status_file_path = get_status_file_path(command_id)
-    status = read_command_status(command_id) or {}
-    status = status.copy()
+    status = read_command_status(command_id)
     status.update(updates)
+    status = status.copy()
     if status.get('status') != 'running':
         output_file_path = get_output_file_path(command_id)
         if os.path.exists(output_file_path):
             status['last_output_line'] = get_last_line(output_file_path, status.get('cols'), status.get('rows'))
+    if 'last_read' in status:
+        del status['last_read']
     with open(status_file_path, 'w') as f:
         json.dump(status, f)
     os.sync()
@@ -419,24 +421,25 @@ def update_command_status(command_id, updates):
 
 def read_command_status(command_id):
     # Return cached status if available
-    status_data = {}
-    if command_id in status_cache:
-        status_data = status_cache[command_id]
+    global status_cache
+    if not command_id in status_cache:
+        status_cache[command_id] = {}
+    status_data = status_cache[command_id]
     status = status_data.get('status')
     if status and status != "running":
         return status_data
-    if command_id in status_cache and status_cache.get('last_read',0)>datetime.now().timestamp()-0.5:
+    if status_data.get('last_read',0)>datetime.now().timestamp()-0.5:
         return status_data
     status_file_path = get_status_file_path(command_id)
     if not os.path.exists(status_file_path):
-        return None
+        return status_data
     with open(status_file_path, 'r') as f:
         try:
             status_data.update(json.load(f))
         except json.JSONDecodeError:
-            return None
+            return status_data
     status_data['last_read'] = datetime.now().timestamp()
-    status_cache[command_id] = status_data
+    #status_cache[command_id] = status_data
     return status_data
 
 def sigwinch_passthrough(sig, data):
@@ -552,7 +555,6 @@ def read_commands():
                                 'last_update': datetime.now().timestamp(),
                                 'last_output_line': get_last_line(output_file_path, status.get('cols'), status.get('rows')),
                             })
-                            status_cache[command_id] = status
                 commands.append({
                     'command_id': command_id,
                     'status': status.get('status'),
@@ -730,13 +732,6 @@ def get_command_status(command_id):
     status = read_command_status(command_id)
     if not status:
         return jsonify({'error': 'Invalid command_id'}), 404
-
-    # output_file_path = get_output_file_path(command_id)
-    # if os.path.exists(output_file_path):
-    #     with open(output_file_path, 'r') as output_file:
-    #         output = output_file.read()
-    #     status['output'] = output
-
     return jsonify(status)
 
 @app.route('/')
@@ -756,11 +751,16 @@ def get_command_output(command_id):
     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:
-            output_file.seek(offset)
-            output = output_file.read().decode('utf-8', errors='replace')
-            new_offset = output_file.tell()
-        status_data = read_command_status(command_id) or {}
+        size = os.path.getsize(output_file_path)
+        if offset >= size:
+            output = ''
+            new_offset = offset
+        else:
+            with open(output_file_path, 'rb') as output_file:
+                output_file.seek(offset)
+                output = output_file.read().decode('utf-8', errors='replace')
+                new_offset = output_file.tell()
+        status_data = read_command_status(command_id)
         token = app.config.get("TOKEN_URL")
         token_param = f"&token={token}" if token else ""
         response = {

pywebexec/static/css/style.css

@@ -1,6 +1,6 @@
 @font-face {
-    font-family: 'Consolas NF';
-    src: url('/static/css/Consolas NF.ttf');
+    font-family: 'CommitMono Nerd Font Mono';
+    src: url('/static/fonts/CommitMonoNerdFontMono-Regular.otf');
     font-weight: 400;
     font-style: normal;
 }
@@ -48,7 +48,7 @@ th {
     cursor: pointer;
 }
 .monospace {
-    font-family: Consolas NF,monospace;
+    font-family: "CommitMono Nerd Font Mono", monospace;
     font-size: 13px;
  }
 .system-font {

pywebexec/static/fonts/LICENSE

@@ -0,0 +1,90 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

pywebexec/static/js/popup.js

@@ -6,7 +6,7 @@ let terminal = new Terminal({
     cursorInactiveStyle: 'none',
     disableStdin: true,
     convertEol: true,
-    fontFamily: 'Consolas NF, monospace, courier-new, courier',
+    fontFamily: '"CommitMono Nerd Font Mono", monospace, courier-new, courier',
     fontSize: fontSize,
     scrollback: maxScrollback,
     theme: {
@@ -36,20 +36,20 @@ terminal.loadAddon(new CanvasAddon.CanvasAddon());
 unicode11Addon = new Unicode11Addon.Unicode11Addon();
 terminal.loadAddon(unicode11Addon);
 terminal.unicode.activeVersion = '11';
-terminal.register({
-    wcwidth: (character) => {
-        const code = character.charCodeAt(0);
-        if (code == 0x1F525) return 2;  // Fire emoji
-        // Handle powerline symbols (usually should be width 1)
-        if (code >= 0xE0A0 && code <= 0xE0D4) return 1;
-        // Handle other specific unicode ranges
-        if (code >= 0x1100 && code <= 0x11FF) return 2;  // Hangul Jamo
-        if (code >= 0x3000 && code <= 0x30FF) return 2;  // CJK Symbols and Japanese
-        if (code >= 0x4E00 && code <= 0x9FFF) return 2;  // CJK Unified Ideographs
-        // Default to system wcwidth
-        return null;
-    }
-});
+// terminal.register({
+//     wcwidth: (character) => {
+//         const code = character.charCodeAt(0);
+//         if (code == 0x1F525) return 2;  // Fire emoji
+//         // Handle powerline symbols (usually should be width 1)
+//         if (code >= 0xE0A0 && code <= 0xE0D4) return 1;
+//         // Handle other specific unicode ranges
+//         if (code >= 0x1100 && code <= 0x11FF) return 2;  // Hangul Jamo
+//         if (code >= 0x3000 && code <= 0x30FF) return 2;  // CJK Symbols and Japanese
+//         if (code >= 0x4E00 && code <= 0x9FFF) return 2;  // CJK Unified Ideographs
+//         // Default to system wcwidth
+//         return null;
+//     }
+// });
 
 const fitAddon = new FitAddon.FitAddon();
 terminal.loadAddon(fitAddon);

pywebexec/static/js/script.js

@@ -22,7 +22,7 @@ function initTerminal()
         cursorInactiveStyle: 'none',
         disableStdin: true,
         //convertEol: true,
-        fontFamily: '"Consolas NF", "Fira Code", monospace, "Powerline Extra Symbols", courier-new, courier',
+        fontFamily: '"CommitMono Nerd Font Mono", "Fira Code", monospace, "Powerline Extra Symbols", courier-new, courier',
         fontSize: fontSize,
         scrollback: maxScrollback,
         theme: {
@@ -59,20 +59,20 @@ terminal.loadAddon(new CanvasAddon.CanvasAddon());
 unicode11Addon = new Unicode11Addon.Unicode11Addon();
 terminal.loadAddon(unicode11Addon);
 terminal.unicode.activeVersion = '11';
-terminal.register({
-    wcwidth: (character) => {
-        const code = character.charCodeAt(0);
-        if (code == 0x1F525) return 2;  // Fire emoji
-        // Handle powerline symbols (usually should be width 1)
-        if (code >= 0xE0A0 && code <= 0xE0D4) return 1;
-        // Handle other specific unicode ranges
-        if (code >= 0x1100 && code <= 0x11FF) return 2;  // Hangul Jamo
-        if (code >= 0x3000 && code <= 0x30FF) return 2;  // CJK Symbols and Japanese
-        if (code >= 0x4E00 && code <= 0x9FFF) return 2;  // CJK Unified Ideographs
-        // Default to system wcwidth
-        return null;
-    }
-});
+// terminal.register({
+//     wcwidth: (character) => {
+//         const code = character.charCodeAt(0);
+//         if (code == 0x1F525) return 3;  // Fire emoji
+//         // Handle powerline symbols (usually should be width 1)
+//         if (code >= 0xE0A0 && code <= 0xE0D4) return 1;
+//         // Handle other specific unicode ranges
+//         if (code >= 0x1100 && code <= 0x11FF) return 3;  // Hangul Jamo
+//         if (code >= 0x3000 && code <= 0x30FF) return 3;  // CJK Symbols and Japanese
+//         if (code >= 0x4E00 && code <= 0x9FFF) return 3;  // CJK Unified Ideographs
+//         // Default to system wcwidth
+//         return null;
+//     }
+// });
 
 const fitAddon = new FitAddon.FitAddon();
 terminal.loadAddon(fitAddon);

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.19'
-__version_tuple__ = version_tuple = (1, 7, 19)
+__version__ = version = '1.8.1'
+__version_tuple__ = version_tuple = (1, 8, 1)

{pywebexec-1.7.19.dist-info → pywebexec-1.8.1.dist-info}/METADATA

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

{pywebexec-1.7.19.dist-info → pywebexec-1.8.1.dist-info}/RECORD

@@ -1,10 +1,11 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=gMkPagOLSc_8OUGxQJBKbwPivyQVK5og8-NgyR6xRl4,32607
-pywebexec/version.py,sha256=TkFaFsruX5Otm0LH6piM1yaTwAuulEqgHrPqtArFw5s,513
-pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=fU-_eAk6Xy0L_GbH9rJBkeCFe5M2RYQA99cvRZ3pW9w,7934
+pywebexec/pywebexec.py,sha256=Pwsjq9VpM19l10-suEZ5nEXBv-LOaJNZy91ubuAkBos,32541
+pywebexec/version.py,sha256=8ety3-vW-PuHKrxUFSl1a0H98STtZwISOYo9asXn_xo,511
+pywebexec/static/css/style.css,sha256=xIVBpx_qfJOqMF678cIdbIs6rT_iZ8EPfFGC1TBYWoE,7986
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
+pywebexec/static/fonts/CommitMonoNerdFontMono-Regular.otf,sha256=gGTSi6NCkg_8ylwMsiDTlQ6YudJDg10nDLwSoIRSs18,7827928
+pywebexec/static/fonts/LICENSE,sha256=Li3JN3B4GQhudjHQLmGD--UjFqidoKYR2bCdO-fUvXI,4389
 pywebexec/static/images/aborted.svg,sha256=2nuvSwGBIZGWtlM1DrBO3qiSq1reDbcZDAj9rJXBnjY,380
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
 pywebexec/static/images/copy_ok.svg,sha256=mEqUVUhSq8xaJK2msQkxRawnz_KwlCZ-tok8QS6hJ3g,451
@@ -22,8 +23,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=TmfcauQlfIeAeC8pwQvKspc4PA_VYLbPTnVCDVBZ87I,8420
-pywebexec/static/js/popup.js,sha256=_2GzUizJ-sdZFWG7SZwbYJTPbu4EvVq7D5Q_UE8nepA,9452
-pywebexec/static/js/script.js,sha256=0vyxfgYYPsnnfscn11YcFYDyDYwmIGEVTe0dx0UJIqA,18538
+pywebexec/static/js/popup.js,sha256=aXT2oxkpUAkVAhKtAyyVMsMb1MVTDJ0Br0aA9ZBRvGI,9510
+pywebexec/static/js/script.js,sha256=e_yjyZazcn9YS7VQhDV_8f3gFfnd7rEF0cQyi5hQ1aA,18594
 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
@@ -36,9 +37,9 @@ pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCf
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=KSdQYBdzWKP6v0ETZsMO_729aosGBAzJxAss8T5jCto,2953
 pywebexec/templates/popup.html,sha256=f5m4u8WKpkevL2mQamGqo4_y-rSuLOXGuNsezuUbniY,1508
-pywebexec-1.7.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.19.dist-info/METADATA,sha256=yD7jkQlQGWpQfEYpoZ62JpLU4wjW8jEYn6uk9NjD5tc,8147
-pywebexec-1.7.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.19.dist-info/RECORD,,
+pywebexec-1.8.1.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.8.1.dist-info/METADATA,sha256=L23NFLbVDGDKYroC9kP37hV8YXjoQ0lAnBZzVK4CBuY,8146
+pywebexec-1.8.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.8.1.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.8.1.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.8.1.dist-info/RECORD,,