Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:05:02 01.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 6ea8f0a5d7c89d4150ee29851479f60805cda3fc..3f3fa619a8d06eb942259671b7f224cb2be5031d 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/324/d193fd99";
+:global CommitId "main/325/afdaff96";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:00:02 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:05:02 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/mod/AM-TG-Bot.rsc.diff b/html/mod/AM-TG-Bot.rsc.diff
deleted file mode 100644 (file)
index 0c6a885..0000000
--- a/html/mod/AM-TG-Bot.rsc.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-1,5c1,4
-< #!rsc by Vados
-< # RouterOS script: mod/AM-TG-Bot
-< # Script comment: Use Telegram to chat with your Router and send commands
-< # Copyright (c) 2007-2026 Vados <vados@vados.ru>
-< #
----
-> #!rsc by RouterOS
-> # RouterOS script: telegram-chat
-> # Copyright (c) 2023-2026 Christian Hesse <mail@eworm.de>
-> # https://rsc.eworm.de/COPYING.md
-8a8,11
-> #
-> # use Telegram to chat with your Router and send commands
-> # https://rsc.eworm.de/doc/telegram-chat.md
-> 
-11,12c14,15
-<   :global GlobalConfReady; :global GlobalFuncReady;
-<   :retry { :if ($GlobalConfReady != true || $GlobalFuncReady != true) \
----
->   :global GlobalConfigReady; :global GlobalFunctionsReady;
->   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
-54,56d56
-<   :if ([ :len [ /system/scheduler/find where name=$ScriptName ] ] = 0) do={
-<     /system/scheduler/add start-time=startup interval=30s name=$ScriptName on-event="/system/script/run $ScriptName;" comment="Telegram Chat Bot";
-<   }
-111a112
-> 
-118a120
-> 

diff --git a/html/mod/telegram-chat.rsc b/html/mod/telegram-chat.rsc
deleted file mode 100644 (file)
index c0fa5c1..0000000
--- a/html/mod/telegram-chat.rsc
+++ /dev/null
@@ -1,201 +0,0 @@
-#!rsc by RouterOS
-# RouterOS script: telegram-chat
-# Copyright (c) 2023-2026 Christian Hesse <mail@eworm.de>
-# https://rsc.eworm.de/COPYING.md
-#
-# requires RouterOS, version=7.19
-# requires device-mode, fetch
-#
-# use Telegram to chat with your Router and send commands
-# https://rsc.eworm.de/doc/telegram-chat.md
-
-:local ExitOK false;
-:onerror Err {
-  :global GlobalConfigReady; :global GlobalFunctionsReady;
-  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
-      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
-  :local ScriptName [ :jobname ];
-
-  :global Identity;
-  :global TelegramChatActive;
-  :global TelegramChatGroups;
-  :global TelegramChatId;
-  :global TelegramChatIdsTrusted;
-  :global TelegramChatOffset;
-  :global TelegramChatRunTime;
-  :global TelegramMessageIDs;
-  :global TelegramRandomDelay;
-  :global TelegramTokenId;
-
-  :global CertificateAvailable;
-  :global EitherOr;
-  :global EscapeForRegEx;
-  :global FileExists;
-  :global GetRandom20CharAlNum;
-  :global IfThenElse;
-  :global LogPrint;
-  :global LogPrintVerbose;
-  :global MAX;
-  :global MIN;
-  :global MkDir;
-  :global RandomDelay;
-  :global RmDir;
-  :global ScriptLock;
-  :global SendTelegram2;
-  :global SymbolForNotification;
-  :global ValidateSyntax;
-  :global WaitForFile;
-  :global WaitFullyConnected;
-
-  :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
-  }
-
-  $WaitFullyConnected;
-
-  :if ([ :typeof $TelegramChatOffset ] != "array") do={
-    :set TelegramChatOffset { 0; 0; 0 };
-  }
-  :if ([ :typeof $TelegramRandomDelay ] != "num") do={
-    :set TelegramRandomDelay 0;
-  }
-
-  :if ([ $CertificateAvailable "Go Daddy Root Certificate Authority - G2" "fetch" ] = false) do={
-    $LogPrint warning $ScriptName ("Downloading required certificate failed.");
-    :set ExitOK true;
-    :error false;
-  }
-
-  $RandomDelay $TelegramRandomDelay;
-
-  :local Data false;
-  :for I from=1 to=4 do={
-    :if ($Data = false) do={
-      :onerror Err {
-        :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
-          ("https://api.telegram.org/bot" . $TelegramTokenId . "/getUpdates?offset=" . \
-          $TelegramChatOffset->0 . "&allowed_updates=%5B%22message%22%5D") as-value ]->"data");
-        :set TelegramRandomDelay [ $MAX 0 ($TelegramRandomDelay - 1) ];
-      } do={
-        :if ($I < 4) do={
-          $LogPrint debug $ScriptName ("Fetch failed, " . $I . ". try: " . $Err);
-          :set TelegramRandomDelay [ $MIN 15 ($TelegramRandomDelay + 5) ];
-          :delay (($I * $I) . "s");
-        }
-      }
-    }
-  }
-
-  :if ($Data = false) do={
-    $LogPrint warning $ScriptName ("Failed getting updates.");
-    :set ExitOK true;
-    :error false;
-  }
-
-  :local JSON [ :deserialize from=json value=$Data ];
-  :local UpdateID 0;
-  :local Uptime [ /system/resource/get uptime ];
-  :foreach Update in=($JSON->"result") do={
-    :set UpdateID ($Update->"update_id");
-    $LogPrintVerbose debug $ScriptName ("Update " . $UpdateID . ": " . [ :serialize to=json $Update ]);
-
-    :local Message ($Update->"message");
-    :local IsAnyReply ([ :typeof ($Message->"reply_to_message") ] = "array");
-    :local IsMyReply ($TelegramMessageIDs->[ :tostr ($Message->"reply_to_message"->"message_id") ]);
-    :if (($IsMyReply = 1 || $TelegramChatOffset->0 > 0 || $Uptime > 5m) && $UpdateID >= $TelegramChatOffset->2) do={
-      :local Trusted false;
-      :local Chat ($Message->"chat");
-      :local From ($Message->"from");
-      :local Command ($Message->"text");
-      :local ThreadId [ $IfThenElse ($Message->"is_topic_message") ($Message->"message_thread_id") "" ];
-
-      :foreach IdsTrusted in=($TelegramChatId, $TelegramChatIdsTrusted) do={
-        :if ($From->"id" = $IdsTrusted || \
-             $From->"username" = $IdsTrusted || \
-             $Chat->"id" = $IdsTrusted) do={
-          :set Trusted true;
-        }
-      }
-
-      :if ($Trusted = true) do={
-        :local Done false;
-        :if ($Command = "?") do={
-          $LogPrint info $ScriptName ("Sending notice for update " . $UpdateID . ".");
-          $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=true; \
-            replyto=($Message->"message_id"); threadid=$ThreadId; \
-            subject=([ $SymbolForNotification "speech-balloon" ] . "Telegram Chat"); \
-            message=([ $IfThenElse ([ :len ($From->"first_name") ] > 0) ("Hello " . ($From->"first_name") . "!\n\n") ] . \
-              "Online" . [ $IfThenElse $TelegramChatActive " (and active!)" ] . ", awaiting your commands!") });
-          :set Done true;
-        }
-        :if ($Done = false && [ :pick $Command 0 1 ] = "!") do={
-          :if ($Command ~ ("^! *(" . [ $EscapeForRegEx $Identity ] . "|@" . $TelegramChatGroups . ")\$")) do={
-            :set TelegramChatActive true;
-          } else={
-            :set TelegramChatActive false;
-          }
-          $LogPrint info $ScriptName ("Now " . [ $IfThenElse $TelegramChatActive "active" "passive" ] . \
-            " from update " . $UpdateID . "!");
-          :set Done true;
-        }
-        :if ($Done = false && ($IsMyReply = 1 || ($IsAnyReply = false && \
-             $TelegramChatActive = true)) && [ :len $Command ] > 0) do={
-          :if ([ $ValidateSyntax $Command ] = true) do={
-            :local State "";
-            :local File ("tmpfs/telegram-chat/" . [ $GetRandom20CharAlNum 6 ]);
-            :if ([ $MkDir "tmpfs/telegram-chat" ] = false) do={
-              $LogPrint error $ScriptName ("Failed creating directory!");
-              :set ExitOK true;
-              :error false;
-            }
-            $LogPrint info $ScriptName ("Running command from update " . $UpdateID . ": " . $Command);
-            :execute script=(":do {\n" . $Command . "\n} on-error={ /file/add name=\"" . $File . ".failed\" };" . \
-              "/file/add name=\"" . $File . ".done\"") file=($File . "\00");
-            :if ([ $WaitForFile ($File . ".done") [ $EitherOr $TelegramChatRunTime 20s ] ] = false) do={
-              :set State ([ $SymbolForNotification "warning-sign" ] . "The command did not finish, still running in background.\n\n");
-            }
-            :if ([ $FileExists ($File . ".failed") ] = true) do={
-              :set State ([ $SymbolForNotification "cross-mark" ] . "The command failed with an error!\n\n");
-            }
-            :local Content ([ /file/read chunk-size=32768 file=$File as-value ]->"data");
-            $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=true; \
-              replyto=($Message->"message_id"); threadid=$ThreadId; \
-              subject=([ $SymbolForNotification "speech-balloon" ] . "Telegram Chat"); \
-              message=([ $SymbolForNotification "gear" ] . "Command:\n" . $Command . "\n\n" . \
-                $State . [ $IfThenElse ([ :len $Content ] > 0) \
-                ([ $SymbolForNotification "memo" ] . "Output:\n" . $Content) \
-                ([ $SymbolForNotification "memo" ] . "No output.") ]) });
-            $RmDir "tmpfs/telegram-chat";
-          } else={
-            $LogPrint info $ScriptName ("The command from update " . $UpdateID . " failed syntax validation!");
-            $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=false; \
-              replyto=($Message->"message_id"); threadid=$ThreadId; \
-              subject=([ $SymbolForNotification "speech-balloon" ] . "Telegram Chat"); \
-              message=([ $SymbolForNotification "gear" ] . "Command:\n" . $Command . "\n\n" . \
-                [ $SymbolForNotification "cross-mark" ] . "The command failed syntax validation!") });
-          }
-        }
-      } else={
-        :local MessageText ("Received a message from untrusted contact " . \
-          [ $IfThenElse ([ :len ($From->"username") ] = 0) "without username" ("'" . $From->"username" . "'") ] . \
-          " (ID " . $From->"id" . ") in update " . $UpdateID . "!");
-        :if ($Command ~ ("^! *" . [ $EscapeForRegEx $Identity ] . "\$")) do={
-          $LogPrint warning $ScriptName $MessageText;
-          $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=false; \
-            replyto=($Message->"message_id"); threadid=$ThreadId; \
-            subject=([ $SymbolForNotification "speech-balloon" ] . "Telegram Chat"); \
-            message=("You are not trusted.") });
-        } else={
-          $LogPrint info $ScriptName $MessageText;
-        }
-      }
-    } else={
-      $LogPrint debug $ScriptName ("Already handled update " . $UpdateID . ".");
-    }
-  }
-  :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \
-    [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]);
-} do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
-}