1 files changed, 22 insertions, 19 deletions

diff --git a/gps-track.rsc b/gps-track.rsc
index 1aeab84..6a090bf 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -1,27 +1,31 @@
 #!rsc by RouterOS
 # RouterOS script: gps-track
-# Copyright (c) 2018-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2018-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.12
+# requires RouterOS, version=7.15
+# requires device-mode, fetch
 #
 # track gps data by sending json data to http server
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/gps-track.md
+# https://rsc.eworm.de/doc/gps-track.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 GpsTrackUrl;
   :global Identity;
 
+  :global FetchUserAgentStr;
   :global LogPrint;
   :global ScriptLock;
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
   $WaitFullyConnected;
@@ -30,21 +34,20 @@
   :local Gps [ /system/gps/monitor once as-value ];
 
   :if ($Gps->"valid" = true) do={
-    :do {
-      /tool/fetch check-certificate=yes-without-crl $GpsTrackUrl output=none \
-        http-method=post http-header-field=({ "Content-Type: application/json" }) \
-        http-data=("{" . \
-          "\"lat\":\"" . ($Gps->"latitude") . "\"," . \
-          "\"lon\":\"" . ($Gps->"longitude") . "\"," . \
-          "\"identity\":\"" . $Identity . "\"" . \
-        "}") as-value;
+    :onerror Err {
+      /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
+        http-header-field=({ [ $FetchUserAgentStr $ScriptName ]; "Content-Type: application/json" }) \
+        http-data=[ :serialize to=json { "identity"=$Identity; \
+        "lat"=($Gps->"latitude"); "lon"=($Gps->"longitude") } ] $GpsTrackUrl as-value;
       $LogPrint debug $ScriptName ("Sending GPS data in " . $CoordinateFormat . " format: " . \
         "lat: " . ($Gps->"latitude") . " " . \
         "lon: " . ($Gps->"longitude"));
-    } on-error={
-      $LogPrint warning $ScriptName ("Failed sending GPS data!");
+    } do={
+      $LogPrint warning $ScriptName ("Failed sending GPS data: " . $Err);
     }
   } else={
     $LogPrint debug $ScriptName ("GPS data not valid.");
   }
-} on-error={ }
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+}