From 613269450ff3ade42d6ea183d6077c7d798106e3 Mon Sep 17 00:00:00 2001
From: vados-dev <192440777+vados-dev@users.noreply.github.com>
Date: Mon, 4 May 2026 20:20:03 +0300
Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root,
 in 20:20:03 04.05.2026.

---
 html/AM-FwAddrLists.rsc | 48 +++++++++++++++++++++++++----------------
 html/AM-GlobalFunc.rsc  |  4 ++--
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index 825c9e734..3512bf3c5 100644
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -50,25 +50,34 @@
   }
 
   :local ListComment ("managed by " . $ScriptName);
+  :local Url ($ListsUrl . $ListsIndex);
   :local tmpIndex false;
 
-  :onerror Err {
-        :local Url ($ListsUrl . $ListsIndex);
-        :log info ($0 " Fetching script '" . $ScriptName . "' from url: " . $Url);
-        :set tmpIndex [ /tool/fetch check-certificate=yes-without-crl \
-          http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) $Url output=user as-value ];
-        :if ($tmpIndex->"status" = "finished") do={
-          :set arrLists [ :tolf ($tmpIndex->"Lists") ];
-        }
-      } do={
+  :do {
+    :onerror Err {
+      :log info ($0 " Fetching script '" . $ScriptName . "' from url: " . $Url);
+      :set tmpIndex [ /tool/fetch check-certificate=yes-without-crl \
+      http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) $Url dst-path=$tmpIndex ];
+    } do={
+      :if (!($Err ~ "[Ss]tatus 404")) do={
         :log warning ($ScriptName . " Failed downloading address-lists index from: '" . $Url . "' Error: " . $Err);
-        :if ($Err != "Fetch failed with status 404") do={
-          :error false;
-        }
-      :set tmpIndex false;
-      :set arrLists false;
-      :error true;
       }
+    :error false;
+   }
+   $WaitForFile $tmpIndex;
+
+#        :if ($tmpIndex->"status" = "finished") do={
+#          :set arrLists [ :tolf ($tmpIndex->"Lists") ];
+#        }
+#      } do={
+#        :log warning ($ScriptName . " Failed downloading address-lists index from: '" . $Url . "' Error: " . $Err);
+#        :if ($Err != "Fetch failed with status 404") do={
+#          :error false;
+#        }
+#      :set tmpIndex false;
+#      :set arrLists false;
+#      :error true;
+#      }
 
 #  :for I from=1 to=5 do={
 #    :if ($tmpIndex = false) do={
@@ -79,10 +88,11 @@
 #      }
 #    }
 #  }
-#  :if ($tmpIndex = false) do={
-#    :log warning ($ScriptName . " Failed downloading address-list index from: " . $FwAddrListsUrl . $Index);
-#    :set tmpIndex "";
-#  }
+  :if ($tmpIndex = false) do={
+    :log warning ($ScriptName . " Failed downloading address-list index from: " . $FwAddrListsUrl . $Index);
+    :set tmpIndex "";
+  }
+  }
 
   :foreach List in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
     :set List ($List->0);
diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index c690ea66b..3f9ea6461 100644
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/591/7dc214a5";
+:global CommitId "main/592/9ef54f8b";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:55:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 20:20:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;
-- 
2.52.0