fix(flashstart): fix euci sync issue and disabled WAN DHCP resolver (#1250)

Author: Tbaile

packages/ns-flashstart/README.md

@@ -40,6 +40,22 @@ uci commit flashstart
 reload_config
 ```
 
+## Debug mode
+
+The daemon can be run in various logging levels, to set the levels you can:
+
+```
+uci set flashstart.global.log_level="debug"
+uci commit flashstart
+reload_config
+```
+
+To check for the logging levels available, please refer to the CLI utility help:
+
+```
+ns-flashstart --help
+```
+
 ## CLI utility
 
 The script `/usr/sbin/ns-flashstart` can be used to manage the client from command line. To see the

packages/ns-flashstart/files/ns-flashstart

@@ -28,8 +28,14 @@ DEFAULT_HEADERS = {
 
 CONST_PORT_START = 5300
 
+# this wrapper is more hideous than it looks. UCI config gets read ONLY ONCE WHEN INSTANTIATED, beware of that.
 e_uci = EUci()
 
+def __refresh_uci():
+    global e_uci
+    e_uci = EUci()
+
+
 def __get_client() -> requests.Session:
     session = requests.Session()
     session.headers.update(DEFAULT_HEADERS)
@@ -215,6 +221,9 @@ def __add_profile(port, profile):
     e_uci.set('dhcp', profile['id'], 'ns_flashstart_profile', profile["name"])
     e_uci.set('dhcp', profile['id'], 'ns_flashstart_dns_code', profile["dns_code"])
     e_uci.set('dhcp', profile['id'], 'port', port)
+    e_uci.set('dhcp', profile['id'], 'noresolv', True)
+    e_uci.set('dhcp', profile['id'], 'max_ttl', 60)
+    e_uci.set('dhcp', profile['id'], 'max_cache_ttl', 60)
     # sets always get replaced, checking before replacing
     custom_servers = list(e_uci.get('flashstart', 'global', 'custom_servers', list=True, dtype=str, default=[]))
     servers = sorted(custom_servers + profile['servers'])
@@ -359,9 +368,9 @@ def __sync_pro_plus_profiles():
 
 
 def sync():
-    __sync_host_sets()
     if e_uci.get('flashstart', 'global', 'proplus', default=False, dtype=bool):
         logging.debug('Syncing pro+ profiles')
+        __sync_host_sets()
         __sync_pro_plus_profiles()
     else:
         logging.debug('Syncing pro profiles')
@@ -419,7 +428,7 @@ def ping():
         cmd = ["curl", "-s", "--connect-timeout", "10", "--interface", wan, url]
         res = subprocess.run(cmd, capture_output=True, text=True)
         if res.returncode != 0:
-            raise Exception(f'Failed to update IP for WAN {wan} -> {wan_id} with error: {res.stdout}')
+            logging.warning(f'Failed to update IP for WAN {wan} -> {wan_id} with error: {res.stdout}')
         counter = counter + 1
 
 
@@ -495,6 +504,8 @@ def main():
                 except Exception as e:
                     logging.error(f'Unexpected error: {e}')
                 event_handler.wait(wait_time)
+                # re-init the UCI object to avoid issues with the config being changed
+                __refresh_uci()
             # remove the config
             disable()
         case 'ping':

packages/ns-flashstart/files/ns-flashstart.init

@@ -10,14 +10,15 @@ USE_PROCD=1
 
 start_service() {
   config_load flashstart
-  local enabled
+  local enabled log_level
   config_get enabled global enabled
+  config_get log_level global log_level "warning"
 
   if [ "$enabled" != "1" ]; then
     return 0
   fi
   procd_open_instance
-  procd_set_param command /usr/sbin/ns-flashstart daemon
+  procd_set_param command /usr/sbin/ns-flashstart --log-level "$log_level" daemon
   procd_set_param stdout 1
   procd_set_param stderr 1
   procd_set_param respawn 3600 60 0

packages/ns-flashstart/files/uci-default

@@ -47,5 +47,6 @@ then
   done
   # set default
   uci -q set flashstart.global.proplus=0
+  uci -q set flashstart.global.log_level=warning
   uci commit flashstart
 fi