Updated the Times to parse ISO 8601 and convert to Unix for CoT Protobuf message

Author: keithwilliams324

TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/dto/EventDto.java

@@ -10,13 +10,13 @@ public class EventDto {
 	private String _type = "";
 
 	@SerializedName("time")
-	private Long _time = -1L;
+	private String _time = "";
 
 	@SerializedName("start")
-	private Long _start = -1L;
+	private String _start = "";
 
 	@SerializedName("stale")
-	private Long _stale = -1L;
+	private String _stale = "";
 
 	@SerializedName("how")
 	private String _how = "";
@@ -42,27 +42,27 @@ public void setType(String type) {
        _type = type;
     }
 
-    public Long getTime() {
+    public String getTime() {
         return _time;
     }
 
-    public void setTime(Long time) {
+    public void setTime(String time) {
        _time = time;
     }
 
-    public Long getStart() {
+    public String getStart() {
         return _start;
     }
 
-    public void setStart(Long start) {
+    public void setStart(String start) {
        _start = start;
     }
 
-    public Long getStale() {
+    public String getStale() {
         return _stale;
     }
 
-    public void setStale(Long stale) {
+    public void setStale(String stale) {
        _stale = stale;
     }
 

TAK Server Plugin/Plugin/src/takserver-sender-plugin-mcs/src/main/java/tak/server/plugins/utilities/McsCoTConverter.java

@@ -1,6 +1,7 @@
 package tak.server.plugins.utilities;
 
 import java.util.List;
+import java.time.Instant;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -17,15 +18,19 @@
 
 import org.json.JSONObject;
 import org.json.XML;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class McsCoTConverter {
 
+    private static final Logger _logger = LoggerFactory.getLogger(McsCoTConverter.class);
+    
     public static Message convertToMessage(EventDto event, PluginConfiguration configuration) {
         Message.Builder messageBuilder = MessageOuterClass.Message.newBuilder();
 		TakMessage.Builder payloadBuilder = messageBuilder.getPayloadBuilder();
 		CotEvent.Builder cotEventBuilder = payloadBuilder.getCotEventBuilder();
 		DetailOuterClass.Detail.Builder detailBuilder = cotEventBuilder.getDetailBuilder();
-		
+        		
         @SuppressWarnings("unchecked")
 		List<String> callsigns = (List<String>) configuration.getProperty("callsigns");
 
@@ -35,9 +40,10 @@ public static Message convertToMessage(EventDto event, PluginConfiguration confi
 		cotEventBuilder.setUid(event.getUid());
 		cotEventBuilder.setType(event.getType());
 		cotEventBuilder.setHow(event.getHow());
-		cotEventBuilder.setSendTime(event.getTime());
-		cotEventBuilder.setStartTime(event.getStart());
-		cotEventBuilder.setStaleTime(event.getStale());
+        
+		cotEventBuilder.setSendTime(convertTime(event.getTime()));
+		cotEventBuilder.setStartTime(convertTime(event.getStart()));
+		cotEventBuilder.setStaleTime(convertTime(event.getStale()));
 		cotEventBuilder.setLat(event.getPoint().getLat());
 		cotEventBuilder.setLon(event.getPoint().getLon());
 		cotEventBuilder.setHae(event.getPoint().getHae());
@@ -77,4 +83,18 @@ public static EventDto convertToEvent(String json, PluginConfiguration configura
 
         return event;
     }
+
+    private static Long convertTime(String time) {
+        // CoT Protobuf uses "timeMs" units, which is number of milliseconds since
+        // 1970-01-01 00:00:00 UTC
+        Long timeMs = 0L;
+        try {
+            Instant instant = Instant.parse( time );
+            timeMs = instant.toEpochMilli() ;
+        } catch (Exception e) {
+            _logger.error("Error parsing time", e);
+        }
+        
+        return timeMs;
+    }
 }

TAK Server Plugin/RabbitMQ Client/Program.cs

@@ -81,11 +81,11 @@ private static string MassageMessage(string message)
                 jObject["point"]["lat"] = newLat;
                 jObject["point"]["lon"] = newLon;
 
-                var currentUnixTimeMs = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-                var staleUnixTimeMs = DateTimeOffset.Now.AddMinutes(10).ToUnixTimeMilliseconds();
-                jObject["time"] = currentUnixTimeMs;
-                jObject["start"] = currentUnixTimeMs;
-                jObject["stale"] = staleUnixTimeMs;
+                var currentIsoTime = DateTime.UtcNow.ToString("o");
+                var staleIsoTime = DateTimeOffset.UtcNow.AddMinutes(10).ToString("o");
+                jObject["time"] = currentIsoTime;
+                jObject["start"] = currentIsoTime;
+                jObject["stale"] = staleIsoTime;
 
                 return jObject.ToString(Formatting.None);
             }