pulled dev

changhe sort events logic
tracker: fix autogen version
2025-03-18 18:27:26 +01:00 · 2025-03-18 18:27:05 +01:00 · 2025-03-18 16:37:09 +01:00 · 2025-03-18 16:36:10 +01:00 · 2025-03-18 15:30:24 +01:00 · 2025-03-18 13:52:56 +01:00
38 changed files with 333 additions and 878 deletions
--- a/api/chalicelib/core/sessions/sessions_search.py
+++ b/api/chalicelib/core/sessions/sessions_search.py
@ -122,7 +122,10 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project: schemas.
            sort = 'session_id'
            if data.sort is not None and data.sort != "session_id":
                # sort += " " + data.order + "," + helper.key_to_snake_case(data.sort)
-                sort = helper.key_to_snake_case(data.sort)
+                if data.sort == 'datetime':
+                    sort = 'start_ts'
+                else:
+                    sort = helper.key_to_snake_case(data.sort)

            meta_keys = metadata.get(project_id=project.project_id)
            main_query = cur.mogrify(f"""SELECT COUNT(full_sessions) AS count, 
--- a/api/chalicelib/utils/ch_client_exp.py
+++ b/api/chalicelib/utils/ch_client_exp.py
@ -34,7 +34,10 @@ if config("CH_COMPRESSION", cast=bool, default=True):
 def transform_result(self, original_function):
    @wraps(original_function)
    def wrapper(*args, **kwargs):
-        logger.debug(str.encode(self.format(query=kwargs.get("query", ""), parameters=kwargs.get("parameters"))))
+        if kwargs.get("parameters"):
+            logger.debug(str.encode(self.format(query=kwargs.get("query", ""), parameters=kwargs.get("parameters"))))
+        elif len(args) > 0:
+            logger.debug(str.encode(args[0]))
        result = original_function(*args, **kwargs)
        if isinstance(result, clickhouse_connect.driver.query.QueryResult):
            column_names = result.column_names
@ -146,13 +149,11 @@ class ClickHouseClient:
    def __enter__(self):
        return self.__client

-    def format(self, query, *, parameters=None):
-        if parameters is None:
-            return query
-        return query % {
-            key: f"'{value}'" if isinstance(value, str) else value
-            for key, value in parameters.items()
-        }
+    def format(self, query, parameters=None):
+        if parameters:
+            ctx = QueryContext(query=query, parameters=parameters)
+            return ctx.final_query
+        return query

    def __exit__(self, *args):
        if config('CH_POOL', cast=bool, default=True):
--- a/api/product_analytics_working_query.sql
+++ b/api/product_analytics_working_query.sql
@ -1,591 +0,0 @@
-- -- Original Q3
-- WITH ranked_events AS (SELECT *
--                        FROM ranked_events_1736344377403),
--      n1 AS (SELECT event_number_in_session,
--                    event_type,
--                    e_value,
--                    next_type,
--                    next_value,
--                    COUNT(1) AS sessions_count
--             FROM ranked_events
--             WHERE event_number_in_session = 1
--               AND isNotNull(next_value)
--             GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
--             ORDER BY sessions_count DESC
--             LIMIT 8),
--      n2 AS (SELECT *
--             FROM (SELECT re.event_number_in_session AS event_number_in_session,
--                          re.event_type              AS event_type,
--                          re.e_value                 AS e_value,
--                          re.next_type               AS next_type,
--                          re.next_value              AS next_value,
--                          COUNT(1)                   AS sessions_count
--                   FROM n1
--                            INNER JOIN ranked_events AS re
--                                       ON (n1.next_value = re.e_value AND n1.next_type = re.event_type)
--                   WHERE re.event_number_in_session = 2
--                   GROUP BY re.event_number_in_session, re.event_type, re.e_value, re.next_type,
--                            re.next_value) AS sub_level
--             ORDER BY sessions_count DESC
--             LIMIT 8),
--      n3 AS (SELECT *
--             FROM (SELECT re.event_number_in_session AS event_number_in_session,
--                          re.event_type              AS event_type,
--                          re.e_value                 AS e_value,
--                          re.next_type               AS next_type,
--                          re.next_value              AS next_value,
--                          COUNT(1)                   AS sessions_count
--                   FROM n2
--                            INNER JOIN ranked_events AS re
--                                       ON (n2.next_value = re.e_value AND n2.next_type = re.event_type)
--                   WHERE re.event_number_in_session = 3
--                   GROUP BY re.event_number_in_session, re.event_type, re.e_value, re.next_type,
--                            re.next_value) AS sub_level
--             ORDER BY sessions_count DESC
--             LIMIT 8),
--      n4 AS (SELECT *
--             FROM (SELECT re.event_number_in_session AS event_number_in_session,
--                          re.event_type              AS event_type,
--                          re.e_value                 AS e_value,
--                          re.next_type               AS next_type,
--                          re.next_value              AS next_value,
--                          COUNT(1)                   AS sessions_count
--                   FROM n3
--                            INNER JOIN ranked_events AS re
--                                       ON (n3.next_value = re.e_value AND n3.next_type = re.event_type)
--                   WHERE re.event_number_in_session = 4
--                   GROUP BY re.event_number_in_session, re.event_type, re.e_value, re.next_type,
--                            re.next_value) AS sub_level
--             ORDER BY sessions_count DESC
--             LIMIT 8),
--      n5 AS (SELECT *
--             FROM (SELECT re.event_number_in_session AS event_number_in_session,
--                          re.event_type              AS event_type,
--                          re.e_value                 AS e_value,
--                          re.next_type               AS next_type,
--                          re.next_value              AS next_value,
--                          COUNT(1)                   AS sessions_count
--                   FROM n4
--                            INNER JOIN ranked_events AS re
--                                       ON (n4.next_value = re.e_value AND n4.next_type = re.event_type)
--                   WHERE re.event_number_in_session = 5
--                   GROUP BY re.event_number_in_session, re.event_type, re.e_value, re.next_type,
--                            re.next_value) AS sub_level
--             ORDER BY sessions_count DESC
--             LIMIT 8)
-- SELECT *
-- FROM (SELECT event_number_in_session,
--              event_type,
--              e_value,
--              next_type,
--              next_value,
--              sessions_count
--       FROM n1
--       UNION ALL
--       SELECT event_number_in_session,
--              event_type,
--              e_value,
--              next_type,
--              next_value,
--              sessions_count
--       FROM n2
--       UNION ALL
--       SELECT event_number_in_session,
--              event_type,
--              e_value,
--              next_type,
--              next_value,
--              sessions_count
--       FROM n3
--       UNION ALL
--       SELECT event_number_in_session,
--              event_type,
--              e_value,
--              next_type,
--              next_value,
--              sessions_count
--       FROM n4
--       UNION ALL
--       SELECT event_number_in_session,
--              event_type,
--              e_value,
--              next_type,
--              next_value,
--              sessions_count
--       FROM n5) AS chart_steps
-- ORDER BY event_number_in_session;
-
-- Q1
-- CREATE TEMPORARY TABLE pre_ranked_events_1736344377403 AS
-CREATE TABLE pre_ranked_events_1736344377403 ENGINE = Memory AS
-    (WITH initial_event AS (SELECT events.session_id, MIN(datetime) AS start_event_timestamp
-                            FROM experimental.events AS events
-                            WHERE ((event_type = 'LOCATION' AND (url_path = '/en/deployment/')))
-                              AND events.project_id = toUInt16(65)
-                              AND events.datetime >= toDateTime(1735599600000 / 1000)
-                              AND events.datetime < toDateTime(1736290799999 / 1000)
-                            GROUP BY 1),
-          pre_ranked_events AS (SELECT *
-                                FROM (SELECT session_id,
-                                             event_type,
-                                             datetime,
-                                             url_path             AS e_value,
-                                             row_number() OVER (PARTITION BY session_id
-                                                 ORDER BY datetime ,
-                                                     message_id ) AS event_number_in_session
-                                      FROM experimental.events AS events
-                                               INNER JOIN initial_event ON (events.session_id = initial_event.session_id)
-                                      WHERE events.project_id = toUInt16(65)
-                                        AND events.datetime >= toDateTime(1735599600000 / 1000)
-                                        AND events.datetime < toDateTime(1736290799999 / 1000)
-                                        AND (events.event_type = 'LOCATION')
-                                        AND events.datetime >= initial_event.start_event_timestamp
-                                         ) AS full_ranked_events
-                                WHERE event_number_in_session <= 5)
-     SELECT *
-     FROM pre_ranked_events);
-;
-
-SELECT *
-FROM pre_ranked_events_1736344377403
-WHERE event_number_in_session < 3;
-
-
-
-- ---------Q2-----------
-- CREATE TEMPORARY TABLE ranked_events_1736344377403 AS
-DROP TABLE ranked_events_1736344377403;
-CREATE TABLE ranked_events_1736344377403 ENGINE = Memory AS
-    (WITH pre_ranked_events AS (SELECT *
-                                FROM pre_ranked_events_1736344377403),
-          start_points AS (SELECT DISTINCT session_id
-                           FROM pre_ranked_events
-                           WHERE ((event_type = 'LOCATION' AND (e_value = '/en/deployment/')))
-                             AND pre_ranked_events.event_number_in_session = 1),
-          ranked_events AS (SELECT pre_ranked_events.*,
-                                   leadInFrame(e_value)
-                                               OVER (PARTITION BY session_id ORDER BY datetime
-                                                   ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS next_value,
-                                   leadInFrame(toNullable(event_type))
-                                               OVER (PARTITION BY session_id ORDER BY datetime
-                                                   ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS next_type
-                            FROM start_points
-                                     INNER JOIN pre_ranked_events USING (session_id))
-     SELECT *
-     FROM ranked_events);
-
-
-- ranked events
-SELECT event_number_in_session,
-       event_type,
-       e_value,
-       next_type,
-       next_value,
-       COUNT(1) AS sessions_count
-FROM ranked_events_1736344377403
-WHERE event_number_in_session = 2
--   AND e_value='/en/deployment/deploy-docker/'
--     AND next_value NOT IN ('/en/deployment/','/en/plugins/','/en/using-or/')
--     AND e_value NOT IN ('/en/deployment/deploy-docker/','/en/getting-started/','/en/deployment/deploy-ubuntu/')
-  AND isNotNull(next_value)
-GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-ORDER BY event_number_in_session, sessions_count DESC;
-
-
-
-SELECT event_number_in_session,
-       event_type,
-       e_value,
-       COUNT(1) AS sessions_count
-FROM ranked_events_1736344377403
-WHERE event_number_in_session = 1
-GROUP BY event_number_in_session, event_type, e_value
-ORDER BY event_number_in_session, sessions_count DESC;
-
-SELECT COUNT(1) AS sessions_count
-FROM ranked_events_1736344377403
-WHERE event_number_in_session = 2
-  AND isNull(next_value)
-;
-
-- ---------Q3 MORE -----------
-WITH ranked_events AS (SELECT *
-                       FROM ranked_events_1736344377403),
-     n1 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 1
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-     n2 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 2
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-     n3 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 3
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-     drop_n AS (-- STEP 1
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                'DROP' AS next_type,
-                NULL   AS next_value,
-                sessions_count
-         FROM n1
-         WHERE isNull(n1.next_type)
-         UNION ALL
-         -- STEP 2
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                'DROP' AS next_type,
-                NULL   AS next_value,
-                sessions_count
-         FROM n2
-         WHERE isNull(n2.next_type)),
--      TODO: make this as top_steps, where every step will go to next as top/others
-     top_n1 AS (-- STEP 1
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                next_type,
-                next_value,
-                sessions_count
-         FROM n1
-         WHERE isNotNull(next_type)
-         ORDER BY sessions_count DESC
-         LIMIT 3),
-     top_n2 AS (-- STEP 2
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                next_type,
-                next_value,
-                sessions_count
-         FROM n2
-         WHERE (event_type, e_value) IN (SELECT event_type,
-                                                e_value
-                                         FROM n2
-                                         WHERE isNotNull(next_type)
-                                         GROUP BY event_type, e_value
-                                         ORDER BY SUM(sessions_count) DESC
-                                         LIMIT 3)
-         ORDER BY sessions_count DESC),
-     top_n AS (SELECT *
-               FROM top_n1
-               UNION ALL
-               SELECT *
-               FROM top_n2),
-     u_top_n AS (SELECT DISTINCT event_number_in_session,
-                                 event_type,
-                                 e_value
-                 FROM top_n),
-     others_n AS (
-         -- STEP 1
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                next_type,
-                next_value,
-                sessions_count
-         FROM n1
-         WHERE isNotNull(next_type)
-         ORDER BY sessions_count DESC
-         LIMIT 1000000 OFFSET 3
-         UNION ALL
-         -- STEP 2
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                next_type,
-                next_value,
-                sessions_count
-         FROM n2
-         WHERE isNotNull(next_type)
--          GROUP BY event_number_in_session, event_type, e_value
-         ORDER BY sessions_count DESC
-         LIMIT 1000000 OFFSET 3)
-SELECT *
-FROM (
-- Top
-         SELECT *
-         FROM top_n
-         --          UNION ALL
-- -- Others
--          SELECT event_number_in_session,
--                 event_type,
--                 e_value,
--                 'OTHER' AS next_type,
--                 NULL    AS next_value,
--                 SUM(sessions_count)
--          FROM others_n
--          GROUP BY event_number_in_session, event_type, e_value
--          UNION ALL
-- -- Top go to Drop
--          SELECT drop_n.event_number_in_session,
--                 drop_n.event_type,
--                 drop_n.e_value,
--                 drop_n.next_type,
--                 drop_n.next_value,
--                 drop_n.sessions_count
--          FROM drop_n
--                   INNER JOIN u_top_n ON (drop_n.event_number_in_session = u_top_n.event_number_in_session
--              AND drop_n.event_type = u_top_n.event_type
--              AND drop_n.e_value = u_top_n.e_value)
--          ORDER BY drop_n.event_number_in_session
--          --          --          UNION ALL
-- -- -- Top go to Others
--          SELECT top_n.event_number_in_session,
--                 top_n.event_type,
--                 top_n.e_value,
--                 'OTHER'                   AS next_type,
--                 NULL                      AS next_value,
--                 SUM(top_n.sessions_count) AS sessions_count
--          FROM top_n
--                   LEFT JOIN others_n ON (others_n.event_number_in_session = (top_n.event_number_in_session + 1)
--              AND top_n.next_type = others_n.event_type
--              AND top_n.next_value = others_n.e_value)
--          WHERE others_n.event_number_in_session IS NULL
--            AND top_n.next_type IS NOT NULL
--          GROUP BY event_number_in_session, event_type, e_value
--          UNION ALL
-- -- Others got to Top
--          SELECT others_n.event_number_in_session,
--                 'OTHER'               AS event_type,
--                 NULL                  AS e_value,
--                 others_n.s_next_type  AS next_type,
--                 others_n.s_next_value AS next_value,
--                 SUM(sessions_count)   AS sessions_count
--          FROM others_n
--                   INNER JOIN top_n ON (others_n.event_number_in_session = top_n.event_number_in_session + 1 AND
--                                        others_n.s_next_type = top_n.event_type AND
--                                        others_n.s_next_value = top_n.event_type)
--          GROUP BY others_n.event_number_in_session, next_type, next_value
-         --          UNION ALL
--          -- TODO: find if this works or not
-- -- Others got to Others
--          SELECT others_n.event_number_in_session,
--                 'OTHER'             AS event_type,
--                 NULL                AS e_value,
--                 'OTHERS'            AS next_type,
--                 NULL                AS next_value,
--                 SUM(sessions_count) AS sessions_count
--          FROM others_n
--                   LEFT JOIN u_top_n ON ((others_n.event_number_in_session + 1) = u_top_n.event_number_in_session
--              AND others_n.s_next_type = u_top_n.event_type
--              AND others_n.s_next_value = u_top_n.e_value)
--          WHERE u_top_n.event_number_in_session IS NULL
--          GROUP BY others_n.event_number_in_session
-         )
-ORDER BY event_number_in_session;
-
-
-- ---------Q3 TOP ON VALUE ONLY -----------
-WITH ranked_events AS (SELECT *
-                       FROM ranked_events_1736344377403),
-     n1 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 1
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-     n2 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 2
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-     n3 AS (SELECT event_number_in_session,
-                   event_type,
-                   e_value,
-                   next_type,
-                   next_value,
-                   COUNT(1) AS sessions_count
-            FROM ranked_events
-            WHERE event_number_in_session = 3
-            GROUP BY event_number_in_session, event_type, e_value, next_type, next_value
-            ORDER BY sessions_count DESC),
-
-     drop_n AS (-- STEP 1
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                'DROP' AS next_type,
-                NULL   AS next_value,
-                sessions_count
-         FROM n1
-         WHERE isNull(n1.next_type)
-         UNION ALL
-         -- STEP 2
-         SELECT event_number_in_session,
-                event_type,
-                e_value,
-                'DROP' AS next_type,
-                NULL   AS next_value,
-                sessions_count
-         FROM n2
-         WHERE isNull(n2.next_type)),
-     top_n AS (SELECT event_number_in_session,
-                      event_type,
-                      e_value,
-                      SUM(sessions_count) AS sessions_count
-               FROM n1
-               GROUP BY event_number_in_session, event_type, e_value
-               LIMIT 1
-               UNION ALL
-               -- STEP 2
-               SELECT event_number_in_session,
-                      event_type,
-                      e_value,
-                      SUM(sessions_count) AS sessions_count
-               FROM n2
-               GROUP BY event_number_in_session, event_type, e_value
-               ORDER BY sessions_count DESC
-               LIMIT 3
-               UNION ALL
-               -- STEP 3
-               SELECT event_number_in_session,
-                      event_type,
-                      e_value,
-                      SUM(sessions_count) AS sessions_count
-               FROM n3
-               GROUP BY event_number_in_session, event_type, e_value
-               ORDER BY sessions_count DESC
-               LIMIT 3),
-     top_n_with_next AS (SELECT n1.*
-                         FROM n1
-                         UNION ALL
-                         SELECT n2.*
-                         FROM n2
-                                  INNER JOIN top_n ON (n2.event_number_in_session = top_n.event_number_in_session
-                             AND n2.event_type = top_n.event_type
-                             AND n2.e_value = top_n.e_value)),
-     others_n AS (
-         -- STEP 2
-         SELECT n2.*
-         FROM n2
-         WHERE (n2.event_number_in_session, n2.event_type, n2.e_value) NOT IN
-               (SELECT event_number_in_session, event_type, e_value
-                FROM top_n
-                WHERE top_n.event_number_in_session = 2)
-         UNION ALL
-         -- STEP 3
-         SELECT n3.*
-         FROM n3
-         WHERE (n3.event_number_in_session, n3.event_type, n3.e_value) NOT IN
-               (SELECT event_number_in_session, event_type, e_value
-                FROM top_n
-                WHERE top_n.event_number_in_session = 3))
-SELECT *
-FROM (
-         --          SELECT sum(top_n_with_next.sessions_count)
--          FROM top_n_with_next
--          WHERE event_number_in_session = 1
-- --            AND isNotNull(next_value)
--            AND (next_type, next_value) IN
--                (SELECT others_n.event_type, others_n.e_value FROM others_n WHERE others_n.event_number_in_session = 2)
--            --                   SELECT * FROM others_n
--            --     SELECT * FROM n2
--              SELECT *
--          FROM top_n
--          );
-- Top to Top: valid
-         SELECT top_n_with_next.*
-         FROM top_n_with_next
-                  INNER JOIN top_n
-                             ON (top_n_with_next.event_number_in_session + 1 = top_n.event_number_in_session
-                                 AND top_n_with_next.next_type = top_n.event_type
-                                 AND top_n_with_next.next_value = top_n.e_value)
-         UNION ALL
-- Top to Others: valid
-         SELECT top_n_with_next.event_number_in_session,
-                top_n_with_next.event_type,
-                top_n_with_next.e_value,
-                'OTHER'                             AS next_type,
-                NULL                                AS next_value,
-                SUM(top_n_with_next.sessions_count) AS sessions_count
-         FROM top_n_with_next
-         WHERE (top_n_with_next.event_number_in_session + 1, top_n_with_next.next_type, top_n_with_next.next_value) IN
-               (SELECT others_n.event_number_in_session, others_n.event_type, others_n.e_value FROM others_n)
-         GROUP BY top_n_with_next.event_number_in_session, top_n_with_next.event_type, top_n_with_next.e_value
-         UNION ALL
-- Top go to Drop: valid
-         SELECT drop_n.event_number_in_session,
-                drop_n.event_type,
-                drop_n.e_value,
-                drop_n.next_type,
-                drop_n.next_value,
-                drop_n.sessions_count
-         FROM drop_n
-                  INNER JOIN top_n ON (drop_n.event_number_in_session = top_n.event_number_in_session
-             AND drop_n.event_type = top_n.event_type
-             AND drop_n.e_value = top_n.e_value)
-         ORDER BY drop_n.event_number_in_session
-         UNION ALL
-- Others got to Drop: valid
-         SELECT others_n.event_number_in_session,
-                'OTHER'                      AS event_type,
-                NULL                         AS e_value,
-                'DROP'                       AS next_type,
-                NULL                         AS next_value,
-                SUM(others_n.sessions_count) AS sessions_count
-         FROM others_n
-         WHERE isNull(others_n.next_type)
-           AND others_n.event_number_in_session < 3
-         GROUP BY others_n.event_number_in_session, next_type, next_value
-         UNION ALL
-- Others got to Top:valid
-         SELECT others_n.event_number_in_session,
-                'OTHER'                      AS event_type,
-                NULL                         AS e_value,
-                others_n.next_type,
-                others_n.next_value,
-                SUM(others_n.sessions_count) AS sessions_count
-         FROM others_n
-         WHERE isNotNull(others_n.next_type)
-           AND (others_n.event_number_in_session + 1, others_n.next_type, others_n.next_value) IN
-               (SELECT top_n.event_number_in_session, top_n.event_type, top_n.e_value FROM top_n)
-         GROUP BY others_n.event_number_in_session, others_n.next_type, others_n.next_value
-         UNION ALL
-- Others got to Others
-         SELECT others_n.event_number_in_session,
-                'OTHER'             AS event_type,
-                NULL                AS e_value,
-                'OTHERS'            AS next_type,
-                NULL                AS next_value,
-                SUM(sessions_count) AS sessions_count
-         FROM others_n
-         WHERE isNotNull(others_n.next_type)
-           AND others_n.event_number_in_session < 3
-           AND (others_n.event_number_in_session + 1, others_n.next_type, others_n.next_value) NOT IN
-               (SELECT event_number_in_session, event_type, e_value FROM top_n)
-         GROUP BY others_n.event_number_in_session)
-ORDER BY event_number_in_session, sessions_count
-        DESC;
-
-
--- a/backend/pkg/sessions/api/web/handlers.go
+++ b/backend/pkg/sessions/api/web/handlers.go
@ -135,11 +135,6 @@ func (e *handlersImpl) startSessionHandlerWeb(w http.ResponseWriter, r *http.Req

 	// Add tracker version to context
 	r = r.WithContext(context.WithValue(r.Context(), "tracker", req.TrackerVersion))
-	if err := validateTrackerVersion(req.TrackerVersion); err != nil {
-		e.log.Error(r.Context(), "unsupported tracker version: %s, err: %s", req.TrackerVersion, err)
-		e.responser.ResponseWithError(e.log, r.Context(), w, http.StatusUpgradeRequired, errors.New("please upgrade the tracker version"), startTime, r.URL.Path, bodySize)
-		return
-	}

 	// Handler's logic
 	if req.ProjectKey == nil {
@ -162,6 +157,13 @@ func (e *handlersImpl) startSessionHandlerWeb(w http.ResponseWriter, r *http.Req
 	// Add projectID to context
 	r = r.WithContext(context.WithValue(r.Context(), "projectID", fmt.Sprintf("%d", p.ProjectID)))

+	// Validate tracker version
+	if err := validateTrackerVersion(req.TrackerVersion); err != nil {
+		e.log.Error(r.Context(), "unsupported tracker version: %s, err: %s", req.TrackerVersion, err)
+		e.responser.ResponseWithError(e.log, r.Context(), w, http.StatusUpgradeRequired, errors.New("please upgrade the tracker version"), startTime, r.URL.Path, bodySize)
+		return
+	}
+
 	// Check if the project supports mobile sessions
 	if !p.IsWeb() {
 		e.responser.ResponseWithError(e.log, r.Context(), w, http.StatusForbidden, errors.New("project doesn't support web sessions"), startTime, r.URL.Path, bodySize)
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@ -225,8 +225,7 @@ Pipfile.lock
 /chalicelib/core/sessions/unprocessed_sessions.py
 /chalicelib/core/metrics/modules
 /chalicelib/core/socket_ios.py
-/chalicelib/core/sourcemaps.py
-/chalicelib/core/sourcemaps_parser.py
+/chalicelib/core/sourcemaps
 /chalicelib/core/tags.py
 /chalicelib/saml
 /chalicelib/utils/__init__.py
--- a/ee/api/chalicelib/core/sessions/sessions_search_exp.py
+++ b/ee/api/chalicelib/core/sessions/sessions_search_exp.py
@ -141,7 +141,7 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project: schemas.
                                            ) AS users_sessions;""",
                                     full_args)
        elif ids_only:
