chore: update timestamp and support string/map metadata

Author: alexbabrykovich

HCaptcha/Assets/journeys.schema.json

@@ -6,17 +6,17 @@
   "items": {
     "type": "object",
     "additionalProperties": false,
-    "required": ["k", "v", "ts", "m"],
+    "required": ["k", "v", "ts"],
     "properties": {
       "k": {
         "type": "string",
         "enum": ["screen", "click", "drag", "gesture", "edit"],
         "description": "Event kind"
       },
       "v": { "type": "string", "description": "View type name" },
-      "ts": { "type": "integer", "minimum": 0, "description": "Timestamp (ms since epoch)" },
+      "ts": { "type": "integer", "minimum": 0, "description": "Timestamp (seconds since epoch)" },
       "m": {
-        "type": "object",
+        "type": ["string", "object"],
         "additionalProperties": true,
         "description": "Event metadata (minified keys)",
         "properties": {

HCaptcha/Classes/Journeylitics/JLEvent.swift

@@ -9,18 +9,18 @@ public enum JLEventKind: String {
 }
 
 public struct JLEvent {
-    public let timestampMs: Int64
+    public let timestamp: Int64
     public let kind: JLEventKind
     public let view: String
     public let metadata: [String: Any]
 
     public init(
-        timestampMs: Int64 = Int64(Date().timeIntervalSince1970 * 1000),
+        timestamp: Int64 = Int64(Date().timeIntervalSince1970),
         kind: JLEventKind,
         view: String,
         metadata: [String: Any] = [:]
     ) {
-        self.timestampMs = timestampMs
+        self.timestamp = timestamp
         self.kind = kind
         self.view = view
         self.metadata = metadata

HCaptcha/Classes/Journeylitics/Sinks/ConsoleSink.swift

@@ -10,7 +10,7 @@ public final class NSLogSink: JourneyliticsSink {
     public func emit(_ event: JLEvent) {
         let parts: [String: String] = [
             FieldKey.kind.jsonKey: event.kind.rawValue,
-            FieldKey.timestamp.jsonKey: String(event.timestampMs),
+            FieldKey.timestamp.jsonKey: String(event.timestamp),
             FieldKey.meta.jsonKey: event.metadata.description
         ]
         let body = parts.map { (key: String, value: String) in "\"\(key)\":\"\(value)\"" }.joined(separator: ",")

HCaptcha/Classes/Journeylitics/Sinks/InMemorySink.swift

@@ -48,7 +48,7 @@ final class JourneyBridgeSink: JourneyliticsSink {
 
     func emit(_ event: JLEvent) {
         let journeyEvent: [String: Any] = [
-            FieldKey.timestamp.rawValue: event.timestampMs,
+            FieldKey.timestamp.rawValue: event.timestamp,
             FieldKey.kind.rawValue: event.kind.rawValue,
             FieldKey.view.rawValue: event.view,
             FieldKey.meta.rawValue: event.metadata