matlab-proxy 0.27.0__tar.gz → 0.27.1__tar.gz

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matlab-proxy
-Version: 0.27.0
+Version: 0.27.1
 Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
 Project-URL: Homepage, https://github.com/mathworks/matlab-proxy/
 Project-URL: Documentation, https://github.com/mathworks/matlab-proxy/blob/main/README.md

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/gui/src/components/App/index.jsx

@@ -4,8 +4,6 @@ import React, { useState, useCallback, useEffect, useMemo, useRef } from 'react'
 import { useSelector, useDispatch } from 'react-redux';
 import { useInterval, useTimeoutFn } from 'react-use';
 import './App.css';
-import './3p/css/bootstrap.min.css';
-import './3p/css/site7.min.css';
 import Confirmation from '../Confirmation';
 import OverlayTrigger from '../OverlayTrigger';
 import Overlay from '../Overlay';

matlab_proxy-0.27.1/gui/src/components/LicensingGatherer/MHLM.css

@@ -0,0 +1,7 @@
+/* Copyright 2025 The MathWorks, Inc. */
+
+iframe {
+    border: 0px;
+    height: 380px;                
+    width: 100%;
+}

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/gui/src/components/LicensingGatherer/MHLM.jsx

@@ -13,6 +13,8 @@ import {
     fetchSetLicensing
 } from '../../actionCreators';
 
+import './MHLM.css';
+
 // Send a generated nonce to the login iframe
 function setLoginNonce (username) {
     const clientNonce = (Math.random() + '').substr(2);
@@ -150,9 +152,6 @@ function MHLM ({ mhlmLicensingInfo = null }) {
                 id="loginframe"
                 title="MathWorks Embedded Login"
                 type="text/html"
-                height="380"
-                width="100%"
-                frameBorder="0"
                 src={embeddedLoginUrl}
                 onLoad={handleIFrameLoaded}
             >

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/gui/src/components/MatlabJsd/index.jsx

@@ -39,7 +39,6 @@ function MatlabJsd ({ url, iFrameRef, shouldListenForEvents, handleUserInteracti
                 ref={iFrameRef}
                 title="MATLAB JSD"
                 src={url}
-                frameBorder="0"
                 allowFullScreen />
         </div>
     );

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/hatch_build.py

@@ -3,7 +3,7 @@
 import os
 import subprocess
 from pathlib import Path
-from shutil import which, copytree
+from shutil import copytree, which
 from typing import Any, Dict
 
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
@@ -23,7 +23,8 @@ class CustomBuildHook(BuildHookInterface):
                 "npm must be installed and on the path during package build!"
             )
 
-        npm_install = [npm_path, "install"]
+        # Adding retries to npm install to avoid transient rate limiting issues
+        npm_install = [npm_path, "install", "--fetch-retries", "10"]
         npm_build = [npm_path, "run", "build"]
 
         pwd = Path.cwd()

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/app.py

@@ -432,25 +432,38 @@ async def shutdown_integration_delete(req):
         req (HTTPRequest): HTTPRequest Object
     """
     state = req.app["state"]
-
     logger.info(f"Shutting down {state.settings['integration_name']}...")
 
-    # Send response manually because this has to happen before the application exits
     res = create_status_response(req.app, "../")
-    await res.prepare(req)
-    await res.write_eof()
 
-    # Gracefully shutdown the server
-    await req.app.shutdown()
-    await req.app.cleanup()
+    # Schedule the shutdown to happen after the response is sent
+    asyncio.create_task(_shutdown_after_response(req.app))
+
+    return res
+
+
+async def _shutdown_after_response(app):
+    # Shutdown the application after a short delay to allow the response to be fully sent
+    # back to the client before the server is stopped
+    await asyncio.sleep(0.1)
+
+    # aiohttp shutdown to be invoked before cleanup -
+    # https://docs.aiohttp.org/en/stable/web_reference.html#aiohttp.web.Application.shutdown
+    await app.shutdown()
+    await app.cleanup()
 
     loop = util.get_event_loop()
-    # Run the current batch of coroutines in the event loop and then exit.
-    # This completes the loop.run_forever() blocking call and subsequent code
-    # in create_and_start_app() resumes execution.
-    loop.stop()
 
-    return res
+    # Cancel remaining tasks (except this one: _shutdown_after_response)
+    running_tasks = asyncio.all_tasks(loop)
+    current_task = asyncio.current_task()
+    if current_task:
+        running_tasks.discard(current_task)
+
+    await util.cancel_tasks(running_tasks)
+
+    # Stop the event loop from this task
+    loop.call_soon_threadsafe(loop.stop)
 
 
 # @token_auth.authenticate_access_decorator
@@ -873,8 +886,6 @@ def configure_and_start(app):
     """
     loop = util.get_event_loop()
 
-    web_logger = None if not mwi_env.is_web_logging_enabled() else logger
-
     # Setup the session storage,
     # Uniqified per session to prevent multiple proxy servers on the same FQDN from interfering with each other.
     uniqify_session_cookie = secrets.token_hex()
@@ -888,7 +899,9 @@ def configure_and_start(app):
     )
 
     # Setup runner
-    runner = web.AppRunner(app, logger=web_logger, access_log=web_logger)
+    runner = web.AppRunner(
+        app, access_log=logger if mwi_env.is_web_logging_enabled() else None
+    )
     loop.run_until_complete(runner.setup())
 
     # Prepare site to start, then set port of the app.
@@ -961,7 +974,7 @@ def create_app(config_name=matlab_proxy.get_default_config_name()):
     app.router.add_route("*", f"{base_url}", root_redirect)
 
     app.router.add_route("*", f"{base_url}/{{proxyPath:.*}}", matlab_view)
-    app.on_cleanup.append(cleanup_background_tasks)
+    app.on_shutdown.append(cleanup_background_tasks)
 
     return app
 
@@ -1011,15 +1024,15 @@ def create_and_start_app(config_name):
 
     # After handling the interrupt, proceed with shutting down the server gracefully.
     try:
+        # aiohttp shutdown to be invoked before cleanup -
+        # https://docs.aiohttp.org/en/stable/web_reference.html#aiohttp.web.Application.shutdown
+        loop.run_until_complete(app.shutdown())
+        loop.run_until_complete(app.cleanup())
+
         running_tasks = asyncio.all_tasks(loop)
-        loop.run_until_complete(
-            asyncio.gather(
-                app.shutdown(),
-                app.cleanup(),
-                util.cancel_tasks(running_tasks),
-                return_exceptions=False,
-            )
-        )
+
+        # Gracefully cancel all running background tasks
+        loop.run_until_complete(util.cancel_tasks(running_tasks))
 
     except Exception:
         pass

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/app_state.py

@@ -484,7 +484,7 @@ class AppState:
                         "'busy' status endpoint returned an invalid response, falling back to using 'ping' endpoint to determine MATLAB state"
                     )
                     warning = f"{mwi_env.get_env_name_shutdown_on_idle_timeout()} environment variable is supported only for MATLAB versions R2021a or later"