-            main_query = cur.format(query=f"""SELECT DISTINCT ON(s.session_id) s.session_id
+            main_query = cur.format(query=f"""SELECT DISTINCT ON(s.session_id) s.session_id AS session_id
                                              {query_part}
                                              ORDER BY s.session_id desc
                                              LIMIT %(sessions_limit)s OFFSET %(sessions_limit_s)s;""",
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@ -46,8 +46,7 @@ rm -rf ./chalicelib/core/sessions/sessions_viewed/sessions_viewed.py
 rm -rf ./chalicelib/core/sessions/unprocessed_sessions.py
 rm -rf ./chalicelib/core/metrics/modules
 rm -rf ./chalicelib/core/socket_ios.py
-rm -rf ./chalicelib/core/sourcemaps.py
-rm -rf ./chalicelib/core/sourcemaps_parser.py
+rm -rf ./chalicelib/core/sourcemaps
 rm -rf ./chalicelib/core/user_testing.py
 rm -rf ./chalicelib/core/tags.py
 rm -rf ./chalicelib/saml
--- a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
+++ b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
@ -82,7 +82,7 @@ function AssistActions({ userId, isCallActive, agentIds }: Props) {
    { stream: MediaStream; isAgent: boolean }[] | null
  >([]);
  const [localStream, setLocalStream] = useState<LocalStream | null>(null);
-  const [callObject, setCallObject] = useState<{ end: () => void } | null>(
+  const [callObject, setCallObject] = useState<{ end: () => void } | null | undefined>(
    null,
  );

@ -135,6 +135,7 @@ function AssistActions({ userId, isCallActive, agentIds }: Props) {
  }, [peerConnectionStatus]);

  const addIncomeStream = (stream: MediaStream, isAgent: boolean) => {
+    if (!stream.active) return;
    setIncomeStream((oldState) => {
      if (oldState === null) return [{ stream, isAgent }];
      if (
@ -149,13 +150,8 @@ function AssistActions({ userId, isCallActive, agentIds }: Props) {
    });
  };

-  const removeIncomeStream = (stream: MediaStream) => {
-    setIncomeStream((prevState) => {
-      if (!prevState) return [];
-      return prevState.filter(
-        (existingStream) => existingStream.stream.id !== stream.id,
-      );
-    });
+  const removeIncomeStream = () => {
+    setIncomeStream([]);
  };

  function onReject() {
@ -181,7 +177,12 @@ function AssistActions({ userId, isCallActive, agentIds }: Props) {
          () => {
            player.assistManager.ping(AssistActionsPing.call.end, agentId);
            lStream.stop.apply(lStream);
-            removeIncomeStream(lStream.stream);
+            removeIncomeStream();
+          },
+          () => {
+            player.assistManager.ping(AssistActionsPing.call.end, agentId);
+            lStream.stop.apply(lStream);
+            removeIncomeStream();
          },
          onReject,
          onError,
--- a/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx
+++ b/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx
@ -34,43 +34,40 @@ function VideoContainer({
    }
    const iid = setInterval(() => {
      const track = stream.getVideoTracks()[0];
-      const settings = track?.getSettings();
-      const isDummyVideoTrack = settings
-        ? settings.width === 2 ||
-          settings.frameRate === 0 ||
-          (!settings.frameRate && !settings.width)
-        : true;
-      const shouldBeEnabled = track.enabled && !isDummyVideoTrack;

-      if (isEnabled !== shouldBeEnabled) {
-        setEnabled(shouldBeEnabled);
-        setRemoteEnabled?.(shouldBeEnabled);
+      if (track) {
+        if (!track.enabled) {
+          setEnabled(false);
+          setRemoteEnabled?.(false);
+        } else {
+          setEnabled(true);
+          setRemoteEnabled?.(true);
+        }
+      } else {
+        setEnabled(false);
+        setRemoteEnabled?.(false);
      }
    }, 500);
    return () => clearInterval(iid);
-  }, [stream, isEnabled]);
+  }, [stream]);

  return (
    <div
      className="flex-1"
      style={{
-        display: isEnabled ? undefined : 'none',
        width: isEnabled ? undefined : '0px!important',
-        height: isEnabled ? undefined : '0px!important',
+        height: isEnabled ? undefined : '0px !important',
        border: '1px solid grey',
        transform: local ? 'scaleX(-1)' : undefined,
+        display: isEnabled ? 'block' : 'none',
      }}
    >
-      <video autoPlay ref={ref} muted={muted} style={{ height }} />
-      {isAgent ? (
-        <div
-          style={{
-            position: 'absolute',
-          }}
-        >
-          {t('Agent')}
-        </div>
-      ) : null}
+      <video
+        autoPlay
+        ref={ref}
+        muted={muted}
+        style={{ height }}
+      />
    </div>
  );
 }
--- a/frontend/app/components/Client/Integrations/ProfilerDoc/ProfilerDoc.tsx
+++ b/frontend/app/components/Client/Integrations/ProfilerDoc/ProfilerDoc.tsx
@ -16,10 +16,10 @@ function ProfilerDoc() {
    ? sites.find((site) => site.id === siteId)?.projectKey
    : sites[0]?.projectKey;

-  const usage = `import OpenReplay from '@openreplay/tracker';
+  const usage = `import { tracker } from '@openreplay/tracker';
 import trackerProfiler from '@openreplay/tracker-profiler';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
@ -29,10 +29,12 @@ export const profiler = tracker.use(trackerProfiler());
 const fn = profiler('call_name')(() => {
 //...
 }, thisArg); // thisArg is optional`;
-  const usageCjs = `import OpenReplay from '@openreplay/tracker/cjs';
+  const usageCjs = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
+
 import trackerProfiler from '@openreplay/tracker-profiler/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 //...
--- a/frontend/app/components/Client/Integrations/Tracker/AssistDoc/AssistNpm.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/AssistDoc/AssistNpm.tsx
@ -7,17 +7,19 @@ import { useTranslation } from 'react-i18next';

 function AssistNpm(props) {
  const { t } = useTranslation();
-  const usage = `import OpenReplay from '@openreplay/tracker';
+  const usage = `import { tracker } from '@openreplay/tracker';
 import trackerAssist from '@openreplay/tracker-assist';
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${props.projectKey}',
 });
 tracker.start()

 tracker.use(trackerAssist(options)); // check the list of available options below`;
-  const usageCjs = `import OpenReplay from '@openreplay/tracker/cjs';
+  const usageCjs = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerAssist from '@openreplay/tracker-assist/cjs';
-const tracker = new OpenReplay({
+
+tracker.configure({
  projectKey: '${props.projectKey}'
 });
 const trackerAssist = tracker.use(trackerAssist(options)); // check the list of available options below
--- a/frontend/app/components/Client/Integrations/Tracker/GraphQLDoc/GraphQLDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/GraphQLDoc/GraphQLDoc.tsx
@ -14,19 +14,20 @@ function GraphQLDoc() {
  const projectKey = siteId
    ? sites.find((site) => site.id === siteId)?.projectKey
    : sites[0]?.projectKey;
-  const usage = `import OpenReplay from '@openreplay/tracker';
+  const usage = `import { tracker } from '@openreplay/tracker';
 import trackerGraphQL from '@openreplay/tracker-graphql';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
 //...
 export const recordGraphQL = tracker.use(trackerGraphQL());`;
-  const usageCjs = `import OpenReplay from '@openreplay/tracker/cjs';
+  const usageCjs = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerGraphQL from '@openreplay/tracker-graphql/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 //...
--- a/frontend/app/components/Client/Integrations/Tracker/MobxDoc/MobxDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/MobxDoc/MobxDoc.tsx
@ -15,20 +15,21 @@ function MobxDoc() {
    ? sites.find((site) => site.id === siteId)?.projectKey
    : sites[0]?.projectKey;

-  const mobxUsage = `import OpenReplay from '@openreplay/tracker';
+  const mobxUsage = `import { tracker } from '@openreplay/tracker';
 import trackerMobX from '@openreplay/tracker-mobx';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.use(trackerMobX(<options>)); // check list of available options below
 tracker.start();
 `;

-  const mobxUsageCjs = `import OpenReplay from '@openreplay/tracker/cjs';
+  const mobxUsageCjs = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerMobX from '@openreplay/tracker-mobx/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.use(trackerMobX(<options>)); // check list of available options below
--- a/frontend/app/components/Client/Integrations/Tracker/NgRxDoc/NgRxDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/NgRxDoc/NgRxDoc.tsx
@ -16,10 +16,10 @@ function NgRxDoc() {
    : sites[0]?.projectKey;
  const usage = `import { StoreModule } from '@ngrx/store';
 import { reducers } from './reducers';
-import OpenReplay from '@openreplay/tracker';
+import { tracker } from '@openreplay/tracker';
 import trackerNgRx from '@openreplay/tracker-ngrx';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
@ -32,10 +32,11 @@ const metaReducers = [tracker.use(trackerNgRx(<options>))]; // check list of ava
 export class AppModule {}`;
  const usageCjs = `import { StoreModule } from '@ngrx/store';
 import { reducers } from './reducers';
-import OpenReplay from '@openreplay/tracker/cjs';
+import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerNgRx from '@openreplay/tracker-ngrx/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 //...
--- a/frontend/app/components/Client/Integrations/Tracker/PiniaDoc/PiniaDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/PiniaDoc/PiniaDoc.tsx
@ -17,10 +17,10 @@ function PiniaDoc() {
    ? sites.find((site) => site.id === siteId)?.projectKey
    : sites[0]?.projectKey;
  const usage = `import Vuex from 'vuex'
-import OpenReplay from '@openreplay/tracker';
+import { tracker } from '@openreplay/tracker';
 import trackerVuex from '@openreplay/tracker-vuex';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
--- a/frontend/app/components/Client/Integrations/Tracker/ReduxDoc/ReduxDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/ReduxDoc/ReduxDoc.tsx
@ -16,10 +16,10 @@ function ReduxDoc() {
    : sites[0]?.projectKey;

  const usage = `import { applyMiddleware, createStore } from 'redux';
-import OpenReplay from '@openreplay/tracker';
+import { tracker } from '@openreplay/tracker';
 import trackerRedux from '@openreplay/tracker-redux';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
@ -29,10 +29,11 @@ const store = createStore(
  applyMiddleware(tracker.use(trackerRedux(<options>))) // check list of available options below
 );`;
  const usageCjs = `import { applyMiddleware, createStore } from 'redux';
-import OpenReplay from '@openreplay/tracker/cjs';
+import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerRedux from '@openreplay/tracker-redux/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 //...
--- a/frontend/app/components/Client/Integrations/Tracker/VueDoc/VueDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/VueDoc/VueDoc.tsx
@ -16,10 +16,10 @@ function VueDoc() {
    : sites[0]?.projectKey;

  const usage = `import Vuex from 'vuex'
-import OpenReplay from '@openreplay/tracker';
+import { tracker } from '@openreplay/tracker';
 import trackerVuex from '@openreplay/tracker-vuex';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 tracker.start()
@ -29,10 +29,11 @@ const store = new Vuex.Store({
  plugins: [tracker.use(trackerVuex(<options>))] // check list of available options below
 });`;
  const usageCjs = `import Vuex from 'vuex'
-import OpenReplay from '@openreplay/tracker/cjs';
+import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerVuex from '@openreplay/tracker-vuex/cjs';
 //...
-const tracker = new OpenReplay({
+tracker.configure({
  projectKey: '${projectKey}'
 });
 //...
--- a/frontend/app/components/Client/Integrations/Tracker/ZustandDoc/ZustandDoc.tsx
+++ b/frontend/app/components/Client/Integrations/Tracker/ZustandDoc/ZustandDoc.tsx
@ -16,11 +16,10 @@ function ZustandDoc(props) {
    : sites[0]?.projectKey;

  const usage = `import create from "zustand";
-import Tracker from '@openreplay/tracker';
+import { tracker } from '@openreplay/tracker';
 import trackerZustand, { StateLogger } from '@openreplay/tracker-zustand';

-
-const tracker = new Tracker({
+tracker.configure({
  projectKey: ${projectKey},
 });

@ -43,11 +42,12 @@ const useBearStore = create(
 )
 `;
  const usageCjs = `import create from "zustand";
-import Tracker from '@openreplay/tracker/cjs';
+import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope
 import trackerZustand, { StateLogger } from '@openreplay/tracker-zustand/cjs';


-const tracker = new Tracker({
+tracker.configure({
  projectKey: ${projectKey},
 });

--- a/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js
+++ b/frontend/app/components/Onboarding/components/OnboardingTabs/InstallDocs/InstallDocs.js
@ -7,16 +7,17 @@ import stl from './installDocs.module.css';
 import { useTranslation } from 'react-i18next';

 const installationCommand = 'npm i @openreplay/tracker';
-const usageCode = `import Tracker from '@openreplay/tracker';
+const usageCode = `import { tracker } from '@openreplay/tracker';

-const tracker = new Tracker({
+tracker.configure({
  projectKey: "PROJECT_KEY",
  ingestPoint: "https://${window.location.hostname}/ingest",
 });
 tracker.start()`;
-const usageCodeSST = `import Tracker from '@openreplay/tracker/cjs';
+const usageCodeSST = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope

-const tracker = new Tracker({
+tracker.configure({
  projectKey: "PROJECT_KEY",
  ingestPoint: "https://${window.location.hostname}/ingest",
 });
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@ -98,7 +98,7 @@ function LiveSessionList() {
    <div>
      <div className="bg-white py-3 rounded-lg border shadow-sm">
        <div className="flex mb-4 pb-2 px-3 justify-between items-center border-b border-b-gray-lighter">
-          <LiveSessionReloadButton onClick={refetch} />
+          <LiveSessionReloadButton />
          <div className="flex items-center">
            <div className="flex items-center ml-6">
              <span className="mr-2 color-gray-medium">{t('Sort By')}</span>
--- a/frontend/app/components/shared/LiveSessionReloadButton/LiveSessionReloadButton.tsx
+++ b/frontend/app/components/shared/LiveSessionReloadButton/LiveSessionReloadButton.tsx
@ -4,15 +4,11 @@ import { observer } from 'mobx-react-lite';
 import ReloadButton from '../ReloadButton';
 import { useTranslation } from 'react-i18next';

-interface Props {
-  onClick: () => void;
-}
-
-function LiveSessionReloadButton(props: Props) {
+function LiveSessionReloadButton() {
  const { t } = useTranslation();
-  const { sessionStore } = useStore();
-  const { onClick } = props;
-  const loading = sessionStore.loadingLiveSessions;
+  const { searchStoreLive } = useStore();
+  const onClick = searchStoreLive.fetchSessions
+  const loading = searchStoreLive.loading;
  return (
    <ReloadButton label={t('Refresh')} buttonSize={'small'} iconSize={14} loading={loading} onClick={onClick} className="cursor-pointer" />
  );
--- a/frontend/app/components/shared/ReloadButton/ReloadButton.tsx
+++ b/frontend/app/components/shared/ReloadButton/ReloadButton.tsx
@ -18,6 +18,7 @@ export default function ReloadButton(props: Props) {
      <Button
        type="default"
        size={buttonSize}
+        loading={loading}
        onClick={onClick}
        icon={<SyncOutlined style={{ fontSize: iconSize }} />}
      >
--- a/frontend/app/components/shared/TrackingCodeModal/InstallDocs/InstallDocs.js
+++ b/frontend/app/components/shared/TrackingCodeModal/InstallDocs/InstallDocs.js
@ -5,17 +5,18 @@ import stl from './installDocs.module.css';
 import { useTranslation } from 'react-i18next';

 const installationCommand = 'npm i @openreplay/tracker';
-const usageCode = `import Tracker from '@openreplay/tracker';
+const usageCode = `import { tracker } from '@openreplay/tracker';

-const tracker = new Tracker({
+tracker.configure({
  projectKey: "PROJECT_KEY",
  ingestPoint: "https://${window.location.hostname}/ingest",
 });

 tracker.start()`;
-const usageCodeSST = `import Tracker from '@openreplay/tracker/cjs';
+const usageCodeSST = `import { tracker } from '@openreplay/tracker/cjs';
+// alternatively you can use dynamic import without /cjs suffix to prevent issues with window scope

-const tracker = new Tracker({
+tracker.configure({
  projectKey: "PROJECT_KEY",
  ingestPoint: "https://${window.location.hostname}/ingest",
 });
--- a/frontend/app/mstore/searchStore.ts
+++ b/frontend/app/mstore/searchStore.ts
@ -28,18 +28,18 @@ export const checkValues = (key: any, value: any) => {
 };

 export const filterMap = ({
-                            category,
-                            value,
-                            key,
-                            operator,
-                            sourceOperator,
-                            source,
-                            custom,
-                            isEvent,
-                            filters,
-                            sort,
-                            order
-                          }: any) => ({
+  category,
+  value,
+  key,
+  operator,
+  sourceOperator,
+  source,
+  custom,
+  isEvent,
+  filters,
+  sort,
+  order
+}: any) => ({
  value: checkValues(key, value),
  custom,
  type: category === FilterCategory.METADATA ? FilterKey.METADATA : key,
@ -254,7 +254,7 @@ class SearchStore {

    this.savedSearch = new SavedSearch({});
    sessionStore.clearList();
-    void this.fetchSessions(true);
+    // void this.fetchSessions(true);
  }

  async checkForLatestSessionCount(): Promise<void> {
--- a/frontend/app/mstore/searchStoreLive.ts
+++ b/frontend/app/mstore/searchStoreLive.ts
@ -75,6 +75,8 @@ class SearchStoreLive {

  loadingFilterSearch = false;

+  loading = false;
+
  constructor() {
    makeAutoObservable(this);

@ -242,11 +244,22 @@ class SearchStoreLive {
    });
  };

-  async fetchSessions() {
-    await sessionStore.fetchLiveSessions({
-      ...this.instance.toSearch(),
-      page: this.currentPage,
-    });
+  setLoading = (val: boolean) => {
+    this.loading = val;
+  }
+
+  fetchSessions = async () => {
+    this.setLoading(true)
+    try {
+      await sessionStore.fetchLiveSessions({
+        ...this.instance.toSearch(),
+        page: this.currentPage,
+      });
+    } catch (e) {
+      console.error('Error fetching sessions:', e);
+    } finally {
+      this.setLoading(false)
+    }
  }
 }

--- a/frontend/app/player/web/MessageLoader.ts
+++ b/frontend/app/player/web/MessageLoader.ts
@ -150,10 +150,10 @@ export default class MessageLoader {
        });

        const sortedMsgs = msgs
-          // .sort((m1, m2) => m1.time - m2.time);
+          // .sort((m1, m2) => m1.time - m2.time)
          .sort(brokenDomSorter)
          .sort(sortIframes);
-
+        
        if (brokenMessages > 0) {
          console.warn(
            'Broken timestamp messages',
@ -383,7 +383,6 @@ const DOMMessages = [
  MType.CreateElementNode,
  MType.CreateTextNode,
  MType.MoveNode,
-  MType.RemoveNode,
  MType.CreateIFrameDocument,
 ];

@ -395,6 +394,11 @@ function brokenDomSorter(m1: PlayerMsg, m2: PlayerMsg) {
  if (m1.tp !== MType.CreateDocument && m2.tp === MType.CreateDocument)
    return 1;

+  if (m1.tp === MType.RemoveNode)
+    return 1;
+  if (m2.tp === MType.RemoveNode)
+    return -1;
+
  const m1IsDOM = DOMMessages.includes(m1.tp);
  const m2IsDOM = DOMMessages.includes(m2.tp);
  if (m1IsDOM && m2IsDOM) {
--- a/frontend/app/player/web/assist/Call.ts
+++ b/frontend/app/player/web/assist/Call.ts
@ -185,8 +185,7 @@ export default class Call {
    pc.ontrack = (event) => {
      const stream = event.streams[0];
      if (stream && !this.videoStreams[remotePeerId]) {
-        const clonnedStream = stream.clone();
-        this.videoStreams[remotePeerId] = clonnedStream.getVideoTracks()[0];
+        this.videoStreams[remotePeerId] = stream.getVideoTracks()[0];
        if (this.store.get().calling !== CallingState.OnCall) {
          this.store.update({ calling: CallingState.OnCall });
        }
@ -305,22 +304,18 @@ export default class Call {
    }
    try {
      // if the connection is not established yet, then set remoteDescription to peer
-      if (!pc.localDescription) {
-        await pc.setRemoteDescription(new RTCSessionDescription(data.offer));
-        const answer = await pc.createAnswer();
-        await pc.setLocalDescription(answer);
-        if (isAgent) {
-          this.socket.emit('WEBRTC_AGENT_CALL', {
-            from: this.callID,
-            answer,
-            toAgentId: getSocketIdByCallId(fromCallId),
-            type: WEBRTC_CALL_AGENT_EVENT_TYPES.ANSWER,
-          });
-        } else {
-          this.socket.emit('webrtc_call_answer', { from: fromCallId, answer });
-        }
+      await pc.setRemoteDescription(new RTCSessionDescription(data.offer));
+      const answer = await pc.createAnswer();
+      await pc.setLocalDescription(answer);
+      if (isAgent) {
+        this.socket.emit('WEBRTC_AGENT_CALL', {
+          from: this.callID,
+          answer,
+          toAgentId: getSocketIdByCallId(fromCallId),
+          type: WEBRTC_CALL_AGENT_EVENT_TYPES.ANSWER,
+        });
      } else {
-        logger.warn('Skipping setRemoteDescription: Already in stable state');
+        this.socket.emit('webrtc_call_answer', { from: fromCallId, answer });
      }
    } catch (e) {
      logger.error('Error setting remote description from answer', e);
@ -388,13 +383,13 @@ export default class Call {
  private handleCallEnd() {
    // If the call is not completed, then call onCallEnd
    if (this.store.get().calling !== CallingState.NoCall) {
-      this.callArgs && this.callArgs.onCallEnd();
+      this.callArgs && this.callArgs.onRemoteCallEnd();
    }
    // change state to NoCall
    this.store.update({ calling: CallingState.NoCall });
    // Close all created RTCPeerConnection
    Object.values(this.connections).forEach((pc) => pc.close());
-    this.callArgs?.onCallEnd();
+    this.callArgs?.onRemoteCallEnd();
    // Clear connections
    this.connections = {};
    this.callArgs = null;
@ -414,7 +409,7 @@ export default class Call {
      // Close all connections and reset callArgs
      Object.values(this.connections).forEach((pc) => pc.close());
      this.connections = {};
-      this.callArgs?.onCallEnd();
+      this.callArgs?.onRemoteCallEnd();
      this.store.update({ calling: CallingState.NoCall });
      this.callArgs = null;
    } else {
@ -443,7 +438,8 @@ export default class Call {
  private callArgs: {
    localStream: LocalStream;
    onStream: (s: MediaStream, isAgent: boolean) => void;
-    onCallEnd: () => void;
+    onRemoteCallEnd: () => void;
+    onLocalCallEnd: () => void;
    onReject: () => void;
    onError?: (arg?: any) => void;
  } | null = null;
@ -451,14 +447,16 @@ export default class Call {
  setCallArgs(
    localStream: LocalStream,
    onStream: (s: MediaStream, isAgent: boolean) => void,
-    onCallEnd: () => void,
+    onRemoteCallEnd: () => void,
+    onLocalCallEnd: () => void,
    onReject: () => void,
    onError?: (e?: any) => void,
  ) {
    this.callArgs = {
      localStream,
      onStream,
-      onCallEnd,
+      onRemoteCallEnd,
+      onLocalCallEnd,
      onReject,
      onError,
    };
@ -549,7 +547,7 @@ export default class Call {
    void this.initiateCallEnd();
    Object.values(this.connections).forEach((pc) => pc.close());
    this.connections = {};
-    this.callArgs?.onCallEnd();
+    this.callArgs?.onLocalCallEnd();
  }
 }

--- a/tracker/tracker-assist/.yarn/install-state.gz
+++ b/tracker/tracker-assist/.yarn/install-state.gz
--- a/tracker/tracker-assist/CHANGELOG.md
+++ b/tracker/tracker-assist/CHANGELOG.md
@ -1,3 +1,8 @@
+## 11.0.1
+
+- fixed rare issue causing videocam feed to be black during calls
+- new call widget url to prepare for multi-user calls
+
 ## 11.0.0

 - migrate to native webrtc, remove peerjs
--- a/tracker/tracker-assist/package.json
+++ b/tracker/tracker-assist/package.json
@ -1,7 +1,7 @@
 {
  "name": "@openreplay/tracker-assist",
  "description": "Tracker plugin for screen assistance through the WebRTC",
-  "version": "11.0.0",
+  "version": "11.0.1",
  "keywords": [
    "WebRTC",
    "assistance",
--- a/tracker/tracker-assist/src/Assist.ts
+++ b/tracker/tracker-assist/src/Assist.ts
@ -548,6 +548,16 @@ export default class Assist {
      }
    }

+    const renegotiateConnection = async ({ pc, from }: { pc: RTCPeerConnection, from: string }) => {
+      try {
+        const offer = await pc.createOffer();
+        await pc.setLocalDescription(offer);
+        this.emit('webrtc_call_offer', { from, offer });
+      } catch (error) {
+        app.debug.error("Error with renegotiation:", error);
+      }
+    };
+
    const handleIncomingCallOffer = async (from: string, offer: RTCSessionDescriptionInit) => {
      app.debug.log('handleIncomingCallOffer', from)
      let confirmAnswer: Promise<boolean>
@ -572,56 +582,59 @@ export default class Assist {

      try {
        // waiting for a decision on accepting the challenge
-        const agreed = await confirmAnswer
+        const agreed = await confirmAnswer;
        // if rejected, then terminate the call
        if (!agreed) {
-          initiateCallEnd()
-          this.options.onCallDeny?.()
-          return
-        }
-        if (!callUI) {
-          callUI = new CallWindow(app.debug.error, this.options.callUITemplate)
-          callUI.setVideoToggleCallback((args: { enabled: boolean }) =>
-            this.emit('videofeed', { streamId: from, enabled: args.enabled })
-          );
-        }
-        // show buttons in the call window
-        callUI.showControls(initiateCallEnd)
-        if (!annot) {
-          annot = new AnnotationCanvas()
-          annot.mount()
-        }
-
-        // callUI.setLocalStreams(Object.values(lStreams))
-        try {
-         // if there are no local streams in lStrems then we set
-          if (!lStreams[from]) {
-            app.debug.log('starting new stream for', from)
-            // request a local stream, and set it to lStreams
-            lStreams[from] = await RequestLocalStream()
-          }
-         // we pass the received tracks to Call ui
-          callUI.setLocalStreams(Object.values(lStreams))
-        } catch (e) {
-          app.debug.error('Error requesting local stream', e);
-          // if something didn't work out, we terminate the call
          initiateCallEnd();
+          this.options.onCallDeny?.();
          return;
        }
-        // create a new RTCPeerConnection with ice server config
+
+         // create a new RTCPeerConnection with ice server config
        const pc = new RTCPeerConnection({
          iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
        });

-        // get all local tracks and add them to RTCPeerConnection
-        lStreams[from].stream.getTracks().forEach(track => {
-          pc.addTrack(track, lStreams[from].stream);
-        });
+        if (!callUI) {
+          callUI = new CallWindow(app.debug.error, this.options.callUITemplate);
+          callUI.setVideoToggleCallback((args: { enabled: boolean }) => {
+            this.emit("videofeed", { streamId: from, enabled: args.enabled })
+          });
+        }
+        // show buttons in the call window
+        callUI.showControls(initiateCallEnd);
+        if (!annot) {
+          annot = new AnnotationCanvas();
+          annot.mount();
+        }

+        
+
+        // callUI.setLocalStreams(Object.values(lStreams))
+        try {
+          // if there are no local streams in lStrems then we set
+          if (!lStreams[from]) {
+            app.debug.log("starting new stream for", from);
+            // request a local stream, and set it to lStreams
+            lStreams[from] = await RequestLocalStream(pc, renegotiateConnection.bind(null, { pc, from }));
+          }
+          // we pass the received tracks to Call ui
+          callUI.setLocalStreams(Object.values(lStreams));
+        } catch (e) {
+          app.debug.error("Error requesting local stream", e);
+          // if something didn't work out, we terminate the call
+          initiateCallEnd();
+          return;
+        }
+
+        // get all local tracks and add them to RTCPeerConnection
        // When we receive local ice candidates, we emit them via socket
        pc.onicecandidate = (event) => {
          if (event.candidate) {
-            socket.emit('webrtc_call_ice_candidate', { from, candidate: event.candidate });
+            socket.emit("webrtc_call_ice_candidate", {
+              from,
+              candidate: event.candidate,
+            });
          }
        };

@ -632,9 +645,9 @@ export default class Assist {
            callUI.addRemoteStream(rStream, from);
            const onInteraction = () => {
              callUI?.playRemote();
-              document.removeEventListener('click', onInteraction);
+              document.removeEventListener("click", onInteraction);
            };
-            document.addEventListener('click', onInteraction);
+            document.addEventListener("click", onInteraction);
          }
        };

@ -648,7 +661,7 @@ export default class Assist {
        // set answer as local description
        await pc.setLocalDescription(answer);
        // set the response as local
-        socket.emit('webrtc_call_answer', { from, answer });
+        socket.emit("webrtc_call_answer", { from, answer });

        // If the state changes to an error, we terminate the call
        // pc.onconnectionstatechange = () => {
@ -658,27 +671,35 @@ export default class Assist {
        // };

        // Update track when local video changes
-        lStreams[from].onVideoTrack(vTrack => {
-          const sender = pc.getSenders().find(s => s.track?.kind === 'video');
+        lStreams[from].onVideoTrack((vTrack) => {
+          const sender = pc.getSenders().find((s) => s.track?.kind === "video");
          if (!sender) {
-            app.debug.warn('No video sender found')
-            return
+            app.debug.warn("No video sender found");
+            return;
          }
-          sender.replaceTrack(vTrack)
-        })
+          sender.replaceTrack(vTrack);
+        });

        // if the user closed the tab or switched, then we end the call
-        document.addEventListener('visibilitychange', () => {
-          initiateCallEnd()
-        })
+        document.addEventListener("visibilitychange", () => {
+          initiateCallEnd();
+        });

        // when everything is set, we change the state to true
-        this.setCallingState(CallingState.True)
-        if (!callEndCallback) { callEndCallback = this.options.onCallStart?.() }
-        const callingPeerIdsNow = Array.from(this.calls.keys())
+        this.setCallingState(CallingState.True);
+        if (!callEndCallback) {
+          callEndCallback = this.options.onCallStart?.();
+        }
+        const callingPeerIdsNow = Array.from(this.calls.keys());
        // in session storage we write down everyone with whom the call is established
-        sessionStorage.setItem(this.options.session_calling_peer_key, JSON.stringify(callingPeerIdsNow))
-        this.emit('UPDATE_SESSION', { agentIds: callingPeerIdsNow, isCallActive: true })
+        sessionStorage.setItem(
+          this.options.session_calling_peer_key,
+          JSON.stringify(callingPeerIdsNow)
+        );
+        this.emit("UPDATE_SESSION", {
+          agentIds: callingPeerIdsNow,
+          isCallActive: true,
+        });
      } catch (reason) {
        app.debug.log(reason);
      }
--- a/tracker/tracker-assist/src/CallWindow.ts
+++ b/tracker/tracker-assist/src/CallWindow.ts
@ -48,7 +48,7 @@ export default class CallWindow {
 		}

 		// const baseHref = "https://static.openreplay.com/tracker-assist/test"
-		const baseHref = 'https://static.openreplay.com/tracker-assist/4.0.0'
+		const baseHref = 'https://static.openreplay.com/tracker-assist/widget'
 		// this.load = fetch(this.callUITemplate || baseHref + '/index2.html')
 		this.load = fetch(this.callUITemplate || baseHref + '/index.html')
 			.then((r) => r.text())
@ -60,7 +60,7 @@ export default class CallWindow {
 					}, 0)
 					//iframe.style.height = doc.body.scrollHeight + 'px';
 					//iframe.style.width = doc.body.scrollWidth + 'px';
-					this.adjustIframeSize()
+				    this.adjustIframeSize()
 					iframe.onload = null
 				}
 				// ?
@ -152,15 +152,6 @@ export default class CallWindow {
 					if (this.checkRemoteVideoInterval) {
 						clearInterval(this.checkRemoteVideoInterval)
 					} // just in case
-					let enabled = false
-					this.checkRemoteVideoInterval = setInterval(() => {
-						const settings = this.remoteVideo?.getSettings()
-						const isDummyVideoTrack = !this.remoteVideo.enabled || (!!settings && (settings.width === 2 || settings.frameRate === 0))
-						const shouldBeEnabled = !isDummyVideoTrack
-						if (enabled !== shouldBeEnabled) {
-							this.toggleRemoteVideoUI((enabled = shouldBeEnabled))
-						}
-					}, 1000)
 				}

 				// Audio
--- a/tracker/tracker-assist/src/LocalStream.ts
+++ b/tracker/tracker-assist/src/LocalStream.ts
@ -1,88 +1,86 @@
-declare global {
-   interface HTMLCanvasElement {
-     captureStream(frameRate?: number): MediaStream;
-  }
-}
-
-function dummyTrack(): MediaStreamTrack { 
-  const canvas = document.createElement('canvas')//, { width: 0, height: 0})
-  canvas.setAttribute('data-openreplay-hidden', '1')
-  canvas.width=canvas.height=2 // Doesn't work when 1 (?!)
-  const ctx = canvas.getContext('2d')
-  ctx?.fillRect(0, 0, canvas.width, canvas.height)
-  requestAnimationFrame(function draw(){
-    ctx?.fillRect(0,0, canvas.width, canvas.height)
-    requestAnimationFrame(draw)
-  })
-  // Also works. Probably it should be done once connected.
-  //setTimeout(() => { ctx?.fillRect(0,0, canvas.width, canvas.height) }, 4000)
-  return canvas.captureStream(60).getTracks()[0]
-}
-
-export default function RequestLocalStream(): Promise<LocalStream> {
-  return navigator.mediaDevices.getUserMedia({ audio:true, })
-    .then(aStream => {
-      const aTrack = aStream.getAudioTracks()[0]
-
-      if (!aTrack) { throw new Error('No audio tracks provided') }
-      return new _LocalStream(aTrack)
-    })
+export default function RequestLocalStream(
+  pc: RTCPeerConnection,
+  toggleVideoCb?: () => void
+): Promise<LocalStream> {
+  return navigator.mediaDevices
+    .getUserMedia({ audio: true, video: false })
+    .then((stream) => {
+      const aTrack = stream.getAudioTracks()[0];
+      if (!aTrack) {
+        throw new Error("No audio tracks provided");
+      }
+      stream.getTracks().forEach((track) => {
+        pc.addTrack(track, stream);
+      });
+      return new _LocalStream(stream, pc, toggleVideoCb);
+    });
 }

 class _LocalStream {
-  private mediaRequested = false
-  readonly stream: MediaStream
-  private readonly vdTrack: MediaStreamTrack
-  constructor(aTrack: MediaStreamTrack) {
-    this.vdTrack = dummyTrack()
-    this.stream = new MediaStream([ aTrack, this.vdTrack, ])
+  private mediaRequested = false;
+  readonly stream: MediaStream;
+  readonly vTrack: MediaStreamTrack;
+  readonly pc: RTCPeerConnection;
+  readonly toggleVideoCb?: () => void;
+  constructor(stream: MediaStream, pc: RTCPeerConnection, toggleVideoCb?: () => void) {
+    this.stream = stream;
+    this.pc = pc;
+    this.toggleVideoCb = toggleVideoCb;
  }

  toggleVideo(): Promise<boolean> {
+    const videoTracks = this.stream.getVideoTracks();
    if (!this.mediaRequested) {
-      return navigator.mediaDevices.getUserMedia({video:true,})
-      .then(vStream => {
-        const vTrack = vStream.getVideoTracks()[0]
-        if (!vTrack) {
-          throw new Error('No video track provided')
-        }
-        this.stream.addTrack(vTrack)
-        this.stream.removeTrack(this.vdTrack)
-        this.mediaRequested = true
-        if (this.onVideoTrackCb) {
-          this.onVideoTrackCb(vTrack)
-        }
-        return true
-      })
-      .catch(e => {
-        // TODO: log
-        console.error(e)
-        return false
-      })
+      return navigator.mediaDevices
+        .getUserMedia({ video: true })
+        .then((vStream) => {
+          const vTrack = vStream.getVideoTracks()[0];
+          if (!vTrack) {
+            throw new Error("No video track provided");
+          }
+
+          this.pc.addTrack(vTrack, this.stream);
+          this.stream.addTrack(vTrack);
+
+          if (this.toggleVideoCb) {
+            this.toggleVideoCb();
+          }
+
+          this.mediaRequested = true;
+
+          if (this.onVideoTrackCb) {
+            this.onVideoTrackCb(vTrack);
+          }
+          return true;
+        })
+        .catch((e) => {
+          // TODO: log
+          return false;
+        });
+    } else {
+      videoTracks.forEach((track) => {
+        track.enabled = !track.enabled;
+      });
    }
-    let enabled = true
-    this.stream.getVideoTracks().forEach(track => {
-      track.enabled = enabled = enabled && !track.enabled
-    })
-    return Promise.resolve(enabled)
+    return Promise.resolve(videoTracks[0].enabled);
  }

  toggleAudio(): boolean {
-    let enabled = true
-    this.stream.getAudioTracks().forEach(track => {
-      track.enabled = enabled = enabled && !track.enabled
-    })
-    return enabled
+    let enabled = true;
+    this.stream.getAudioTracks().forEach((track) => {
+      track.enabled = enabled = enabled && !track.enabled;
+    });
+    return enabled;
  }

-  private onVideoTrackCb: ((t: MediaStreamTrack) => void) | null = null
+  private onVideoTrackCb: ((t: MediaStreamTrack) => void) | null = null;
  onVideoTrack(cb: (t: MediaStreamTrack) => void) {
-    this.onVideoTrackCb = cb
+    this.onVideoTrackCb = cb;
  }

  stop() {
-    this.stream.getTracks().forEach(t => t.stop())
+    this.stream.getTracks().forEach((t) => t.stop());
  }
 }

-export type LocalStream = InstanceType<typeof _LocalStream>
+export type LocalStream = InstanceType<typeof _LocalStream>;
--- a/tracker/tracker-assist/src/version.ts
+++ b/tracker/tracker-assist/src/version.ts
@ -1 +1 @@
-export const pkgVersion = "11.0.0";
+export const pkgVersion = "11.0.1";
--- a/tracker/tracker/.yarn/install-state.gz
+++ b/tracker/tracker/.yarn/install-state.gz
--- a/tracker/tracker/CHANGELOG.md
+++ b/tracker/tracker/CHANGELOG.md
@ -1,3 +1,7 @@
+## 16.0.2
+
+- fix attributeSender key generation to prevent calling native methods on objects
+
 ## 16.0.1

 - drop computing ts digits
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@openreplay/tracker",
  "description": "The OpenReplay tracker main package",
-  "version": "16.0.1",
+  "version": "16.0.2",
  "keywords": [
    "logging",
    "replay"
--- a/tracker/tracker/src/main/modules/attributeSender.ts
+++ b/tracker/tracker/src/main/modules/attributeSender.ts
@ -15,7 +15,9 @@ export class StringDictionary {

  getKey = (str: string): [number, boolean] => {
    let isNew = false
-    if (!this.backDict[str]) {
+    // avoiding potential native object properties
+    const safeKey = `__${str}`
+    if (!this.backDict[safeKey]) {
      isNew = true
      // shaving the first 2 digits of the timestamp (since they are irrelevant for next millennia)
      const shavedTs = Date.now() % 10 ** (13 - 2)
@ -26,10 +28,10 @@ export class StringDictionary {
      } else {
        this.lastSuffix = 1
      }
-      this.backDict[str] = id
+      this.backDict[safeKey] = id
      this.lastTs = shavedTs
    }
-    return [this.backDict[str], isNew]
+    return [this.backDict[safeKey], isNew]
  }
 }
Author	SHA1	Message	Date
Андрей Бабушкин	8cae6590e8	pulled dev	2025-03-18 18:27:26 +01:00
Андрей Бабушкин	d883dba2df	changhe sort events logic	2025-03-18 18:27:05 +01:00
nick-delirium	15d427418d	tracker: fix autogen version	2025-03-18 16:37:09 +01:00
nick-delirium	ed3e553726	tracker: assist 11.0.1 changelog	2025-03-18 16:36:10 +01:00
nick-delirium	7eace68de6	ui: add loading state for LiveSessionReloadButton.tsx	2025-03-18 15:30:24 +01:00
Taha Yassine Kraiem	8009882cef	refactor(chalice): cleaned code fix(chalice): fixed session-search-pg sortKey issue fix(chalice): fixed CH-query-formatter to handle special chars fix(chalice): fixed /ids response (cherry picked from commit `b505645782`)	2025-03-18 13:52:56 +01:00
Andrey Babushkin	7365d8639c	updated widget link (#3158 ) * updated widget link * fix calls * updated widget url	2025-03-18 11:07:09 +01:00
nick-delirium	4c967d4bc1	ui: update tracker import examples	2025-03-17 13:42:34 +01:00
Alexander	3fdf799bd7	feat(http): unsupported tracker error with projectID in logs	2025-03-17 13:32:00 +01:00
nick-delirium	9aca716e6b	tracker: 16.0.2 fix str dictionary keys	2025-03-17 11:25:54 +01:00
Shekar Siri	cf9ecdc9a4	refactor(searchStore): reformat filterMap function parameters - Reformat the parameters of the filterMap function for better readability. - Comment out the fetchSessions call in clearSearch method to avoid unnecessary session fetch.	2025-03-14 19:47:42 +01:00