1 files changed, 30 insertions, 22 deletions

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index a49d0cd..00f03cd 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -1,17 +1,18 @@
 #!rsc by RouterOS
 # RouterOS script: netwatch-notify
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
 # requires RouterOS, version=7.15
 #
 # monitor netwatch and send notifications
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/netwatch-notify.md
+# https://rsc.eworm.de/doc/netwatch-notify.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:do {
+: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 NetwatchNotify;
@@ -37,10 +38,10 @@
     :global ValidateSyntax;
 
     :if ([ $ValidateSyntax $Hook ] = true) do={
-      :do {
+      onerror Err {
         [ :parse $Hook ];
-      } on-error={
-        $LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run.");
+      } do={
+        $LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run: " . $Err);
         :return ("The hook failed to run.");
       }
     } else={
@@ -60,21 +61,26 @@
     :global GetRandom20CharAlNum;
 
     :local FwAddrList ($ScriptName . "-" . [ $GetRandom20CharAlNum ]);
-    /ip/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=1s;
-    :delay 20ms;
-    :if ([ :len [ /ip/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
-      :return true;
+    :if ([ :typeof [ :toip $Expected ] ] = "ip") do={
+      /ip/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=10s;
+      :delay 20ms;
+      :if ([ :len [ /ip/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
+        :return true;
+      }
     }
-    /ipv6/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=1s;
-    :delay 20ms;
-    :if ([ :len [ /ipv6/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
-      :return true;
+    :if ([ :typeof [ :toip6 $Expected ] ] = "ip6") do={
+      /ipv6/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=10s;
+      :delay 20ms;
+      :if ([ :len [ /ipv6/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
+        :return true;
+      }
     }
 
     :return false;
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
@@ -101,7 +107,7 @@
 
       :if ([ :typeof ($HostInfo->"resolve") ] = "str") do={
         :if ([ $IsDNSResolving ] = true) do={
-          :do {
+          :onerror Err {
             :local Resolve [ :resolve type=[ $IfThenElse ([ :typeof ($HostVal->"host") ] = "ip") \
                 "ipv4" "ipv6" ] ($HostInfo->"resolve") ];
             :if ($Resolve != $HostVal->"host") do={
@@ -115,13 +121,13 @@
                 :set ($HostVal->"status") "unknown";
               }
             }
-          } on-error={
+          } do={
             :set ($Metric->"resolve-failcnt") ($Metric->"resolve-failcnt" + 1);
             :if ($Metric->"resolve-failcnt" = 3) do={
               $LogPrint [ $IfThenElse ($HostInfo->"no-resolve-fail" != true) warning debug ] \
                   $ScriptName ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \
                   ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
-                  $HostInfo->"name") "" ] . "' failed.");
+                  $HostInfo->"name") "" ] . "' failed: " . $Err);
             }
           }
         }
@@ -218,4 +224,6 @@
         "since"=($Metric->"since") };
     }
   }
-} on-error={ }
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+}