-                    logger.warn(warning)
+                    logger.warning(warning)
                     self.warnings.append(warning)
 
                 else:

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/settings.py

@@ -289,7 +289,6 @@ def get(config_name=matlab_proxy.get_default_config_name(), dev=False):
             if not settings["is_windowmanager_available"]:
                 warning = " Unable to find fluxbox on the system PATH. To use Simulink Online, add Fluxbox to the system PATH and restart matlab-proxy. For details, see https://github.com/mathworks/matlab-proxy#requirements."
                 logger.warning(warning)
-                settings["warnings"].append(warning)
 
         settings.update(get_matlab_settings())
 
@@ -500,7 +499,7 @@ def _validate_ssl_files_and_get_ssl_context(mwi_config_folder):
     # Don't use SSL if the user has explicitly disabled SSL communication or not set the respective env var
     if not is_ssl_enabled:
         if ssl_cert_file:
-            logger.warn(
+            logger.warning(
                 f"Ignoring provided SSL files, as {env_name_enable_ssl} is either unset or set to false"
             )
         return None
@@ -597,7 +596,7 @@ def generate_new_self_signed_certs(mwi_certs_dir):
             f.write(cert.public_bytes(serialization.Encoding.PEM))
 
     except Exception as ex:
-        logger.warn(
+        logger.warning(
             f"Failed to generate self-signed certificates, proceeding with non-secure mode! Error: {ex}"
         )
         cert_file = priv_key_file = None

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/util/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 import argparse
 import inspect
 import os
@@ -312,7 +312,7 @@ class TrackingLock:
         self._acquired_by = None
         self._lock = asyncio.Lock()
         if not purpose:
-            logger.warn("Provide a purpose for this instance of TrackingLock")
+            logger.warning("Provide a purpose for this instance of TrackingLock")
         self._purpose = purpose
 
     @property

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/util/mwi/logger.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 """Functions to access & control the logging behavior of the app"""
 
 import logging
@@ -8,7 +8,6 @@ from pathlib import Path
 
 from . import environment_variables as mwi_env
 
-
 logging.getLogger("aiohttp_session").setLevel(logging.ERROR)
 
 

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/util/mwi/token_auth.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 The MathWorks, Inc.
+# Copyright 2020-2025 The MathWorks, Inc.
 
 # This file contains functions required to enable token based authentication in the server.
 
@@ -39,7 +39,7 @@ def generate_mwi_auth_token_and_hash():
 
     if enable_token_auth == "false":
         if auth_token:
-            logger.warn(
+            logger.warning(
                 f"Ignoring {env_name_mwi_auth_token}, as {env_name_enable_mwi_token_auth} explicitly set to false"
             )
         return _format_token_as_dictionary(None)

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/matlab_proxy/util/mwi/validators.py

@@ -380,7 +380,7 @@ def validate_idle_timeout(timeout):
         return timeout
 
     except ValueError:
-        logger.warn(
+        logger.warning(
             f"Invalid value supplied for {mwi_env.get_env_name_shutdown_on_idle_timeout()}: {timeout}. Continuing without any IDLE timeout."
         )
         return None

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "matlab-proxy"
-version = "0.27.0"
+version = "0.27.1"
 description = "Python® package enables you to launch MATLAB® and access it from a web browser."
 readme = "README.md"
 license = "LicenseRef-MATHWORKS-CLOUD-REFERENCE-ARCHITECTURE-LICENSE"

{matlab_proxy-0.27.0 → matlab_proxy-0.27.1}/tests/unit/test_app.py

@@ -79,9 +79,10 @@ def test_create_app(event_loop):
     # Verify router is configured with some routes
     assert test_server.router._resources is not None
 
-    # Verify app server has a cleanup task
+    # Verify app server has a shutdown task
     # By default there is 1 for clean up task
-    assert len(test_server.on_cleanup) > 1
+    assert len(test_server.on_shutdown) == 1
+    assert len(test_server.on_cleanup) == 1
     event_loop.run_until_complete(test_server["state"].stop_server_tasks())