refactor: code restructure

1. split frontend and backend 2. simplify supervisor configuration 3. align backend log format with supervisor 4. set nginx worker to 1 5. delete static web pages
2026-08-05 16:12:41 +02:00 · 2018-03-13 21:24:45 +08:00
parent f5da5d152f
commit 99af8cd699
21 changed files with 14 additions and 292 deletions
@@ -0,0 +1,138 @@
+from flask import (Flask,
+                   request,
+                   abort,
+                   )
+import os
+import json
+from functools import wraps
+import subprocess
+import time
+
+
+# Flask app
+app = Flask('novnc2')
+CONFIG = os.environ.get('CONFIG') or 'config.Development'
+app.config.from_object('config.Default')
+app.config.from_object(CONFIG)
+FIRST = 'RESOLUTION' not in os.environ
+
+
+# logging
+import logging
+from log.config import LoggingConfiguration
+LoggingConfiguration.set(
+    logging.DEBUG if os.getenv('DEBUG') else logging.INFO,
+    '/var/log/web.log'
+)
+
+
+def exception_to_json(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            result = func(*args, **kwargs)
+            return result
+        except (BadRequest,
+                KeyError,
+                ValueError,
+                ) as e:
+            result = {'error': {'code': 400,
+                                'message': str(e)}}
+        except PermissionDenied as e:
+            result = {'error': {'code': 403,
+                                'message': ', '.join(e.args)}}
+        except (NotImplementedError, RuntimeError, AttributeError) as e:
+            result = {'error': {'code': 500,
+                                'message': ', '.join(e.args)}}
+        return json.dumps(result)
+    return wrapper
+
+
+class PermissionDenied(Exception):
+    pass
+
+
+class BadRequest(Exception):
+    pass
+
+
+HTML_INDEX = '''<html><head>
+    <script type="text/javascript">
+        var w = window,
+        d = document,
+        e = d.documentElement,
+        g = d.getElementsByTagName('body')[0],
+        x = w.innerWidth || e.clientWidth || g.clientWidth,
+        y = w.innerHeight|| e.clientHeight|| g.clientHeight;
+        var url = "redirect.html?width=" + x + "&height=" + (parseInt(y));
+        window.location.href = url;
+    </script>
+    <title>Page Redirection</title>
+</head><body></body></html>'''
+
+
+HTML_REDIRECT = '''<html><head>
+    <script type="text/javascript">
+        var port = window.location.port;
+        if (!port)
+            port = window.location.protocol[4] == 's' ? 443 : 80;
+        window.location.href = "vnc.html?autoconnect=1&autoscale=0&quality=3";
+    </script>
+    <title>Page Redirection</title>
+</head><body></body></html>'''
+
+
+@app.route('/')
+def index():
+    return HTML_INDEX
+
+
+@app.route('/api/status')
+def status():
+    global FIRST
+    return json.dumps({
+        'default_resolution': FIRST
+    })
+
+
+@app.route('/redirect.html')
+def redirectme():
+    global FIRST
+
+    if not FIRST:
+        return HTML_REDIRECT
+
+    env = {'width': 1024, 'height': 768}
+    if 'width' in request.args:
+        env['width'] = request.args['width']
+    if 'height' in request.args:
+        env['height'] = request.args['height']
+
+    # sed
+    cmd = (
+        'sed -i \'s#'
+        '^exec /usr/bin/Xvfb.*$'
+        '#'
+        'exec /usr/bin/Xvfb :1 -screen 0 {width}x{height}x16'
+        '#\' /usr/local/bin/xvfb.sh'
+    ).format(**env),
+    subprocess.check_call(cmd, shell=True)
+    # supervisorctrl reload
+    subprocess.check_call(['supervisorctl', 'restart', 'x:'])
+
+    # check all running
+    for i in range(40):
+        output = subprocess.check_output(['supervisorctl', 'status'])
+        for line in output.strip().split('\n'):
+            if line.find('RUNNING') < 0:
+                break
+        else:
+            FIRST = False
+            return HTML_REDIRECT
+        time.sleep(1)
+        logging.info('wait services is ready...')
+    abort(500, 'service is not ready, please restart container')
+
+
+if __name__ == '__main__':
+    app.run(host=app.config['ADDRESS'], port=app.config['PORT'])