1 files changed, 39 insertions, 29 deletions
diff --git a/gps-track.rsc b/gps-track.rsc
index 0d328d5..dea56d2 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -1,43 +1,53 @@
 #!rsc by RouterOS
 # RouterOS script: gps-track
-# Copyright (c) 2018-2023 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.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
 
-:local 0 "gps-track";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global GpsTrackUrl;
-:global Identity;
+:local ExitOK false;
+:do {
+  :local ScriptName [ :jobname ];
+
+  :global GpsTrackUrl;
+  :global Identity;
 
-:global LogPrintExit2;
-:global ScriptLock;
-:global WaitFullyConnected;
+  :global FetchUserAgentStr;
+  :global LogPrint;
+  :global ScriptLock;
+  :global WaitFullyConnected;
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
+    :error false;
+  }
+  $WaitFullyConnected;
 
-:local CoordinateFormat [ /system/gps/get coordinate-format ];
-:local Gps [ /system/gps/monitor once as-value ];
+  :local CoordinateFormat [ /system/gps/get coordinate-format ];
+  :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;
-    $LogPrintExit2 debug $0 ("Sending GPS data in " . $CoordinateFormat . " format: " . \
-      "lat: " . ($Gps->"latitude") . " " . \
-      "lon: " . ($Gps->"longitude")) false;
-  } on-error={
-    $LogPrintExit2 warning $0 ("Failed sending GPS data!") false;
+  :if ($Gps->"valid" = true) do={
+    :do {
+      /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!");
+    }
+  } else={
+    $LogPrint debug $ScriptName ("GPS data not valid.");
   }
-} else={
-  $LogPrintExit2 debug $0 ("GPS data not valid.") false;
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
 }