Fix Socket.IO Uploads by Aligning Server/Client Paths

python/mdvtools/dbutils/safe_mdv_app.py

@@ -7,63 +7,62 @@
 
 logger.info("safe_mdv_app.py starting")
 
+# https://stackoverflow.com/a/36033627/279703
+class PrefixMiddleware(object):
+    def __init__(self, app, prefix=''):
+        self.app = app
+        self.prefix = prefix
+
+    def __call__(self, environ, start_response):
+        if environ['PATH_INFO'].startswith(self.prefix):
+            environ['PATH_INFO'] = environ['PATH_INFO'][len(self.prefix):]
+            environ['SCRIPT_NAME'] = self.prefix
+            return self.app(environ, start_response)
+        else:
+            response_body = b"This url does not belong to the app."
+            headers = [('Content-Type', 'text/plain'), ('Content-Length', str(len(response_body)))]
+            start_response('404 Not Found', headers)
+            return [response_body]
+
 # Import the app at the module level (outside any conditionals)
 try:
     from mdvtools.dbutils.mdv_server_app import app
-    # app = socketio
     if app is None:
         logger.error("app from mdv_server_app is None - using fallback")
         app = Flask(__name__)
 except Exception as e:
     logger.exception(f'Error importing mdv_app: {e}')
     app = Flask(__name__)
 
+# Apply prefix middleware at module level - works for both direct run and WSGI deployment
+prefix = os.environ.get('MDV_API_ROOT', '')
+if prefix:
+    # Remove trailing slash from prefix if it exists
+    if prefix.endswith('/'):
+        prefix = prefix[:-1]
+
+    logger.info(f"Applying PrefixMiddleware with prefix: {prefix}")
+    app.wsgi_app = PrefixMiddleware(app.wsgi_app, prefix=prefix)
+
 # Keep the existing __main__ block for direct execution
 if __name__ == '__main__':
     """
     Running the app in local debugger with a path prefix
-    This can be usefull for testing behaviour app running on a sub-path
+    This can be useful for testing behaviour app running on a sub-path
     """
     from mdvtools.websocket import socketio
     from mdvtools.socketio_upload import initialize_socketio_upload
-    # https://stackoverflow.com/a/36033627/279703
-    class PrefixMiddleware(object):
-
-        def __init__(self, app, prefix=''):
-            self.app = app
-            self.prefix = prefix
-
-        def __call__(self, environ, start_response):
-            if environ['PATH_INFO'].startswith(self.prefix):
-                environ['PATH_INFO'] = environ['PATH_INFO'][len(self.prefix):]
-                environ['SCRIPT_NAME'] = self.prefix
-                return self.app(environ, start_response)
-            else:
-                # It's good practice to ensure the Content-Length header is set.
-                # The Werkzeug BaseResponse object (which Flask uses) handles this automatically
-                # if the response is a string or a list of strings, but here we are returning a list of bytes.
-                response_body = b"This url does not belong to the app."
-                headers = [('Content-Type', 'text/plain'), ('Content-Length', str(len(response_body)))]
-                start_response('404 Not Found', headers)
-                return [response_body]
 
     logger.info("running as __main__")
-    os.environ['MDV_API_ROOT'] = '/test/'
-
-    # Get the prefix from the environment variable
-    prefix = os.environ.get('MDV_API_ROOT', '')
-    # Remove trailing slash from prefix if it exists, as PATH_INFO usually starts with a slash
-    if prefix.endswith('/'):
-        prefix = prefix[:-1]
-
-    if prefix:
-        logger.info(f"Applying PrefixMiddleware with prefix: {prefix}")
-        app.wsgi_app = PrefixMiddleware(app.wsgi_app, prefix=prefix)
+    # Set default for local testing if not already set
+    if 'MDV_API_ROOT' not in os.environ:
+        os.environ['MDV_API_ROOT'] = '/test/'
 
     # Register upload socket events
     if initialize_socketio_upload is not None:
         initialize_socketio_upload(app)
-    # app.run(host='0.0.0.0', debug=False, port=5056)
+
+    # Run with socketio if available, otherwise fallback to Flask
     if socketio is not None:
         socketio.run(app, host='0.0.0.0', debug=False, port=5056)
     else:

python/mdvtools/websocket.py

@@ -27,7 +27,7 @@ class SocketIOContextRequest(FlaskRequest):
 def mdv_socketio(app: Flask):
     """
     Experimental and not to be trusted pending design work etc.
-    
+
     Do we have a SocketIO for the entire app and route messages internally,
     - yes probably.
     What `path` should it use? We'll need to make sure it is compatible with
@@ -40,8 +40,15 @@ def mdv_socketio(app: Flask):
     global socketio
     # allow cors for localhost:5170-5179
     # cors = [f"http://localhost:{i}" for i in range(5170,5180)]
-    socketio = SocketIO(app, cors_allowed_origins="*")
-    log("socketio initialized with cors_allowed_origins wildcard")
+
+    # Get the API root path for SocketIO path configuration
+    api_root = app.config.get('mdv_api_root', '/')
+    if api_root != '/' and not api_root.endswith('/'):
+        api_root += '/'
+    socketio_path = f"{api_root}socket.io"
+
+    socketio = SocketIO(app, cors_allowed_origins="*", path=socketio_path)
+    log(f"socketio initialized with cors_allowed_origins wildcard and path={socketio_path}")
 
     # @socketio.on("message")
     # def message(data):

src/charts/dialogs/SocketIOUploadClient.ts

@@ -217,10 +217,10 @@ export class SocketIOUploadClient {
             this.socket = io(`${this.config.namespace}`, {
                 path: this.config.socketPath || '/socket.io',   // '/test/socket.io' or '/carroll/socket.io'
                 autoConnect: false,
-                transports: ['polling'],
+                transports: ['websocket', 'polling'],
                 timeout: 60000,
                 forceNew: true,
-                reconnection: false,
+                reconnection: true,
                 reconnectionDelay: 1000,
                 reconnectionAttempts: 5,
             });