Update to v0.2.9 with bug fixes and change to write to server URL to mwi_proxy.lock

1. background tasks are manually instead of using app.on_startup to prevent race condition on setting mwi_server_url into mwi_proxy.lock in the presence of proxy_config_app.json
2. Added endpoint to accept base_url without trailing "/" character
3. Bug fix which includes base_url with site.name for mwi_server_url

Author: Prabhakar Kumar

matlab_proxy/app.py

@@ -257,7 +257,8 @@ async def root_redirect(request):
     Returns:
         HTTPResponse: HTTPResponse Object containing the index.html file.
     """
-    return aiohttp.web.HTTPFound("./index.html")
+    base_url = request.app["settings"]["base_url"]
+    return aiohttp.web.HTTPFound(f"{base_url}/index.html")
 
 
 async def static_get(req):
@@ -540,7 +541,7 @@ def configure_and_start(app):
 
     # Update the site origin in settings.
     # The origin will be used for communicating with the Embedded connector.
-    app["settings"]["mwi_server_url"] = site.name
+    app["settings"]["mwi_server_url"] = site.name + app["settings"]["base_url"]
 
     loop.run_until_complete(site.start())
 
@@ -552,10 +553,14 @@ def configure_and_start(app):
     logger.info(
         util.prettify(
             boundary_filler="=",
-            text_arr=[f"MATLAB can be accessed at:", site.name],
+            text_arr=[f"MATLAB can be accessed at:", app["settings"]["mwi_server_url"]],
         )
     )
 
+    # Startup tasks are being done here as app.on_startup leads
+    # to a race condition for mwi_server_url information which is
+    # extracted from the site info.
+    loop.run_until_complete(start_background_tasks(app))
     return app
 
 
@@ -596,9 +601,9 @@ def create_app(config_name=matlab_proxy.get_default_config_name()):
         "DELETE", f"{base_url}/terminate_integration", termination_integration_delete
     )
     app.router.add_route("*", f"{base_url}/", root_redirect)
+    app.router.add_route("*", f"{base_url}", root_redirect)
     app.router.add_route("*", f"{base_url}/{{proxyPath:.*}}", matlab_view)
 
-    app.on_startup.append(start_background_tasks)
     app.on_cleanup.append(cleanup_background_tasks)
 
     return app

matlab_proxy/app_state.py

@@ -406,8 +406,9 @@ def prepare_lock_files_for_MATLAB_launch(self):
                     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                     s.bind(("", port))
 
+                    # Use the app_port number to identify the server as that is user visible
                     matlab_ready_file_dir = self.settings["mwi_logs_root_dir"] / str(
-                        port
+                        self.settings["app_port"]
                     )
 
                     mwi_proxy_lock_file = (
@@ -432,7 +433,8 @@ def prepare_lock_files_for_MATLAB_launch(self):
 
                         # Creating the mwi_proxy.lock file to indicate to any other matlab-proxy processes
                         # that this self.matlab_port number is taken up by this process.
-                        mwi_proxy_lock_file.touch()
+                        with open(mwi_proxy_lock_file, "w") as lock_file:
+                            lock_file.write(self.settings["mwi_server_url"] + "/")
 
                         # Update member variables of AppState class
 

matlab_proxy/matlab/startup.m

@@ -33,4 +33,5 @@
 end
 matlab_settings.matlab.addons.explorer.isExplorerSupported.TemporaryValue = false;
 
-clear matlab_settings
+clear matlab_settings
+clc

setup.py

@@ -51,7 +51,7 @@ def run(self):
 
 setuptools.setup(
     name="matlab-proxy",
-    version="0.2.8",
+    version="0.2.9",
     url=config["doc_url"],
     author="The MathWorks, Inc.",
     author_email="[email protected]",

tests/test_app.py

@@ -22,9 +22,8 @@ def test_create_app():
     # Verify router is configured with some routes
     assert test_server.router._resources is not None
 
-    # Verify app server has startup and cleanup tasks
-    # By default there is 1 start up and clean up task
-    assert len(test_server._on_startup) > 1
+    # Verify app server has a cleanup task
+    # By default there is 1 for clean up task
     assert len(test_server.on_cleanup) > 1