Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:30:03 04.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index bdbc88a8a356b2ecbbc88cf2af8eb1800e3e8080..f42987296943bb4c5c3021baedbdf4ac6bb28168 100644 (file)
--- 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/586/4fa7a50c";
+:global CommitId "main/587/8420eba5";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:20:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:30:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;
@@ -660,72 +660,6 @@
   :return $Return;
 }
 
-:set FetchHugeFiles do={
-  :local ScriptName [ :tostr $1 ];
-  :local Url        [ :tostr $2 ];
-  :local CheckCert  [ :tostr $3 ];
-
-  :global CleanName;
-  :global FetchUserAgentStr;
-  :global GetRandom20CharAlNum;
-  :global IfThenElse;
-  :global LogPrint;
-  :global MkDir;
-  :global RmDir;
-  :global RmFile;
-  :global WaitForFile;
-
-  :set CheckCert [ $IfThenElse ($CheckCert = "false") "no" "yes-without-crl" ];
-
-  :local DirName ("tmpfs/" . [ $CleanName $ScriptName ]);
-  :if ([ $MkDir $DirName ] = false) do={
-    $LogPrint error $0 ("Failed creating directory!");
-    :return false;
-  }
-
-  :local FileName ($DirName . "/" . [ $CleanName $0 ] . "-" . [ $GetRandom20CharAlNum ]);
-  :onerror Err {
-    /tool/fetch check-certificate=$CheckCert $Url dst-path=$FileName \
-      http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
-  } do={
-    :if ([ $WaitForFile $FileName 500ms ] = true) do={
-      $RmFile $FileName;
-    }
-    $LogPrint debug $0 ("Failed downloading from " . $Url . " - " . $Err);
-    $RmDir $DirName;
-    :return false;
-  }
-
-  :if ([ $WaitForFile $FileName 5s ] = false) do={
-    $LogPrint debug $0 ("The file downloaded from " . $Url . " did not show up.");
-    :return false;
-  }
-
-  :local FileSize [ /file/get $FileName size ];
-  :local Return "";
-  :local VarSize 0;
-  :while ($VarSize != $FileSize) do={
-    :set Return ($Return . ([ /file/read offset=$VarSize chunk-size=32768 file=$FileName as-value ]->"data"));
-    :set FileSize [ /file/get $FileName size ];
-    :set VarSize [ :len $Return ];
-    :if ($VarSize > $FileSize) do={
-      :delay 100ms;
-    }
-  }
-  $RmDir $DirName;
-  :return $Return;
-}
-
-:set FetchUserAgentStr do={
-  :local Caller [ :tostr $1 ];
-  :global GlobalScriptsUrl;
-  :global CommitBrief;
-  :global IfThenElse;
-  :local Resource [ /system/resource/get ];
-  :return ("User-Agent: Mikrotik/" . $Resource->"version" . " " . $Resource->"architecture-name" . \
-    " " . $Caller . "/Fetch (" . $GlobalScriptsUrl . "; " . [ $CommitBrief ] . ")");
-}
-
 :set FileExists do={
   :local FileName [ :tostr $1 ];
   :local Type     [ :tostr $2 ];
@@ -1474,6 +1408,72 @@
 #  :return $Return;
 #}
 
+:set FetchHugeFiles do={
+  :local ScriptName [ :tostr $1 ];
+  :local Url        [ :tostr $2 ];
+  :local CheckCert  [ :tostr $3 ];
+
+  :global CleanName;
+  :global FetchUserAgentStr;
+  :global GetRandom20CharAlNum;
+  :global IfThenElse;
+  :global LogPrint;
+  :global MkDir;
+  :global RmDir;
+  :global RmFile;
+  :global WaitForFile;
+
+  :set CheckCert [ $IfThenElse ($CheckCert = "false") "no" "yes-without-crl" ];
+
+  :local DirName ("tmpfs/" . [ $CleanName $ScriptName ]);
+  :if ([ $MkDir $DirName ] = false) do={
+    $LogPrint error $0 ("Failed creating directory!");
+    :return false;
+  }
+
+  :local FileName ($DirName . "/" . [ $CleanName $0 ] . "-" . [ $GetRandom20CharAlNum ]);
+  :onerror Err {
+    /tool/fetch check-certificate=$CheckCert $Url dst-path=$FileName \
+      http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
+  } do={
+    :if ([ $WaitForFile $FileName 500ms ] = true) do={
+      $RmFile $FileName;
+    }
+    $LogPrint debug $0 ("Failed downloading from " . $Url . " - " . $Err);
+    $RmDir $DirName;
+    :return false;
+  }
+
+  :if ([ $WaitForFile $FileName 5s ] = false) do={
+    $LogPrint debug $0 ("The file downloaded from " . $Url . " did not show up.");
+    :return false;
+  }
+
+  :local FileSize [ /file/get $FileName size ];
+  :local Return "";
+  :local VarSize 0;
+  :while ($VarSize != $FileSize) do={
+    :set Return ($Return . ([ /file/read offset=$VarSize chunk-size=32768 file=$FileName as-value ]->"data"));
+    :set FileSize [ /file/get $FileName size ];
+    :set VarSize [ :len $Return ];
+    :if ($VarSize > $FileSize) do={
+      :delay 100ms;
+    }
+  }
+  $RmDir $DirName;
+  :return $Return;
+}
+
+:set FetchUserAgentStr do={
+  :local Caller [ :tostr $1 ];
+  :global GlobalScriptsUrl;
+  :global CommitBrief;
+  :global IfThenElse;
+  :local Resource [ /system/resource/get ];
+  :return ("User-Agent: Mikrotik/" . $Resource->"version" . " " . $Resource->"architecture-name" . \
+    " " . $Caller . "/Fetch (" . $GlobalScriptsUrl . "; " . [ $CommitBrief ] . ")");
+}
+
 :set ScriptInstallUpdate do={ :onerror Err {
   :local Scripts    [ :toarray $1 ];
   :local NewComment [ :tostr   $2 ];