cleepcli 1.48.0__tar.gz → 1.48.1__tar.gz

{cleepcli-1.48.0/cleepcli.egg-info → cleepcli-1.48.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.48.0
+Version: 1.48.1
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau
@@ -17,11 +17,11 @@ Requires-Dist: sphinx-rtd-theme>=1.0.0
 Requires-Dist: CProfileV>=1.0.7
 Requires-Dist: PyGithub==1.54.1
 Requires-Dist: pylint<3.0.0,>=2.11.1
-Requires-Dist: semver==3.0.0
-Requires-Dist: coverage==7.2.7
-Requires-Dist: passlib==1.7.4
-Requires-Dist: requests==2.31.0
-Requires-Dist: psutil==5.9.4
+Requires-Dist: semver<4.0.0,>=3.0.0
+Requires-Dist: coverage<8.0.0,>=7.2.7
+Requires-Dist: passlib<2.0.0,>=1.7.4
+Requires-Dist: requests<3.0.0,>=2.32.5
+Requires-Dist: psutil<8.0.0,>=5.9.4
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -63,7 +63,7 @@ This utility helps developers to build Cleep applications providing some useful
 - Watch commands:
     - `watch` to watch for repository filesystem changes and automatically update files on execution folders. It also restart backend or/and frontend according to changes (catch-up sync on start).
     - `watchsvc` to install/enable/disable/restart the durable `cleep-watch` systemd unit (runs `watch` outside `cleep.service`).
-    - `syncall` to force a one-shot sync of core + all modules (same catch-up as watch start).
+    - `syncall` to force a one-shot sync of core + all modules, disable static cache, and reload the UI.
 - Misc commands:
     - `version` to get cleep-cli version
 
@@ -96,7 +96,7 @@ cleep-cli watchsvc enable
 
 The unit runs `cleep-cli watch`, survives `systemctl restart cleep`, and on each start performs a catch-up `syncall` so files written while the watcher was down are applied.
 
-Manual one-shot resync (when the UI looks stale):
+Manual one-shot resync (when the UI looks stale) — `syncall` also mints a fresh asset bust and reloads the device UI:
 
 ```
 cleep-cli syncall

{cleepcli-1.48.0 → cleepcli-1.48.1}/README.md

@@ -27,7 +27,7 @@ This utility helps developers to build Cleep applications providing some useful
 - Watch commands:
     - `watch` to watch for repository filesystem changes and automatically update files on execution folders. It also restart backend or/and frontend according to changes (catch-up sync on start).
     - `watchsvc` to install/enable/disable/restart the durable `cleep-watch` systemd unit (runs `watch` outside `cleep.service`).
-    - `syncall` to force a one-shot sync of core + all modules (same catch-up as watch start).
+    - `syncall` to force a one-shot sync of core + all modules, disable static cache, and reload the UI.
 - Misc commands:
     - `version` to get cleep-cli version
 
@@ -60,7 +60,7 @@ cleep-cli watchsvc enable
 
 The unit runs `cleep-cli watch`, survives `systemctl restart cleep`, and on each start performs a catch-up `syncall` so files written while the watcher was down are applied.
 
-Manual one-shot resync (when the UI looks stale):
+Manual one-shot resync (when the UI looks stale) — `syncall` also mints a fresh asset bust and reloads the device UI:
 
 ```
 cleep-cli syncall

{cleepcli-1.48.0 → cleepcli-1.48.1}/bin/ccli

@@ -114,12 +114,18 @@ def syncall():
     """
     Synchronize core and all modules from /root/cleep-dev to execution folders.
 
-    Same catch-up used when cleep-watch.service starts. Safe one-shot resync when
-    the UI looks stale: run this, then reload the device page.
+    Same catch-up used when cleep-watch.service starts. Also disables frontend
+    static cache, mints a new asset bust, and reloads the UI so the device page
+    cannot keep stale JS.
     """
+    from cleepcli.cleepapi import CleepApi
+
     f = File()
     if not f.sync_all():
         sys.exit(1)
+    api = CleepApi(None)
+    api.ensure_frontend_nocache()
+    api.restart_frontend()
 
 @core.command()
 @click.option('--coverage', is_flag=True, help='Display coverage report.')

{cleepcli-1.48.0 → cleepcli-1.48.1}/bin/cleep-cli

@@ -114,12 +114,18 @@ def syncall():
     """
     Synchronize core and all modules from /root/cleep-dev to execution folders.
 
-    Same catch-up used when cleep-watch.service starts. Safe one-shot resync when
-    the UI looks stale: run this, then reload the device page.
+    Same catch-up used when cleep-watch.service starts. Also disables frontend
+    static cache, mints a new asset bust, and reloads the UI so the device page
+    cannot keep stale JS.
     """
+    from cleepcli.cleepapi import CleepApi
+
     f = File()
     if not f.sync_all():
         sys.exit(1)
+    api = CleepApi(None)
+    api.ensure_frontend_nocache()
+    api.restart_frontend()
 
 @core.command()
 @click.option('--coverage', is_flag=True, help='Display coverage report.')

{cleepcli-1.48.0 → cleepcli-1.48.1}/cleepcli/cleepapi.py

@@ -243,6 +243,32 @@ class CleepApi():
             return False
         return True
 
+    def ensure_frontend_nocache(self):
+        """
+        Disable RPC static cache and mint a fresh asset bust token.
+
+        Safe to call repeatedly; used after syncall / frontend watch batches so
+        the browser cannot keep stale core or module JS.
+        """
+        data = {
+            'to': 'inventory',
+            'command': 'bump_rpc_asset_cache',
+            'params': {},
+        }
+        result = self.__post(self.command_url, data)
+        if not result or result[0] != 200:
+            # Older cores only expose set_rpc_cache_control
+            data = {
+                'to': 'inventory',
+                'command': 'set_rpc_cache_control',
+                'params': {'cache_enabled': False},
+            }
+            result = self.__post(self.command_url, data)
+            if not result or result[0] != 200:
+                self.logger.debug('Unable to disable frontend static cache')
+                return False
+        return True
+
     def notify_sync_started(self):
         """
         Tell the developer UI a watch sync is starting.

{cleepcli-1.48.0 → cleepcli-1.48.1}/cleepcli/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = "1.48.0"
+VERSION = "1.48.1"

{cleepcli-1.48.0 → cleepcli-1.48.1}/cleepcli/watch.py

@@ -165,6 +165,9 @@ class ActionsExecutor(Thread):
                 self.logger.error("Sync failed, Cleep was not restarted")
                 self.cleep.notify_sync_failed()
                 return
+            # Always mint a fresh asset bust before UI reload so Chrome/Electron
+            # cannot reuse ?cleepversion / max-age=3600 core scripts.
+            self.cleep.ensure_frontend_nocache()
             if batch.backend:
                 # Backend restart drops the UI connection. The page reloads on its own
                 # once Cleep answers again, with the frontend files already synced.
@@ -563,6 +566,9 @@ class CleepWatchdog:
                     WATCH_SERVICE,
                 )
                 return False
+            # Files may have landed while Cleep/UI were up with an old bust token.
+            self.actions_executor.cleep.ensure_frontend_nocache()
+            self.actions_executor.cleep.restart_frontend()
 
         self.actions_executor.start()
 

{cleepcli-1.48.0 → cleepcli-1.48.1/cleepcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.48.0
+Version: 1.48.1
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau
@@ -17,11 +17,11 @@ Requires-Dist: sphinx-rtd-theme>=1.0.0
 Requires-Dist: CProfileV>=1.0.7
 Requires-Dist: PyGithub==1.54.1
 Requires-Dist: pylint<3.0.0,>=2.11.1
-Requires-Dist: semver==3.0.0
-Requires-Dist: coverage==7.2.7
-Requires-Dist: passlib==1.7.4
-Requires-Dist: requests==2.31.0
-Requires-Dist: psutil==5.9.4
+Requires-Dist: semver<4.0.0,>=3.0.0
+Requires-Dist: coverage<8.0.0,>=7.2.7
+Requires-Dist: passlib<2.0.0,>=1.7.4
+Requires-Dist: requests<3.0.0,>=2.32.5
+Requires-Dist: psutil<8.0.0,>=5.9.4
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -63,7 +63,7 @@ This utility helps developers to build Cleep applications providing some useful
 - Watch commands:
     - `watch` to watch for repository filesystem changes and automatically update files on execution folders. It also restart backend or/and frontend according to changes (catch-up sync on start).
     - `watchsvc` to install/enable/disable/restart the durable `cleep-watch` systemd unit (runs `watch` outside `cleep.service`).
-    - `syncall` to force a one-shot sync of core + all modules (same catch-up as watch start).
+    - `syncall` to force a one-shot sync of core + all modules, disable static cache, and reload the UI.
 - Misc commands:
     - `version` to get cleep-cli version
 
@@ -96,7 +96,7 @@ cleep-cli watchsvc enable
 
 The unit runs `cleep-cli watch`, survives `systemctl restart cleep`, and on each start performs a catch-up `syncall` so files written while the watcher was down are applied.
 
-Manual one-shot resync (when the UI looks stale):
+Manual one-shot resync (when the UI looks stale) — `syncall` also mints a fresh asset bust and reloads the device UI:
 
 ```
 cleep-cli syncall

{cleepcli-1.48.0 → cleepcli-1.48.1}/cleepcli.egg-info/requires.txt

@@ -5,8 +5,8 @@ sphinx-rtd-theme>=1.0.0
 CProfileV>=1.0.7
 PyGithub==1.54.1
 pylint<3.0.0,>=2.11.1
-semver==3.0.0
-coverage==7.2.7
-passlib==1.7.4
-requests==2.31.0
-psutil==5.9.4
+semver<4.0.0,>=3.0.0
+coverage<8.0.0,>=7.2.7
+passlib<2.0.0,>=1.7.4
+requests<3.0.0,>=2.32.5
+psutil<8.0.0,>=5.9.4

cleepcli-1.48.1/requirements.txt

@@ -0,0 +1,18 @@
+# CLI-only
+Click>=8.0,<9.0
+watchdog>=3.0.0,<4.0.0
+Sphinx>=5.0.0,<6.0.0
+sphinx-rtd-theme>=1.0.0
+CProfileV>=1.0.7
+# Force version due to pynacl package introduced in 1.55 that makes 15-20 mins to build on raspi
+# This package seems useful only for github actions we are not using.
+PyGithub==1.54.1
+pylint>=2.11.1,<3.0.0
+semver>=3.0.0,<4.0.0
+
+# Shared with the Cleep device env — permissive ranges only.
+# Exact pins are owned by Cleep (requests, passlib, coverage) or cleepapp-system (psutil).
+coverage>=7.2.7,<8.0.0
+passlib>=1.7.4,<2.0.0
+requests>=2.32.5,<3.0.0
+psutil>=5.9.4,<8.0.0

{cleepcli-1.48.0 → cleepcli-1.48.1}/tests/test_file_sync_all.py

@@ -57,17 +57,22 @@ def test_watch_catch_up_calls_sync_all():
         "cleepcli.watch.CleepHandler"
     ) as handler_cls, patch(
         "cleepcli.watch.ActionsExecutor"
-    ), patch(
+    ) as executor_cls, patch(
         "cleepcli.watch.time.sleep", side_effect=KeyboardInterrupt
     ):
         file_cls.return_value.sync_all.return_value = True
         handler = handler_cls.return_value
         handler._watched = {"/tmp"}
         handler.schedule_all = Mock()
+        executor = executor_cls.return_value
+        executor.cleep.ensure_frontend_nocache = Mock(return_value=True)
+        executor.cleep.restart_frontend = Mock(return_value=True)
 
         watchdog = CleepWatchdog("https://127.0.0.1:443", catch_up=True)
         assert watchdog.watch() is True
         file_cls.return_value.sync_all.assert_called_once_with()
+        executor.cleep.ensure_frontend_nocache.assert_called_once_with()
+        executor.cleep.restart_frontend.assert_called_once_with()
 
 
 def test_watch_skip_catch_up():
@@ -79,13 +84,18 @@ def test_watch_skip_catch_up():
         "cleepcli.watch.CleepHandler"
     ) as handler_cls, patch(
         "cleepcli.watch.ActionsExecutor"
-    ), patch(
+    ) as executor_cls, patch(
         "cleepcli.watch.time.sleep", side_effect=KeyboardInterrupt
     ):
         handler = handler_cls.return_value
         handler._watched = {"/tmp"}
         handler.schedule_all = Mock()
+        executor = executor_cls.return_value
+        executor.cleep.ensure_frontend_nocache = Mock()
+        executor.cleep.restart_frontend = Mock()
 
         watchdog = CleepWatchdog("https://127.0.0.1:443", catch_up=False)
         assert watchdog.watch() is True
         file_cls.return_value.sync_all.assert_not_called()
+        executor.cleep.ensure_frontend_nocache.assert_not_called()
+        executor.cleep.restart_frontend.assert_not_called()

cleepcli-1.48.0/requirements.txt

@@ -1,15 +0,0 @@
-Click>=8.0,<9.0
-watchdog>=3.0.0,<4.0.0
-Sphinx>=5.0.0,<6.0.0
-sphinx-rtd-theme>=1.0.0
-CProfileV>=1.0.7
-# Force version due to pynacl package introduced in 1.55 that makes 15-20 mins to build on raspi
-# This package seems useful only for github actions we are not using.
-PyGithub==1.54.1
-pylint>=2.11.1,<3.0.0
-semver==3.0.0
-# Make sure deps below match with cleep ones
-coverage==7.2.7
-passlib==1.7.4
-requests==2.31.0
-psutil==5.9.4