feat: add ws user id (#288)

openstream-fm · Mar 9, 2024 · 49caf39 · 49caf39
2 parents 5e60920 + cd2365d
commit 49caf39
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 21 deletions.
diff --git a/defs/api/app-analytics/GET/Output.schema.json b/defs/api/app-analytics/GET/Output.schema.json
@@ -21,6 +21,7 @@
         "stations",
         "total_duration_ms",
         "until",
+        "users",
         "utc_offset_minutes"
       ],
       "properties": {
@@ -123,6 +124,11 @@
           "format": "uint64",
           "minimum": 0.0
         },
+        "users": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
         "total_duration_ms": {
           "type": "integer",
           "format": "uint64",
@@ -148,7 +154,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -186,6 +193,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",
@@ -219,7 +231,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -263,6 +276,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",
@@ -296,7 +314,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -565,6 +584,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",
@@ -598,7 +622,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -614,6 +639,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",
@@ -646,7 +676,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -663,6 +694,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",
@@ -696,7 +732,8 @@
               "max_concurrent_listeners",
               "sessions",
               "total_duration_ms",
-              "total_transfer_bytes"
+              "total_transfer_bytes",
+              "users"
             ],
             "properties": {
               "key": {
@@ -724,6 +761,11 @@
                 "format": "uint64",
                 "minimum": 0.0
               },
+              "users": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
               "total_duration_ms": {
                 "type": "integer",
                 "format": "uint64",

diff --git a/defs/app-analytics/Analytics.ts b/defs/app-analytics/Analytics.ts
@@ -18,6 +18,7 @@ export type Analytics = {
   utc_offset_minutes: number;
   sessions: number;
   ips: number;
+  users: number;
   total_duration_ms: number;
   max_concurrent_listeners?: number;
   max_concurrent_listeners_date?: DateTime;

diff --git a/defs/app-analytics/AnalyticsItem.ts b/defs/app-analytics/AnalyticsItem.ts
@@ -5,6 +5,7 @@ export type AnalyticsItem<K> = {
   key: K;
   sessions: number;
   ips: number;
+  users: number;
   total_duration_ms: number;
   total_transfer_bytes: number;
   max_concurrent_listeners?: number;

diff --git a/defs/db/WsStatsConnection.ts b/defs/db/WsStatsConnection.ts
@@ -12,6 +12,7 @@ export type WsStatsConnection = {
   ip: string;
   ap: string | null | undefined;
   av: number | null | undefined;
+  us: string | null | undefined;
   re: number;
   ca: DateTime;
   cl: DateTime | null | undefined;

diff --git a/defs/ws-stats/api/ws/stats/connection/WS/Query.ts b/defs/ws-stats/api/ws/stats/connection/WS/Query.ts
@@ -3,6 +3,7 @@
 export type Query = {
   connection_id?: string;
   station_id: string;
+  user_id?: string;
   app_kind?: string;
   app_version?: number;
 };
diff --git a/front/share/src/analytics/AnalyticsData.svelte b/front/share/src/analytics/AnalyticsData.svelte
@@ -1089,12 +1089,12 @@
           key: item_key,
           sessions: 0,
           ips: 0,
+          users: 0,
           total_duration_ms: 0,
-          total_transfer_bytes: 0,
-          // max_concurrent_listeners: undefined,
-          // max_concurrent_listeners_date: undefined,
+          total_transfer_bytes: 0
         })
       } else {
+        // @ts-expect-error
         items.push(item)
       }
 
@@ -1131,12 +1131,12 @@
           key: item_key,
           sessions: 0,
           ips: 0,
+          users: 0,
           total_duration_ms: 0,
           total_transfer_bytes: 0,
-          // max_concurrent_listeners: undefined,
-          // max_concurrent_listeners_date: undefined,
         })
       } else {
+        // @ts-expect-error
         items.push(item)
       }
 

diff --git a/rs/packages/api/src/ws_stats/routes/connection.rs b/rs/packages/api/src/ws_stats/routes/connection.rs
@@ -80,6 +80,10 @@ pub struct Query {
 
   station_id: String,
 
+  #[ts(optional)]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  user_id: Option<String>,
+
   #[ts(optional)]
   #[serde(skip_serializing_if = "Option::is_none")]
   app_kind: Option<String>,
@@ -140,6 +144,7 @@ impl WsConnectionHandler {
       let Query {
         connection_id: prev_id,
         station_id,
+        user_id,
         app_kind,
         app_version,
       } = qs;
@@ -179,6 +184,7 @@ impl WsConnectionHandler {
             ip,
             app_kind: app_kind.clone(),
             app_version,
+            user_id,
             reconnections,
             created_at,
             closed_at: None,