From f64464de5847bc8aec2d1f2a261d91194d4b6505 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 12 Jul 2022 11:38:43 +0200
Subject: [PATCH 01/77] chore(helm): ingress-nginx update image to latest

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/values.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/helmcharts/openreplay/values.yaml b/scripts/helmcharts/openreplay/values.yaml
index 57f3a1432..92a932aad 100644
--- a/scripts/helmcharts/openreplay/values.yaml
+++ b/scripts/helmcharts/openreplay/values.yaml
@@ -94,3 +94,12 @@ nginx-ingress:
 
 ingress-nginx:
   enabled: true
+  controller:
+    name: controller
+    image:
+      registry: k8s.gcr.io
+      image: ingress-nginx/controller
+      ## for backwards compatibility consider setting the full image url via the repository value below
+      ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
+      ## repository:
+      tag: "v1.2.1"

From 6d45a41c18794b673b9f39be8e48b2d0d9532d6a Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Tue, 12 Jul 2022 12:20:13 +0200
Subject: [PATCH 02/77] feat(backend): set default size of first part of
 session mob file to 1mb

---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 3c3bebc3b..f7e4b3711 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -48,7 +48,7 @@ ENV TZ=UTC \
     ASSETS_SIZE_LIMIT=6291456 \
     ASSETS_HEADERS="{ \"Cookie\": \"ABv=3;\" }" \
     FS_CLEAN_HRS=72 \
-    FILE_SPLIT_SIZE=500000 \
+    FILE_SPLIT_SIZE=1000000 \
     LOG_QUEUE_STATS_INTERVAL_SEC=60 \
     DB_BATCH_QUEUE_LIMIT=20 \
     DB_BATCH_SIZE_LIMIT=10000000 \

From bae347c4ffc70f902c8020ac3ccc936b8928ce55 Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Tue, 12 Jul 2022 13:52:26 +0200
Subject: [PATCH 03/77] feat(backend): added extra information for db metrics

---
 backend/pkg/db/postgres/connector.go | 121 ++++++++++++++++++++++-----
 1 file changed, 98 insertions(+), 23 deletions(-)

diff --git a/backend/pkg/db/postgres/connector.go b/backend/pkg/db/postgres/connector.go
index 4a85029fd..e772b479d 100644
--- a/backend/pkg/db/postgres/connector.go
+++ b/backend/pkg/db/postgres/connector.go
@@ -24,15 +24,16 @@ type batchItem struct {
 }
 
 type Conn struct {
-	c               *pgxpool.Pool // TODO: conditional usage of Pool/Conn (use interface?)
-	batches         map[uint64]*pgx.Batch
-	batchSizes      map[uint64]int
-	rawBatches      map[uint64][]*batchItem
-	batchQueueLimit int
-	batchSizeLimit  int
-	batchSizeBytes  syncfloat64.Histogram
-	batchSizeLines  syncfloat64.Histogram
-	sqlRequestTime  syncfloat64.Histogram
+	c                 *pgxpool.Pool // TODO: conditional usage of Pool/Conn (use interface?)
+	batches           map[uint64]*pgx.Batch
+	batchSizes        map[uint64]int
+	rawBatches        map[uint64][]*batchItem
+	batchQueueLimit   int
+	batchSizeLimit    int
+	batchSizeBytes    syncfloat64.Histogram
+	batchSizeLines    syncfloat64.Histogram
+	sqlRequestTime    syncfloat64.Histogram
+	sqlRequestCounter syncfloat64.Counter
 }
 
 func NewConn(url string, queueLimit, sizeLimit int, metrics *monitoring.Metrics) *Conn {
@@ -75,6 +76,10 @@ func (conn *Conn) initMetrics(metrics *monitoring.Metrics) {
 	if err != nil {
 		log.Printf("can't create sqlRequestTime metric: %s", err)
 	}
+	conn.sqlRequestCounter, err = metrics.RegisterCounter("sql_request_number")
+	if err != nil {
+		log.Printf("can't create sqlRequestNumber metric: %s", err)
+	}
 }
 
 func (conn *Conn) batchQueue(sessionID uint64, sql string, args ...interface{}) {
@@ -99,6 +104,10 @@ func (conn *Conn) CommitBatches() {
 		// Record batch size in bytes and number of lines
 		conn.batchSizeBytes.Record(context.Background(), float64(conn.batchSizes[sessID]))
 		conn.batchSizeLines.Record(context.Background(), float64(b.Len()))
+
+		start := time.Now()
+		isFailed := false
+
 		// Send batch to db and execute
 		br := conn.c.SendBatch(getTimeoutContext(), b)
 		l := b.Len()
@@ -108,9 +117,14 @@ func (conn *Conn) CommitBatches() {
 				failedSql := conn.rawBatches[sessID][i]
 				query := strings.ReplaceAll(failedSql.query, "\n", " ")
 				log.Println("failed sql req:", query, failedSql.arguments)
+				isFailed = true
 			}
 		}
 		br.Close() // returns err
+		conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+			attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
+		conn.sqlRequestCounter.Add(context.Background(), 1,
+			attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
 	}
 	conn.batches = make(map[uint64]*pgx.Batch)
 	conn.batchSizes = make(map[uint64]int)
@@ -134,6 +148,10 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 	// Record batch size in bytes and number of lines
 	conn.batchSizeBytes.Record(context.Background(), float64(conn.batchSizes[sessionID]))
 	conn.batchSizeLines.Record(context.Background(), float64(b.Len()))
+
+	start := time.Now()
+	isFailed := false
+
 	// Send batch to db and execute
 	br := conn.c.SendBatch(getTimeoutContext(), b)
 	l := b.Len()
@@ -143,10 +161,16 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 			failedSql := conn.rawBatches[sessionID][i]
 			query := strings.ReplaceAll(failedSql.query, "\n", " ")
 			log.Println("failed sql req:", query, failedSql.arguments)
+			isFailed = true
 		}
 	}
 	br.Close()
 
+	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
+	conn.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
+
 	// Clean batch info
 	delete(conn.batches, sessionID)
 	delete(conn.batchSizes, sessionID)
@@ -156,61 +180,112 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 func (conn *Conn) query(sql string, args ...interface{}) (pgx.Rows, error) {
 	start := time.Now()
 	res, err := conn.c.Query(getTimeoutContext(), sql, args...)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", methodName(sql)))
+	method, table := methodName(sql)
+	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	conn.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
 	return res, err
 }
 
 func (conn *Conn) queryRow(sql string, args ...interface{}) pgx.Row {
 	start := time.Now()
 	res := conn.c.QueryRow(getTimeoutContext(), sql, args...)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", methodName(sql)))
+	method, table := methodName(sql)
+	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	conn.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
 	return res
 }
 
 func (conn *Conn) exec(sql string, args ...interface{}) error {
 	start := time.Now()
 	_, err := conn.c.Exec(getTimeoutContext(), sql, args...)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", methodName(sql)))
+	method, table := methodName(sql)
+	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	conn.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
 	return err
 }
 
 type _Tx struct {
 	pgx.Tx
-	sqlRequestTime syncfloat64.Histogram
+	sqlRequestTime    syncfloat64.Histogram
+	sqlRequestCounter syncfloat64.Counter
 }
 
 func (conn *Conn) begin() (_Tx, error) {
 	start := time.Now()
 	tx, err := conn.c.Begin(context.Background())
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", "begin"))
-	return _Tx{tx, conn.sqlRequestTime}, err
+	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "begin"))
+	conn.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "begin"))
+	return _Tx{tx, conn.sqlRequestTime, conn.sqlRequestCounter}, err
 }
 
 func (tx _Tx) exec(sql string, args ...interface{}) error {
 	start := time.Now()
 	_, err := tx.Exec(context.Background(), sql, args...)
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", methodName(sql)))
+	method, table := methodName(sql)
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
 	return err
 }
 
 func (tx _Tx) rollback() error {
 	start := time.Now()
 	err := tx.Rollback(context.Background())
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", "rollback"))
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "rollback"))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "rollback"))
 	return err
 }
 
 func (tx _Tx) commit() error {
 	start := time.Now()
 	err := tx.Commit(context.Background())
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()), attribute.String("method", "commit"))
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "commit"))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "commit"))
 	return err
 }
 
-func methodName(sql string) string {
-	method := "unknown"
-	if parts := strings.Split(sql, ""); len(parts) > 0 {
-		method = parts[0]
+func methodName(sql string) (string, string) {
+	cmd, table := "unknown", "unknown"
+
+	// Prepare sql request for parsing
+	sql = strings.TrimSpace(sql)
+	sql = strings.ReplaceAll(sql, "\n", " ")
+	sql = strings.ReplaceAll(sql, "\t", "")
+	sql = strings.ToLower(sql)
+
+	// Get sql command name
+	parts := strings.Split(sql, " ")
+	if parts[0] == "" {
+		return cmd, table
+	} else {
+		cmd = strings.TrimSpace(parts[0])
 	}
-	return strings.ToLower(method)
+
+	// Get table name
+	switch cmd {
+	case "select":
+		for i, p := range parts {
+			if strings.TrimSpace(p) == "from" {
+				table = strings.TrimSpace(parts[i+1])
+			}
+		}
+	case "update":
+		table = strings.TrimSpace(parts[1])
+	case "insert":
+		table = strings.TrimSpace(parts[2])
+	}
+	return cmd, table
 }

From 285d4cf0e58f2926a574d232a5d10a36bd4f4d8f Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 13 Jul 2022 20:25:33 +0200
Subject: [PATCH 04/77] fix(helm): timings for cron jobs

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/utilities/templates/report-cron.yaml      | 2 +-
 .../charts/utilities/templates/sessions-cleaner-cron.yaml       | 2 +-
 .../openreplay/charts/utilities/templates/telemetry-cron.yaml   | 2 +-
 scripts/helmcharts/openreplay/charts/utilities/values.yaml      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
index 4a321c20e..966a47247 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
@@ -5,7 +5,7 @@ metadata:
   name: report-cron
   namespace: {{ .Release.Namespace }}
 spec:
-  schedule: "{{ .Values.cron }}"
+  schedule: "{{ .Values.report.cron }}"
   failedJobsHistoryLimit: 1
   successfulJobsHistoryLimit: 1
   jobTemplate:
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
index 7a916b4c1..9313e88af 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
@@ -5,7 +5,7 @@ metadata:
   name: sessions-cleaner-cron
   namespace: {{ .Release.Namespace }}
 spec:
-  schedule: "{{ .Values.cron }}"
+  schedule: "{{ .Values.sessionsCleaner.cron }}"
   failedJobsHistoryLimit: 1
   successfulJobsHistoryLimit: 1
   jobTemplate:
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
index ca7dc03c4..95fd26188 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
@@ -5,7 +5,7 @@ metadata:
   name: telemetry-cron
   namespace: {{ .Release.Namespace }}
 spec:
-  schedule: "{{ .Values.cron }}"
+  schedule: "{{ .Values.telemetry.cron }}"
   failedJobsHistoryLimit: 1
   successfulJobsHistoryLimit: 1
   jobTemplate:
diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index 8df1560d0..e973cbeec 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -35,6 +35,7 @@ report:
 sessionsCleaner:
   # https://crontab.guru/#5_1_*_*_*
   # Midnight 1.05
+  cron: "5 1 * * *"
   image:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/crons"
     pullPolicy: IfNotPresent

From 9e78bf742e0dc3cd6c606e3c9aae6fc34e2f47cf Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 13 Jul 2022 20:37:27 +0200
Subject: [PATCH 05/77] chore(cron): pull image always

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../helmcharts/openreplay/charts/utilities/values.yaml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index e973cbeec..7bfa67523 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: "{{ .Values.global.openReplayContainerRegistry }}/utilities"
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
@@ -16,7 +16,7 @@ telemetry:
   cron: "5 12 * * *"
   image:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/crons"
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
   env:
@@ -27,7 +27,7 @@ report:
   cron: "0 5 * * 1"
   image:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/crons"
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
   env:
@@ -38,7 +38,7 @@ sessionsCleaner:
   cron: "5 1 * * *"
   image:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/crons"
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
   env:

From 6f6b832a18e6dd364def4c7fd60b62b82cc35820 Mon Sep 17 00:00:00 2001
From: sylenien <nikita@openreplay.com>
Date: Mon, 11 Jul 2022 12:49:28 +0200
Subject: [PATCH 06/77] fix(ui): fix dashbaord selector

---
 .../Dashboard/components/DashboardView/DashboardView.tsx       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
index d376e97f0..108d961a5 100644
--- a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
@@ -65,6 +65,9 @@ function DashboardView(props: Props) {
             trimQuery();
         }
     }, []);
+    useEffect(() => {
+        dashboardStore.selectDefaultDashboard();
+    }, [siteId])
 
     const onAddWidgets = () => {
         dashboardStore.initDashboard(dashboard);

From d1806b08efe54817da2a68391857a942c5268bef Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 11 Jul 2022 17:56:01 +0200
Subject: [PATCH 07/77] fix(ui) - devtools inputfields

---
 frontend/app/components/Session_/Console/ConsoleContent.js | 2 +-
 frontend/app/components/Session_/Fetch/Fetch.js            | 2 +-
 frontend/app/components/Session_/LongTasks/LongTasks.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/app/components/Session_/Console/ConsoleContent.js b/frontend/app/components/Session_/Console/ConsoleContent.js
index 880f660e7..0ffaa6032 100644
--- a/frontend/app/components/Session_/Console/ConsoleContent.js
+++ b/frontend/app/components/Session_/Console/ConsoleContent.js
@@ -60,7 +60,7 @@ export default class ConsoleContent extends React.PureComponent {
     activeTab: ALL,
   }
   onTabClick = activeTab => this.setState({ activeTab })
-  onFilterChange = (e, { value }) => this.setState({ filter: value })
+  onFilterChange = ({ target: { value }}) => this.setState({ filter: value })
 
   render() {
     const { logs, isResult, additionalHeight, time } = this.props;
diff --git a/frontend/app/components/Session_/Fetch/Fetch.js b/frontend/app/components/Session_/Fetch/Fetch.js
index 46cc44d38..cf05f944d 100644
--- a/frontend/app/components/Session_/Fetch/Fetch.js
+++ b/frontend/app/components/Session_/Fetch/Fetch.js
@@ -28,7 +28,7 @@ export default class Fetch extends React.PureComponent {
     hasPreviousError: false,
 	}
   
-  onFilterChange = (e, { value }) => {
+  onFilterChange = ({ target: { value } }) => {
     const { list } = this.props;
     const filterRE = getRE(value, 'i');
     const filtered = list
diff --git a/frontend/app/components/Session_/LongTasks/LongTasks.js b/frontend/app/components/Session_/LongTasks/LongTasks.js
index 61f8b41ea..55f204ea4 100644
--- a/frontend/app/components/Session_/LongTasks/LongTasks.js
+++ b/frontend/app/components/Session_/LongTasks/LongTasks.js
@@ -29,7 +29,7 @@ export default class GraphQL extends React.PureComponent {
   state = {
     filter: "",
   }
-  onFilterChange = (e, { value }) => this.setState({ filter: value })
+  onFilterChange = ({ target: { value } }) => this.setState({ filter: value })
 
   jump = ({ time }) => {
     jump(time);

From de9a11a7dace79d92b75d68dd5536fd56ef7414c Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 12 Jul 2022 17:40:24 +0200
Subject: [PATCH 08/77] fix random issues (tooltip, assist, button) (#596)

* fix(ui) - live player loader

* change(ui) - removed unused

* change(ui) - button changes

* fix(ui) - tooltip changes
---
 .../AssistActions/AssistActions.tsx           | 261 +++++++++---------
 .../EventsToggleButton.module.css             |   7 -
 .../EventsToggleButton/EventsToggleButton.tsx |  35 ---
 .../Session/EventsToggleButton/index.js       |   1 -
 .../app/components/Session/LiveSession.js     |  18 +-
 .../Player/Overlay/ElementsMarker/Marker.tsx  |   8 +-
 .../LiveSessionList/LiveSessionList.tsx       | 112 ++++----
 frontend/app/components/ui/Button/Button.tsx  | 115 ++++----
 .../components/ui/Pagination/Pagination.tsx   |  13 +-
 frontend/app/components/ui/Popup/Popup.tsx    |  15 +-
 10 files changed, 287 insertions(+), 298 deletions(-)
 delete mode 100644 frontend/app/components/Session/EventsToggleButton/EventsToggleButton.module.css
 delete mode 100644 frontend/app/components/Session/EventsToggleButton/EventsToggleButton.tsx
 delete mode 100644 frontend/app/components/Session/EventsToggleButton/index.js

diff --git a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
index de843e969..ba1a7cf0b 100644
--- a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
+++ b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
@@ -1,153 +1,166 @@
-import React, { useState, useEffect } from 'react'
-import { Popup, Icon, IconButton } from 'UI'
-import { connect } from 'react-redux'
-import cn from 'classnames'
+import React, { useState, useEffect } from 'react';
+import { Popup, Icon, Button, IconButton } from 'UI';
+import { connect } from 'react-redux';
+import cn from 'classnames';
 import { toggleChatWindow } from 'Duck/sessions';
 import { connectPlayer } from 'Player/store';
 import ChatWindow from '../../ChatWindow';
-import { callPeer, requestReleaseRemoteControl, toggleAnnotation } from 'Player'
+import { callPeer, requestReleaseRemoteControl, toggleAnnotation } from 'Player';
 import { CallingState, ConnectionStatus, RemoteControlStatus } from 'Player/MessageDistributor/managers/AssistManager';
 import RequestLocalStream from 'Player/MessageDistributor/managers/LocalStream';
 import type { LocalStream } from 'Player/MessageDistributor/managers/LocalStream';
 
 import { toast } from 'react-toastify';
 import { confirm } from 'UI';
-import stl from './AassistActions.module.css'
+import stl from './AassistActions.module.css';
 
 function onClose(stream) {
-  stream.getTracks().forEach(t=>t.stop());
+    stream.getTracks().forEach((t) => t.stop());
 }
 
 function onReject() {
-  toast.info(`Call was rejected.`);
+    toast.info(`Call was rejected.`);
 }
 
 function onError(e) {
-  toast.error(typeof e === 'string' ? e : e.message);
+    toast.error(typeof e === 'string' ? e : e.message);
 }
 
-
 interface Props {
-  userId: String,
-  toggleChatWindow: (state) => void,
-  calling: CallingState,
-  annotating: boolean,
-  peerConnectionStatus: ConnectionStatus,
-  remoteControlStatus: RemoteControlStatus,
-  hasPermission: boolean,
-  isEnterprise: boolean,
+    userId: String;
+    toggleChatWindow: (state) => void;
+    calling: CallingState;
+    annotating: boolean;
+    peerConnectionStatus: ConnectionStatus;
+    remoteControlStatus: RemoteControlStatus;
+    hasPermission: boolean;
+    isEnterprise: boolean;
 }
 
-function AssistActions({ toggleChatWindow, userId, calling, annotating, peerConnectionStatus, remoteControlStatus, hasPermission, isEnterprise }: Props) {
-  const [ incomeStream, setIncomeStream ] = useState<MediaStream | null>(null);
-  const [ localStream, setLocalStream ] = useState<LocalStream | null>(null);
-  const [ callObject, setCallObject ] = useState<{ end: ()=>void } | null >(null);
+function AssistActions({
+    toggleChatWindow,
+    userId,
+    calling,
+    annotating,
+    peerConnectionStatus,
+    remoteControlStatus,
+    hasPermission,
+    isEnterprise,
+}: Props) {
+    const [incomeStream, setIncomeStream] = useState<MediaStream | null>(null);
+    const [localStream, setLocalStream] = useState<LocalStream | null>(null);
+    const [callObject, setCallObject] = useState<{ end: () => void } | null>(null);
 
-  useEffect(() => {
-    return callObject?.end()
-  }, [])
+    useEffect(() => {
+        return callObject?.end();
+    }, []);
 
-  useEffect(() => {
-    if (peerConnectionStatus == ConnectionStatus.Disconnected) {
-      toast.info(`Live session was closed.`);
-    }    
-  }, [peerConnectionStatus])
-
-  function call() {
-    RequestLocalStream().then(lStream => {
-      setLocalStream(lStream);
-      setCallObject(callPeer(
-        lStream,
-        setIncomeStream,
-        lStream.stop.bind(lStream),
-        onReject,
-        onError
-      ));
-    }).catch(onError)
-  }
-
-  const confirmCall =  async () => {
-    if (await confirm({
-      header: 'Start Call',
-      confirmButton: 'Call',
-      confirmation: `Are you sure you want to call ${userId ? userId : 'User'}?`
-    })) {
-      call()
-    }
-  }
-
-  const onCall = calling === CallingState.OnCall || calling === CallingState.Reconnecting
-  const cannotCall = (peerConnectionStatus !== ConnectionStatus.Connected) || (isEnterprise && !hasPermission)
-  const remoteActive = remoteControlStatus === RemoteControlStatus.Enabled
-
-  return (
-    <div className="flex items-center">
-      {(onCall || remoteActive) && (
-        <>
-          <div
-            className={
-              cn(
-                'cursor-pointer p-2 flex items-center',
-                {[stl.disabled]: cannotCall}
-              )
-            }
-            onClick={ () => toggleAnnotation(!annotating) }
-            role="button"
-          >
-            <IconButton label={`Annotate`} icon={ annotating ? "pencil-stop" : "pencil"} primaryText redText={annotating} />
-          </div>
-          <div className={ stl.divider } />
-        </>
-      )}
-      <div
-        className={
-          cn(
-            'cursor-pointer p-2 flex items-center',
-            {[stl.disabled]: cannotCall}
-          )
+    useEffect(() => {
+        if (peerConnectionStatus == ConnectionStatus.Disconnected) {
+            toast.info(`Live session was closed.`);
         }
-        onClick={ requestReleaseRemoteControl }
-        role="button"
-      >
-        <IconButton label={`Remote Control`} icon={ remoteActive ? "window-x" : "remote-control"} primaryText redText={remoteActive} />
-      </div>
-      <div className={ stl.divider } />
-      
-      <Popup
-        content={ cannotCall ? "You don’t have the permissions to perform this action." : `Call ${userId ? userId : 'User'}` }
-      >
-        <div
-          className={
-            cn(
-              'cursor-pointer p-2 flex items-center',
-              {[stl.disabled]: cannotCall}
-            )
-          }
-          onClick={ onCall ? callObject?.end : confirmCall}
-          role="button"
-        >
-          <IconButton size="small" primary={!onCall} red={onCall} label={onCall ? 'End' : 'Call'} icon="headset" />
-        </div>
-      </Popup>
+    }, [peerConnectionStatus]);
 
-      <div className="fixed ml-3 left-0 top-0" style={{ zIndex: 999 }}>
-        { onCall && callObject && <ChatWindow endCall={callObject.end} userId={userId} incomeStream={incomeStream} localStream={localStream} /> }
-      </div>
-    </div>
-  )
+    function call() {
+        RequestLocalStream()
+            .then((lStream) => {
+                setLocalStream(lStream);
+                setCallObject(callPeer(lStream, setIncomeStream, lStream.stop.bind(lStream), onReject, onError));
+            })
+            .catch(onError);
+    }
+
+    const confirmCall = async () => {
+        if (
+            await confirm({
+                header: 'Start Call',
+                confirmButton: 'Call',
+                confirmation: `Are you sure you want to call ${userId ? userId : 'User'}?`,
+            })
+        ) {
+            call();
+        }
+    };
+
+    const onCall = calling === CallingState.OnCall || calling === CallingState.Reconnecting;
+    const cannotCall = peerConnectionStatus !== ConnectionStatus.Connected || (isEnterprise && !hasPermission);
+    const remoteActive = remoteControlStatus === RemoteControlStatus.Enabled;
+
+    return (
+        <div className="flex items-center">
+            {(onCall || remoteActive) && (
+                <>
+                    <div
+                        className={cn('cursor-pointer p-2 flex items-center', { [stl.disabled]: cannotCall })}
+                        onClick={() => toggleAnnotation(!annotating)}
+                        role="button"
+                    >
+                        <Button
+                            icon={annotating ? 'pencil-stop' : 'pencil'}
+                            variant={annotating ? 'text-red' : 'text-primary'}
+                            style={{ height: '28px' }}
+                        >
+                            Annotate
+                        </Button>
+                        {/* <IconButton label={`Annotate`} icon={annotating ? 'pencil-stop' : 'pencil'} primaryText redText={annotating} /> */}
+                    </div>
+                    <div className={stl.divider} />
+                </>
+            )}
+            <div
+                className={cn('cursor-pointer p-2 flex items-center', { [stl.disabled]: cannotCall })}
+                onClick={requestReleaseRemoteControl}
+                role="button"
+            >
+                <Button
+                    icon={remoteActive ? 'window-x' : 'remote-control'}
+                    variant={remoteActive ? 'text-red' : 'text-primary'}
+                    style={{ height: '28px' }}
+                >
+                    Remote Control
+                </Button>
+                {/* <IconButton label={`Remote Control`} icon={remoteActive ? 'window-x' : 'remote-control'} primaryText redText={remoteActive} /> */}
+            </div>
+            <div className={stl.divider} />
+
+            <Popup content={cannotCall ? 'You don’t have the permissions to perform this action.' : `Call ${userId ? userId : 'User'}`}>
+                <div
+                    className={cn('cursor-pointer p-2 flex items-center', { [stl.disabled]: cannotCall })}
+                    onClick={onCall ? callObject?.end : confirmCall}
+                    role="button"
+                >
+                    <Button icon="headset" variant={onCall ? 'text-red' : 'primary'} style={{ height: '28px' }}>
+                        {onCall ? 'End' : 'Call'}
+                    </Button>
+                    {/* <IconButton size="small" primary={!onCall} red={onCall} label={onCall ? 'End' : 'Call'} icon="headset" /> */}
+                </div>
+            </Popup>
+
+            <div className="fixed ml-3 left-0 top-0" style={{ zIndex: 999 }}>
+                {onCall && callObject && (
+                    <ChatWindow endCall={callObject.end} userId={userId} incomeStream={incomeStream} localStream={localStream} />
+                )}
+            </div>
+        </div>
+    );
 }
 
-const con = connect(state => {
-  const permissions = state.getIn([ 'user', 'account', 'permissions' ]) || []
-  return {
-    hasPermission: permissions.includes('ASSIST_CALL'),
-    isEnterprise: state.getIn([ 'user', 'account', 'edition' ]) === 'ee',
-  }
-}, { toggleChatWindow })
+const con = connect(
+    (state) => {
+        const permissions = state.getIn(['user', 'account', 'permissions']) || [];
+        return {
+            hasPermission: permissions.includes('ASSIST_CALL'),
+            isEnterprise: state.getIn(['user', 'account', 'edition']) === 'ee',
+        };
+    },
+    { toggleChatWindow }
+);
 
-export default con(connectPlayer(state => ({
-  calling: state.calling,
-  annotating: state.annotating,
-  remoteControlStatus: state.remoteControl,
-  peerConnectionStatus: state.peerConnectionStatus,
-}))(AssistActions))
+export default con(
+    connectPlayer((state) => ({
+        calling: state.calling,
+        annotating: state.annotating,
+        remoteControlStatus: state.remoteControl,
+        peerConnectionStatus: state.peerConnectionStatus,
+    }))(AssistActions)
+);
diff --git a/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.module.css b/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.module.css
deleted file mode 100644
index 19eda2568..000000000
--- a/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.wrapper {  
-  background-color: rgba(255, 255, 255, 1);
-  border-top-left-radius: 20px;
-  border-bottom-left-radius: 20px;
-  padding: 5px;
-  box-shadow: -1px 1px 1px rgba(0, 0, 0, 0.5);
-}
\ No newline at end of file
diff --git a/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.tsx b/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.tsx
deleted file mode 100644
index 4d4b70895..000000000
--- a/frontend/app/components/Session/EventsToggleButton/EventsToggleButton.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react'
-import { Icon, Popup } from 'UI'
-import { connectPlayer, toggleEvents, scale } from 'Player';
-import cn from 'classnames'
-import stl from './EventsToggleButton.module.css'
-
-function EventsToggleButton({ showEvents, toggleEvents }: any) {
-  const toggle = () => {
-    toggleEvents()
-    scale()
-  }
-  return (
-    <Popup
-      content={ showEvents ? 'Hide Events' : 'Show Events' }
-      size="tiny"
-      inverted
-      position="bottom right"
-    >
-      <button
-        className={cn("absolute right-0 z-50", stl.wrapper)}
-        onClick={toggle}
-      >
-        <Icon
-          name={ showEvents ? 'chevron-double-right' : 'chevron-double-left' }
-          size="12"
-        />      
-      </button>
-    </Popup>
-  )
-}
-
-export default connectPlayer(state => ({
-  showEvents: !state.showEvents
-}), { toggleEvents })(EventsToggleButton)
-
diff --git a/frontend/app/components/Session/EventsToggleButton/index.js b/frontend/app/components/Session/EventsToggleButton/index.js
deleted file mode 100644
index b391f169d..000000000
--- a/frontend/app/components/Session/EventsToggleButton/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './EventsToggleButton'
\ No newline at end of file
diff --git a/frontend/app/components/Session/LiveSession.js b/frontend/app/components/Session/LiveSession.js
index 673e0c701..8ab1adf03 100644
--- a/frontend/app/components/Session/LiveSession.js
+++ b/frontend/app/components/Session/LiveSession.js
@@ -4,17 +4,17 @@ import { connect } from 'react-redux';
 import usePageTitle from 'App/hooks/usePageTitle';
 import { fetch as fetchSession } from 'Duck/sessions';
 import { fetchList as fetchSlackList } from 'Duck/integrations/slack';
-import { Link, NoContent, Loader } from 'UI';
-import { sessions as sessionsRoute } from 'App/routes';
+// import { Link, NoContent, Loader } from 'UI';
+// import { sessions as sessionsRoute } from 'App/routes';
 import withPermissions from 'HOCs/withPermissions'
 import LivePlayer from './LivePlayer';
 
-const SESSIONS_ROUTE = sessionsRoute();
+// const SESSIONS_ROUTE = sessionsRoute();
 
 function LiveSession({ 
 	sessionId,
-	loading,
-  	hasErrors,
+	// loading,
+  	// hasErrors,
 	session, 
 	fetchSession,
   	fetchSlackList,
@@ -38,9 +38,9 @@ function LiveSession({
 	},[ sessionId, hasSessionsPath ]);
 
 	return (
-		<Loader className="flex-1" loading={ loading }> 
+		// <Loader className="flex-1" loading={ loading }> 
 			<LivePlayer />
-		</Loader>
+		// </Loader>
 	);
 }
 
@@ -50,8 +50,8 @@ export default withPermissions(['ASSIST_LIVE'], '', true)(connect((state, props)
   	const hasSessiosPath = state.getIn([ 'sessions', 'sessionPath' ]).pathname.includes('/sessions');
 	return {
 		sessionId,
-		loading: state.getIn([ 'sessions', 'loading' ]),
-		hasErrors: !!state.getIn([ 'sessions', 'errors' ]),
+		// loading: state.getIn([ 'sessions', 'loading' ]),
+		// hasErrors: !!state.getIn([ 'sessions', 'errors' ]),
 		session: state.getIn([ 'sessions', 'current' ]),
 		hasSessionsPath: hasSessiosPath && !isAssist,
 	};
diff --git a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx
index f91f1d963..d5afa65a2 100644
--- a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx
+++ b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx
@@ -4,7 +4,7 @@ import type { MarkedTarget } from 'Player/MessageDistributor/StatedScreen/Stated
 import cn from 'classnames';
 import stl from './Marker.module.css';
 import { activeTarget } from 'Player';
-import { Popup } from 'UI';
+import { Tooltip } from 'react-tippy';
 
 interface Props {
   target: MarkedTarget;
@@ -21,17 +21,17 @@ export default function Marker({ target, active }: Props) {
   return (
       <div className={ cn(stl.marker, { [stl.active] : active }) }  style={ style } onClick={() => activeTarget(target.index)}>
         <div className={stl.index}>{target.index + 1}</div>
-        <Popup      
+        <Tooltip      
           open={active}
           arrow
           sticky
           distance={15}
-          content={(
+          html={(
             <div>{target.count} Clicks</div>
           )}
         >
           <div className="absolute inset-0"></div>
-        </Popup>
+        </Tooltip>
     </div>    
   )    
 }
\ No newline at end of file
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index 75a09eb80..4adcc8365 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -116,67 +116,67 @@ function LiveSessionList(props: Props) {
                 <div className="flex items-center">
                     <div className="flex items-center ml-6 mr-4">
                         <span className="mr-2 color-gray-medium">Sort By</span>
-                        <Popup
-                          content="No metadata available to sort"
-                          disabled={sortOptions.length > 0}
-                        >
-                          <div className={ cn("flex items-center", { 'disabled': sortOptions.length === 0})} >
-                            <Select
-                                plain
-                                right
-                                options={sortOptions}
-                                // defaultValue={sort.field}
-                                onChange={onSortChange}
-                                value={sortOptions.find((i: any) => i.value === filter.sort) || sortOptions[0]}
-                            />
-                            <div className="mx-2" />
-                            <SortOrderButton onChange={(state: any) => props.applyFilter({ order: state })} sortOrder={filter.order} />
-                          </div>
+                        <Popup content="No metadata available to sort" disabled={sortOptions.length > 0}>
+                            <div className={cn('flex items-center', { disabled: sortOptions.length === 0 })}>
+                                <Select
+                                    plain
+                                    right
+                                    options={sortOptions}
+                                    // defaultValue={sort.field}
+                                    onChange={onSortChange}
+                                    value={sortOptions.find((i: any) => i.value === filter.sort) || sortOptions[0]}
+                                />
+                                <div className="mx-2" />
+                                <SortOrderButton onChange={(state: any) => props.applyFilter({ order: state })} sortOrder={filter.order} />
+                            </div>
                         </Popup>
                     </div>
                 </div>
             </div>
-            <Loader loading={loading}>
-                <NoContent
-                    title={'No live sessions.'}
-                    subtext={
-                        <span>
-                            See how to setup the{' '}
-                            <a target="_blank" className="link" href="https://docs.openreplay.com/plugins/assist">
-                                {'Assist'}
-                            </a>{' '}
-                            plugin, if you haven’t done that already.
-                        </span>
-                    }
-                    image={<img src="/assets/img/live-sessions.png" style={{ width: '70%', marginBottom: '30px' }} />}
-                    show={!loading && list.size === 0}
-                >
-                    <div className="bg-white p-3 rounded border">
-                        {list.map((session) => (
-                            <>
-                                <SessionItem
-                                    key={session.sessionId}
-                                    session={session}
-                                    live
-                                    hasUserFilter={hasUserFilter}
-                                    onUserClick={onUserClick}
-                                    metaList={metaList}
-                                />
-                                <div className="border-b" />
-                            </>
-                        ))}
-
-                        <div className="w-full flex items-center justify-center py-6">
-                            <Pagination
-                                page={currentPage}
-                                totalPages={Math.ceil(total / PER_PAGE)}
-                                onPageChange={(page: any) => props.updateCurrentPage(page)}
-                                limit={PER_PAGE}
-                            />
+            <div className="bg-white p-3 rounded border">
+                <Loader loading={loading}>
+                    <NoContent
+                        title={'No live sessions.'}
+                        subtext={
+                            <span>
+                                See how to setup the{' '}
+                                <a target="_blank" className="link" href="https://docs.openreplay.com/plugins/assist">
+                                    {'Assist'}
+                                </a>{' '}
+                                plugin, if you haven’t done that already.
+                            </span>
+                        }
+                        image={<img src="/assets/img/live-sessions.png" style={{ width: '70%', marginBottom: '30px' }} />}
+                        show={!loading && list.size === 0}
+                    >
+                        <div>
+                            {list.map((session) => (
+                                <>
+                                    <SessionItem
+                                        key={session.sessionId}
+                                        session={session}
+                                        live
+                                        hasUserFilter={hasUserFilter}
+                                        onUserClick={onUserClick}
+                                        metaList={metaList}
+                                    />
+                                    <div className="border-b" />
+                                </>
+                            ))}
                         </div>
-                    </div>
-                </NoContent>
-            </Loader>
+                    </NoContent>
+                </Loader>
+
+                <div className={cn("w-full flex items-center justify-center py-6", { 'disabled' : loading})}>
+                    <Pagination
+                        page={currentPage}
+                        totalPages={Math.ceil(total / PER_PAGE)}
+                        onPageChange={(page: any) => props.updateCurrentPage(page)}
+                        limit={PER_PAGE}
+                        debounceRequest={500}
+                    />
+                </div>
+            </div>
         </div>
     );
 }
diff --git a/frontend/app/components/ui/Button/Button.tsx b/frontend/app/components/ui/Button/Button.tsx
index ec57b2231..d324d4f4a 100644
--- a/frontend/app/components/ui/Button/Button.tsx
+++ b/frontend/app/components/ui/Button/Button.tsx
@@ -3,67 +3,74 @@ import cn from 'classnames';
 import { CircularLoader, Icon } from 'UI';
 
 interface Props {
-  className?: string;
-  children: React.ReactNode;
-  onClick?: () => void;
-  disabled?: boolean;
-  type?: 'button' | 'submit' | 'reset';
-  loading?: boolean;
-  icon?: string;
-  [x: string]: any
+    className?: string;
+    children: React.ReactNode;
+    onClick?: () => void;
+    disabled?: boolean;
+    type?: 'button' | 'submit' | 'reset';
+    loading?: boolean;
+    icon?: string;
+    [x: string]: any;
 }
 export default (props: Props) => {
-  const {
-    icon = '',
-    className = '',
-    variant = "default",
-    type = "button",
-    size = '',
-    disabled = false,
-    children,
-    loading = false,
-    ...rest
-  } = props;
+    const {
+        icon = '',
+        className = '',
+        variant = 'default',
+        type = 'button',
+        size = '',
+        disabled = false,
+        children,
+        loading = false,
+        ...rest
+    } = props;
 
-  const classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
-  if (variant === 'default') {
-    classes.push('bg-white hover:bg-gray-lightest border border-gray-light')
-  }
+    const classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
+    if (variant === 'default') {
+        classes.push('bg-white hover:bg-gray-lightest border border-gray-light');
+    }
 
-  if (variant === 'primary') {
-    classes.push('bg-teal color-white hover:bg-teal-dark')
-  }
+    if (variant === 'primary') {
+        classes.push('bg-teal color-white hover:bg-teal-dark');
+    }
 
-  if (variant === 'text') {
-    classes.push('bg-transparent color-gray-dark hover:bg-gray-lightest hover:color-gray-dark')
-  }
+    if (variant === 'text') {
+        classes.push('bg-transparent color-gray-dark hover:bg-gray-lightest hover:color-gray-dark');
+    }
 
-  if (variant === 'text-primary') {
-    classes.push('bg-transparent color-teal hover:bg-teal-light hover:color-teal-dark')
-  }
+    if (variant === 'text-primary') {
+        classes.push('bg-transparent color-teal hover:bg-teal-light hover:color-teal-dark');
+    }
 
-  if (variant === 'outline') {
-    classes.push('bg-white color-teal border border-teal hover:bg-teal-light')
-  }
+    if (variant === 'text-red') {
+        classes.push('bg-transparent color-red hover:bg-teal-light');
+    }
 
-  if (disabled) {
-    classes.push('opacity-40 pointer-events-none')
-  }
+    if (variant === 'outline') {
+        classes.push('bg-white color-teal border border-teal hover:bg-teal-light');
+    }
 
-  const iconColor = variant === 'text' || variant === 'default' ? 'gray-dark' : 'teal';
-  // console.log('children', children)
+    if (disabled) {
+        classes.push('opacity-40 pointer-events-none');
+    }
 
-  return (
-    <button
-      { ...rest }
-      type={type}
-      className={ cn(classes, className ) }
-    >
-      { icon && <Icon className={cn({ "mr-2" : children })} name={icon} color={iconColor} size="16" /> }
-      { loading && <div className="absolute flex items-center justify-center inset-0 z-1 rounded">
-        <CircularLoader />
-      </div> }
-      <div className={cn({ 'opacity-0' : loading }, 'flex items-center')}>{children}</div>
-    </button>
-  );
-}
+    let iconColor = variant === 'text' || variant === 'default' ? 'gray-dark' : 'teal';
+    if (variant === 'primary') {
+        iconColor = 'white';
+    }
+    if (variant === 'text-red') {
+        iconColor = 'red';
+    }
+
+    return (
+        <button {...rest} type={type} className={cn(classes, className)}>
+            {icon && <Icon className={cn({ 'mr-2': children })} name={icon} color={iconColor} size="16" />}
+            {loading && (
+                <div className="absolute flex items-center justify-center inset-0 z-1 rounded">
+                    <CircularLoader />
+                </div>
+            )}
+            <div className={cn({ 'opacity-0': loading }, 'flex items-center')}>{children}</div>
+        </button>
+    );
+};
diff --git a/frontend/app/components/ui/Pagination/Pagination.tsx b/frontend/app/components/ui/Pagination/Pagination.tsx
index ff1f8fde5..b36d2b397 100644
--- a/frontend/app/components/ui/Pagination/Pagination.tsx
+++ b/frontend/app/components/ui/Pagination/Pagination.tsx
@@ -33,9 +33,10 @@ export default function Pagination(props: Props) {
     return (
         <div className="flex items-center">
             <Popup
-                sticky
                 content="Previous Page"  
-                hideOnClick={true}
+                // hideOnClick={true}
+                animation="none"
+                delay={1500}
             >
                 <button
                     className={cn("py-2 px-3", { "opacity-50 cursor-default": isFirstPage })}
@@ -51,16 +52,16 @@ export default function Pagination(props: Props) {
                 className={cn("py-1 px-2 bg-white border border-gray-light rounded w-16", { "opacity-50 cursor-default": totalPages === 1 })}
                 value={currentPage}
                 min={1}
-                max={totalPages}
+                max={totalPages ? totalPages : 1}
                 onChange={(e) => changePage(parseInt(e.target.value))}
             />
             <span className="mx-3 color-gray-medium">of</span>
             <span >{numberWithCommas(totalPages)}</span>
             <Popup
-                arrow
-                sticky
                 content="Next Page"
-                hideOnClick={true}
+                // hideOnClick={true}
+                animation="none"
+                delay={1500}
             >
                 <button
                     className={cn("py-2 px-3", { "opacity-50 cursor-default": isLastPage })}
diff --git a/frontend/app/components/ui/Popup/Popup.tsx b/frontend/app/components/ui/Popup/Popup.tsx
index 4144aa4a7..c8928fa07 100644
--- a/frontend/app/components/ui/Popup/Popup.tsx
+++ b/frontend/app/components/ui/Popup/Popup.tsx
@@ -7,6 +7,10 @@ interface Props {
   trigger?: any
   position?: any
   className?: string
+  delay?: number
+  disabled?: boolean
+  arrow?: boolean
+  open?: boolean
   [x:string]: any;
 }
 export default ({
@@ -14,14 +18,21 @@ export default ({
   title='',
   className='',
   trigger = 'mouseenter',
+  delay = 1000,
+  disabled = false,
+  arrow = true,
   ...props
 }: Props) => (
   <Tooltip
-    { ...props }
+    // {...props}
     className={className}
     trigger={trigger}
     html={props.content || props.title}
-    arrow
+    disabled={disabled}
+    arrow={arrow}
+    delay={delay}
+    hideOnClick={true}
+    hideOnScroll={true}
   >
     { props.children }
   </Tooltip>

From db40242eaca424d6e838e6960d9fa603e3031442 Mon Sep 17 00:00:00 2001
From: Delirium <sylenien@gmail.com>
Date: Tue, 12 Jul 2022 19:03:11 +0200
Subject: [PATCH 09/77] fix(player): fix for message reader (#597)

---
 .../app/player/MessageDistributor/messages/MFileReader.ts     | 4 ++--
 .../app/player/MessageDistributor/messages/PrimitiveReader.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/app/player/MessageDistributor/messages/MFileReader.ts b/frontend/app/player/MessageDistributor/messages/MFileReader.ts
index 48f9bd3cf..82d505716 100644
--- a/frontend/app/player/MessageDistributor/messages/MFileReader.ts
+++ b/frontend/app/player/MessageDistributor/messages/MFileReader.ts
@@ -21,7 +21,7 @@ export default class MFileReader extends RawMessageReader {
         return this.buf[ this.p + i ] - this.buf[ this.pLastMessageID + i ] < 0
       }
     }
-    return true
+    return false
   }
 
   private readRawMessage(): RawMessage | null {
@@ -70,4 +70,4 @@ export default class MFileReader extends RawMessageReader {
     })
     return [msg, this.pLastMessageID]
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/app/player/MessageDistributor/messages/PrimitiveReader.ts b/frontend/app/player/MessageDistributor/messages/PrimitiveReader.ts
index bc62bf653..ffb2c3edc 100644
--- a/frontend/app/player/MessageDistributor/messages/PrimitiveReader.ts
+++ b/frontend/app/player/MessageDistributor/messages/PrimitiveReader.ts
@@ -1,4 +1,5 @@
 export default class PrimitiveReader {
+  /** pointer for curent position in the buffer */
   protected p: number = 0
   constructor(protected buf: Uint8Array = new Uint8Array(0)) {}
 

From 35d50180b96a583a56cddd578245f21beaf8c050 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 12 Jul 2022 19:21:29 +0200
Subject: [PATCH 10/77] fix(ui) - player loader

---
 frontend/app/components/Session/LiveSession.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/app/components/Session/LiveSession.js b/frontend/app/components/Session/LiveSession.js
index 8ab1adf03..f35997b11 100644
--- a/frontend/app/components/Session/LiveSession.js
+++ b/frontend/app/components/Session/LiveSession.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import usePageTitle from 'App/hooks/usePageTitle';
 import { fetch as fetchSession } from 'Duck/sessions';
 import { fetchList as fetchSlackList } from 'Duck/integrations/slack';
-// import { Link, NoContent, Loader } from 'UI';
+import { Loader } from 'UI';
 // import { sessions as sessionsRoute } from 'App/routes';
 import withPermissions from 'HOCs/withPermissions'
 import LivePlayer from './LivePlayer';
@@ -13,7 +13,7 @@ import LivePlayer from './LivePlayer';
 
 function LiveSession({ 
 	sessionId,
-	// loading,
+	loading,
   	// hasErrors,
 	session, 
 	fetchSession,
@@ -38,9 +38,9 @@ function LiveSession({
 	},[ sessionId, hasSessionsPath ]);
 
 	return (
-		// <Loader className="flex-1" loading={ loading }> 
+		<Loader className="flex-1" loading={ loading }> 
 			<LivePlayer />
-		// </Loader>
+		</Loader>
 	);
 }
 
@@ -50,7 +50,7 @@ export default withPermissions(['ASSIST_LIVE'], '', true)(connect((state, props)
   	const hasSessiosPath = state.getIn([ 'sessions', 'sessionPath' ]).pathname.includes('/sessions');
 	return {
 		sessionId,
-		// loading: state.getIn([ 'sessions', 'loading' ]),
+		loading: state.getIn([ 'sessions', 'loading' ]),
 		// hasErrors: !!state.getIn([ 'sessions', 'errors' ]),
 		session: state.getIn([ 'sessions', 'current' ]),
 		hasSessionsPath: hasSessiosPath && !isAssist,

From 1c92641833ad3d605364e7d8b6d2bebfa8d1a437 Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Tue, 12 Jul 2022 22:16:23 +0200
Subject: [PATCH 11/77] v1.7.0 enhanced  (#598)

* feat(chalice): upgrades & refacotered image
* feat(alerts): upgrades & refacotered image
* feat(crons): upgrades & refacotered image
* feat(crons): changed build script
* feat(alerts): changed build script
* feat(crons): changed Dockerfile
* feat(alerts): changed shell interpreter
* feat(chalice): changed shell interpreter
* feat(crons): changed shell interpreter
* feat(alerts): changed Dockerfile
* feat(chalice): changed Dockerfile
* feat(crons): changed Dockerfile
* feat(chalice): include tenant_key
* feat(chalice): less imports
---
 api/Dockerfile                          |  14 +-
 api/Dockerfile.alerts                   |   4 +-
 api/build_alerts.sh                     |  37 +-
 api/chalicelib/utils/helper.py          |   4 +
 api/requirements-alerts.txt             |  15 +
 api/requirements.txt                    |  12 +-
 ee/api/.dockerignore                    |  15 +
 ee/api/Dockerfile                       |  29 +-
 ee/api/Dockerfile.alerts                |  24 +-
 ee/api/Dockerfile.alerts.dockerignore   |  15 +
 ee/api/Dockerfile.crons                 |  25 +-
 ee/api/Dockerfile.crons.dockerignore    |  15 +
 ee/api/build_crons.sh                   |  25 +-
 ee/api/chalicelib/core/tenants.py       |   3 +-
 ee/api/chalicelib/core/users.py         |   4 +-
 ee/api/chalicelib/utils/SAML2_helper.py |   4 +
 ee/api/clean.sh                         |   1 -
 ee/api/entrypoint.sh                    |   4 +-
 ee/api/entrypoint_alerts.sh             |   4 +-
 ee/api/entrypoint_crons.sh              |   4 +-
 ee/api/env_vars.sh                      |   2 +-
 ee/api/requirements-alerts.txt          |  18 +
 ee/api/requirements-crons.txt           |  18 +
 ee/api/requirements.txt                 |  23 +-
 peers/Dockerfile                        |  23 +-
 peers/package-lock.json                 | 446 +++++++++++++--------
 peers/package.json                      |   2 +-
 sourcemap-reader/package-lock.json      | 493 +++++++++++++++---------
 sourcemap-reader/package.json           |   4 +-
 utilities/Dockerfile                    |  27 +-
 utilities/package-lock.json             | 449 ++++++++++++++-------
 utilities/package.json                  |   2 +-
 32 files changed, 1118 insertions(+), 647 deletions(-)
 create mode 100644 api/requirements-alerts.txt
 create mode 100644 ee/api/.dockerignore
 create mode 100644 ee/api/Dockerfile.alerts.dockerignore
 create mode 100644 ee/api/Dockerfile.crons.dockerignore
 create mode 100644 ee/api/requirements-alerts.txt
 create mode 100644 ee/api/requirements-crons.txt

diff --git a/api/Dockerfile b/api/Dockerfile
index 90ef3ad13..ae149b034 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,27 +1,27 @@
-FROM python:3.9.12-slim
+FROM python:3.10-slim
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-ENV APP_NAME chalice
+ARG envarg
 # Add Tini
 # Startup daemon
 ENV TINI_VERSION=v0.19.0 \
-    SOURCE_MAP_VERSION=0.7.4
-ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
+    SOURCE_MAP_VERSION=0.7.4 \
+    APP_NAME=chalice \
+    ENTERPRISE_BUILD=${envarg}
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
 RUN chmod +x /tini
 
 # Installing Nodejs
 RUN apt update && apt install -y curl && \
-    curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \
+    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
     apt install -y nodejs && \
     apt remove --purge -y curl && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /work_tmp
 COPY requirements.txt /work_tmp/requirements.txt
-RUN pip install -r /work_tmp/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
 COPY sourcemap-reader/*.json /work_tmp/
 RUN cd /work_tmp && npm install
 
diff --git a/api/Dockerfile.alerts b/api/Dockerfile.alerts
index 19485fe38..bb8f11285 100644
--- a/api/Dockerfile.alerts
+++ b/api/Dockerfile.alerts
@@ -1,4 +1,4 @@
-FROM python:3.9.12-slim
+FROM python:3.10-slim
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 ENV APP_NAME alerts
@@ -13,7 +13,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 COPY requirements.txt /work_tmp/requirements.txt
-RUN pip install -r /work_tmp/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
 
 WORKDIR /work
 COPY . .
diff --git a/api/build_alerts.sh b/api/build_alerts.sh
index 5a098b70c..b5aa759b0 100644
--- a/api/build_alerts.sh
+++ b/api/build_alerts.sh
@@ -7,35 +7,6 @@
 
 # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
 
-function make_submodule() {
-    [[ $1 != "ee" ]] && {
-      # -- this part was generated by modules_lister.py --
-      mkdir alerts
-      cp -R ./{app_alerts,schemas}.py ./alerts/
-      mkdir -p ./alerts/chalicelib/
-      cp -R ./chalicelib/__init__.py ./alerts/chalicelib/
-      mkdir -p ./alerts/chalicelib/core/
-      cp -R ./chalicelib/core/{__init__,alerts_processor,alerts_listener,sessions,events,issues,sessions_metas,metadata,projects,users,authorizers,tenants,assist,events_ios,sessions_mobs,errors,sourcemaps,sourcemaps_parser,resources,performance_event,alerts,notifications,slack,collaboration_slack,webhook}.py ./alerts/chalicelib/core/
-      mkdir -p ./alerts/chalicelib/utils/
-      cp -R ./chalicelib/utils/{__init__,TimeUTC,pg_client,helper,event_filter_definition,dev,email_helper,email_handler,smtp,s3,metrics_helper}.py ./alerts/chalicelib/utils/
-      # -- end of generated part
-    }
-    [[ $1 == "ee" ]] && {
-      # -- this part was generated by modules_lister.py --
-      mkdir alerts
-      cp -R ./{app_alerts,schemas,schemas_ee}.py ./alerts/
-      mkdir -p ./alerts/chalicelib/
-      cp -R ./chalicelib/__init__.py ./alerts/chalicelib/
-      mkdir -p ./alerts/chalicelib/core/
-      cp -R ./chalicelib/core/{__init__,alerts_processor,alerts_listener,sessions,events,issues,sessions_metas,metadata,projects,users,authorizers,tenants,roles,assist,events_ios,sessions_mobs,errors,metrics,sourcemaps,sourcemaps_parser,resources,performance_event,alerts,notifications,slack,collaboration_slack,webhook}.py ./alerts/chalicelib/core/
-      mkdir -p ./alerts/chalicelib/utils/
-      cp -R ./chalicelib/utils/{__init__,TimeUTC,pg_client,helper,event_filter_definition,dev,SAML2_helper,email_helper,email_handler,smtp,s3,args_transformer,ch_client,metrics_helper}.py ./alerts/chalicelib/utils/
-      # -- end of generated part
-    }
-    cp -R ./{Dockerfile.alerts,requirements.txt,env.default,entrypoint_alerts.sh} ./alerts/
-    cp -R ./chalicelib/utils/html ./alerts/chalicelib/utils/html
-}
-
 git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
 envarg="default-foss"
 check_prereq() {
@@ -53,11 +24,9 @@ function build_api(){
         envarg="default-ee"
         tag="ee-"
     }
-    make_submodule $1
-    cd alerts
-    docker build -f ./Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
-    cd ..
-    rm -rf alerts
+    cp -R ../api ../_alerts
+    docker build -f ../_alerts/Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
+    rm -rf ../_alerts
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/alerts:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/alerts:${git_sha1} ${DOCKER_REPO:-'local'}/alerts:${tag}latest
diff --git a/api/chalicelib/utils/helper.py b/api/chalicelib/utils/helper.py
index 2716cf111..b04b8aa43 100644
--- a/api/chalicelib/utils/helper.py
+++ b/api/chalicelib/utils/helper.py
@@ -398,3 +398,7 @@ def __time_value(row):
     if "chart" in row and factor > 1:
         for r in row["chart"]:
             r["value"] /= factor
+
+
+def is_saml2_available():
+    return config("hastSAML2", default=False, cast=bool)
diff --git a/api/requirements-alerts.txt b/api/requirements-alerts.txt
new file mode 100644
index 000000000..81198b0f3
--- /dev/null
+++ b/api/requirements-alerts.txt
@@ -0,0 +1,15 @@
+requests==2.28.1
+urllib3==1.26.10
+boto3==1.24.26
+pyjwt==2.4.0
+psycopg2-binary==2.9.3
+elasticsearch==8.3.1
+jira==3.3.0
+
+
+
+fastapi==0.78.0
+uvicorn[standard]==0.18.2
+python-decouple==3.6
+pydantic[email]==1.9.1
+apscheduler==3.9.1
\ No newline at end of file
diff --git a/api/requirements.txt b/api/requirements.txt
index dd79c5324..81198b0f3 100644
--- a/api/requirements.txt
+++ b/api/requirements.txt
@@ -1,15 +1,15 @@
-requests==2.28.0
-urllib3==1.26.9
-boto3==1.24.11
+requests==2.28.1
+urllib3==1.26.10
+boto3==1.24.26
 pyjwt==2.4.0
 psycopg2-binary==2.9.3
-elasticsearch==8.2.3
-jira==3.2.0
+elasticsearch==8.3.1
+jira==3.3.0
 
 
 
 fastapi==0.78.0
-uvicorn[standard]==0.17.6
+uvicorn[standard]==0.18.2
 python-decouple==3.6
 pydantic[email]==1.9.1
 apscheduler==3.9.1
\ No newline at end of file
diff --git a/ee/api/.dockerignore b/ee/api/.dockerignore
new file mode 100644
index 000000000..b456d908b
--- /dev/null
+++ b/ee/api/.dockerignore
@@ -0,0 +1,15 @@
+# ignore .git and .cache folders
+.git
+.cache
+**/build.sh
+**/build_*.sh
+**/*deploy.sh
+
+app_crons.py
+app_alerts.py
+requirements-crons.txt
+requirements-alerts.txt
+build_crons.sh
+build_alerts.sh
+entrypoint_crons.sh
+entrypoint_alerts.sh
\ No newline at end of file
diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile
index 9c4faa962..9e40d3ca6 100644
--- a/ee/api/Dockerfile
+++ b/ee/api/Dockerfile
@@ -1,28 +1,17 @@
-FROM python:3.9.12-slim
+FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-ENV APP_NAME chalice
-RUN apt-get update && apt-get install -y pkg-config libxmlsec1-dev gcc && rm -rf /var/lib/apt/lists/*
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION=v0.19.0 \
-    SOURCE_MAP_VERSION=0.7.4
+RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev libxml2-dev xmlsec-dev xmlsec nodejs npm tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
-RUN chmod +x /tini
+ENV SOURCE_MAP_VERSION=0.7.4 \
+    APP_NAME=chalice \
+    ENTERPRISE_BUILD=${envarg}
 
-# Installing Nodejs
-RUN apt update && apt install -y curl && \
-    curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \
-    apt install -y nodejs && \
-    apt remove --purge -y curl && \
-    rm -rf /var/lib/apt/lists/*
+ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
 
 WORKDIR /work_tmp
 COPY requirements.txt /work_tmp/requirements.txt
-RUN pip install -r /work_tmp/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
 COPY sourcemap-reader/*.json /work_tmp/
 RUN cd /work_tmp && npm install
 
@@ -30,5 +19,5 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/.
 
-ENTRYPOINT ["/tini", "--"]
-CMD ./entrypoint.sh
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ./entrypoint.sh
\ No newline at end of file
diff --git a/ee/api/Dockerfile.alerts b/ee/api/Dockerfile.alerts
index 9e43d81f0..6382fa27f 100644
--- a/ee/api/Dockerfile.alerts
+++ b/ee/api/Dockerfile.alerts
@@ -1,25 +1,19 @@
-FROM python:3.9.12-slim
+FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-RUN apt-get update && apt-get install -y pkg-config libxmlsec1-dev gcc && rm -rf /var/lib/apt/lists/*
-ENV APP_NAME alerts
-ENV pg_minconn 2
-ENV pg_maxconn 10
-
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION v0.19.0
+RUN apk add --no-cache build-base tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+ENV APP_NAME=alerts \
+    pg_minconn=2 \
+    pg_maxconn=10 \
+    ENTERPRISE_BUILD=${envarg}
 
-COPY requirements.txt /work_tmp/requirements.txt
-RUN pip install -r /work_tmp/requirements.txt
+COPY requirements-alerts.txt /work_tmp/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
 
 WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
\ No newline at end of file
diff --git a/ee/api/Dockerfile.alerts.dockerignore b/ee/api/Dockerfile.alerts.dockerignore
new file mode 100644
index 000000000..8e1cbef03
--- /dev/null
+++ b/ee/api/Dockerfile.alerts.dockerignore
@@ -0,0 +1,15 @@
+# ignore .git and .cache folders
+.git
+.cache
+**/build.sh
+**/build_*.sh
+**/*deploy.sh
+
+app.py
+app_crons.py
+requirements.txt
+requirements-crons.txt
+build.sh
+build_crons.sh
+entrypoint.sh
+entrypoint_crons.sh
\ No newline at end of file
diff --git a/ee/api/Dockerfile.crons b/ee/api/Dockerfile.crons
index d4b8ed8f0..155180006 100644
--- a/ee/api/Dockerfile.crons
+++ b/ee/api/Dockerfile.crons
@@ -1,26 +1,21 @@
-FROM python:3.9.12-slim
+FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-ENV APP_NAME crons
-ENV pg_minconn 2
-ENV pg_maxconn 10
-RUN apt-get update && apt-get install -y pkg-config libxmlsec1-dev gcc && rm -rf /var/lib/apt/lists/*
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION=v0.19.0 \
-    ACTION=""
+RUN apk add --no-cache build-base tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+ENV APP_NAME=crons \
+    pg_minconn=2 \
+    pg_maxconn=10 \
+    ENTERPRISE_BUILD=${envarg} \
+    ACTION=""
 
 WORKDIR /work_tmp
-COPY requirements.txt /work_tmp/requirements.txt
-RUN pip install -r /work_tmp/requirements.txt
+COPY requirements-crons.txt /work_tmp/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
 
 WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv entrypoint_crons.sh entrypoint.sh
 
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/ee/api/Dockerfile.crons.dockerignore b/ee/api/Dockerfile.crons.dockerignore
new file mode 100644
index 000000000..38fed8fd0
--- /dev/null
+++ b/ee/api/Dockerfile.crons.dockerignore
@@ -0,0 +1,15 @@
+# ignore .git and .cache folders
+.git
+.cache
+**/build.sh
+**/build_*.sh
+**/*deploy.sh
+
+app.py
+app_alerts.py
+requirements.txt
+requirements-alerts.txt
+build.sh
+build_alerts.sh
+entrypoint.sh
+entrypoint_alerts.sh
\ No newline at end of file
diff --git a/ee/api/build_crons.sh b/ee/api/build_crons.sh
index 681d2187e..32bc7ec7f 100644
--- a/ee/api/build_crons.sh
+++ b/ee/api/build_crons.sh
@@ -6,23 +6,6 @@
 # Default will be OSS build.
 
 # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
-function make_submodule() {
-    # -- this part was generated by modules_lister.py --
-    mkdir crons
-    cp -R ./{app_crons,schemas,schemas_ee}.py ./crons/
-    mkdir -p ./crons/routers/crons/
-    cp -R ./routers/crons/{__init__,core_dynamic_crons}.py ./crons/routers/crons/
-    mkdir -p ./crons/chalicelib/
-    cp -R ./chalicelib/__init__.py ./crons/chalicelib/
-    mkdir -p ./crons/chalicelib/core/
-    cp -R ./chalicelib/core/{__init__,telemetry,license,unlock,weekly_report,jobs,sessions,events,issues,sessions_metas,metadata,projects,users,authorizers,tenants,roles,assist,events_ios,sessions_mobs,errors,metrics,sourcemaps,sourcemaps_parser,resources,performance_event}.py ./crons/chalicelib/core/
-    mkdir -p ./crons/chalicelib/utils/
-    cp -R ./chalicelib/utils/{__init__,TimeUTC,pg_client,helper,event_filter_definition,dev,email_helper,email_handler,smtp,s3,args_transformer,ch_client,SAML2_helper,metrics_helper}.py ./crons/chalicelib/utils/
-    # -- end of generated part
-
-    cp -R ./{Dockerfile.crons,requirements.txt,env.default,entrypoint_crons.sh} ./crons/
-    cp -R ./chalicelib/utils/html ./crons/chalicelib/utils/html
-}
 
 git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
 envarg="default-foss"
@@ -42,11 +25,9 @@ function build_api(){
     envarg="default-ee"
     tag="ee-"
 
-    make_submodule $1
-    cd crons
-    docker build -f ./Dockerfile.crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
-    cd ..
-    rm -rf crons
+    cp -R ../api ../_crons
+    docker build -f ../_crons/Dockerfile.crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
+    rm -rf ../crons
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/crons:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/crons:${git_sha1} ${DOCKER_REPO:-'local'}/crons:${tag}latest
diff --git a/ee/api/chalicelib/core/tenants.py b/ee/api/chalicelib/core/tenants.py
index 3f810884e..71119fd13 100644
--- a/ee/api/chalicelib/core/tenants.py
+++ b/ee/api/chalicelib/core/tenants.py
@@ -34,7 +34,8 @@ def get_by_tenant_id(tenant_id):
                        t.created_at,
                         '{license.EDITION}' AS edition,
                         t.version_number,
-                        t.opt_out
+                        t.opt_out,
+                        t.tenant_key
                     FROM public.tenants AS t
                     WHERE t.tenant_id = %(tenantId)s AND t.deleted_at ISNULL
                     LIMIT 1;""",
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index 908c913f6..7b5162b27 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -4,11 +4,9 @@ import secrets
 from decouple import config
 from fastapi import BackgroundTasks
 
-import schemas
 import schemas_ee
 from chalicelib.core import authorizers, metadata, projects, roles
 from chalicelib.core import tenants, assist
-from chalicelib.utils import dev, SAML2_helper
 from chalicelib.utils import helper, email_helper
 from chalicelib.utils import pg_client
 from chalicelib.utils.TimeUTC import TimeUTC
@@ -649,7 +647,7 @@ def authenticate(email, password, for_change_password=False, for_plugin=False):
 
         cur.execute(query)
         r = cur.fetchone()
-        if r is None and SAML2_helper.is_saml2_available():
+        if r is None and helper.is_saml2_available():
             query = cur.mogrify(
                 f"""SELECT 1
                     FROM public.users
diff --git a/ee/api/chalicelib/utils/SAML2_helper.py b/ee/api/chalicelib/utils/SAML2_helper.py
index 5d8ee5ffc..765c8639e 100644
--- a/ee/api/chalicelib/utils/SAML2_helper.py
+++ b/ee/api/chalicelib/utils/SAML2_helper.py
@@ -1,4 +1,5 @@
 from http import cookies
+from os import environ
 from urllib.parse import urlparse
 
 from decouple import config
@@ -125,3 +126,6 @@ def get_saml2_provider():
 
 def get_landing_URL(jwt):
     return config("SITE_URL") + config("sso_landing", default="/login?jwt=%s") % jwt
+
+
+environ["hastSAML2"] = str(is_saml2_available())
diff --git a/ee/api/clean.sh b/ee/api/clean.sh
index 549228366..fa1ab8cb5 100755
--- a/ee/api/clean.sh
+++ b/ee/api/clean.sh
@@ -70,7 +70,6 @@ rm -rf ./routers/subs/dashboard.py
 rm -rf ./db_changes.sql
 rm -rf ./Dockerfile.bundle
 rm -rf ./entrypoint.bundle.sh
-rm -rf ./entrypoint.sh
 rm -rf ./chalicelib/core/heatmaps.py
 rm -rf ./routers/subs/insights.py
 rm -rf ./schemas.py
diff --git a/ee/api/entrypoint.sh b/ee/api/entrypoint.sh
index 60396491c..60aba72a6 100755
--- a/ee/api/entrypoint.sh
+++ b/ee/api/entrypoint.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-bash env_vars.sh
+#!/bin/sh
+sh env_vars.sh
 source .env.override
 cd sourcemap-reader
 nohup npm start &> /tmp/sourcemap-reader.log &
diff --git a/ee/api/entrypoint_alerts.sh b/ee/api/entrypoint_alerts.sh
index 9d6c95358..d2e6d677b 100755
--- a/ee/api/entrypoint_alerts.sh
+++ b/ee/api/entrypoint_alerts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
-bash env_vars.sh
+#!/bin/sh
+sh env_vars.sh
 source .env.override
 uvicorn app:app --host 0.0.0.0 --reload
diff --git a/ee/api/entrypoint_crons.sh b/ee/api/entrypoint_crons.sh
index 056feaa9f..ef29496b2 100755
--- a/ee/api/entrypoint_crons.sh
+++ b/ee/api/entrypoint_crons.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
-bash env_vars.sh
+#!/bin/sh
+sh env_vars.sh
 source .env.override
 python app_crons.py $ACTION
diff --git a/ee/api/env_vars.sh b/ee/api/env_vars.sh
index bb3d42646..a17610aab 100755
--- a/ee/api/env_vars.sh
+++ b/ee/api/env_vars.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 touch .env.override
 if [[ -z "${ENV_CONFIG_OVERRIDE_PATH}" ]]; then
diff --git a/ee/api/requirements-alerts.txt b/ee/api/requirements-alerts.txt
new file mode 100644
index 000000000..66fa84713
--- /dev/null
+++ b/ee/api/requirements-alerts.txt
@@ -0,0 +1,18 @@
+requests==2.28.1
+urllib3==1.26.10
+boto3==1.24.26
+pyjwt==2.4.0
+psycopg2-binary==2.9.3
+elasticsearch==8.3.1
+jira==3.3.0
+
+
+
+fastapi==0.78.0
+uvicorn[standard]==0.18.2
+python-decouple==3.6
+pydantic[email]==1.9.1
+apscheduler==3.9.1
+
+clickhouse-driver==0.2.4
+python-multipart==0.0.5
\ No newline at end of file
diff --git a/ee/api/requirements-crons.txt b/ee/api/requirements-crons.txt
new file mode 100644
index 000000000..66fa84713
--- /dev/null
+++ b/ee/api/requirements-crons.txt
@@ -0,0 +1,18 @@
+requests==2.28.1
+urllib3==1.26.10
+boto3==1.24.26
+pyjwt==2.4.0
+psycopg2-binary==2.9.3
+elasticsearch==8.3.1
+jira==3.3.0
+
+
+
+fastapi==0.78.0
+uvicorn[standard]==0.18.2
+python-decouple==3.6
+pydantic[email]==1.9.1
+apscheduler==3.9.1
+
+clickhouse-driver==0.2.4
+python-multipart==0.0.5
\ No newline at end of file
diff --git a/ee/api/requirements.txt b/ee/api/requirements.txt
index 1593a9206..5ce044904 100644
--- a/ee/api/requirements.txt
+++ b/ee/api/requirements.txt
@@ -1,16 +1,19 @@
-requests==2.28.0
-urllib3==1.26.9
-boto3==1.24.11
+requests==2.28.1
+urllib3==1.26.10
+boto3==1.24.26
 pyjwt==2.4.0
 psycopg2-binary==2.9.3
-elasticsearch==8.2.3
-jira==3.2.0
-clickhouse-driver==0.2.4
-python3-saml==1.12.0
+elasticsearch==8.3.1
+jira==3.3.0
+
+
 
 fastapi==0.78.0
-python-multipart==0.0.5
-uvicorn[standard]==0.17.6
+uvicorn[standard]==0.18.2
 python-decouple==3.6
 pydantic[email]==1.9.1
-apscheduler==3.9.1
\ No newline at end of file
+apscheduler==3.9.1
+
+clickhouse-driver==0.2.4
+python3-saml==1.14.0
+python-multipart==0.0.5
\ No newline at end of file
diff --git a/peers/Dockerfile b/peers/Dockerfile
index d053bf3af..c95415177 100644
--- a/peers/Dockerfile
+++ b/peers/Dockerfile
@@ -1,14 +1,13 @@
-FROM node:17-stretch
-WORKDIR /work
-COPY . .
-RUN npm install
-
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION v0.19.0
+FROM node:18-alpine
+LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk add --no-cache tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENV ENTERPRISE_BUILD=${envarg}
+
+WORKDIR /work
+COPY package.json .
+COPY package-lock.json .
+RUN npm install
+COPY . .
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start
\ No newline at end of file
diff --git a/peers/package-lock.json b/peers/package-lock.json
index 5f253d3bc..043a3ba6d 100644
--- a/peers/package-lock.json
+++ b/peers/package-lock.json
@@ -1,15 +1,15 @@
 {
-  "name": "utilities_server",
+  "name": "peers-server",
   "version": "1.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "utilities_server",
+      "name": "peers-server",
       "version": "1.0.0",
-      "license": "MIT",
+      "license": "Elastic License 2.0 (ELv2)",
       "dependencies": {
-        "express": "^4.17.1",
+        "express": "^4.18.1",
         "peer": "^0.6.1"
       }
     },
@@ -133,23 +133,26 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/bytes": {
@@ -160,6 +163,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/cliui": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -206,9 +221,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -247,22 +262,26 @@
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -272,7 +291,7 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -280,48 +299,49 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -331,16 +351,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -370,11 +390,16 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -383,19 +408,54 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "node_modules/get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/iconv-lite": {
@@ -513,10 +573,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -622,9 +690,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -641,12 +712,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -692,23 +763,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -720,14 +791,14 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -743,12 +814,25 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/string-width": {
@@ -798,7 +882,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -1013,20 +1097,22 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       }
     },
     "bytes": {
@@ -1034,6 +1120,15 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "cliui": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -1071,9 +1166,9 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -1103,19 +1198,19 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -1125,66 +1220,67 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       }
     },
@@ -1205,22 +1301,50 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
-    "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "requires": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       }
     },
@@ -1303,10 +1427,15 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -1380,9 +1509,12 @@
       }
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "range-parser": {
       "version": "1.2.1",
@@ -1390,12 +1522,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -1421,23 +1553,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "ms": {
@@ -1448,14 +1580,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
@@ -1468,10 +1600,20 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "string-width": {
       "version": "4.2.3",
@@ -1508,7 +1650,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "utils-merge": {
       "version": "1.0.1",
diff --git a/peers/package.json b/peers/package.json
index 8a87b3b6a..51f37b5fa 100644
--- a/peers/package.json
+++ b/peers/package.json
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/openreplay/openreplay#readme",
   "dependencies": {
-    "express": "^4.17.1",
+    "express": "^4.18.1",
     "peer": "^0.6.1"
   }
 }
diff --git a/sourcemap-reader/package-lock.json b/sourcemap-reader/package-lock.json
index e2871acb2..eb866a247 100644
--- a/sourcemap-reader/package-lock.json
+++ b/sourcemap-reader/package-lock.json
@@ -9,9 +9,9 @@
       "version": "1.0.0",
       "license": "Elastic License 2.0 (ELv2)",
       "dependencies": {
-        "aws-sdk": "^2.992.0",
-        "express": "^4.17.1",
-        "source-map": "^0.7.3"
+        "aws-sdk": "^2.1172.0",
+        "express": "^4.18.1",
+        "source-map": "^0.7.4"
       }
     },
     "node_modules/accepts": {
@@ -32,9 +32,9 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "node_modules/aws-sdk": {
-      "version": "2.1087.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz",
-      "integrity": "sha512-m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==",
+      "version": "2.1172.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1172.0.tgz",
+      "integrity": "sha512-B3NXD1ZLfwj8oDavb3GTUkDvCioWbRrf01nNkPvdTpoMBQCGw4elTuvG7ZQ114v5V2XWMxpu+SKMkcxALHEd6Q==",
       "dependencies": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -43,7 +43,7 @@
         "querystring": "0.2.0",
         "sax": "1.2.1",
         "url": "0.10.3",
-        "uuid": "3.3.2",
+        "uuid": "8.0.0",
         "xml2js": "0.4.19"
       },
       "engines": {
@@ -70,23 +70,26 @@
       ]
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/buffer": {
@@ -107,6 +110,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -127,9 +142,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -148,27 +163,31 @@
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -176,12 +195,12 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -195,37 +214,38 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -235,16 +255,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -262,24 +282,64 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/iconv-lite": {
@@ -327,7 +387,7 @@
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -378,7 +438,7 @@
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -388,10 +448,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -430,9 +498,12 @@
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -458,12 +529,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -501,23 +572,23 @@
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -529,14 +600,14 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -547,20 +618,33 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/toidentifier": {
@@ -586,7 +670,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -609,12 +693,11 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+      "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/vary": {
@@ -659,9 +742,9 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "aws-sdk": {
-      "version": "2.1087.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz",
-      "integrity": "sha512-m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==",
+      "version": "2.1172.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1172.0.tgz",
+      "integrity": "sha512-B3NXD1ZLfwj8oDavb3GTUkDvCioWbRrf01nNkPvdTpoMBQCGw4elTuvG7ZQ114v5V2XWMxpu+SKMkcxALHEd6Q==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -670,7 +753,7 @@
         "querystring": "0.2.0",
         "sax": "1.2.1",
         "url": "0.10.3",
-        "uuid": "3.3.2",
+        "uuid": "8.0.0",
         "xml2js": "0.4.19"
       }
     },
@@ -680,20 +763,22 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       }
     },
     "buffer": {
@@ -711,6 +796,15 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -725,9 +819,9 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -743,34 +837,34 @@
       }
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "events": {
       "version": "1.1.1",
@@ -778,53 +872,54 @@
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       }
     },
@@ -836,17 +931,45 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       }
     },
@@ -886,7 +1009,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
@@ -919,17 +1042,22 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -959,9 +1087,12 @@
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "querystring": {
       "version": "0.2.0",
@@ -974,12 +1105,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -1000,23 +1131,23 @@
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "ms": {
@@ -1027,14 +1158,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "setprototypeof": {
@@ -1042,15 +1173,25 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "toidentifier": {
       "version": "1.0.1",
@@ -1069,7 +1210,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "url": {
       "version": "0.10.3",
@@ -1086,9 +1227,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+      "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
     },
     "vary": {
       "version": "1.1.2",
diff --git a/sourcemap-reader/package.json b/sourcemap-reader/package.json
index c389c5804..ad24a481d 100644
--- a/sourcemap-reader/package.json
+++ b/sourcemap-reader/package.json
@@ -18,8 +18,8 @@
   },
   "homepage": "https://github.com/openreplay/openreplay#readme",
   "dependencies": {
-    "aws-sdk": "^2.992.0",
-    "express": "^4.17.1",
+    "aws-sdk": "^2.1172.0",
+    "express": "^4.18.1",
     "source-map": "^0.7.4"
   }
 }
diff --git a/utilities/Dockerfile b/utilities/Dockerfile
index 9b82358b3..7c3a66719 100644
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@@ -1,16 +1,15 @@
-FROM node:17-stretch
-WORKDIR /work
-COPY . .
-RUN npm install
-ENV MAXMINDDB_FILE=/root/geoip.mmdb
-RUN wget https://static.openreplay.com/geoip/GeoLite2-Country.mmdb -O "$MAXMINDDB_FILE";
-
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION v0.19.0
+FROM node:18-alpine
+LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk add --no-cache tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENV ENTERPRISE_BUILD=${envarg} \
+    MAXMINDDB_FILE=/root/geoip.mmdb
+
+WORKDIR /work
+ADD https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
+COPY package.json .
+COPY package-lock.json .
+RUN npm install
+COPY . .
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start
\ No newline at end of file
diff --git a/utilities/package-lock.json b/utilities/package-lock.json
index e8d8d3129..8e90703f3 100644
--- a/utilities/package-lock.json
+++ b/utilities/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Elastic License 2.0 (ELv2)",
       "dependencies": {
         "@maxmind/geoip2-node": "^3.4.0",
-        "express": "^4.17.1",
+        "express": "^4.18.1",
         "socket.io": "^4.5.1",
         "ua-parser-js": "^1.0.2"
       }
@@ -80,23 +80,26 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/bytes": {
@@ -107,6 +110,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -198,27 +213,31 @@
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -275,48 +294,49 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -325,6 +345,14 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -334,16 +362,16 @@
       ]
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -361,24 +389,64 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/iconv-lite": {
@@ -465,7 +533,7 @@
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -525,7 +593,7 @@
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -543,10 +611,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -580,9 +656,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -610,12 +689,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -648,23 +727,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -676,14 +755,14 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -694,6 +773,19 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/socket.io": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
@@ -771,11 +863,11 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/tiny-lru": {
@@ -838,7 +930,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -950,20 +1042,22 @@
       "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       }
     },
     "bytes": {
@@ -971,6 +1065,15 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -1038,24 +1141,24 @@
       }
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "engine.io": {
       "version": "6.2.0",
@@ -1097,48 +1200,56 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+        }
       }
     },
     "extsprintf": {
@@ -1147,16 +1258,16 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       }
     },
@@ -1168,17 +1279,45 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       }
     },
@@ -1247,7 +1386,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
@@ -1285,7 +1424,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "negotiator": {
       "version": "0.6.3",
@@ -1297,10 +1436,15 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -1325,9 +1469,12 @@
       }
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "quick-lru": {
       "version": "5.1.1",
@@ -1340,12 +1487,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -1361,23 +1508,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "ms": {
@@ -1388,14 +1535,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "setprototypeof": {
@@ -1403,6 +1550,16 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "socket.io": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
@@ -1462,9 +1619,9 @@
       }
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "tiny-lru": {
       "version": "8.0.2",
@@ -1498,7 +1655,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "utils-merge": {
       "version": "1.0.1",
diff --git a/utilities/package.json b/utilities/package.json
index cb6fb2b65..41859ebc6 100644
--- a/utilities/package.json
+++ b/utilities/package.json
@@ -19,7 +19,7 @@
   "homepage": "https://github.com/openreplay/openreplay#readme",
   "dependencies": {
     "@maxmind/geoip2-node": "^3.4.0",
-    "express": "^4.17.1",
+    "express": "^4.18.1",
     "socket.io": "^4.5.1",
     "ua-parser-js": "^1.0.2"
   }

From 25c7a7a6ba049c65b51e4e26a27bd2eb3386021b Mon Sep 17 00:00:00 2001
From: sylenien <nikita@openreplay.com>
Date: Wed, 13 Jul 2022 12:04:05 +0200
Subject: [PATCH 12/77] fix(ui): fix icon colors for issue events

---
 .../app/components/Session_/Player/Controls/Timeline.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/app/components/Session_/Player/Controls/Timeline.js b/frontend/app/components/Session_/Player/Controls/Timeline.js
index 95742874c..828715499 100644
--- a/frontend/app/components/Session_/Player/Controls/Timeline.js
+++ b/frontend/app/components/Session_/Player/Controls/Timeline.js
@@ -232,7 +232,7 @@ export default class Timeline extends React.PureComponent {
                     </div>
                   }
                 >
-                  <Icon className="bg-white" name={getPointerIcon('click_rage')} size="16" />
+                  <Icon className="bg-white" name={getPointerIcon('click_rage')} color="red" size="16" />
                 </Tooltip>
               </div>
             ))}
@@ -254,7 +254,7 @@ export default class Timeline extends React.PureComponent {
                     </div>
                   }
                 >
-                  <Icon className=" rounded-full bg-white" name={getPointerIcon('click_rage')} size="16" />
+                  <Icon className="rounded-full bg-white" name={getPointerIcon('click_rage')} color="red" size="16" />
                 </Tooltip>
               </div>
             }
@@ -277,7 +277,7 @@ export default class Timeline extends React.PureComponent {
                       </div>
                   }
                   >
-                    <Icon className=" rounded-full bg-white" name={getPointerIcon('exception')} size="16" />
+                    <Icon className=" rounded-full bg-white" name={getPointerIcon('exception')} color="red" size="16" />
                   </Tooltip>
                 </div>
               ))
@@ -330,7 +330,7 @@ export default class Timeline extends React.PureComponent {
                       </div>
                     }
                   >
-                    <Icon className=" rounded-full bg-white" name={getPointerIcon('fetch')} size="16" />
+                    <Icon className=" rounded-full bg-white" name={getPointerIcon('fetch')} color="red" size="16" />
                   </Tooltip>
                 </div>
               ))

From 269863ea13e03c9e79fc8c559c960dfd8cc52522 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 13 Jul 2022 12:45:00 +0200
Subject: [PATCH 13/77] change(ui) - assist sort by timestamp

---
 .../LiveSessionList/LiveSessionList.tsx       | 61 +++++--------------
 .../SortOrderButton/SortOrderButton.tsx       |  4 +-
 frontend/app/duck/liveSearch.js               |  2 +-
 3 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index 4adcc8365..fd4af677c 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
-import { NoContent, Loader, Pagination, Popup } from 'UI';
+import { NoContent, Loader, Pagination } from 'UI';
 import { List } from 'immutable';
 import SessionItem from 'Shared/SessionItem';
 import withPermissions from 'HOCs/withPermissions';
@@ -39,41 +39,11 @@ function LiveSessionList(props: Props) {
     var timeoutId: any;
     const { filters } = filter;
     const hasUserFilter = filters.map((i: any) => i.key).includes(KEYS.USERID);
-    const sortOptions = metaList
+    const sortOptions = [{ label: 'Newest', value: 'timestamp' }].concat(metaList
         .map((i: any) => ({
             label: capitalize(i),
             value: i,
-        }))
-        .toJS();
-
-    // useEffect(() => {
-    //   if (metaListLoading || metaList.size === 0 || !!filter.sort) return;
-
-    //   if (sortOptions[0]) {
-    //     props.applyFilter({ sort: sortOptions[0].value });
-    //   }
-    // }, [metaListLoading]);
-
-    // useEffect(() => {
-    //   const filteredSessions = filters.size > 0 ? props.list.filter(session => {
-    //     let hasValidFilter = true;
-    //     filters.forEach(filter => {
-    //       if (!hasValidFilter) return;
-
-    //       const _values = filter.value.filter(i => i !== '' && i !== null && i !== undefined).map(i => i.toLowerCase());
-    //       if (filter.key === FilterKey.USERID) {
-    //         const _userId = session.userId ? session.userId.toLowerCase() : '';
-    //         hasValidFilter = _values.length > 0 ? (_values.includes(_userId) && hasValidFilter) || _values.some(i => _userId.includes(i)) : hasValidFilter;
-    //       }
-    //       if (filter.category === FilterCategory.METADATA) {
-    //         const _source = session.metadata[filter.key] ? session.metadata[filter.key].toLowerCase() : '';
-    //         hasValidFilter = _values.length > 0 ? (_values.includes(_source) && hasValidFilter) || _values.some(i => _source.includes(i)) : hasValidFilter;
-    //       }
-    //     })
-    //     return hasValidFilter;
-    //   }) : props.list;
-    //   setSessions(filteredSessions);
-    // }, [filters, list]);
+        })).toJS());
 
     useEffect(() => {
         props.applyFilter({ ...filter });
@@ -116,20 +86,17 @@ function LiveSessionList(props: Props) {
                 <div className="flex items-center">
                     <div className="flex items-center ml-6 mr-4">
                         <span className="mr-2 color-gray-medium">Sort By</span>
-                        <Popup content="No metadata available to sort" disabled={sortOptions.length > 0}>
-                            <div className={cn('flex items-center', { disabled: sortOptions.length === 0 })}>
-                                <Select
-                                    plain
-                                    right
-                                    options={sortOptions}
-                                    // defaultValue={sort.field}
-                                    onChange={onSortChange}
-                                    value={sortOptions.find((i: any) => i.value === filter.sort) || sortOptions[0]}
-                                />
-                                <div className="mx-2" />
-                                <SortOrderButton onChange={(state: any) => props.applyFilter({ order: state })} sortOrder={filter.order} />
-                            </div>
-                        </Popup>
+                        <div className={cn('flex items-center', { disabled: sortOptions.length === 0 })}>
+                            <Select
+                                plain
+                                right
+                                options={sortOptions}
+                                onChange={onSortChange}
+                                value={sortOptions.find((i: any) => i.value === filter.sort) || sortOptions[0]}
+                            />
+                            <div className="mx-2" />
+                            <SortOrderButton onChange={(state: any) => props.applyFilter({ order: state })} sortOrder={filter.order} />
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/frontend/app/components/shared/SortOrderButton/SortOrderButton.tsx b/frontend/app/components/shared/SortOrderButton/SortOrderButton.tsx
index 1a10d8030..7d7901783 100644
--- a/frontend/app/components/shared/SortOrderButton/SortOrderButton.tsx
+++ b/frontend/app/components/shared/SortOrderButton/SortOrderButton.tsx
@@ -14,7 +14,7 @@ export default React.memo(function SortOrderButton(props: Props) {
         <div className="flex items-center border">
             <Popup content={'Ascending'} >
                 <div
-                    className={cn("p-1 hover:bg-active-blue", { 'cursor-pointer bg-white' : !isAscending, 'bg-active-blue' : isAscending })}
+                    className={cn("p-1 hover:bg-active-blue", { 'cursor-pointer bg-white' : !isAscending, 'bg-active-blue pointer-events-none' : isAscending })}
                     onClick={() => onChange('asc')}
                 >
                     <Icon name="arrow-up" size="14" color={isAscending ? 'teal' : 'gray-medium'} />
@@ -23,7 +23,7 @@ export default React.memo(function SortOrderButton(props: Props) {
 
             <Popup content={'Descending'} >
                 <div
-                    className={cn("p-1 hover:bg-active-blue border-l", { 'cursor-pointer bg-white' : isAscending, 'bg-active-blue' : !isAscending })}
+                    className={cn("p-1 hover:bg-active-blue border-l", { 'cursor-pointer bg-white' : isAscending, 'bg-active-blue pointer-events-none' : !isAscending })}
                     onClick={() => onChange('desc')}
                 >
                     <Icon name="arrow-down" size="14" color={!isAscending ? 'teal' : 'gray-medium'} />
diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js
index d75916eec..9df03dc81 100644
--- a/frontend/app/duck/liveSearch.js
+++ b/frontend/app/duck/liveSearch.js
@@ -20,7 +20,7 @@ const FETCH_SESSION_LIST = fetchListType(`${name}/FETCH_SESSION_LIST`);
 
 const initialState = Map({
 	list: List(),
-	instance: new Filter({ filters: [], sort: '' }),
+	instance: new Filter({ filters: [], sort: 'timestamp' }),
   filterSearchList: {},
   currentPage: 1,
 });

From 776ff4f30b61dacc68427b11d40378cfaa72a053 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 13 Jul 2022 17:20:04 +0200
Subject: [PATCH 14/77] fix(ui) - filters input value (#604)

* fix(ui) - search filters input field

* fix(ui) - search filters input field
---
 .../FilterAutoCompleteLocal/FilterAutoCompleteLocal.tsx       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app/components/shared/Filters/FilterAutoCompleteLocal/FilterAutoCompleteLocal.tsx b/frontend/app/components/shared/Filters/FilterAutoCompleteLocal/FilterAutoCompleteLocal.tsx
index 38dabe535..ad73be681 100644
--- a/frontend/app/components/shared/Filters/FilterAutoCompleteLocal/FilterAutoCompleteLocal.tsx
+++ b/frontend/app/components/shared/Filters/FilterAutoCompleteLocal/FilterAutoCompleteLocal.tsx
@@ -35,12 +35,12 @@ function FilterAutoCompleteLocal(props: Props) {
     if(allowDecimals) {
       const value = e.target.value;
       setQuery(value);
-      props.onSelect(null, { value });
+      props.onSelect(null, value);
     } else {
       const value = e.target.value.replace(/[^\d]/, "");
       if (+value !== 0) {
         setQuery(value);
-        props.onSelect(null, { value });
+        props.onSelect(null, value);
       }
     }
   };

From 37e128e767072c2e71f69ccea7f21e8c7265ca83 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 13 Jul 2022 19:28:27 +0200
Subject: [PATCH 15/77] fix(ui) - session clean error state

---
 frontend/app/components/Session/Session.js                   | 2 +-
 frontend/app/player/MessageDistributor/MessageDistributor.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/app/components/Session/Session.js b/frontend/app/components/Session/Session.js
index c86d7d3e4..2d9bfa882 100644
--- a/frontend/app/components/Session/Session.js
+++ b/frontend/app/components/Session/Session.js
@@ -38,7 +38,7 @@ function Session({
 			subtext={
 				<span>
 				{'Please check your data retention plan, or try '}
-				<Link to={ SESSIONS_ROUTE }>{'another one'}</Link>
+				<Link to={ SESSIONS_ROUTE } className="link">{'another one'}</Link>
 				</span>
 			}
 		>
diff --git a/frontend/app/player/MessageDistributor/MessageDistributor.ts b/frontend/app/player/MessageDistributor/MessageDistributor.ts
index 936f7409f..d9f2aac2b 100644
--- a/frontend/app/player/MessageDistributor/MessageDistributor.ts
+++ b/frontend/app/player/MessageDistributor/MessageDistributor.ts
@@ -45,6 +45,7 @@ export interface State extends SuperState, AssistState {
   domContentLoadedTime?: any,
   domBuildingTime?: any,
   loadTime?: any,
+  error: boolean,
 }
 export const INITIAL_STATE: State = {
   ...SUPER_INITIAL_STATE,
@@ -52,6 +53,7 @@ export const INITIAL_STATE: State = {
   ...ASSIST_INITIAL_STATE,
   performanceChartData: [],
   skipIntervals: [],
+  error: false
 };
 
 

From 3c9a96e7ab1f685785fcc1063dd91b3f464f5934 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 13 Jul 2022 19:32:01 +0200
Subject: [PATCH 16/77] fix(ui) - meta list more popup color

---
 frontend/app/components/ui/Popup/Popup.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/app/components/ui/Popup/Popup.tsx b/frontend/app/components/ui/Popup/Popup.tsx
index c8928fa07..129b9a8a4 100644
--- a/frontend/app/components/ui/Popup/Popup.tsx
+++ b/frontend/app/components/ui/Popup/Popup.tsx
@@ -21,6 +21,7 @@ export default ({
   delay = 1000,
   disabled = false,
   arrow = true,
+  theme = 'dark',
   ...props
 }: Props) => (
   <Tooltip
@@ -33,6 +34,7 @@ export default ({
     delay={delay}
     hideOnClick={true}
     hideOnScroll={true}
+    theme={theme}
   >
     { props.children }
   </Tooltip>

From 625176df97ecaddb38a5608d6d60e7fd8a42bedd Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Wed, 13 Jul 2022 20:19:06 +0200
Subject: [PATCH 17/77] change(ui) - assist sort by first meta

---
 frontend/app/components/Header/Header.js                 | 2 +-
 frontend/app/components/Header/SiteDropdown.js           | 5 ++++-
 .../shared/LiveSessionList/LiveSessionList.tsx           | 9 +++++++--
 frontend/app/duck/liveSearch.js                          | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/app/components/Header/Header.js b/frontend/app/components/Header/Header.js
index fc1aab477..9e6efa0de 100644
--- a/frontend/app/components/Header/Header.js
+++ b/frontend/app/components/Header/Header.js
@@ -51,6 +51,7 @@ const Header = (props) => {
       Promise.all([
         userStore.fetchLimits(),
         notificationStore.fetchNotificationsCount(),
+        props.fetchMetadata(),
       ]).then(() => {
         userStore.updateKey('initialDataFetched', true);
       });
@@ -60,7 +61,6 @@ const Header = (props) => {
   useEffect(() => {
     activeSite = sites.find(s => s.id == siteId);
     props.initSite(activeSite);
-    props.fetchMetadata();
   }, [siteId])
 
   return (
diff --git a/frontend/app/components/Header/SiteDropdown.js b/frontend/app/components/Header/SiteDropdown.js
index 9b3af1f8f..228190111 100644
--- a/frontend/app/components/Header/SiteDropdown.js
+++ b/frontend/app/components/Header/SiteDropdown.js
@@ -11,6 +11,7 @@ import styles from './siteDropdown.module.css';
 import cn from 'classnames';
 import NewSiteForm from '../Client/Sites/NewSiteForm';
 import { clearSearch } from 'Duck/search';
+import { clearSearch as clearSearchLive } from 'Duck/liveSearch';
 import { fetchList as fetchIntegrationVariables } from 'Duck/customField';
 import { withStore } from 'App/mstore'
 import AnimatedSVG, { ICONS } from '../shared/AnimatedSVG/AnimatedSVG';
@@ -27,6 +28,7 @@ import NewProjectButton from './NewProjectButton';
   pushNewSite,
   init,
   clearSearch,
+  clearSearchLive,
   fetchIntegrationVariables,
 })
 export default class SiteDropdown extends React.PureComponent {
@@ -45,8 +47,9 @@ export default class SiteDropdown extends React.PureComponent {
     const { mstore, location } = this.props
 
     this.props.setSiteId(siteId);
-    this.props.clearSearch(location.pathname.includes('/sessions'));
     this.props.fetchIntegrationVariables();
+    this.props.clearSearch(location.pathname.includes('/sessions'));
+    this.props.clearSearchLive();
 
     mstore.initClient();
   }
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index fd4af677c..f4bb1f45d 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -46,12 +46,17 @@ function LiveSessionList(props: Props) {
         })).toJS());
 
     useEffect(() => {
-        props.applyFilter({ ...filter });
+        if (metaListLoading) return;
+        const _filter = { ...filter };
+        if (sortOptions[1]) {
+            _filter.sort = sortOptions[1].value;
+        }
+        props.applyFilter(_filter);
         timeout();
         return () => {
             clearTimeout(timeoutId);
         };
-    }, []);
+    }, [metaListLoading]);
 
     const onUserClick = (userId: string, userAnonymousId: string) => {
         if (userId) {
diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js
index 9df03dc81..ecb8a720e 100644
--- a/frontend/app/duck/liveSearch.js
+++ b/frontend/app/duck/liveSearch.js
@@ -96,7 +96,7 @@ export const fetchSessions = (filter) => (dispatch, getState) => {
 };
 
 export const clearSearch = () => (dispatch, getState) => {
-  dispatch(edit(new Filter({ filters: [] })));
+  dispatch(edit(new Filter({ filters: [], sort: 'timestamp' })));
   return dispatch({
     type: CLEAR_SEARCH,
   });

From cab904e0e2d1adec1691fb6ca227f4e76e1954be Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Wed, 13 Jul 2022 22:40:29 +0200
Subject: [PATCH 18/77] v1.7.0 enhanced (#606)

* feat(assist): changed Dockerfile

* feat(assist): changed Dockerfile

* feat(assist): changed Dockerfile

* feat(assist): changed lock file

* feat(assist): changed Dockerfile

* feat(chalice): return role name after update user

* feat(chalice): changed sessions search

* feat(chalice): changed sessions search

* feat(chalice): changed Dockerfile
feat(chalice): changed entrypoint
feat(alerts): changed Dockerfile
feat(alerts): changed entrypoint

* feat(assist): handle null uws payload

* feat(crons): fixed coroutine

* feat(chalice): optimize get projects
---
 api/Dockerfile                                |  18 +-
 api/Dockerfile.alerts                         |  18 +-
 api/chalicelib/core/sessions.py               |  12 +-
 api/entrypoint.sh                             |   2 +-
 api/entrypoint_alerts.sh                      |   2 +-
 ee/api/app_crons.py                           |  17 +-
 ee/api/chalicelib/core/projects.py            |  12 +-
 ee/api/chalicelib/core/users.py               |  12 +-
 .../db/init_dbs/postgresql/1.7.0/1.7.0.sql    |   1 +
 .../db/init_dbs/postgresql/init_schema.sql    |   1 +
 ee/utilities/.gitignore                       |   2 +-
 ee/utilities/Dockerfile                       |  15 +
 ee/utilities/clean.sh                         |   1 +
 ee/utilities/package-lock.json                | 773 ++++++++++--------
 ee/utilities/utils/helper-ee.js               |   5 +-
 15 files changed, 518 insertions(+), 373 deletions(-)
 create mode 100644 ee/utilities/Dockerfile

diff --git a/api/Dockerfile b/api/Dockerfile
index ae149b034..8b2acf1f7 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,23 +1,15 @@
-FROM python:3.10-slim
+FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk add --no-cache nodejs npm tini
 ARG envarg
 # Add Tini
 # Startup daemon
-ENV TINI_VERSION=v0.19.0 \
-    SOURCE_MAP_VERSION=0.7.4 \
+ENV SOURCE_MAP_VERSION=0.7.4 \
     APP_NAME=chalice \
     ENTERPRISE_BUILD=${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
-RUN chmod +x /tini
 
-# Installing Nodejs
-RUN apt update && apt install -y curl && \
-    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt install -y nodejs && \
-    apt remove --purge -y curl && \
-    rm -rf /var/lib/apt/lists/*
+ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
 
 WORKDIR /work_tmp
 COPY requirements.txt /work_tmp/requirements.txt
@@ -29,5 +21,5 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/.
 
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/api/Dockerfile.alerts b/api/Dockerfile.alerts
index bb8f11285..70879cae8 100644
--- a/api/Dockerfile.alerts
+++ b/api/Dockerfile.alerts
@@ -1,16 +1,12 @@
-FROM python:3.10-slim
+FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-ENV APP_NAME alerts
-ENV pg_minconn 2
-ENV pg_maxconn 10
-# Add Tini
-# Startup daemon
-ENV TINI_VERSION v0.19.0
+RUN apk add --no-cache tini
 ARG envarg
-ENV ENTERPRISE_BUILD ${envarg}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+ENV APP_NAME=alerts \
+    pg_minconn=2 \
+    pg_maxconn=10 \
+    ENTERPRISE_BUILD=${envarg}
 
 COPY requirements.txt /work_tmp/requirements.txt
 RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
@@ -19,5 +15,5 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
\ No newline at end of file
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index 3856acaa0..8dc87c90d 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -863,12 +863,12 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
                     full_args = {**full_args, **_multiple_values(f.value, value_key=e_k_f)}
                     if f.type == schemas.FetchFilterType._url:
                         event_where.append(
-                            _multiple_conditions(f"main.{events.event_type.REQUEST.column} {op} %({e_k_f})s", f.value,
-                                                 value_key=e_k_f))
+                            _multiple_conditions(f"main.{events.event_type.REQUEST.column} {op} %({e_k_f})s::text",
+                                                 f.value, value_key=e_k_f))
                         apply = True
                     elif f.type == schemas.FetchFilterType._status_code:
                         event_where.append(
-                            _multiple_conditions(f"main.status_code {f.operator} %({e_k_f})s", f.value,
+                            _multiple_conditions(f"main.status_code {f.operator} %({e_k_f})s::integer", f.value,
                                                  value_key=e_k_f))
                         apply = True
                     elif f.type == schemas.FetchFilterType._method:
@@ -877,15 +877,15 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
                         apply = True
                     elif f.type == schemas.FetchFilterType._duration:
                         event_where.append(
-                            _multiple_conditions(f"main.duration {f.operator} %({e_k_f})s", f.value, value_key=e_k_f))
+                            _multiple_conditions(f"main.duration {f.operator} %({e_k_f})s::integer", f.value, value_key=e_k_f))
                         apply = True
                     elif f.type == schemas.FetchFilterType._request_body:
                         event_where.append(
-                            _multiple_conditions(f"main.request_body {op} %({e_k_f})s", f.value, value_key=e_k_f))
+                            _multiple_conditions(f"main.request_body {op} %({e_k_f})s::text", f.value, value_key=e_k_f))
                         apply = True
                     elif f.type == schemas.FetchFilterType._response_body:
                         event_where.append(
-                            _multiple_conditions(f"main.response_body {op} %({e_k_f})s", f.value, value_key=e_k_f))
+                            _multiple_conditions(f"main.response_body {op} %({e_k_f})s::text", f.value, value_key=e_k_f))
                         apply = True
                     else:
                         print(f"undefined FETCH filter: {f.type}")
diff --git a/api/entrypoint.sh b/api/entrypoint.sh
index a41427181..94b56121a 100755
--- a/api/entrypoint.sh
+++ b/api/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 cd sourcemap-reader
 nohup npm start &> /tmp/sourcemap-reader.log &
 cd ..
diff --git a/api/entrypoint_alerts.sh b/api/entrypoint_alerts.sh
index 5f15a78b7..861206589 100755
--- a/api/entrypoint_alerts.sh
+++ b/api/entrypoint_alerts.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
 uvicorn app:app --host 0.0.0.0 --reload
diff --git a/ee/api/app_crons.py b/ee/api/app_crons.py
index 3dfea4fe4..97f4b5406 100644
--- a/ee/api/app_crons.py
+++ b/ee/api/app_crons.py
@@ -1,19 +1,28 @@
 print("============= CRONS =============")
 import sys
+import asyncio
 
 from routers.crons import core_dynamic_crons
 
 
-def process(action):
-    {
+def default_action(action):
+    async def _func():
+        print(f"{action} not found in crons-definitions")
+
+    return _func
+
+
+async def process(action):
+    await {
         "TELEMETRY": core_dynamic_crons.telemetry_cron,
         "JOB": core_dynamic_crons.run_scheduled_jobs,
         "REPORT": core_dynamic_crons.weekly_report2
-    }.get(action.upper(), lambda: print(f"{action} not found in crons-definitions"))()
+    }.get(action.upper(), default_action(action))()
 
 
 if __name__ == '__main__':
     if len(sys.argv) < 2 or len(sys.argv[1]) < 1:
         print("please provide actions as argument")
     else:
-        process(sys.argv[1])
+        print(f"action: {sys.argv[1]}")
+        asyncio.run(process(sys.argv[1]))
diff --git a/ee/api/chalicelib/core/projects.py b/ee/api/chalicelib/core/projects.py
index 6a06e8230..e6ef34760 100644
--- a/ee/api/chalicelib/core/projects.py
+++ b/ee/api/chalicelib/core/projects.py
@@ -52,14 +52,23 @@ def get_projects(tenant_id, recording_state=False, gdpr=None, recorded=False, st
                        AND users.tenant_id = %(tenant_id)s
                        AND (roles.all_projects OR roles_projects.project_id = s.project_id)
                     ) AS role_project ON (TRUE)"""
+        pre_select = ""
+        if recorded:
+            pre_select = """WITH recorded_p AS (SELECT DISTINCT projects.project_id
+                            FROM projects INNER JOIN sessions USING (project_id)
+                            WHERE tenant_id =%(tenant_id)s
+                              AND deleted_at IS NULL
+                              AND duration > 0)"""
         cur.execute(
             cur.mogrify(f"""\
+                    {pre_select}
                     SELECT
                            s.project_id, s.name, s.project_key, s.save_request_payloads
                             {',s.gdpr' if gdpr else ''} 
-                            {',COALESCE((SELECT TRUE FROM public.sessions WHERE sessions.project_id = s.project_id LIMIT 1), FALSE) AS recorded' if recorded else ''}
+                            {',EXISTS(SELECT 1 FROM recorded_p WHERE recorded_p.project_id = s.project_id) AS recorded' if recorded else ''}
                             {',stack_integrations.count>0 AS stack_integrations' if stack_integrations else ''}
                     FROM public.projects AS s
+                            {'LEFT JOIN recorded_p USING (project_id)' if recorded else ''}
                             {'LEFT JOIN LATERAL (SELECT COUNT(*) AS count FROM public.integrations WHERE s.project_id = integrations.project_id LIMIT 1) AS stack_integrations ON TRUE' if stack_integrations else ''}
                             {role_query if user_id is not None else ""}
                     WHERE s.tenant_id =%(tenant_id)s
@@ -76,7 +85,6 @@ def get_projects(tenant_id, recording_state=False, gdpr=None, recorded=False, st
                                     WHERE sessions.start_ts >= %(startDate)s AND sessions.start_ts <= %(endDate)s
                                     GROUP BY project_id;""",
                                 {"startDate": TimeUTC.now(delta_days=-3), "endDate": TimeUTC.now(delta_days=1)})
-
             cur.execute(query=query)
             status = cur.fetchall()
             for r in rows:
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index 7b5162b27..815d39106 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -168,7 +168,11 @@ def update(tenant_id, user_id, changes):
                                 (CASE WHEN users.role = 'owner' THEN TRUE ELSE FALSE END) AS super_admin,
                                 (CASE WHEN users.role = 'admin' THEN TRUE ELSE FALSE END) AS admin,
                                 (CASE WHEN users.role = 'member' THEN TRUE ELSE FALSE END) AS member,
-                                users.role_id;""",
+                                users.role_id,
+                                (SELECT roles.name 
+                                    FROM roles 
+                                    WHERE roles.tenant_id=%(tenant_id)s 
+                                        AND roles.role_id=users.role_id) AS role_name;""",
                             {"tenant_id": tenant_id, "user_id": user_id, **changes})
             )
         if len(sub_query_bauth) > 0:
@@ -187,7 +191,11 @@ def update(tenant_id, user_id, changes):
                                 (CASE WHEN users.role = 'owner' THEN TRUE ELSE FALSE END) AS super_admin,
                                 (CASE WHEN users.role = 'admin' THEN TRUE ELSE FALSE END) AS admin,
                                 (CASE WHEN users.role = 'member' THEN TRUE ELSE FALSE END) AS member,
-                                users.role_id;""",
+                                users.role_id,
+                                (SELECT roles.name 
+                                    FROM roles 
+                                    WHERE roles.tenant_id=%(tenant_id)s 
+                                        AND roles.role_id=users.role_id) AS role_name;""",
                             {"tenant_id": tenant_id, "user_id": user_id, **changes})
             )
 
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
index 3f74ad21d..1ea5c6ab6 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
@@ -56,6 +56,7 @@ ALTER TABLE IF EXISTS events.resources
         PRIMARY KEY (session_id, message_id, timestamp);
 
 COMMIT;
+CREATE INDEX CONCURRENTLY IF NOT EXISTS projects_tenant_id_idx ON public.projects (tenant_id);
 CREATE INDEX CONCURRENTLY IF NOT EXISTS projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
 ALTER TYPE metric_type ADD VALUE IF NOT EXISTS 'funnel';
 
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 7cac6e10e..2d1c2b95f 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -257,6 +257,7 @@ $$
             );
 
 
+            CREATE INDEX IF NOT EXISTS projects_tenant_id_idx ON public.projects (tenant_id);
             CREATE INDEX IF NOT EXISTS projects_project_key_idx ON public.projects (project_key);
             CREATE INDEX IF NOT EXISTS projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
             DROP TRIGGER IF EXISTS on_insert_or_update ON projects;
diff --git a/ee/utilities/.gitignore b/ee/utilities/.gitignore
index f54e439ba..0eaed6d80 100644
--- a/ee/utilities/.gitignore
+++ b/ee/utilities/.gitignore
@@ -10,7 +10,7 @@ build.sh
 servers/peerjs-server.js
 servers/sourcemaps-handler.js
 servers/sourcemaps-server.js
-/Dockerfile
 /utils/geoIP.js
 /utils/HeapSnapshot.js
 /utils/helper.js
+/utils/assistHelper.js
diff --git a/ee/utilities/Dockerfile b/ee/utilities/Dockerfile
new file mode 100644
index 000000000..f3e605ccc
--- /dev/null
+++ b/ee/utilities/Dockerfile
@@ -0,0 +1,15 @@
+FROM node:18-alpine
+LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk add --no-cache tini git libc6-compat && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
+ARG envarg
+ENV ENTERPRISE_BUILD=${envarg} \
+    MAXMINDDB_FILE=/root/geoip.mmdb
+
+WORKDIR /work
+ADD https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
+COPY package.json .
+COPY package-lock.json .
+RUN npm install
+COPY . .
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD npm start
\ No newline at end of file
diff --git a/ee/utilities/clean.sh b/ee/utilities/clean.sh
index 3e8ec080b..ec1aaeae4 100755
--- a/ee/utilities/clean.sh
+++ b/ee/utilities/clean.sh
@@ -1,6 +1,7 @@
 rm -rf ./utils/geoIP.js
 rm -rf ./utils/HeapSnapshot.js
 rm -rf ./utils/helper.js
+rm -rf ./utils/assistHelper.js
 
 rm -rf servers/peerjs-server.js
 rm -rf servers/sourcemaps-handler.js
diff --git a/ee/utilities/package-lock.json b/ee/utilities/package-lock.json
index 19699560a..8aa6c9196 100644
--- a/ee/utilities/package-lock.json
+++ b/ee/utilities/package-lock.json
@@ -29,68 +29,67 @@
         "maxmind": "^4.2.0"
       }
     },
-    "node_modules/@node-redis/bloom": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@node-redis/bloom/-/bloom-1.0.1.tgz",
-      "integrity": "sha512-mXEBvEIgF4tUzdIN89LiYsbi6//EdpFA7L8M+DHCvePXg+bfHWi+ct5VI6nHUFQE5+ohm/9wmgihCH3HSkeKsw==",
+    "node_modules/@redis/bloom": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz",
+      "integrity": "sha512-EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw==",
       "peerDependencies": {
-        "@node-redis/client": "^1.0.0"
+        "@redis/client": "^1.0.0"
       }
     },
-    "node_modules/@node-redis/client": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@node-redis/client/-/client-1.0.5.tgz",
-      "integrity": "sha512-ESZ3bd1f+od62h4MaBLKum+klVJfA4wAeLHcVQBkoXa1l0viFesOWnakLQqKg+UyrlJhZmXJWtu0Y9v7iTMrig==",
+    "node_modules/@redis/client": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.2.0.tgz",
+      "integrity": "sha512-a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg==",
       "dependencies": {
         "cluster-key-slot": "1.1.0",
         "generic-pool": "3.8.2",
-        "redis-parser": "3.0.0",
         "yallist": "4.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
-    "node_modules/@node-redis/graph": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@node-redis/graph/-/graph-1.0.0.tgz",
-      "integrity": "sha512-mRSo8jEGC0cf+Rm7q8mWMKKKqkn6EAnA9IA2S3JvUv/gaWW/73vil7GLNwion2ihTptAm05I9LkepzfIXUKX5g==",
+    "node_modules/@redis/graph": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz",
+      "integrity": "sha512-oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ==",
       "peerDependencies": {
-        "@node-redis/client": "^1.0.0"
+        "@redis/client": "^1.0.0"
       }
     },
-    "node_modules/@node-redis/json": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@node-redis/json/-/json-1.0.2.tgz",
-      "integrity": "sha512-qVRgn8WfG46QQ08CghSbY4VhHFgaTY71WjpwRBGEuqGPfWwfRcIf3OqSpR7Q/45X+v3xd8mvYjywqh0wqJ8T+g==",
+    "node_modules/@redis/json": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz",
+      "integrity": "sha512-4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q==",
       "peerDependencies": {
-        "@node-redis/client": "^1.0.0"
+        "@redis/client": "^1.0.0"
       }
     },
-    "node_modules/@node-redis/search": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@node-redis/search/-/search-1.0.5.tgz",
-      "integrity": "sha512-MCOL8iCKq4v+3HgEQv8zGlSkZyXSXtERgrAJ4TSryIG/eLFy84b57KmNNa/V7M1Q2Wd2hgn2nPCGNcQtk1R1OQ==",
+    "node_modules/@redis/search": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz",
+      "integrity": "sha512-pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA==",
       "peerDependencies": {
-        "@node-redis/client": "^1.0.0"
+        "@redis/client": "^1.0.0"
       }
     },
-    "node_modules/@node-redis/time-series": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@node-redis/time-series/-/time-series-1.0.2.tgz",
-      "integrity": "sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==",
+    "node_modules/@redis/time-series": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz",
+      "integrity": "sha512-OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA==",
       "peerDependencies": {
-        "@node-redis/client": "^1.0.0"
+        "@redis/client": "^1.0.0"
       }
     },
     "node_modules/@socket.io/redis-adapter": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-7.1.0.tgz",
-      "integrity": "sha512-vbsNJKUQgtVHcOqNL2ac8kSemTVNKHRzYPldqQJt0eFKvlAtAviuAMzBP0WmOp5OoRLQMjhVsVvgMzzMsVsK5g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-7.2.0.tgz",
+      "integrity": "sha512-/r6oF6Myz0K9uatB/pfCi0BhKg/KRMh1OokrqcjlNz6aq40WiXdFLRbHJQuwGHq/KvB+D6141K+IynbVxZGvhw==",
       "dependencies": {
         "debug": "~4.3.1",
         "notepack.io": "~2.2.0",
-        "socket.io-adapter": "~2.3.0",
+        "socket.io-adapter": "^2.4.0",
         "uid2": "0.0.3"
       },
       "engines": {
@@ -113,9 +112,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "node_modules/@types/node": {
-      "version": "17.0.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.42.tgz",
-      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
+      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -132,12 +131,12 @@
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "engines": {
         "node": ">=0.8"
       }
@@ -151,23 +150,26 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -181,7 +183,7 @@
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/bytes": {
       "version": "3.1.2",
@@ -191,6 +193,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -252,9 +266,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -262,12 +276,12 @@
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -298,27 +312,31 @@
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -351,51 +369,60 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -415,27 +442,27 @@
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "engines": [
         "node >=0.6.0"
       ]
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -453,7 +480,7 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
@@ -466,11 +493,16 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
     "node_modules/generic-pool": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
@@ -479,19 +511,54 @@
         "node": ">= 4"
       }
     },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "node_modules/get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/iconv-lite": {
@@ -549,7 +616,7 @@
     "node_modules/lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
     },
     "node_modules/map-obj": {
       "version": "4.3.0",
@@ -578,7 +645,7 @@
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -586,12 +653,12 @@
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -661,10 +728,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -683,7 +758,7 @@
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
@@ -698,9 +773,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -728,12 +806,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -742,35 +820,16 @@
       }
     },
     "node_modules/redis": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-4.0.6.tgz",
-      "integrity": "sha512-IaPAxgF5dV0jx+A9l6yd6R9/PAChZIoAskDVRzUODeLDNhsMlq7OLLTmu0AwAr0xjrJ1bibW5xdpRwqIQ8Q0Xg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-4.2.0.tgz",
+      "integrity": "sha512-bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ==",
       "dependencies": {
-        "@node-redis/bloom": "1.0.1",
-        "@node-redis/client": "1.0.5",
-        "@node-redis/graph": "1.0.0",
-        "@node-redis/json": "1.0.2",
-        "@node-redis/search": "1.0.5",
-        "@node-redis/time-series": "1.0.2"
-      }
-    },
-    "node_modules/redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/redis-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
-      "dependencies": {
-        "redis-errors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@redis/bloom": "1.0.2",
+        "@redis/client": "1.2.0",
+        "@redis/graph": "1.0.1",
+        "@redis/json": "1.0.3",
+        "@redis/search": "1.0.6",
+        "@redis/time-series": "1.0.3"
       }
     },
     "node_modules/safe-buffer": {
@@ -798,23 +857,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -831,7 +890,7 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
@@ -839,14 +898,14 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -857,6 +916,19 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/socket.io": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
@@ -874,14 +946,14 @@
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dependencies": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",
@@ -891,17 +963,12 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/socket.io/node_modules/socket.io-adapter": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
-      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
-    },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/tiny-lru": {
@@ -964,12 +1031,12 @@
     "node_modules/uid2": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
-      "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I="
+      "integrity": "sha512-5gSP1liv10Gjp8cMEnFd6shzkL/D6W1uhXSFNCxDC+YI8+L8wkCYCbJ7n77Ezb4wE/xzMogecE+DtamEe9PZjg=="
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -977,19 +1044,19 @@
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/uWebSockets.js": {
-      "version": "20.6.0",
-      "resolved": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#a58e810e47a23696410f6073c8c905dc38f75da5"
+      "version": "20.10.0",
+      "resolved": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#806df48c9da86af7b3341f3e443388c7cd15c3de"
     },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -997,7 +1064,7 @@
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "engines": [
         "node >=0.6.0"
       ],
@@ -1045,55 +1112,54 @@
         "maxmind": "^4.2.0"
       }
     },
-    "@node-redis/bloom": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@node-redis/bloom/-/bloom-1.0.1.tgz",
-      "integrity": "sha512-mXEBvEIgF4tUzdIN89LiYsbi6//EdpFA7L8M+DHCvePXg+bfHWi+ct5VI6nHUFQE5+ohm/9wmgihCH3HSkeKsw==",
+    "@redis/bloom": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz",
+      "integrity": "sha512-EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw==",
       "requires": {}
     },
-    "@node-redis/client": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@node-redis/client/-/client-1.0.5.tgz",
-      "integrity": "sha512-ESZ3bd1f+od62h4MaBLKum+klVJfA4wAeLHcVQBkoXa1l0viFesOWnakLQqKg+UyrlJhZmXJWtu0Y9v7iTMrig==",
+    "@redis/client": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.2.0.tgz",
+      "integrity": "sha512-a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg==",
       "requires": {
         "cluster-key-slot": "1.1.0",
         "generic-pool": "3.8.2",
-        "redis-parser": "3.0.0",
         "yallist": "4.0.0"
       }
     },
-    "@node-redis/graph": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@node-redis/graph/-/graph-1.0.0.tgz",
-      "integrity": "sha512-mRSo8jEGC0cf+Rm7q8mWMKKKqkn6EAnA9IA2S3JvUv/gaWW/73vil7GLNwion2ihTptAm05I9LkepzfIXUKX5g==",
+    "@redis/graph": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz",
+      "integrity": "sha512-oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ==",
       "requires": {}
     },
-    "@node-redis/json": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@node-redis/json/-/json-1.0.2.tgz",
-      "integrity": "sha512-qVRgn8WfG46QQ08CghSbY4VhHFgaTY71WjpwRBGEuqGPfWwfRcIf3OqSpR7Q/45X+v3xd8mvYjywqh0wqJ8T+g==",
+    "@redis/json": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz",
+      "integrity": "sha512-4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q==",
       "requires": {}
     },
-    "@node-redis/search": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@node-redis/search/-/search-1.0.5.tgz",
-      "integrity": "sha512-MCOL8iCKq4v+3HgEQv8zGlSkZyXSXtERgrAJ4TSryIG/eLFy84b57KmNNa/V7M1Q2Wd2hgn2nPCGNcQtk1R1OQ==",
+    "@redis/search": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz",
+      "integrity": "sha512-pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA==",
       "requires": {}
     },
-    "@node-redis/time-series": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@node-redis/time-series/-/time-series-1.0.2.tgz",
-      "integrity": "sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==",
+    "@redis/time-series": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz",
+      "integrity": "sha512-OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA==",
       "requires": {}
     },
     "@socket.io/redis-adapter": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-7.1.0.tgz",
-      "integrity": "sha512-vbsNJKUQgtVHcOqNL2ac8kSemTVNKHRzYPldqQJt0eFKvlAtAviuAMzBP0WmOp5OoRLQMjhVsVvgMzzMsVsK5g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/redis-adapter/-/redis-adapter-7.2.0.tgz",
+      "integrity": "sha512-/r6oF6Myz0K9uatB/pfCi0BhKg/KRMh1OokrqcjlNz6aq40WiXdFLRbHJQuwGHq/KvB+D6141K+IynbVxZGvhw==",
       "requires": {
         "debug": "~4.3.1",
         "notepack.io": "~2.2.0",
-        "socket.io-adapter": "~2.3.0",
+        "socket.io-adapter": "^2.4.0",
         "uid2": "0.0.3"
       }
     },
@@ -1113,9 +1179,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "@types/node": {
-      "version": "17.0.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.42.tgz",
-      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
+      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -1129,12 +1195,12 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
     },
     "base64id": {
       "version": "2.0.0",
@@ -1142,20 +1208,22 @@
       "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -1169,7 +1237,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -1178,6 +1246,15 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -1218,19 +1295,19 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "cors": {
       "version": "2.8.5",
@@ -1250,24 +1327,24 @@
       }
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "engine.io": {
       "version": "6.2.0",
@@ -1284,6 +1361,13 @@
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+        }
       }
     },
     "engine.io-parser": {
@@ -1294,45 +1378,46 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.0",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -1349,26 +1434,26 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -1383,7 +1468,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -1395,22 +1480,50 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "generic-pool": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
       "integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="
     },
-    "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+    "get-intrinsic": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
       "requires": {
-        "depd": "~1.1.2",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       }
     },
@@ -1460,7 +1573,7 @@
     "lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
     },
     "map-obj": {
       "version": "4.3.0",
@@ -1479,17 +1592,17 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "mime": {
       "version": "1.6.0",
@@ -1534,10 +1647,15 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -1550,7 +1668,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "proxy-addr": {
       "version": "2.0.7",
@@ -1562,9 +1680,12 @@
       }
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "quick-lru": {
       "version": "5.1.1",
@@ -1577,40 +1698,27 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
     "redis": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-4.0.6.tgz",
-      "integrity": "sha512-IaPAxgF5dV0jx+A9l6yd6R9/PAChZIoAskDVRzUODeLDNhsMlq7OLLTmu0AwAr0xjrJ1bibW5xdpRwqIQ8Q0Xg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-4.2.0.tgz",
+      "integrity": "sha512-bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ==",
       "requires": {
-        "@node-redis/bloom": "1.0.1",
-        "@node-redis/client": "1.0.5",
-        "@node-redis/graph": "1.0.0",
-        "@node-redis/json": "1.0.2",
-        "@node-redis/search": "1.0.5",
-        "@node-redis/time-series": "1.0.2"
-      }
-    },
-    "redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60="
-    },
-    "redis-parser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
-      "requires": {
-        "redis-errors": "^1.0.0"
+        "@redis/bloom": "1.0.2",
+        "@redis/client": "1.2.0",
+        "@redis/graph": "1.0.1",
+        "@redis/json": "1.0.3",
+        "@redis/search": "1.0.6",
+        "@redis/time-series": "1.0.3"
       }
     },
     "safe-buffer": {
@@ -1624,23 +1732,23 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -1654,7 +1762,7 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
@@ -1666,14 +1774,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "setprototypeof": {
@@ -1681,6 +1789,16 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "socket.io": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
@@ -1692,24 +1810,17 @@
         "engine.io": "~6.2.0",
         "socket.io-adapter": "~2.4.0",
         "socket.io-parser": "~4.0.4"
-      },
-      "dependencies": {
-        "socket.io-adapter": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
-          "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
-        }
       }
     },
     "socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
     },
     "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "requires": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",
@@ -1717,9 +1828,9 @@
       }
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "tiny-lru": {
       "version": "8.0.2",
@@ -1753,31 +1864,31 @@
     "uid2": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
-      "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I="
+      "integrity": "sha512-5gSP1liv10Gjp8cMEnFd6shzkL/D6W1uhXSFNCxDC+YI8+L8wkCYCbJ7n77Ezb4wE/xzMogecE+DtamEe9PZjg=="
     },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uWebSockets.js": {
-      "version": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#a58e810e47a23696410f6073c8c905dc38f75da5",
+      "version": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#806df48c9da86af7b3341f3e443388c7cd15c3de",
       "from": "uWebSockets.js@github:uNetworking/uWebSockets.js#v20.10.0"
     },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
diff --git a/ee/utilities/utils/helper-ee.js b/ee/utilities/utils/helper-ee.js
index dc821b94a..50b414b7a 100644
--- a/ee/utilities/utils/helper-ee.js
+++ b/ee/utilities/utils/helper-ee.js
@@ -70,7 +70,10 @@ const extractPayloadFromRequest = async function (req, res) {
             filters.filter.userID = [req.getQuery("userId")];
         }
         if (!filters.query.value) {
-            let body = await getBodyFromUWSResponse(res);
+            let body = {};
+            if (req.getMethod() !== 'get') {
+                body = await getBodyFromUWSResponse(res);
+            }
             filters = {
                 ...filters,
                 "sort": {

From 8e4e5a0f70e12e5ad997c85878055922b1b194e7 Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Thu, 14 Jul 2022 12:11:47 +0200
Subject: [PATCH 19/77] v1.7.0 enhanced (#607)

feat(alerts): changed Dockerfile
---
 api/Dockerfile                     |  2 +-
 api/Dockerfile.alerts              |  2 +-
 api/Dockerfile.alerts.dockerignore | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 api/Dockerfile.alerts.dockerignore

diff --git a/api/Dockerfile b/api/Dockerfile
index 8b2acf1f7..7e99cc457 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-RUN apk add --no-cache nodejs npm tini
+RUN apk add --no-cache build-base nodejs npm tini
 ARG envarg
 # Add Tini
 # Startup daemon
diff --git a/api/Dockerfile.alerts b/api/Dockerfile.alerts
index 70879cae8..062a1cb3a 100644
--- a/api/Dockerfile.alerts
+++ b/api/Dockerfile.alerts
@@ -1,7 +1,7 @@
 FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-RUN apk add --no-cache tini
+RUN apk add --no-cache build-base tini
 ARG envarg
 ENV APP_NAME=alerts \
     pg_minconn=2 \
diff --git a/api/Dockerfile.alerts.dockerignore b/api/Dockerfile.alerts.dockerignore
new file mode 100644
index 000000000..3539023b4
--- /dev/null
+++ b/api/Dockerfile.alerts.dockerignore
@@ -0,0 +1,10 @@
+# ignore .git and .cache folders
+.git
+.cache
+**/build.sh
+**/build_*.sh
+**/*deploy.sh
+
+app.py
+entrypoint_alerts.sh
+requirements.txt
\ No newline at end of file

From e5fcd52686841fd61ddae31afb4ddea65c58823c Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Thu, 14 Jul 2022 13:55:08 +0200
Subject: [PATCH 20/77] fix(ui) - onboarding user form

---
 .../Client/Roles/components/RoleForm/RoleForm.tsx  |  1 -
 frontend/app/components/Client/Users/UsersView.tsx |  5 +++--
 .../Client/Users/components/UserList/UserList.tsx  |  6 ++++--
 .../Users/components/UserListItem/UserListItem.tsx | 14 +++++++++-----
 .../components/ManageUsersTab/ManageUsersTab.js    |  7 +++----
 .../app/components/Session_/Inspector/index.js     |  2 --
 .../Session_/Player/Controls/Timeline.js           |  1 -
 .../components/shared/CodeSnippet/CodeSnippet.tsx  |  1 -
 frontend/app/duck/assignments.js                   |  1 -
 frontend/app/mstore/funnelStore.ts                 |  1 -
 10 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/frontend/app/components/Client/Roles/components/RoleForm/RoleForm.tsx b/frontend/app/components/Client/Roles/components/RoleForm/RoleForm.tsx
index 578cc75ad..7aed70131 100644
--- a/frontend/app/components/Client/Roles/components/RoleForm/RoleForm.tsx
+++ b/frontend/app/components/Client/Roles/components/RoleForm/RoleForm.tsx
@@ -49,7 +49,6 @@ const RoleForm = (props: Props) => {
   }
 
   const writeOption = ({ name, value }: any) => {
-    console.log('name', name);
     if (name === 'permissions') {
       onChangePermissions(value)
     } else if (name === 'projects') {
diff --git a/frontend/app/components/Client/Users/UsersView.tsx b/frontend/app/components/Client/Users/UsersView.tsx
index 3b4d0c95f..a1240eb37 100644
--- a/frontend/app/components/Client/Users/UsersView.tsx
+++ b/frontend/app/components/Client/Users/UsersView.tsx
@@ -10,12 +10,13 @@ import { connect } from 'react-redux';
 import AddUserButton from './components/AddUserButton';
 
 interface Props {
+    isOnboarding?: boolean;
     account: any;
     isEnterprise: boolean;
     limits: any;
 }
 function UsersView(props: Props) {
-    const { account, limits, isEnterprise } = props;
+    const { account, limits, isEnterprise, isOnboarding = false } = props;
     const { userStore, roleStore } = useStore();
     const userCount = useObserver(() => userStore.list.length);
     const roles = useObserver(() => roleStore.list);
@@ -49,7 +50,7 @@ function UsersView(props: Props) {
                     <UserSearch />
                 </div>
             </div>
-            <UserList isEnterprise={isEnterprise} />
+            <UserList isEnterprise={isEnterprise} isOnboarding={isOnboarding} />
         </div>
     );
 }
diff --git a/frontend/app/components/Client/Users/components/UserList/UserList.tsx b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
index cae5ffd43..a86e6d7d7 100644
--- a/frontend/app/components/Client/Users/components/UserList/UserList.tsx
+++ b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
@@ -9,10 +9,11 @@ import UserForm from '../UserForm';
 import AnimatedSVG, { ICONS } from 'Shared/AnimatedSVG/AnimatedSVG';
 
 interface Props {
+    isOnboarding?: boolean;
     isEnterprise?: boolean;
 }
 function UserList(props: Props) {
-    const { isEnterprise  = false } = props;
+    const { isEnterprise  = false, isOnboarding = false } = props;
     const { userStore } = useStore();
     const loading = useObserver(() => userStore.loading);
     const users = useObserver(() => userStore.list);
@@ -55,7 +56,7 @@ function UserList(props: Props) {
                     <div className="grid grid-cols-12 p-3 border-b font-medium">
                         <div className="col-span-5">Name</div>
                         <div className="col-span-3">Role</div>
-                        <div className="col-span-2">Created On</div>
+                        {!isOnboarding && <div className="col-span-2">Created On</div> }
                         <div className="col-span-2"></div>
                     </div>
 
@@ -67,6 +68,7 @@ function UserList(props: Props) {
                                 generateInvite={() => userStore.generateInviteCode(user.userId)}
                                 copyInviteCode={() => userStore.copyInviteCode(user.userId)}
                                 isEnterprise={isEnterprise}
+                                isOnboarding={isOnboarding}
                             />
                         </div>
                     ))}
diff --git a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
index 8628f029f..d7b7d0d55 100644
--- a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
+++ b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import { Icon, Popup } from 'UI';
 import { checkForRecent } from 'App/date';
-
+import cn from 'classnames';
 
 const AdminPrivilegeLabel = ({ user }) => {
     return (
@@ -13,6 +13,7 @@ const AdminPrivilegeLabel = ({ user }) => {
     )
 }
 interface Props {
+    isOnboarding?: boolean;
     user: any;
     editHandler?: any;
     generateInvite?: any;
@@ -26,6 +27,7 @@ function UserListItem(props: Props) {
         generateInvite = () => {},
         copyInviteCode = () => {},
         isEnterprise = false,
+        isOnboarding = false
     } = props;
     return (
         <div className="grid grid-cols-12 p-3 py-4 border-b items-center select-none hover:bg-active-blue group">
@@ -41,11 +43,13 @@ function UserListItem(props: Props) {
                     </span>
                 )}
             </div>
-            <div className="col-span-2">
-                <span>{user.createdAt && checkForRecent(user.createdAt, 'LLL dd, yyyy, hh:mm a')}</span>
-            </div>
+            {!isOnboarding && (
+                <div className="col-span-2">
+                    <span>{user.createdAt && checkForRecent(user.createdAt, 'LLL dd, yyyy, hh:mm a')}</span>
+                </div>
+            )}
 
-            <div className="col-span-2 justify-self-end invisible group-hover:visible">
+            <div className={cn("justify-self-end invisible group-hover:visible", { 'col-span-2' : !isOnboarding, 'col-span-4' : isOnboarding})}>
                 <div className="grid grid-cols-2 gap-3 items-center justify-end">
                     <div>
                         {!user.isJoined && user.invitationLink && !user.isExpiredInvite && (
diff --git a/frontend/app/components/Onboarding/components/ManageUsersTab/ManageUsersTab.js b/frontend/app/components/Onboarding/components/ManageUsersTab/ManageUsersTab.js
index c4d414395..1f4763247 100644
--- a/frontend/app/components/Onboarding/components/ManageUsersTab/ManageUsersTab.js
+++ b/frontend/app/components/Onboarding/components/ManageUsersTab/ManageUsersTab.js
@@ -1,5 +1,5 @@
+import UsersView from 'App/components/Client/Users/UsersView'
 import React from 'react' 
-import ManageUsers from '../../../Client/ManageUsers'
 
 export default function ManageUsersTab() {
   return (
@@ -9,9 +9,8 @@ export default function ManageUsersTab() {
           <span>👨‍💻</span>
           <div className="ml-3">Invite Collaborators</div>
         </h1>
-        
-        <ManageUsers hideHeader />
-      
+
+        <UsersView isOnboarding={true} />      
       </div>
       <div className="w-4/12 py-6">
         <div className="p-5 bg-gray-lightest mb-4 rounded">
diff --git a/frontend/app/components/Session_/Inspector/index.js b/frontend/app/components/Session_/Inspector/index.js
index e3fda7096..f76834fee 100644
--- a/frontend/app/components/Session_/Inspector/index.js
+++ b/frontend/app/components/Session_/Inspector/index.js
@@ -38,9 +38,7 @@ export default function Inspector () {
     const onKeyPress = e => {
       if (e.key === 'Backspace' || e.key === 'Delete') {
         const elem = selectedElementRef.current;
-        console.log(elem)
         if (elem !== null && elem.parentElement !== null) {
-          console.log('a?')
           elem.parentElement.removeChild(elem);
           setSelectedElement(null);
         }
diff --git a/frontend/app/components/Session_/Player/Controls/Timeline.js b/frontend/app/components/Session_/Player/Controls/Timeline.js
index 828715499..3acdb4c11 100644
--- a/frontend/app/components/Session_/Player/Controls/Timeline.js
+++ b/frontend/app/components/Session_/Player/Controls/Timeline.js
@@ -95,7 +95,6 @@ export default class Timeline extends React.PureComponent {
     const { endTime } = this.props;
     const p = e.nativeEvent.offsetX / e.target.offsetWidth;
     const time = Math.max(Math.round(p * endTime), 0);
-    console.log(p, time, e, endTime)
     this.props.jump(time);
   }
 
diff --git a/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx b/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
index 76f752f70..c9629bf7a 100644
--- a/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
+++ b/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
@@ -21,7 +21,6 @@ interface Props {
 }
 function CodeSnippet(props: Props) {
     const { host, projectKey, ingestPoint, defaultInputMode, obscureTextNumbers, obscureTextEmails } = props;
-    console.log('defaultInputMode', defaultInputMode)
     const codeSnippet = `<!-- OpenReplay Tracking Code for ${host} -->
 <script>
   var initOpts = {
diff --git a/frontend/app/duck/assignments.js b/frontend/app/duck/assignments.js
index ed6b9834a..0892df161 100644
--- a/frontend/app/duck/assignments.js
+++ b/frontend/app/duck/assignments.js
@@ -41,7 +41,6 @@ const reducer = (state = initialState, action = {}) => {
     case EDIT:
       return state.mergeIn([ 'instance' ], action.instance);
     case FETCH_PROJECTS.SUCCESS:
-      console.log('data', action.data)
       return state.set('projects', List(action.data)).set('projectsFetched', true);
     case FETCH_ASSIGNMENTS.SUCCESS:
       return state.set('list', List(action.data).map(Assignment));
diff --git a/frontend/app/mstore/funnelStore.ts b/frontend/app/mstore/funnelStore.ts
index d727661ea..f0a9d5384 100644
--- a/frontend/app/mstore/funnelStore.ts
+++ b/frontend/app/mstore/funnelStore.ts
@@ -134,7 +134,6 @@ export default class FunnelStore {
                 .then(response => {
                     this.issueInstance = new FunnelIssue().fromJSON(response.issue)
                     this.issueInstance.sessions = response.sessions.sessions.map(i => new Session().fromJson(i))
-                    console.log('response.sessions', response.sessions);
                     resolve(this.issueInstance)
                 }).catch(error => {
                     reject(error)

From 76aba00abe324b0a954ef1071334f0de06745ee5 Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 14:51:57 +0200
Subject: [PATCH 21/77] v1.7.0 - hotfix (#611)

feat(chalice): fixed get null-duration-session
---
 api/chalicelib/core/resources.py    | 2 ++
 ee/api/chalicelib/core/resources.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/api/chalicelib/core/resources.py b/api/chalicelib/core/resources.py
index 9873bd97e..e56c0cf74 100644
--- a/api/chalicelib/core/resources.py
+++ b/api/chalicelib/core/resources.py
@@ -4,6 +4,8 @@ from decouple import config
 
 def get_by_session_id(session_id, project_id, start_ts, duration):
     with pg_client.PostgresClient() as cur:
+        if duration is None or (type(duration) != 'int' and type(duration) != 'float') or duration < 0:
+            duration = 0
         delta = config("events_ts_delta", cast=int, default=60 * 60) * 1000
         ch_query = """\
                 SELECT
diff --git a/ee/api/chalicelib/core/resources.py b/ee/api/chalicelib/core/resources.py
index a1f966937..71e493a4d 100644
--- a/ee/api/chalicelib/core/resources.py
+++ b/ee/api/chalicelib/core/resources.py
@@ -6,6 +6,8 @@ from decouple import config
 
 def get_by_session_id(session_id, project_id, start_ts, duration):
     with ch_client.ClickHouseClient() as ch:
+        if duration is None or (type(duration) != 'int' and type(duration) != 'float') or duration < 0:
+            duration = 0
         delta = config("events_ts_delta", cast=int, default=60 * 60) * 1000
         ch_query = """\
                 SELECT

From 2de128ebcfb759f021bdf428e2b2dc2e76cd57d4 Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 15:14:32 +0200
Subject: [PATCH 22/77] v1.7.0 hotfix (#612)

* feat(chalice): fixed chalice get null-duration-session

* feat(assist): default inactive live session
---
 utilities/utils/assistHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/utils/assistHelper.js b/utilities/utils/assistHelper.js
index dd97a1dd9..63692f4fc 100644
--- a/utilities/utils/assistHelper.js
+++ b/utilities/utils/assistHelper.js
@@ -5,7 +5,7 @@ let debug = process.env.debug === "1" || false;
 
 const BASE_sessionInfo = {
     "pageTitle": "Page",
-    "active": true,
+    "active": false,
     "live": true,
     "sessionID": "0",
     "metadata": {},

From bb8dee83fef86c5f8cd784dd36ed1dc04eff92d3 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 16:02:55 +0200
Subject: [PATCH 23/77] feat(assist): 2 levels sort support

---
 utilities/utils/helper.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index b9c20a6f3..80b37ce27 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -158,11 +158,17 @@ const getValue = function (obj, key) {
 const sortPaginate = function (list, filters) {
     const total = list.length;
     list.sort((a, b) => {
-        const vA = getValue(a, filters.sort.key || "timestamp");
-        const vB = getValue(b, filters.sort.key || "timestamp");
-        return vA > vB ? 1 : vA < vB ? -1 : 0;
+        const tA = getValue(a, "timestamp");
+        const tB = getValue(b, "timestamp");
+        return tA > tB ? 1 : tA < tB ? -1 : 0;
     });
-
+    if ((filters.sort.key || "timestamp") !== "timestamp") {
+        list.sort((a, b) => {
+            const vA = getValue(a, filters.sort.key);
+            const vB = getValue(b, filters.sort.key);
+            return vA > vB ? 1 : vA < vB ? -1 : 0;
+        });
+    }
     if (filters.sort.order) {
         list.reverse();
     }

From 0bc584cd104eb5b707e5a1b5f14084c253b42e62 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 17:20:23 +0200
Subject: [PATCH 24/77] feat(assist): fixed sort by numeric attributes

---
 utilities/utils/helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index 80b37ce27..e41c276b8 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -149,7 +149,7 @@ const getValue = function (obj, key) {
             }
 
             if (val !== undefined) {
-                return val;
+                return isNaN(val) ? val : Number(val);
             }
         }
     }

From b541816c5d250d818cb5009c15703951c462b789 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 17:37:32 +0200
Subject: [PATCH 25/77] feat(assist): fixed double sort

---
 utilities/utils/helper.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index e41c276b8..9844fa7d8 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -162,6 +162,9 @@ const sortPaginate = function (list, filters) {
         const tB = getValue(b, "timestamp");
         return tA > tB ? 1 : tA < tB ? -1 : 0;
     });
+    if (filters.sort.order) {
+        list.reverse();
+    }
     if ((filters.sort.key || "timestamp") !== "timestamp") {
         list.sort((a, b) => {
             const vA = getValue(a, filters.sort.key);

From 92e44a7af484d12a33b8a5abb04aa8b8953a0235 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 15 Jul 2022 17:51:47 +0200
Subject: [PATCH 26/77] feat(assist): fixed double sort

---
 utilities/utils/helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index 9844fa7d8..7088d2b77 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -160,7 +160,7 @@ const sortPaginate = function (list, filters) {
     list.sort((a, b) => {
         const tA = getValue(a, "timestamp");
         const tB = getValue(b, "timestamp");
-        return tA > tB ? 1 : tA < tB ? -1 : 0;
+        return tA < tB ? 1 : tA > tB ? -1 : 0;
     });
     if (filters.sort.order) {
         list.reverse();

From 31c470de076076d9fb62fd4a0d8c19d4349f5709 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 15 Jul 2022 11:35:29 +0200
Subject: [PATCH 27/77] change(ui) - reload alert count on ignore

---
 frontend/app/mstore/notificationStore.ts | 2 ++
 frontend/app/services/UserService.ts     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/app/mstore/notificationStore.ts b/frontend/app/mstore/notificationStore.ts
index e2e4fbe5e..13124ca62 100644
--- a/frontend/app/mstore/notificationStore.ts
+++ b/frontend/app/mstore/notificationStore.ts
@@ -44,6 +44,7 @@ export default class NotificationStore {
                         notification.viewed = true;
                         return notification;
                     });
+                    this.fetchNotificationsCount();
                     resolve(response);
                 }).catch((error: any) => {
                     reject(error);
@@ -63,6 +64,7 @@ export default class NotificationStore {
                         }
                         return notification;
                     });
+                    this.fetchNotificationsCount();
                     resolve(response);
                 }).catch((error: any) => {
                     reject(error);
diff --git a/frontend/app/services/UserService.ts b/frontend/app/services/UserService.ts
index 5ab27bd30..7a515d910 100644
--- a/frontend/app/services/UserService.ts
+++ b/frontend/app/services/UserService.ts
@@ -74,7 +74,7 @@ export default class UserService {
             .then((response: { data: any; }) => response.data || {});
     }
 
-    ignoreNotification(notificationId: string) {
+    ignoreNotification(notificationId: number) {
         return this.client.get(`/notifications/${notificationId}/view`)
             .then((response: { json: () => any; }) => response.json())
             .then((response: { data: any; }) => response.data || {});

From 2beb53c13d753d82518c9e24bb17e9097654f8d1 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 15 Jul 2022 15:01:37 +0200
Subject: [PATCH 28/77] fix(ui) - dev tools - fetch name col width and tooltip
 issue

---
 .../app/components/Session_/Fetch/Fetch.js    |   2 +-
 .../components/Session_/Network/Network.js    | 256 +++++++++---------
 frontend/app/components/ui/Button/Button.tsx  |   2 +-
 frontend/app/components/ui/Popup/Popup.tsx    |   3 +
 4 files changed, 135 insertions(+), 128 deletions(-)

diff --git a/frontend/app/components/Session_/Fetch/Fetch.js b/frontend/app/components/Session_/Fetch/Fetch.js
index cf05f944d..5b8e49911 100644
--- a/frontend/app/components/Session_/Fetch/Fetch.js
+++ b/frontend/app/components/Session_/Fetch/Fetch.js
@@ -160,7 +160,7 @@ export default class Fetch extends React.PureComponent {
                     width: 60,
                   }, {
                     label: "Name",
-                    width: 180,
+                    width: 240,
                     render: renderName,
                   },
                   {
diff --git a/frontend/app/components/Session_/Network/Network.js b/frontend/app/components/Session_/Network/Network.js
index 2834cc501..26396e5bd 100644
--- a/frontend/app/components/Session_/Network/Network.js
+++ b/frontend/app/components/Session_/Network/Network.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import cn from 'classnames';
 import { connectPlayer, jump, pause } from 'Player';
-import { Popup } from 'UI';
+import { Popup, Button, TextEllipsis } from 'UI';
 import { getRE } from 'App/utils';
 import { TYPES } from 'Types/session/resource';
 import stl from './network.module.css';
@@ -18,138 +18,142 @@ const MEDIA = 'media';
 const OTHER = 'other';
 
 const TAB_TO_TYPE_MAP = {
-  [ XHR ]: TYPES.XHR,
-  [ JS ]: TYPES.JS,
-  [ CSS ]: TYPES.CSS,
-  [ IMG ]: TYPES.IMG,
-  [ MEDIA ]: TYPES.MEDIA,
-  [ OTHER ]: TYPES.OTHER
-}
+    [XHR]: TYPES.XHR,
+    [JS]: TYPES.JS,
+    [CSS]: TYPES.CSS,
+    [IMG]: TYPES.IMG,
+    [MEDIA]: TYPES.MEDIA,
+    [OTHER]: TYPES.OTHER,
+};
 
-export function renderName(r) { 
-  return (
-    <div className="flex w-full relative items-center">
-      <Popup content={ <div className={ stl.popupNameContent }>{ r.url }</div> } >
-        <div className={ stl.popupNameTrigger }>{ r.name }</div>
-      </Popup>
-      <div
-        className="absolute right-0 text-xs uppercase p-2 color-gray-500 hover:color-black"
-        onClick={ (e) => {
-          e.stopPropagation();
-          jump(r.time)
-        }}
-      >Jump</div>
-    </div>
-  );
+export function renderName(r) {
+    return (
+        <div className="flex justify-between items-center grow-0 w-full">
+            <Popup style={{ maxWidth: '75%' }} content={<div className={stl.popupNameContent}>{r.url}</div>}>
+                <TextEllipsis>{r.name}</TextEllipsis>
+            </Popup>
+            <Button
+                variant="text"
+                className="right-0 text-xs uppercase p-2 color-gray-500 hover:color-teal"
+                onClick={(e) => {
+                    e.stopPropagation();
+                    jump(r.time);
+                }}
+            >
+                Jump
+            </Button>
+        </div>
+    );
 }
 
 export function renderDuration(r) {
-  if (!r.success) return 'x';
+    if (!r.success) return 'x';
 
-  const text = `${ Math.round(r.duration) }ms`;
-  if (!r.isRed() && !r.isYellow()) return text;
+    const text = `${Math.round(r.duration)}ms`;
+    if (!r.isRed() && !r.isYellow()) return text;
 
-  let tooltipText;
-  let className = "w-full h-full flex items-center ";
-  if (r.isYellow()) {
-    tooltipText = "Slower than average";
-    className += "warn color-orange";
-  } else {
-    tooltipText = "Much slower than average";
-    className += "error color-red";
-  }
-
-  return (
-    <Popup content={ tooltipText } >
-      <div className={ cn(className, stl.duration) } > { text } </div>
-    </Popup>
-  );
-}
-
-@connectPlayer(state => ({
-  location: state.location,
-  resources: state.resourceList,
-  domContentLoadedTime: state.domContentLoadedTime,
-  loadTime: state.loadTime,
-  // time: state.time,
-  playing: state.playing,
-  domBuildingTime: state.domBuildingTime,
-  fetchPresented: state.fetchList.length > 0,
-}))
-@connect(state => ({
-  timelinePointer: state.getIn(['sessions', 'timelinePointer']),
-}), { setTimelinePointer })
-export default class Network extends React.PureComponent {
-  state = {
-    filter: '',
-    filteredList: this.props.resources,
-    activeTab: ALL,
-    currentIndex: 0
-  }
-
-  onRowClick = (e, index) => {
-    pause();
-    jump(e.time);
-    this.setState({ currentIndex: index })
-    this.props.setTimelinePointer(null);
-  }
-
-  onTabClick = activeTab => this.setState({ activeTab })
-
-  onFilterChange = (e, { value }) => {
-    const { resources } = this.props;
-    const filterRE = getRE(value, 'i');
-    const filtered = resources.filter(({ type, name }) =>
-      filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[ activeTab ]));
-
-    this.setState({ filter: value, filteredList: value ? filtered : resources, currentIndex: 0 });
-  }
-
-  static getDerivedStateFromProps(nextProps, prevState) {
-    const { filteredList } = prevState;
-    if (nextProps.timelinePointer) {
-      const activeItem = filteredList.find((r) => r.time >= nextProps.timelinePointer.time);
-      return {
-        currentIndex: activeItem ? filteredList.indexOf(activeItem) : filteredList.length - 1,
-      };
-    }    
-  }
-
-  render() {
-    const {
-      location,
-      resources,
-      domContentLoadedTime,
-      loadTime,
-      domBuildingTime,
-      fetchPresented,
-      // time,
-      playing
-    } = this.props;
-    const { filter, activeTab, currentIndex, filteredList } = this.state;
-    // const filterRE = getRE(filter, 'i');
-    // let filtered = resources.filter(({ type, name }) =>
-    //   filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[ activeTab ]));
-    const resourcesSize = filteredList.reduce((sum, { decodedBodySize }) => sum + (decodedBodySize || 0), 0);
-    const transferredSize = filteredList
-      .reduce((sum, { headerSize, encodedBodySize }) => sum + (headerSize || 0) + (encodedBodySize || 0), 0);
+    let tooltipText;
+    let className = 'w-full h-full flex items-center ';
+    if (r.isYellow()) {
+        tooltipText = 'Slower than average';
+        className += 'warn color-orange';
+    } else {
+        tooltipText = 'Much slower than average';
+        className += 'error color-red';
+    }
 
     return (
-      <React.Fragment>
-        <NetworkContent
-          // time = { time }
-          location = { location }
-          resources = { filteredList }
-          domContentLoadedTime = { domContentLoadedTime }
-          loadTime = { loadTime }
-          domBuildingTime = { domBuildingTime }
-          fetchPresented = { fetchPresented }
-          resourcesSize={resourcesSize}
-          transferredSize={transferredSize}
-          onRowClick={ this.onRowClick }
-          currentIndex={currentIndex}
-        />
-      </React.Fragment>
+        <Popup content={tooltipText}>
+            <div className={cn(className, stl.duration)}> {text} </div>
+        </Popup>
     );
-  }
+}
+
+@connectPlayer((state) => ({
+    location: state.location,
+    resources: state.resourceList,
+    domContentLoadedTime: state.domContentLoadedTime,
+    loadTime: state.loadTime,
+    // time: state.time,
+    playing: state.playing,
+    domBuildingTime: state.domBuildingTime,
+    fetchPresented: state.fetchList.length > 0,
+}))
+@connect(
+    (state) => ({
+        timelinePointer: state.getIn(['sessions', 'timelinePointer']),
+    }),
+    { setTimelinePointer }
+)
+export default class Network extends React.PureComponent {
+    state = {
+        filter: '',
+        filteredList: this.props.resources,
+        activeTab: ALL,
+        currentIndex: 0,
+    };
+
+    onRowClick = (e, index) => {
+        pause();
+        jump(e.time);
+        this.setState({ currentIndex: index });
+        this.props.setTimelinePointer(null);
+    };
+
+    onTabClick = (activeTab) => this.setState({ activeTab });
+
+    onFilterChange = (e, { value }) => {
+        const { resources } = this.props;
+        const filterRE = getRE(value, 'i');
+        const filtered = resources.filter(({ type, name }) => filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[activeTab]));
+
+        this.setState({ filter: value, filteredList: value ? filtered : resources, currentIndex: 0 });
+    };
+
+    static getDerivedStateFromProps(nextProps, prevState) {
+        const { filteredList } = prevState;
+        if (nextProps.timelinePointer) {
+            const activeItem = filteredList.find((r) => r.time >= nextProps.timelinePointer.time);
+            return {
+                currentIndex: activeItem ? filteredList.indexOf(activeItem) : filteredList.length - 1,
+            };
+        }
+    }
+
+    render() {
+        const {
+            location,
+            resources,
+            domContentLoadedTime,
+            loadTime,
+            domBuildingTime,
+            fetchPresented,
+            // time,
+            playing,
+        } = this.props;
+        const { filter, activeTab, currentIndex, filteredList } = this.state;
+        // const filterRE = getRE(filter, 'i');
+        // let filtered = resources.filter(({ type, name }) =>
+        //   filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[ activeTab ]));
+        const resourcesSize = filteredList.reduce((sum, { decodedBodySize }) => sum + (decodedBodySize || 0), 0);
+        const transferredSize = filteredList.reduce((sum, { headerSize, encodedBodySize }) => sum + (headerSize || 0) + (encodedBodySize || 0), 0);
+
+        return (
+            <React.Fragment>
+                <NetworkContent
+                    // time = { time }
+                    location={location}
+                    resources={filteredList}
+                    domContentLoadedTime={domContentLoadedTime}
+                    loadTime={loadTime}
+                    domBuildingTime={domBuildingTime}
+                    fetchPresented={fetchPresented}
+                    resourcesSize={resourcesSize}
+                    transferredSize={transferredSize}
+                    onRowClick={this.onRowClick}
+                    currentIndex={currentIndex}
+                />
+            </React.Fragment>
+        );
+    }
 }
diff --git a/frontend/app/components/ui/Button/Button.tsx b/frontend/app/components/ui/Button/Button.tsx
index d324d4f4a..043491ed2 100644
--- a/frontend/app/components/ui/Button/Button.tsx
+++ b/frontend/app/components/ui/Button/Button.tsx
@@ -16,7 +16,7 @@ export default (props: Props) => {
     const {
         icon = '',
         className = '',
-        variant = 'default',
+        variant = 'default', // 'default|primary|text|text-primary|text-red|outline',
         type = 'button',
         size = '',
         disabled = false,
diff --git a/frontend/app/components/ui/Popup/Popup.tsx b/frontend/app/components/ui/Popup/Popup.tsx
index 129b9a8a4..d44976b28 100644
--- a/frontend/app/components/ui/Popup/Popup.tsx
+++ b/frontend/app/components/ui/Popup/Popup.tsx
@@ -11,6 +11,7 @@ interface Props {
   disabled?: boolean
   arrow?: boolean
   open?: boolean
+  style?: any
   [x:string]: any;
 }
 export default ({
@@ -22,6 +23,7 @@ export default ({
   disabled = false,
   arrow = true,
   theme = 'dark',
+  style = {},
   ...props
 }: Props) => (
   <Tooltip
@@ -35,6 +37,7 @@ export default ({
     hideOnClick={true}
     hideOnScroll={true}
     theme={theme}
+    style={style}
   >
     { props.children }
   </Tooltip>

From 80ae669ed15df3f3dbb0cae566b0bffe887c7393 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 15 Jul 2022 19:11:39 +0200
Subject: [PATCH 29/77] fix(ui) - dev tools - sync with timeline

---
 .../app/components/Session_/Autoscroll.js     | 153 +++---
 .../components/Session_/Console/Console.js    |   7 +-
 .../Session_/Console/ConsoleContent.js        | 185 +++----
 .../app/components/Session_/Fetch/Fetch.js    | 308 +++++------
 .../components/Session_/Network/Network.js    |  22 +-
 .../Session_/TimeTable/TimeTable.tsx          | 512 ++++++++----------
 .../components/Session_/autoscroll.module.css |   2 +-
 frontend/app/components/ui/Button/Button.tsx  |   2 +-
 8 files changed, 554 insertions(+), 637 deletions(-)

diff --git a/frontend/app/components/Session_/Autoscroll.js b/frontend/app/components/Session_/Autoscroll.js
index 0d24f3930..02af15417 100644
--- a/frontend/app/components/Session_/Autoscroll.js
+++ b/frontend/app/components/Session_/Autoscroll.js
@@ -4,85 +4,82 @@ import cn from 'classnames';
 import stl from './autoscroll.module.css';
 
 export default class Autoscroll extends React.PureComponent {
-  static defaultProps = {
-    bottomOffset: 10,
-  }
-  state = {
-    autoScroll: true,
-  }
+    static defaultProps = {
+        bottomOffset: 10,
+    };
+    state = {
+        autoScroll: true,
+    };
 
-  componentDidMount() {
-    if (!this.scrollableElement) return; // is necessary ?
-    this.scrollableElement.addEventListener('scroll', this.scrollHandler);
-    this.scrollableElement.scrollTop = this.scrollableElement.scrollHeight;
-  }
-
-  componentDidUpdate() {
-    if (!this.scrollableElement) return; // is necessary ?
-    if (this.state.autoScroll) {
-      this.scrollableElement.scrollTop = this.scrollableElement.scrollHeight;
+    componentDidMount() {
+        if (!this.scrollableElement) return; // is necessary ?
+        this.scrollableElement.addEventListener('scroll', this.scrollHandler);
+        this.scrollableElement.scrollTop = this.scrollableElement.scrollHeight;
     }
-  }
 
-  scrollHandler = (e) => {
-    if (!this.scrollableElement) return;
-    this.setState({ 
-      autoScroll: this.scrollableElement.scrollHeight 
-        - this.scrollableElement.clientHeight 
-        - this.scrollableElement.scrollTop < this.props.bottomOffset,
-    });
-  }
-
-  onPrevClick = () => {
-    if (!this.scrollableElement) return;
-    const scEl = this.scrollableElement;
-    let prevItem;
-    for (let i = scEl.children.length - 1; i >= 0; i--) {
-      const child = scEl.children[ i ];
-      const isScrollable = child.getAttribute("data-scroll-item") === "true";
-      if (isScrollable && child.offsetTop < scEl.scrollTop) {
-        prevItem = child;
-        break;
-      }
-    }
-    if (!prevItem) return;
-    scEl.scrollTop = prevItem.offsetTop;
-  }
-
-  onNextClick = () => {
-    if (!this.scrollableElement) return;
-    const scEl = this.scrollableElement;
-    let nextItem;
-    for (let i = 0; i < scEl.children.length; i++) {
-      const child = scEl.children[ i ];
-      const isScrollable = child.getAttribute("data-scroll-item") === "true";
-      if (isScrollable && child.offsetTop > scEl.scrollTop + 20) { // ?
-        nextItem = child;
-        break;
-      }
-    }
-    if (!nextItem) return;
-    scEl.scrollTop = nextItem.offsetTop;
-  }
-
-  render() {
-    const { className, navigation=false, children, ...props } = this.props;
-    return (
-      <div className={ cn("relative w-full h-full", stl.wrapper) } >
-        <div 
-          { ...props }
-          className={ cn("relative scroll-y h-full", className) }
-          ref={ ref => this.scrollableElement = ref }
-        >
-          { children }
-        </div>
-        { navigation && 
-          <div className={ stl.navButtons } >
-            <IconButton size="small" icon="chevron-up" onClick={this.onPrevClick} />
-            <IconButton size="small" icon="chevron-down" onClick={this.onNextClick} className="mt-5" />
-          </div>
+    componentDidUpdate() {
+        if (!this.scrollableElement) return; // is necessary ?
+        if (this.state.autoScroll) {
+            this.scrollableElement.scrollTop = this.scrollableElement.scrollHeight;
         }
-      </div>
-    );
-  }
-}
\ No newline at end of file
+    }
+
+    scrollHandler = (e) => {
+        if (!this.scrollableElement) return;
+        this.setState({
+            autoScroll:
+                this.scrollableElement.scrollHeight - this.scrollableElement.clientHeight - this.scrollableElement.scrollTop <
+                this.props.bottomOffset,
+        });
+    };
+
+    onPrevClick = () => {
+        if (!this.scrollableElement) return;
+        const scEl = this.scrollableElement;
+        let prevItem;
+        for (let i = scEl.children.length - 1; i >= 0; i--) {
+            const child = scEl.children[i];
+            const isScrollable = child.getAttribute('data-scroll-item') === 'true';
+            if (isScrollable && child.offsetTop < scEl.scrollTop) {
+                prevItem = child;
+                break;
+            }
+        }
+        if (!prevItem) return;
+        scEl.scrollTop = prevItem.offsetTop;
+    };
+
+    onNextClick = () => {
+        if (!this.scrollableElement) return;
+        const scEl = this.scrollableElement;
+        let nextItem;
+        for (let i = 0; i < scEl.children.length; i++) {
+            const child = scEl.children[i];
+            const isScrollable = child.getAttribute('data-scroll-item') === 'true';
+            if (isScrollable && child.offsetTop > scEl.scrollTop + 20) {
+                // ?
+                nextItem = child;
+                break;
+            }
+        }
+        if (!nextItem) return;
+        scEl.scrollTop = nextItem.offsetTop;
+    };
+
+    render() {
+        const { className, navigation = false, children, ...props } = this.props;
+        return (
+            <div className={cn('relative w-full h-full', stl.wrapper)}>
+                <div {...props} className={cn('relative scroll-y h-full', className)} ref={(ref) => (this.scrollableElement = ref)}>
+                    {children}
+                </div>
+                {navigation && (
+                    <div className={stl.navButtons}>
+                        <IconButton size="small" icon="chevron-up" onClick={this.onPrevClick} />
+                        <IconButton size="small" icon="chevron-down" onClick={this.onNextClick} className="mt-5" />
+                    </div>
+                )}
+            </div>
+        );
+    }
+}
diff --git a/frontend/app/components/Session_/Console/Console.js b/frontend/app/components/Session_/Console/Console.js
index 6c0207aa5..5534439fb 100644
--- a/frontend/app/components/Session_/Console/Console.js
+++ b/frontend/app/components/Session_/Console/Console.js
@@ -4,14 +4,15 @@ import ConsoleContent from './ConsoleContent';
 
 @connectPlayer(state => ({
   logs: state.logList,
-  time: state.time,
+  // time: state.time,
   livePlay: state.livePlay,
+  listNow: state.logListNow,
 }))
 export default class Console extends React.PureComponent {
   render() {
-    const { logs, time } = this.props;
+    const { logs, time, listNow } = this.props;
     return (
-        <ConsoleContent jump={!this.props.livePlay && jump} logs={logs} time={time} />
+        <ConsoleContent jump={!this.props.livePlay && jump} logs={logs} lastIndex={listNow.length - 1} />
     );
   }
 }
diff --git a/frontend/app/components/Session_/Console/ConsoleContent.js b/frontend/app/components/Session_/Console/ConsoleContent.js
index 0ffaa6032..a2c084abd 100644
--- a/frontend/app/components/Session_/Console/ConsoleContent.js
+++ b/frontend/app/components/Session_/Console/ConsoleContent.js
@@ -3,126 +3,113 @@ import cn from 'classnames';
 import { getRE } from 'App/utils';
 import { Icon, NoContent, Tabs, Input } from 'UI';
 import { jump } from 'Player';
-import { LEVEL } from 'Types/session/log'; 
+import { LEVEL } from 'Types/session/log';
 import Autoscroll from '../Autoscroll';
 import BottomBlock from '../BottomBlock';
 import stl from './console.module.css';
 
-
 const ALL = 'ALL';
 const INFO = 'INFO';
 const WARNINGS = 'WARNINGS';
 const ERRORS = 'ERRORS';
 
 const LEVEL_TAB = {
-  [ LEVEL.INFO ]: INFO,
-  [ LEVEL.LOG ]: INFO,
-  [ LEVEL.WARNING ]: WARNINGS,
-  [ LEVEL.ERROR ]: ERRORS,
-  [ LEVEL.EXCEPTION ]: ERRORS,
+    [LEVEL.INFO]: INFO,
+    [LEVEL.LOG]: INFO,
+    [LEVEL.WARNING]: WARNINGS,
+    [LEVEL.ERROR]: ERRORS,
+    [LEVEL.EXCEPTION]: ERRORS,
 };
 
-const TABS = [ ALL, ERRORS, WARNINGS, INFO,  ].map(tab => ({ text: tab, key: tab }));
+const TABS = [ALL, ERRORS, WARNINGS, INFO].map((tab) => ({ text: tab, key: tab }));
 
 // eslint-disable-next-line complexity
 const getIconProps = (level) => {
-  switch (level) {
-    case LEVEL.INFO:
-    case LEVEL.LOG:
-      return {
-        name: 'console/info',
-        color: 'blue2',
-      };
-    case LEVEL.WARN:
-    case LEVEL.WARNING:
-      return {
-        name: 'console/warning',
-        color: 'red2',
-      };
-    case LEVEL.ERROR:
-      return {
-        name: 'console/error',
-        color: 'red',
-      };    
-        
-  }  
-  return null;
+    switch (level) {
+        case LEVEL.INFO:
+        case LEVEL.LOG:
+            return {
+                name: 'console/info',
+                color: 'blue2',
+            };
+        case LEVEL.WARN:
+        case LEVEL.WARNING:
+            return {
+                name: 'console/warning',
+                color: 'red2',
+            };
+        case LEVEL.ERROR:
+            return {
+                name: 'console/error',
+                color: 'red',
+            };
+    }
+    return null;
 };
 
 function renderWithNL(s = '') {
-  if (typeof s !== 'string') return '';
-  return s.split('\n').map((line, i) => <div className={ cn({ "ml-20": i !== 0 }) }>{ line }</div>)
+    if (typeof s !== 'string') return '';
+    return s.split('\n').map((line, i) => <div className={cn({ 'ml-20': i !== 0 })}>{line}</div>);
 }
 
 export default class ConsoleContent extends React.PureComponent {
-  state = {
-    filter: '',
-    activeTab: ALL,
-  }
-  onTabClick = activeTab => this.setState({ activeTab })
-  onFilterChange = ({ target: { value }}) => this.setState({ filter: value })
+    state = {
+        filter: '',
+        activeTab: ALL,
+    };
+    onTabClick = (activeTab) => this.setState({ activeTab });
+    onFilterChange = ({ target: { value } }) => this.setState({ filter: value });
 
-  render() {
-    const { logs, isResult, additionalHeight, time } = this.props;
-    const { filter, activeTab, currentError } = this.state;
-    const filterRE = getRE(filter, 'i');
-    const filtered = logs.filter(({ level, value }) => activeTab === ALL 
-      ? filterRE.test(value) 
-      : (filterRE.test(value) && LEVEL_TAB[ level ] === activeTab)
-    );
+    render() {
+        const { logs, isResult, additionalHeight, lastIndex } = this.props;
+        const { filter, activeTab } = this.state;
+        const filterRE = getRE(filter, 'i');
+        const filtered = logs.filter(({ level, value }) =>
+            activeTab === ALL ? filterRE.test(value) : filterRE.test(value) && LEVEL_TAB[level] === activeTab
+        );
 
-    const lastIndex = filtered.filter(item => item.time <= time).length - 1;    
-
-    return (
-      <>
-        <BottomBlock style={{ height: 300 + additionalHeight + 'px' }}>
-          <BottomBlock.Header showClose={!isResult}>
-            <div className="flex items-center">
-              <span className="font-semibold color-gray-medium mr-4">Console</span>
-              <Tabs 
-                tabs={ TABS }
-                active={ activeTab }
-                onClick={ this.onTabClick }
-                border={ false }              
-              />
-            </div>
-            <Input
-              className="input-small"
-              placeholder="Filter by keyword"
-              icon="search"
-              iconPosition="left"
-              name="filter"
-              onChange={ this.onFilterChange }
-            />
-          </BottomBlock.Header>
-          <BottomBlock.Content>
-            <NoContent
-              size="small"
-              show={ filtered.length === 0 }
-            >
-              <Autoscroll>
-                { filtered.map((l, index) => (
-                  <div 
-                    key={ l.key }
-                    className={ cn(stl.line, {
-                      "info": !l.isYellow() && !l.isRed(),
-                      "warn": l.isYellow(),
-                      "error": l.isRed(),
-                      "cursor-pointer": !isResult,
-                      [stl.activeRow] : lastIndex === index
-                    }) }
-                    data-scroll-item={ l.isRed() }
-                    onClick={ () => !isResult && jump(l.time) }
-                  >
-                    <Icon size="14" className={ stl.icon } { ...getIconProps(l.level) } />
-                    <div className={ stl.message }>{ renderWithNL(l.value) }</div>
-                  </div>
-                ))}
-              </Autoscroll>
-            </NoContent>
-          </BottomBlock.Content>
-        </BottomBlock>
-      </>
-    );
-  }
+        return (
+            <>
+                <BottomBlock style={{ height: 300 + additionalHeight + 'px' }}>
+                    <BottomBlock.Header showClose={!isResult}>
+                        <div className="flex items-center">
+                            <span className="font-semibold color-gray-medium mr-4">Console</span>
+                            <Tabs tabs={TABS} active={activeTab} onClick={this.onTabClick} border={false} />
+                        </div>
+                        <Input
+                            className="input-small"
+                            placeholder="Filter by keyword"
+                            icon="search"
+                            iconPosition="left"
+                            name="filter"
+                            onChange={this.onFilterChange}
+                        />
+                    </BottomBlock.Header>
+                    <BottomBlock.Content>
+                        <NoContent size="small" show={filtered.length === 0}>
+                            <Autoscroll>
+                                {filtered.map((l, index) => (
+                                    <div
+                                        key={l.key}
+                                        className={cn(stl.line, {
+                                            info: !l.isYellow() && !l.isRed(),
+                                            warn: l.isYellow(),
+                                            error: l.isRed(),
+                                            'cursor-pointer': !isResult,
+                                            [stl.activeRow]: lastIndex === index,
+                                        })}
+                                        data-scroll-item={l.isRed()}
+                                        onClick={() => !isResult && jump(l.time)}
+                                    >
+                                        <Icon size="14" className={stl.icon} {...getIconProps(l.level)} />
+                                        <div className={stl.message}>{renderWithNL(l.value)}</div>
+                                    </div>
+                                ))}
+                            </Autoscroll>
+                        </NoContent>
+                    </BottomBlock.Content>
+                </BottomBlock>
+            </>
+        );
+    }
 }
diff --git a/frontend/app/components/Session_/Fetch/Fetch.js b/frontend/app/components/Session_/Fetch/Fetch.js
index 5b8e49911..2dff482c9 100644
--- a/frontend/app/components/Session_/Fetch/Fetch.js
+++ b/frontend/app/components/Session_/Fetch/Fetch.js
@@ -10,170 +10,154 @@ import { renderName, renderDuration } from '../Network';
 import { connect } from 'react-redux';
 import { setTimelinePointer } from 'Duck/sessions';
 
-@connectPlayer(state => ({
-  list: state.fetchList,
-  livePlay: state.livePlay,
+@connectPlayer((state) => ({
+    list: state.fetchList,
+    listNow: state.fetchListNow,
+    livePlay: state.livePlay,
 }))
-@connect(state => ({
-  timelinePointer: state.getIn(['sessions', 'timelinePointer']),
-}), { setTimelinePointer })
+@connect(
+    (state) => ({
+        timelinePointer: state.getIn(['sessions', 'timelinePointer']),
+    }),
+    { setTimelinePointer }
+)
 export default class Fetch extends React.PureComponent {
-	state = {
-		filter: "",
-    filteredList: this.props.list,
-		current: null,
-    currentIndex: 0,
-    showFetchDetails: false,
-    hasNextError: false,
-    hasPreviousError: false,
-	}
-  
-  onFilterChange = ({ target: { value } }) => {
-    const { list } = this.props;
-    const filterRE = getRE(value, 'i');
-    const filtered = list
-      .filter((r) => filterRE.test(r.name) || filterRE.test(r.url) || filterRE.test(r.method) || filterRE.test(r.status));
-    this.setState({ filter: value, filteredList: value ? filtered : list, currentIndex: 0 });
-  }
+    state = {
+        filter: '',
+        filteredList: this.props.list,
+        current: null,
+        currentIndex: 0,
+        showFetchDetails: false,
+        hasNextError: false,
+        hasPreviousError: false,
+    };
 
-  setCurrent = (item, index) => {
-    if (!this.props.livePlay) {
-      pause();
-      jump(item.time)
+    onFilterChange = ({ target: { value } }) => {
+        const { list } = this.props;
+        const filterRE = getRE(value, 'i');
+        const filtered = list.filter((r) => filterRE.test(r.name) || filterRE.test(r.url) || filterRE.test(r.method) || filterRE.test(r.status));
+        this.setState({ filter: value, filteredList: value ? filtered : list, currentIndex: 0 });
+    };
+
+    setCurrent = (item, index) => {
+        if (!this.props.livePlay) {
+            pause();
+            jump(item.time);
+        }
+        this.setState({ current: item, currentIndex: index });
+    };
+
+    onRowClick = (item, index) => {
+        if (!this.props.livePlay) {
+            pause();
+        }
+        this.setState({ current: item, currentIndex: index, showFetchDetails: true });
+        this.props.setTimelinePointer(null);
+    };
+
+    closeModal = () => this.setState({ current: null, showFetchDetails: false });
+
+    nextClickHander = () => {
+        // const { list } = this.props;
+        const { currentIndex, filteredList } = this.state;
+
+        if (currentIndex === filteredList.length - 1) return;
+        const newIndex = currentIndex + 1;
+        this.setCurrent(filteredList[newIndex], newIndex);
+        this.setState({ showFetchDetails: true });
+    };
+
+    prevClickHander = () => {
+        // const { list } = this.props;
+        const { currentIndex, filteredList } = this.state;
+
+        if (currentIndex === 0) return;
+        const newIndex = currentIndex - 1;
+        this.setCurrent(filteredList[newIndex], newIndex);
+        this.setState({ showFetchDetails: true });
+    };
+
+    render() {
+        const { listNow } = this.props;
+        const { current, currentIndex, showFetchDetails, filteredList } = this.state;
+        return (
+            <React.Fragment>
+                <SlideModal
+                    right
+                    size="middle"
+                    title={
+                        <div className="flex justify-between">
+                            <h1>Fetch Request</h1>
+                            <div className="flex items-center">
+                                <div className="flex items-center">
+                                    <span className="mr-2 color-gray-medium uppercase text-base">Status</span>
+                                    <Label data-red={current && current.status >= 400} data-green={current && current.status < 400}>
+                                        <div className="uppercase w-16 justify-center code-font text-lg">{current && current.status}</div>
+                                    </Label>
+                                </div>
+                                <CloseButton onClick={this.closeModal} size="18" className="ml-2" />
+                            </div>
+                        </div>
+                    }
+                    isDisplayed={current != null && showFetchDetails}
+                    content={
+                        current &&
+                        showFetchDetails && (
+                            <FetchDetails
+                                resource={current}
+                                nextClick={this.nextClickHander}
+                                prevClick={this.prevClickHander}
+                                first={currentIndex === 0}
+                                last={currentIndex === filteredList.length - 1}
+                            />
+                        )
+                    }
+                    onClose={this.closeModal}
+                />
+                <BottomBlock>
+                    <BottomBlock.Header>
+                        <h4 className="text-lg">Fetch</h4>
+                        <div className="flex items-center">
+                            <Input
+                                className="input-small"
+                                placeholder="Filter"
+                                icon="search"
+                                iconPosition="left"
+                                name="filter"
+                                onChange={this.onFilterChange}
+                            />
+                        </div>
+                    </BottomBlock.Header>
+                    <BottomBlock.Content>
+                        <NoContent size="small" show={filteredList.length === 0}>
+                            <TimeTable rows={filteredList} onRowClick={this.onRowClick} hoverable navigation activeIndex={listNow.length - 1}>
+                                {[
+                                    {
+                                        label: 'Status',
+                                        dataKey: 'status',
+                                        width: 70,
+                                    },
+                                    {
+                                        label: 'Method',
+                                        dataKey: 'method',
+                                        width: 60,
+                                    },
+                                    {
+                                        label: 'Name',
+                                        width: 240,
+                                        render: renderName,
+                                    },
+                                    {
+                                        label: 'Time',
+                                        width: 80,
+                                        render: renderDuration,
+                                    },
+                                ]}
+                            </TimeTable>
+                        </NoContent>
+                    </BottomBlock.Content>
+                </BottomBlock>
+            </React.Fragment>
+        );
     }
-    this.setState({ current: item, currentIndex: index });
-  }
-
-  onRowClick = (item, index) => {
-    if (!this.props.livePlay) {
-      pause();
-    }
-    this.setState({ current: item, currentIndex: index, showFetchDetails: true });
-    this.props.setTimelinePointer(null);
-  }
-
-  closeModal = () => this.setState({ current: null, showFetchDetails: false });
-
-  nextClickHander = () => {
-    // const { list } = this.props;
-    const { currentIndex, filteredList } = this.state;
-    
-    if (currentIndex === filteredList.length  - 1) return;
-    const newIndex = currentIndex + 1;
-    this.setCurrent(filteredList[newIndex], newIndex);
-    this.setState({ showFetchDetails: true });
-  }
-
-  prevClickHander = () => {
-    // const { list } = this.props;
-    const { currentIndex, filteredList } = this.state;
-
-    if (currentIndex === 0) return;
-    const newIndex = currentIndex - 1;
-    this.setCurrent(filteredList[newIndex], newIndex);
-    this.setState({ showFetchDetails: true });
-  }
-
-  static getDerivedStateFromProps(nextProps, prevState) {
-    const { filteredList } = prevState;
-    if (nextProps.timelinePointer) {
-      let activeItem = filteredList.find((r) => r.time >= nextProps.timelinePointer.time);
-      activeItem = activeItem || filteredList[filteredList.length - 1];
-      return {
-        current: activeItem,
-        currentIndex: filteredList.indexOf(activeItem),
-      };
-    }
-  }
-
-  render() {
-    // const { list } = this.props;
-    const { current, currentIndex, showFetchDetails, filteredList } = this.state;
-    return (
-      <React.Fragment>
-        <SlideModal
-          right 
-          size="middle"
-          title={
-            <div className="flex justify-between">
-              <h1>Fetch Request</h1>
-              <div className="flex items-center">
-                <div className="flex items-center">
-                  <span className="mr-2 color-gray-medium uppercase text-base">Status</span>
-                  <Label
-                    data-red={current && current.status >= 400}
-                    data-green={current && current.status < 400}
-                  >
-                    <div className="uppercase w-16 justify-center code-font text-lg">{current && current.status}</div>
-                  </Label>
-                </div>
-                <CloseButton onClick={ this.closeModal } size="18" className="ml-2" />
-              </div>
-            </div>
-          }
-          isDisplayed={ current != null && showFetchDetails }
-          content={ current && showFetchDetails && 
-            <FetchDetails
-              resource={ current }
-              nextClick={this.nextClickHander}
-              prevClick={this.prevClickHander}
-              first={currentIndex === 0}
-              last={currentIndex === filteredList.length - 1}
-            />
-          }
-          onClose={ this.closeModal }
-        />
-        <BottomBlock>
-          <BottomBlock.Header>
-            <h4 className="text-lg">Fetch</h4>
-            <div className="flex items-center">
-              <Input
-                className="input-small"
-                placeholder="Filter"
-                icon="search"
-                iconPosition="left"
-                name="filter"
-                onChange={ this.onFilterChange }
-              />
-            </div>
-          </BottomBlock.Header>
-          <BottomBlock.Content>
-            <NoContent
-              size="small"
-              show={ filteredList.length === 0}
-            >
-              <TimeTable
-                rows={ filteredList }
-                onRowClick={ this.onRowClick }
-                hoverable
-                navigation
-                activeIndex={currentIndex}
-              >
-                {[
-                  {
-                    label: "Status",
-                    dataKey: 'status',
-                    width: 70,
-                  }, {
-                    label: "Method",
-                    dataKey: "method",
-                    width: 60,
-                  }, {
-                    label: "Name",
-                    width: 240,
-                    render: renderName,
-                  },
-                  {
-                    label: "Time",
-                    width: 80,
-                    render: renderDuration,
-                  }
-                ]}
-              </TimeTable>
-            </NoContent>
-          </BottomBlock.Content>
-        </BottomBlock>
-      </React.Fragment>
-    );
-  }
 }
diff --git a/frontend/app/components/Session_/Network/Network.js b/frontend/app/components/Session_/Network/Network.js
index 26396e5bd..887cc1148 100644
--- a/frontend/app/components/Session_/Network/Network.js
+++ b/frontend/app/components/Session_/Network/Network.js
@@ -78,6 +78,7 @@ export function renderDuration(r) {
     playing: state.playing,
     domBuildingTime: state.domBuildingTime,
     fetchPresented: state.fetchList.length > 0,
+    listNow: state.resourceListNow,
 }))
 @connect(
     (state) => ({
@@ -110,31 +111,16 @@ export default class Network extends React.PureComponent {
         this.setState({ filter: value, filteredList: value ? filtered : resources, currentIndex: 0 });
     };
 
-    static getDerivedStateFromProps(nextProps, prevState) {
-        const { filteredList } = prevState;
-        if (nextProps.timelinePointer) {
-            const activeItem = filteredList.find((r) => r.time >= nextProps.timelinePointer.time);
-            return {
-                currentIndex: activeItem ? filteredList.indexOf(activeItem) : filteredList.length - 1,
-            };
-        }
-    }
-
     render() {
         const {
             location,
-            resources,
             domContentLoadedTime,
             loadTime,
             domBuildingTime,
             fetchPresented,
-            // time,
-            playing,
+            listNow,
         } = this.props;
-        const { filter, activeTab, currentIndex, filteredList } = this.state;
-        // const filterRE = getRE(filter, 'i');
-        // let filtered = resources.filter(({ type, name }) =>
-        //   filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[ activeTab ]));
+        const { filteredList } = this.state;
         const resourcesSize = filteredList.reduce((sum, { decodedBodySize }) => sum + (decodedBodySize || 0), 0);
         const transferredSize = filteredList.reduce((sum, { headerSize, encodedBodySize }) => sum + (headerSize || 0) + (encodedBodySize || 0), 0);
 
@@ -151,7 +137,7 @@ export default class Network extends React.PureComponent {
                     resourcesSize={resourcesSize}
                     transferredSize={transferredSize}
                     onRowClick={this.onRowClick}
-                    currentIndex={currentIndex}
+                    currentIndex={listNow.length - 0}
                 />
             </React.Fragment>
         );
diff --git a/frontend/app/components/Session_/TimeTable/TimeTable.tsx b/frontend/app/components/Session_/TimeTable/TimeTable.tsx
index 413af3f61..4a6f1140e 100644
--- a/frontend/app/components/Session_/TimeTable/TimeTable.tsx
+++ b/frontend/app/components/Session_/TimeTable/TimeTable.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { List, AutoSizer } from "react-virtualized";
+import { List, AutoSizer } from 'react-virtualized';
 import cn from 'classnames';
-import { NoContent, IconButton } from 'UI';
+import { NoContent, IconButton, Button } from 'UI';
 import { percentOf } from 'App/utils';
 import { formatMs } from 'App/date';
 
@@ -10,58 +10,58 @@ import stl from './timeTable.module.css';
 
 import autoscrollStl from '../autoscroll.module.css'; //aaa
 
-
 type Timed = {
-  time: number,
-}
+    time: number;
+};
 
 type Durationed = {
-  duration: number,
-}
+    duration: number;
+};
 
 type CanBeRed = {
-  //+isRed: boolean,
-  isRed: () => boolean,
-}
+    //+isRed: boolean,
+    isRed: () => boolean;
+};
 
-type Row = Timed & Durationed & CanBeRed
+type Row = Timed & Durationed & CanBeRed;
 
 type Line = {
-  color: string,  // Maybe use typescript?
-  hint?: string,
-  onClick?: any,
-} & Timed
+    color: string; // Maybe use typescript?
+    hint?: string;
+    onClick?: any;
+} & Timed;
 
 type Column = {
-  label: string,
-  width: number,
-  referenceLines?: Array<Line>,
-  style?: Object,
-} & RenderOrKey
+    label: string;
+    width: number;
+    referenceLines?: Array<Line>;
+    style?: Object;
+} & RenderOrKey;
 
 // type RenderOrKey = { // Disjoint?
-//   render: Row => React.Node 
+//   render: Row => React.Node
 // } | {
 //   dataKey: string,
 // }
-type RenderOrKey = {
-  render?: (row: Row) => React.ReactNode,
-  key?: string,
-} | {
-  dataKey: string,
-}
-
+type RenderOrKey =
+    | {
+          render?: (row: Row) => React.ReactNode;
+          key?: string;
+      }
+    | {
+          dataKey: string;
+      };
 
 type Props = {
-  className?: string,
-  rows: Array<Row>,
-  children: Array<Column>
-}
+    className?: string;
+    rows: Array<Row>;
+    children: Array<Column>;
+};
 
 type TimeLineInfo = {
-  timestart: number,
-  timewidth: number,
-}
+    timestart: number;
+    timewidth: number;
+};
 
 type State = TimeLineInfo & typeof initialState;
 
@@ -73,266 +73,228 @@ const ROW_HEIGHT = 32;
 const TIME_SECTIONS_COUNT = 8;
 const ZERO_TIMEWIDTH = 1000;
 function formatTime(ms) {
-  if(ms < 0) return "";
-  return formatMs(ms);
+    if (ms < 0) return '';
+    return formatMs(ms);
 }
 
 function computeTimeLine(rows: Array<Row>, firstVisibleRowIndex: number, visibleCount): TimeLineInfo {
-  const visibleRows = rows.slice(firstVisibleRowIndex, firstVisibleRowIndex + visibleCount + _additionalHeight);
-  let timestart = visibleRows.length > 0 
-    ? Math.min(...visibleRows.map(r => r.time))
-    : 0;
-  const timeend = visibleRows.length > 0 
-    ? Math.max(...visibleRows.map(r => r.time + r.duration))
-    : 0;
-  let timewidth = timeend - timestart;
-  const offset = timewidth / 70;
-  if (timestart >= offset) {
-    timestart -= offset;
-  }
-  timewidth *= 1.5; // += offset;
-  if (timewidth === 0) {
-    timewidth = ZERO_TIMEWIDTH;
-  }
-  return {
-    timestart,
-    timewidth,
-  };
+    const visibleRows = rows.slice(firstVisibleRowIndex, firstVisibleRowIndex + visibleCount + _additionalHeight);
+    let timestart = visibleRows.length > 0 ? Math.min(...visibleRows.map((r) => r.time)) : 0;
+    const timeend = visibleRows.length > 0 ? Math.max(...visibleRows.map((r) => r.time + r.duration)) : 0;
+    let timewidth = timeend - timestart;
+    const offset = timewidth / 70;
+    if (timestart >= offset) {
+        timestart -= offset;
+    }
+    timewidth *= 1.5; // += offset;
+    if (timewidth === 0) {
+        timewidth = ZERO_TIMEWIDTH;
+    }
+    return {
+        timestart,
+        timewidth,
+    };
 }
 
 const initialState = {
-  firstVisibleRowIndex: 0,
-}
+    firstVisibleRowIndex: 0,
+};
 
 export default class TimeTable extends React.PureComponent<Props, State> {
-  state = {
-    ...computeTimeLine(this.props.rows, initialState.firstVisibleRowIndex, this.visibleCount),
-    ...initialState,
-  }
+    state = {
+        ...computeTimeLine(this.props.rows, initialState.firstVisibleRowIndex, this.visibleCount),
+        ...initialState,
+    };
 
-  get tableHeight() {
-    return  this.props.tableHeight || 195;
-  }
-
-  get visibleCount() {
-    return Math.ceil(this.tableHeight/ROW_HEIGHT);
-  }
-
-  scroller = React.createRef();
-  autoScroll = true;
-
-  // componentDidMount() {
-  //   if (this.scroller.current != null) {
-  //     this.scroller.current.scrollToRow(this.props.rows.length - 1);      
-  //   }   
-  // }
-
-  componentDidUpdate(prevProps: any, prevState: any) {
-    // if (prevProps.rows.length !== this.props.rows.length && 
-    //     this.autoScroll && 
-    //     this.scroller.current != null) {
-    //   this.scroller.current.scrollToRow(this.props.rows.length);
-    // }
-    if (prevState.firstVisibleRowIndex !== this.state.firstVisibleRowIndex ||
-        (this.props.rows.length <= (this.visibleCount + _additionalHeight) && prevProps.rows.length !== this.props.rows.length)) {
-      this.setState({
-        ...computeTimeLine(this.props.rows, this.state.firstVisibleRowIndex, this.visibleCount),
-      });
-    }    
-    if (this.props.activeIndex >= 0 && prevProps.activeIndex !== this.props.activeIndex && this.scroller.current != null) {
-      this.scroller.current.scrollToRow(this.props.activeIndex);
-    }
-  }
-
-  onScroll = ({ scrollTop, scrollHeight, clientHeight }: 
-      { scrollTop: number, scrollHeight: number, clientHeight: number }):void => {
-    const firstVisibleRowIndex = Math.floor(scrollTop / ROW_HEIGHT + 0.33);
-
-    if (this.state.firstVisibleRowIndex !== firstVisibleRowIndex) {
-      this.autoScroll = (scrollHeight - clientHeight - scrollTop) < ROW_HEIGHT / 2;
-      this.setState({ firstVisibleRowIndex });
-    }
-  }
-
-  renderRow = ({ index, key, style: rowStyle }: any) => {
-    const { activeIndex } = this.props;
-    const { 
-      children: columns,
-      rows,
-      renderPopup,
-      hoverable,
-      onRowClick,
-    } = this.props;
-    const {
-      timestart,
-      timewidth,
-    } = this.state;
-    const row = rows[ index ];    
-    return (
-      <div
-        style={ rowStyle }
-        key={ key } 
-        className={ cn('border-b border-color-gray-light-shade', stl.row, { [ stl.hoverable ]: hoverable, "error color-red": !!row.isRed && row.isRed(), 'cursor-pointer' : typeof onRowClick === "function", [stl.activeRow] : activeIndex === index }) }
-        onClick={ typeof onRowClick === "function" ? () => onRowClick(row, index) : null }
-        id="table-row"
-      >
-        { columns.map(({ dataKey, render, width }) => (
-          <div className={ stl.cell } style={{ width: `${width}px`}}> 
-            { render ? render(row) : (row[ dataKey ] || <i className="color-gray-light">{"empty"}</i>) }
-          </div>
-        ))}
-        <div className={ cn("relative flex-1 flex", stl.timeBarWrapper)}>
-          <BarRow 
-            resource={ row } 
-            timestart={ timestart } 
-            timewidth={ timewidth } 
-            popup={ renderPopup } 
-          />
-        </div>
-      </div>
-    );
-  }
-
-  onPrevClick = () => {
-    let prevRedIndex = -1;
-    for (let i = this.state.firstVisibleRowIndex-1; i >= 0; i--) {
-      if (this.props.rows[ i ].isRed()) {
-        prevRedIndex = i;
-        break;
-      }
-    }
-    if (this.scroller.current != null) {
-      this.scroller.current.scrollToRow(prevRedIndex);
-    }
-  }
-
-  onNextClick = () => {
-    let prevRedIndex = -1;
-    for (let i = this.state.firstVisibleRowIndex+1; i < this.props.rows.length; i++) {
-      if (this.props.rows[ i ].isRed()) {
-        prevRedIndex = i;
-        break;
-      }
-    }
-    if (this.scroller.current != null) {
-      this.scroller.current.scrollToRow(prevRedIndex);
-    }
-  }
-
-  render() {
-    const { 
-      className,
-      rows,
-      children: columns, 
-      navigation=false,
-      referenceLines = [],
-      additionalHeight = 0,
-      activeIndex,
-    } = this.props;
-    const { 
-      timewidth,
-      timestart,
-    } = this.state;
-
-    _additionalHeight = additionalHeight;
-
-    const sectionDuration = Math.round(timewidth / TIME_SECTIONS_COUNT);
-    const timeColumns = [];
-    if (timewidth > 0) {
-      for (let i = 0; i < TIME_SECTIONS_COUNT; i++) {
-        timeColumns.push(timestart + i * sectionDuration);
-      }
+    get tableHeight() {
+        return this.props.tableHeight || 195;
     }
 
-    const visibleRefLines = referenceLines.filter(({ time }) => time > timestart && time < timestart + timewidth);
+    get visibleCount() {
+        return Math.ceil(this.tableHeight / ROW_HEIGHT);
+    }
 
-    const columnsSumWidth = columns.reduce((sum, { width }) => sum + width, 0);
+    scroller = React.createRef();
+    autoScroll = true;
 
-    return (
-      <div className={ cn(className, "relative") }>
-        { navigation && 
-          <div className={ cn(autoscrollStl.navButtons, "flex items-center") } >
-            <IconButton 
+    componentDidMount() {
+        this.scroller.current.scrollToRow(this.props.activeIndex);
+    }
+
+    componentDidUpdate(prevProps: any, prevState: any) {
+        // if (prevProps.rows.length !== this.props.rows.length &&
+        //     this.autoScroll &&
+        //     this.scroller.current != null) {
+        //   this.scroller.current.scrollToRow(this.props.rows.length);
+        // }
+        if (
+            prevState.firstVisibleRowIndex !== this.state.firstVisibleRowIndex ||
+            (this.props.rows.length <= this.visibleCount + _additionalHeight && prevProps.rows.length !== this.props.rows.length)
+        ) {
+            this.setState({
+                ...computeTimeLine(this.props.rows, this.state.firstVisibleRowIndex, this.visibleCount),
+            });
+        }
+        if (this.props.activeIndex >= 0 && prevProps.activeIndex !== this.props.activeIndex) {
+            this.scroller.current.scrollToRow(this.props.activeIndex);
+        }
+    }
+
+    onScroll = ({ scrollTop, scrollHeight, clientHeight }: { scrollTop: number; scrollHeight: number; clientHeight: number }): void => {
+        const firstVisibleRowIndex = Math.floor(scrollTop / ROW_HEIGHT + 0.33);
+
+        if (this.state.firstVisibleRowIndex !== firstVisibleRowIndex) {
+            this.autoScroll = scrollHeight - clientHeight - scrollTop < ROW_HEIGHT / 2;
+            this.setState({ firstVisibleRowIndex });
+        }
+    };
+
+    renderRow = ({ index, key, style: rowStyle }: any) => {
+        const { activeIndex } = this.props;
+        const { children: columns, rows, renderPopup, hoverable, onRowClick } = this.props;
+        const { timestart, timewidth } = this.state;
+        const row = rows[index];
+        return (
+            <div
+                style={rowStyle}
+                key={key}
+                className={cn('border-b border-color-gray-light-shade', stl.row, {
+                    [stl.hoverable]: hoverable,
+                    'error color-red': !!row.isRed && row.isRed(),
+                    'cursor-pointer': typeof onRowClick === 'function',
+                    [stl.activeRow]: activeIndex === index,
+                })}
+                onClick={typeof onRowClick === 'function' ? () => onRowClick(row, index) : null}
+                id="table-row"
+            >
+                {columns.map(({ dataKey, render, width }) => (
+                    <div className={stl.cell} style={{ width: `${width}px` }}>
+                        {render ? render(row) : row[dataKey] || <i className="color-gray-light">{'empty'}</i>}
+                    </div>
+                ))}
+                <div className={cn('relative flex-1 flex', stl.timeBarWrapper)}>
+                    <BarRow resource={row} timestart={timestart} timewidth={timewidth} popup={renderPopup} />
+                </div>
+            </div>
+        );
+    };
+
+    onPrevClick = () => {
+        let prevRedIndex = -1;
+        for (let i = this.state.firstVisibleRowIndex - 1; i >= 0; i--) {
+            if (this.props.rows[i].isRed()) {
+                prevRedIndex = i;
+                break;
+            }
+        }
+        if (this.scroller.current != null) {
+            this.scroller.current.scrollToRow(prevRedIndex);
+        }
+    };
+
+    onNextClick = () => {
+        let prevRedIndex = -1;
+        for (let i = this.state.firstVisibleRowIndex + 1; i < this.props.rows.length; i++) {
+            if (this.props.rows[i].isRed()) {
+                prevRedIndex = i;
+                break;
+            }
+        }
+        if (this.scroller.current != null) {
+            this.scroller.current.scrollToRow(prevRedIndex);
+        }
+    };
+
+    render() {
+        const { className, rows, children: columns, navigation = false, referenceLines = [], additionalHeight = 0, activeIndex } = this.props;
+        const { timewidth, timestart } = this.state;
+
+        _additionalHeight = additionalHeight;
+
+        const sectionDuration = Math.round(timewidth / TIME_SECTIONS_COUNT);
+        const timeColumns = [];
+        if (timewidth > 0) {
+            for (let i = 0; i < TIME_SECTIONS_COUNT; i++) {
+                timeColumns.push(timestart + i * sectionDuration);
+            }
+        }
+
+        const visibleRefLines = referenceLines.filter(({ time }) => time > timestart && time < timestart + timewidth);
+
+        const columnsSumWidth = columns.reduce((sum, { width }) => sum + width, 0);
+
+        return (
+            <div className={cn(className, 'relative')}>
+                {navigation && (
+                    <div className={cn(autoscrollStl.navButtons, 'flex items-center')}>
+                        <Button variant="text-primary" icon="chevron-up" onClick={this.onPrevClick} />
+                        <Button variant="text-primary" icon="chevron-down" onClick={this.onNextClick} />
+                        {/* <IconButton 
               size="small" 
               icon="chevron-up" 
               onClick={this.onPrevClick}
-            />
-            <IconButton 
+            /> */}
+                        {/* <IconButton 
               size="small" 
               icon="chevron-down"
               onClick={this.onNextClick}
-            />
-          </div>
-        }
-        <div className={ stl.headers }>
-          <div className={ stl.infoHeaders }>
-            { columns.map(({ label, width }) => (
-              <div 
-                className={ stl.headerCell }
-                style={{ width: `${width}px` 
-              }}>
-                { label }
-              </div>
-            )) }
-          </div>
-          <div className={ stl.waterfallHeaders } >
-            { timeColumns.map((time, i) => (
-                <div 
-                  className={ stl.timeCell }
-                  key={ `tc-${ i }` }
-                >
-                  { formatTime(time) }
+            /> */}
+                    </div>
+                )}
+                <div className={stl.headers}>
+                    <div className={stl.infoHeaders}>
+                        {columns.map(({ label, width }) => (
+                            <div className={stl.headerCell} style={{ width: `${width}px` }}>
+                                {label}
+                            </div>
+                        ))}
+                    </div>
+                    <div className={stl.waterfallHeaders}>
+                        {timeColumns.map((time, i) => (
+                            <div className={stl.timeCell} key={`tc-${i}`}>
+                                {formatTime(time)}
+                            </div>
+                        ))}
+                    </div>
                 </div>
-              ))
-            }
-          </div>
-        </div>
 
-        <NoContent
-          size="small"
-          show={ rows.length === 0 }
-        >
-          <div className="relative">
-            <div className={ stl.timePart } style={{ left: `${ columnsSumWidth }px` }}>
-              { timeColumns.map((_, index) => (
-                  <div 
-                    key={ `tc-${ index }` } 
-                    className={ stl.timeCell } 
-                  />
-                ))
-              }
-              { visibleRefLines.map(({ time, color, onClick }) => (
-                <div 
-                  className={cn(stl.refLine, `bg-${color}`)} 
-                  style={{ 
-                    left: `${ percentOf(time - timestart, timewidth) }%`,
-                    cursor: typeof onClick === "function" ? "click" : "auto",
-                  }}
-                  onClick={ onClick }
-                />
-              ))}
+                <NoContent size="small" show={rows.length === 0}>
+                    <div className="relative">
+                        <div className={stl.timePart} style={{ left: `${columnsSumWidth}px` }}>
+                            {timeColumns.map((_, index) => (
+                                <div key={`tc-${index}`} className={stl.timeCell} />
+                            ))}
+                            {visibleRefLines.map(({ time, color, onClick }) => (
+                                <div
+                                    className={cn(stl.refLine, `bg-${color}`)}
+                                    style={{
+                                        left: `${percentOf(time - timestart, timewidth)}%`,
+                                        cursor: typeof onClick === 'function' ? 'click' : 'auto',
+                                    }}
+                                    onClick={onClick}
+                                />
+                            ))}
+                        </div>
+                        <AutoSizer disableHeight>
+                            {({ width }) => (
+                                <List
+                                    ref={this.scroller}
+                                    className={stl.list}
+                                    height={this.tableHeight + additionalHeight}
+                                    width={width}
+                                    overscanRowCount={20}
+                                    rowCount={rows.length}
+                                    rowHeight={ROW_HEIGHT}
+                                    rowRenderer={this.renderRow}
+                                    onScroll={this.onScroll}
+                                    scrollToAlignment="start"
+                                    forceUpdateProp={timestart | timewidth | activeIndex}
+                                />
+                            )}
+                        </AutoSizer>
+                    </div>
+                </NoContent>
             </div>
-            <AutoSizer disableHeight>
-              {({ width }) => (
-                <List
-                  ref={ this.scroller }
-                  className={ stl.list }
-                  height={this.tableHeight + additionalHeight}
-                  width={width}
-                  overscanRowCount={20}
-                  rowCount={rows.length}
-                  rowHeight={ROW_HEIGHT}
-                  rowRenderer={this.renderRow}
-                  onScroll={ this.onScroll }
-                  scrollToAlignment="start"
-                  forceUpdateProp={ timestart | timewidth | activeIndex }
-                />
-              )}
-            </AutoSizer>
-          </div>
-        </NoContent>
-      </div>
-    );
-  }
+        );
+    }
 }
-
diff --git a/frontend/app/components/Session_/autoscroll.module.css b/frontend/app/components/Session_/autoscroll.module.css
index 546f87049..42c5d980a 100644
--- a/frontend/app/components/Session_/autoscroll.module.css
+++ b/frontend/app/components/Session_/autoscroll.module.css
@@ -13,7 +13,7 @@
 .navButtons {
 	position: absolute;
 	right: 260px;
-	top: -34px;
+	top: -39px;
 }
 
 
diff --git a/frontend/app/components/ui/Button/Button.tsx b/frontend/app/components/ui/Button/Button.tsx
index 043491ed2..075d95b33 100644
--- a/frontend/app/components/ui/Button/Button.tsx
+++ b/frontend/app/components/ui/Button/Button.tsx
@@ -4,7 +4,7 @@ import { CircularLoader, Icon } from 'UI';
 
 interface Props {
     className?: string;
-    children: React.ReactNode;
+    children?: React.ReactNode;
     onClick?: () => void;
     disabled?: boolean;
     type?: 'button' | 'submit' | 'reset';

From 7b9a8a2a062d219b0f10a43d5fc0b3de6ccec0e8 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 15 Jul 2022 20:12:45 +0200
Subject: [PATCH 30/77] change(ui) - assist active sessions modal

---
 .../components/AssistTabs/AssistTabs.tsx      |  8 ++--
 .../components/SessionList/SessionList.tsx    | 46 ++++++++++++-------
 .../Session_/EventsBlock/event.module.css     |  1 +
 .../shared/SessionItem/PlayLink/PlayLink.tsx  |  6 ++-
 .../shared/SessionItem/SessionItem.tsx        |  3 ++
 5 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
index 9d965d821..93a73c236 100644
--- a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
+++ b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
@@ -1,3 +1,4 @@
+import { useModal } from 'App/components/Modal';
 import React, { useEffect, useState } from 'react';
 import { SlideModal, Avatar, TextEllipsis, Icon } from 'UI';
 import SessionList from '../SessionList';
@@ -10,6 +11,7 @@ interface Props {
 
 const AssistTabs = (props: Props) => {
   const [showMenu, setShowMenu] = useState(false)
+  const { showModal } = useModal();
 
   return (
     <div className="relative mr-4">
@@ -18,19 +20,19 @@ const AssistTabs = (props: Props) => {
           <>
             <div
               className={stl.btnLink}
-              onClick={() => setShowMenu(!showMenu)}
+              onClick={() => showModal(<SessionList userId={props.userId} />, {})}
             >
               Active Sessions
             </div>
           </>
         )}
       </div>
-      <SlideModal
+      {/* <SlideModal
         title={ <div>{props.userId}'s <span className="color-gray-medium">Live Sessions</span> </div> }
         isDisplayed={ showMenu }
         content={ showMenu && <SessionList /> }
         onClose={ () => setShowMenu(false) }
-      />
+      /> */}
     </div>
   );
 };
diff --git a/frontend/app/components/Assist/components/SessionList/SessionList.tsx b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
index 79aa4af28..25cbcb89d 100644
--- a/frontend/app/components/Assist/components/SessionList/SessionList.tsx
+++ b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
@@ -3,14 +3,17 @@ import { connect } from 'react-redux';
 import { fetchLiveList } from 'Duck/sessions';
 import { Loader, NoContent, Label } from 'UI';
 import SessionItem from 'Shared/SessionItem';
+import { useModal } from 'App/components/Modal';
 
 interface Props {
     loading: boolean;
     list: any;
     session: any;
+    userId: any;
     fetchLiveList: (params: any) => void;
 }
 function SessionList(props: Props) {
+    const { hideModal } = useModal();
     useEffect(() => {
         const params: any = {};
         if (props.session.userId) {
@@ -20,25 +23,34 @@ function SessionList(props: Props) {
     }, []);
 
     return (
-        <Loader loading={props.loading}>
-            <NoContent show={!props.loading && props.list.size === 0} title="No live sessions.">
+        <div style={{ width: '45vw' }}>
+            <div className="border-r shadow h-screen" style={{ backgroundColor: '#FAFAFA', zIndex: 999, width: '100%', minWidth: '800px' }}>
                 <div className="p-4">
-                    {props.list.map((session: any) => (
-                        <div className="mb-6">
-                            {session.pageTitle && session.pageTitle !== '' && (
-                                <div className="flex items-center mb-2">
-                                    <Label size="small" className="p-1">
-                                        <span className="color-gray-medium">TAB</span>
-                                    </Label>
-                                    <span className="ml-2 font-medium">{session.pageTitle}</span>
-                                </div>
-                            )}
-                            <SessionItem key={session.sessionId} session={session} showActive={session.active} />
-                        </div>
-                    ))}
+                    <div className="text-2xl">
+                        {props.userId}'s <span className="color-gray-medium">Live Sessions</span>{' '}
+                    </div>
                 </div>
-            </NoContent>
-        </Loader>
+                <Loader loading={props.loading}>
+                    <NoContent show={!props.loading && props.list.size === 0} title="No live sessions.">
+                        <div className="p-4">
+                            {props.list.map((session: any) => (
+                                <div className="mb-6">
+                                    {session.pageTitle && session.pageTitle !== '' && (
+                                        <div className="flex items-center mb-2">
+                                            <Label size="small" className="p-1">
+                                                <span className="color-gray-medium">TAB</span>
+                                            </Label>
+                                            <span className="ml-2 font-medium">{session.pageTitle}</span>
+                                        </div>
+                                    )}
+                                    <SessionItem onClick={() => hideModal()} key={session.sessionId} session={session} showActive={session.active} />
+                                </div>
+                            ))}
+                        </div>
+                    </NoContent>
+                </Loader>
+            </div>
+        </div>
     );
 }
 
diff --git a/frontend/app/components/Session_/EventsBlock/event.module.css b/frontend/app/components/Session_/EventsBlock/event.module.css
index 2a928e3ed..8afea78f2 100644
--- a/frontend/app/components/Session_/EventsBlock/event.module.css
+++ b/frontend/app/components/Session_/EventsBlock/event.module.css
@@ -71,6 +71,7 @@
     transition: all 0.2s;
     box-shadow: 0px 2px 10px 0 $gray-light;
     border: 1px solid $active-blue-border;
+    /* background-color: red; */
   }
 
   &.red {
diff --git a/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx b/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
index 2234a5242..54c7ed692 100644
--- a/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
+++ b/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
@@ -17,9 +17,10 @@ interface Props {
     isAssist: boolean;
     viewed: boolean;
     sessionId: string;
+    onClick?: () => void;
 }
 export default function PlayLink(props: Props) {
-    const { isAssist, viewed, sessionId } = props
+    const { isAssist, viewed, sessionId, onClick = null } = props
     const defaultIconName = getDefaultIconName(viewed)
 
     const [isHovered, toggleHover] = useState(false)
@@ -31,7 +32,8 @@ export default function PlayLink(props: Props) {
     }, [isHovered, viewed])
 
     return (
-        <Link 
+        <Link
+            onClick={onClick ? onClick : () => {}}
             to={ isAssist ? liveSessionRoute(sessionId) : sessionRoute(sessionId) }
             onMouseEnter={() => toggleHover(true)}
             onMouseLeave={() => toggleHover(false)}
diff --git a/frontend/app/components/shared/SessionItem/SessionItem.tsx b/frontend/app/components/shared/SessionItem/SessionItem.tsx
index b2acd2431..bb324d2e0 100644
--- a/frontend/app/components/shared/SessionItem/SessionItem.tsx
+++ b/frontend/app/components/shared/SessionItem/SessionItem.tsx
@@ -55,6 +55,7 @@ interface Props {
   showActive?: boolean;
   lastPlayedSessionId?: string;
   live?: boolean;
+  onClick?: any
 }
 
 function SessionItem(props: RouteComponentProps & Props) {
@@ -69,6 +70,7 @@ function SessionItem(props: RouteComponentProps & Props) {
     metaList = [],
     showActive = false,
     lastPlayedSessionId,
+    onClick = null,
   } = props;
 
   const {
@@ -179,6 +181,7 @@ function SessionItem(props: RouteComponentProps & Props) {
                 isAssist={isAssist}
                 sessionId={sessionId}
                 viewed={viewed}
+                onClick={onClick}
               />
             </div>
           </div>

From 9ee58c6bee406021eb4b871c06639f0c5e777bb9 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 18 Jul 2022 11:37:54 +0200
Subject: [PATCH 31/77] change(ui) - removed active button from the session
 listing item

---
 .../app/components/shared/SessionItem/SessionItem.tsx     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/frontend/app/components/shared/SessionItem/SessionItem.tsx b/frontend/app/components/shared/SessionItem/SessionItem.tsx
index bb324d2e0..aa5cd479d 100644
--- a/frontend/app/components/shared/SessionItem/SessionItem.tsx
+++ b/frontend/app/components/shared/SessionItem/SessionItem.tsx
@@ -52,7 +52,7 @@ interface Props {
   hasUserFilter?: boolean;
   disableUser?: boolean;
   metaList?: Array<any>;
-  showActive?: boolean;
+  // showActive?: boolean;
   lastPlayedSessionId?: string;
   live?: boolean;
   onClick?: any
@@ -68,7 +68,6 @@ function SessionItem(props: RouteComponentProps & Props) {
     hasUserFilter = false,
     disableUser = false,
     metaList = [],
-    showActive = false,
     lastPlayedSessionId,
     onClick = null,
   } = props;
@@ -162,11 +161,6 @@ function SessionItem(props: RouteComponentProps & Props) {
           </div>
 
           <div className="flex items-center">
-            { isAssist && showActive && (
-              <Label success className={cn("bg-green color-white text-right mr-4", { 'opacity-0' : !active})}>
-                <span className="color-white">ACTIVE</span>
-              </Label>
-            )}
             <div className={ stl.playLink } id="play-button" data-viewed={ viewed }>
               { isSessions && (
                 <div className="mr-4 flex-shrink-0 w-24">

From 400fcd435a887f02323e226e6f4838cc63f3b8e4 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 18 Jul 2022 11:38:27 +0200
Subject: [PATCH 32/77] change(ui) - reduced active session modal to 700px

---
 .../Assist/components/SessionList/SessionList.tsx           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/app/components/Assist/components/SessionList/SessionList.tsx b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
index 25cbcb89d..ed0af5625 100644
--- a/frontend/app/components/Assist/components/SessionList/SessionList.tsx
+++ b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
@@ -23,8 +23,8 @@ function SessionList(props: Props) {
     }, []);
 
     return (
-        <div style={{ width: '45vw' }}>
-            <div className="border-r shadow h-screen" style={{ backgroundColor: '#FAFAFA', zIndex: 999, width: '100%', minWidth: '800px' }}>
+        <div style={{ width: '50vw' }}>
+            <div className="border-r shadow h-screen" style={{ backgroundColor: '#FAFAFA', zIndex: 999, width: '100%', minWidth: '700px' }}>
                 <div className="p-4">
                     <div className="text-2xl">
                         {props.userId}'s <span className="color-gray-medium">Live Sessions</span>{' '}
@@ -43,7 +43,7 @@ function SessionList(props: Props) {
                                             <span className="ml-2 font-medium">{session.pageTitle}</span>
                                         </div>
                                     )}
-                                    <SessionItem onClick={() => hideModal()} key={session.sessionId} session={session} showActive={session.active} />
+                                    <SessionItem onClick={() => hideModal()} key={session.sessionId} session={session} />
                                 </div>
                             ))}
                         </div>

From 47df65fb5094e1808c4057dd102d5f9eb14389ab Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 18 Jul 2022 12:23:13 +0200
Subject: [PATCH 33/77] fix(ui) - date range - timepicker closing on time
 selection

---
 .../SelectDateRange/SelectDateRange.tsx       | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx b/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
index 107c87337..12b6ba016 100644
--- a/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
+++ b/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { DATE_RANGE_OPTIONS, CUSTOM_RANGE } from 'App/dateRange'
+import { DATE_RANGE_OPTIONS, CUSTOM_RANGE } from 'App/dateRange';
 import Select from 'Shared/Select';
 import Period, { LAST_7_DAYS } from 'Types/app/period';
 import { components } from 'react-select';
@@ -8,7 +8,7 @@ import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv';
 import cn from 'classnames';
 
 interface Props {
-    period: any,
+    period: any;
     onChange: (data: any) => void;
     disableCustom?: boolean;
     right?: boolean;
@@ -17,8 +17,8 @@ interface Props {
 function SelectDateRange(props: Props) {
     const [isCustom, setIsCustom] = React.useState(false);
     const { right = false, period, disableCustom = false, ...rest } = props;
-    let selectedValue = DATE_RANGE_OPTIONS.find((obj: any) => obj.value === period.rangeName)
-    const options = DATE_RANGE_OPTIONS.filter((obj: any) => disableCustom ? obj.value !== CUSTOM_RANGE : true);
+    let selectedValue = DATE_RANGE_OPTIONS.find((obj: any) => obj.value === period.rangeName);
+    const options = DATE_RANGE_OPTIONS.filter((obj: any) => (disableCustom ? obj.value !== CUSTOM_RANGE : true));
 
     const onChange = (value: any) => {
         if (value === CUSTOM_RANGE) {
@@ -26,12 +26,12 @@ function SelectDateRange(props: Props) {
         } else {
             props.onChange(new Period({ rangeName: value }));
         }
-    }
+    };
 
     const onApplyDateRange = (value: any) => {
         props.onChange(new Period({ rangeName: CUSTOM_RANGE, start: value.start, end: value.end }));
         setIsCustom(false);
-    }
+    };
 
     return (
         <div className="relative">
@@ -40,39 +40,42 @@ function SelectDateRange(props: Props) {
                 value={selectedValue}
                 options={options}
                 onChange={({ value }: any) => onChange(value.value)}
-                components={{ SingleValue: ({ children, ...props} : any) => {
-                    return (
-                        <components.SingleValue {...props}>
-                            {period.rangeName === CUSTOM_RANGE ? period.rangeFormatted() : children}
-                        </components.SingleValue>
-                    )
-                } }}
+                components={{
+                    SingleValue: ({ children, ...props }: any) => {
+                        return (
+                            <components.SingleValue {...props}>
+                                {period.rangeName === CUSTOM_RANGE ? period.rangeFormatted() : children}
+                            </components.SingleValue>
+                        );
+                    },
+                }}
                 period={period}
                 right={true}
                 style={{ width: '100%' }}
             />
-            {
-            isCustom &&
-            <OutsideClickDetectingDiv 
-                onClickOutside={() => setIsCustom(false)}
-            >
-                <div className={ cn("absolute top-0 mt-10 z-40", { 'right-0' : right })} style={{ 
-                    width: '770px',
-                    // margin: 'auto 50vh 0',
-                    // transform: 'translateX(-50%)'
-                }}>
-                    <DateRangePopup
-                        onApply={ onApplyDateRange }
-                        onCancel={ () => setIsCustom(false) }
-                        selectedDateRange={ period.range }
-                    />
-                </div>
-            </OutsideClickDetectingDiv>
-            }
+            {isCustom && (
+                <OutsideClickDetectingDiv
+                    onClickOutside={(e: any) => {
+                        if (e.target.parentElement.parentElement.classList.contains('rc-time-picker-panel-select')) {
+                            return false;
+                        }
+                        setIsCustom(false);
+                    }}
+                >
+                    <div
+                        className={cn('absolute top-0 mt-10 z-40', { 'right-0': right })}
+                        style={{
+                            width: '770px',
+                            // margin: 'auto 50vh 0',
+                            // transform: 'translateX(-50%)'
+                        }}
+                    >
+                        <DateRangePopup onApply={onApplyDateRange} onCancel={() => setIsCustom(false)} selectedDateRange={period.range} />
+                    </div>
+                </OutsideClickDetectingDiv>
+            )}
         </div>
     );
 }
 
 export default SelectDateRange;
-
-  
\ No newline at end of file

From 8f246313a82beab8e8b871b3ed3adbaa22209b43 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 18 Jul 2022 18:05:02 +0200
Subject: [PATCH 34/77] fix(ui) - console errors with popup

---
 .../app/components/ui/ItemMenu/ItemMenu.js    | 139 ++++++++----------
 frontend/app/components/ui/Popup/Popup.tsx    |  89 ++++++-----
 2 files changed, 116 insertions(+), 112 deletions(-)

diff --git a/frontend/app/components/ui/ItemMenu/ItemMenu.js b/frontend/app/components/ui/ItemMenu/ItemMenu.js
index 18dc414d4..442bcac50 100644
--- a/frontend/app/components/ui/ItemMenu/ItemMenu.js
+++ b/frontend/app/components/ui/ItemMenu/ItemMenu.js
@@ -1,90 +1,81 @@
 import React from 'react';
-import { Icon, Popup } from 'UI';
+import { Icon } from 'UI';
 import styles from './itemMenu.module.css';
 import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv';
 import cn from 'classnames';
 
 export default class ItemMenu extends React.PureComponent {
-  state = {
-    displayed: false,
-  };
+    state = {
+        displayed: false,
+    };
 
-  handleEsc = (e) => e.key === 'Escape' && this.closeMenu()
+    handleEsc = (e) => e.key === 'Escape' && this.closeMenu();
 
-  componentDidMount() {
-    document.addEventListener("keydown", this.handleEsc, false);
-  }
-  componentWillUnmount() {
-    document.removeEventListener("keydown", this.handleEsc, false);
-  }
+    componentDidMount() {
+        document.addEventListener('keydown', this.handleEsc, false);
+    }
+    componentWillUnmount() {
+        document.removeEventListener('keydown', this.handleEsc, false);
+    }
 
-  onClick = callback => (e) => {
-    e.stopPropagation();
-    callback(e);
-  }
+    onClick = (callback) => (e) => {
+        e.stopPropagation();
+        callback(e);
+    };
 
-  toggleMenu = (e) => {
-    this.setState({ displayed: !this.state.displayed });
-  }
+    toggleMenu = (e) => {
+        this.setState({ displayed: !this.state.displayed });
+    };
 
-  closeMenu = () => this.setState({ displayed: false })
+    closeMenu = () => this.setState({ displayed: false });
 
-  render() {
-    const { items, label = "", bold } = this.props;
-    const { displayed } = this.state;
-    const parentStyles = label ? 'rounded px-2 py-2 hover:bg-gray-light' : '';
+    render() {
+        const { items, label = '', bold } = this.props;
+        const { displayed } = this.state;
+        const parentStyles = label ? 'rounded px-2 py-2 hover:bg-gray-light' : '';
 
-    return (
-      <div className={ styles.wrapper }>
-        <OutsideClickDetectingDiv
-          onClickOutside={ this.closeMenu }
-        >
-          <div
-            onClick={ this.toggleMenu }
-            className={cn("flex items-center cursor-pointer select-none", parentStyles, { 'bg-gray-light' : displayed && label })}
-          >
-            {label && <span className={cn('mr-1', bold ? 'font-medium color-gray-darkest' : 'color-gray-medium')}>{label}</span>}
-            <div
-              ref={ (ref) => { this.menuBtnRef = ref; } }
-              className={cn("rounded-full flex items-center justify-center", { 'bg-gray-light' : displayed, "w-10 h-10" : !label })}
-              role="button"
-            >
-              <Icon name="ellipsis-v" size="16" />
-            </div>
-          </div>
-        </OutsideClickDetectingDiv>
-        <div
-          className={ cn(styles.menu, { [styles.menuDim]: !bold }) }
-          data-displayed={ displayed }
-        >
-          { items.filter(({ hidden }) => !hidden).map(({ onClick, text, icon, disabled = false, disabledMessage = '' }) => (
-            <div
-              key={ text }
-              onClick={ !disabled ? this.onClick(onClick) : () => {} }
-              className={disabled ? 'cursor-not-allowed' : ''}
-              role="menuitem"
-              tabIndex="-1"
-            >
-              <Popup
-                  delay={500}
-                  arrow
-                  title={ disabledMessage }
-                  position="left"
-                  disabled={ !disabled }
-              >
-                  <div className={cn(styles.menuItem, 'text-neutral-700', {'disabled' : disabled })}>
-                    { icon && (
-                        <div className={ styles.iconWrapper }>
-                          <Icon name={ icon } size="13" color="gray-dark" />
+        return (
+            <div className={styles.wrapper}>
+                <OutsideClickDetectingDiv onClickOutside={this.closeMenu}>
+                    <div
+                        onClick={this.toggleMenu}
+                        className={cn('flex items-center cursor-pointer select-none', parentStyles, { 'bg-gray-light': displayed && label })}
+                    >
+                        {label && <span className={cn('mr-1', bold ? 'font-medium color-gray-darkest' : 'color-gray-medium')}>{label}</span>}
+                        <div
+                            ref={(ref) => {
+                                this.menuBtnRef = ref;
+                            }}
+                            className={cn('rounded-full flex items-center justify-center', { 'bg-gray-light': displayed, 'w-10 h-10': !label })}
+                            role="button"
+                        >
+                            <Icon name="ellipsis-v" size="16" />
                         </div>
-                      )}
-                      <div>{ text }</div>
-                  </div>
-              </Popup>
+                    </div>
+                </OutsideClickDetectingDiv>
+                <div className={cn(styles.menu, { [styles.menuDim]: !bold })} data-displayed={displayed}>
+                    {items
+                        .filter(({ hidden }) => !hidden)
+                        .map(({ onClick, text, icon, disabled = false, disabledMessage = '' }) => (
+                            <div
+                                key={text}
+                                onClick={!disabled ? this.onClick(onClick) : () => {}}
+                                className={disabled ? 'cursor-not-allowed' : ''}
+                                role="menuitem"
+                                tabIndex="-1"
+                            >
+                                <div className={cn(styles.menuItem, 'text-neutral-700', { disabled: disabled })}>
+                                    {icon && (
+                                        <div className={styles.iconWrapper}>
+                                            <Icon name={icon} size="13" color="gray-dark" />
+                                        </div>
+                                    )}
+                                    <div>{text}</div>
+                                </div>
+                            </div>
+                        ))}
+                </div>
             </div>
-          ))}
-        </div>
-      </div>
-    );
-  }
+        );
+    }
 }
diff --git a/frontend/app/components/ui/Popup/Popup.tsx b/frontend/app/components/ui/Popup/Popup.tsx
index d44976b28..fba21fd4e 100644
--- a/frontend/app/components/ui/Popup/Popup.tsx
+++ b/frontend/app/components/ui/Popup/Popup.tsx
@@ -1,44 +1,57 @@
 import React from 'react';
-import { Tooltip } from 'react-tippy';
+import { Tooltip, Theme, Trigger, Position } from 'react-tippy';
 
 interface Props {
-  content?: any;
-  title?: any;
-  trigger?: any
-  position?: any
-  className?: string
-  delay?: number
-  disabled?: boolean
-  arrow?: boolean
-  open?: boolean
-  style?: any
-  [x:string]: any;
+    content?: any;
+    title?: any;
+    trigger?: Trigger;
+    position?: Position;
+    className?: string;
+    delay?: number;
+    hideDelay?: number;
+    duration?: number;
+    disabled?: boolean;
+    arrow?: boolean;
+    open?: boolean;
+    style?: any;
+    theme?: Theme;
+    interactive?: boolean;
+    children?: any;
+    // [x:string]: any;
 }
 export default ({
-  position = 'top',
-  title='',
-  className='',
-  trigger = 'mouseenter',
-  delay = 1000,
-  disabled = false,
-  arrow = true,
-  theme = 'dark',
-  style = {},
-  ...props
-}: Props) => (
-  <Tooltip
-    // {...props}
-    className={className}
-    trigger={trigger}
-    html={props.content || props.title}
-    disabled={disabled}
-    arrow={arrow}
-    delay={delay}
-    hideOnClick={true}
-    hideOnScroll={true}
-    theme={theme}
-    style={style}
-  >
-    { props.children }
-  </Tooltip>
+    position = 'top',
+    title = '',
+    className = '',
+    trigger = 'mouseenter',
+    delay = 1000,
+    hideDelay = 0,
+    content = '',
+    duration = 0,
+    disabled = false,
+    arrow = true,
+    theme = 'dark',
+    style = {},
+    interactive = false,
+    children,
+}: // ...props
+Props) => (
+    <Tooltip
+        position={position}
+        className={className}
+        trigger={trigger}
+        html={content || title}
+        disabled={disabled}
+        arrow={arrow}
+        delay={delay}
+        hideOnClick={true}
+        hideOnScroll={true}
+        theme={theme}
+        style={style}
+        interactive={interactive}
+        duration={0}
+        hideDelay={hideDelay}
+    >
+        {children}
+    </Tooltip>
 );

From c3e79028950b0d8cab7291d193ae7f2ca0fbfe6e Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 18 Jul 2022 18:07:01 +0200
Subject: [PATCH 35/77] fix(ui) - attribute class name

---
 frontend/app/components/ui/CircularLoader/CircularLoader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/components/ui/CircularLoader/CircularLoader.js b/frontend/app/components/ui/CircularLoader/CircularLoader.js
index 74fa004f4..4c9fb69f5 100644
--- a/frontend/app/components/ui/CircularLoader/CircularLoader.js
+++ b/frontend/app/components/ui/CircularLoader/CircularLoader.js
@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 
 export default ({ children = null, loading = true, size = 'tiny', ...props }) => (!loading ? children :
-  <svg role="status" class={cn("mr-2 color-gray-light animate-spin fill-teal", { 'w-6 h-6 ' : size === "tiny", 'w-8 h-8' : size === 'large'  })} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg role="status" className={cn("mr-2 color-gray-light animate-spin fill-teal", { 'w-6 h-6 ' : size === "tiny", 'w-8 h-8' : size === 'large'  })} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
     <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
   </svg>

From 8989e460f033f07b83603e7c308ff1da94b16a49 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 19 Jul 2022 13:43:51 +0200
Subject: [PATCH 36/77] fix(ui) - siteform loader, trash btn project exists
 check, IconButton replace

---
 .../Sites/AddProjectButton/AddUserButton.tsx      | 15 +++++++--------
 .../app/components/Client/Sites/NewSiteForm.js    | 10 ++++++----
 frontend/app/components/ui/Button/Button.tsx      |  9 ++++++++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx b/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
index 078122bb2..7371056fd 100644
--- a/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
+++ b/frontend/app/components/Client/Sites/AddProjectButton/AddUserButton.tsx
@@ -1,29 +1,28 @@
 import React from 'react';
-import { Popup, IconButton } from 'UI';
+import { Popup, Button, IconButton } from 'UI';
 import { useStore } from 'App/mstore';
 import { useObserver } from 'mobx-react-lite';
 
 const PERMISSION_WARNING = 'You don’t have the permissions to perform this action.';
 const LIMIT_WARNING = 'You have reached site limit.';
 
-function AddProjectButton({ isAdmin = false, onClick }: any ) {
+function AddProjectButton({ isAdmin = false, onClick }: any) {
     const { userStore } = useStore();
     const limtis = useObserver(() => userStore.limits);
     const canAddProject = useObserver(() => isAdmin && (limtis.projects === -1 || limtis.projects > 0));
     return (
-        <Popup
-            content={ `${ !isAdmin ? PERMISSION_WARNING : (!canAddProject ? LIMIT_WARNING : 'Add a Project') }` }
-        >
-            <IconButton
+        <Popup content={`${!isAdmin ? PERMISSION_WARNING : !canAddProject ? LIMIT_WARNING : 'Add a Project'}`}>
+            <Button rounded={true} variant="outline" icon="plus" onClick={onClick} disabled={!canAddProject || !isAdmin}></Button>
+            {/* <IconButton
                 id="add-button"
                 disabled={ !canAddProject || !isAdmin }
                 circle
                 icon="plus"
                 outline
                 onClick={ onClick }
-            />
+            /> */}
         </Popup>
     );
 }
 
-export default AddProjectButton;
\ No newline at end of file
+export default AddProjectButton;
diff --git a/frontend/app/components/Client/Sites/NewSiteForm.js b/frontend/app/components/Client/Sites/NewSiteForm.js
index 57713d981..c6633b73b 100644
--- a/frontend/app/components/Client/Sites/NewSiteForm.js
+++ b/frontend/app/components/Client/Sites/NewSiteForm.js
@@ -12,7 +12,7 @@ import { confirm } from 'UI';
 	site: state.getIn([ 'site', 'instance' ]),
 	sites: state.getIn([ 'site', 'list' ]),
 	siteList: state.getIn([ 'site', 'list' ]),
-	loading: state.getIn([ 'site', 'save', 'loading' ]),
+	loading: state.getIn([ 'site', 'save', 'loading' ]) || state.getIn([ 'site', 'remove', 'loading' ]),
 }), {
 	save,
 	remove,
@@ -103,9 +103,11 @@ export default class NewSiteForm extends React.PureComponent {
 						>
 							{site.exists() ? 'Update' : 'Add'}
 						</Button>
-						<Button variant="text" type="button" plain onClick={() => this.remove(site)}>
-							<Icon name="trash" size="16" />
-						</Button>
+						{site.exists() && (
+							<Button variant="text" type="button" onClick={() => this.remove(site)}>
+								<Icon name="trash" size="16" />
+							</Button>
+						)}
 					</div>
 					{ this.state.existsError &&
 						<div className={ styles.errorMessage }>
diff --git a/frontend/app/components/ui/Button/Button.tsx b/frontend/app/components/ui/Button/Button.tsx
index 075d95b33..bc71be3a0 100644
--- a/frontend/app/components/ui/Button/Button.tsx
+++ b/frontend/app/components/ui/Button/Button.tsx
@@ -10,6 +10,7 @@ interface Props {
     type?: 'button' | 'submit' | 'reset';
     loading?: boolean;
     icon?: string;
+    rounded?: boolean;
     [x: string]: any;
 }
 export default (props: Props) => {
@@ -22,10 +23,12 @@ export default (props: Props) => {
         disabled = false,
         children,
         loading = false,
+        rounded = false,
         ...rest
     } = props;
 
-    const classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
+    let classes = ['relative flex items-center h-10 px-3 rounded tracking-wide whitespace-nowrap'];
+
     if (variant === 'default') {
         classes.push('bg-white hover:bg-gray-lightest border border-gray-light');
     }
@@ -62,6 +65,10 @@ export default (props: Props) => {
         iconColor = 'red';
     }
 
+    if (rounded) {
+        classes = classes.map((c) => c.replace('rounded', 'rounded-full h-10 w-10 justify-center'));
+    }
+
     return (
         <button {...rest} type={type} className={cn(classes, className)}>
             {icon && <Icon className={cn({ 'mr-2': children })} name={icon} color={iconColor} size="16" />}

From 78d7df72a58210d9abe949ec567d471fd360d797 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 19 Jul 2022 14:43:43 +0200
Subject: [PATCH 37/77] Session list - redesign (#621)

* change(ui) - removed env

* change(ui) - no content component updates

* feat(ui) - session list - wip

* feat(ui) - session list - wip

* feat(ui) - session list - wip

* feat(ui) - session list - wip

* fix(ui) - live session list key

* feat(ui) - session list - wip

* feat(ui) - session list - wip

* feat(backend): set default size of first part of session mob file to 1mb

* feat(backend): added extra information for db metrics

* fix(ui) - siteform loader, trash btn project exists check, IconButton replace

Co-authored-by: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
---
 frontend/app/Router.js                        |   2 +-
 frontend/app/components/Overview/Overview.tsx |  28 +++++
 frontend/app/components/Overview/index.ts     |   1 +
 .../LiveSessionList/LiveSessionList.tsx       |   2 +-
 .../SessionListContainer.tsx                  |  17 +++
 .../components/NoContentMessage.tsx           |  20 ++++
 .../SessionHeader/SessionHeader.tsx           |  48 ++++++++
 .../components/SessionHeader/index.ts         |   1 +
 .../components/SessionList/SessionList.tsx    | 103 ++++++++++++++++++
 .../components/SessionList/index.ts           |   1 +
 .../components/SessionSort/SessionSort.tsx    |  42 +++++++
 .../components/SessionSort/index.ts           |   1 +
 .../SessionSort/sortDropdown.module.css       |  23 ++++
 .../components/SessionTags/SessionTags.tsx    |  66 +++++++++++
 .../components/SessionTags/index.ts           |   1 +
 .../shared/SessionListContainer/index.ts      |   0
 .../app/components/ui/NoContent/NoContent.js  |  30 -----
 .../app/components/ui/NoContent/NoContent.tsx |  29 +++++
 .../ui/NoContent/{index.js => index.ts}       |   0
 .../ui/NoContent/noContent.module.css         |  12 --
 frontend/app/duck/search.js                   |   4 +-
 frontend/app/styles/global.scss               |   4 +
 frontend/app/types/session/issue.js           |  21 ++--
 frontend/env.js                               |  29 -----
 24 files changed, 401 insertions(+), 84 deletions(-)
 create mode 100644 frontend/app/components/Overview/Overview.tsx
 create mode 100644 frontend/app/components/Overview/index.ts
 create mode 100644 frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/NoContentMessage.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionHeader/index.ts
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionList/SessionList.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionList/index.ts
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionSort/index.ts
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionSort/sortDropdown.module.css
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
 create mode 100644 frontend/app/components/shared/SessionListContainer/components/SessionTags/index.ts
 create mode 100644 frontend/app/components/shared/SessionListContainer/index.ts
 delete mode 100644 frontend/app/components/ui/NoContent/NoContent.js
 create mode 100644 frontend/app/components/ui/NoContent/NoContent.tsx
 rename frontend/app/components/ui/NoContent/{index.js => index.ts} (100%)
 delete mode 100644 frontend/env.js

diff --git a/frontend/app/Router.js b/frontend/app/Router.js
index f5dc4c593..acbdd9cbb 100644
--- a/frontend/app/Router.js
+++ b/frontend/app/Router.js
@@ -31,7 +31,7 @@ const LiveSessionPure = lazy(() => import('Components/Session/LiveSession'));
 const OnboardingPure = lazy(() => import('Components/Onboarding/Onboarding'));
 const ClientPure = lazy(() => import('Components/Client/Client'));
 const AssistPure = lazy(() => import('Components/Assist'));
-const BugFinderPure = lazy(() => import('Components/BugFinder/BugFinder'));
+const BugFinderPure = lazy(() => import('Components/Overview'));
 const DashboardPure = lazy(() => import('Components/Dashboard/NewDashboard'));
 const ErrorsPure = lazy(() => import('Components/Errors/Errors'));
 const FunnelDetailsPure = lazy(() => import('Components/Funnels/FunnelDetails'));
diff --git a/frontend/app/components/Overview/Overview.tsx b/frontend/app/components/Overview/Overview.tsx
new file mode 100644
index 000000000..78b4bfe2b
--- /dev/null
+++ b/frontend/app/components/Overview/Overview.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import withPageTitle from 'HOCs/withPageTitle';
+import NoSessionsMessage from 'Shared/NoSessionsMessage';
+import MainSearchBar from 'Shared/MainSearchBar';
+import SessionSearch from 'Shared/SessionSearch';
+import SessionListContainer from 'Shared/SessionListContainer/SessionListContainer';
+
+function Overview() {
+    return (
+        <div className="page-margin container-90 flex relative">
+            <div className="flex-1 flex">
+                <div className={'w-full mx-auto'} style={{ maxWidth: '1300px' }}>
+                    <NoSessionsMessage />
+
+                    <div className="mb-5">
+                        <MainSearchBar />
+                        <SessionSearch />
+
+                        <div className="my-4" />
+                        <SessionListContainer />
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+export default withPageTitle('Sessions - OpenReplay')(Overview);
diff --git a/frontend/app/components/Overview/index.ts b/frontend/app/components/Overview/index.ts
new file mode 100644
index 000000000..44bcc2216
--- /dev/null
+++ b/frontend/app/components/Overview/index.ts
@@ -0,0 +1 @@
+export { default } from './Overview';
\ No newline at end of file
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index f4bb1f45d..fae2e40cf 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { Fragment, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { NoContent, Loader, Pagination } from 'UI';
 import { List } from 'immutable';
diff --git a/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx b/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
new file mode 100644
index 000000000..156f845c4
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/SessionListContainer.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import SessionList from './components/SessionList';
+import SessionHeader from './components/SessionHeader';
+
+interface Props {}
+function SessionListContainer(props: Props) {
+    return (
+        <div className="widget-wrapper">
+            <SessionHeader />
+            <div className="p-4">
+                <SessionList />
+            </div>
+        </div>
+    );
+}
+
+export default SessionListContainer;
diff --git a/frontend/app/components/shared/SessionListContainer/components/NoContentMessage.tsx b/frontend/app/components/shared/SessionListContainer/components/NoContentMessage.tsx
new file mode 100644
index 000000000..c80ec6555
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/NoContentMessage.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+function NoContentMessage({ activeTab }: any) {
+    return <div>{getNoContentMessage(activeTab)}</div>;
+}
+
+export default connect((state: any) => ({
+    activeTab: state.getIn(['search', 'activeTab']),
+}))(NoContentMessage);
+
+function getNoContentMessage(activeTab: any) {
+    let str = 'No recordings found';
+    if (activeTab.type !== 'all') {
+        str += ' with ' + activeTab.name;
+        return str;
+    }
+
+    return str + '!';
+}
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
new file mode 100644
index 000000000..5c5107310
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { numberWithCommas } from 'App/utils';
+import { applyFilter } from 'Duck/search';
+import Period from 'Types/app/period';
+import SelectDateRange from 'Shared/SelectDateRange';
+import SessionTags from '../SessionTags';
+import { connect } from 'react-redux';
+import SessionSort from '../SessionSort';
+
+interface Props {
+    listCount: number;
+    filter: any;
+    applyFilter: (filter: any) => void;
+}
+function SessionHeader(props: Props) {
+    const { listCount, filter: { startDate, endDate, rangeValue } } = props;
+    const period = Period({ start: startDate, end: endDate, rangeName: rangeValue });
+
+    const onDateChange = (e: any) => {
+        const dateValues = e.toJSON();
+        props.applyFilter(dateValues);
+    };
+
+    return (
+        <div className="flex items-center p-4 justify-between">
+            <div className="flex items-center">
+                <div className="mr-3 text-lg">
+                    <span className="font-bold">Sessions</span> <span className="color-gray-medium ml-2">{listCount}</span>
+                </div>
+                <SessionTags />
+            </div>
+
+            <div className="flex items-center">
+                <SelectDateRange period={period} onChange={onDateChange} />
+                <div className="mx-2" />
+                <SessionSort />
+            </div>
+        </div>
+    );
+}
+
+export default connect(
+    (state: any) => ({
+        filter: state.getIn(['search', 'instance']),
+        listCount: numberWithCommas(state.getIn(['sessions', 'total'])),
+    }),
+    { applyFilter }
+)(SessionHeader);
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/index.ts b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/index.ts
new file mode 100644
index 000000000..ad3beb4fd
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/index.ts
@@ -0,0 +1 @@
+export { default } from './SessionHeader';
\ No newline at end of file
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionList/SessionList.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionList/SessionList.tsx
new file mode 100644
index 000000000..60d1aec6c
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionList/SessionList.tsx
@@ -0,0 +1,103 @@
+import React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { FilterKey } from 'Types/filter/filterType';
+import SessionItem from 'Shared/SessionItem';
+import { NoContent, Loader, Pagination } from 'UI';
+import AnimatedSVG, { ICONS } from 'Shared/AnimatedSVG/AnimatedSVG';
+import NoContentMessage from '../NoContentMessage';
+import { fetchSessions, addFilterByKeyAndValue, updateCurrentPage, setScrollPosition } from 'Duck/search';
+
+interface Props {
+    loading: boolean;
+    list: any;
+    currentPage: number;
+    total: number;
+    filters: any;
+    lastPlayedSessionId: string;
+    metaList: any;
+    scrollY: number;
+    addFilterByKeyAndValue: (key: string, value: any, operator?: string) => void;
+    updateCurrentPage: (page: number) => void;
+    setScrollPosition: (scrollPosition: number) => void;
+    fetchSessions: () => void;
+}
+function SessionList(props: Props) {
+    const { loading, list, currentPage, total, filters, lastPlayedSessionId, metaList } = props;
+    const _filterKeys = filters.map((i: any) => i.key);
+    const hasUserFilter = _filterKeys.includes(FilterKey.USERID) || _filterKeys.includes(FilterKey.USERANONYMOUSID);
+
+    useEffect(() => {
+        const { scrollY } = props;
+        window.scrollTo(0, scrollY);
+        if (total === 0) {
+            props.fetchSessions()
+        }
+
+        return () => {
+            props.setScrollPosition(window.scrollY);
+        };
+    }, []);
+
+    const onUserClick = (userId: any) => {
+        if (userId) {
+            props.addFilterByKeyAndValue(FilterKey.USERID, userId);
+        } else {
+            props.addFilterByKeyAndValue(FilterKey.USERID, '', 'isUndefined');
+        }
+    };
+
+    return (
+        <Loader loading={loading}>
+            <NoContent
+                title={
+                    <div className="flex items-center justify-center flex-col">
+                        <AnimatedSVG name={ICONS.NO_RESULTS} size={170} />
+                        <div className="mt-2" />
+                        <NoContentMessage />
+                    </div>
+                }
+                subtext={<div>Please try changing your search parameters.</div>}
+                show={!loading && list.size === 0}
+            >
+                {list.map((session: any) => (
+                    <React.Fragment key={session.sessionId}>
+                        <SessionItem
+                            session={session}
+                            hasUserFilter={hasUserFilter}
+                            onUserClick={onUserClick}
+                            metaList={metaList}
+                            lastPlayedSessionId={lastPlayedSessionId}
+                        />
+                        <div className="border-b" />
+                    </React.Fragment>
+                ))}
+            </NoContent>
+
+            {total > 0 && (
+                <div className="w-full flex items-center justify-center py-6">
+                    <Pagination
+                        page={currentPage}
+                        totalPages={Math.ceil(total / 10)}
+                        onPageChange={(page) => props.updateCurrentPage(page)}
+                        limit={10}
+                        debounceRequest={1000}
+                    />
+                </div>
+            )}
+        </Loader>
+    );
+}
+
+export default connect(
+    (state: any) => ({
+        list: state.getIn(['sessions', 'list']),
+        filters: state.getIn(['search', 'instance', 'filters']),
+        lastPlayedSessionId: state.getIn(['sessions', 'lastPlayedSessionId']),
+        metaList: state.getIn(['customFields', 'list']).map((i: any) => i.key),
+        loading: state.getIn(['sessions', 'loading']),
+        currentPage: state.getIn(['search', 'currentPage']) || 1,
+        total: state.getIn(['sessions', 'total']) || 0,
+        scrollY: state.getIn(['search', 'scrollY']),
+    }),
+    { updateCurrentPage, addFilterByKeyAndValue, setScrollPosition, fetchSessions }
+)(SessionList);
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionList/index.ts b/frontend/app/components/shared/SessionListContainer/components/SessionList/index.ts
new file mode 100644
index 000000000..779c9df2a
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionList/index.ts
@@ -0,0 +1 @@
+export { default } from './SessionList';
\ No newline at end of file
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
new file mode 100644
index 000000000..01e770310
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import Select from 'Shared/Select';
+import { sort } from 'Duck/sessions';
+import { applyFilter } from 'Duck/search';
+
+const sortOptionsMap = {
+    'startTs-desc': 'Newest',
+    'startTs-asc': 'Oldest',
+    'eventsCount-asc': 'Events Ascending',
+    'eventsCount-desc': 'Events Descending',
+};
+
+const sortOptions = Object.entries(sortOptionsMap).map(([value, label]) => ({ value, label }));
+
+interface Props {
+    filter: any;
+    options: any;
+    applyFilter: (filter: any) => void;
+    sort: (sort: string, sign: number) => void;
+}
+
+function SessionSort(props: Props) {
+    const { sort, order } = props.filter;
+    const onSort = ({ value }: any) => {
+        value = value.value;
+        const [sort, order] = value.split('-');
+        const sign = order === 'desc' ? -1 : 1;
+        props.applyFilter({ order, sort });
+        props.sort(sort, sign);
+    };
+
+    const defaultOption = `${sort}-${order}`;
+    return <Select name="sortSessions" plain right options={sortOptions} onChange={onSort} defaultValue={defaultOption} />;
+}
+
+export default connect(
+    (state: any) => ({
+        filter: state.getIn(['search', 'instance']),
+    }),
+    { sort, applyFilter }
+)(SessionSort);
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionSort/index.ts b/frontend/app/components/shared/SessionListContainer/components/SessionSort/index.ts
new file mode 100644
index 000000000..b0c0489be
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionSort/index.ts
@@ -0,0 +1 @@
+export { default } from './SessionSort';
\ No newline at end of file
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionSort/sortDropdown.module.css b/frontend/app/components/shared/SessionListContainer/components/SessionSort/sortDropdown.module.css
new file mode 100644
index 000000000..87e26bc68
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionSort/sortDropdown.module.css
@@ -0,0 +1,23 @@
+.dropdown {
+  display: flex !important;
+  padding: 4px 6px;
+  border-radius: 3px;
+  color: $gray-darkest;
+  font-weight: 500;
+  &:hover {
+    background-color: $gray-light;
+  }
+}
+
+.dropdownTrigger {
+  padding: 4px 8px;
+  border-radius: 3px;
+  &:hover {
+    background-color: $gray-light;
+  }
+}
+
+.dropdownIcon {
+  margin-top: 2px;
+  margin-left: 3px;
+}
\ No newline at end of file
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
new file mode 100644
index 000000000..67c1e5e83
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { setActiveTab } from 'Duck/search';
+import { connect } from 'react-redux';
+import { issues_types } from 'Types/session/issue';
+import { Icon } from 'UI';
+import cn from 'classnames';
+
+interface Props {
+    setActiveTab: typeof setActiveTab;
+    activeTab: any;
+    tags: any;
+    total: number;
+}
+function SessionTags(props: Props) {
+    const { activeTab, tags, total } = props;
+    const disable = activeTab.type === 'all' && total === 0;
+
+    return (
+        <div className="flex items-center">
+            {tags &&
+                tags.map((tag: any, index: any) => (
+                    <div key={index}>
+                        <TagItem
+                            onClick={() => props.setActiveTab(tag)}
+                            label={tag.name}
+                            isActive={activeTab.type === tag.type}
+                            icon={tag.icon}
+                            disabled={disable && tag.type !== 'all'}
+                        />
+                    </div>
+                ))}
+        </div>
+    );
+}
+
+export default connect(
+    (state: any) => {
+        const isEnterprise = state.getIn(['user', 'account', 'edition']) === 'ee';
+        return {
+            activeTab: state.getIn(['search', 'activeTab']),
+            tags: issues_types.filter((tag: any) => (isEnterprise ? tag.type !== 'bookmark' : tag.type !== 'vault')),
+            total: state.getIn(['sessions', 'total']) || 0,
+        };
+    },
+    {
+        setActiveTab,
+    }
+)(SessionTags);
+
+function TagItem({ isActive, onClick, label, icon = '', disabled = false }: any) {
+    return (
+        <div>
+            <button
+                onClick={onClick}
+                className={cn('transition group rounded ml-2 px-2 py-1 flex items-center uppercase text-sm hover:bg-teal hover:text-white', {
+                    'bg-teal text-white': isActive,
+                    'bg-active-blue color-teal': !isActive,
+                    'disabled': disabled,
+                })}
+            >
+                {icon && <Icon name={icon} color="teal" size="14" className={cn('group-hover:fill-white mr-2', { 'fill-white': isActive })} />}
+                <span className="leading-none">{label}</span>
+            </button>
+        </div>
+    );
+}
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionTags/index.ts b/frontend/app/components/shared/SessionListContainer/components/SessionTags/index.ts
new file mode 100644
index 000000000..4f5e62f6c
--- /dev/null
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionTags/index.ts
@@ -0,0 +1 @@
+export { default } from './SessionTags';
\ No newline at end of file
diff --git a/frontend/app/components/shared/SessionListContainer/index.ts b/frontend/app/components/shared/SessionListContainer/index.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/frontend/app/components/ui/NoContent/NoContent.js b/frontend/app/components/ui/NoContent/NoContent.js
deleted file mode 100644
index a82b8b99b..000000000
--- a/frontend/app/components/ui/NoContent/NoContent.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import { Icon } from 'UI';
-import styles from './noContent.module.css';
-
-export default ({
-  title = <div>No data available.</div>,
-  subtext,
-  icon,
-  iconSize = 100,
-  size,
-  show = true,
-  children = null,
-  empty = false,
-  image = null,
-  style = {},
-}) => (!show ? children :
-<div className={ `${ styles.wrapper } ${ size && styles[ size ] }` } style={style}>
-  {
-    icon && <Icon name={icon} size={iconSize} />
-  }
-  { title && <div className={ styles.title }>{ title }</div> }
-  {
-    subtext &&
-    <div className={ styles.subtext }>{ subtext }</div>
-  }
-  {
-    image && <div className="mt-4 flex justify-center">{ image } </div>
-  }
-</div>
-);
diff --git a/frontend/app/components/ui/NoContent/NoContent.tsx b/frontend/app/components/ui/NoContent/NoContent.tsx
new file mode 100644
index 000000000..10a7e72e7
--- /dev/null
+++ b/frontend/app/components/ui/NoContent/NoContent.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Icon } from 'UI';
+import styles from './noContent.module.css';
+
+interface Props {
+    title?: any;
+    subtext?: any;
+    icon?: string;
+    iconSize?: number;
+    size?: number;
+    show?: boolean;
+    children?: any;
+    image?: any;
+    style?: any;
+}
+export default function NoContent(props: Props) {
+    const { title = '', subtext = '', icon, iconSize, size, show, children, image, style } = props;
+
+    return !show ? (
+        children
+    ) : (
+        <div className={`${styles.wrapper} ${size && styles[size]}`} style={style}>
+            {icon && <Icon name={icon} size={iconSize} />}
+            {title && <div className={styles.title}>{title}</div>}
+            {subtext && <div className={styles.subtext}>{subtext}</div>}
+            {image && <div className="mt-4 flex justify-center">{image} </div>}
+        </div>
+    );
+}
diff --git a/frontend/app/components/ui/NoContent/index.js b/frontend/app/components/ui/NoContent/index.ts
similarity index 100%
rename from frontend/app/components/ui/NoContent/index.js
rename to frontend/app/components/ui/NoContent/index.ts
diff --git a/frontend/app/components/ui/NoContent/noContent.module.css b/frontend/app/components/ui/NoContent/noContent.module.css
index 5cf7a0d24..33c63c916 100644
--- a/frontend/app/components/ui/NoContent/noContent.module.css
+++ b/frontend/app/components/ui/NoContent/noContent.module.css
@@ -45,15 +45,3 @@
   height: 166px;
   margin-bottom: 20px;
 }
-
-.empty-state {
-  display: block;
-  margin: auto;
-  background-image: svg-load(empty-state.svg, fill=#CCC);
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-position: center center;
-  width: 166px;
-  height: 166px;
-  margin-bottom: 20px;
-}
diff --git a/frontend/app/duck/search.js b/frontend/app/duck/search.js
index c49b00b26..fde7a9623 100644
--- a/frontend/app/duck/search.js
+++ b/frontend/app/duck/search.js
@@ -137,13 +137,13 @@ export const reduceThenFetchResource =
         const filter = getState().getIn(['search', 'instance']).toData();
 
         const activeTab = getState().getIn(['search', 'activeTab']);
-        if (activeTab.type !== 'all' && activeTab.type !== 'bookmark') {
+        if (activeTab.type !== 'all' && activeTab.type !== 'bookmark' && activeTab.type !== 'vault') {
             const tmpFilter = filtersMap[FilterKey.ISSUE];
             tmpFilter.value = [activeTab.type];
             filter.filters = filter.filters.concat(tmpFilter);
         }
 
-        if (activeTab.type === 'bookmark') {
+        if (activeTab.type === 'bookmark' || activeTab.type === 'vault') {
             filter.bookmarked = true;
         }
 
diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss
index 040831c9e..014cfce5f 100644
--- a/frontend/app/styles/global.scss
+++ b/frontend/app/styles/global.scss
@@ -11,4 +11,8 @@
 input.no-focus:focus {
     outline: none !important;
     border: solid thin transparent !important;
+}
+
+.widget-wrapper {
+    @apply rounded border bg-white;
 }
\ No newline at end of file
diff --git a/frontend/app/types/session/issue.js b/frontend/app/types/session/issue.js
index 31214ae3e..db220f8cc 100644
--- a/frontend/app/types/session/issue.js
+++ b/frontend/app/types/session/issue.js
@@ -3,15 +3,18 @@ import { List } from 'immutable';
 import Watchdog from 'Types/watchdog'
 
 export const issues_types = List([
-  { 'type': 'js_exception', 'visible': true, 'order': 0, 'name': 'Errors', 'icon': 'funnel/exclamation-circle' },
-  { 'type': 'bad_request', 'visible': true, 'order': 1, 'name': 'Bad Requests', 'icon': 'funnel/file-medical-alt' },
-  { 'type': 'missing_resource', 'visible': true, 'order': 2, 'name': 'Missing Images', 'icon': 'funnel/image' },
-  { 'type': 'click_rage', 'visible': true, 'order': 3, 'name': 'Click Rage', 'icon': 'funnel/emoji-angry' },
-  { 'type': 'dead_click', 'visible': true, 'order': 4, 'name': 'Dead Clicks', 'icon': 'funnel/dizzy' },
-  { 'type': 'memory', 'visible': true, 'order': 5, 'name': 'High Memory', 'icon': 'funnel/sd-card' },
-  { 'type': 'cpu', 'visible': true, 'order': 6, 'name': 'High CPU', 'icon': 'funnel/cpu' },
-  { 'type': 'crash', 'visible': true, 'order': 7, 'name': 'Crashes', 'icon': 'funnel/file-earmark-break' },
-  { 'type': 'custom', 'visible': false, 'order': 8, 'name': 'Custom', 'icon': 'funnel/exclamation-circle' }
+  { 'type': 'all', 'visible': true, 'order': 0, 'name': 'All', 'icon': '' },
+  { 'type': 'js_exception', 'visible': true, 'order': 1, 'name': 'Errors', 'icon': 'funnel/exclamation-circle' },
+  { 'type': 'click_rage', 'visible': true, 'order': 2, 'name': 'Click Rage', 'icon': 'funnel/emoji-angry' },
+  { 'type': 'crash', 'visible': true, 'order': 3, 'name': 'Crashes', 'icon': 'funnel/file-earmark-break' },
+  { 'type': 'memory', 'visible': true, 'order': 4, 'name': 'High Memory', 'icon': 'funnel/sd-card' },
+  { 'type': 'vault', 'visible': true, 'order': 5, 'name': 'Vault', 'icon': 'safe' },
+  { 'type': 'bookmark', 'visible': true, 'order': 5, 'name': 'Bookmarks', 'icon': 'safe' },
+  // { 'type': 'bad_request', 'visible': true, 'order': 1, 'name': 'Bad Requests', 'icon': 'funnel/file-medical-alt' },
+  // { 'type': 'missing_resource', 'visible': true, 'order': 2, 'name': 'Missing Images', 'icon': 'funnel/image' },
+  // { 'type': 'dead_click', 'visible': true, 'order': 4, 'name': 'Dead Clicks', 'icon': 'funnel/dizzy' },
+  // { 'type': 'cpu', 'visible': true, 'order': 6, 'name': 'High CPU', 'icon': 'funnel/cpu' },
+  // { 'type': 'custom', 'visible': false, 'order': 8, 'name': 'Custom', 'icon': 'funnel/exclamation-circle' }
 ]).map(Watchdog)
 
 export const issues_types_map = {}
diff --git a/frontend/env.js b/frontend/env.js
deleted file mode 100644
index e8332bd82..000000000
--- a/frontend/env.js
+++ /dev/null
@@ -1,29 +0,0 @@
-require('dotenv').config()
-
-// TODO: (the problem is during the build time the frontend is isolated)
-//const trackerInfo = require('../tracker/tracker/package.json');
-
-const oss = {
-	name: 'oss',
-	PRODUCTION: true,
-	SENTRY_ENABLED: false,
-	SENTRY_URL: "",
-	CAPTCHA_ENABLED: process.env.CAPTCHA_ENABLED === 'true',
-	CAPTCHA_SITE_KEY: process.env.CAPTCHA_SITE_KEY,
-	ORIGIN: () => 'window.location.origin',
-	API_EDP: () => 'window.location.origin + "/api"',
-	ASSETS_HOST: () => 'window.location.origin + "/assets"',
-	VERSION: '1.7.0',
-	SOURCEMAP: true,
-	MINIO_ENDPOINT: process.env.MINIO_ENDPOINT,
-	MINIO_PORT: process.env.MINIO_PORT,
-	MINIO_USE_SSL: process.env.MINIO_USE_SSL,
-	MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
-	MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
-	ICE_SERVERS: process.env.ICE_SERVERS,
-	TRACKER_VERSION: '3.5.15' // trackerInfo.version,
-}
-
-module.exports = {
-    oss,    
-};

From 4dc82294e913d13a46e01d6a3f55b3e8468770cd Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Tue, 19 Jul 2022 15:02:15 +0200
Subject: [PATCH 38/77] feat(backend/db): implemented bulk inserts for db
 service (#619)

---
 backend/pkg/db/cache/messages-ios.go         |   8 -
 backend/pkg/db/cache/messages-web.go         |  52 +++-
 backend/pkg/db/cache/pg-cache.go             |   7 +-
 backend/pkg/db/postgres/bulk.go              |  93 +++++++
 backend/pkg/db/postgres/connector.go         | 268 ++++++++++---------
 backend/pkg/db/postgres/integration.go       |   4 +-
 backend/pkg/db/postgres/messages-common.go   |  80 ++----
 backend/pkg/db/postgres/messages-ios.go      |  22 +-
 backend/pkg/db/postgres/messages-web.go      | 185 ++++---------
 backend/pkg/db/postgres/pool.go              | 175 ++++++++++++
 backend/pkg/db/postgres/project.go           |   4 +-
 backend/pkg/db/postgres/session-updates.go   |  30 +++
 backend/pkg/db/postgres/session.go           |  71 +----
 backend/pkg/db/postgres/unstarted-session.go |   2 +-
 14 files changed, 588 insertions(+), 413 deletions(-)
 create mode 100644 backend/pkg/db/postgres/bulk.go
 create mode 100644 backend/pkg/db/postgres/pool.go
 create mode 100644 backend/pkg/db/postgres/session-updates.go

diff --git a/backend/pkg/db/cache/messages-ios.go b/backend/pkg/db/cache/messages-ios.go
index 4195976c3..87cfef13a 100644
--- a/backend/pkg/db/cache/messages-ios.go
+++ b/backend/pkg/db/cache/messages-ios.go
@@ -84,13 +84,5 @@ func (c *PGCache) InsertIOSCrash(sessionID uint64, crash *IOSCrash) error {
 }
 
 func (c *PGCache) InsertIOSIssueEvent(sessionID uint64, issueEvent *IOSIssueEvent) error {
-	// session, err := c.GetSession(sessionID)
-	// if err != nil {
-	// 	return err
-	// }
-	// TODO: unite IssueEvent message for the all platforms
-	// if err := c.Conn.InsertIssueEvent(sessionID, session.ProjectID, issueEvent); err != nil {
-	// 	return err
-	// }
 	return nil
 }
diff --git a/backend/pkg/db/cache/messages-web.go b/backend/pkg/db/cache/messages-web.go
index 7da7006af..e704f6c9f 100644
--- a/backend/pkg/db/cache/messages-web.go
+++ b/backend/pkg/db/cache/messages-web.go
@@ -91,7 +91,7 @@ func (c *PGCache) InsertWebFetchEvent(sessionID uint64, e *FetchEvent) error {
 	if err != nil {
 		return err
 	}
-	return c.Conn.InsertWebFetchEvent(sessionID, project.SaveRequestPayloads, e)
+	return c.Conn.InsertWebFetchEvent(sessionID, session.ProjectID, project.SaveRequestPayloads, e)
 }
 
 func (c *PGCache) InsertWebGraphQLEvent(sessionID uint64, e *GraphQLEvent) error {
@@ -103,5 +103,53 @@ func (c *PGCache) InsertWebGraphQLEvent(sessionID uint64, e *GraphQLEvent) error
 	if err != nil {
 		return err
 	}
-	return c.Conn.InsertWebGraphQLEvent(sessionID, project.SaveRequestPayloads, e)
+	return c.Conn.InsertWebGraphQLEvent(sessionID, session.ProjectID, project.SaveRequestPayloads, e)
+}
+
+func (c *PGCache) InsertWebCustomEvent(sessionID uint64, e *CustomEvent) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebCustomEvent(sessionID, session.ProjectID, e)
+}
+
+func (c *PGCache) InsertWebUserID(sessionID uint64, userID *UserID) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebUserID(sessionID, session.ProjectID, userID)
+}
+
+func (c *PGCache) InsertWebUserAnonymousID(sessionID uint64, userAnonymousID *UserAnonymousID) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebUserAnonymousID(sessionID, session.ProjectID, userAnonymousID)
+}
+
+func (c *PGCache) InsertWebPageEvent(sessionID uint64, e *PageEvent) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebPageEvent(sessionID, session.ProjectID, e)
+}
+
+func (c *PGCache) InsertWebClickEvent(sessionID uint64, e *ClickEvent) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebClickEvent(sessionID, session.ProjectID, e)
+}
+
+func (c *PGCache) InsertWebInputEvent(sessionID uint64, e *InputEvent) error {
+	session, err := c.GetSession(sessionID)
+	if err != nil {
+		return err
+	}
+	return c.Conn.InsertWebInputEvent(sessionID, session.ProjectID, e)
 }
diff --git a/backend/pkg/db/cache/pg-cache.go b/backend/pkg/db/cache/pg-cache.go
index 6422209d4..ca31bcd82 100644
--- a/backend/pkg/db/cache/pg-cache.go
+++ b/backend/pkg/db/cache/pg-cache.go
@@ -29,10 +29,9 @@ type PGCache struct {
 // TODO: create conn automatically
 func NewPGCache(pgConn *postgres.Conn, projectExpirationTimeoutMs int64) *PGCache {
 	return &PGCache{
-		Conn:     pgConn,
-		sessions: make(map[uint64]*Session),
-		projects: make(map[uint32]*ProjectMeta),
-		//projectsByKeys: make(map[string]*ProjectMeta),
+		Conn:                     pgConn,
+		sessions:                 make(map[uint64]*Session),
+		projects:                 make(map[uint32]*ProjectMeta),
 		projectExpirationTimeout: time.Duration(1000 * projectExpirationTimeoutMs),
 	}
 }
diff --git a/backend/pkg/db/postgres/bulk.go b/backend/pkg/db/postgres/bulk.go
new file mode 100644
index 000000000..16f59efcd
--- /dev/null
+++ b/backend/pkg/db/postgres/bulk.go
@@ -0,0 +1,93 @@
+package postgres
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+)
+
+const (
+	insertPrefix = `INSERT INTO `
+	insertValues = ` VALUES `
+	insertSuffix = ` ON CONFLICT DO NOTHING;`
+)
+
+type Bulk interface {
+	Append(args ...interface{}) error
+	Send() error
+}
+
+type bulkImpl struct {
+	conn      Pool
+	table     string
+	columns   string
+	template  string
+	setSize   int
+	sizeLimit int
+	values    []interface{}
+}
+
+func (b *bulkImpl) Append(args ...interface{}) error {
+	if len(args) != b.setSize {
+		return fmt.Errorf("wrong number of arguments, waited: %d, got: %d", b.setSize, len(args))
+	}
+	b.values = append(b.values, args...)
+	if len(b.values)/b.setSize >= b.sizeLimit {
+		return b.send()
+	}
+	return nil
+}
+
+func (b *bulkImpl) Send() error {
+	if len(b.values) == 0 {
+		return nil
+	}
+	return b.send()
+}
+
+func (b *bulkImpl) send() error {
+	request := bytes.NewBufferString(insertPrefix + b.table + b.columns + insertValues)
+	args := make([]interface{}, b.setSize)
+	for i := 0; i < len(b.values)/b.setSize; i++ {
+		for j := 0; j < b.setSize; j++ {
+			args[j] = i*b.setSize + j + 1
+		}
+		if i > 0 {
+			request.WriteByte(',')
+		}
+		request.WriteString(fmt.Sprintf(b.template, args...))
+	}
+	request.WriteString(insertSuffix)
+	err := b.conn.Exec(request.String(), b.values...)
+	b.values = make([]interface{}, 0, b.setSize*b.sizeLimit)
+	if err != nil {
+		return fmt.Errorf("send bulk err: %s", err)
+	}
+	return nil
+}
+
+func NewBulk(conn Pool, table, columns, template string, setSize, sizeLimit int) (Bulk, error) {
+	switch {
+	case conn == nil:
+		return nil, errors.New("db conn is empty")
+	case table == "":
+		return nil, errors.New("table is empty")
+	case columns == "":
+		return nil, errors.New("columns is empty")
+	case template == "":
+		return nil, errors.New("template is empty")
+	case setSize <= 0:
+		return nil, errors.New("set size is wrong")
+	case sizeLimit <= 0:
+		return nil, errors.New("size limit is wrong")
+	}
+	return &bulkImpl{
+		conn:      conn,
+		table:     table,
+		columns:   columns,
+		template:  template,
+		setSize:   setSize,
+		sizeLimit: sizeLimit,
+		values:    make([]interface{}, 0, setSize*sizeLimit),
+	}, nil
+}
diff --git a/backend/pkg/db/postgres/connector.go b/backend/pkg/db/postgres/connector.go
index e772b479d..0360c54bc 100644
--- a/backend/pkg/db/postgres/connector.go
+++ b/backend/pkg/db/postgres/connector.go
@@ -13,21 +13,24 @@ import (
 	"github.com/jackc/pgx/v4/pgxpool"
 )
 
-func getTimeoutContext() context.Context {
-	ctx, _ := context.WithTimeout(context.Background(), time.Duration(time.Second*30))
-	return ctx
-}
-
 type batchItem struct {
 	query     string
 	arguments []interface{}
 }
 
+// Conn contains batches, bulks and cache for all sessions
 type Conn struct {
-	c                 *pgxpool.Pool // TODO: conditional usage of Pool/Conn (use interface?)
+	c                 Pool
 	batches           map[uint64]*pgx.Batch
 	batchSizes        map[uint64]int
 	rawBatches        map[uint64][]*batchItem
+	autocompletes     Bulk
+	requests          Bulk
+	customEvents      Bulk
+	webPageEvents     Bulk
+	webInputEvents    Bulk
+	webGraphQLEvents  Bulk
+	sessionUpdates    map[uint64]*sessionUpdates
 	batchQueueLimit   int
 	batchSizeLimit    int
 	batchSizeBytes    syncfloat64.Histogram
@@ -46,14 +49,19 @@ func NewConn(url string, queueLimit, sizeLimit int, metrics *monitoring.Metrics)
 		log.Fatalln("pgxpool.Connect Error")
 	}
 	conn := &Conn{
-		c:               c,
 		batches:         make(map[uint64]*pgx.Batch),
 		batchSizes:      make(map[uint64]int),
 		rawBatches:      make(map[uint64][]*batchItem),
+		sessionUpdates:  make(map[uint64]*sessionUpdates),
 		batchQueueLimit: queueLimit,
 		batchSizeLimit:  sizeLimit,
 	}
 	conn.initMetrics(metrics)
+	conn.c, err = NewPool(c, conn.sqlRequestTime, conn.sqlRequestCounter)
+	if err != nil {
+		log.Fatalf("can't create new pool wrapper: %s", err)
+	}
+	conn.initBulks()
 	return conn
 }
 
@@ -82,6 +90,70 @@ func (conn *Conn) initMetrics(metrics *monitoring.Metrics) {
 	}
 }
 
+func (conn *Conn) initBulks() {
+	var err error
+	conn.autocompletes, err = NewBulk(conn.c,
+		"autocomplete",
+		"(value, type, project_id)",
+		"($%d, $%d, $%d)",
+		3, 100)
+	if err != nil {
+		log.Fatalf("can't create autocomplete bulk")
+	}
+	conn.requests, err = NewBulk(conn.c,
+		"events_common.requests",
+		"(session_id, timestamp, seq_index, url, duration, success)",
+		"($%d, $%d, $%d, left($%d, 2700), $%d, $%d)",
+		6, 100)
+	if err != nil {
+		log.Fatalf("can't create requests bulk")
+	}
+	conn.customEvents, err = NewBulk(conn.c,
+		"events_common.customs",
+		"(session_id, timestamp, seq_index, name, payload)",
+		"($%d, $%d, $%d, left($%d, 2700), $%d)",
+		5, 100)
+	if err != nil {
+		log.Fatalf("can't create customEvents bulk")
+	}
+	conn.webPageEvents, err = NewBulk(conn.c,
+		"events.pages",
+		"(session_id, message_id, timestamp, referrer, base_referrer, host, path, query, dom_content_loaded_time, "+
+			"load_time, response_end, first_paint_time, first_contentful_paint_time, speed_index, visually_complete, "+
+			"time_to_interactive, response_time, dom_building_time)",
+		"($%d, $%d, $%d, $%d, $%d, $%d, $%d, $%d, NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0),"+
+			" NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0), NULLIF($%d, 0))",
+		18, 100)
+	if err != nil {
+		log.Fatalf("can't create webPageEvents bulk")
+	}
+	conn.webInputEvents, err = NewBulk(conn.c,
+		"events.inputs",
+		"(session_id, message_id, timestamp, value, label)",
+		"($%d, $%d, $%d, $%d, NULLIF($%d,''))",
+		5, 100)
+	if err != nil {
+		log.Fatalf("can't create webPageEvents bulk")
+	}
+	conn.webGraphQLEvents, err = NewBulk(conn.c,
+		"events.graphql",
+		"(session_id, timestamp, message_id, name, request_body, response_body)",
+		"($%d, $%d, $%d, left($%d, 2700), $%d, $%d)",
+		6, 100)
+	if err != nil {
+		log.Fatalf("can't create webPageEvents bulk")
+	}
+}
+
+func (conn *Conn) insertAutocompleteValue(sessionID uint64, projectID uint32, tp string, value string) {
+	if len(value) == 0 {
+		return
+	}
+	if err := conn.autocompletes.Append(tp, value, projectID); err != nil {
+		log.Printf("autocomplete bulk err: %s", err)
+	}
+}
+
 func (conn *Conn) batchQueue(sessionID uint64, sql string, args ...interface{}) {
 	batch, ok := conn.batches[sessionID]
 	if !ok {
@@ -90,6 +162,10 @@ func (conn *Conn) batchQueue(sessionID uint64, sql string, args ...interface{})
 		batch = conn.batches[sessionID]
 	}
 	batch.Queue(sql, args...)
+	conn.rawBatch(sessionID, sql, args...)
+}
+
+func (conn *Conn) rawBatch(sessionID uint64, sql string, args ...interface{}) {
 	// Temp raw batch store
 	raw := conn.rawBatches[sessionID]
 	raw = append(raw, &batchItem{
@@ -99,8 +175,45 @@ func (conn *Conn) batchQueue(sessionID uint64, sql string, args ...interface{})
 	conn.rawBatches[sessionID] = raw
 }
 
+func (conn *Conn) updateSessionEvents(sessionID uint64, events, pages int) {
+	if _, ok := conn.sessionUpdates[sessionID]; !ok {
+		conn.sessionUpdates[sessionID] = NewSessionUpdates(sessionID)
+	}
+	conn.sessionUpdates[sessionID].add(pages, events)
+}
+
+func (conn *Conn) sendBulks() {
+	if err := conn.autocompletes.Send(); err != nil {
+		log.Printf("autocomplete bulk send err: %s", err)
+	}
+	if err := conn.requests.Send(); err != nil {
+		log.Printf("requests bulk send err: %s", err)
+	}
+	if err := conn.customEvents.Send(); err != nil {
+		log.Printf("customEvents bulk send err: %s", err)
+	}
+	if err := conn.webPageEvents.Send(); err != nil {
+		log.Printf("webPageEvents bulk send err: %s", err)
+	}
+	if err := conn.webInputEvents.Send(); err != nil {
+		log.Printf("webInputEvents bulk send err: %s", err)
+	}
+	if err := conn.webGraphQLEvents.Send(); err != nil {
+		log.Printf("webGraphQLEvents bulk send err: %s", err)
+	}
+}
+
 func (conn *Conn) CommitBatches() {
+	conn.sendBulks()
 	for sessID, b := range conn.batches {
+		// Append session update sql request to the end of batch
+		if update, ok := conn.sessionUpdates[sessID]; ok {
+			sql, args := update.request()
+			if sql != "" {
+				conn.batchQueue(sessID, sql, args...)
+				b, _ = conn.batches[sessID]
+			}
+		}
 		// Record batch size in bytes and number of lines
 		conn.batchSizeBytes.Record(context.Background(), float64(conn.batchSizes[sessID]))
 		conn.batchSizeLines.Record(context.Background(), float64(b.Len()))
@@ -109,7 +222,7 @@ func (conn *Conn) CommitBatches() {
 		isFailed := false
 
 		// Send batch to db and execute
-		br := conn.c.SendBatch(getTimeoutContext(), b)
+		br := conn.c.SendBatch(b)
 		l := b.Len()
 		for i := 0; i < l; i++ {
 			if ct, err := br.Exec(); err != nil {
@@ -125,10 +238,25 @@ func (conn *Conn) CommitBatches() {
 			attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
 		conn.sqlRequestCounter.Add(context.Background(), 1,
 			attribute.String("method", "batch"), attribute.Bool("failed", isFailed))
+		if !isFailed {
+			delete(conn.sessionUpdates, sessID)
+		}
 	}
 	conn.batches = make(map[uint64]*pgx.Batch)
 	conn.batchSizes = make(map[uint64]int)
 	conn.rawBatches = make(map[uint64][]*batchItem)
+
+	// Session updates
+	for sessID, su := range conn.sessionUpdates {
+		sql, args := su.request()
+		if sql == "" {
+			continue
+		}
+		if err := conn.c.Exec(sql, args...); err != nil {
+			log.Printf("failed session update, sessID: %d, err: %s", sessID, err)
+		}
+	}
+	conn.sessionUpdates = make(map[uint64]*sessionUpdates)
 }
 
 func (conn *Conn) updateBatchSize(sessionID uint64, reqSize int) {
@@ -145,6 +273,14 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 		log.Printf("can't find batch for session: %d", sessionID)
 		return
 	}
+	// Append session update sql request to the end of batch
+	if update, ok := conn.sessionUpdates[sessionID]; ok {
+		sql, args := update.request()
+		if sql != "" {
+			conn.batchQueue(sessionID, sql, args...)
+			b, _ = conn.batches[sessionID]
+		}
+	}
 	// Record batch size in bytes and number of lines
 	conn.batchSizeBytes.Record(context.Background(), float64(conn.batchSizes[sessionID]))
 	conn.batchSizeLines.Record(context.Background(), float64(b.Len()))
@@ -153,7 +289,7 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 	isFailed := false
 
 	// Send batch to db and execute
-	br := conn.c.SendBatch(getTimeoutContext(), b)
+	br := conn.c.SendBatch(b)
 	l := b.Len()
 	for i := 0; i < l; i++ {
 		if ct, err := br.Exec(); err != nil {
@@ -175,117 +311,5 @@ func (conn *Conn) commitBatch(sessionID uint64) {
 	delete(conn.batches, sessionID)
 	delete(conn.batchSizes, sessionID)
 	delete(conn.rawBatches, sessionID)
-}
-
-func (conn *Conn) query(sql string, args ...interface{}) (pgx.Rows, error) {
-	start := time.Now()
-	res, err := conn.c.Query(getTimeoutContext(), sql, args...)
-	method, table := methodName(sql)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", method), attribute.String("table", table))
-	conn.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", method), attribute.String("table", table))
-	return res, err
-}
-
-func (conn *Conn) queryRow(sql string, args ...interface{}) pgx.Row {
-	start := time.Now()
-	res := conn.c.QueryRow(getTimeoutContext(), sql, args...)
-	method, table := methodName(sql)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", method), attribute.String("table", table))
-	conn.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", method), attribute.String("table", table))
-	return res
-}
-
-func (conn *Conn) exec(sql string, args ...interface{}) error {
-	start := time.Now()
-	_, err := conn.c.Exec(getTimeoutContext(), sql, args...)
-	method, table := methodName(sql)
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", method), attribute.String("table", table))
-	conn.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", method), attribute.String("table", table))
-	return err
-}
-
-type _Tx struct {
-	pgx.Tx
-	sqlRequestTime    syncfloat64.Histogram
-	sqlRequestCounter syncfloat64.Counter
-}
-
-func (conn *Conn) begin() (_Tx, error) {
-	start := time.Now()
-	tx, err := conn.c.Begin(context.Background())
-	conn.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", "begin"))
-	conn.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", "begin"))
-	return _Tx{tx, conn.sqlRequestTime, conn.sqlRequestCounter}, err
-}
-
-func (tx _Tx) exec(sql string, args ...interface{}) error {
-	start := time.Now()
-	_, err := tx.Exec(context.Background(), sql, args...)
-	method, table := methodName(sql)
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", method), attribute.String("table", table))
-	tx.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", method), attribute.String("table", table))
-	return err
-}
-
-func (tx _Tx) rollback() error {
-	start := time.Now()
-	err := tx.Rollback(context.Background())
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", "rollback"))
-	tx.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", "rollback"))
-	return err
-}
-
-func (tx _Tx) commit() error {
-	start := time.Now()
-	err := tx.Commit(context.Background())
-	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
-		attribute.String("method", "commit"))
-	tx.sqlRequestCounter.Add(context.Background(), 1,
-		attribute.String("method", "commit"))
-	return err
-}
-
-func methodName(sql string) (string, string) {
-	cmd, table := "unknown", "unknown"
-
-	// Prepare sql request for parsing
-	sql = strings.TrimSpace(sql)
-	sql = strings.ReplaceAll(sql, "\n", " ")
-	sql = strings.ReplaceAll(sql, "\t", "")
-	sql = strings.ToLower(sql)
-
-	// Get sql command name
-	parts := strings.Split(sql, " ")
-	if parts[0] == "" {
-		return cmd, table
-	} else {
-		cmd = strings.TrimSpace(parts[0])
-	}
-
-	// Get table name
-	switch cmd {
-	case "select":
-		for i, p := range parts {
-			if strings.TrimSpace(p) == "from" {
-				table = strings.TrimSpace(parts[i+1])
-			}
-		}
-	case "update":
-		table = strings.TrimSpace(parts[1])
-	case "insert":
-		table = strings.TrimSpace(parts[2])
-	}
-	return cmd, table
+	delete(conn.sessionUpdates, sessionID)
 }
diff --git a/backend/pkg/db/postgres/integration.go b/backend/pkg/db/postgres/integration.go
index e44bd726e..1556006c1 100644
--- a/backend/pkg/db/postgres/integration.go
+++ b/backend/pkg/db/postgres/integration.go
@@ -15,7 +15,7 @@ type Integration struct {
 }
 
 func (conn *Conn) IterateIntegrationsOrdered(iter func(integration *Integration, err error)) error {
-	rows, err := conn.query(`
+	rows, err := conn.c.Query(`
 		SELECT project_id, provider, options, request_data
 		FROM integrations
 	`)
@@ -40,7 +40,7 @@ func (conn *Conn) IterateIntegrationsOrdered(iter func(integration *Integration,
 }
 
 func (conn *Conn) UpdateIntegrationRequestData(i *Integration) error {
-	return conn.exec(`
+	return conn.c.Exec(`
 		UPDATE integrations 
 		SET request_data = $1 
 		WHERE project_id=$2 AND provider=$3`,
diff --git a/backend/pkg/db/postgres/messages-common.go b/backend/pkg/db/postgres/messages-common.go
index a68d2c814..8409d38e7 100644
--- a/backend/pkg/db/postgres/messages-common.go
+++ b/backend/pkg/db/postgres/messages-common.go
@@ -18,31 +18,8 @@ func getAutocompleteType(baseType string, platform string) string {
 
 }
 
-func (conn *Conn) insertAutocompleteValue(sessionID uint64, tp string, value string) {
-	if len(value) == 0 {
-		return
-	}
-	sqlRequest := `
-		INSERT INTO autocomplete (
-			value,
-			type,
-			project_id
-		) (SELECT 
-			$1, $2, project_id
-			FROM sessions 
-			WHERE session_id = $3
-		) ON CONFLICT DO NOTHING`
-	if err := conn.exec(sqlRequest, value, tp, sessionID); err != nil {
-		log.Printf("can't insert autocomplete: %s", err)
-	}
-	//conn.batchQueue(sessionID, sqlRequest, value, tp, sessionID)
-
-	// Record approximate message size
-	//conn.updateBatchSize(sessionID, len(sqlRequest)+len(value)+len(tp)+8)
-}
-
 func (conn *Conn) InsertSessionStart(sessionID uint64, s *types.Session) error {
-	return conn.exec(`
+	return conn.c.Exec(`
 		INSERT INTO sessions (
 			session_id, project_id, start_ts,
 			user_uuid, user_device, user_device_type, user_country,
@@ -74,18 +51,18 @@ func (conn *Conn) InsertSessionStart(sessionID uint64, s *types.Session) error {
 }
 
 func (conn *Conn) HandleSessionStart(sessionID uint64, s *types.Session) error {
-	conn.insertAutocompleteValue(sessionID, getAutocompleteType("USEROS", s.Platform), s.UserOS)
-	conn.insertAutocompleteValue(sessionID, getAutocompleteType("USERDEVICE", s.Platform), s.UserDevice)
-	conn.insertAutocompleteValue(sessionID, getAutocompleteType("USERCOUNTRY", s.Platform), s.UserCountry)
-	conn.insertAutocompleteValue(sessionID, getAutocompleteType("REVID", s.Platform), s.RevID)
+	conn.insertAutocompleteValue(sessionID, s.ProjectID, getAutocompleteType("USEROS", s.Platform), s.UserOS)
+	conn.insertAutocompleteValue(sessionID, s.ProjectID, getAutocompleteType("USERDEVICE", s.Platform), s.UserDevice)
+	conn.insertAutocompleteValue(sessionID, s.ProjectID, getAutocompleteType("USERCOUNTRY", s.Platform), s.UserCountry)
+	conn.insertAutocompleteValue(sessionID, s.ProjectID, getAutocompleteType("REVID", s.Platform), s.RevID)
 	// s.Platform == "web"
-	conn.insertAutocompleteValue(sessionID, "USERBROWSER", s.UserBrowser)
+	conn.insertAutocompleteValue(sessionID, s.ProjectID, "USERBROWSER", s.UserBrowser)
 	return nil
 }
 
 func (conn *Conn) InsertSessionEnd(sessionID uint64, timestamp uint64) (uint64, error) {
 	var dur uint64
-	if err := conn.queryRow(`
+	if err := conn.c.QueryRow(`
 		UPDATE sessions SET duration=$2 - start_ts
 		WHERE session_id=$1
 		RETURNING duration
@@ -119,30 +96,16 @@ func (conn *Conn) HandleSessionEnd(sessionID uint64) error {
 }
 
 func (conn *Conn) InsertRequest(sessionID uint64, timestamp uint64, index uint64, url string, duration uint64, success bool) error {
-	sqlRequest := `
-		INSERT INTO events_common.requests (
-			session_id, timestamp, seq_index, url, duration, success
-		) VALUES (
-			$1, $2, $3, left($4, 2700), $5, $6
-		)`
-	conn.batchQueue(sessionID, sqlRequest, sessionID, timestamp, getSqIdx(index), url, duration, success)
-
-	// Record approximate message size
-	conn.updateBatchSize(sessionID, len(sqlRequest)+len(url)+8*4)
+	if err := conn.requests.Append(sessionID, timestamp, getSqIdx(index), url, duration, success); err != nil {
+		return fmt.Errorf("insert request in bulk err: %s", err)
+	}
 	return nil
 }
 
 func (conn *Conn) InsertCustomEvent(sessionID uint64, timestamp uint64, index uint64, name string, payload string) error {
-	sqlRequest := `
-		INSERT INTO events_common.customs (
-			session_id, timestamp, seq_index, name, payload
-		) VALUES (
-			$1, $2, $3, left($4, 2700), $5
-		)`
-	conn.batchQueue(sessionID, sqlRequest, sessionID, timestamp, getSqIdx(index), name, payload)
-
-	// Record approximate message size
-	conn.updateBatchSize(sessionID, len(sqlRequest)+len(name)+len(payload)+8*3)
+	if err := conn.customEvents.Append(sessionID, timestamp, getSqIdx(index), name, payload); err != nil {
+		return fmt.Errorf("insert custom event in bulk err: %s", err)
+	}
 	return nil
 }
 
@@ -172,15 +135,21 @@ func (conn *Conn) InsertMetadata(sessionID uint64, keyNo uint, value string) err
 	sqlRequest := `
 		UPDATE sessions SET  metadata_%v = $1
 		WHERE session_id = $2`
-	return conn.exec(fmt.Sprintf(sqlRequest, keyNo), value, sessionID)
+	return conn.c.Exec(fmt.Sprintf(sqlRequest, keyNo), value, sessionID)
 }
 
-func (conn *Conn) InsertIssueEvent(sessionID uint64, projectID uint32, e *messages.IssueEvent) error {
-	tx, err := conn.begin()
+func (conn *Conn) InsertIssueEvent(sessionID uint64, projectID uint32, e *messages.IssueEvent) (err error) {
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
-	defer tx.rollback()
+	defer func() {
+		if err != nil {
+			if rollbackErr := tx.rollback(); rollbackErr != nil {
+				log.Printf("rollback err: %s", rollbackErr)
+			}
+		}
+	}()
 	issueID := hashid.IssueID(projectID, e)
 
 	// TEMP. TODO: nullable & json message field type
@@ -237,5 +206,6 @@ func (conn *Conn) InsertIssueEvent(sessionID uint64, projectID uint32, e *messag
 			return err
 		}
 	}
-	return tx.commit()
+	err = tx.commit()
+	return
 }
diff --git a/backend/pkg/db/postgres/messages-ios.go b/backend/pkg/db/postgres/messages-ios.go
index e75ff2acd..d7b2f58f3 100644
--- a/backend/pkg/db/postgres/messages-ios.go
+++ b/backend/pkg/db/postgres/messages-ios.go
@@ -9,7 +9,7 @@ import (
 func (conn *Conn) InsertIOSCustomEvent(sessionID uint64, e *messages.IOSCustomEvent) error {
 	err := conn.InsertCustomEvent(sessionID, e.Timestamp, e.Index, e.Name, e.Payload)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "CUSTOM_IOS", e.Name)
+		conn.insertAutocompleteValue(sessionID, 0, "CUSTOM_IOS", e.Name)
 	}
 	return err
 }
@@ -17,7 +17,7 @@ func (conn *Conn) InsertIOSCustomEvent(sessionID uint64, e *messages.IOSCustomEv
 func (conn *Conn) InsertIOSUserID(sessionID uint64, userID *messages.IOSUserID) error {
 	err := conn.InsertUserID(sessionID, userID.Value)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "USERID_IOS", userID.Value)
+		conn.insertAutocompleteValue(sessionID, 0, "USERID_IOS", userID.Value)
 	}
 	return err
 }
@@ -25,7 +25,7 @@ func (conn *Conn) InsertIOSUserID(sessionID uint64, userID *messages.IOSUserID)
 func (conn *Conn) InsertIOSUserAnonymousID(sessionID uint64, userAnonymousID *messages.IOSUserAnonymousID) error {
 	err := conn.InsertUserAnonymousID(sessionID, userAnonymousID.Value)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "USERANONYMOUSID_IOS", userAnonymousID.Value)
+		conn.insertAutocompleteValue(sessionID, 0, "USERANONYMOUSID_IOS", userAnonymousID.Value)
 	}
 	return err
 }
@@ -33,13 +33,13 @@ func (conn *Conn) InsertIOSUserAnonymousID(sessionID uint64, userAnonymousID *me
 func (conn *Conn) InsertIOSNetworkCall(sessionID uint64, e *messages.IOSNetworkCall) error {
 	err := conn.InsertRequest(sessionID, e.Timestamp, e.Index, e.URL, e.Duration, e.Success)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "REQUEST_IOS", url.DiscardURLQuery(e.URL))
+		conn.insertAutocompleteValue(sessionID, 0, "REQUEST_IOS", url.DiscardURLQuery(e.URL))
 	}
 	return err
 }
 
 func (conn *Conn) InsertIOSScreenEnter(sessionID uint64, screenEnter *messages.IOSScreenEnter) error {
-	tx, err := conn.begin()
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
@@ -65,12 +65,12 @@ func (conn *Conn) InsertIOSScreenEnter(sessionID uint64, screenEnter *messages.I
 	if err = tx.commit(); err != nil {
 		return err
 	}
-	conn.insertAutocompleteValue(sessionID, "VIEW_IOS", screenEnter.ViewName)
+	conn.insertAutocompleteValue(sessionID, 0, "VIEW_IOS", screenEnter.ViewName)
 	return nil
 }
 
 func (conn *Conn) InsertIOSClickEvent(sessionID uint64, clickEvent *messages.IOSClickEvent) error {
-	tx, err := conn.begin()
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
@@ -96,12 +96,12 @@ func (conn *Conn) InsertIOSClickEvent(sessionID uint64, clickEvent *messages.IOS
 	if err = tx.commit(); err != nil {
 		return err
 	}
-	conn.insertAutocompleteValue(sessionID, "CLICK_IOS", clickEvent.Label)
+	conn.insertAutocompleteValue(sessionID, 0, "CLICK_IOS", clickEvent.Label)
 	return nil
 }
 
 func (conn *Conn) InsertIOSInputEvent(sessionID uint64, inputEvent *messages.IOSInputEvent) error {
-	tx, err := conn.begin()
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
@@ -132,13 +132,13 @@ func (conn *Conn) InsertIOSInputEvent(sessionID uint64, inputEvent *messages.IOS
 	if err = tx.commit(); err != nil {
 		return err
 	}
-	conn.insertAutocompleteValue(sessionID, "INPUT_IOS", inputEvent.Label)
+	conn.insertAutocompleteValue(sessionID, 0, "INPUT_IOS", inputEvent.Label)
 	// conn.insertAutocompleteValue(sessionID, "INPUT_VALUE", inputEvent.Label)
 	return nil
 }
 
 func (conn *Conn) InsertIOSCrash(sessionID uint64, projectID uint32, crash *messages.IOSCrash) error {
-	tx, err := conn.begin()
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
diff --git a/backend/pkg/db/postgres/messages-web.go b/backend/pkg/db/postgres/messages-web.go
index e703ee933..c55344509 100644
--- a/backend/pkg/db/postgres/messages-web.go
+++ b/backend/pkg/db/postgres/messages-web.go
@@ -1,6 +1,7 @@
 package postgres
 
 import (
+	"log"
 	"math"
 
 	"openreplay/backend/pkg/hashid"
@@ -13,104 +14,54 @@ func getSqIdx(messageID uint64) uint {
 	return uint(messageID % math.MaxInt32)
 }
 
-func (conn *Conn) InsertWebCustomEvent(sessionID uint64, e *CustomEvent) error {
+func (conn *Conn) InsertWebCustomEvent(sessionID uint64, projectID uint32, e *CustomEvent) error {
 	err := conn.InsertCustomEvent(sessionID, e.Timestamp,
 		e.MessageID,
 		e.Name, e.Payload)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "CUSTOM", e.Name)
+		conn.insertAutocompleteValue(sessionID, projectID, "CUSTOM", e.Name)
 	}
 	return err
 }
 
-func (conn *Conn) InsertWebUserID(sessionID uint64, userID *UserID) error {
+func (conn *Conn) InsertWebUserID(sessionID uint64, projectID uint32, userID *UserID) error {
 	err := conn.InsertUserID(sessionID, userID.ID)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "USERID", userID.ID)
+		conn.insertAutocompleteValue(sessionID, projectID, "USERID", userID.ID)
 	}
 	return err
 }
 
-func (conn *Conn) InsertWebUserAnonymousID(sessionID uint64, userAnonymousID *UserAnonymousID) error {
+func (conn *Conn) InsertWebUserAnonymousID(sessionID uint64, projectID uint32, userAnonymousID *UserAnonymousID) error {
 	err := conn.InsertUserAnonymousID(sessionID, userAnonymousID.ID)
 	if err == nil {
-		conn.insertAutocompleteValue(sessionID, "USERANONYMOUSID", userAnonymousID.ID)
+		conn.insertAutocompleteValue(sessionID, projectID, "USERANONYMOUSID", userAnonymousID.ID)
 	}
 	return err
 }
 
-// func (conn *Conn) InsertWebResourceEvent(sessionID uint64, e *ResourceEvent) error {
-// 	if e.Type != "fetch" {
-// 		return nil
-// 	}
-// 	err := conn.InsertRequest(sessionID, e.Timestamp,
-// 		e.MessageID,
-// 		e.URL, e.Duration, e.Success,
-// 	)
-// 	if err == nil {
-// 		conn.insertAutocompleteValue(sessionID, "REQUEST", url.DiscardURLQuery(e.URL))
-// 	}
-// 	return err
-// }
-
 // TODO: fix column "dom_content_loaded_event_end" of relation "pages"
-func (conn *Conn) InsertWebPageEvent(sessionID uint64, e *PageEvent) error {
+func (conn *Conn) InsertWebPageEvent(sessionID uint64, projectID uint32, e *PageEvent) error {
 	host, path, query, err := url.GetURLParts(e.URL)
 	if err != nil {
 		return err
 	}
-	tx, err := conn.begin()
-	if err != nil {
-		return err
+	// base_path is deprecated
+	if err = conn.webPageEvents.Append(sessionID, e.MessageID, e.Timestamp, e.Referrer, url.DiscardURLQuery(e.Referrer),
+		host, path, query, e.DomContentLoadedEventEnd, e.LoadEventEnd, e.ResponseEnd, e.FirstPaint, e.FirstContentfulPaint,
+		e.SpeedIndex, e.VisuallyComplete, e.TimeToInteractive, calcResponseTime(e), calcDomBuildingTime(e)); err != nil {
+		log.Printf("insert web page event in bulk err: %s", err)
 	}
-	defer tx.rollback()
-	// base_path is depricated
-	if err := tx.exec(`
-		INSERT INTO events.pages (
-			session_id, message_id, timestamp, referrer, base_referrer, host, path, query,
-			dom_content_loaded_time, load_time, response_end, first_paint_time, first_contentful_paint_time, 
-			speed_index, visually_complete, time_to_interactive,
-			response_time, dom_building_time
-		) VALUES (
-			$1, $2, $3, 
-			$4, $5, 
-			$6, $7, $8,
-			NULLIF($9, 0), NULLIF($10, 0), NULLIF($11, 0), NULLIF($12, 0), NULLIF($13, 0), 
-			NULLIF($14, 0), NULLIF($15, 0), NULLIF($16, 0),
-			NULLIF($17, 0), NULLIF($18, 0)
-		)
-		`,
-		sessionID, e.MessageID, e.Timestamp,
-		e.Referrer, url.DiscardURLQuery(e.Referrer),
-		host, path, query,
-		e.DomContentLoadedEventEnd, e.LoadEventEnd, e.ResponseEnd, e.FirstPaint, e.FirstContentfulPaint,
-		e.SpeedIndex, e.VisuallyComplete, e.TimeToInteractive,
-		calcResponseTime(e), calcDomBuildingTime(e),
-	); err != nil {
-		return err
-	}
-	if err = tx.exec(`
-		UPDATE sessions SET (pages_count, events_count) = (pages_count + 1, events_count + 1)
-		WHERE session_id = $1`,
-		sessionID,
-	); err != nil {
-		return err
-	}
-	if err = tx.commit(); err != nil {
-		return err
-	}
-	conn.insertAutocompleteValue(sessionID, "LOCATION", url.DiscardURLQuery(path))
-	conn.insertAutocompleteValue(sessionID, "REFERRER", url.DiscardURLQuery(e.Referrer))
+	// Accumulate session updates and exec inside batch with another sql commands
+	conn.updateSessionEvents(sessionID, 1, 1)
+	// Add new value set to autocomplete bulk
+	conn.insertAutocompleteValue(sessionID, projectID, "LOCATION", url.DiscardURLQuery(path))
+	conn.insertAutocompleteValue(sessionID, projectID, "REFERRER", url.DiscardURLQuery(e.Referrer))
 	return nil
 }
 
-func (conn *Conn) InsertWebClickEvent(sessionID uint64, e *ClickEvent) error {
-	tx, err := conn.begin()
-	if err != nil {
-		return err
-	}
-	defer tx.rollback()
-	if err = tx.exec(`
+func (conn *Conn) InsertWebClickEvent(sessionID uint64, projectID uint32, e *ClickEvent) error {
+	sqlRequest := `
 		INSERT INTO events.clicks
 			(session_id, message_id, timestamp, label, selector, url)
 		(SELECT
@@ -118,65 +69,40 @@ func (conn *Conn) InsertWebClickEvent(sessionID uint64, e *ClickEvent) error {
 			FROM events.pages
 			WHERE session_id = $1 AND timestamp <= $3 ORDER BY timestamp DESC LIMIT 1
 		)
-		`,
-		sessionID, e.MessageID, e.Timestamp, e.Label, e.Selector,
-	); err != nil {
-		return err
-	}
-	if err = tx.exec(`
-		UPDATE sessions SET events_count = events_count + 1
-		WHERE session_id = $1`,
-		sessionID,
-	); err != nil {
-		return err
-	}
-	if err = tx.commit(); err != nil {
-		return err
-	}
-	conn.insertAutocompleteValue(sessionID, "CLICK", e.Label)
+		`
+	conn.batchQueue(sessionID, sqlRequest, sessionID, e.MessageID, e.Timestamp, e.Label, e.Selector)
+	// Accumulate session updates and exec inside batch with another sql commands
+	conn.updateSessionEvents(sessionID, 1, 0)
+	// Add new value set to autocomplete bulk
+	conn.insertAutocompleteValue(sessionID, projectID, "CLICK", e.Label)
 	return nil
 }
 
-func (conn *Conn) InsertWebInputEvent(sessionID uint64, e *InputEvent) error {
-	tx, err := conn.begin()
-	if err != nil {
-		return err
-	}
-	defer tx.rollback()
+func (conn *Conn) InsertWebInputEvent(sessionID uint64, projectID uint32, e *InputEvent) error {
 	value := &e.Value
 	if e.ValueMasked {
 		value = nil
 	}
-	if err = tx.exec(`
-		INSERT INTO events.inputs
-			(session_id, message_id, timestamp, value, label)
-		VALUES
-			($1, $2, $3, $4, NULLIF($5,''))
-		`,
-		sessionID, e.MessageID, e.Timestamp, value, e.Label,
-	); err != nil {
-		return err
+	if err := conn.webInputEvents.Append(sessionID, e.MessageID, e.Timestamp, value, e.Label); err != nil {
+		log.Printf("insert web input event err: %s", err)
 	}
-	if err = tx.exec(`
-		UPDATE sessions SET events_count = events_count + 1
-		WHERE session_id = $1`,
-		sessionID,
-	); err != nil {
-		return err
-	}
-	if err = tx.commit(); err != nil {
-		return err
-	}
-	conn.insertAutocompleteValue(sessionID, "INPUT", e.Label)
+	conn.updateSessionEvents(sessionID, 1, 0)
+	conn.insertAutocompleteValue(sessionID, projectID, "INPUT", e.Label)
 	return nil
 }
 
-func (conn *Conn) InsertWebErrorEvent(sessionID uint64, projectID uint32, e *ErrorEvent) error {
-	tx, err := conn.begin()
+func (conn *Conn) InsertWebErrorEvent(sessionID uint64, projectID uint32, e *ErrorEvent) (err error) {
+	tx, err := conn.c.Begin()
 	if err != nil {
 		return err
 	}
-	defer tx.rollback()
+	defer func() {
+		if err != nil {
+			if rollbackErr := tx.rollback(); rollbackErr != nil {
+				log.Printf("rollback err: %s", rollbackErr)
+			}
+		}
+	}()
 	errorID := hashid.WebErrorID(projectID, e)
 
 	if err = tx.exec(`
@@ -206,17 +132,18 @@ func (conn *Conn) InsertWebErrorEvent(sessionID uint64, projectID uint32, e *Err
 	); err != nil {
 		return err
 	}
-	return tx.commit()
+	err = tx.commit()
+	return
 }
 
-func (conn *Conn) InsertWebFetchEvent(sessionID uint64, savePayload bool, e *FetchEvent) error {
+func (conn *Conn) InsertWebFetchEvent(sessionID uint64, projectID uint32, savePayload bool, e *FetchEvent) error {
 	var request, response *string
 	if savePayload {
 		request = &e.Request
 		response = &e.Response
 	}
 	host, path, query, err := url.GetURLParts(e.URL)
-	conn.insertAutocompleteValue(sessionID, "REQUEST", path)
+	conn.insertAutocompleteValue(sessionID, projectID, "REQUEST", path)
 	if err != nil {
 		return err
 	}
@@ -246,29 +173,15 @@ func (conn *Conn) InsertWebFetchEvent(sessionID uint64, savePayload bool, e *Fet
 	return nil
 }
 
-func (conn *Conn) InsertWebGraphQLEvent(sessionID uint64, savePayload bool, e *GraphQLEvent) error {
+func (conn *Conn) InsertWebGraphQLEvent(sessionID uint64, projectID uint32, savePayload bool, e *GraphQLEvent) error {
 	var request, response *string
 	if savePayload {
 		request = &e.Variables
 		response = &e.Response
 	}
-	conn.insertAutocompleteValue(sessionID, "GRAPHQL", e.OperationName)
-
-	sqlRequest := `
-		INSERT INTO events.graphql (
-			session_id, timestamp, message_id, 
-			name,
-			request_body, response_body
-		) VALUES (
-			$1, $2, $3, 
-			left($4, 2700),
-			$5, $6
-		) ON CONFLICT DO NOTHING`
-	conn.batchQueue(sessionID, sqlRequest, sessionID, e.Timestamp, e.MessageID,
-		e.OperationName, request, response,
-	)
-
-	// Record approximate message size
-	conn.updateBatchSize(sessionID, len(sqlRequest)+len(e.OperationName)+len(e.Variables)+len(e.Response)+8*3)
+	if err := conn.webGraphQLEvents.Append(sessionID, e.Timestamp, e.MessageID, e.OperationName, request, response); err != nil {
+		log.Printf("insert web graphQL event err: %s", err)
+	}
+	conn.insertAutocompleteValue(sessionID, projectID, "GRAPHQL", e.OperationName)
 	return nil
 }
diff --git a/backend/pkg/db/postgres/pool.go b/backend/pkg/db/postgres/pool.go
new file mode 100644
index 000000000..5f9cbaa29
--- /dev/null
+++ b/backend/pkg/db/postgres/pool.go
@@ -0,0 +1,175 @@
+package postgres
+
+import (
+	"context"
+	"errors"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric/instrument/syncfloat64"
+	"strings"
+	"time"
+)
+
+// Pool is a pgx.Pool wrapper with metrics integration
+type Pool interface {
+	Query(sql string, args ...interface{}) (pgx.Rows, error)
+	QueryRow(sql string, args ...interface{}) pgx.Row
+	Exec(sql string, arguments ...interface{}) error
+	SendBatch(b *pgx.Batch) pgx.BatchResults
+	Begin() (*_Tx, error)
+	Close()
+}
+
+type poolImpl struct {
+	conn              *pgxpool.Pool
+	sqlRequestTime    syncfloat64.Histogram
+	sqlRequestCounter syncfloat64.Counter
+}
+
+func (p *poolImpl) Query(sql string, args ...interface{}) (pgx.Rows, error) {
+	start := time.Now()
+	res, err := p.conn.Query(getTimeoutContext(), sql, args...)
+	method, table := methodName(sql)
+	p.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	p.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
+	return res, err
+}
+
+func (p *poolImpl) QueryRow(sql string, args ...interface{}) pgx.Row {
+	start := time.Now()
+	res := p.conn.QueryRow(getTimeoutContext(), sql, args...)
+	method, table := methodName(sql)
+	p.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	p.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
+	return res
+}
+
+func (p *poolImpl) Exec(sql string, arguments ...interface{}) error {
+	start := time.Now()
+	_, err := p.conn.Exec(getTimeoutContext(), sql, arguments...)
+	method, table := methodName(sql)
+	p.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	p.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
+	return err
+}
+
+func (p *poolImpl) SendBatch(b *pgx.Batch) pgx.BatchResults {
+	start := time.Now()
+	res := p.conn.SendBatch(getTimeoutContext(), b)
+	p.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "sendBatch"))
+	p.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "sendBatch"))
+	return res
+}
+
+func (p *poolImpl) Begin() (*_Tx, error) {
+	start := time.Now()
+	tx, err := p.conn.Begin(context.Background())
+	p.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "begin"))
+	p.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "begin"))
+	return &_Tx{tx, p.sqlRequestTime, p.sqlRequestCounter}, err
+}
+
+func (p *poolImpl) Close() {
+	p.conn.Close()
+}
+
+func NewPool(conn *pgxpool.Pool, sqlRequestTime syncfloat64.Histogram, sqlRequestCounter syncfloat64.Counter) (Pool, error) {
+	if conn == nil {
+		return nil, errors.New("conn is empty")
+	}
+	return &poolImpl{
+		conn:              conn,
+		sqlRequestTime:    sqlRequestTime,
+		sqlRequestCounter: sqlRequestCounter,
+	}, nil
+}
+
+// TX - start
+
+type _Tx struct {
+	pgx.Tx
+	sqlRequestTime    syncfloat64.Histogram
+	sqlRequestCounter syncfloat64.Counter
+}
+
+func (tx *_Tx) exec(sql string, args ...interface{}) error {
+	start := time.Now()
+	_, err := tx.Exec(context.Background(), sql, args...)
+	method, table := methodName(sql)
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", method), attribute.String("table", table))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", method), attribute.String("table", table))
+	return err
+}
+
+func (tx *_Tx) rollback() error {
+	start := time.Now()
+	err := tx.Rollback(context.Background())
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "rollback"))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "rollback"))
+	return err
+}
+
+func (tx *_Tx) commit() error {
+	start := time.Now()
+	err := tx.Commit(context.Background())
+	tx.sqlRequestTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()),
+		attribute.String("method", "commit"))
+	tx.sqlRequestCounter.Add(context.Background(), 1,
+		attribute.String("method", "commit"))
+	return err
+}
+
+// TX - end
+
+func getTimeoutContext() context.Context {
+	ctx, _ := context.WithTimeout(context.Background(), time.Second*30)
+	return ctx
+}
+
+func methodName(sql string) (string, string) {
+	cmd, table := "unknown", "unknown"
+
+	// Prepare sql request for parsing
+	sql = strings.TrimSpace(sql)
+	sql = strings.ReplaceAll(sql, "\n", " ")
+	sql = strings.ReplaceAll(sql, "\t", "")
+	sql = strings.ToLower(sql)
+
+	// Get sql command name
+	parts := strings.Split(sql, " ")
+	if parts[0] == "" {
+		return cmd, table
+	} else {
+		cmd = strings.TrimSpace(parts[0])
+	}
+
+	// Get table name
+	switch cmd {
+	case "select":
+		for i, p := range parts {
+			if strings.TrimSpace(p) == "from" {
+				table = strings.TrimSpace(parts[i+1])
+			}
+		}
+	case "update":
+		table = strings.TrimSpace(parts[1])
+	case "insert":
+		table = strings.TrimSpace(parts[2])
+	}
+	return cmd, table
+}
diff --git a/backend/pkg/db/postgres/project.go b/backend/pkg/db/postgres/project.go
index 066339791..f38161885 100644
--- a/backend/pkg/db/postgres/project.go
+++ b/backend/pkg/db/postgres/project.go
@@ -6,7 +6,7 @@ import (
 
 func (conn *Conn) GetProjectByKey(projectKey string) (*Project, error) {
 	p := &Project{ProjectKey: projectKey}
-	if err := conn.queryRow(`
+	if err := conn.c.QueryRow(`
 		SELECT max_session_duration, sample_rate, project_id
 		FROM projects
 		WHERE project_key=$1 AND active = true
@@ -21,7 +21,7 @@ func (conn *Conn) GetProjectByKey(projectKey string) (*Project, error) {
 // TODO: logical separation of metadata
 func (conn *Conn) GetProject(projectID uint32) (*Project, error) {
 	p := &Project{ProjectID: projectID}
-	if err := conn.queryRow(`
+	if err := conn.c.QueryRow(`
 		SELECT project_key, max_session_duration, save_request_payloads,
 			metadata_1, metadata_2, metadata_3, metadata_4, metadata_5,
 			metadata_6, metadata_7, metadata_8, metadata_9, metadata_10
diff --git a/backend/pkg/db/postgres/session-updates.go b/backend/pkg/db/postgres/session-updates.go
new file mode 100644
index 000000000..14260c2c6
--- /dev/null
+++ b/backend/pkg/db/postgres/session-updates.go
@@ -0,0 +1,30 @@
+package postgres
+
+// Mechanism of combination several session updates into one
+const sessionUpdateReq = `UPDATE sessions SET (pages_count, events_count) = (pages_count + $1, events_count + $2) WHERE session_id = $3`
+
+type sessionUpdates struct {
+	sessionID uint64
+	pages     int
+	events    int
+}
+
+func NewSessionUpdates(sessionID uint64) *sessionUpdates {
+	return &sessionUpdates{
+		sessionID: sessionID,
+		pages:     0,
+		events:    0,
+	}
+}
+
+func (su *sessionUpdates) add(pages, events int) {
+	su.pages += pages
+	su.events += events
+}
+
+func (su *sessionUpdates) request() (string, []interface{}) {
+	if su.pages == 0 && su.events == 0 {
+		return "", nil
+	}
+	return sessionUpdateReq, []interface{}{su.pages, su.events, su.sessionID}
+}
diff --git a/backend/pkg/db/postgres/session.go b/backend/pkg/db/postgres/session.go
index 7148d9871..9735cdc1a 100644
--- a/backend/pkg/db/postgres/session.go
+++ b/backend/pkg/db/postgres/session.go
@@ -1,14 +1,11 @@
 package postgres
 
-//import 	. "openreplay/backend/pkg/messages"
 import . "openreplay/backend/pkg/db/types"
 
-//import "log"
-
 func (conn *Conn) GetSession(sessionID uint64) (*Session, error) {
 	s := &Session{SessionID: sessionID}
 	var revID, userOSVersion *string
-	if err := conn.queryRow(`
+	if err := conn.c.QueryRow(`
 		SELECT platform,
 			duration, project_id, start_ts,
 			user_uuid, user_os, user_os_version, 
@@ -39,69 +36,3 @@ func (conn *Conn) GetSession(sessionID uint64) (*Session, error) {
 	}
 	return s, nil
 }
-
-// func (conn *Conn) GetSessionClickEvents(sessionID uint64) (list []IOSClickEvent, err error) {
-// 	rows, err := conn.query(`
-// 		SELECT
-// 			timestamp, seq_index, label
-// 		FROM events_ios.clicks
-// 		WHERE session_id=$1
-// 	`, sessionID)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	defer rows.Close()
-// 	for rows.Next() {
-// 		e := new(IOSClickEvent)
-// 		if err = rows.Scan(&e.Timestamp, &e.Index, &e.Label); err != nil {
-// 			log.Printf("Error while scanning click events: %v", err)
-// 		} else {
-// 			list = append(list, e)
-// 		}
-// 	}
-// 	return list
-// }
-
-// func (conn *Conn) GetSessionInputEvents(sessionID uint64) (list []IOSInputEvent, err error) {
-// 	rows, err := conn.query(`
-// 		SELECT
-// 			timestamp, seq_index, label, value
-// 		FROM events_ios.inputs
-// 		WHERE session_id=$1
-// 	`, sessionID)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	defer rows.Close()
-// 	for rows.Next() {
-// 		e := new(IOSInputEvent)
-// 		if err = rows.Scan(&e.Timestamp, &e.Index, &e.Label, &e.Value); err != nil {
-// 			log.Printf("Error while scanning click events: %v", err)
-// 		} else {
-// 			list = append(list, e)
-// 		}
-// 	}
-// 	return list
-// }
-
-// func (conn *Conn) GetSessionCrashEvents(sessionID uint64) (list []IOSCrash, err error) {
-// 	rows, err := conn.query(`
-// 		SELECT
-// 			timestamp, seq_index
-// 		FROM events_ios.crashes
-// 		WHERE session_id=$1
-// 	`, sessionID)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	defer rows.Close()
-// 	for rows.Next() {
-// 		e := new(IOSCrash)
-// 		if err = rows.Scan(&e.Timestamp, &e.Index, &e.Label, &e.Value); err != nil {
-// 			log.Printf("Error while scanning click events: %v", err)
-// 		} else {
-// 			list = append(list, e)
-// 		}
-// 	}
-// 	return list
-// }
diff --git a/backend/pkg/db/postgres/unstarted-session.go b/backend/pkg/db/postgres/unstarted-session.go
index 2a9a71037..cc27e3f5d 100644
--- a/backend/pkg/db/postgres/unstarted-session.go
+++ b/backend/pkg/db/postgres/unstarted-session.go
@@ -16,7 +16,7 @@ type UnstartedSession struct {
 }
 
 func (conn *Conn) InsertUnstartedSession(s UnstartedSession) error {
-	return conn.exec(`
+	return conn.c.Exec(`
 		INSERT INTO unstarted_sessions (
 			project_id, 
 			tracker_version, do_not_track, 

From 8f54247a29f771ee68e0d023ac439624fc14731a Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Tue, 19 Jul 2022 16:16:01 +0200
Subject: [PATCH 39/77] feat(backend/storage): added new reading_duration
 metric for storage service

---
 backend/internal/storage/storage.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/internal/storage/storage.go b/backend/internal/storage/storage.go
index abe8089be..8d79468db 100644
--- a/backend/internal/storage/storage.go
+++ b/backend/internal/storage/storage.go
@@ -21,6 +21,7 @@ type Storage struct {
 	startBytes    []byte
 	totalSessions syncfloat64.Counter
 	sessionSize   syncfloat64.Histogram
+	readingTime   syncfloat64.Histogram
 	archivingTime syncfloat64.Histogram
 }
 
@@ -40,6 +41,10 @@ func New(cfg *config.Config, s3 *storage.S3, metrics *monitoring.Metrics) (*Stor
 	if err != nil {
 		log.Printf("can't create session_size metric: %s", err)
 	}
+	readingTime, err := metrics.RegisterHistogram("reading_duration")
+	if err != nil {
+		log.Printf("can't create reading_duration metric: %s", err)
+	}
 	archivingTime, err := metrics.RegisterHistogram("archiving_duration")
 	if err != nil {
 		log.Printf("can't create archiving_duration metric: %s", err)
@@ -50,16 +55,17 @@ func New(cfg *config.Config, s3 *storage.S3, metrics *monitoring.Metrics) (*Stor
 		startBytes:    make([]byte, cfg.FileSplitSize),
 		totalSessions: totalSessions,
 		sessionSize:   sessionSize,
+		readingTime:   readingTime,
 		archivingTime: archivingTime,
 	}, nil
 }
 
 func (s *Storage) UploadKey(key string, retryCount int) error {
-	start := time.Now()
 	if retryCount <= 0 {
 		return nil
 	}
 
+	start := time.Now()
 	file, err := os.Open(s.cfg.FSDir + "/" + key)
 	if err != nil {
 		sessID, _ := strconv.ParseUint(key, 10, 64)
@@ -84,6 +90,9 @@ func (s *Storage) UploadKey(key string, retryCount int) error {
 		})
 		return nil
 	}
+	s.readingTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()))
+
+	start = time.Now()
 	startReader := bytes.NewBuffer(s.startBytes[:nRead])
 	if err := s.s3.Upload(s.gzipFile(startReader), key, "application/octet-stream", true); err != nil {
 		log.Fatalf("Storage: start upload failed.  %v\n", err)
@@ -93,6 +102,7 @@ func (s *Storage) UploadKey(key string, retryCount int) error {
 			log.Fatalf("Storage: end upload failed. %v\n", err)
 		}
 	}
+	s.archivingTime.Record(context.Background(), float64(time.Now().Sub(start).Milliseconds()))
 
 	// Save metrics
 	var fileSize float64 = 0
@@ -103,7 +113,7 @@ func (s *Storage) UploadKey(key string, retryCount int) error {
 		fileSize = float64(fileInfo.Size())
 	}
 	ctx, _ := context.WithTimeout(context.Background(), time.Millisecond*200)
-	s.archivingTime.Record(ctx, float64(time.Now().Sub(start).Milliseconds()))
+
 	s.sessionSize.Record(ctx, fileSize)
 	s.totalSessions.Add(ctx, 1)
 	return nil

From 56f68273d517b68740dd39a7864969dc566fe3cf Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Tue, 19 Jul 2022 17:45:22 +0200
Subject: [PATCH 40/77] fix(backend/db): fixed arguments order for autocomplete
 inserts

---
 backend/pkg/db/postgres/connector.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/pkg/db/postgres/connector.go b/backend/pkg/db/postgres/connector.go
index 0360c54bc..1cc537982 100644
--- a/backend/pkg/db/postgres/connector.go
+++ b/backend/pkg/db/postgres/connector.go
@@ -149,7 +149,7 @@ func (conn *Conn) insertAutocompleteValue(sessionID uint64, projectID uint32, tp
 	if len(value) == 0 {
 		return
 	}
-	if err := conn.autocompletes.Append(tp, value, projectID); err != nil {
+	if err := conn.autocompletes.Append(value, tp, projectID); err != nil {
 		log.Printf("autocomplete bulk err: %s", err)
 	}
 }

From 0584f52f55640a4fc7706c1bdd29f76811f766c2 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 20 Jul 2022 11:58:24 +0200
Subject: [PATCH 41/77] chore(docker): Updating docker image for nginx

Updated base image. Fixed busybox vulnerability
---
 scripts/dockerfiles/nginx/Dockerfile          | 186 ++++++++++++++++--
 .../dockerfiles/nginx/nginx.vh.default.conf   |  58 ++++++
 2 files changed, 231 insertions(+), 13 deletions(-)
 create mode 100644 scripts/dockerfiles/nginx/nginx.vh.default.conf

diff --git a/scripts/dockerfiles/nginx/Dockerfile b/scripts/dockerfiles/nginx/Dockerfile
index 53da15731..caf6b283b 100644
--- a/scripts/dockerfiles/nginx/Dockerfile
+++ b/scripts/dockerfiles/nginx/Dockerfile
@@ -1,23 +1,183 @@
-# Ability to add sticky sessions using any parameters
-FROM openresty/openresty:buster as builder
-workdir /work
-ADD https://github.com/openresty/lua-resty-balancer/archive/refs/heads/master.tar.gz .
-RUN apt update && \
-    apt install gcc make -y && \
-    tar -xf master.tar.gz && \
-    cd lua-resty-balancer-master && \
-    make
+# Dockerfile - alpine
+# https://github.com/openresty/docker-openresty
+
+ARG RESTY_IMAGE_BASE="alpine"
+ARG RESTY_IMAGE_TAG="3.16"
+
+FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
+
+LABEL maintainer="Evan Wies <evan@neomantra.net>"
+
+# Docker Build Arguments
+ARG RESTY_IMAGE_BASE="alpine"
+ARG RESTY_IMAGE_TAG="3.16"
+ARG RESTY_VERSION="1.21.4.1"
+ARG RESTY_OPENSSL_VERSION="1.1.1p"
+ARG RESTY_OPENSSL_PATCH_VERSION="1.1.1f"
+ARG RESTY_OPENSSL_URL_BASE="https://www.openssl.org/source"
+ARG RESTY_PCRE_VERSION="8.45"
+ARG RESTY_PCRE_BUILD_OPTIONS="--enable-jit"
+ARG RESTY_PCRE_SHA256="4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09"
+ARG RESTY_J="1"
+ARG RESTY_CONFIG_OPTIONS="\
+    --with-compat \
+    --with-file-aio \
+    --with-http_addition_module \
+    --with-http_auth_request_module \
+    --with-http_dav_module \
+    --with-http_flv_module \
+    --with-http_geoip_module=dynamic \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_image_filter_module=dynamic \
+    --with-http_mp4_module \
+    --with-http_random_index_module \
+    --with-http_realip_module \
+    --with-http_secure_link_module \
+    --with-http_slice_module \
+    --with-http_ssl_module \
+    --with-http_stub_status_module \
+    --with-http_sub_module \
+    --with-http_v2_module \
+    --with-http_xslt_module=dynamic \
+    --with-ipv6 \
+    --with-mail \
+    --with-mail_ssl_module \
+    --with-md5-asm \
+    --with-sha1-asm \
+    --with-stream \
+    --with-stream_ssl_module \
+    --with-threads \
+    "
+ARG RESTY_CONFIG_OPTIONS_MORE=""
+ARG RESTY_LUAJIT_OPTIONS="--with-luajit-xcflags='-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT'"
+ARG RESTY_PCRE_OPTIONS="--with-pcre-jit"
+
+ARG RESTY_ADD_PACKAGE_BUILDDEPS=""
+ARG RESTY_ADD_PACKAGE_RUNDEPS=""
+ARG RESTY_EVAL_PRE_CONFIGURE=""
+ARG RESTY_EVAL_POST_MAKE=""
+
+# These are not intended to be user-specified
+ARG _RESTY_CONFIG_DEPS="--with-pcre \
+    --with-cc-opt='-DNGX_LUA_ABORT_AT_PANIC -I/usr/local/openresty/pcre/include -I/usr/local/openresty/openssl/include' \
+    --with-ld-opt='-L/usr/local/openresty/pcre/lib -L/usr/local/openresty/openssl/lib -Wl,-rpath,/usr/local/openresty/pcre/lib:/usr/local/openresty/openssl/lib' \
+    "
+
+LABEL resty_image_base="${RESTY_IMAGE_BASE}"
+LABEL resty_image_tag="${RESTY_IMAGE_TAG}"
+LABEL resty_version="${RESTY_VERSION}"
+LABEL resty_openssl_version="${RESTY_OPENSSL_VERSION}"
+LABEL resty_openssl_patch_version="${RESTY_OPENSSL_PATCH_VERSION}"
+LABEL resty_openssl_url_base="${RESTY_OPENSSL_URL_BASE}"
+LABEL resty_pcre_version="${RESTY_PCRE_VERSION}"
+LABEL resty_pcre_build_options="${RESTY_PCRE_BUILD_OPTIONS}"
+LABEL resty_pcre_sha256="${RESTY_PCRE_SHA256}"
+LABEL resty_config_options="${RESTY_CONFIG_OPTIONS}"
+LABEL resty_config_options_more="${RESTY_CONFIG_OPTIONS_MORE}"
+LABEL resty_config_deps="${_RESTY_CONFIG_DEPS}"
+LABEL resty_add_package_builddeps="${RESTY_ADD_PACKAGE_BUILDDEPS}"
+LABEL resty_add_package_rundeps="${RESTY_ADD_PACKAGE_RUNDEPS}"
+LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
+LABEL resty_eval_post_make="${RESTY_EVAL_POST_MAKE}"
+LABEL resty_luajit_options="${RESTY_LUAJIT_OPTIONS}"
+LABEL resty_pcre_options="${RESTY_PCRE_OPTIONS}"
+
+RUN apk add --no-cache --virtual .build-deps \
+        build-base \
+        coreutils \
+        curl \
+        gd-dev \
+        geoip-dev \
+        libxslt-dev \
+        linux-headers \
+        make \
+        perl-dev \
+        readline-dev \
+        zlib-dev \
+        ${RESTY_ADD_PACKAGE_BUILDDEPS} \
+    && apk add --no-cache \
+        gd \
+        geoip \
+        libgcc \
+        libxslt \
+        zlib \
+        ${RESTY_ADD_PACKAGE_RUNDEPS} \
+    && cd /tmp \
+    && if [ -n "${RESTY_EVAL_PRE_CONFIGURE}" ]; then eval $(echo ${RESTY_EVAL_PRE_CONFIGURE}); fi \
+    && cd /tmp \
+    && curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
+    && tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
+    && cd openssl-${RESTY_OPENSSL_VERSION} \
+    && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \
+        echo 'patching OpenSSL 1.1.1 for OpenResty' \
+        && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
+    fi \
+    && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.0" ] ; then \
+        echo 'patching OpenSSL 1.1.0 for OpenResty' \
+        && curl -s https://raw.githubusercontent.com/openresty/openresty/ed328977028c3ec3033bc25873ee360056e247cd/patches/openssl-1.1.0j-parallel_build_fix.patch | patch -p1 \
+        && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \
+    fi \
+    && ./config \
+      no-threads shared zlib -g \
+      enable-ssl3 enable-ssl3-method \
+      --prefix=/usr/local/openresty/openssl \
+      --libdir=lib \
+      -Wl,-rpath,/usr/local/openresty/openssl/lib \
+    && make -j${RESTY_J} \
+    && make -j${RESTY_J} install_sw \
+    && cd /tmp \
+    && curl -fSL https://downloads.sourceforge.net/project/pcre/pcre/${RESTY_PCRE_VERSION}/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \
+    && echo "${RESTY_PCRE_SHA256}  pcre-${RESTY_PCRE_VERSION}.tar.gz" | shasum -a 256 --check \
+    && tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz \
+    && cd /tmp/pcre-${RESTY_PCRE_VERSION} \
+    && ./configure \
+        --prefix=/usr/local/openresty/pcre \
+        --disable-cpp \
+        --enable-utf \
+        --enable-unicode-properties \
+        ${RESTY_PCRE_BUILD_OPTIONS} \
+    && make -j${RESTY_J} \
+    && make -j${RESTY_J} install \
+    && cd /tmp \
+    && curl -fSL https://openresty.org/download/openresty-${RESTY_VERSION}.tar.gz -o openresty-${RESTY_VERSION}.tar.gz \
+    && tar xzf openresty-${RESTY_VERSION}.tar.gz \
+    && cd /tmp/openresty-${RESTY_VERSION} \
+    && eval ./configure -j${RESTY_J} ${_RESTY_CONFIG_DEPS} ${RESTY_CONFIG_OPTIONS} ${RESTY_CONFIG_OPTIONS_MORE} ${RESTY_LUAJIT_OPTIONS} ${RESTY_PCRE_OPTIONS} \
+    && make -j${RESTY_J} \
+    && make -j${RESTY_J} install \
+    && cd /tmp \
+    && if [ -n "${RESTY_EVAL_POST_MAKE}" ]; then eval $(echo ${RESTY_EVAL_POST_MAKE}); fi \
+    && rm -rf \
+        openssl-${RESTY_OPENSSL_VERSION}.tar.gz openssl-${RESTY_OPENSSL_VERSION} \
+        pcre-${RESTY_PCRE_VERSION}.tar.gz pcre-${RESTY_PCRE_VERSION} \
+        openresty-${RESTY_VERSION}.tar.gz openresty-${RESTY_VERSION} \
+    && apk del .build-deps \
+    && mkdir -p /var/run/openresty \
+    && ln -sf /dev/stdout /usr/local/openresty/nginx/logs/access.log \
+    && ln -sf /dev/stderr /usr/local/openresty/nginx/logs/error.log
+
+# Add additional binaries into PATH for convenience
+ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
+
+# Copy nginx configuration files
+COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
+COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
+
+CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"]
+
+# Use SIGQUIT instead of default SIGTERM to cleanly drain requests
+# See https://github.com/openresty/docker-openresty/blob/master/README.md#tips--pitfalls
+STOPSIGNAL SIGQUIT
 
 
-FROM openresty/openresty:buster
+# Openreplay Custom configs
 
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 # Adding prometheus monitoring support
 ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus.lua /usr/local/openresty/lualib/
 ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus_keys.lua /usr/local/openresty/lualib/
 ADD https://raw.githubusercontent.com/knyar/nginx-lua-prometheus/master/prometheus_resty_counter.lua /usr/local/openresty/lualib/
-COPY --from=builder /work/lua-resty-balancer-master/*.so /usr/local/openresty/lualib/lua-resty-chash/
-COPY --from=builder /work/lua-resty-balancer-master/lib /usr/local/openresty/lualib/lua-resty-chash/lib/
-
 RUN chmod 0644 /usr/local/openresty/lualib/*.lua
 
 # Enabling monitoring on port 9145
diff --git a/scripts/dockerfiles/nginx/nginx.vh.default.conf b/scripts/dockerfiles/nginx/nginx.vh.default.conf
new file mode 100644
index 000000000..3ad957225
--- /dev/null
+++ b/scripts/dockerfiles/nginx/nginx.vh.default.conf
@@ -0,0 +1,58 @@
+# nginx.vh.default.conf  --  docker-openresty
+#
+# This file is installed to:
+#   `/etc/nginx/conf.d/default.conf`
+#
+# It tracks the `server` section of the upstream OpenResty's `nginx.conf`.
+#
+# This config (and any other configs in `etc/nginx/conf.d/`) is loaded by
+# default by the `include` directive in `/usr/local/openresty/nginx/conf/nginx.conf`.
+#
+# See https://github.com/openresty/docker-openresty/blob/master/README.md#nginx-config-files
+#
+
+
+server {
+    listen       80;
+    server_name  localhost;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/local/openresty/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/local/openresty/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           /usr/local/openresty/nginx/html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}

From a94b3f4410714b712f8f515750239a6246c4cf65 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 20 Jul 2022 11:49:18 +0000
Subject: [PATCH 42/77] chore(docker): Updated docker base image

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 api/Dockerfile           | 1 +
 api/Dockerfile.alerts    | 3 ++-
 backend/Dockerfile       | 1 +
 ee/api/Dockerfile        | 3 ++-
 ee/api/Dockerfile.alerts | 3 ++-
 ee/api/Dockerfile.crons  | 1 +
 ee/utilities/Dockerfile  | 3 ++-
 frontend/Dockerfile      | 1 +
 peers/Dockerfile         | 3 ++-
 utilities/Dockerfile     | 3 ++-
 10 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 7e99cc457..79f8e8d5e 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -2,6 +2,7 @@ FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 RUN apk add --no-cache build-base nodejs npm tini
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 ARG envarg
 # Add Tini
 # Startup daemon
diff --git a/api/Dockerfile.alerts b/api/Dockerfile.alerts
index 062a1cb3a..5830966b3 100644
--- a/api/Dockerfile.alerts
+++ b/api/Dockerfile.alerts
@@ -1,6 +1,7 @@
 FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache build-base tini
 ARG envarg
 ENV APP_NAME=alerts \
@@ -16,4 +17,4 @@ COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ./entrypoint.sh
\ No newline at end of file
+CMD ./entrypoint.sh
diff --git a/backend/Dockerfile b/backend/Dockerfile
index f7e4b3711..3e353243b 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -19,6 +19,7 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openrep
 
 
 FROM alpine AS entrypoint
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache ca-certificates
 
 ENV TZ=UTC \
diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile
index 9e40d3ca6..92a2868a9 100644
--- a/ee/api/Dockerfile
+++ b/ee/api/Dockerfile
@@ -2,6 +2,7 @@ FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev libxml2-dev xmlsec-dev xmlsec nodejs npm tini
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 ARG envarg
 ENV SOURCE_MAP_VERSION=0.7.4 \
     APP_NAME=chalice \
@@ -20,4 +21,4 @@ COPY . .
 RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/.
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ./entrypoint.sh
\ No newline at end of file
+CMD ./entrypoint.sh
diff --git a/ee/api/Dockerfile.alerts b/ee/api/Dockerfile.alerts
index 6382fa27f..a3bee2a28 100644
--- a/ee/api/Dockerfile.alerts
+++ b/ee/api/Dockerfile.alerts
@@ -1,6 +1,7 @@
 FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache build-base tini
 ARG envarg
 ENV APP_NAME=alerts \
@@ -16,4 +17,4 @@ COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ./entrypoint.sh
\ No newline at end of file
+CMD ./entrypoint.sh
diff --git a/ee/api/Dockerfile.crons b/ee/api/Dockerfile.crons
index 155180006..e29b4440f 100644
--- a/ee/api/Dockerfile.crons
+++ b/ee/api/Dockerfile.crons
@@ -1,6 +1,7 @@
 FROM python:3.10-alpine
 LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache build-base tini
 ARG envarg
 ENV APP_NAME=crons \
diff --git a/ee/utilities/Dockerfile b/ee/utilities/Dockerfile
index f3e605ccc..3c9d2f600 100644
--- a/ee/utilities/Dockerfile
+++ b/ee/utilities/Dockerfile
@@ -1,5 +1,6 @@
 FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache tini git libc6-compat && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg} \
@@ -12,4 +13,4 @@ COPY package-lock.json .
 RUN npm install
 COPY . .
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD npm start
\ No newline at end of file
+CMD npm start
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 198c03c7a..b87d5c172 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -14,5 +14,6 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf
 # Default step in docker build
 FROM nginx:alpine
 LABEL maintainer=Rajesh<rajesh@openreplay.com>
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 COPY --from=builder /work/public /var/www/openreplay
 COPY nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/peers/Dockerfile b/peers/Dockerfile
index c95415177..98475f750 100644
--- a/peers/Dockerfile
+++ b/peers/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 RUN apk add --no-cache tini
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg}
 
@@ -10,4 +11,4 @@ COPY package-lock.json .
 RUN npm install
 COPY . .
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD npm start
\ No newline at end of file
+CMD npm start
diff --git a/utilities/Dockerfile b/utilities/Dockerfile
index 7c3a66719..cb9d081f1 100644
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 RUN apk add --no-cache tini
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg} \
     MAXMINDDB_FILE=/root/geoip.mmdb
@@ -12,4 +13,4 @@ COPY package-lock.json .
 RUN npm install
 COPY . .
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD npm start
\ No newline at end of file
+CMD npm start

From 6840ba7e134897b33a5ddb92e1c32e050f2e5510 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 20 Jul 2022 14:53:53 +0200
Subject: [PATCH 43/77] chore(docker): ingress-controller fix critical
 vulnerability

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/dockerfiles/ingress-controller/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 scripts/dockerfiles/ingress-controller/Dockerfile

diff --git a/scripts/dockerfiles/ingress-controller/Dockerfile b/scripts/dockerfiles/ingress-controller/Dockerfile
new file mode 100644
index 000000000..595be9b4f
--- /dev/null
+++ b/scripts/dockerfiles/ingress-controller/Dockerfile
@@ -0,0 +1,3 @@
+from k8s.gcr.io/ingress-nginx/controller
+# Fix critical vulnerability
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main

From 41c80c12ea7d9c134a76e64fd0a433b8f0c946c1 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 20 Jul 2022 17:18:04 +0000
Subject: [PATCH 44/77] chore(docker): Run non root users for containers

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 api/Dockerfile                                           | 3 +++
 api/Dockerfile.alerts                                    | 2 ++
 api/Dockerfile.bundle                                    | 2 ++
 backend/Dockerfile                                       | 2 ++
 ee/api/Dockerfile                                        | 3 +++
 ee/api/Dockerfile.alerts                                 | 3 +++
 ee/api/Dockerfile.crons                                  | 3 +++
 ee/utilities/Dockerfile                                  | 2 ++
 frontend/Dockerfile                                      | 8 ++++++++
 peers/Dockerfile                                         | 2 ++
 scripts/helmcharts/init.sh                               | 8 ++++++--
 scripts/helmcharts/openreplay/charts/sink/values.yaml    | 6 +++++-
 scripts/helmcharts/openreplay/charts/storage/values.yaml | 6 +++++-
 utilities/Dockerfile                                     | 2 ++
 14 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 79f8e8d5e..cdd8cd295 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -22,5 +22,8 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/.
 
+RUN adduser -u 1001 openreplay -D
+USER 1001
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/api/Dockerfile.alerts b/api/Dockerfile.alerts
index 5830966b3..c4614b3c1 100644
--- a/api/Dockerfile.alerts
+++ b/api/Dockerfile.alerts
@@ -16,5 +16,7 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/api/Dockerfile.bundle b/api/Dockerfile.bundle
index 2f58635f2..b047f6d6c 100644
--- a/api/Dockerfile.bundle
+++ b/api/Dockerfile.bundle
@@ -23,5 +23,7 @@ ARG envarg
 ENV ENTERPRISE_BUILD ${envarg}
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT ["/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 3e353243b..152f6aa3d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -69,4 +69,6 @@ RUN if [ "$SERVICE_NAME" = "http" ]; then \
 
 
 COPY --from=build /root/service /root/service
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT /root/service
diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile
index 92a2868a9..f599bfc45 100644
--- a/ee/api/Dockerfile
+++ b/ee/api/Dockerfile
@@ -20,5 +20,8 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/.
 
+RUN adduser -u 1001 openreplay -D
+USER 1001
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/ee/api/Dockerfile.alerts b/ee/api/Dockerfile.alerts
index a3bee2a28..785b0a5f9 100644
--- a/ee/api/Dockerfile.alerts
+++ b/ee/api/Dockerfile.alerts
@@ -16,5 +16,8 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv app_alerts.py app.py && mv entrypoint_alerts.sh entrypoint.sh
 
+RUN adduser -u 1001 openreplay -D
+USER 1001
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/ee/api/Dockerfile.crons b/ee/api/Dockerfile.crons
index e29b4440f..0647c6fc6 100644
--- a/ee/api/Dockerfile.crons
+++ b/ee/api/Dockerfile.crons
@@ -18,5 +18,8 @@ WORKDIR /work
 COPY . .
 RUN mv env.default .env && mv entrypoint_crons.sh entrypoint.sh
 
+RUN adduser -u 1001 openreplay -D
+USER 1001
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ./entrypoint.sh
diff --git a/ee/utilities/Dockerfile b/ee/utilities/Dockerfile
index 3c9d2f600..f01c7d71c 100644
--- a/ee/utilities/Dockerfile
+++ b/ee/utilities/Dockerfile
@@ -12,5 +12,7 @@ COPY package.json .
 COPY package-lock.json .
 RUN npm install
 COPY . .
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index b87d5c172..2ab0312ab 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -17,3 +17,11 @@ LABEL maintainer=Rajesh<rajesh@openreplay.com>
 RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 COPY --from=builder /work/public /var/www/openreplay
 COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+RUN chown -R nginx:nginx /var/cache/nginx && \
+    chown -R nginx:nginx /var/log/nginx && \
+    chown -R nginx:nginx /etc/nginx/conf.d && \
+    touch /var/run/nginx.pid && \
+    chown -R nginx:nginx /var/run/nginx.pid
+
+USER nginx
diff --git a/peers/Dockerfile b/peers/Dockerfile
index 98475f750..b05fdee3a 100644
--- a/peers/Dockerfile
+++ b/peers/Dockerfile
@@ -10,5 +10,7 @@ COPY package.json .
 COPY package-lock.json .
 RUN npm install
 COPY . .
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start
diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh
index 078a60583..5fe454f90 100644
--- a/scripts/helmcharts/init.sh
+++ b/scripts/helmcharts/init.sh
@@ -107,8 +107,12 @@ sed_i_wrapper -i "s/secretKey: \"changeMeMinioPassword\"/secretKey: \"$(randomPa
 sed_i_wrapper -i "s/jwt_secret: \"SetARandomStringHere\"/jwt_secret: \"$(randomPass)\"/g" vars.yaml
 sed_i_wrapper -i "s/domainName: \"\"/domainName: \"${DOMAIN_NAME}\"/g" vars.yaml
 
+info "Setting proper permission for shared folder"
+sudo mkdir -p /openreplay/storage/nfs
+sudo chown -R 1001:1001 /openreplay/storage/nfs
+
 ## Installing OpenReplay
-info "Installing databases"
+info "installing databases"
 helm upgrade --install databases ./databases -n db --create-namespace --wait -f ./vars.yaml --atomic
-info "Installing application"
+info "installing application"
 helm upgrade --install openreplay ./openreplay -n app --create-namespace --wait -f ./vars.yaml --atomic
diff --git a/scripts/helmcharts/openreplay/charts/sink/values.yaml b/scripts/helmcharts/openreplay/charts/sink/values.yaml
index 11df1d4e7..a37ecfa41 100644
--- a/scripts/helmcharts/openreplay/charts/sink/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/values.yaml
@@ -25,7 +25,11 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  runAsUser: 1001
+  runAsGroup: 1001
+  fsGroup: 1001
+  fsGroupChangePolicy: "OnRootMismatch"
   # fsGroup: 2000
 
 securityContext: {}
diff --git a/scripts/helmcharts/openreplay/charts/storage/values.yaml b/scripts/helmcharts/openreplay/charts/storage/values.yaml
index 5adbf189f..b73c2cf1e 100644
--- a/scripts/helmcharts/openreplay/charts/storage/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/values.yaml
@@ -25,7 +25,11 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  runAsUser: 1001
+  runAsGroup: 1001
+  fsGroup: 1001
+  fsGroupChangePolicy: "OnRootMismatch"
   # fsGroup: 2000
 
 securityContext: {}
diff --git a/utilities/Dockerfile b/utilities/Dockerfile
index cb9d081f1..cbf217339 100644
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@@ -12,5 +12,7 @@ COPY package.json .
 COPY package-lock.json .
 RUN npm install
 COPY . .
+RUN adduser -u 1001 openreplay -D
+USER 1001
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start

From 3afb72c037076e9c1b222cd6fb9abd13fb5980ce Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 08:56:57 +0200
Subject: [PATCH 45/77] fix(helm): updated non-root path for backend services

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 backend/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 152f6aa3d..23f37e22d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -21,12 +21,13 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openrep
 FROM alpine AS entrypoint
 RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache ca-certificates
+RUN adduser -u 1001 openreplay -D
 
 ENV TZ=UTC \
     FS_ULIMIT=1000 \
     FS_DIR=/mnt/efs \
-    MAXMINDDB_FILE=/root/geoip.mmdb \
-    UAPARSER_FILE=/root/regexes.yaml \
+    MAXMINDDB_FILE=/home/openreplay/geoip.mmdb \
+    UAPARSER_FILE=/home/openreplay/regexes.yaml \
     HTTP_PORT=80 \
     KAFKA_USE_SSL=true \
     KAFKA_MAX_POLL_INTERVAL_MS=400000 \
@@ -68,7 +69,6 @@ RUN if [ "$SERVICE_NAME" = "http" ]; then \
   wget https://static.openreplay.com/geoip/GeoLite2-Country.mmdb -O "$MAXMINDDB_FILE"; fi
 
 
-COPY --from=build /root/service /root/service
-RUN adduser -u 1001 openreplay -D
+COPY --from=build /root/service /home/openreplay/service
 USER 1001
-ENTRYPOINT /root/service
+ENTRYPOINT /home/openreplay/service

From 22bd479dca23e11b538abf9934d408cbd7fb8bb5 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 07:16:56 +0000
Subject: [PATCH 46/77] fix(chalice): user permission issue for geodb

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 ee/utilities/Dockerfile |  8 +++++---
 utilities/Dockerfile    | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ee/utilities/Dockerfile b/ee/utilities/Dockerfile
index f01c7d71c..2de6197a2 100644
--- a/ee/utilities/Dockerfile
+++ b/ee/utilities/Dockerfile
@@ -2,17 +2,19 @@ FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
 RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache tini git libc6-compat && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
+
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg} \
-    MAXMINDDB_FILE=/root/geoip.mmdb
-
+    MAXMINDDB_FILE=/home/openreplay/geoip.mmdb
 WORKDIR /work
-ADD https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
 COPY package.json .
 COPY package-lock.json .
 RUN npm install
 COPY . .
+
 RUN adduser -u 1001 openreplay -D
 USER 1001
+ADD --chown=1001 https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start
diff --git a/utilities/Dockerfile b/utilities/Dockerfile
index cbf217339..2de6197a2 100644
--- a/utilities/Dockerfile
+++ b/utilities/Dockerfile
@@ -1,18 +1,20 @@
 FROM node:18-alpine
 LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
-RUN apk add --no-cache tini
 RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk add --no-cache tini git libc6-compat && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2
+
 ARG envarg
 ENV ENTERPRISE_BUILD=${envarg} \
-    MAXMINDDB_FILE=/root/geoip.mmdb
-
+    MAXMINDDB_FILE=/home/openreplay/geoip.mmdb
 WORKDIR /work
-ADD https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
 COPY package.json .
 COPY package-lock.json .
 RUN npm install
 COPY . .
+
 RUN adduser -u 1001 openreplay -D
 USER 1001
+ADD --chown=1001 https://static.openreplay.com/geoip/GeoLite2-Country.mmdb  $MAXMINDDB_FILE
+
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD npm start

From 7e92ac29bf5314c0c43376228e628a6cbd917413 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 10:43:10 +0200
Subject: [PATCH 47/77] chore(docker): updater ingress image

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helmcharts/openreplay/values.yaml b/scripts/helmcharts/openreplay/values.yaml
index 92a932aad..1cf12370f 100644
--- a/scripts/helmcharts/openreplay/values.yaml
+++ b/scripts/helmcharts/openreplay/values.yaml
@@ -102,4 +102,4 @@ ingress-nginx:
       ## for backwards compatibility consider setting the full image url via the repository value below
       ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
       ## repository:
-      tag: "v1.2.1"
+      tag: "v1.3.0"

From 1997d326d6c70b3f303eddf6a102c78ae2df0d23 Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Thu, 21 Jul 2022 10:55:20 +0200
Subject: [PATCH 48/77] Fix duplicates (#628)

* feat(backend/ender): added check for sessionEnd duplicates
---
 backend/cmd/ender/main.go                  | 12 +++++++++++-
 backend/pkg/db/cache/messages-common.go    |  8 ++------
 backend/pkg/db/cache/messages-ios.go       |  3 ++-
 backend/pkg/db/cache/messages-web.go       |  3 ++-
 backend/pkg/db/postgres/messages-common.go |  8 ++++++++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/backend/cmd/ender/main.go b/backend/cmd/ender/main.go
index c0613fca0..1fd2f4e64 100644
--- a/backend/cmd/ender/main.go
+++ b/backend/cmd/ender/main.go
@@ -82,10 +82,20 @@ func main() {
 			// Find ended sessions and send notification to other services
 			sessions.HandleEndedSessions(func(sessionID uint64, timestamp int64) bool {
 				msg := &messages.SessionEnd{Timestamp: uint64(timestamp)}
-				if err := pg.InsertSessionEnd(sessionID, msg.Timestamp); err != nil {
+				currDuration, err := pg.GetSessionDuration(sessionID)
+				if err != nil {
+					log.Printf("getSessionDuration failed, sessID: %d, err: %s", sessionID, err)
+				}
+				newDuration, err := pg.InsertSessionEnd(sessionID, msg.Timestamp)
+				if err != nil {
 					log.Printf("can't save sessionEnd to database, sessID: %d, err: %s", sessionID, err)
 					return false
 				}
+				if currDuration == newDuration {
+					log.Printf("sessionEnd duplicate, sessID: %d, prevDur: %d, newDur: %d", sessionID,
+						currDuration, newDuration)
+					return true
+				}
 				if err := producer.Produce(cfg.TopicRawWeb, sessionID, messages.Encode(msg)); err != nil {
 					log.Printf("can't send sessionEnd to topic: %s; sessID: %d", err, sessionID)
 					return false
diff --git a/backend/pkg/db/cache/messages-common.go b/backend/pkg/db/cache/messages-common.go
index cebdaf5e7..41cdb1895 100644
--- a/backend/pkg/db/cache/messages-common.go
+++ b/backend/pkg/db/cache/messages-common.go
@@ -7,12 +7,8 @@ import (
 	//	. "openreplay/backend/pkg/db/types"
 )
 
-func (c *PGCache) InsertSessionEnd(sessionID uint64, timestamp uint64) error {
-	_, err := c.Conn.InsertSessionEnd(sessionID, timestamp)
-	if err != nil {
-		return err
-	}
-	return nil
+func (c *PGCache) InsertSessionEnd(sessionID uint64, timestamp uint64) (uint64, error) {
+	return c.Conn.InsertSessionEnd(sessionID, timestamp)
 }
 
 func (c *PGCache) HandleSessionEnd(sessionID uint64) error {
diff --git a/backend/pkg/db/cache/messages-ios.go b/backend/pkg/db/cache/messages-ios.go
index 87cfef13a..e0463c431 100644
--- a/backend/pkg/db/cache/messages-ios.go
+++ b/backend/pkg/db/cache/messages-ios.go
@@ -32,7 +32,8 @@ func (c *PGCache) InsertIOSSessionStart(sessionID uint64, s *IOSSessionStart) er
 }
 
 func (c *PGCache) InsertIOSSessionEnd(sessionID uint64, e *IOSSessionEnd) error {
-	return c.InsertSessionEnd(sessionID, e.Timestamp)
+	_, err := c.InsertSessionEnd(sessionID, e.Timestamp)
+	return err
 }
 
 func (c *PGCache) InsertIOSScreenEnter(sessionID uint64, screenEnter *IOSScreenEnter) error {
diff --git a/backend/pkg/db/cache/messages-web.go b/backend/pkg/db/cache/messages-web.go
index e704f6c9f..0a864e6d3 100644
--- a/backend/pkg/db/cache/messages-web.go
+++ b/backend/pkg/db/cache/messages-web.go
@@ -63,7 +63,8 @@ func (c *PGCache) HandleWebSessionStart(sessionID uint64, s *SessionStart) error
 }
 
 func (c *PGCache) InsertWebSessionEnd(sessionID uint64, e *SessionEnd) error {
-	return c.InsertSessionEnd(sessionID, e.Timestamp)
+	_, err := c.InsertSessionEnd(sessionID, e.Timestamp)
+	return err
 }
 
 func (c *PGCache) HandleWebSessionEnd(sessionID uint64, e *SessionEnd) error {
diff --git a/backend/pkg/db/postgres/messages-common.go b/backend/pkg/db/postgres/messages-common.go
index 8409d38e7..2925acde3 100644
--- a/backend/pkg/db/postgres/messages-common.go
+++ b/backend/pkg/db/postgres/messages-common.go
@@ -60,6 +60,14 @@ func (conn *Conn) HandleSessionStart(sessionID uint64, s *types.Session) error {
 	return nil
 }
 
+func (conn *Conn) GetSessionDuration(sessionID uint64) (uint64, error) {
+	var dur uint64
+	if err := conn.c.QueryRow("SELECT COALESCE( duration, 0 ) FROM sessions WHERE session_id=$1", sessionID).Scan(&dur); err != nil {
+		return 0, err
+	}
+	return dur, nil
+}
+
 func (conn *Conn) InsertSessionEnd(sessionID uint64, timestamp uint64) (uint64, error) {
 	var dur uint64
 	if err := conn.c.QueryRow(`

From cd2656df957f7cc0d4b715aca0a9fe95ffa853d9 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 10:43:10 +0200
Subject: [PATCH 49/77] chore(docker): updater ingress image

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/helmcharts/openreplay/values.yaml b/scripts/helmcharts/openreplay/values.yaml
index 1cf12370f..20700a4f2 100644
--- a/scripts/helmcharts/openreplay/values.yaml
+++ b/scripts/helmcharts/openreplay/values.yaml
@@ -103,3 +103,4 @@ ingress-nginx:
       ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
       ## repository:
       tag: "v1.3.0"
+      digest: ""

From 3d79940c74634f7c98f117d12233eecf5b949e23 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 11:14:46 +0200
Subject: [PATCH 50/77] chore(docker): Creating inhouse alpine image

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/dockerfiles/alpine/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 scripts/dockerfiles/alpine/Dockerfile

diff --git a/scripts/dockerfiles/alpine/Dockerfile b/scripts/dockerfiles/alpine/Dockerfile
new file mode 100644
index 000000000..db49d3c3d
--- /dev/null
+++ b/scripts/dockerfiles/alpine/Dockerfile
@@ -0,0 +1,3 @@
+FROM alpine
+# Fix busybox vulnerability
+RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main

From 0c147e935d55feb1b5bb408eff8b0399879e2135 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 11:21:59 +0200
Subject: [PATCH 51/77] chore(helm): updating images for crons

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/utilities/templates/efs-cron.yaml   | 1 +
 .../charts/utilities/templates/report-cron.yaml           | 2 +-
 .../charts/utilities/templates/sessions-cleaner-cron.yaml | 2 +-
 .../charts/utilities/templates/telemetry-cron.yaml        | 2 +-
 .../helmcharts/openreplay/charts/utilities/values.yaml    | 8 +++++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index c09c1b65f..b74b0cbad 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -14,6 +14,7 @@ spec:
           containers:
           - name: efs-cleaner
             image: alpine
+            image: "{{ tpl .Values.efsCleaner.image.repository . }}:{{ .Values.efsCleaner.image.tag | default .Chart.AppVersion }}"
             command:
             - /bin/sh
             - -c
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
index 966a47247..350de8c12 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
@@ -15,7 +15,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: report-cron
-            image: "{{ tpl .Values.report.image.repository . }}:{{ .Values.image.tag | default .Chart.AppVersion }}-ee"
+            image: "{{ tpl .Values.report.image.repository . }}:{{ .Values.report.image.tag | default .Chart.AppVersion }}-ee"
             env:
               - name: LICENSE_KEY
                 value: '{{ .Values.global.enterpriseEditionLicense }}'
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
index 9313e88af..47246a5bd 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
@@ -15,7 +15,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: sessions-cleaner-cron
-            image: "{{ tpl .Values.sessionsCleaner.image.repository . }}:{{ .Values.image.tag | default .Chart.AppVersion }}-ee"
+            image: "{{ tpl .Values.sessionsCleaner.image.repository . }}:{{ .Values.sessionsCleaner.image.tag | default .Chart.AppVersion }}-ee"
             env:
               - name: LICENSE_KEY
                 value: '{{ .Values.global.enterpriseEditionLicense }}'
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
index 95fd26188..74d24b624 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
@@ -15,7 +15,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: telemetry-cron
-            image: "{{ tpl .Values.telemetry.image.repository . }}:{{ .Values.image.tag | default .Chart.AppVersion }}-ee"
+            image: "{{ tpl .Values.telemetry.image.repository . }}:{{ .Values.telemetry.image.tag | default .Chart.AppVersion }}-ee"
             env:
               - name: LICENSE_KEY
                 value: '{{ .Values.global.enterpriseEditionLicense }}'
diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index 7bfa67523..17caeb5b5 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -4,9 +4,11 @@
 
 replicaCount: 1
 
-image:
-  repository: "{{ .Values.global.openReplayContainerRegistry }}/utilities"
-  pullPolicy: Always
+efsCleaner:
+  image:
+    repository: "{{ .Values.global.openReplayContainerRegistry }}/alpine"
+    pullPolicy: Always
+    tag: 3.16.1
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 

From 843e20e6221f5cbf8018565ba898a32a38d17271 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 11:57:18 +0200
Subject: [PATCH 52/77] chore(helm): sink/storage default user root

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/values.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/helmcharts/openreplay/values.yaml b/scripts/helmcharts/openreplay/values.yaml
index 20700a4f2..65b67c6bc 100644
--- a/scripts/helmcharts/openreplay/values.yaml
+++ b/scripts/helmcharts/openreplay/values.yaml
@@ -92,6 +92,20 @@ nginx-ingress:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "buster"
 
+# Running sink and storage as non root users, because of existing volume permission change will take time
+sink:
+  podSecurityContext:
+    runAsUser: 0
+    runAsGroup: 0
+    fsGroup: 0
+    fsGroupChangePolicy: "OnRootMismatch"
+storage:
+  podSecurityContext:
+    runAsUser: 0
+    runAsGroup: 0
+    fsGroup: 0
+    fsGroupChangePolicy: "OnRootMismatch"
+
 ingress-nginx:
   enabled: true
   controller:

From f2ccdc86926bb23807e393049220f24d199ab9ba Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 12:06:40 +0200
Subject: [PATCH 53/77] TODO: revert in 1.8.0 force run http as root, as v1.7.0
 http listens in 80

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay/values.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/helmcharts/openreplay/values.yaml b/scripts/helmcharts/openreplay/values.yaml
index 65b67c6bc..1652dedab 100644
--- a/scripts/helmcharts/openreplay/values.yaml
+++ b/scripts/helmcharts/openreplay/values.yaml
@@ -92,6 +92,13 @@ nginx-ingress:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "buster"
 
+# By default http listens to 80 port, and for v1.7.0 http listens in 80
+http:
+  podSecurityContext:
+    runAsUser: 0
+    runAsGroup: 0
+    fsGroup: 0
+    fsGroupChangePolicy: "OnRootMismatch"
 # Running sink and storage as non root users, because of existing volume permission change will take time
 sink:
   podSecurityContext:

From bea850b9de02cdd9934ed15290a113a619385047 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 12:11:16 +0200
Subject: [PATCH 54/77] chore(http): Changing http port to 8080

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 backend/Dockerfile                                    | 2 +-
 scripts/helmcharts/openreplay/charts/http/values.yaml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 23f37e22d..fe8f9e7e4 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -28,7 +28,7 @@ ENV TZ=UTC \
     FS_DIR=/mnt/efs \
     MAXMINDDB_FILE=/home/openreplay/geoip.mmdb \
     UAPARSER_FILE=/home/openreplay/regexes.yaml \
-    HTTP_PORT=80 \
+    HTTP_PORT=8080 \
     KAFKA_USE_SSL=true \
     KAFKA_MAX_POLL_INTERVAL_MS=400000 \
     REDIS_STREAMS_MAX_LEN=10000 \
diff --git a/scripts/helmcharts/openreplay/charts/http/values.yaml b/scripts/helmcharts/openreplay/charts/http/values.yaml
index 66b4fe228..72a8acb7d 100644
--- a/scripts/helmcharts/openreplay/charts/http/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/values.yaml
@@ -39,7 +39,7 @@ securityContext: {}
 service:
   type: ClusterIP
   ports:
-    http: 80 
+    http: 8080
     metrics: 8888
 
 serviceMonitor:
@@ -90,7 +90,6 @@ env:
   TOKEN_SECRET: secret_token_string # TODO: generate on buld
   S3_BUCKET_IOS_IMAGES: sessions-mobile-assets
   CACHE_ASSETS: true
-  HTTP_PORT: 80
 
 
 nodeSelector: {}

From 8683da2fa173938e93eb261fa50636cef8aa4df5 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 17:25:50 +0200
Subject: [PATCH 55/77] chore(helm): change frontend to port to 8080

---
 frontend/Dockerfile                                       | 1 +
 scripts/helmcharts/openreplay/charts/frontend/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 2ab0312ab..bfa86857d 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -18,6 +18,7 @@ RUN apk upgrade busybox --no-cache --repository=http://dl-cdn.alpinelinux.org/al
 COPY --from=builder /work/public /var/www/openreplay
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 
+EXPOSE 8080
 RUN chown -R nginx:nginx /var/cache/nginx && \
     chown -R nginx:nginx /var/log/nginx && \
     chown -R nginx:nginx /etc/nginx/conf.d && \
diff --git a/scripts/helmcharts/openreplay/charts/frontend/values.yaml b/scripts/helmcharts/openreplay/charts/frontend/values.yaml
index 26e2362f5..822cf6899 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/values.yaml
@@ -39,7 +39,7 @@ securityContext: {}
 service:
   type: ClusterIP
   ports:
-    frontend: 80 
+    frontend: 8080
 
 serviceMonitor:
   enabled: true

From 22a452410b8ca971be4ef7242727dd9a41994ae5 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 17:31:48 +0200
Subject: [PATCH 56/77] chore(docker): change nginx listen port to 8080

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 frontend/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 499065087..0138027f0 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -1,6 +1,6 @@
 server {
-  listen 80 default_server;
-  listen [::]:80 default_server;
+  listen 8080 default_server;
+  listen [::]:8080 default_server;
   root /var/www/openreplay;
   index index.html;
   location / {

From 801e24ec6612477eef3375c302d1ae891032aa64 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Thu, 21 Jul 2022 18:09:12 +0200
Subject: [PATCH 57/77] feat(ui) - session list - tag font weight

---
 .../SessionListContainer/components/SessionTags/SessionTags.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
index 67c1e5e83..1c8f5c926 100644
--- a/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionTags/SessionTags.tsx
@@ -59,7 +59,7 @@ function TagItem({ isActive, onClick, label, icon = '', disabled = false }: any)
                 })}
             >
                 {icon && <Icon name={icon} color="teal" size="14" className={cn('group-hover:fill-white mr-2', { 'fill-white': isActive })} />}
-                <span className="leading-none">{label}</span>
+                <span className="leading-none font-bold">{label}</span>
             </button>
         </div>
     );

From a37042d4ca68d281309898d8123234d4ba5a53ea Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Thu, 21 Jul 2022 18:11:58 +0200
Subject: [PATCH 58/77] feat(ui) - session list - select dropdown font weight
 to bold

---
 frontend/app/components/shared/Select/Select.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/components/shared/Select/Select.tsx b/frontend/app/components/shared/Select/Select.tsx
index b209eddc8..cc9e2cbbc 100644
--- a/frontend/app/components/shared/Select/Select.tsx
+++ b/frontend/app/components/shared/Select/Select.tsx
@@ -104,7 +104,7 @@ export default function<Value extends ValueObject>({ placeholder='Select', name
           const opacity = state.isDisabled ? 0.5 : 1;
           const transition = 'opacity 300ms';
       
-          return { ...provided, opacity, transition };
+          return { ...provided, opacity, transition, fontWeight: 'bold' };
         },
         input: (provided: any) => ({
             ...provided,

From 7c2a71c276dc089e3f8d85d59c2ab58208ff0ae6 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Thu, 21 Jul 2022 18:13:20 +0200
Subject: [PATCH 59/77] feat(ui) - session list - date range picker - custom
 range alignment

---
 .../components/SessionHeader/SessionHeader.tsx                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
index 5c5107310..9efcf7e6e 100644
--- a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
@@ -31,7 +31,7 @@ function SessionHeader(props: Props) {
             </div>
 
             <div className="flex items-center">
-                <SelectDateRange period={period} onChange={onDateChange} />
+                <SelectDateRange period={period} onChange={onDateChange} right={true} />
                 <div className="mx-2" />
                 <SessionSort />
             </div>

From d8f3673bbf9d859c51380ef1fa479da031f2b817 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 19:04:34 +0200
Subject: [PATCH 60/77] chore(helm): override the pvc name

---
 .../charts/utilities/templates/efs-cron.yaml     |  6 +++---
 .../openreplay/charts/utilities/values.yaml      | 16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index b74b0cbad..a960ebea4 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -32,17 +32,17 @@ spec:
             - mountPath: /mnt/efs
               name: datadir
           restartPolicy: Never
-          {{- if eq .Values.pvc.name "hostPath" }}
+          {{- if eq .Values.efsCleaner.pvc.name "hostPath" }}
           volumes:
           - name: datadir
             hostPath:
               # Ensure the file directory is created.
-              path: {{ .Values.pvc.hostMountPath }}
+              path: {{ .Values.efsCleaner.pvc.hostMountPath }}
               type: DirectoryOrCreate
           {{- else }}
           volumes:
           - name: datadir
             persistentVolumeClaim:
-              claimName: {{ .Values.pvc.name }}
+              claimName: {{ .Values.efsCleaner.pvc.name }}
           {{- end }}
 
diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index 17caeb5b5..49838d774 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -9,8 +9,13 @@ efsCleaner:
     repository: "{{ .Values.global.openReplayContainerRegistry }}/alpine"
     pullPolicy: Always
     tag: 3.16.1
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  pvc:
+    # This can be either persistentVolumeClaim or hostPath.
+    # In case of pvc, you'll have to provide the pvc name.
+    # For example
+    # name: openreplay-efs
+    name: hostPath
+    hostMountPath: /openreplay/storage/nfs
 
 telemetry:
   # https://crontab.guru/#5_12_*_*_*
@@ -78,10 +83,3 @@ fullnameOverride: "utilities-openreplay"
 # refer: https://crontab.guru/#5_3_*_*_1
 cron: "5 3 * * 1"
 
-pvc:
-  # This can be either persistentVolumeClaim or hostPath.
-  # In case of pvc, you'll have to provide the pvc name.
-  # For example
-  # name: openreplay-efs
-  name: hostPath
-  hostMountPath: /openreplay/storage/nfs

From 2b70863a7c0ff7c97f63c1904d992f34c8965e62 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Thu, 21 Jul 2022 19:17:12 +0200
Subject: [PATCH 61/77] chore(helm): change job backoff policy

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/utilities/templates/efs-cron.yaml         | 2 ++
 .../openreplay/charts/utilities/templates/report-cron.yaml      | 1 +
 .../charts/utilities/templates/sessions-cleaner-cron.yaml       | 1 +
 .../openreplay/charts/utilities/templates/telemetry-cron.yaml   | 1 +
 4 files changed, 5 insertions(+)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index a960ebea4..d27a678da 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -9,8 +9,10 @@ spec:
   successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 0 # Don't restart the failed jobs
       template:
         spec:
+          restartPolicy: Never
           containers:
           - name: efs-cleaner
             image: alpine
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
index 350de8c12..678c15111 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml
@@ -10,6 +10,7 @@ spec:
   successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 0 # Don't restart the failed jobs
       template:
         spec:
           restartPolicy: Never
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
index 47246a5bd..2d625e97f 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml
@@ -10,6 +10,7 @@ spec:
   successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 0 # Don't restart the failed jobs
       template:
         spec:
           restartPolicy: Never
diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
index 74d24b624..57de6ce90 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml
@@ -10,6 +10,7 @@ spec:
   successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 0 # Don't restart the failed jobs
       template:
         spec:
           restartPolicy: Never

From 931d8b783df0037bf717482ee1fa3dffdf2fd9e2 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Fri, 22 Jul 2022 10:35:56 +0200
Subject: [PATCH 62/77] chore(helm): efs cleaner enable verbose output

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../openreplay/charts/utilities/templates/efs-cron.yaml          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
index d27a678da..233025bf2 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/templates/efs-cron.yaml
@@ -23,6 +23,7 @@ spec:
             args:
             - |
               # Delete all the files older than 7 days
+              set -x
               echo "Cleaning NFS strorage for data older than 7 days"
               storage=`du -sh /mnt/efs`
               find /mnt/efs -type f -mtime +7 -delete

From 705eec29feb44b3957457fbfafee4bf88c2677cd Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Fri, 22 Jul 2022 12:33:54 +0200
Subject: [PATCH 63/77] style(frontend/player): generated code format

---
 .../app/player/MessageDistributor/messages/MStreamReader.ts | 4 +++-
 .../player/MessageDistributor/messages/RawMessageReader.ts  | 3 ---
 frontend/app/player/MessageDistributor/messages/message.ts  | 6 ++++--
 frontend/app/player/MessageDistributor/messages/raw.ts      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/app/player/MessageDistributor/messages/MStreamReader.ts b/frontend/app/player/MessageDistributor/messages/MStreamReader.ts
index 1cc30dcec..02e765a67 100644
--- a/frontend/app/player/MessageDistributor/messages/MStreamReader.ts
+++ b/frontend/app/player/MessageDistributor/messages/MStreamReader.ts
@@ -9,9 +9,11 @@ import type {
   RawCssInsertRule,
 } from './raw'
 import RawMessageReader from './RawMessageReader'
-import type { RawMessageReaderI } from './RawMessageReader'
 import { resolveURL, resolveCSS } from './urlResolve'
 
+interface RawMessageReaderI {
+  readMessage(): RawMessage | null
+}
 
 const resolveMsg = {
   "set_node_attribute_url_based": (msg: RawSetNodeAttributeURLBased): RawSetNodeAttribute => 
diff --git a/frontend/app/player/MessageDistributor/messages/RawMessageReader.ts b/frontend/app/player/MessageDistributor/messages/RawMessageReader.ts
index 501a85a7b..2c1f8de2f 100644
--- a/frontend/app/player/MessageDistributor/messages/RawMessageReader.ts
+++ b/frontend/app/player/MessageDistributor/messages/RawMessageReader.ts
@@ -3,9 +3,6 @@
 import PrimitiveReader from './PrimitiveReader'
 import type { RawMessage } from './raw'
 
-export interface RawMessageReaderI {
-  readMessage(): RawMessage | null
-}
 
 export default class RawMessageReader extends PrimitiveReader {
   readMessage(): RawMessage | null {
diff --git a/frontend/app/player/MessageDistributor/messages/message.ts b/frontend/app/player/MessageDistributor/messages/message.ts
index 1c21bbfd2..3726dfed8 100644
--- a/frontend/app/player/MessageDistributor/messages/message.ts
+++ b/frontend/app/player/MessageDistributor/messages/message.ts
@@ -2,7 +2,8 @@
 
 import type { Timed } from './timed'
 import type { RawMessage } from './raw'
-import type {   RawBatchMeta,
+import type { 
+  RawBatchMeta,
   RawTimestamp,
   RawSessionDisconnect,
   RawSetPageLocation,
@@ -60,7 +61,8 @@ import type {   RawBatchMeta,
   RawIosClickEvent,
   RawIosPerformanceEvent,
   RawIosLog,
-  RawIosNetworkCall, } from './raw'
+  RawIosNetworkCall,
+} from './raw'
 
 export type Message = RawMessage & Timed
 
diff --git a/frontend/app/player/MessageDistributor/messages/raw.ts b/frontend/app/player/MessageDistributor/messages/raw.ts
index e86181b2d..9dc368bf8 100644
--- a/frontend/app/player/MessageDistributor/messages/raw.ts
+++ b/frontend/app/player/MessageDistributor/messages/raw.ts
@@ -1,7 +1,7 @@
 // Auto-generated, do not edit
 
 export const TP_MAP = {
-    80: "batch_meta",
+  80: "batch_meta",
   0: "timestamp",
   2: "session_disconnect",
   4: "set_page_location",

From 1860655ab07b3692c761d676657169e276dbf0c9 Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Fri, 22 Jul 2022 13:06:52 +0200
Subject: [PATCH 64/77] feat(mobs): opensource message enc/dec generator

---
 mobs/README.md                                |  16 +
 mobs/ios_messages.rb                          | 172 ++++++++
 mobs/messages.rb                              | 409 ++++++++++++++++++
 mobs/primitives/primitives.go                 | 124 ++++++
 mobs/primitives/primitives.py                 |  62 +++
 mobs/primitives/primitives.swift              |  60 +++
 mobs/run.rb                                   | 136 ++++++
 .../backend~pkg~messages~filters.go.erb       |  10 +
 .../backend~pkg~messages~get-timestamp.go.erb |  12 +
 .../backend~pkg~messages~messages.go.erb      |  22 +
 .../backend~pkg~messages~read-message.go.erb  |  26 ++
 ...stributor~messages~RawMessageReader.ts.erb |  35 ++
 ...MessageDistributor~messages~message.ts.erb |  13 +
 ...yer~MessageDistributor~messages~raw.ts.erb |  14 +
 mobs/templates/ios/ASMessage.swift            |  36 ++
 ...tracker~tracker~src~common~messages.ts.erb |  31 ++
 16 files changed, 1178 insertions(+)
 create mode 100644 mobs/README.md
 create mode 100644 mobs/ios_messages.rb
 create mode 100644 mobs/messages.rb
 create mode 100644 mobs/primitives/primitives.go
 create mode 100644 mobs/primitives/primitives.py
 create mode 100644 mobs/primitives/primitives.swift
 create mode 100644 mobs/run.rb
 create mode 100644 mobs/templates/backend~pkg~messages~filters.go.erb
 create mode 100644 mobs/templates/backend~pkg~messages~get-timestamp.go.erb
 create mode 100644 mobs/templates/backend~pkg~messages~messages.go.erb
 create mode 100644 mobs/templates/backend~pkg~messages~read-message.go.erb
 create mode 100644 mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb
 create mode 100644 mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb
 create mode 100644 mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb
 create mode 100644 mobs/templates/ios/ASMessage.swift
 create mode 100644 mobs/templates/tracker~tracker~src~common~messages.ts.erb

diff --git a/mobs/README.md b/mobs/README.md
new file mode 100644
index 000000000..beee0030c
--- /dev/null
+++ b/mobs/README.md
@@ -0,0 +1,16 @@
+# Message Object Binary Schema and Code Generator from Templates
+
+
+To generate all necessary files for the project:
+
+```sh
+ruby run.rb
+
+```
+
+In order generated .go file to fit the go formatting style:
+```sh
+gofmt -w ../backend/pkg/messages/messages.go
+
+```
+(Otherwise there will be changes in stage)
diff --git a/mobs/ios_messages.rb b/mobs/ios_messages.rb
new file mode 100644
index 000000000..57e737714
--- /dev/null
+++ b/mobs/ios_messages.rb
@@ -0,0 +1,172 @@
+message 107, 'IOSBatchMeta', :replayer => false  do
+    uint 'Timestamp'
+    uint 'Length'
+    uint 'FirstIndex'
+end
+
+message 90, 'IOSSessionStart',  :replayer => true  do 
+	uint 'Timestamp'
+	# uint 'Length'
+  
+  uint 'ProjectID'
+  string 'TrackerVersion'
+  string 'RevID'
+  string 'UserUUID'
+  # string 'UserAgent'
+  string 'UserOS'
+  string 'UserOSVersion'
+  # string 'UserBrowser'
+  # string 'UserBrowserVersion'
+  string 'UserDevice'
+  string 'UserDeviceType'
+  # uint 'UserDeviceMemorySize'
+  # uint 'UserDeviceHeapSize'
+  string 'UserCountry'
+end
+
+message 91, 'IOSSessionEnd'  do 
+	uint 'Timestamp'
+end
+
+message 92, 'IOSMetadata' do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Key'
+    string 'Value'
+end
+
+message 93, 'IOSCustomEvent', :seq_index => true,  :replayer => true do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Name'
+    string 'Payload'
+end
+
+message 94, 'IOSUserID' do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Value'
+end
+
+message 95, 'IOSUserAnonymousID' do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Value'
+end
+
+message 96, 'IOSScreenChanges', :replayer => true do
+    uint 'Timestamp'
+    uint 'Length'
+    uint 'X'
+    uint 'Y'
+    uint 'Width'
+    uint 'Height'
+end
+
+message 97, 'IOSCrash', :seq_index => true do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Name'
+    string 'Reason'
+    string 'Stacktrace' 
+end
+
+message 98, 'IOSScreenEnter', :seq_index => true do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Title'
+    string 'ViewName'
+end
+
+message 99, 'IOSScreenLeave' do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Title'
+    string 'ViewName'
+end
+
+message 100, 'IOSClickEvent', :seq_index => true,  :replayer => true do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Label'
+    uint 'X'
+    uint 'Y'
+end
+
+message 101, 'IOSInputEvent', :seq_index => true do
+    uint 'Timestamp'
+    uint 'Length'
+    string 'Value'
+    boolean 'ValueMasked'
+    string 'Label'
+end
+
+=begin
+Name/Value may be :
+"physicalMemory": Total memory in bytes
+"processorCount": Total processors in device
+?"activeProcessorCount": Number of currently used processors
+"systemUptime": Elapsed time (in seconds) since last boot
+?"isLowPowerModeEnabled": Possible values (1 or 0)
+2/3!"thermalState": Possible values (0:nominal 1:fair 2:serious 3:critical)
+!"batteryLevel": Possible values (0 .. 100)
+"batteryState": Possible values (0:unknown 1:unplugged 2:charging 3:full)
+"orientation": Possible values (0unknown 1:portrait 2:portraitUpsideDown 3:landscapeLeft 4:landscapeRight 5:faceUp 6:faceDown)
+"mainThreadCPU": Possible values (0 .. 100)
+"memoryUsage": Used memory in bytes
+=end
+message 102, 'IOSPerformanceEvent', :replayer => true, :seq_index => true do
+  uint 'Timestamp'
+  uint 'Length'
+  string 'Name'
+  uint 'Value'
+end
+
+message 103, 'IOSLog', :replayer => true do
+  uint 'Timestamp'
+  uint 'Length'
+  string 'Severity' # Possible values ("info", "error")
+  string 'Content'
+end
+
+message 104, 'IOSInternalError' do
+  uint 'Timestamp'
+  uint 'Length'
+  string 'Content'
+end
+
+message 105, 'IOSNetworkCall', :replayer => true, :seq_index => true do
+  uint 'Timestamp'
+  uint 'Length'
+  uint 'Duration'
+  string 'Headers'
+  string 'Body'
+  string 'URL'
+  boolean 'Success'
+  string 'Method'
+  uint 'Status'
+end
+message 110, 'IOSPerformanceAggregated', :swift => false do 
+  uint 'TimestampStart'
+  uint 'TimestampEnd'
+  uint 'MinFPS'
+  uint 'AvgFPS'
+  uint 'MaxFPS'
+  uint 'MinCPU'
+  uint 'AvgCPU'
+  uint 'MaxCPU'
+  uint 'MinMemory'
+  uint 'AvgMemory'
+  uint 'MaxMemory'
+  uint 'MinBattery'
+  uint 'AvgBattery'
+  uint 'MaxBattery'
+end
+
+message 111, 'IOSIssueEvent', :seq_index => true do
+  uint 'Timestamp'
+  string 'Type'
+  string 'ContextString'
+  string 'Context'
+  string 'Payload'
+end
diff --git a/mobs/messages.rb b/mobs/messages.rb
new file mode 100644
index 000000000..0f97f3db5
--- /dev/null
+++ b/mobs/messages.rb
@@ -0,0 +1,409 @@
+# Special one for Batch Meta. Message id could define the version 
+message 80, 'BatchMeta', :replayer => false do 
+  uint 'PageNo'
+  uint 'FirstIndex'
+  int 'Timestamp'
+end
+message 0, 'Timestamp' do
+  uint 'Timestamp'
+end
+message 1, 'SessionStart', :js => false, :replayer => false do
+  uint 'Timestamp'
+  uint 'ProjectID'
+  string 'TrackerVersion'
+  string 'RevID'
+  string 'UserUUID'
+  string 'UserAgent'
+  string 'UserOS'
+  string 'UserOSVersion'
+  string 'UserBrowser'
+  string 'UserBrowserVersion'
+  string 'UserDevice'
+  string 'UserDeviceType'
+  uint 'UserDeviceMemorySize'
+  uint 'UserDeviceHeapSize'
+  string 'UserCountry'
+  string 'UserID'
+end
+# Depricated (not used) since OpenReplay tracker 3.0.0
+message 2, 'SessionDisconnect', :js => false do
+  uint 'Timestamp'
+end
+message 3, 'SessionEnd', :js => false, :replayer => false do
+  uint 'Timestamp'
+end
+message 4, 'SetPageLocation' do
+  string 'URL'
+  string 'Referrer'
+  uint 'NavigationStart'
+end
+message 5, 'SetViewportSize' do
+  uint 'Width'
+  uint 'Height'
+end
+message 6, 'SetViewportScroll' do
+  int 'X'
+  int 'Y'
+end
+message 7, 'CreateDocument' do
+end
+message 8, 'CreateElementNode' do
+  uint 'ID'
+  uint 'ParentID'
+  uint 'index'
+  string 'Tag'
+  boolean 'SVG'
+end
+message 9, 'CreateTextNode' do
+  uint 'ID'
+  uint 'ParentID'
+  uint 'Index'
+end
+message 10, 'MoveNode' do
+  uint 'ID'
+  uint 'ParentID'
+  uint 'Index'
+end
+message 11, 'RemoveNode' do
+  uint 'ID'
+end
+message 12, 'SetNodeAttribute' do
+  uint 'ID'
+  string 'Name'
+  string 'Value'
+end
+message 13, 'RemoveNodeAttribute' do
+  uint 'ID'
+  string 'Name'
+end
+message 14, 'SetNodeData' do
+  uint 'ID'
+  string 'Data'
+end
+# Depricated starting from 5.5.11 in favor of SetStyleData
+message 15, 'SetCSSData', :js => false do
+  uint 'ID'
+  string 'Data'
+end
+message 16, 'SetNodeScroll' do
+  uint 'ID'
+  int 'X'
+  int 'Y'
+end
+message 17, 'SetInputTarget', :replayer => false do
+  uint 'ID'
+  string 'Label'
+end
+message 18, 'SetInputValue' do
+  uint 'ID'
+  string 'Value'
+  int 'Mask'
+end
+message 19, 'SetInputChecked' do
+  uint 'ID'
+  boolean 'Checked'
+end
+message 20, 'MouseMove' do
+  uint 'X'
+  uint 'Y'
+end
+# Depricated since OpenReplay 1.2.0
+message 21, 'MouseClickDepricated', :js => false, :replayer => false do
+  uint 'ID'
+  uint 'HesitationTime'
+  string 'Label'
+end
+message 22, 'ConsoleLog' do
+  string 'Level'
+  string 'Value'
+end
+message 23, 'PageLoadTiming', :replayer => false do
+  uint 'RequestStart'
+  uint 'ResponseStart'
+  uint 'ResponseEnd'
+  uint 'DomContentLoadedEventStart'
+  uint 'DomContentLoadedEventEnd'
+  uint 'LoadEventStart'
+  uint 'LoadEventEnd'
+  uint 'FirstPaint'
+  uint 'FirstContentfulPaint'
+end
+message 24, 'PageRenderTiming', :replayer => false do
+  uint 'SpeedIndex'
+  uint 'VisuallyComplete'
+  uint 'TimeToInteractive'
+end
+message 25, 'JSException', :replayer => false do
+  string 'Name'
+  string 'Message'
+  string 'Payload'
+end
+message 26, 'IntegrationEvent', :js => false, :replayer => false do
+  uint 'Timestamp'
+  string 'Source'
+  string 'Name'
+  string 'Message'
+  string 'Payload'
+end
+message 27, 'RawCustomEvent', :replayer => false do
+  string 'Name'
+  string 'Payload'
+end
+message 28, 'UserID', :replayer => false do
+  string 'ID'
+end
+message 29, 'UserAnonymousID', :replayer => false do
+  string 'ID'
+end
+message 30, 'Metadata', :replayer => false do
+  string 'Key'
+  string 'Value'
+end
+message 31, 'PageEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'URL'
+  string 'Referrer'
+  boolean 'Loaded'
+  uint 'RequestStart'
+  uint 'ResponseStart'
+  uint 'ResponseEnd'
+  uint 'DomContentLoadedEventStart'
+  uint 'DomContentLoadedEventEnd'
+  uint 'LoadEventStart'
+  uint 'LoadEventEnd'
+  uint 'FirstPaint'
+  uint 'FirstContentfulPaint'
+  uint 'SpeedIndex'
+  uint 'VisuallyComplete'
+  uint 'TimeToInteractive'
+end
+message 32, 'InputEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Value'
+  boolean 'ValueMasked'
+  string 'Label'
+end
+message 33, 'ClickEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  uint 'HesitationTime'
+  string 'Label'
+  string 'Selector'
+end
+message 34, 'ErrorEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Source'
+  string 'Name'
+  string 'Message'
+  string 'Payload'
+end
+message 35, 'ResourceEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  uint 'Duration'
+  uint 'TTFB'
+  uint 'HeaderSize'
+  uint 'EncodedBodySize'
+  uint 'DecodedBodySize'
+  string 'URL'
+  string 'Type'
+  boolean 'Success'
+  string 'Method'
+  uint 'Status'
+end
+message 36, 'CustomEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Name'
+  string 'Payload'
+end
+
+
+message 37, 'CSSInsertRule' do
+  uint 'ID'
+  string 'Rule'
+  uint 'Index'
+end
+message 38, 'CSSDeleteRule' do
+  uint 'ID'
+  uint 'Index'
+end
+
+message 39, 'Fetch' do
+  string 'Method'
+  string 'URL'
+  string 'Request'
+  string 'Response'
+  uint 'Status'
+  uint 'Timestamp'
+  uint 'Duration'
+end
+message 40, 'Profiler' do
+  string 'Name'
+  uint   'Duration'
+  string 'Args'
+  string 'Result'
+end
+
+message 41, 'OTable' do
+  string 'Key'
+  string 'Value'
+end
+message 42, 'StateAction', :replayer => false do
+  string 'Type'
+end
+message 43, 'StateActionEvent', :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Type'
+end
+
+message 44, 'Redux' do
+  string 'Action'
+  string 'State'
+  uint 'Duration'
+end
+message 45, 'Vuex' do
+  string 'Mutation'
+  string 'State'
+end
+message 46, 'MobX' do
+  string 'Type'
+  string 'Payload'
+end
+message 47, 'NgRx' do
+  string 'Action'
+  string 'State'
+  uint 'Duration'
+end
+message 48, 'GraphQL' do
+  string 'OperationKind'
+  string 'OperationName'
+  string 'Variables'
+  string 'Response'
+end
+message 49, 'PerformanceTrack' do
+  int 'Frames'
+  int 'Ticks'
+  uint 'TotalJSHeapSize'
+  uint 'UsedJSHeapSize'
+end
+message 50, 'GraphQLEvent',  :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'OperationKind'
+  string 'OperationName'
+  string 'Variables'
+  string 'Response'
+end
+message 51, 'FetchEvent',  :js => false, :replayer => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Method'
+  string 'URL'
+  string 'Request'
+  string 'Response'
+  uint 'Status'
+  uint 'Duration'
+end
+message 52, 'DOMDrop', :js => false, :replayer => false do
+  uint 'Timestamp'
+end
+message 53, 'ResourceTiming', :replayer => false do
+  uint 'Timestamp'
+  uint 'Duration'
+  uint 'TTFB'
+  uint 'HeaderSize'
+  uint 'EncodedBodySize'
+  uint 'DecodedBodySize'
+  string 'URL'
+  string 'Initiator'
+end
+message 54, 'ConnectionInformation' do
+  uint 'Downlink'
+  string 'Type'
+end
+message 55, 'SetPageVisibility' do
+  boolean 'hidden'
+end
+message 56, 'PerformanceTrackAggr', :js => false, :replayer => false do
+  uint 'TimestampStart'
+  uint 'TimestampEnd'
+  uint 'MinFPS'
+  uint 'AvgFPS'
+  uint 'MaxFPS'
+  uint 'MinCPU'
+  uint 'AvgCPU'
+  uint 'MaxCPU'
+  uint 'MinTotalJSHeapSize'
+  uint 'AvgTotalJSHeapSize'
+  uint 'MaxTotalJSHeapSize'
+  uint 'MinUsedJSHeapSize'
+  uint 'AvgUsedJSHeapSize'
+  uint 'MaxUsedJSHeapSize'
+end
+message 59, 'LongTask' do
+  uint 'Timestamp'
+  uint 'Duration'
+  uint 'Context'
+  uint 'ContainerType'
+  string 'ContainerSrc'
+  string 'ContainerId'
+  string 'ContainerName'
+end
+message 60, 'SetNodeAttributeURLBased', :replayer => false do
+  uint 'ID'
+  string 'Name'
+  string 'Value'
+  string 'BaseURL'
+end
+# Might replace SetCSSData (although BaseURL is useless after rewriting)
+message 61, 'SetCSSDataURLBased', :replayer => false do
+  uint 'ID'
+  string 'Data'
+  string 'BaseURL'
+end
+message 62, 'IssueEvent', :replayer => false, :js => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Type'
+  string 'ContextString'
+  string 'Context'
+  string 'Payload'
+end
+message 63, 'TechnicalInfo', :replayer => false do
+  string 'Type'
+  string 'Value'
+end
+message 64, 'CustomIssue', :replayer => false do
+  string 'Name'
+  string 'Payload'
+end
+# Since 5.6.6; only for websocket (might be probably replaced with ws.close())
+# Depricated
+message 65, 'PageClose', :replayer => false do
+end
+message 66, 'AssetCache', :replayer => false, :js => false do
+  string 'URL'
+end
+message 67, 'CSSInsertRuleURLBased', :replayer => false do
+  uint 'ID'
+  string 'Rule'
+  uint 'Index'
+  string 'BaseURL'
+end
+message 69, 'MouseClick' do
+  uint 'ID'
+  uint 'HesitationTime'
+  string 'Label'
+  string 'Selector'
+end
+
+# Since 3.4.0
+message 70, 'CreateIFrameDocument' do
+  uint 'FrameID'
+  uint 'ID'
+end
\ No newline at end of file
diff --git a/mobs/primitives/primitives.go b/mobs/primitives/primitives.go
new file mode 100644
index 000000000..2603d31f5
--- /dev/null
+++ b/mobs/primitives/primitives.go
@@ -0,0 +1,124 @@
+package messages
+
+import (
+	"errors"
+	"io"
+)
+
+func ReadByte(reader io.Reader) (byte, error) {
+	p := make([]byte, 1)
+	_, err := io.ReadFull(reader, p)
+	if err != nil {
+		return 0, err
+	}
+	return p[0], nil
+}
+
+func SkipBytes(reader io.ReadSeeker) error {
+	n, err := ReadUint(reader)
+	if err != nil {
+		return err
+	}
+	_, err := reader.Seek(n, io.SeekCurrent);
+	return err
+}
+
+func ReadData(reader io.Reader) ([]byte, error) {
+	n, err := ReadUint(reader)
+	if err != nil {
+		return nil, err
+	}
+	p := make([]byte, n)
+	_, err := io.ReadFull(reader, p)
+	if err != nil {
+		return nil, err
+	}
+	return p, nil
+}
+ 
+func ReadUint(reader io.Reader) (uint64, error) {
+	var x uint64
+	var s uint
+	i := 0
+	for {
+		b, err := ReadByte(reader)
+		if err != nil {
+			return x, err
+		}
+		if b < 0x80 {
+			if i > 9 || i == 9 && b > 1 {
+				return x, errors.New("overflow")
+			}
+			return x | uint64(b)<<s, nil
+		}
+		x |= uint64(b&0x7f) << s
+		s += 7
+		i++
+	}
+}
+
+func ReadInt(reader io.Reader) (int64, error) {
+	ux, err := ReadUint(reader)
+	x := int64(ux >> 1)
+	if err != nil {
+		return x, err
+	}
+	if ux&1 != 0 {
+		x = ^x
+	}
+	return x, err
+}
+
+func ReadBoolean(reader io.Reader) (bool, error) {
+	p := make([]byte, 1)
+	_, err := io.ReadFull(reader, p)
+	if err != nil {
+		return false, err
+	}
+	return p[0] == 1, nil
+}
+
+func ReadString(reader io.Reader) (string, error) {
+	l, err := ReadUint(reader)
+	if err != nil {
+		return "", err
+	}
+	buf := make([]byte, l)
+	_, err = io.ReadFull(reader, buf)
+	if err != nil {
+		return "", err
+	}
+	return string(buf), nil
+}
+
+func WriteUint(v uint64, buf []byte, p int) int {
+	for v >= 0x80 {
+		buf[p] = byte(v) | 0x80
+		v >>= 7
+		p++
+	}
+	buf[p] = byte(v)
+	return p + 1
+}
+
+func WriteInt(v int64, buf []byte, p int) int {
+	uv := uint64(v) << 1
+	if v < 0 {
+		uv = ^uv
+	}
+	return WriteUint(uv, buf, p)
+}
+
+func WriteBoolean(v bool, buf []byte, p int) int {
+	if v {
+		buf[p] = 1
+	} else {
+		buf[p] = 0
+	}
+	return p + 1
+}
+
+func WriteString(str string, buf []byte, p int) int {
+	p = WriteUint(uint64(len(str)), buf, p)
+	return p + copy(buf[p:], str)
+}
diff --git a/mobs/primitives/primitives.py b/mobs/primitives/primitives.py
new file mode 100644
index 000000000..5aeb0e4ed
--- /dev/null
+++ b/mobs/primitives/primitives.py
@@ -0,0 +1,62 @@
+import io
+
+class Codec:
+    """
+    Implements encode/decode primitives
+    """
+
+    @staticmethod
+    def read_boolean(reader: io.BytesIO):
+        b = reader.read(1)
+        return b == 1
+
+    @staticmethod
+    def read_uint(reader: io.BytesIO):
+        """
+        The ending "big" doesn't play any role here,
+        since we're dealing with data per one byte
+        """
+        x = 0  # the result
+        s = 0  # the shift (our result is big-ending)
+        i = 0  # n of byte (max 9 for uint64)
+        while True:
+            b = reader.read(1)
+            num = int.from_bytes(b, "big", signed=False)
+            # print(i, x)
+
+            if num < 0x80:
+                if i > 9 | i == 9 & num > 1:
+                    raise OverflowError()
+                return int(x | num << s)
+            x |= (num & 0x7f) << s
+            s += 7
+            i += 1
+
+    @staticmethod
+    def read_int(reader: io.BytesIO) -> int:
+        """
+        ux, err := ReadUint(reader)
+        x := int64(ux >> 1)
+        if err != nil {
+            return x, err
+        }
+        if ux&1 != 0 {
+            x = ^x
+        }
+        return x, err
+        """
+        ux = Codec.read_uint(reader)
+        x = int(ux >> 1)
+
+        if ux & 1 != 0:
+            x = - x - 1
+        return x
+
+    @staticmethod
+    def read_string(reader: io.BytesIO) -> str:
+        length = Codec.read_uint(reader)
+        s = reader.read(length)
+        try:
+            return s.decode("utf-8", errors="replace").replace("\x00", "\uFFFD")
+        except UnicodeDecodeError:
+            return None
diff --git a/mobs/primitives/primitives.swift b/mobs/primitives/primitives.swift
new file mode 100644
index 000000000..b7d66d0f9
--- /dev/null
+++ b/mobs/primitives/primitives.swift
@@ -0,0 +1,60 @@
+extension Data {
+    func readByte(offset: inout Int) -> UInt8 {
+        if offset >= self.count {
+            fatalError(">>> Error reading Byte")
+        }
+        let b = self[offset]
+        offset += 1
+        return b
+    }
+    func readUint(offset: inout Int) -> UInt64 {
+        var x: UInt64 = 0
+        var s: Int = 0
+        var i: Int = 0
+        while true {
+            let b = readByte(offset: &offset)
+            if b < 0x80 {
+                if i > 9 || i == 9 && b > 1 {
+                    fatalError(">>> Error reading UInt")
+                }
+                return x | UInt64(b)<<s
+            }
+            x |= UInt64(b&0x7f) << s
+            s += 7
+            i += 1
+        }
+    }
+    func readInt(offset: inout Int) -> Int64 {
+        let ux = readUint(offset: &offset)
+        var x = Int64(ux >> 1)
+        if ux&1 != 0 {
+            x = ~x
+        }
+        return x
+    }
+    func readBoolean(offset: inout Int) -> Bool {
+        return readByte(offset: &offset) == 1
+    }
+    mutating func writeUint(_ input: UInt64) {
+        var v = input
+        while v >= 0x80 {
+            append(UInt8(v.littleEndian & 0x7F) | 0x80) // v.littleEndian ?
+            v >>= 7
+        }
+        append(UInt8(v))
+    }
+    mutating func writeInt(_ v: Int64) {
+        var uv = UInt64(v) << 1
+        if v < 0 {
+            uv = ~uv
+        }
+        writeUint(uv)
+    }
+    mutating func writeBoolean(_ v: Bool) {
+        if v {
+            append(1)
+        } else {
+            append(0)
+        }
+    }
+}
\ No newline at end of file
diff --git a/mobs/run.rb b/mobs/run.rb
new file mode 100644
index 000000000..ed9999e88
--- /dev/null
+++ b/mobs/run.rb
@@ -0,0 +1,136 @@
+require 'erb'
+
+
+# TODO: change method names to correct (CapitalCase and camelCase, not CamalCase and firstLower)
+class String
+  def camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map{|e| e.capitalize}.join.upperize
+  end
+
+  def camel_case_lower
+    self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join.upperize
+  end
+
+  def upperize
+    self.sub('Id', 'ID').sub('Url', 'URL')
+  end
+
+  def first_lower
+    self.sub(/^[A-Z]+/) {|f| f.downcase }
+  end
+
+  def underscore
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+end
+
+class Attribute
+  attr_reader :name, :type
+  def initialize(name:, type:)
+    @name = name
+    @type = type
+  end
+
+  def type_js
+    case @type
+    when :int
+      "number"
+    when :uint
+      "number"
+    when :json
+      # TODO
+      # raise "Unexpected attribute type: data type attribute #{@name} found in JS template"
+      "string"
+    when :data
+      raise "Unexpected attribute type: data type attribute #{@name} found in JS template"
+    else
+      @type
+    end
+  end
+
+  def type_go
+    case @type
+    when :int
+      'int64'
+    when :uint
+      'uint64'
+    when :string
+      'string'
+    when :data
+      '[]byte'
+    when :boolean
+      'bool'
+    when :json
+      'interface{}'
+    end
+  end
+
+  def lengh_encoded
+    case @type
+    when :string, :data
+      true
+    else 
+      false
+    end
+  end
+
+end
+
+
+$context = :web
+
+class Message
+  attr_reader :id, :name, :js, :replayer, :swift, :seq_index, :attributes, :context
+  def initialize(name:, id:, js: $context == :web, replayer: $context == :web, swift: $context == :ios, seq_index: false, &block)
+    @id = id
+    @name = name
+    @js = js
+    @replayer = replayer
+    @swift = swift
+    @seq_index = seq_index
+    @context = $context
+    @attributes = []
+    instance_eval &block
+  end
+
+  %i(int uint boolean string data).each do |type|
+    define_method type do |name, opts = {}|
+      opts.merge!(
+        name: name,
+        type: type,
+      )
+      @attributes << Attribute.new(opts)
+    end
+  end
+end
+
+$ids = []
+$messages = []
+def message(id, name, opts = {}, &block)
+  raise "id duplicated #{name}" if $ids.include? id
+  raise "id is too big #{name}" if id > 120
+  $ids << id
+  opts[:id] = id
+  opts[:name] = name
+  msg = Message.new(opts, &block)
+  $messages << msg
+end
+
+require './messages.rb'
+
+$context = :ios
+require './ios_messages.rb'
+
+Dir["templates/*.erb"].each do |tpl|
+  e = ERB.new(File.read(tpl))
+  path = tpl.split '/'
+  t = '../' + path[1].gsub('~', '/')
+  t = t[0..-5]
+  File.write(t, e.result)
+  puts tpl + ' --> ' + t
+end
diff --git a/mobs/templates/backend~pkg~messages~filters.go.erb b/mobs/templates/backend~pkg~messages~filters.go.erb
new file mode 100644
index 000000000..ac4ba9cba
--- /dev/null
+++ b/mobs/templates/backend~pkg~messages~filters.go.erb
@@ -0,0 +1,10 @@
+// Auto-generated, do not edit
+package messages
+
+func IsReplayerType(id int) bool {
+	return <%= $messages.select { |msg| msg.replayer }.map{ |msg| "#{msg.id} == id" }.join(' || ') %>
+}
+
+func IsIOSType(id int) bool {
+	return <%= $messages.select { |msg| msg.context == :ios }.map{ |msg| "#{msg.id} == id"}.join(' || ') %>
+}
diff --git a/mobs/templates/backend~pkg~messages~get-timestamp.go.erb b/mobs/templates/backend~pkg~messages~get-timestamp.go.erb
new file mode 100644
index 000000000..f4a634dea
--- /dev/null
+++ b/mobs/templates/backend~pkg~messages~get-timestamp.go.erb
@@ -0,0 +1,12 @@
+// Auto-generated, do not edit
+package messages
+
+func GetTimestamp(message Message) uint64 {
+	switch msg := message.(type) {
+<% $messages.select { |msg| msg.swift }.each do |msg| %>
+	case *<%= msg.name %>:
+		return msg.Timestamp
+<% end %>
+	}
+	return uint64(message.Meta().Timestamp)
+}
diff --git a/mobs/templates/backend~pkg~messages~messages.go.erb b/mobs/templates/backend~pkg~messages~messages.go.erb
new file mode 100644
index 000000000..81fb18800
--- /dev/null
+++ b/mobs/templates/backend~pkg~messages~messages.go.erb
@@ -0,0 +1,22 @@
+// Auto-generated, do not edit
+package messages
+<% $messages.each do |msg| %>
+type <%= msg.name %> struct {
+	message
+<%= msg.attributes.map { |attr| 
+"	#{attr.name} #{attr.type_go}" }.join "\n" %>
+}
+
+func (msg *<%= msg.name %>) Encode() []byte {
+	buf := make([]byte, <%= msg.attributes.count * 10 + 1 %><%= msg.attributes.map { |attr| "+len(msg.#{attr.name})" if attr.lengh_encoded }.compact.join %>)
+	buf[0] = <%= msg.id %>
+	p := 1
+<%= msg.attributes.map { |attr| 
+"	p = Write#{attr.type.to_s.camel_case}(msg.#{attr.name}, buf, p)" }.join "\n" %>
+	return buf[:p]
+}
+
+func (msg *<%= msg.name %>) TypeID() int {
+	return <%= msg.id %>
+}
+<% end %>
diff --git a/mobs/templates/backend~pkg~messages~read-message.go.erb b/mobs/templates/backend~pkg~messages~read-message.go.erb
new file mode 100644
index 000000000..2e8920747
--- /dev/null
+++ b/mobs/templates/backend~pkg~messages~read-message.go.erb
@@ -0,0 +1,26 @@
+// Auto-generated, do not edit
+package messages
+
+import (
+	"fmt"
+	"io"
+)
+
+func ReadMessage(reader io.Reader) (Message, error) {
+	t, err := ReadUint(reader)
+	if err != nil {
+		return nil, err
+	}
+	switch t {
+<% $messages.each do |msg| %>
+	case <%= msg.id %>:
+		msg := &<%= msg.name %>{}
+<%= msg.attributes.map { |attr| 
+"		if msg.#{attr.name}, err = Read#{attr.type.to_s.camel_case}(reader); err != nil {
+			return nil, err
+		}" }.join "\n" %>
+		return msg, nil
+<% end %>
+	}
+	return nil, fmt.Errorf("Unknown message code: %v", t)
+}
diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb
new file mode 100644
index 000000000..337dfb803
--- /dev/null
+++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~RawMessageReader.ts.erb
@@ -0,0 +1,35 @@
+// Auto-generated, do not edit
+
+import PrimitiveReader from './PrimitiveReader'
+import type { RawMessage } from './raw'
+
+
+export default class RawMessageReader extends PrimitiveReader {
+  readMessage(): RawMessage | null {
+    const p = this.p
+    const resetPointer = () => {
+      this.p = p
+      return null
+    }
+
+    const tp = this.readUint()
+    if (tp === null) { return resetPointer() }
+
+    switch (tp) {
+    <% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %>
+    case <%= msg.id %>: {
+<%= msg.attributes.map { |attr| 
+"      const #{attr.name.first_lower} = this.read#{attr.type.to_s.camel_case}(); if (#{attr.name.first_lower} === null) { return resetPointer() }" }.join "\n" %>      
+      return {
+        tp: "<%= msg.name.underscore %>", 
+<%= msg.attributes.map { |attr| 
+"        #{attr.name.first_lower}," }.join "\n" %>      
+      };
+    }
+    <% end %>
+    default:
+      throw new Error(`Unrecognizable message type: ${ tp }; Pointer at the position ${this.p} of ${this.buf.length}`)
+      return null;
+    }
+  }
+}
diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb
new file mode 100644
index 000000000..e81bddd7c
--- /dev/null
+++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~message.ts.erb
@@ -0,0 +1,13 @@
+// Auto-generated, do not edit
+
+import type { Timed } from './timed'
+import type { RawMessage } from './raw'
+import type { 
+<%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| "  Raw#{msg.name.underscore.camel_case}," }.join "\n" %>
+} from './raw'
+
+export type Message = RawMessage & Timed
+
+<% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %>
+export type <%= msg.name.underscore.camel_case %> = Raw<%= msg.name.underscore.camel_case %> & Timed
+<% end %>
\ No newline at end of file
diff --git a/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb b/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb
new file mode 100644
index 000000000..bb441f810
--- /dev/null
+++ b/mobs/templates/frontend~app~player~MessageDistributor~messages~raw.ts.erb
@@ -0,0 +1,14 @@
+// Auto-generated, do not edit
+
+export const TP_MAP = {
+<%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| "  #{msg.id}: \"#{msg.name.underscore}\"," }.join "\n" %>
+}
+
+<% $messages.select { |msg| msg.js || msg.replayer }.each do |msg| %>
+export interface Raw<%= msg.name.underscore.camel_case %> {
+  tp: "<%= msg.name.underscore %>",
+<%= msg.attributes.map { |attr| "  #{attr.name.first_lower}: #{attr.type_js}," }.join "\n" %>
+}
+<% end %>
+
+export type RawMessage = <%= $messages.select { |msg| msg.js || msg.replayer }.map { |msg| "Raw#{msg.name.underscore.camel_case}" }.join " | " %>;
diff --git a/mobs/templates/ios/ASMessage.swift b/mobs/templates/ios/ASMessage.swift
new file mode 100644
index 000000000..664a65643
--- /dev/null
+++ b/mobs/templates/ios/ASMessage.swift
@@ -0,0 +1,36 @@
+// Auto-generated, do not edit
+import UIKit
+
+enum ASMessageType: UInt64 {
+<%= $messages.map { |msg| "    case #{msg.name.first_lower} = #{msg.id}" }.join "\n" %>
+}
+<% $messages.each do |msg| %>
+class AS<%= msg.name.to_s.camel_case %>: ASMessage {
+<%= msg.attributes[2..-1].map { |attr| "    let #{attr.property}: #{attr.type_swift}" }.join "\n" %>
+
+    init(<%= msg.attributes[2..-1].map { |attr| "#{attr.property}: #{attr.type_swift}" }.join ", " %>) {
+<%= msg.attributes[2..-1].map { |attr| "        self.#{attr.property} = #{attr.property}" }.join "\n" %>
+        super.init(messageType: .<%= "#{msg.name.first_lower}" %>)
+    }
+
+    override init?(genericMessage: GenericMessage) {
+    <% if msg.attributes.length > 2 %>  do {
+            var offset = 0
+<%= msg.attributes[2..-1].map { |attr| "            self.#{attr.property} = try genericMessage.body.read#{attr.type_swift_read}(offset: &offset)" }.join "\n" %>
+            super.init(genericMessage: genericMessage)
+        } catch {
+            return nil
+        }
+    <% else %>
+        super.init(genericMessage: genericMessage)
+    <% end %>}
+
+    override func contentData() -> Data {
+        return Data(values: UInt64(<%= "#{msg.id}"%>), timestamp<% if msg.attributes.length > 2 %>, Data(values: <%= msg.attributes[2..-1].map { |attr| attr.property }.join ", "%>)<% end %>)
+    }
+
+    override var description: String {
+        return "-->> <%= msg.name.to_s.camel_case %>(<%= "#{msg.id}"%>): timestamp:\(timestamp) <%= msg.attributes[2..-1].map { |attr| "#{attr.property}:\\(#{attr.property})" }.join " "%>";
+    }
+}
+<% end %>
diff --git a/mobs/templates/tracker~tracker~src~common~messages.ts.erb b/mobs/templates/tracker~tracker~src~common~messages.ts.erb
new file mode 100644
index 000000000..3b3849370
--- /dev/null
+++ b/mobs/templates/tracker~tracker~src~common~messages.ts.erb
@@ -0,0 +1,31 @@
+// Auto-generated, do not edit
+import type { Writer, Message }from "./types.js";
+export default Message
+
+function bindNew<C extends { new(...args: A): T }, A extends any[], T>(
+  Class: C & { new(...args: A): T }
+): C & ((...args: A) => T) {
+  function _Class(...args: A) {
+    return new Class(...args);
+  }
+  _Class.prototype = Class.prototype;
+  return <C & ((...args: A) => T)>_Class;
+}
+
+export const classes: Map<number, Function> = new Map();
+
+<% $messages.select { |msg| msg.js }.each do |msg| %>
+class _<%= msg.name %> implements Message {
+  readonly _id: number = <%= msg.id %>;
+  constructor(
+    <%= msg.attributes.map { |attr| "public #{attr.name.first_lower}: #{attr.type_js}" }.join ",\n    " %>
+  ) {}
+  encode(writer: Writer): boolean {
+    return writer.uint(<%= msg.id %>)<%= " &&" if msg.attributes.length() > 0 %>
+      <%= msg.attributes.map { |attr| "writer.#{attr.type}(this.#{attr.name.first_lower})" }.join " &&\n      " %>; 
+  }
+}
+export const <%= msg.name %> = bindNew(_<%= msg.name %>);
+classes.set(<%= msg.id %>, <%= msg.name %>);
+
+<% end %>

From 3b19c2fddf166029e3937bdd5b630d6317cc2b98 Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Fri, 22 Jul 2022 13:24:52 +0200
Subject: [PATCH 65/77] refactor(ee/connectors):split code to make it
 generatable

---
 ee/connectors/consumer.py          |  11 +-
 ee/connectors/main.py              |  11 +-
 ee/connectors/msgcodec/codec.py    | 608 -----------------------------
 ee/connectors/msgcodec/msgcodec.py | 584 +++++++++++++++++++++++++++
 4 files changed, 604 insertions(+), 610 deletions(-)
 create mode 100644 ee/connectors/msgcodec/msgcodec.py

diff --git a/ee/connectors/consumer.py b/ee/connectors/consumer.py
index dfa856501..8a233ecb6 100644
--- a/ee/connectors/consumer.py
+++ b/ee/connectors/consumer.py
@@ -49,7 +49,7 @@ def main():
         elif LEVEL == 'normal':
             n = handle_normal_message(message)
 
-        session_id = codec.decode_key(msg.key)
+        session_id = decode_key(msg.key)
         sessions[session_id] = handle_session(sessions[session_id], message)
         if sessions[session_id]:
             sessions[session_id].sessionid = session_id
@@ -116,6 +116,15 @@ def attempt_batch_insert(batch):
     except Exception as e:
         print(repr(e))
 
+def decode_key(b) -> int:
+    """
+    Decode the message key (encoded with little endian)
+    """
+    try:
+        decoded = int.from_bytes(b, "little", signed=False)
+    except Exception as e:
+        raise UnicodeDecodeError(f"Error while decoding message key (SessionID) from {b}\n{e}")
+    return decoded
 
 if __name__ == '__main__':
     main()
diff --git a/ee/connectors/main.py b/ee/connectors/main.py
index 57349f6e9..ef3a824d9 100644
--- a/ee/connectors/main.py
+++ b/ee/connectors/main.py
@@ -49,7 +49,7 @@ def main():
         elif LEVEL == 'normal':
             n = handle_normal_message(message)
 
-        session_id = codec.decode_key(msg.key)
+        session_id = decode_key(msg.key)
         sessions[session_id] = handle_session(sessions[session_id], message)
         if sessions[session_id]:
             sessions[session_id].sessionid = session_id
@@ -116,6 +116,15 @@ def attempt_batch_insert(batch):
     except Exception as e:
         print(repr(e))
 
+def decode_key(b) -> int:
+    """
+    Decode the message key (encoded with little endian)
+    """
+    try:
+        decoded = int.from_bytes(b, "little", signed=False)
+    except Exception as e:
+        raise UnicodeDecodeError(f"Error while decoding message key (SessionID) from {b}\n{e}")
+    return decoded
 
 if __name__ == '__main__':
     main()
diff --git a/ee/connectors/msgcodec/codec.py b/ee/connectors/msgcodec/codec.py
index 18f074a33..5aeb0e4ed 100644
--- a/ee/connectors/msgcodec/codec.py
+++ b/ee/connectors/msgcodec/codec.py
@@ -1,8 +1,5 @@
 import io
 
-from msgcodec.messages import *
-
-
 class Codec:
     """
     Implements encode/decode primitives
@@ -63,608 +60,3 @@ class Codec:
             return s.decode("utf-8", errors="replace").replace("\x00", "\uFFFD")
         except UnicodeDecodeError:
             return None
-
-
-class MessageCodec(Codec):
-
-    def encode(self, m: Message) -> bytes:
-        ...
-
-    def decode(self, b: bytes) -> Message:
-        reader = io.BytesIO(b)
-        message_id = self.read_message_id(reader)
-
-        if message_id == 0:
-            return Timestamp(
-                timestamp=self.read_uint(reader)
-            )
-        if message_id == 1:
-            return SessionStart(
-                timestamp=self.read_uint(reader),
-                project_id=self.read_uint(reader),
-                tracker_version=self.read_string(reader),
-                rev_id=self.read_string(reader),
-                user_uuid=self.read_string(reader),
-                user_agent=self.read_string(reader),
-                user_os=self.read_string(reader),
-                user_os_version=self.read_string(reader),
-                user_browser=self.read_string(reader),
-                user_browser_version=self.read_string(reader),
-                user_device=self.read_string(reader),
-                user_device_type=self.read_string(reader),
-                user_device_memory_size=self.read_uint(reader),
-                user_device_heap_size=self.read_uint(reader),
-                user_country=self.read_string(reader)
-            )
-
-        if message_id == 2:
-            return SessionDisconnect(
-                timestamp=self.read_uint(reader)
-            )
-
-        if message_id == 3:
-            return SessionEnd(
-                timestamp=self.read_uint(reader)
-            )
-
-        if message_id == 4:
-            return SetPageLocation(
-                url=self.read_string(reader),
-                referrer=self.read_string(reader),
-                navigation_start=self.read_uint(reader)
-            )
-
-        if message_id == 5:
-            return SetViewportSize(
-                width=self.read_uint(reader),
-                height=self.read_uint(reader)
-            )
-
-        if message_id == 6:
-            return SetViewportScroll(
-                x=self.read_int(reader),
-                y=self.read_int(reader)
-            )
-
-        if message_id == 7:
-            return CreateDocument()
-
-        if message_id == 8:
-            return CreateElementNode(
-                id=self.read_uint(reader),
-                parent_id=self.read_uint(reader),
-                index=self.read_uint(reader),
-                tag=self.read_string(reader),
-                svg=self.read_boolean(reader),
-            )
-
-        if message_id == 9:
-            return CreateTextNode(
-                id=self.read_uint(reader),
-                parent_id=self.read_uint(reader),
-                index=self.read_uint(reader)
-            )
-
-        if message_id == 10:
-            return MoveNode(
-                id=self.read_uint(reader),
-                parent_id=self.read_uint(reader),
-                index=self.read_uint(reader)
-            )
-
-        if message_id == 11:
-            return RemoveNode(
-                id=self.read_uint(reader)
-            )
-
-        if message_id == 12:
-            return SetNodeAttribute(
-                id=self.read_uint(reader),
-                name=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 13:
-            return RemoveNodeAttribute(
-                id=self.read_uint(reader),
-                name=self.read_string(reader)
-            )
-
-        if message_id == 14:
-            return SetNodeData(
-                id=self.read_uint(reader),
-                data=self.read_string(reader)
-            )
-
-        if message_id == 15:
-            return SetCSSData(
-                id=self.read_uint(reader),
-                data=self.read_string(reader)
-            )
-
-        if message_id == 16:
-            return SetNodeScroll(
-                id=self.read_uint(reader),
-                x=self.read_int(reader),
-                y=self.read_int(reader),
-            )
-
-        if message_id == 17:
-            return SetInputTarget(
-                id=self.read_uint(reader),
-                label=self.read_string(reader)
-            )
-
-        if message_id == 18:
-            return SetInputValue(
-                id=self.read_uint(reader),
-                value=self.read_string(reader),
-                mask=self.read_int(reader),
-            )
-
-        if message_id == 19:
-            return SetInputChecked(
-                id=self.read_uint(reader),
-                checked=self.read_boolean(reader)
-            )
-
-        if message_id == 20:
-            return MouseMove(
-                x=self.read_uint(reader),
-                y=self.read_uint(reader)
-            )
-
-        if message_id == 21:
-            return MouseClick(
-                id=self.read_uint(reader),
-                hesitation_time=self.read_uint(reader),
-                label=self.read_string(reader)
-            )
-
-        if message_id == 22:
-            return ConsoleLog(
-                level=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 23:
-            return PageLoadTiming(
-                request_start=self.read_uint(reader),
-                response_start=self.read_uint(reader),
-                response_end=self.read_uint(reader),
-                dom_content_loaded_event_start=self.read_uint(reader),
-                dom_content_loaded_event_end=self.read_uint(reader),
-                load_event_start=self.read_uint(reader),
-                load_event_end=self.read_uint(reader),
-                first_paint=self.read_uint(reader),
-                first_contentful_paint=self.read_uint(reader)
-            )
-
-        if message_id == 24:
-            return PageRenderTiming(
-                speed_index=self.read_uint(reader),
-                visually_complete=self.read_uint(reader),
-                time_to_interactive=self.read_uint(reader),
-            )
-
-        if message_id == 25:
-            return JSException(
-                name=self.read_string(reader),
-                message=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 26:
-            return RawErrorEvent(
-                timestamp=self.read_uint(reader),
-                source=self.read_string(reader),
-                name=self.read_string(reader),
-                message=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 27:
-            return RawCustomEvent(
-                name=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 28:
-            return UserID(
-                id=self.read_string(reader)
-            )
-
-        if message_id == 29:
-            return UserAnonymousID(
-                id=self.read_string(reader)
-            )
-
-        if message_id == 30:
-            return Metadata(
-                key=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 31:
-            return PageEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                url=self.read_string(reader),
-                referrer=self.read_string(reader),
-                loaded=self.read_boolean(reader),
-                request_start=self.read_uint(reader),
-                response_start=self.read_uint(reader),
-                response_end=self.read_uint(reader),
-                dom_content_loaded_event_start=self.read_uint(reader),
-                dom_content_loaded_event_end=self.read_uint(reader),
-                load_event_start=self.read_uint(reader),
-                load_event_end=self.read_uint(reader),
-                first_paint=self.read_uint(reader),
-                first_contentful_paint=self.read_uint(reader),
-                speed_index=self.read_uint(reader),
-                visually_complete=self.read_uint(reader),
-                time_to_interactive=self.read_uint(reader)
-            )
-
-        if message_id == 32:
-            return InputEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                value=self.read_string(reader),
-                value_masked=self.read_boolean(reader),
-                label=self.read_string(reader),
-            )
-
-        if message_id == 33:
-            return ClickEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                hesitation_time=self.read_uint(reader),
-                label=self.read_string(reader)
-            )
-
-        if message_id == 34:
-            return ErrorEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                source=self.read_string(reader),
-                name=self.read_string(reader),
-                message=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 35:
-
-            message_id = self.read_uint(reader)
-            ts = self.read_uint(reader)
-            if ts > 9999999999999:
-                ts = None
-            return ResourceEvent(
-                message_id=message_id,
-                timestamp=ts,
-                duration=self.read_uint(reader),
-                ttfb=self.read_uint(reader),
-                header_size=self.read_uint(reader),
-                encoded_body_size=self.read_uint(reader),
-                decoded_body_size=self.read_uint(reader),
-                url=self.read_string(reader),
-                type=self.read_string(reader),
-                success=self.read_boolean(reader),
-                method=self.read_string(reader),
-                status=self.read_uint(reader)
-            )
-
-        if message_id == 36:
-            return CustomEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                name=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 37:
-            return CSSInsertRule(
-                id=self.read_uint(reader),
-                rule=self.read_string(reader),
-                index=self.read_uint(reader)
-            )
-
-        if message_id == 38:
-            return CSSDeleteRule(
-                id=self.read_uint(reader),
-                index=self.read_uint(reader)
-            )
-
-        if message_id == 39:
-            return Fetch(
-                method=self.read_string(reader),
-                url=self.read_string(reader),
-                request=self.read_string(reader),
-                response=self.read_string(reader),
-                status=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                duration=self.read_uint(reader)
-            )
-
-        if message_id == 40:
-            return Profiler(
-                name=self.read_string(reader),
-                duration=self.read_uint(reader),
-                args=self.read_string(reader),
-                result=self.read_string(reader)
-            )
-
-        if message_id == 41:
-            return OTable(
-                key=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 42:
-            return StateAction(
-                type=self.read_string(reader)
-            )
-
-        if message_id == 43:
-            return StateActionEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                type=self.read_string(reader)
-            )
-
-        if message_id == 44:
-            return Redux(
-                action=self.read_string(reader),
-                state=self.read_string(reader),
-                duration=self.read_uint(reader)
-            )
-
-        if message_id == 45:
-            return Vuex(
-                mutation=self.read_string(reader),
-                state=self.read_string(reader),
-            )
-
-        if message_id == 46:
-            return MobX(
-                type=self.read_string(reader),
-                payload=self.read_string(reader),
-            )
-
-        if message_id == 47:
-            return NgRx(
-                action=self.read_string(reader),
-                state=self.read_string(reader),
-                duration=self.read_uint(reader)
-            )
-
-        if message_id == 48:
-            return GraphQL(
-                operation_kind=self.read_string(reader),
-                operation_name=self.read_string(reader),
-                variables=self.read_string(reader),
-                response=self.read_string(reader)
-            )
-
-        if message_id == 49:
-            return PerformanceTrack(
-                frames=self.read_int(reader),
-                ticks=self.read_int(reader),
-                total_js_heap_size=self.read_uint(reader),
-                used_js_heap_size=self.read_uint(reader)
-            )
-
-        if message_id == 50:
-            return GraphQLEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                name=self.read_string(reader)
-            )
-
-        if message_id == 52:
-            return DomDrop(
-                timestamp=self.read_uint(reader)
-            )
-
-        if message_id == 53:
-            return ResourceTiming(
-                timestamp=self.read_uint(reader),
-                duration=self.read_uint(reader),
-                ttfb=self.read_uint(reader),
-                header_size=self.read_uint(reader),
-                encoded_body_size=self.read_uint(reader),
-                decoded_body_size=self.read_uint(reader),
-                url=self.read_string(reader),
-                initiator=self.read_string(reader)
-            )
-
-        if message_id == 54:
-            return ConnectionInformation(
-                downlink=self.read_uint(reader),
-                type=self.read_string(reader)
-            )
-
-        if message_id == 55:
-            return SetPageVisibility(
-                hidden=self.read_boolean(reader)
-            )
-
-        if message_id == 56:
-            return PerformanceTrackAggr(
-                timestamp_start=self.read_uint(reader),
-                timestamp_end=self.read_uint(reader),
-                min_fps=self.read_uint(reader),
-                avg_fps=self.read_uint(reader),
-                max_fps=self.read_uint(reader),
-                min_cpu=self.read_uint(reader),
-                avg_cpu=self.read_uint(reader),
-                max_cpu=self.read_uint(reader),
-                min_total_js_heap_size=self.read_uint(reader),
-                avg_total_js_heap_size=self.read_uint(reader),
-                max_total_js_heap_size=self.read_uint(reader),
-                min_used_js_heap_size=self.read_uint(reader),
-                avg_used_js_heap_size=self.read_uint(reader),
-                max_used_js_heap_size=self.read_uint(reader)
-            )
-
-        if message_id == 59:
-            return LongTask(
-                timestamp=self.read_uint(reader),
-                duration=self.read_uint(reader),
-                context=self.read_uint(reader),
-                container_type=self.read_uint(reader),
-                container_src=self.read_string(reader),
-                container_id=self.read_string(reader),
-                container_name=self.read_string(reader)
-            )
-
-        if message_id == 60:
-            return SetNodeURLBasedAttribute(
-                id=self.read_uint(reader),
-                name=self.read_string(reader),
-                value=self.read_string(reader),
-                base_url=self.read_string(reader)
-            )
-
-        if message_id == 61:
-            return SetStyleData(
-                id=self.read_uint(reader),
-                data=self.read_string(reader),
-                base_url=self.read_string(reader)
-            )
-
-        if message_id == 62:
-            return IssueEvent(
-                message_id=self.read_uint(reader),
-                timestamp=self.read_uint(reader),
-                type=self.read_string(reader),
-                context_string=self.read_string(reader),
-                context=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 63:
-            return TechnicalInfo(
-                type=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 64:
-            return CustomIssue(
-                name=self.read_string(reader),
-                payload=self.read_string(reader)
-            )
-
-        if message_id == 65:
-            return PageClose()
-
-        if message_id == 90:
-            return IOSSessionStart(
-                timestamp=self.read_uint(reader),
-                project_id=self.read_uint(reader),
-                tracker_version=self.read_string(reader),
-                rev_id=self.read_string(reader),
-                user_uuid=self.read_string(reader),
-                user_os=self.read_string(reader),
-                user_os_version=self.read_string(reader),
-                user_device=self.read_string(reader),
-                user_device_type=self.read_string(reader),
-                user_country=self.read_string(reader)
-            )
-
-        if message_id == 91:
-            return IOSSessionEnd(
-                timestamp=self.read_uint(reader)
-            )
-
-        if message_id == 92:
-            return IOSMetadata(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                key=self.read_string(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 94:
-            return IOSUserID(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 95:
-            return IOSUserAnonymousID(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                value=self.read_string(reader)
-            )
-
-        if message_id == 99:
-            return IOSScreenLeave(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                title=self.read_string(reader),
-                view_name=self.read_string(reader)
-            )
-
-        if message_id == 103:
-            return IOSLog(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                severity=self.read_string(reader),
-                content=self.read_string(reader)
-            )
-
-        if message_id == 104:
-            return IOSInternalError(
-                timestamp=self.read_uint(reader),
-                length=self.read_uint(reader),
-                content=self.read_string(reader)
-            )
-
-        if message_id == 110:
-            return IOSPerformanceAggregated(
-                timestamp_start=self.read_uint(reader),
-                timestamp_end=self.read_uint(reader),
-                min_fps=self.read_uint(reader),
-                avg_fps=self.read_uint(reader),
-                max_fps=self.read_uint(reader),
-                min_cpu=self.read_uint(reader),
-                avg_cpu=self.read_uint(reader),
-                max_cpu=self.read_uint(reader),
-                min_memory=self.read_uint(reader),
-                avg_memory=self.read_uint(reader),
-                max_memory=self.read_uint(reader),
-                min_battery=self.read_uint(reader),
-                avg_battery=self.read_uint(reader),
-                max_battery=self.read_uint(reader)
-            )
-
-    def read_message_id(self, reader: io.BytesIO) -> int:
-        """
-        Read and return the first byte where the message id is encoded
-        """
-        id_ = self.read_uint(reader)
-        return id_
-
-    @staticmethod
-    def check_message_id(b: bytes) -> int:
-        """
-        todo: make it static and without reader. It's just the first byte
-        Read and return the first byte where the message id is encoded
-        """
-        reader = io.BytesIO(b)
-        id_ = Codec.read_uint(reader)
-
-        return id_
-
-    @staticmethod
-    def decode_key(b) -> int:
-        """
-        Decode the message key (encoded with little endian)
-        """
-        try:
-            decoded = int.from_bytes(b, "little", signed=False)
-        except Exception as e:
-            raise UnicodeDecodeError(f"Error while decoding message key (SessionID) from {b}\n{e}")
-        return decoded
diff --git a/ee/connectors/msgcodec/msgcodec.py b/ee/connectors/msgcodec/msgcodec.py
new file mode 100644
index 000000000..3289a18bd
--- /dev/null
+++ b/ee/connectors/msgcodec/msgcodec.py
@@ -0,0 +1,584 @@
+from msgcodec.codec import Codec
+from msgcodec.messages import *
+
+class MessageCodec(Codec):
+
+    def read_message_id(self, reader: io.BytesIO) -> int:
+        """
+        Read and return the first byte where the message id is encoded
+        """
+        id_ = self.read_uint(reader)
+        return id_
+
+    def encode(self, m: Message) -> bytes:
+        ...
+
+    def decode(self, b: bytes) -> Message:
+        reader = io.BytesIO(b)
+        message_id = self.read_message_id(reader)
+
+        if message_id == 0:
+            return Timestamp(
+                timestamp=self.read_uint(reader)
+            )
+        if message_id == 1:
+            return SessionStart(
+                timestamp=self.read_uint(reader),
+                project_id=self.read_uint(reader),
+                tracker_version=self.read_string(reader),
+                rev_id=self.read_string(reader),
+                user_uuid=self.read_string(reader),
+                user_agent=self.read_string(reader),
+                user_os=self.read_string(reader),
+                user_os_version=self.read_string(reader),
+                user_browser=self.read_string(reader),
+                user_browser_version=self.read_string(reader),
+                user_device=self.read_string(reader),
+                user_device_type=self.read_string(reader),
+                user_device_memory_size=self.read_uint(reader),
+                user_device_heap_size=self.read_uint(reader),
+                user_country=self.read_string(reader)
+            )
+
+        if message_id == 2:
+            return SessionDisconnect(
+                timestamp=self.read_uint(reader)
+            )
+
+        if message_id == 3:
+            return SessionEnd(
+                timestamp=self.read_uint(reader)
+            )
+
+        if message_id == 4:
+            return SetPageLocation(
+                url=self.read_string(reader),
+                referrer=self.read_string(reader),
+                navigation_start=self.read_uint(reader)
+            )
+
+        if message_id == 5:
+            return SetViewportSize(
+                width=self.read_uint(reader),
+                height=self.read_uint(reader)
+            )
+
+        if message_id == 6:
+            return SetViewportScroll(
+                x=self.read_int(reader),
+                y=self.read_int(reader)
+            )
+
+        if message_id == 7:
+            return CreateDocument()
+
+        if message_id == 8:
+            return CreateElementNode(
+                id=self.read_uint(reader),
+                parent_id=self.read_uint(reader),
+                index=self.read_uint(reader),
+                tag=self.read_string(reader),
+                svg=self.read_boolean(reader),
+            )
+
+        if message_id == 9:
+            return CreateTextNode(
+                id=self.read_uint(reader),
+                parent_id=self.read_uint(reader),
+                index=self.read_uint(reader)
+            )
+
+        if message_id == 10:
+            return MoveNode(
+                id=self.read_uint(reader),
+                parent_id=self.read_uint(reader),
+                index=self.read_uint(reader)
+            )
+
+        if message_id == 11:
+            return RemoveNode(
+                id=self.read_uint(reader)
+            )
+
+        if message_id == 12:
+            return SetNodeAttribute(
+                id=self.read_uint(reader),
+                name=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 13:
+            return RemoveNodeAttribute(
+                id=self.read_uint(reader),
+                name=self.read_string(reader)
+            )
+
+        if message_id == 14:
+            return SetNodeData(
+                id=self.read_uint(reader),
+                data=self.read_string(reader)
+            )
+
+        if message_id == 15:
+            return SetCSSData(
+                id=self.read_uint(reader),
+                data=self.read_string(reader)
+            )
+
+        if message_id == 16:
+            return SetNodeScroll(
+                id=self.read_uint(reader),
+                x=self.read_int(reader),
+                y=self.read_int(reader),
+            )
+
+        if message_id == 17:
+            return SetInputTarget(
+                id=self.read_uint(reader),
+                label=self.read_string(reader)
+            )
+
+        if message_id == 18:
+            return SetInputValue(
+                id=self.read_uint(reader),
+                value=self.read_string(reader),
+                mask=self.read_int(reader),
+            )
+
+        if message_id == 19:
+            return SetInputChecked(
+                id=self.read_uint(reader),
+                checked=self.read_boolean(reader)
+            )
+
+        if message_id == 20:
+            return MouseMove(
+                x=self.read_uint(reader),
+                y=self.read_uint(reader)
+            )
+
+        if message_id == 21:
+            return MouseClick(
+                id=self.read_uint(reader),
+                hesitation_time=self.read_uint(reader),
+                label=self.read_string(reader)
+            )
+
+        if message_id == 22:
+            return ConsoleLog(
+                level=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 23:
+            return PageLoadTiming(
+                request_start=self.read_uint(reader),
+                response_start=self.read_uint(reader),
+                response_end=self.read_uint(reader),
+                dom_content_loaded_event_start=self.read_uint(reader),
+                dom_content_loaded_event_end=self.read_uint(reader),
+                load_event_start=self.read_uint(reader),
+                load_event_end=self.read_uint(reader),
+                first_paint=self.read_uint(reader),
+                first_contentful_paint=self.read_uint(reader)
+            )
+
+        if message_id == 24:
+            return PageRenderTiming(
+                speed_index=self.read_uint(reader),
+                visually_complete=self.read_uint(reader),
+                time_to_interactive=self.read_uint(reader),
+            )
+
+        if message_id == 25:
+            return JSException(
+                name=self.read_string(reader),
+                message=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 26:
+            return RawErrorEvent(
+                timestamp=self.read_uint(reader),
+                source=self.read_string(reader),
+                name=self.read_string(reader),
+                message=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 27:
+            return RawCustomEvent(
+                name=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 28:
+            return UserID(
+                id=self.read_string(reader)
+            )
+
+        if message_id == 29:
+            return UserAnonymousID(
+                id=self.read_string(reader)
+            )
+
+        if message_id == 30:
+            return Metadata(
+                key=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 31:
+            return PageEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                url=self.read_string(reader),
+                referrer=self.read_string(reader),
+                loaded=self.read_boolean(reader),
+                request_start=self.read_uint(reader),
+                response_start=self.read_uint(reader),
+                response_end=self.read_uint(reader),
+                dom_content_loaded_event_start=self.read_uint(reader),
+                dom_content_loaded_event_end=self.read_uint(reader),
+                load_event_start=self.read_uint(reader),
+                load_event_end=self.read_uint(reader),
+                first_paint=self.read_uint(reader),
+                first_contentful_paint=self.read_uint(reader),
+                speed_index=self.read_uint(reader),
+                visually_complete=self.read_uint(reader),
+                time_to_interactive=self.read_uint(reader)
+            )
+
+        if message_id == 32:
+            return InputEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                value=self.read_string(reader),
+                value_masked=self.read_boolean(reader),
+                label=self.read_string(reader),
+            )
+
+        if message_id == 33:
+            return ClickEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                hesitation_time=self.read_uint(reader),
+                label=self.read_string(reader)
+            )
+
+        if message_id == 34:
+            return ErrorEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                source=self.read_string(reader),
+                name=self.read_string(reader),
+                message=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 35:
+
+            message_id = self.read_uint(reader)
+            ts = self.read_uint(reader)
+            if ts > 9999999999999:
+                ts = None
+            return ResourceEvent(
+                message_id=message_id,
+                timestamp=ts,
+                duration=self.read_uint(reader),
+                ttfb=self.read_uint(reader),
+                header_size=self.read_uint(reader),
+                encoded_body_size=self.read_uint(reader),
+                decoded_body_size=self.read_uint(reader),
+                url=self.read_string(reader),
+                type=self.read_string(reader),
+                success=self.read_boolean(reader),
+                method=self.read_string(reader),
+                status=self.read_uint(reader)
+            )
+
+        if message_id == 36:
+            return CustomEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                name=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 37:
+            return CSSInsertRule(
+                id=self.read_uint(reader),
+                rule=self.read_string(reader),
+                index=self.read_uint(reader)
+            )
+
+        if message_id == 38:
+            return CSSDeleteRule(
+                id=self.read_uint(reader),
+                index=self.read_uint(reader)
+            )
+
+        if message_id == 39:
+            return Fetch(
+                method=self.read_string(reader),
+                url=self.read_string(reader),
+                request=self.read_string(reader),
+                response=self.read_string(reader),
+                status=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                duration=self.read_uint(reader)
+            )
+
+        if message_id == 40:
+            return Profiler(
+                name=self.read_string(reader),
+                duration=self.read_uint(reader),
+                args=self.read_string(reader),
+                result=self.read_string(reader)
+            )
+
+        if message_id == 41:
+            return OTable(
+                key=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 42:
+            return StateAction(
+                type=self.read_string(reader)
+            )
+
+        if message_id == 43:
+            return StateActionEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                type=self.read_string(reader)
+            )
+
+        if message_id == 44:
+            return Redux(
+                action=self.read_string(reader),
+                state=self.read_string(reader),
+                duration=self.read_uint(reader)
+            )
+
+        if message_id == 45:
+            return Vuex(
+                mutation=self.read_string(reader),
+                state=self.read_string(reader),
+            )
+
+        if message_id == 46:
+            return MobX(
+                type=self.read_string(reader),
+                payload=self.read_string(reader),
+            )
+
+        if message_id == 47:
+            return NgRx(
+                action=self.read_string(reader),
+                state=self.read_string(reader),
+                duration=self.read_uint(reader)
+            )
+
+        if message_id == 48:
+            return GraphQL(
+                operation_kind=self.read_string(reader),
+                operation_name=self.read_string(reader),
+                variables=self.read_string(reader),
+                response=self.read_string(reader)
+            )
+
+        if message_id == 49:
+            return PerformanceTrack(
+                frames=self.read_int(reader),
+                ticks=self.read_int(reader),
+                total_js_heap_size=self.read_uint(reader),
+                used_js_heap_size=self.read_uint(reader)
+            )
+
+        if message_id == 50:
+            return GraphQLEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                name=self.read_string(reader)
+            )
+
+        if message_id == 52:
+            return DomDrop(
+                timestamp=self.read_uint(reader)
+            )
+
+        if message_id == 53:
+            return ResourceTiming(
+                timestamp=self.read_uint(reader),
+                duration=self.read_uint(reader),
+                ttfb=self.read_uint(reader),
+                header_size=self.read_uint(reader),
+                encoded_body_size=self.read_uint(reader),
+                decoded_body_size=self.read_uint(reader),
+                url=self.read_string(reader),
+                initiator=self.read_string(reader)
+            )
+
+        if message_id == 54:
+            return ConnectionInformation(
+                downlink=self.read_uint(reader),
+                type=self.read_string(reader)
+            )
+
+        if message_id == 55:
+            return SetPageVisibility(
+                hidden=self.read_boolean(reader)
+            )
+
+        if message_id == 56:
+            return PerformanceTrackAggr(
+                timestamp_start=self.read_uint(reader),
+                timestamp_end=self.read_uint(reader),
+                min_fps=self.read_uint(reader),
+                avg_fps=self.read_uint(reader),
+                max_fps=self.read_uint(reader),
+                min_cpu=self.read_uint(reader),
+                avg_cpu=self.read_uint(reader),
+                max_cpu=self.read_uint(reader),
+                min_total_js_heap_size=self.read_uint(reader),
+                avg_total_js_heap_size=self.read_uint(reader),
+                max_total_js_heap_size=self.read_uint(reader),
+                min_used_js_heap_size=self.read_uint(reader),
+                avg_used_js_heap_size=self.read_uint(reader),
+                max_used_js_heap_size=self.read_uint(reader)
+            )
+
+        if message_id == 59:
+            return LongTask(
+                timestamp=self.read_uint(reader),
+                duration=self.read_uint(reader),
+                context=self.read_uint(reader),
+                container_type=self.read_uint(reader),
+                container_src=self.read_string(reader),
+                container_id=self.read_string(reader),
+                container_name=self.read_string(reader)
+            )
+
+        if message_id == 60:
+            return SetNodeURLBasedAttribute(
+                id=self.read_uint(reader),
+                name=self.read_string(reader),
+                value=self.read_string(reader),
+                base_url=self.read_string(reader)
+            )
+
+        if message_id == 61:
+            return SetStyleData(
+                id=self.read_uint(reader),
+                data=self.read_string(reader),
+                base_url=self.read_string(reader)
+            )
+
+        if message_id == 62:
+            return IssueEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                type=self.read_string(reader),
+                context_string=self.read_string(reader),
+                context=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 63:
+            return TechnicalInfo(
+                type=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 64:
+            return CustomIssue(
+                name=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
+        if message_id == 65:
+            return PageClose()
+
+        if message_id == 90:
+            return IOSSessionStart(
+                timestamp=self.read_uint(reader),
+                project_id=self.read_uint(reader),
+                tracker_version=self.read_string(reader),
+                rev_id=self.read_string(reader),
+                user_uuid=self.read_string(reader),
+                user_os=self.read_string(reader),
+                user_os_version=self.read_string(reader),
+                user_device=self.read_string(reader),
+                user_device_type=self.read_string(reader),
+                user_country=self.read_string(reader)
+            )
+
+        if message_id == 91:
+            return IOSSessionEnd(
+                timestamp=self.read_uint(reader)
+            )
+
+        if message_id == 92:
+            return IOSMetadata(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                key=self.read_string(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 94:
+            return IOSUserID(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 95:
+            return IOSUserAnonymousID(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                value=self.read_string(reader)
+            )
+
+        if message_id == 99:
+            return IOSScreenLeave(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                title=self.read_string(reader),
+                view_name=self.read_string(reader)
+            )
+
+        if message_id == 103:
+            return IOSLog(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                severity=self.read_string(reader),
+                content=self.read_string(reader)
+            )
+
+        if message_id == 104:
+            return IOSInternalError(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                content=self.read_string(reader)
+            )
+
+        if message_id == 110:
+            return IOSPerformanceAggregated(
+                timestamp_start=self.read_uint(reader),
+                timestamp_end=self.read_uint(reader),
+                min_fps=self.read_uint(reader),
+                avg_fps=self.read_uint(reader),
+                max_fps=self.read_uint(reader),
+                min_cpu=self.read_uint(reader),
+                avg_cpu=self.read_uint(reader),
+                max_cpu=self.read_uint(reader),
+                min_memory=self.read_uint(reader),
+                avg_memory=self.read_uint(reader),
+                max_memory=self.read_uint(reader),
+                min_battery=self.read_uint(reader),
+                avg_battery=self.read_uint(reader),
+                max_battery=self.read_uint(reader)
+            )

From 544e05a08147bcc07f0e85ec2e6f55445c1efc17 Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Fri, 22 Jul 2022 13:59:41 +0200
Subject: [PATCH 66/77] feat(ee/connectors+mobs): generatable message decoder
 for connectors

---
 ee/connectors/msgcodec/messages.py            | 357 ++++++++++++------
 ee/connectors/msgcodec/msgcodec.py            | 192 ++++++++--
 .../ee~connectors~msgcodec~messages.py.erb    |  16 +
 .../ee~connectors~msgcodec~msgcodec.py.erb    |  29 ++
 4 files changed, 461 insertions(+), 133 deletions(-)
 create mode 100644 mobs/templates/ee~connectors~msgcodec~messages.py.erb
 create mode 100644 mobs/templates/ee~connectors~msgcodec~msgcodec.py.erb

diff --git a/ee/connectors/msgcodec/messages.py b/ee/connectors/msgcodec/messages.py
index c6e53b445..b500424b7 100644
--- a/ee/connectors/msgcodec/messages.py
+++ b/ee/connectors/msgcodec/messages.py
@@ -1,13 +1,20 @@
-"""
-Representations of Kafka messages
-"""
-from abc import ABC
+# Auto-generated, do not edit
 
+from abc import ABC
 
 class Message(ABC):
     pass
 
 
+class BatchMeta(Message):
+    __id__ = 80
+
+    def __init__(self, page_no, first_index, timestamp):
+        self.page_no = page_no
+        self.first_index = first_index
+        self.timestamp = timestamp
+
+
 class Timestamp(Message):
     __id__ = 0
 
@@ -18,10 +25,7 @@ class Timestamp(Message):
 class SessionStart(Message):
     __id__ = 1
 
-    def __init__(self, timestamp, project_id, tracker_version, rev_id, user_uuid,
-                 user_agent, user_os, user_os_version, user_browser, user_browser_version,
-                 user_device, user_device_type, user_device_memory_size, user_device_heap_size,
-                 user_country):
+    def __init__(self, timestamp, project_id, tracker_version, rev_id, user_uuid, user_agent, user_os, user_os_version, user_browser, user_browser_version, user_device, user_device_type, user_device_memory_size, user_device_heap_size, user_country, user_id):
         self.timestamp = timestamp
         self.project_id = project_id
         self.tracker_version = tracker_version
@@ -37,6 +41,7 @@ class SessionStart(Message):
         self.user_device_memory_size = user_device_memory_size
         self.user_device_heap_size = user_device_heap_size
         self.user_country = user_country
+        self.user_id = user_id
 
 
 class SessionDisconnect(Message):
@@ -48,7 +53,6 @@ class SessionDisconnect(Message):
 
 class SessionEnd(Message):
     __id__ = 3
-    __name__ = 'SessionEnd'
 
     def __init__(self, timestamp):
         self.timestamp = timestamp
@@ -82,13 +86,16 @@ class SetViewportScroll(Message):
 class CreateDocument(Message):
     __id__ = 7
 
+    def __init__(self, ):
+        
+
 
 class CreateElementNode(Message):
     __id__ = 8
 
     def __init__(self, id, parent_id, index, tag, svg):
         self.id = id
-        self.parent_id = parent_id,
+        self.parent_id = parent_id
         self.index = index
         self.tag = tag
         self.svg = svg
@@ -122,7 +129,7 @@ class RemoveNode(Message):
 class SetNodeAttribute(Message):
     __id__ = 12
 
-    def __init__(self, id, name: str, value: str):
+    def __init__(self, id, name, value):
         self.id = id
         self.name = name
         self.value = value
@@ -131,7 +138,7 @@ class SetNodeAttribute(Message):
 class RemoveNodeAttribute(Message):
     __id__ = 13
 
-    def __init__(self, id, name: str):
+    def __init__(self, id, name):
         self.id = id
         self.name = name
 
@@ -139,7 +146,7 @@ class RemoveNodeAttribute(Message):
 class SetNodeData(Message):
     __id__ = 14
 
-    def __init__(self, id, data: str):
+    def __init__(self, id, data):
         self.id = id
         self.data = data
 
@@ -147,7 +154,7 @@ class SetNodeData(Message):
 class SetCSSData(Message):
     __id__ = 15
 
-    def __init__(self, id, data: str):
+    def __init__(self, id, data):
         self.id = id
         self.data = data
 
@@ -155,7 +162,7 @@ class SetCSSData(Message):
 class SetNodeScroll(Message):
     __id__ = 16
 
-    def __init__(self, id, x: int, y: int):
+    def __init__(self, id, x, y):
         self.id = id
         self.x = x
         self.y = y
@@ -164,7 +171,7 @@ class SetNodeScroll(Message):
 class SetInputTarget(Message):
     __id__ = 17
 
-    def __init__(self, id, label: str):
+    def __init__(self, id, label):
         self.id = id
         self.label = label
 
@@ -172,7 +179,7 @@ class SetInputTarget(Message):
 class SetInputValue(Message):
     __id__ = 18
 
-    def __init__(self, id, value: str, mask: int):
+    def __init__(self, id, value, mask):
         self.id = id
         self.value = value
         self.mask = mask
@@ -181,7 +188,7 @@ class SetInputValue(Message):
 class SetInputChecked(Message):
     __id__ = 19
 
-    def __init__(self, id, checked: bool):
+    def __init__(self, id, checked):
         self.id = id
         self.checked = checked
 
@@ -194,10 +201,10 @@ class MouseMove(Message):
         self.y = y
 
 
-class MouseClick(Message):
+class MouseClickDepricated(Message):
     __id__ = 21
 
-    def __init__(self, id, hesitation_time, label: str):
+    def __init__(self, id, hesitation_time, label):
         self.id = id
         self.hesitation_time = hesitation_time
         self.label = label
@@ -206,7 +213,7 @@ class MouseClick(Message):
 class ConsoleLog(Message):
     __id__ = 22
 
-    def __init__(self, level: str, value: str):
+    def __init__(self, level, value):
         self.level = level
         self.value = value
 
@@ -214,9 +221,7 @@ class ConsoleLog(Message):
 class PageLoadTiming(Message):
     __id__ = 23
 
-    def __init__(self, request_start, response_start, response_end, dom_content_loaded_event_start,
-                 dom_content_loaded_event_end, load_event_start, load_event_end,
-                 first_paint, first_contentful_paint):
+    def __init__(self, request_start, response_start, response_end, dom_content_loaded_event_start, dom_content_loaded_event_end, load_event_start, load_event_end, first_paint, first_contentful_paint):
         self.request_start = request_start
         self.response_start = response_start
         self.response_end = response_end
@@ -236,20 +241,20 @@ class PageRenderTiming(Message):
         self.visually_complete = visually_complete
         self.time_to_interactive = time_to_interactive
 
+
 class JSException(Message):
     __id__ = 25
 
-    def __init__(self, name: str, message: str, payload: str):
+    def __init__(self, name, message, payload):
         self.name = name
         self.message = message
         self.payload = payload
 
 
-class RawErrorEvent(Message):
+class IntegrationEvent(Message):
     __id__ = 26
 
-    def __init__(self, timestamp, source: str, name: str, message: str,
-                 payload: str):
+    def __init__(self, timestamp, source, name, message, payload):
         self.timestamp = timestamp
         self.source = source
         self.name = name
@@ -260,7 +265,7 @@ class RawErrorEvent(Message):
 class RawCustomEvent(Message):
     __id__ = 27
 
-    def __init__(self, name: str, payload: str):
+    def __init__(self, name, payload):
         self.name = name
         self.payload = payload
 
@@ -268,44 +273,29 @@ class RawCustomEvent(Message):
 class UserID(Message):
     __id__ = 28
 
-    def __init__(self, id: str):
+    def __init__(self, id):
         self.id = id
 
 
 class UserAnonymousID(Message):
     __id__ = 29
 
-    def __init__(self, id: str):
+    def __init__(self, id):
         self.id = id
 
 
 class Metadata(Message):
     __id__ = 30
 
-    def __init__(self, key: str, value: str):
+    def __init__(self, key, value):
         self.key = key
         self.value = value
 
 
-class PerformanceTrack(Message):
-    __id__ = 49
-
-    def __init__(self, frames: int, ticks: int, total_js_heap_size,
-                 used_js_heap_size):
-        self.frames = frames
-        self.ticks = ticks
-        self.total_js_heap_size = total_js_heap_size
-        self.used_js_heap_size = used_js_heap_size
-
-
 class PageEvent(Message):
     __id__ = 31
 
-    def __init__(self, message_id, timestamp, url: str, referrer: str,
-                 loaded: bool, request_start, response_start, response_end,
-                 dom_content_loaded_event_start, dom_content_loaded_event_end,
-                 load_event_start, load_event_end, first_paint, first_contentful_paint,
-                 speed_index, visually_complete, time_to_interactive):
+    def __init__(self, message_id, timestamp, url, referrer, loaded, request_start, response_start, response_end, dom_content_loaded_event_start, dom_content_loaded_event_end, load_event_start, load_event_end, first_paint, first_contentful_paint, speed_index, visually_complete, time_to_interactive):
         self.message_id = message_id
         self.timestamp = timestamp
         self.url = url
@@ -328,7 +318,7 @@ class PageEvent(Message):
 class InputEvent(Message):
     __id__ = 32
 
-    def __init__(self, message_id, timestamp, value: str, value_masked: bool, label: str):
+    def __init__(self, message_id, timestamp, value, value_masked, label):
         self.message_id = message_id
         self.timestamp = timestamp
         self.value = value
@@ -339,18 +329,18 @@ class InputEvent(Message):
 class ClickEvent(Message):
     __id__ = 33
 
-    def __init__(self, message_id, timestamp, hesitation_time, label: str):
+    def __init__(self, message_id, timestamp, hesitation_time, label, selector):
         self.message_id = message_id
         self.timestamp = timestamp
         self.hesitation_time = hesitation_time
         self.label = label
+        self.selector = selector
 
 
 class ErrorEvent(Message):
     __id__ = 34
 
-    def __init__(self, message_id, timestamp, source: str, name: str, message: str,
-                 payload: str):
+    def __init__(self, message_id, timestamp, source, name, message, payload):
         self.message_id = message_id
         self.timestamp = timestamp
         self.source = source
@@ -362,8 +352,7 @@ class ErrorEvent(Message):
 class ResourceEvent(Message):
     __id__ = 35
 
-    def __init__(self, message_id, timestamp, duration, ttfb, header_size, encoded_body_size,
-                 decoded_body_size, url: str, type: str, success: bool, method: str, status):
+    def __init__(self, message_id, timestamp, duration, ttfb, header_size, encoded_body_size, decoded_body_size, url, type, success, method, status):
         self.message_id = message_id
         self.timestamp = timestamp
         self.duration = duration
@@ -381,7 +370,7 @@ class ResourceEvent(Message):
 class CustomEvent(Message):
     __id__ = 36
 
-    def __init__(self, message_id, timestamp, name: str, payload: str):
+    def __init__(self, message_id, timestamp, name, payload):
         self.message_id = message_id
         self.timestamp = timestamp
         self.name = name
@@ -391,7 +380,7 @@ class CustomEvent(Message):
 class CSSInsertRule(Message):
     __id__ = 37
 
-    def __init__(self, id, rule: str, index):
+    def __init__(self, id, rule, index):
         self.id = id
         self.rule = rule
         self.index = index
@@ -408,8 +397,7 @@ class CSSDeleteRule(Message):
 class Fetch(Message):
     __id__ = 39
 
-    def __init__(self, method: str, url: str, request: str, response: str, status,
-                 timestamp, duration):
+    def __init__(self, method, url, request, response, status, timestamp, duration):
         self.method = method
         self.url = url
         self.request = request
@@ -422,7 +410,7 @@ class Fetch(Message):
 class Profiler(Message):
     __id__ = 40
 
-    def __init__(self, name: str, duration, args: str, result: str):
+    def __init__(self, name, duration, args, result):
         self.name = name
         self.duration = duration
         self.args = args
@@ -432,7 +420,7 @@ class Profiler(Message):
 class OTable(Message):
     __id__ = 41
 
-    def __init__(self, key: str, value: str):
+    def __init__(self, key, value):
         self.key = key
         self.value = value
 
@@ -440,14 +428,14 @@ class OTable(Message):
 class StateAction(Message):
     __id__ = 42
 
-    def __init__(self, type: str):
+    def __init__(self, type):
         self.type = type
 
 
 class StateActionEvent(Message):
     __id__ = 43
 
-    def __init__(self, message_id, timestamp, type: str):
+    def __init__(self, message_id, timestamp, type):
         self.message_id = message_id
         self.timestamp = timestamp
         self.type = type
@@ -456,7 +444,7 @@ class StateActionEvent(Message):
 class Redux(Message):
     __id__ = 44
 
-    def __init__(self, action: str, state: str, duration):
+    def __init__(self, action, state, duration):
         self.action = action
         self.state = state
         self.duration = duration
@@ -465,7 +453,7 @@ class Redux(Message):
 class Vuex(Message):
     __id__ = 45
 
-    def __init__(self, mutation: str, state: str):
+    def __init__(self, mutation, state):
         self.mutation = mutation
         self.state = state
 
@@ -473,7 +461,7 @@ class Vuex(Message):
 class MobX(Message):
     __id__ = 46
 
-    def __init__(self, type: str, payload: str):
+    def __init__(self, type, payload):
         self.type = type
         self.payload = payload
 
@@ -481,7 +469,7 @@ class MobX(Message):
 class NgRx(Message):
     __id__ = 47
 
-    def __init__(self, action: str, state: str, duration):
+    def __init__(self, action, state, duration):
         self.action = action
         self.state = state
         self.duration = duration
@@ -490,8 +478,7 @@ class NgRx(Message):
 class GraphQL(Message):
     __id__ = 48
 
-    def __init__(self, operation_kind: str, operation_name: str,
-                 variables: str, response: str):
+    def __init__(self, operation_kind, operation_name, variables, response):
         self.operation_kind = operation_kind
         self.operation_name = operation_name
         self.variables = variables
@@ -501,8 +488,7 @@ class GraphQL(Message):
 class PerformanceTrack(Message):
     __id__ = 49
 
-    def __init__(self, frames: int, ticks: int,
-                 total_js_heap_size, used_js_heap_size):
+    def __init__(self, frames, ticks, total_js_heap_size, used_js_heap_size):
         self.frames = frames
         self.ticks = ticks
         self.total_js_heap_size = total_js_heap_size
@@ -512,13 +498,30 @@ class PerformanceTrack(Message):
 class GraphQLEvent(Message):
     __id__ = 50
 
-    def __init__(self, message_id, timestamp, name: str):
+    def __init__(self, message_id, timestamp, operation_kind, operation_name, variables, response):
         self.message_id = message_id
         self.timestamp = timestamp
-        self.name = name
+        self.operation_kind = operation_kind
+        self.operation_name = operation_name
+        self.variables = variables
+        self.response = response
 
 
-class DomDrop(Message):
+class FetchEvent(Message):
+    __id__ = 51
+
+    def __init__(self, message_id, timestamp, method, url, request, response, status, duration):
+        self.message_id = message_id
+        self.timestamp = timestamp
+        self.method = method
+        self.url = url
+        self.request = request
+        self.response = response
+        self.status = status
+        self.duration = duration
+
+
+class DOMDrop(Message):
     __id__ = 52
 
     def __init__(self, timestamp):
@@ -528,8 +531,7 @@ class DomDrop(Message):
 class ResourceTiming(Message):
     __id__ = 53
 
-    def __init__(self, timestamp, duration, ttfb, header_size, encoded_body_size,
-                 decoded_body_size, url, initiator):
+    def __init__(self, timestamp, duration, ttfb, header_size, encoded_body_size, decoded_body_size, url, initiator):
         self.timestamp = timestamp
         self.duration = duration
         self.ttfb = ttfb
@@ -543,7 +545,7 @@ class ResourceTiming(Message):
 class ConnectionInformation(Message):
     __id__ = 54
 
-    def __init__(self, downlink, type: str):
+    def __init__(self, downlink, type):
         self.downlink = downlink
         self.type = type
 
@@ -551,19 +553,14 @@ class ConnectionInformation(Message):
 class SetPageVisibility(Message):
     __id__ = 55
 
-    def __init__(self, hidden: bool):
+    def __init__(self, hidden):
         self.hidden = hidden
 
 
 class PerformanceTrackAggr(Message):
     __id__ = 56
 
-    def __init__(self, timestamp_start, timestamp_end, min_fps, avg_fps,
-                 max_fps, min_cpu, avg_cpu, max_cpu,
-                 min_total_js_heap_size, avg_total_js_heap_size,
-                 max_total_js_heap_size, min_used_js_heap_size,
-                 avg_used_js_heap_size, max_used_js_heap_size
-                 ):
+    def __init__(self, timestamp_start, timestamp_end, min_fps, avg_fps, max_fps, min_cpu, avg_cpu, max_cpu, min_total_js_heap_size, avg_total_js_heap_size, max_total_js_heap_size, min_used_js_heap_size, avg_used_js_heap_size, max_used_js_heap_size):
         self.timestamp_start = timestamp_start
         self.timestamp_end = timestamp_end
         self.min_fps = min_fps
@@ -583,8 +580,7 @@ class PerformanceTrackAggr(Message):
 class LongTask(Message):
     __id__ = 59
 
-    def __init__(self, timestamp, duration, context, container_type, container_src: str,
-                 container_id: str, container_name: str):
+    def __init__(self, timestamp, duration, context, container_type, container_src, container_id, container_name):
         self.timestamp = timestamp
         self.duration = duration
         self.context = context
@@ -594,20 +590,20 @@ class LongTask(Message):
         self.container_name = container_name
 
 
-class SetNodeURLBasedAttribute(Message):
+class SetNodeAttributeURLBased(Message):
     __id__ = 60
 
-    def __init__(self, id, name: str, value: str, base_url: str):
+    def __init__(self, id, name, value, base_url):
         self.id = id
         self.name = name
         self.value = value
         self.base_url = base_url
 
 
-class SetStyleData(Message):
+class SetCSSDataURLBased(Message):
     __id__ = 61
 
-    def __init__(self, id, data: str, base_url: str):
+    def __init__(self, id, data, base_url):
         self.id = id
         self.data = data
         self.base_url = base_url
@@ -616,8 +612,7 @@ class SetStyleData(Message):
 class IssueEvent(Message):
     __id__ = 62
 
-    def __init__(self, message_id, timestamp, type: str, context_string: str,
-                 context: str, payload: str):
+    def __init__(self, message_id, timestamp, type, context_string, context, payload):
         self.message_id = message_id
         self.timestamp = timestamp
         self.type = type
@@ -629,7 +624,7 @@ class IssueEvent(Message):
 class TechnicalInfo(Message):
     __id__ = 63
 
-    def __init__(self, type: str, value: str):
+    def __init__(self, type, value):
         self.type = type
         self.value = value
 
@@ -637,7 +632,7 @@ class TechnicalInfo(Message):
 class CustomIssue(Message):
     __id__ = 64
 
-    def __init__(self, name: str, payload: str):
+    def __init__(self, name, payload):
         self.name = name
         self.payload = payload
 
@@ -645,13 +640,58 @@ class CustomIssue(Message):
 class PageClose(Message):
     __id__ = 65
 
+    def __init__(self, ):
+        
+
+
+class AssetCache(Message):
+    __id__ = 66
+
+    def __init__(self, url):
+        self.url = url
+
+
+class CSSInsertRuleURLBased(Message):
+    __id__ = 67
+
+    def __init__(self, id, rule, index, base_url):
+        self.id = id
+        self.rule = rule
+        self.index = index
+        self.base_url = base_url
+
+
+class MouseClick(Message):
+    __id__ = 69
+
+    def __init__(self, id, hesitation_time, label, selector):
+        self.id = id
+        self.hesitation_time = hesitation_time
+        self.label = label
+        self.selector = selector
+
+
+class CreateIFrameDocument(Message):
+    __id__ = 70
+
+    def __init__(self, frame_id, id):
+        self.frame_id = frame_id
+        self.id = id
+
+
+class IOSBatchMeta(Message):
+    __id__ = 107
+
+    def __init__(self, timestamp, length, first_index):
+        self.timestamp = timestamp
+        self.length = length
+        self.first_index = first_index
+
 
 class IOSSessionStart(Message):
     __id__ = 90
 
-    def __init__(self, timestamp, project_id, tracker_version: str,
-                 rev_id: str, user_uuid: str, user_os: str, user_os_version: str,
-                 user_device: str, user_device_type: str, user_country: str):
+    def __init__(self, timestamp, project_id, tracker_version, rev_id, user_uuid, user_os, user_os_version, user_device, user_device_type, user_country):
         self.timestamp = timestamp
         self.project_id = project_id
         self.tracker_version = tracker_version
@@ -674,17 +714,27 @@ class IOSSessionEnd(Message):
 class IOSMetadata(Message):
     __id__ = 92
 
-    def __init__(self, timestamp, length, key: str, value: str):
+    def __init__(self, timestamp, length, key, value):
         self.timestamp = timestamp
         self.length = length
         self.key = key
         self.value = value
 
 
+class IOSCustomEvent(Message):
+    __id__ = 93
+
+    def __init__(self, timestamp, length, name, payload):
+        self.timestamp = timestamp
+        self.length = length
+        self.name = name
+        self.payload = payload
+
+
 class IOSUserID(Message):
     __id__ = 94
 
-    def __init__(self, timestamp, length, value: str):
+    def __init__(self, timestamp, length, value):
         self.timestamp = timestamp
         self.length = length
         self.value = value
@@ -693,26 +743,91 @@ class IOSUserID(Message):
 class IOSUserAnonymousID(Message):
     __id__ = 95
 
-    def __init__(self, timestamp, length, value: str):
+    def __init__(self, timestamp, length, value):
         self.timestamp = timestamp
         self.length = length
         self.value = value
 
 
-class IOSScreenLeave(Message):
-    __id__ = 99
+class IOSScreenChanges(Message):
+    __id__ = 96
 
-    def __init__(self, timestamp, length, title: str, view_name: str):
+    def __init__(self, timestamp, length, x, y, width, height):
+        self.timestamp = timestamp
+        self.length = length
+        self.x = x
+        self.y = y
+        self.width = width
+        self.height = height
+
+
+class IOSCrash(Message):
+    __id__ = 97
+
+    def __init__(self, timestamp, length, name, reason, stacktrace):
+        self.timestamp = timestamp
+        self.length = length
+        self.name = name
+        self.reason = reason
+        self.stacktrace = stacktrace
+
+
+class IOSScreenEnter(Message):
+    __id__ = 98
+
+    def __init__(self, timestamp, length, title, view_name):
         self.timestamp = timestamp
         self.length = length
         self.title = title
         self.view_name = view_name
 
 
+class IOSScreenLeave(Message):
+    __id__ = 99
+
+    def __init__(self, timestamp, length, title, view_name):
+        self.timestamp = timestamp
+        self.length = length
+        self.title = title
+        self.view_name = view_name
+
+
+class IOSClickEvent(Message):
+    __id__ = 100
+
+    def __init__(self, timestamp, length, label, x, y):
+        self.timestamp = timestamp
+        self.length = length
+        self.label = label
+        self.x = x
+        self.y = y
+
+
+class IOSInputEvent(Message):
+    __id__ = 101
+
+    def __init__(self, timestamp, length, value, value_masked, label):
+        self.timestamp = timestamp
+        self.length = length
+        self.value = value
+        self.value_masked = value_masked
+        self.label = label
+
+
+class IOSPerformanceEvent(Message):
+    __id__ = 102
+
+    def __init__(self, timestamp, length, name, value):
+        self.timestamp = timestamp
+        self.length = length
+        self.name = name
+        self.value = value
+
+
 class IOSLog(Message):
     __id__ = 103
 
-    def __init__(self, timestamp, length, severity: str, content: str):
+    def __init__(self, timestamp, length, severity, content):
         self.timestamp = timestamp
         self.length = length
         self.severity = severity
@@ -722,20 +837,31 @@ class IOSLog(Message):
 class IOSInternalError(Message):
     __id__ = 104
 
-    def __init__(self, timestamp, length, content: str):
+    def __init__(self, timestamp, length, content):
         self.timestamp = timestamp
         self.length = length
         self.content = content
 
 
+class IOSNetworkCall(Message):
+    __id__ = 105
+
+    def __init__(self, timestamp, length, duration, headers, body, url, success, method, status):
+        self.timestamp = timestamp
+        self.length = length
+        self.duration = duration
+        self.headers = headers
+        self.body = body
+        self.url = url
+        self.success = success
+        self.method = method
+        self.status = status
+
+
 class IOSPerformanceAggregated(Message):
     __id__ = 110
 
-    def __init__(self, timestamp_start, timestamp_end, min_fps, avg_fps,
-                 max_fps, min_cpu, avg_cpu, max_cpu,
-                 min_memory, avg_memory, max_memory,
-                 min_battery, avg_battery, max_battery
-                 ):
+    def __init__(self, timestamp_start, timestamp_end, min_fps, avg_fps, max_fps, min_cpu, avg_cpu, max_cpu, min_memory, avg_memory, max_memory, min_battery, avg_battery, max_battery):
         self.timestamp_start = timestamp_start
         self.timestamp_end = timestamp_end
         self.min_fps = min_fps
@@ -750,3 +876,16 @@ class IOSPerformanceAggregated(Message):
         self.min_battery = min_battery
         self.avg_battery = avg_battery
         self.max_battery = max_battery
+
+
+class IOSIssueEvent(Message):
+    __id__ = 111
+
+    def __init__(self, timestamp, type, context_string, context, payload):
+        self.timestamp = timestamp
+        self.type = type
+        self.context_string = context_string
+        self.context = context
+        self.payload = payload
+
+
diff --git a/ee/connectors/msgcodec/msgcodec.py b/ee/connectors/msgcodec/msgcodec.py
index 3289a18bd..3bd74499c 100644
--- a/ee/connectors/msgcodec/msgcodec.py
+++ b/ee/connectors/msgcodec/msgcodec.py
@@ -1,3 +1,5 @@
+# Auto-generated, do not edit
+
 from msgcodec.codec import Codec
 from msgcodec.messages import *
 
@@ -17,10 +19,18 @@ class MessageCodec(Codec):
         reader = io.BytesIO(b)
         message_id = self.read_message_id(reader)
 
+        if message_id == 80:
+            return BatchMeta(
+                page_no=self.read_uint(reader),
+                first_index=self.read_uint(reader),
+                timestamp=self.read_int(reader)
+            )
+
         if message_id == 0:
             return Timestamp(
                 timestamp=self.read_uint(reader)
             )
+
         if message_id == 1:
             return SessionStart(
                 timestamp=self.read_uint(reader),
@@ -37,7 +47,8 @@ class MessageCodec(Codec):
                 user_device_type=self.read_string(reader),
                 user_device_memory_size=self.read_uint(reader),
                 user_device_heap_size=self.read_uint(reader),
-                user_country=self.read_string(reader)
+                user_country=self.read_string(reader),
+                user_id=self.read_string(reader)
             )
 
         if message_id == 2:
@@ -70,7 +81,9 @@ class MessageCodec(Codec):
             )
 
         if message_id == 7:
-            return CreateDocument()
+            return CreateDocument(
+                
+            )
 
         if message_id == 8:
             return CreateElementNode(
@@ -78,7 +91,7 @@ class MessageCodec(Codec):
                 parent_id=self.read_uint(reader),
                 index=self.read_uint(reader),
                 tag=self.read_string(reader),
-                svg=self.read_boolean(reader),
+                svg=self.read_boolean(reader)
             )
 
         if message_id == 9:
@@ -129,7 +142,7 @@ class MessageCodec(Codec):
             return SetNodeScroll(
                 id=self.read_uint(reader),
                 x=self.read_int(reader),
-                y=self.read_int(reader),
+                y=self.read_int(reader)
             )
 
         if message_id == 17:
@@ -142,7 +155,7 @@ class MessageCodec(Codec):
             return SetInputValue(
                 id=self.read_uint(reader),
                 value=self.read_string(reader),
-                mask=self.read_int(reader),
+                mask=self.read_int(reader)
             )
 
         if message_id == 19:
@@ -158,7 +171,7 @@ class MessageCodec(Codec):
             )
 
         if message_id == 21:
-            return MouseClick(
+            return MouseClickDepricated(
                 id=self.read_uint(reader),
                 hesitation_time=self.read_uint(reader),
                 label=self.read_string(reader)
@@ -187,7 +200,7 @@ class MessageCodec(Codec):
             return PageRenderTiming(
                 speed_index=self.read_uint(reader),
                 visually_complete=self.read_uint(reader),
-                time_to_interactive=self.read_uint(reader),
+                time_to_interactive=self.read_uint(reader)
             )
 
         if message_id == 25:
@@ -198,7 +211,7 @@ class MessageCodec(Codec):
             )
 
         if message_id == 26:
-            return RawErrorEvent(
+            return IntegrationEvent(
                 timestamp=self.read_uint(reader),
                 source=self.read_string(reader),
                 name=self.read_string(reader),
@@ -255,7 +268,7 @@ class MessageCodec(Codec):
                 timestamp=self.read_uint(reader),
                 value=self.read_string(reader),
                 value_masked=self.read_boolean(reader),
-                label=self.read_string(reader),
+                label=self.read_string(reader)
             )
 
         if message_id == 33:
@@ -263,7 +276,8 @@ class MessageCodec(Codec):
                 message_id=self.read_uint(reader),
                 timestamp=self.read_uint(reader),
                 hesitation_time=self.read_uint(reader),
-                label=self.read_string(reader)
+                label=self.read_string(reader),
+                selector=self.read_string(reader)
             )
 
         if message_id == 34:
@@ -277,14 +291,9 @@ class MessageCodec(Codec):
             )
 
         if message_id == 35:
-
-            message_id = self.read_uint(reader)
-            ts = self.read_uint(reader)
-            if ts > 9999999999999:
-                ts = None
             return ResourceEvent(
-                message_id=message_id,
-                timestamp=ts,
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
                 duration=self.read_uint(reader),
                 ttfb=self.read_uint(reader),
                 header_size=self.read_uint(reader),
@@ -365,13 +374,13 @@ class MessageCodec(Codec):
         if message_id == 45:
             return Vuex(
                 mutation=self.read_string(reader),
-                state=self.read_string(reader),
+                state=self.read_string(reader)
             )
 
         if message_id == 46:
             return MobX(
                 type=self.read_string(reader),
-                payload=self.read_string(reader),
+                payload=self.read_string(reader)
             )
 
         if message_id == 47:
@@ -401,11 +410,26 @@ class MessageCodec(Codec):
             return GraphQLEvent(
                 message_id=self.read_uint(reader),
                 timestamp=self.read_uint(reader),
-                name=self.read_string(reader)
+                operation_kind=self.read_string(reader),
+                operation_name=self.read_string(reader),
+                variables=self.read_string(reader),
+                response=self.read_string(reader)
+            )
+
+        if message_id == 51:
+            return FetchEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                method=self.read_string(reader),
+                url=self.read_string(reader),
+                request=self.read_string(reader),
+                response=self.read_string(reader),
+                status=self.read_uint(reader),
+                duration=self.read_uint(reader)
             )
 
         if message_id == 52:
-            return DomDrop(
+            return DOMDrop(
                 timestamp=self.read_uint(reader)
             )
 
@@ -462,7 +486,7 @@ class MessageCodec(Codec):
             )
 
         if message_id == 60:
-            return SetNodeURLBasedAttribute(
+            return SetNodeAttributeURLBased(
                 id=self.read_uint(reader),
                 name=self.read_string(reader),
                 value=self.read_string(reader),
@@ -470,7 +494,7 @@ class MessageCodec(Codec):
             )
 
         if message_id == 61:
-            return SetStyleData(
+            return SetCSSDataURLBased(
                 id=self.read_uint(reader),
                 data=self.read_string(reader),
                 base_url=self.read_string(reader)
@@ -499,7 +523,43 @@ class MessageCodec(Codec):
             )
 
         if message_id == 65:
-            return PageClose()
+            return PageClose(
+                
+            )
+
+        if message_id == 66:
+            return AssetCache(
+                url=self.read_string(reader)
+            )
+
+        if message_id == 67:
+            return CSSInsertRuleURLBased(
+                id=self.read_uint(reader),
+                rule=self.read_string(reader),
+                index=self.read_uint(reader),
+                base_url=self.read_string(reader)
+            )
+
+        if message_id == 69:
+            return MouseClick(
+                id=self.read_uint(reader),
+                hesitation_time=self.read_uint(reader),
+                label=self.read_string(reader),
+                selector=self.read_string(reader)
+            )
+
+        if message_id == 70:
+            return CreateIFrameDocument(
+                frame_id=self.read_uint(reader),
+                id=self.read_uint(reader)
+            )
+
+        if message_id == 107:
+            return IOSBatchMeta(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                first_index=self.read_uint(reader)
+            )
 
         if message_id == 90:
             return IOSSessionStart(
@@ -528,6 +588,14 @@ class MessageCodec(Codec):
                 value=self.read_string(reader)
             )
 
+        if message_id == 93:
+            return IOSCustomEvent(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                name=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
         if message_id == 94:
             return IOSUserID(
                 timestamp=self.read_uint(reader),
@@ -542,6 +610,33 @@ class MessageCodec(Codec):
                 value=self.read_string(reader)
             )
 
+        if message_id == 96:
+            return IOSScreenChanges(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                x=self.read_uint(reader),
+                y=self.read_uint(reader),
+                width=self.read_uint(reader),
+                height=self.read_uint(reader)
+            )
+
+        if message_id == 97:
+            return IOSCrash(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                name=self.read_string(reader),
+                reason=self.read_string(reader),
+                stacktrace=self.read_string(reader)
+            )
+
+        if message_id == 98:
+            return IOSScreenEnter(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                title=self.read_string(reader),
+                view_name=self.read_string(reader)
+            )
+
         if message_id == 99:
             return IOSScreenLeave(
                 timestamp=self.read_uint(reader),
@@ -550,6 +645,32 @@ class MessageCodec(Codec):
                 view_name=self.read_string(reader)
             )
 
+        if message_id == 100:
+            return IOSClickEvent(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                label=self.read_string(reader),
+                x=self.read_uint(reader),
+                y=self.read_uint(reader)
+            )
+
+        if message_id == 101:
+            return IOSInputEvent(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                value=self.read_string(reader),
+                value_masked=self.read_boolean(reader),
+                label=self.read_string(reader)
+            )
+
+        if message_id == 102:
+            return IOSPerformanceEvent(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                name=self.read_string(reader),
+                value=self.read_uint(reader)
+            )
+
         if message_id == 103:
             return IOSLog(
                 timestamp=self.read_uint(reader),
@@ -565,6 +686,19 @@ class MessageCodec(Codec):
                 content=self.read_string(reader)
             )
 
+        if message_id == 105:
+            return IOSNetworkCall(
+                timestamp=self.read_uint(reader),
+                length=self.read_uint(reader),
+                duration=self.read_uint(reader),
+                headers=self.read_string(reader),
+                body=self.read_string(reader),
+                url=self.read_string(reader),
+                success=self.read_boolean(reader),
+                method=self.read_string(reader),
+                status=self.read_uint(reader)
+            )
+
         if message_id == 110:
             return IOSPerformanceAggregated(
                 timestamp_start=self.read_uint(reader),
@@ -582,3 +716,13 @@ class MessageCodec(Codec):
                 avg_battery=self.read_uint(reader),
                 max_battery=self.read_uint(reader)
             )
+
+        if message_id == 111:
+            return IOSIssueEvent(
+                timestamp=self.read_uint(reader),
+                type=self.read_string(reader),
+                context_string=self.read_string(reader),
+                context=self.read_string(reader),
+                payload=self.read_string(reader)
+            )
+
diff --git a/mobs/templates/ee~connectors~msgcodec~messages.py.erb b/mobs/templates/ee~connectors~msgcodec~messages.py.erb
new file mode 100644
index 000000000..88acfa282
--- /dev/null
+++ b/mobs/templates/ee~connectors~msgcodec~messages.py.erb
@@ -0,0 +1,16 @@
+# Auto-generated, do not edit
+
+from abc import ABC
+
+class Message(ABC):
+    pass
+
+<% $messages.each do |msg| %>
+class <%= msg.name %>(Message):
+    __id__ = <%= msg.id %>
+
+    def __init__(self, <%= msg.attributes.map { |attr| "#{attr.name.underscore}" }.join ", " %>):
+        <%= msg.attributes.map { |attr| "self.#{attr.name.underscore} = #{attr.name.underscore}" }.join "\n        "
+        %>
+
+<% end %>
diff --git a/mobs/templates/ee~connectors~msgcodec~msgcodec.py.erb b/mobs/templates/ee~connectors~msgcodec~msgcodec.py.erb
new file mode 100644
index 000000000..08d94ba8b
--- /dev/null
+++ b/mobs/templates/ee~connectors~msgcodec~msgcodec.py.erb
@@ -0,0 +1,29 @@
+# Auto-generated, do not edit
+
+from msgcodec.codec import Codec
+from msgcodec.messages import *
+
+class MessageCodec(Codec):
+
+    def read_message_id(self, reader: io.BytesIO) -> int:
+        """
+        Read and return the first byte where the message id is encoded
+        """
+        id_ = self.read_uint(reader)
+        return id_
+
+    def encode(self, m: Message) -> bytes:
+        ...
+
+    def decode(self, b: bytes) -> Message:
+        reader = io.BytesIO(b)
+        message_id = self.read_message_id(reader)
+<% $messages.each do |msg| %>
+        if message_id == <%= msg.id %>:
+            return <%= msg.name %>(
+                <%= msg.attributes.map { |attr| 
+                    "#{attr.name.underscore}=self.read_#{attr.type.to_s}(reader)" }
+                    .join ",\n                "
+                %>
+            )
+<% end %>

From ef679a275f092ebbbea3633f2b366036cb203674 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 22 Jul 2022 18:52:30 +0200
Subject: [PATCH 67/77] change(ui) - live sessions maintain query params

---
 .../shared/SessionItem/PlayLink/PlayLink.tsx  |  36 +-
 .../shared/SessionItem/SessionItem.tsx        | 321 +++++++++---------
 frontend/app/routes.js                        |   2 +-
 3 files changed, 178 insertions(+), 181 deletions(-)

diff --git a/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx b/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
index 54c7ed692..a063641ec 100644
--- a/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
+++ b/frontend/app/components/shared/SessionItem/PlayLink/PlayLink.tsx
@@ -1,44 +1,42 @@
-import React, { useState, useEffect } from 'react'
-import { 
-    Link,
-    Icon,
-  } from 'UI';
+import React, { useState, useEffect } from 'react';
+import { Link, Icon } from 'UI';
 import { session as sessionRoute, liveSession as liveSessionRoute } from 'App/routes';
 
 const PLAY_ICON_NAMES = {
     notPlayed: 'play-fill',
     played: 'play-circle-light',
-    hovered: 'play-hover'
-}
+    hovered: 'play-hover',
+};
 
-const getDefaultIconName = (isViewed) => !isViewed ? PLAY_ICON_NAMES.notPlayed : PLAY_ICON_NAMES.played
+const getDefaultIconName = (isViewed: any) => (!isViewed ? PLAY_ICON_NAMES.notPlayed : PLAY_ICON_NAMES.played);
 
 interface Props {
     isAssist: boolean;
     viewed: boolean;
     sessionId: string;
     onClick?: () => void;
+    queryParams: any;
 }
 export default function PlayLink(props: Props) {
-    const { isAssist, viewed, sessionId, onClick = null } = props
-    const defaultIconName = getDefaultIconName(viewed)
+    const { isAssist, viewed, sessionId, onClick = null, queryParams } = props;
+    const defaultIconName = getDefaultIconName(viewed);
 
-    const [isHovered, toggleHover] = useState(false)
-    const [iconName, setIconName] = useState(defaultIconName)
+    const [isHovered, toggleHover] = useState(false);
+    const [iconName, setIconName] = useState(defaultIconName);
 
     useEffect(() => {
-        if (isHovered) setIconName(PLAY_ICON_NAMES.hovered)
-        else setIconName(getDefaultIconName(viewed))
-    }, [isHovered, viewed])
+        if (isHovered) setIconName(PLAY_ICON_NAMES.hovered);
+        else setIconName(getDefaultIconName(viewed));
+    }, [isHovered, viewed]);
 
     return (
         <Link
             onClick={onClick ? onClick : () => {}}
-            to={ isAssist ? liveSessionRoute(sessionId) : sessionRoute(sessionId) }
+            to={isAssist ? liveSessionRoute(sessionId, queryParams) : sessionRoute(sessionId)}
             onMouseEnter={() => toggleHover(true)}
             onMouseLeave={() => toggleHover(false)}
         >
-            <Icon name={iconName} size={38} color={isAssist ? "tealx" : "teal"} />
+            <Icon name={iconName} size={38} color={isAssist ? 'tealx' : 'teal'} />
         </Link>
-    )
-}
\ No newline at end of file
+    );
+}
diff --git a/frontend/app/components/shared/SessionItem/SessionItem.tsx b/frontend/app/components/shared/SessionItem/SessionItem.tsx
index 17b8122c3..fa886ab8b 100644
--- a/frontend/app/components/shared/SessionItem/SessionItem.tsx
+++ b/frontend/app/components/shared/SessionItem/SessionItem.tsx
@@ -1,192 +1,191 @@
-import React from 'react'
+import React, { useEffect } from 'react';
 import cn from 'classnames';
-import {
-  CountryFlag,
-  Avatar,
-  TextEllipsis,
-  Label,
-  Icon,
-} from 'UI';
+import { CountryFlag, Avatar, TextEllipsis, Label, Icon } from 'UI';
 import { useStore } from 'App/mstore';
 import { observer } from 'mobx-react-lite';
 import { durationFormatted, formatTimeOrDate } from 'App/date';
 import stl from './sessionItem.module.css';
-import Counter from './Counter'
+import Counter from './Counter';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import SessionMetaList from './SessionMetaList';
 import PlayLink from './PlayLink';
 import ErrorBars from './ErrorBars';
-import { assist as assistRoute, liveSession, sessions as sessionsRoute, isRoute } from "App/routes";
+import { assist as assistRoute, liveSession, sessions as sessionsRoute, isRoute } from 'App/routes';
 import { capitalize } from 'App/utils';
 
 const ASSIST_ROUTE = assistRoute();
-const ASSIST_LIVE_SESSION = liveSession()
+const ASSIST_LIVE_SESSION = liveSession();
 const SESSIONS_ROUTE = sessionsRoute();
 
 interface Props {
-  session: {
-    sessionId: string;
-    userBrowser: string;
-    userOs: string;
-    userId: string;
-    userAnonymousId: string;
-    userDisplayName: string;
-    userCountry: string;
-    startedAt: number;
-    duration: string;
-    eventsCount: number;
-    errorsCount: number;
-    pagesCount: number;
-    viewed: boolean;
-    favorite: boolean;
-    userDeviceType: string;
-    userUuid: string;
-    userNumericHash: number;
-    live: boolean;
-    metadata: Record<string, any>;
-    userSessionsCount: number;
-    issueTypes: [];
-    active: boolean;
-  },
-  onUserClick?: (userId: string, userAnonymousId: string) => void;
-  hasUserFilter?: boolean;
-  disableUser?: boolean;
-  metaList?: Array<any>;
-  // showActive?: boolean;
-  lastPlayedSessionId?: string;
-  live?: boolean;
-  onClick?: any
+    session: {
+        sessionId: string;
+        userBrowser: string;
+        userOs: string;
+        userId: string;
+        userAnonymousId: string;
+        userDisplayName: string;
+        userCountry: string;
+        startedAt: number;
+        duration: string;
+        eventsCount: number;
+        errorsCount: number;
+        pagesCount: number;
+        viewed: boolean;
+        favorite: boolean;
+        userDeviceType: string;
+        userUuid: string;
+        userNumericHash: number;
+        live: boolean;
+        metadata: Record<string, any>;
+        userSessionsCount: number;
+        issueTypes: [];
+        active: boolean;
+    };
+    onUserClick?: (userId: string, userAnonymousId: string) => void;
+    hasUserFilter?: boolean;
+    disableUser?: boolean;
+    metaList?: Array<any>;
+    // showActive?: boolean;
+    lastPlayedSessionId?: string;
+    live?: boolean;
+    onClick?: any;
 }
 
 function SessionItem(props: RouteComponentProps & Props) {
-  const { settingsStore } = useStore();
-  const { timezone } = settingsStore.sessionSettings;
+    const { settingsStore } = useStore();
+    const { timezone } = settingsStore.sessionSettings;
+    const [isIframe, setIsIframe] = React.useState(false);
 
-  const {
-    session,
-    onUserClick = () => null,
-    hasUserFilter = false,
-    disableUser = false,
-    metaList = [],
-    lastPlayedSessionId,
-    onClick = null,
-  } = props;
+    const {
+        session,
+        onUserClick = () => null,
+        hasUserFilter = false,
+        disableUser = false,
+        metaList = [],
+        lastPlayedSessionId,
+        onClick = null,
+    } = props;
 
-  const {
-    sessionId,
-    userBrowser,
-    userOs,
-    userId,
-    userAnonymousId,
-    userDisplayName,
-    userCountry,
-    startedAt,
-    duration,
-    eventsCount,
-    viewed,
-    userDeviceType,
-    userNumericHash,
-    live,
-    metadata,
-    issueTypes,
-    active,
-  } = session;
+    const {
+        sessionId,
+        userBrowser,
+        userOs,
+        userId,
+        userAnonymousId,
+        userDisplayName,
+        userCountry,
+        startedAt,
+        duration,
+        eventsCount,
+        viewed,
+        userDeviceType,
+        userNumericHash,
+        live,
+        metadata,
+        issueTypes,
+        active,
+    } = session;
 
-  const location = props.location;
+    const location = props.location;
+    const queryParams = Object.fromEntries(new URLSearchParams(location.search));
 
-  const formattedDuration = durationFormatted(duration);
-  const hasUserId = userId || userAnonymousId;
-  const isSessions = isRoute(SESSIONS_ROUTE, location.pathname);
-  const isAssist = isRoute(ASSIST_ROUTE, location.pathname) || isRoute(ASSIST_LIVE_SESSION, location.pathname);
-  const isLastPlayed = lastPlayedSessionId === sessionId;
+    const formattedDuration = durationFormatted(duration);
+    const hasUserId = userId || userAnonymousId;
+    const isSessions = isRoute(SESSIONS_ROUTE, location.pathname);
+    const isAssist = isRoute(ASSIST_ROUTE, location.pathname) || isRoute(ASSIST_LIVE_SESSION, location.pathname);
+    const isLastPlayed = lastPlayedSessionId === sessionId;
 
-  const _metaList = Object.keys(metadata).filter(i => metaList.includes(i)).map(key => {
-    const value = metadata[key];
-    return { label: key, value };
-  });
+    const _metaList = Object.keys(metadata)
+        .filter((i) => metaList.includes(i))
+        .map((key) => {
+            const value = metadata[key];
+            return { label: key, value };
+        });
 
-  return (
-    <div className={ cn(stl.sessionItem, "flex flex-col p-2") } id="session-item" onClick={(e) => e.stopPropagation()}>
-        <div className="flex items-start">
-          <div className={ cn('flex items-center w-full')}>
-            <div className="flex items-center pr-2 shrink-0" style={{ width: "40%"}}>
-              <div><Avatar isActive={active} seed={ userNumericHash } isAssist={isAssist} /></div>
-              <div className="flex flex-col overflow-hidden color-gray-medium ml-3 justify-between items-center shrink-0">
-                <div
-                  className={cn('text-lg', {'color-teal cursor-pointer': !disableUser && hasUserId, [stl.userName]: !disableUser && hasUserId, 'color-gray-medium' : disableUser || !hasUserId})}
-                  onClick={() => (!disableUser && !hasUserFilter) && onUserClick(userId, userAnonymousId)}
-                >
-                  <TextEllipsis text={userDisplayName} maxWidth="200px" popupProps={{ inverted: true, size: 'tiny' }} />
+    return (
+        <div className={cn(stl.sessionItem, 'flex flex-col p-2')} id="session-item" onClick={(e) => e.stopPropagation()}>
+            <div className="flex items-start">
+                <div className={cn('flex items-center w-full')}>
+                    <div className="flex items-center pr-2 shrink-0" style={{ width: '40%' }}>
+                        <div>
+                            <Avatar isActive={active} seed={userNumericHash} isAssist={isAssist} />
+                        </div>
+                        <div className="flex flex-col overflow-hidden color-gray-medium ml-3 justify-between items-center shrink-0">
+                            <div
+                                className={cn('text-lg', {
+                                    'color-teal cursor-pointer': !disableUser && hasUserId,
+                                    [stl.userName]: !disableUser && hasUserId,
+                                    'color-gray-medium': disableUser || !hasUserId,
+                                })}
+                                onClick={() => !disableUser && !hasUserFilter && onUserClick(userId, userAnonymousId)}
+                            >
+                                <TextEllipsis text={userDisplayName} maxWidth="200px" popupProps={{ inverted: true, size: 'tiny' }} />
+                            </div>
+                        </div>
+                    </div>
+                    <div style={{ width: '20%' }} className="px-2 flex flex-col justify-between">
+                        <div>
+                            <TextEllipsis text={formatTimeOrDate(startedAt, timezone)} popupProps={{ inverted: true, size: 'tiny' }} />
+                        </div>
+                        <div className="flex items-center color-gray-medium py-1">
+                            {!isAssist && (
+                                <>
+                                    <div className="color-gray-medium">
+                                        <span className="mr-1">{eventsCount}</span>
+                                        <span>{eventsCount === 0 || eventsCount > 1 ? 'Events' : 'Event'}</span>
+                                    </div>
+                                    <Icon name="circle-fill" size={3} className="mx-4" />
+                                </>
+                            )}
+                            <div>{live ? <Counter startTime={startedAt} /> : formattedDuration}</div>
+                        </div>
+                    </div>
+                    <div style={{ width: '30%' }} className="px-2 flex flex-col justify-between">
+                        <div style={{ height: '21px' }}>
+                            <CountryFlag country={userCountry} style={{ paddingTop: '4px' }} label />
+                        </div>
+                        <div className="color-gray-medium flex items-center py-1">
+                            <span className="capitalize" style={{ maxWidth: '70px' }}>
+                                <TextEllipsis text={capitalize(userBrowser)} popupProps={{ inverted: true, size: 'tiny' }} />
+                            </span>
+                            <Icon name="circle-fill" size={3} className="mx-4" />
+                            <span className="capitalize" style={{ maxWidth: '70px' }}>
+                                <TextEllipsis text={capitalize(userOs)} popupProps={{ inverted: true, size: 'tiny' }} />
+                            </span>
+                            <Icon name="circle-fill" size={3} className="mx-4" />
+                            <span className="capitalize" style={{ maxWidth: '70px' }}>
+                                <TextEllipsis text={capitalize(userDeviceType)} popupProps={{ inverted: true, size: 'tiny' }} />
+                            </span>
+                        </div>
+                    </div>
+                    {isSessions && (
+                        <div style={{ width: '10%' }} className="self-center px-2 flex items-center">
+                            <ErrorBars count={issueTypes.length} />
+                        </div>
+                    )}
                 </div>
-              </div>
-            </div>
-            <div style={{ width: "20%" }} className="px-2 flex flex-col justify-between">
-              <div>
-                <TextEllipsis text={formatTimeOrDate(startedAt, timezone)} popupProps={{ inverted: true, size: 'tiny' }} />
-              </div>
-              <div className="flex items-center color-gray-medium py-1">
-                {!isAssist && (
-                    <>
-                      <div className="color-gray-medium">
-                        <span className="mr-1">{ eventsCount }</span>
-                        <span>{ eventsCount === 0 || eventsCount > 1 ? 'Events' : 'Event' }</span>
-                      </div>
-                      <Icon name="circle-fill" size={3} className="mx-4" />
-                    </>
-                )}
-                <div>{ live ? <Counter startTime={startedAt} /> : formattedDuration }</div>
-              </div>
-            </div>
-            <div style={{ width: "30%" }} className="px-2 flex flex-col justify-between">
-              <div style={{ height: '21px'}}>
-                <CountryFlag country={ userCountry } style={{ paddingTop: '4px' }} label />
-              </div>
-              <div className="color-gray-medium flex items-center py-1">
-                <span className="capitalize" style={{ maxWidth: '70px'}}>
-                  <TextEllipsis text={ capitalize(userBrowser) } popupProps={{ inverted: true, size: "tiny" }} />
-                </span>
-                <Icon name="circle-fill" size={3} className="mx-4" />
-                <span className="capitalize" style={{ maxWidth: '70px'}}>
-                  <TextEllipsis text={ capitalize(userOs) } popupProps={{ inverted: true, size: "tiny" }} />
-                </span>
-                <Icon name="circle-fill" size={3} className="mx-4" />
-                <span className="capitalize" style={{ maxWidth: '70px'}}>
-                  <TextEllipsis text={ capitalize(userDeviceType) } popupProps={{ inverted: true, size: "tiny" }} />
-                </span>
-              </div>
-            </div>
-            { isSessions && (
-              <div style={{ width: "10%"}} className="self-center px-2 flex items-center">
-                <ErrorBars count={issueTypes.length} />
-              </div>
-            )}
-          </div>
 
-          <div className="flex items-center">
-            <div className={ stl.playLink } id="play-button" data-viewed={ viewed }>
-              { isSessions && (
-                <div className="mr-4 flex-shrink-0 w-24">
-                  { isLastPlayed && (
-                    <Label className="bg-gray-lightest p-1 px-2 rounded-lg">
-                      <span className="color-gray-medium text-xs" style={{ whiteSpace: 'nowrap'}}>LAST PLAYED</span>
-                    </Label>
-                  )}
+                <div className="flex items-center">
+                    <div className={stl.playLink} id="play-button" data-viewed={viewed}>
+                        {isSessions && (
+                            <div className="mr-4 flex-shrink-0 w-24">
+                                {isLastPlayed && (
+                                    <Label className="bg-gray-lightest p-1 px-2 rounded-lg">
+                                        <span className="color-gray-medium text-xs" style={{ whiteSpace: 'nowrap' }}>
+                                            LAST PLAYED
+                                        </span>
+                                    </Label>
+                                )}
+                            </div>
+                        )}
+                        <PlayLink isAssist={isAssist} sessionId={sessionId} viewed={viewed} onClick={onClick} queryParams={queryParams} />
+                    </div>
                 </div>
-              )}
-              <PlayLink
-                isAssist={isAssist}
-                sessionId={sessionId}
-                viewed={viewed}
-                onClick={onClick}
-              />
             </div>
-          </div>
+            {_metaList.length > 0 && <SessionMetaList className="mt-4" metaList={_metaList} />}
         </div>
-        { _metaList.length > 0 && (
-          <SessionMetaList className="mt-4" metaList={_metaList} />
-        )}
-      </div>
-  )
+    );
 }
 
-export default withRouter<Props>(observer<Props>(SessionItem))
+export default withRouter<Props>(observer<Props>(SessionItem));
diff --git a/frontend/app/routes.js b/frontend/app/routes.js
index b1e241292..627095f86 100644
--- a/frontend/app/routes.js
+++ b/frontend/app/routes.js
@@ -86,7 +86,7 @@ export const sessions = params => queried('/sessions', params);
 export const assist = params => queried('/assist', params);
 
 export const session = (sessionId = ':sessionId', hash) => hashed(`/session/${ sessionId }`, hash);
-export const liveSession = (sessionId = ':sessionId', hash) => hashed(`/assist/${ sessionId }`, hash);
+export const liveSession = (sessionId = ':sessionId', params, hash) => hashed(queried(`/assist/${ sessionId }`, params), hash);
 // export const liveSession = (sessionId = ':sessionId', hash) => hashed(`/live/session/${ sessionId }`, hash);
 
 export const errors = params => queried('/errors', params);

From c2541786316d3d1bcc0273479dfb4778ce43f885 Mon Sep 17 00:00:00 2001
From: sylenien <nikita@openreplay.com>
Date: Mon, 25 Jul 2022 12:21:06 +0200
Subject: [PATCH 68/77] feat(tracker): linting hook for tracker

---
 frontend/app/date.ts                          |   4 +-
 tracker/.husky/pre-commit                     |  25 ++
 tracker/tracker-assist/.eslintignore          |   8 +
 tracker/tracker-assist/.eslintrc.cjs          |  49 +++
 tracker/tracker-assist/package.json           |  25 +-
 .../tracker-assist/src/AnnotationCanvas.ts    |  22 +-
 tracker/tracker-assist/src/Assist.ts          | 165 ++++----
 tracker/tracker-assist/src/CallWindow.ts      | 112 +++---
 .../src/ConfirmWindow/ConfirmWindow.ts        | 139 +++----
 .../src/ConfirmWindow/defaults.ts             |  20 +-
 tracker/tracker-assist/src/LocalStream.ts     |  24 +-
 tracker/tracker-assist/src/Mouse.ts           |  50 +--
 tracker/tracker-assist/src/RemoteControl.ts   |  12 +-
 tracker/tracker-assist/src/_slim.ts           |   2 +-
 tracker/tracker-assist/src/dnd.ts             |  18 +-
 tracker/tracker-assist/src/icons.ts           |   4 +-
 tracker/tracker-assist/src/index.ts           |  16 +-
 tracker/tracker/.eslintignore                 |   8 +
 tracker/tracker/.eslintrc.cjs                 |  21 +-
 tracker/tracker/.prettierrc.json              |   1 +
 tracker/tracker/package.json                  |  35 +-
 tracker/tracker/scripts/compile.cjs           |   2 +-
 tracker/tracker/src/common/webworker.ts       |  24 +-
 tracker/tracker/src/main/app/guards.ts        |  37 +-
 tracker/tracker/src/main/app/index.ts         | 369 +++++++++---------
 tracker/tracker/src/main/app/logger.ts        |  61 +--
 tracker/tracker/src/main/app/nodes.ts         |  10 +-
 .../src/main/app/observer/iframe_observer.ts  |  15 +-
 .../tracker/src/main/app/observer/observer.ts | 112 +++---
 .../main/app/observer/shadow_root_observer.ts |  15 +-
 .../src/main/app/observer/top_observer.ts     | 131 ++++---
 tracker/tracker/src/main/app/sanitizer.ts     |  66 ++--
 tracker/tracker/src/main/app/session.ts       |  58 ++-
 tracker/tracker/src/main/app/ticker.ts        |   2 +-
 tracker/tracker/src/main/index.ts             | 167 ++++----
 .../tracker/src/main/modules/connection.ts    |  14 +-
 tracker/tracker/src/main/modules/console.ts   |  42 +-
 tracker/tracker/src/main/modules/cssrules.ts  |  50 ++-
 tracker/tracker/src/main/modules/exception.ts |  66 ++--
 tracker/tracker/src/main/modules/img.ts       |  61 +--
 tracker/tracker/src/main/modules/input.ts     |  63 ++-
 tracker/tracker/src/main/modules/longtasks.ts |  29 +-
 tracker/tracker/src/main/modules/mouse.ts     | 106 +++--
 .../tracker/src/main/modules/performance.ts   |  35 +-
 tracker/tracker/src/main/modules/scroll.ts    |  12 +-
 tracker/tracker/src/main/modules/timing.ts    | 131 +++----
 tracker/tracker/src/main/modules/viewport.ts  |   8 +-
 tracker/tracker/src/main/utils.ts             |  67 ++--
 .../tracker/src/main/vendors/finder/finder.ts | 362 ++++++++---------
 tracker/tracker/src/webworker/BatchWriter.ts  |  76 ++--
 .../tracker/src/webworker/PrimitiveWriter.ts  |  44 +--
 tracker/tracker/src/webworker/QueueSender.ts  | 101 +++--
 tracker/tracker/src/webworker/index.ts        | 125 +++---
 tracker/tracker/src/webworker/tsconfig.json   |   4 +-
 54 files changed, 1688 insertions(+), 1537 deletions(-)
 create mode 100755 tracker/.husky/pre-commit
 create mode 100644 tracker/tracker-assist/.eslintignore
 create mode 100644 tracker/tracker-assist/.eslintrc.cjs
 create mode 100644 tracker/tracker/.eslintignore

diff --git a/frontend/app/date.ts b/frontend/app/date.ts
index e043f33fd..897c4db90 100644
--- a/frontend/app/date.ts
+++ b/frontend/app/date.ts
@@ -13,7 +13,7 @@ export const durationFormatted = (duration: Duration):string => {
     duration = duration.toFormat('h\'h\'m\'m');
   } else if (duration.as('months') < 1) { // show in days and hours
     duration = duration.toFormat('d\'d\'h\'h');
-  } else { //
+  } else {
     duration = duration.toFormat('m\'m\'s\'s\'');
   }
 
@@ -133,4 +133,4 @@ export const countDaysFrom = (timestamp: number): number => {
   const date = DateTime.fromMillis(timestamp);
   const d = new Date();
   return Math.round(Math.abs(d.getTime() - date.toJSDate().getTime()) / (1000 * 3600 * 24));
-}
\ No newline at end of file
+}
diff --git a/tracker/.husky/pre-commit b/tracker/.husky/pre-commit
new file mode 100755
index 000000000..9471928e2
--- /dev/null
+++ b/tracker/.husky/pre-commit
@@ -0,0 +1,25 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+if git diff --cached --name-only | grep --quiet '^tracker/tracker/'
+then
+  echo "tracker"
+  pwd
+  cd tracker/tracker
+
+  npm run lint-front
+
+  cd ../../
+fi
+
+if git diff --cached --name-only | grep --quiet '^tracker/tracker-assist/'
+then
+  echo "tracker-assist"
+  cd tracker/tracker-assist
+
+  npm run lint-front
+
+  cd ../../
+fi
+
+exit 0
diff --git a/tracker/tracker-assist/.eslintignore b/tracker/tracker-assist/.eslintignore
new file mode 100644
index 000000000..94b2f339c
--- /dev/null
+++ b/tracker/tracker-assist/.eslintignore
@@ -0,0 +1,8 @@
+node_modules
+npm-debug.log
+lib
+cjs
+build
+.cache
+.eslintrc.cjs
+src/common/messages.ts
diff --git a/tracker/tracker-assist/.eslintrc.cjs b/tracker/tracker-assist/.eslintrc.cjs
new file mode 100644
index 000000000..01d5c5bc0
--- /dev/null
+++ b/tracker/tracker-assist/.eslintrc.cjs
@@ -0,0 +1,49 @@
+/* eslint-disable */
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: ['./tsconfig.json'],
+    tsconfigRootDir: __dirname,
+  },
+  plugins: ['@typescript-eslint', 'prettier'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
+    'prettier',
+  ],
+  rules: {
+    'no-empty': [
+      'error',
+      {
+        allowEmptyCatch: true,
+      },
+    ],
+    '@typescript-eslint/camelcase': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/unbound-method': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'warn',
+    '@typescript-eslint/prefer-readonly': 'warn',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+    '@typescript-eslint/restrict-plus-operands': 'warn',
+    '@typescript-eslint/no-unsafe-return': 'warn',
+    'no-useless-escape': 'warn',
+    'no-control-regex': 'warn',
+    '@typescript-eslint/restrict-template-expressions': 'warn',
+    '@typescript-eslint/no-useless-constructor': 'warn',
+    '@typescript-eslint/no-this-alias': 'off',
+    '@typescript-eslint/no-floating-promises': 'warn',
+    '@typescript-eslint/no-unsafe-argument': 'warn',
+    'no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-expressions': 'warn',
+    '@typescript-eslint/no-useless-constructor': 'warn',
+    'semi': ["error", "never"],
+    'quotes': ["error", "single"],
+    'comma-dangle': ["error", "always"]
+  },
+}; 
diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index 3d363cffd..3d3e13f93 100644
--- a/tracker/tracker-assist/package.json
+++ b/tracker/tracker-assist/package.json
@@ -13,7 +13,7 @@
   "type": "module",
   "main": "./lib/index.js",
   "scripts": {
-    "lint": "prettier --write 'src/**/*.ts' README.md && tsc --noEmit",
+    "lint": "eslint src --ext .ts,.js --fix --quiet",
     "build": "npm run build-es && npm run build-cjs",
     "build-es": "rm -Rf lib && tsc && npm run replace-versions",
     "build-cjs": "rm -Rf cjs && tsc --project tsconfig-cjs.json && echo '{ \"type\": \"commonjs\" }' > cjs/package.json && npm run replace-paths && npm run replace-versions",
@@ -21,7 +21,9 @@
     "replace-versions": "npm run replace-pkg-version && npm run replace-req-version",
     "replace-pkg-version": "replace-in-files lib/* cjs/* --string='PACKAGE_VERSION' --replacement=$npm_package_version",
     "replace-req-version": "replace-in-files lib/* cjs/* --string='REQUIRED_TRACKER_VERSION' --replacement='3.5.14'",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "prepare": "cd ../../ && husky install tracker/.husky/",
+    "lint-front": "lint-staged"
   },
   "dependencies": {
     "csstype": "^3.0.10",
@@ -32,9 +34,26 @@
     "@openreplay/tracker": "^3.5.3"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
+    "eslint": "^7.8.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
     "@openreplay/tracker": "file:../tracker",
-    "prettier": "^2.7.0",
     "replace-in-files-cli": "^1.0.0",
     "typescript": "^4.6.0-dev.20211126"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "sh lint.sh"
+    }
+  },
+  "lint-staged": {
+    "*.{js,mjs,cjs,jsx,ts,tsx}": [
+      "eslint --fix --quiet"
+    ]
   }
 }
diff --git a/tracker/tracker-assist/src/AnnotationCanvas.ts b/tracker/tracker-assist/src/AnnotationCanvas.ts
index 11a06a781..1341045f6 100644
--- a/tracker/tracker-assist/src/AnnotationCanvas.ts
+++ b/tracker/tracker-assist/src/AnnotationCanvas.ts
@@ -1,14 +1,14 @@
 export default class AnnotationCanvas {
   private canvas: HTMLCanvasElement
   private ctx: CanvasRenderingContext2D | null = null
-  private painting: boolean = false
+  private painting = false
   constructor() {
     this.canvas = document.createElement('canvas')
     Object.assign(this.canvas.style, {
-      position: "fixed",
+      position: 'fixed',
       left: 0,
       top: 0,
-      pointerEvents: "none",
+      pointerEvents: 'none',
       zIndex: 2147483647 - 2,
     })
   }
@@ -18,7 +18,7 @@ export default class AnnotationCanvas {
     this.canvas.height = window.innerHeight
   }
 
-  private lastPosition: [number, number] = [0,0]
+  private lastPosition: [number, number] = [0,0,]
   start = (p: [number, number]) => {
     this.painting = true
     this.clrTmID && clearTimeout(this.clrTmID)
@@ -38,9 +38,9 @@ export default class AnnotationCanvas {
     this.ctx.moveTo(this.lastPosition[0], this.lastPosition[1])
     this.ctx.lineTo(p[0], p[1])
     this.ctx.lineWidth = 8
-    this.ctx.lineCap = "round"
-    this.ctx.lineJoin = "round"
-    this.ctx.strokeStyle = "red"
+    this.ctx.lineCap = 'round'
+    this.ctx.lineJoin = 'round'
+    this.ctx.strokeStyle = 'red'
     this.ctx.stroke()
     this.lastPosition = p
   }
@@ -51,7 +51,7 @@ export default class AnnotationCanvas {
     const fadeStep = () => {
       if (!this.ctx || this.painting ) { return }
       this.ctx.globalCompositeOperation = 'destination-out'
-      this.ctx.fillStyle = "rgba(255, 255, 255, 0.1)"
+      this.ctx.fillStyle = 'rgba(255, 255, 255, 0.1)'
       this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height)
       this.ctx.globalCompositeOperation = 'source-over'
       timeoutID = setTimeout(fadeStep,100)
@@ -67,8 +67,8 @@ export default class AnnotationCanvas {
 
   mount() {
     document.body.appendChild(this.canvas)
-    this.ctx = this.canvas.getContext("2d")
-    window.addEventListener("resize", this.resizeCanvas)
+    this.ctx = this.canvas.getContext('2d')
+    window.addEventListener('resize', this.resizeCanvas)
     this.resizeCanvas()
   }
 
@@ -76,6 +76,6 @@ export default class AnnotationCanvas {
     if (this.canvas.parentNode){
       this.canvas.parentNode.removeChild(this.canvas)
     }
-    window.removeEventListener("resize", this.resizeCanvas)
+    window.removeEventListener('resize', this.resizeCanvas)
   }
 }
\ No newline at end of file
diff --git a/tracker/tracker-assist/src/Assist.ts b/tracker/tracker-assist/src/Assist.ts
index a36c307db..eec9a66d7 100644
--- a/tracker/tracker-assist/src/Assist.ts
+++ b/tracker/tracker-assist/src/Assist.ts
@@ -1,20 +1,21 @@
-import type { Socket } from 'socket.io-client';
-import { connect } from 'socket.io-client';
-import Peer from 'peerjs';
-import type { Properties } from 'csstype';
-import { App } from '@openreplay/tracker';
+/* eslint-disable @typescript-eslint/no-empty-function */
+import type { Socket, } from 'socket.io-client'
+import { connect, } from 'socket.io-client'
+import Peer from 'peerjs'
+import type { Properties, } from 'csstype'
+import { App, } from '@openreplay/tracker'
 
-import RequestLocalStream from './LocalStream.js';
-import RemoteControl from './RemoteControl.js';
-import CallWindow from './CallWindow.js';
-import AnnotationCanvas from './AnnotationCanvas.js';
-import ConfirmWindow from './ConfirmWindow/ConfirmWindow.js';
-import { callConfirmDefault } from './ConfirmWindow/defaults.js';
-import type { Options as ConfirmOptions } from './ConfirmWindow/defaults.js';
+import RequestLocalStream from './LocalStream.js'
+import RemoteControl from './RemoteControl.js'
+import CallWindow from './CallWindow.js'
+import AnnotationCanvas from './AnnotationCanvas.js'
+import ConfirmWindow from './ConfirmWindow/ConfirmWindow.js'
+import { callConfirmDefault, } from './ConfirmWindow/defaults.js'
+import type { Options as ConfirmOptions, } from './ConfirmWindow/defaults.js'
 
 // TODO: fully specified  strict check (everywhere)
 
-type StartEndCallback = () => ((()=>{}) | void)
+type StartEndCallback = () => ((()=>Record<string, unknown>) | void)
 
 export interface Options {
   onAgentConnect: StartEndCallback,
@@ -40,7 +41,7 @@ enum CallingState {
 
 
 // TODO typing????
-type OptionalCallback = (()=>{}) | void
+type OptionalCallback = (()=>Record<string, unknown>) | void
 type Agent = {
   onDisconnect?: OptionalCallback,
   onControlReleased?: OptionalCallback,
@@ -49,11 +50,11 @@ type Agent = {
 }
 
 export default class Assist {
-  readonly version = "PACKAGE_VERSION"
+  readonly version = 'PACKAGE_VERSION'
 
   private socket: Socket | null = null
   private peer: Peer | null = null
-  private assistDemandedRestart: boolean = false
+  private assistDemandedRestart = false
   private callingState: CallingState = CallingState.False
 
   private agents: Record<string, Agent> = {}
@@ -64,8 +65,8 @@ export default class Assist {
     private readonly noSecureMode: boolean = false,
   ) {
     this.options = Object.assign({ 
-        session_calling_peer_key: "__openreplay_calling_peer",
-        session_control_peer_key: "__openreplay_control_peer",
+        session_calling_peer_key: '__openreplay_calling_peer',
+        session_control_peer_key: '__openreplay_control_peer',
         config: null,
         onCallStart: ()=>{},
         onAgentConnect: ()=>{},
@@ -74,10 +75,10 @@ export default class Assist {
         controlConfirm: {}, // TODO: clear options passing/merging/overriting
       },
       options,
-    );
+    )
 
     if (document.hidden !== undefined) {
-      const sendActivityState = () => this.emit("UPDATE_SESSION", { active: !document.hidden })
+      const sendActivityState = () => this.emit('UPDATE_SESSION', { active: !document.hidden, })
       app.attachEventListener(
         document,
         'visibilitychange',
@@ -88,15 +89,15 @@ export default class Assist {
     }
     const titleNode = document.querySelector('title')
     const observer = titleNode && new MutationObserver(() => {
-      this.emit("UPDATE_SESSION", { pageTitle: document.title })
+      this.emit('UPDATE_SESSION', { pageTitle: document.title, })
     })
     app.attachStartCallback(() => { 
-      if (this.assistDemandedRestart) { return; }
+      if (this.assistDemandedRestart) { return }
       this.onStart()
-      observer && observer.observe(titleNode, { subtree: true, characterData: true, childList: true })
+      observer && observer.observe(titleNode, { subtree: true, characterData: true, childList: true, })
     })
     app.attachStopCallback(() => { 
-      if (this.assistDemandedRestart) { return; } 
+      if (this.assistDemandedRestart) { return } 
       this.clean()
       observer && observer.disconnect()
     })
@@ -104,10 +105,10 @@ export default class Assist {
       if (this.agentsConnected) {
         // @ts-ignore No need in statistics messages. TODO proper filter
         if (messages.length === 2 && messages[0]._id === 0 &&  messages[1]._id === 49) { return }
-        this.emit("messages", messages)
+        this.emit('messages', messages)
       }
     })
-    app.session.attachUpdateCallback(sessInfo => this.emit("UPDATE_SESSION", sessInfo))
+    app.session.attachUpdateCallback(sessInfo => this.emit('UPDATE_SESSION', sessInfo))
   }
 
   private emit(ev: string, ...args) {
@@ -119,7 +120,7 @@ export default class Assist {
   }
 
   private notifyCallEnd() {
-    this.emit("call_end");
+    this.emit('call_end')
   }
   private onRemoteCallEnd = () => {}
 
@@ -131,17 +132,17 @@ export default class Assist {
     const socket = this.socket = connect(app.getHost(), {
       path: '/ws-assist/socket',
       query: {
-        "peerId": peerID,
-        "identity": "session",
-        "sessionInfo": JSON.stringify({ 
+        'peerId': peerID,
+        'identity': 'session',
+        'sessionInfo': JSON.stringify({ 
           pageTitle: document.title,
           active: true,
-          ...this.app.getSessionInfo() 
+          ...this.app.getSessionInfo(), 
         }),
       },
-      transports: ["websocket"],
+      transports: ['websocket',],
     })
-    socket.onAny((...args) => app.debug.log("Socket:", ...args))
+    socket.onAny((...args) => app.debug.log('Socket:', ...args))
 
 
 
@@ -149,15 +150,15 @@ export default class Assist {
       this.options,
       id => {
         this.agents[id].onControlReleased = this.options.onRemoteControlStart()
-        this.emit("control_granted", id)
+        this.emit('control_granted', id)
         annot = new AnnotationCanvas()
         annot.mount()
       },
       id => {
         const cb = this.agents[id].onControlReleased
         delete this.agents[id].onControlReleased
-        typeof cb === "function" && cb()
-        this.emit("control_rejected", id)
+        typeof cb === 'function' && cb()
+        this.emit('control_rejected', id)
         if (annot != null) {
           annot.remove()
           annot = null
@@ -166,41 +167,41 @@ export default class Assist {
     )
 
     // TODO: check incoming args
-    socket.on("request_control", remoteControl.requestControl)
-    socket.on("release_control", remoteControl.releaseControl)
-    socket.on("scroll", remoteControl.scroll)
-    socket.on("click", remoteControl.click)
-    socket.on("move", remoteControl.move)
-    socket.on("focus", (clientID, nodeID) => {
+    socket.on('request_control', remoteControl.requestControl)
+    socket.on('release_control', remoteControl.releaseControl)
+    socket.on('scroll', remoteControl.scroll)
+    socket.on('click', remoteControl.click)
+    socket.on('move', remoteControl.move)
+    socket.on('focus', (clientID, nodeID) => {
       const el = app.nodes.getNode(nodeID)
       if (el instanceof HTMLElement) {
         remoteControl.focus(clientID, el)
       }
     })
-    socket.on("input", remoteControl.input)
+    socket.on('input', remoteControl.input)
 
     let annot: AnnotationCanvas | null = null
-    socket.on("moveAnnotation", (_, p) => annot && annot.move(p)) // TODO: restrict by id
-    socket.on("startAnnotation", (_, p) => annot && annot.start(p))
-    socket.on("stopAnnotation", () => annot && annot.stop())
+    socket.on('moveAnnotation', (_, p) => annot && annot.move(p)) // TODO: restrict by id
+    socket.on('startAnnotation', (_, p) => annot && annot.start(p))
+    socket.on('stopAnnotation', () => annot && annot.stop())
 
-    socket.on("NEW_AGENT", (id: string, info) => {
+    socket.on('NEW_AGENT', (id: string, info) => {
       this.agents[id] = {
         onDisconnect: this.options.onAgentConnect && this.options.onAgentConnect(),
         ...info, // TODO
       }
       this.assistDemandedRestart = true
-      this.app.stop();
+      this.app.stop()
       this.app.start().then(() => { this.assistDemandedRestart = false })
     })
-    socket.on("AGENTS_CONNECTED", (ids: string[]) => {
+    socket.on('AGENTS_CONNECTED', (ids: string[]) => {
       ids.forEach(id =>{
         this.agents[id] = {
           onDisconnect: this.options.onAgentConnect && this.options.onAgentConnect(),
         }
       })
       this.assistDemandedRestart = true
-      this.app.stop();
+      this.app.stop()
       this.app.start().then(() => { this.assistDemandedRestart = false })
 
       remoteControl.reconnect(ids)
@@ -208,7 +209,7 @@ export default class Assist {
 
     let confirmCall:ConfirmWindow | null = null
 
-    socket.on("AGENT_DISCONNECTED", (id) => {
+    socket.on('AGENT_DISCONNECTED', (id) => {
       remoteControl.releaseControl(id)
 
       // close the call also
@@ -221,15 +222,15 @@ export default class Assist {
       this.agents[id] && this.agents[id].onDisconnect != null && this.agents[id].onDisconnect()
       delete this.agents[id]
     })
-    socket.on("NO_AGENT", () => {
+    socket.on('NO_AGENT', () => {
       this.agents = {}
     })
-    socket.on("call_end", () => this.onRemoteCallEnd()) // TODO: check if agent calling id
+    socket.on('call_end', () => this.onRemoteCallEnd()) // TODO: check if agent calling id
 
     // TODO: fix the code
-    let agentName = ""
-    let callingAgent = ""
-    socket.on("_agent_name",(id, name) => { agentName = name; callingAgent = id })
+    let agentName = ''
+    let callingAgent = ''
+    socket.on('_agent_name',(id, name) => { agentName = name; callingAgent = id })
 
 
     // PeerJS call (todo: use native WebRTC)
@@ -242,27 +243,27 @@ export default class Assist {
     if (this.options.config) {
       peerOptions['config'] = this.options.config
     }
-    const peer = this.peer = new Peer(peerID, peerOptions);
+    const peer = this.peer = new Peer(peerID, peerOptions)
     // app.debug.log('Peer created: ', peer)
     // @ts-ignore
-    peer.on('error', e => app.debug.warn("Peer error: ", e.type, e))
+    peer.on('error', e => app.debug.warn('Peer error: ', e.type, e))
     peer.on('disconnected', () => peer.reconnect())
     peer.on('call', (call) => {
-      app.debug.log("Call: ", call)    
+      app.debug.log('Call: ', call)    
       if (this.callingState !== CallingState.False) {
         call.close()
         //this.notifyCallEnd() // TODO: strictly connect calling peer with agent socket.id
-        app.debug.warn("Call closed instantly bacause line is busy. CallingState: ", this.callingState)
-        return;
+        app.debug.warn('Call closed instantly bacause line is busy. CallingState: ', this.callingState)
+        return
       }
 
       const setCallingState = (newState: CallingState) => {
         if (newState === CallingState.True) {
-          sessionStorage.setItem(this.options.session_calling_peer_key, call.peer);
+          sessionStorage.setItem(this.options.session_calling_peer_key, call.peer)
         } else if (newState === CallingState.False) {
-          sessionStorage.removeItem(this.options.session_calling_peer_key);
+          sessionStorage.removeItem(this.options.session_calling_peer_key)
         }
-        this.callingState = newState;
+        this.callingState = newState
       }
       
       let confirmAnswer: Promise<boolean>
@@ -278,7 +279,7 @@ export default class Assist {
         confirmAnswer = confirmCall.mount()
         this.playNotificationSound()
         this.onRemoteCallEnd = () => { // if call cancelled by a caller before confirmation
-          app.debug.log("Received call_end during confirm window opened")
+          app.debug.log('Received call_end during confirm window opened')
           confirmCall?.remove()
           setCallingState(CallingState.False)
           call.close()
@@ -307,7 +308,7 @@ export default class Assist {
         
         const onCallEnd = this.options.onCallStart()
         const handleCallEnd = () => {
-          app.debug.log("Handle Call End")
+          app.debug.log('Handle Call End')
           call.close()
           callUI.remove()
           annot && annot.remove()
@@ -322,27 +323,27 @@ export default class Assist {
         this.onRemoteCallEnd = handleCallEnd
 
         call.on('error', e => {
-          app.debug.warn("Call error:", e)
+          app.debug.warn('Call error:', e)
           initiateCallEnd()
-        });
+        })
 
         RequestLocalStream().then(lStream => {
           call.on('stream', function(rStream) {
-            callUI.setRemoteStream(rStream);
+            callUI.setRemoteStream(rStream)
             const onInteraction = () => { // only if hidden?
               callUI.playRemote()
-              document.removeEventListener("click", onInteraction)
+              document.removeEventListener('click', onInteraction)
             }
-            document.addEventListener("click", onInteraction)
-          });
+            document.addEventListener('click', onInteraction)
+          })
 
           lStream.onVideoTrack(vTrack => {
-            const sender = call.peerConnection.getSenders().find(s => s.track?.kind === "video")
+            const sender = call.peerConnection.getSenders().find(s => s.track?.kind === 'video')
             if (!sender) {
-              app.debug.warn("No video sender found")
+              app.debug.warn('No video sender found')
               return
             }
-            app.debug.log("sender found:", sender)
+            app.debug.log('sender found:', sender)
             sender.replaceTrack(vTrack)
           })
 
@@ -352,16 +353,16 @@ export default class Assist {
           setCallingState(CallingState.True)
         })
         .catch(e => {
-          app.debug.warn("Audio mediadevice request error:", e)
+          app.debug.warn('Audio mediadevice request error:', e)
           initiateCallEnd()
-        });
-      }).catch(); // in case of Confirm.remove() without any confirmation/decline
-    });
+        })
+      }).catch() // in case of Confirm.remove() without any confirmation/decline
+    })
   }
 
   private playNotificationSound() {
     if ('Audio' in window) {
-      new Audio("https://static.openreplay.com/tracker-assist/notification.mp3")
+      new Audio('https://static.openreplay.com/tracker-assist/notification.mp3')
       .play()
       .catch(e => {
         this.app.debug.warn(e)
@@ -372,11 +373,11 @@ export default class Assist {
   private clean() {
     if (this.peer) {
       this.peer.destroy()
-      this.app.debug.log("Peer destroyed")
+      this.app.debug.log('Peer destroyed')
     }
     if (this.socket) {
       this.socket.disconnect()
-      this.app.debug.log("Socket disconnected")
+      this.app.debug.log('Socket disconnected')
     }
   }
 }
diff --git a/tracker/tracker-assist/src/CallWindow.ts b/tracker/tracker-assist/src/CallWindow.ts
index ae2bdd3fa..8804ffa3e 100644
--- a/tracker/tracker-assist/src/CallWindow.ts
+++ b/tracker/tracker-assist/src/CallWindow.ts
@@ -1,7 +1,7 @@
-import type { LocalStream } from './LocalStream.js';
-import attachDND from './dnd.js';
+import type { LocalStream, } from './LocalStream.js'
+import attachDND from './dnd.js'
 
-const SS_START_TS_KEY = "__openreplay_assist_call_start_ts"
+const SS_START_TS_KEY = '__openreplay_assist_call_start_ts'
 
 export default class CallWindow {
   private iframe: HTMLIFrameElement
@@ -21,66 +21,66 @@ export default class CallWindow {
   constructor() {
     const iframe = this.iframe = document.createElement('iframe')
     Object.assign(iframe.style, {
-      position: "fixed",
+      position: 'fixed',
       zIndex: 2147483647 - 1,
-      border: "none",
-      bottom: "10px",
-      right: "10px",
-      height: "200px",
-      width: "200px",
+      border: 'none',
+      bottom: '10px',
+      right: '10px',
+      height: '200px',
+      width: '200px',
     })
     // TODO: find the best attribute name for the ignoring iframes
-    iframe.setAttribute("data-openreplay-obscured", "")
-    iframe.setAttribute("data-openreplay-hidden", "")
-    iframe.setAttribute("data-openreplay-ignore", "")
+    iframe.setAttribute('data-openreplay-obscured', '')
+    iframe.setAttribute('data-openreplay-hidden', '')
+    iframe.setAttribute('data-openreplay-ignore', '')
     document.body.appendChild(iframe)
 
-    const doc = iframe.contentDocument;
+    const doc = iframe.contentDocument
     if (!doc) {
-      console.error("OpenReplay: CallWindow iframe document is not reachable.")
-      return; 
+      console.error('OpenReplay: CallWindow iframe document is not reachable.')
+      return 
     }
 
 
     //const baseHref = "https://static.openreplay.com/tracker-assist/test"
-    const baseHref = "https://static.openreplay.com/tracker-assist/3.4.4"
-    this.load = fetch(baseHref + "/index.html")
+    const baseHref = 'https://static.openreplay.com/tracker-assist/3.4.4'
+    this.load = fetch(baseHref + '/index.html')
     .then(r => r.text())
     .then((text) => {
       iframe.onload = () => {
-        const assistSection = doc.getElementById("or-assist")
-        assistSection?.classList.remove("status-connecting")
+        const assistSection = doc.getElementById('or-assist')
+        assistSection?.classList.remove('status-connecting')
         //iframe.style.height = doc.body.scrollHeight + 'px';
         //iframe.style.width = doc.body.scrollWidth + 'px';
         this.adjustIframeSize()
-        iframe.onload = null;
+        iframe.onload = null
       }
 
       // ?
       text = text.replace(/href="css/g, `href="${baseHref}/css`)
-      doc.open();
-      doc.write(text);
-      doc.close();
+      doc.open()
+      doc.write(text)
+      doc.close()
 
       
-      this.vLocal = doc.getElementById("video-local") as (HTMLVideoElement | null);
-      this.vRemote = doc.getElementById("video-remote") as (HTMLVideoElement | null);
-      this.videoContainer = doc.getElementById("video-container");
+      this.vLocal = doc.getElementById('video-local') as (HTMLVideoElement | null)
+      this.vRemote = doc.getElementById('video-remote') as (HTMLVideoElement | null)
+      this.videoContainer = doc.getElementById('video-container')
       
-      this.audioBtn = doc.getElementById("audio-btn");
+      this.audioBtn = doc.getElementById('audio-btn')
       if (this.audioBtn) {
-        this.audioBtn.onclick = () => this.toggleAudio();
+        this.audioBtn.onclick = () => this.toggleAudio()
       }
-      this.videoBtn = doc.getElementById("video-btn");
+      this.videoBtn = doc.getElementById('video-btn')
       if (this.videoBtn) {
-        this.videoBtn.onclick = () => this.toggleVideo();
+        this.videoBtn.onclick = () => this.toggleVideo()
       }
-      this.endCallBtn = doc.getElementById("end-call-btn");
+      this.endCallBtn = doc.getElementById('end-call-btn')
 
-      this.agentNameElem = doc.getElementById("agent-name");
-      this.vPlaceholder = doc.querySelector("#remote-stream p")
+      this.agentNameElem = doc.getElementById('agent-name')
+      this.vPlaceholder = doc.querySelector('#remote-stream p')
 
-      const tsElem = doc.getElementById("duration");
+      const tsElem = doc.getElementById('duration')
       if (tsElem) {
         const startTs = Number(sessionStorage.getItem(SS_START_TS_KEY)) || Date.now()
         sessionStorage.setItem(SS_START_TS_KEY, startTs.toString())
@@ -90,15 +90,15 @@ export default class CallWindow {
           const mins = ~~(secsFull / 60)
           const secs = secsFull - mins * 60
           tsElem.innerText = `${mins}:${secs < 10 ? 0 : ''}${secs}`
-        }, 500);
+        }, 500)
       }
 
-      const dragArea = doc.querySelector(".drag-area")
+      const dragArea = doc.querySelector('.drag-area')
       if (dragArea) {
         // TODO: save coordinates on the new page
         attachDND(iframe, dragArea, doc.documentElement)
       }
-    });
+    })
 
     //this.toggleVideoUI(false)
     //this.toggleRemoteVideoUI(false)
@@ -107,8 +107,8 @@ export default class CallWindow {
   private adjustIframeSize() {
     const doc = this.iframe.contentDocument
     if (!doc) { return }
-    this.iframe.style.height = doc.body.scrollHeight + 'px';
-    this.iframe.style.width = doc.body.scrollWidth + 'px';
+    this.iframe.style.height = doc.body.scrollHeight + 'px'
+    this.iframe.style.width = doc.body.scrollWidth + 'px'
   }
 
   setCallEndAction(endCall: () => void) {
@@ -124,16 +124,16 @@ export default class CallWindow {
   setRemoteStream(rStream: MediaStream) {
     this.load.then(() => {
       if (this.vRemote && !this.vRemote.srcObject) {
-        this.vRemote.srcObject = rStream;
+        this.vRemote.srcObject = rStream
         if (this.vPlaceholder) {
-          this.vPlaceholder.innerText = "Video has been paused. Click anywhere to resume.";
+          this.vPlaceholder.innerText = 'Video has been paused. Click anywhere to resume.'
         }
 
         // Hack for audio. Doesen't work inside the iframe because of some magical reasons (check if it is connected to autoplay?)
-        this.aRemote = document.createElement("audio");
-        this.aRemote.autoplay = true;
-        this.aRemote.style.display = "none"
-        this.aRemote.srcObject = rStream;
+        this.aRemote = document.createElement('audio')
+        this.aRemote.autoplay = true
+        this.aRemote.style.display = 'none'
+        this.aRemote.srcObject = rStream
         document.body.appendChild(this.aRemote)
       }
 
@@ -156,9 +156,9 @@ export default class CallWindow {
     this.load.then(() => {
       if (this.videoContainer) {
         if (enable) {
-          this.videoContainer.classList.add("remote")
+          this.videoContainer.classList.add('remote')
         } else {
-          this.videoContainer.classList.remove("remote")
+          this.videoContainer.classList.remove('remote')
         }
         this.adjustIframeSize()
       }
@@ -186,11 +186,11 @@ export default class CallWindow {
 
 
   private toggleAudioUI(enabled: boolean) {
-    if (!this.audioBtn) { return; } 
+    if (!this.audioBtn) { return } 
     if (enabled) {
-      this.audioBtn.classList.remove("muted")
+      this.audioBtn.classList.remove('muted')
     } else {
-      this.audioBtn.classList.add("muted")
+      this.audioBtn.classList.add('muted')
     }
   }
 
@@ -200,18 +200,18 @@ export default class CallWindow {
   }
 
   private toggleVideoUI(enabled: boolean) {
-    if (!this.videoBtn || !this.videoContainer) { return; }
+    if (!this.videoBtn || !this.videoContainer) { return }
     if (enabled) {
-      this.videoContainer.classList.add("local")
-      this.videoBtn.classList.remove("off");
+      this.videoContainer.classList.add('local')
+      this.videoBtn.classList.remove('off')
     } else {
-      this.videoContainer.classList.remove("local")
-      this.videoBtn.classList.add("off");
+      this.videoContainer.classList.remove('local')
+      this.videoBtn.classList.add('off')
     }
     this.adjustIframeSize()
   }
 
-  private videoRequested: boolean = false
+  private videoRequested = false
   private toggleVideo() {
     this.localStream?.toggleVideo()
     .then(enabled => {
diff --git a/tracker/tracker-assist/src/ConfirmWindow/ConfirmWindow.ts b/tracker/tracker-assist/src/ConfirmWindow/ConfirmWindow.ts
index 02d9dd9c6..fd7209689 100644
--- a/tracker/tracker-assist/src/ConfirmWindow/ConfirmWindow.ts
+++ b/tracker/tracker-assist/src/ConfirmWindow/ConfirmWindow.ts
@@ -1,4 +1,5 @@
-import type { Properties } from 'csstype';
+/* eslint-disable @typescript-eslint/no-empty-function */
+import type { Properties, } from 'csstype'
 
 export type ButtonOptions =
   | HTMLButtonElement
@@ -19,45 +20,45 @@ export interface ConfirmWindowOptions {
 
 function makeButton(options: ButtonOptions, defaultStyle?: Properties): HTMLButtonElement {
   if (options instanceof HTMLButtonElement) {
-    return options;
+    return options
   }
-  const btn = document.createElement("button");
+  const btn = document.createElement('button')
   Object.assign(btn.style, {
-    padding: "10px 14px",
-    fontSize: "14px",
-    borderRadius: "3px",
-    border: "none",
-    cursor: "pointer",
-    display: "flex",
-    alignItems: "center",
-    textTransform: "uppercase",
-    marginRight: "10px"
-  }, defaultStyle);
-  if (typeof options === "string") {
-    btn.innerHTML = options;
+    padding: '10px 14px',
+    fontSize: '14px',
+    borderRadius: '3px',
+    border: 'none',
+    cursor: 'pointer',
+    display: 'flex',
+    alignItems: 'center',
+    textTransform: 'uppercase',
+    marginRight: '10px',
+  }, defaultStyle)
+  if (typeof options === 'string') {
+    btn.innerHTML = options
   } else {
-    btn.innerHTML = options.innerHTML;
-    Object.assign(btn.style, options.style);
+    btn.innerHTML = options.innerHTML
+    Object.assign(btn.style, options.style)
   }
-  return btn;
+  return btn
 }
 
 export default class ConfirmWindow {
   private wrapper: HTMLDivElement;
 
   constructor(options: ConfirmWindowOptions) {
-    const wrapper = document.createElement("div");
-    const popup = document.createElement("div");
-    const p = document.createElement("p");
-    p.innerText = options.text;
-    const buttons = document.createElement("div");
+    const wrapper = document.createElement('div')
+    const popup = document.createElement('div')
+    const p = document.createElement('p')
+    p.innerText = options.text
+    const buttons = document.createElement('div')
     const confirmBtn = makeButton(options.confirmBtn, {
-      background: "rgba(0, 167, 47, 1)",
-      color: "white"
+      background: 'rgba(0, 167, 47, 1)',
+      color: 'white',
     })
     const declineBtn = makeButton(options.declineBtn, {
-      background: "#FFE9E9",
-      color: "#CC0000"
+      background: '#FFE9E9',
+      color: '#CC0000',
     })
     buttons.appendChild(confirmBtn)
     buttons.appendChild(declineBtn)
@@ -66,78 +67,78 @@ export default class ConfirmWindow {
 
 
     Object.assign(buttons.style, {
-      marginTop: "10px",
-      display: "flex",
-      alignItems: "center",
+      marginTop: '10px',
+      display: 'flex',
+      alignItems: 'center',
       // justifyContent: "space-evenly",
-      backgroundColor: "white",
-      padding: "10px",
-      boxShadow: "0px 0px 3.99778px 1.99889px rgba(0, 0, 0, 0.1)",
-      borderRadius: "6px"
-    });
+      backgroundColor: 'white',
+      padding: '10px',
+      boxShadow: '0px 0px 3.99778px 1.99889px rgba(0, 0, 0, 0.1)',
+      borderRadius: '6px',
+    })
 
     Object.assign(
       popup.style,
       {
-        font: "14px 'Roboto', sans-serif",
-        position: "relative",
-        pointerEvents: "auto",
-        margin: "4em auto",
-        width: "90%",
-        maxWidth: "fit-content",
-        padding: "20px",
-        background: "#F3F3F3",
+        font: '14px \'Roboto\', sans-serif',
+        position: 'relative',
+        pointerEvents: 'auto',
+        margin: '4em auto',
+        width: '90%',
+        maxWidth: 'fit-content',
+        padding: '20px',
+        background: '#F3F3F3',
         //opacity: ".75",
-        color: "black",
-        borderRadius: "3px",
-        boxShadow: "0px 0px 3.99778px 1.99889px rgba(0, 0, 0, 0.1)"
+        color: 'black',
+        borderRadius: '3px',
+        boxShadow: '0px 0px 3.99778px 1.99889px rgba(0, 0, 0, 0.1)',
       },
       options.style
-    );
+    )
 
     Object.assign(wrapper.style, {
-      position: "fixed",
+      position: 'fixed',
       left: 0,
       top: 0,
-      height: "100%",
-      width: "100%",
-      pointerEvents: "none",
-      zIndex: 2147483647 - 1
-    });
+      height: '100%',
+      width: '100%',
+      pointerEvents: 'none',
+      zIndex: 2147483647 - 1,
+    })
 
-    wrapper.appendChild(popup);
-    this.wrapper = wrapper;
+    wrapper.appendChild(popup)
+    this.wrapper = wrapper
 
     confirmBtn.onclick = () => {
-      this._remove();
-      this.resolve(true);
-    };
+      this._remove()
+      this.resolve(true)
+    }
     declineBtn.onclick = () => {
-      this._remove();
-      this.resolve(false);
-    };
+      this._remove()
+      this.resolve(false)
+    }
   }
 
   private resolve: (result: boolean) => void = () => {};
   private reject: () => void = () => {};
 
   mount(): Promise<boolean> {
-    document.body.appendChild(this.wrapper);
+    document.body.appendChild(this.wrapper)
 
     return new Promise((resolve, reject) => {
-      this.resolve = resolve;
-      this.reject = reject;
-    });
+      this.resolve = resolve
+      this.reject = reject
+    })
   }
 
   private _remove() {
     if (!this.wrapper.parentElement) {
-      return;
+      return
     }
-    document.body.removeChild(this.wrapper);
+    document.body.removeChild(this.wrapper)
   }
   remove() {
-    this._remove();
-    this.reject();
+    this._remove()
+    this.reject()
   }
 }
diff --git a/tracker/tracker-assist/src/ConfirmWindow/defaults.ts b/tracker/tracker-assist/src/ConfirmWindow/defaults.ts
index 8f84cbe89..d6d5430c4 100644
--- a/tracker/tracker-assist/src/ConfirmWindow/defaults.ts
+++ b/tracker/tracker-assist/src/ConfirmWindow/defaults.ts
@@ -1,10 +1,10 @@
-import { declineCall, acceptCall, cross, remoteControl } from '../icons.js'
-import type { ButtonOptions, ConfirmWindowOptions } from './ConfirmWindow.js'
+import { declineCall, acceptCall, cross, remoteControl, } from '../icons.js'
+import type { ButtonOptions, ConfirmWindowOptions, } from './ConfirmWindow.js'
 
 
-const TEXT_GRANT_REMORTE_ACCESS = "Grant Remote Control";
-const TEXT_REJECT = "Reject";
-const TEXT_ANSWER_CALL = `${acceptCall} &#xa0 Answer`;
+const TEXT_GRANT_REMORTE_ACCESS = 'Grant Remote Control'
+const TEXT_REJECT = 'Reject'
+const TEXT_ANSWER_CALL = `${acceptCall} &#xa0 Answer`
 
 export type Options = string | Partial<ConfirmWindowOptions>;
 
@@ -14,15 +14,15 @@ function confirmDefault(
   declineBtn: ButtonOptions,
   text: string
 ): ConfirmWindowOptions {
-  const isStr = typeof opts === "string";
+  const isStr = typeof opts === 'string'
   return Object.assign(
     {
       text: isStr ? opts : text,
       confirmBtn,
-      declineBtn
+      declineBtn,
     },
     isStr ? undefined : opts
-  );
+  )
 }
 
 export const callConfirmDefault = (opts: Options) =>
@@ -30,7 +30,7 @@ export const callConfirmDefault = (opts: Options) =>
     opts,
     TEXT_ANSWER_CALL,
     TEXT_REJECT,
-    "You have an incoming call. Do you want to answer?"
+    'You have an incoming call. Do you want to answer?'
   )
 
 export const controlConfirmDefault = (opts: Options) =>
@@ -38,5 +38,5 @@ export const controlConfirmDefault = (opts: Options) =>
     opts,
     TEXT_GRANT_REMORTE_ACCESS,
     TEXT_REJECT,
-    "Agent requested remote control. Allow?"
+    'Agent requested remote control. Allow?'
   )
diff --git a/tracker/tracker-assist/src/LocalStream.ts b/tracker/tracker-assist/src/LocalStream.ts
index 63f01ad58..7f233108a 100644
--- a/tracker/tracker-assist/src/LocalStream.ts
+++ b/tracker/tracker-assist/src/LocalStream.ts
@@ -5,44 +5,44 @@ declare global {
 }
 
 function dummyTrack(): MediaStreamTrack { 
-  const canvas = document.createElement("canvas")//, { width: 0, height: 0})
+  const canvas = document.createElement('canvas')//, { width: 0, height: 0})
   canvas.width=canvas.height=2 // Doesn't work when 1 (?!)
-  const ctx = canvas.getContext('2d');
-  ctx?.fillRect(0, 0, canvas.width, canvas.height);
+  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);
-  });
+    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];
+  return canvas.captureStream(60).getTracks()[0]
 }
 
 export default function RequestLocalStream(): Promise<LocalStream> {
-  return navigator.mediaDevices.getUserMedia({ audio:true })
+  return navigator.mediaDevices.getUserMedia({ audio:true, })
     .then(aStream => {
       const aTrack = aStream.getAudioTracks()[0]
-      if (!aTrack) { throw new Error("No audio tracks provided") }
+      if (!aTrack) { throw new Error('No audio tracks provided') }
       return new _LocalStream(aTrack)
     })
 }
 
 class _LocalStream {
-  private mediaRequested: boolean = false
+  private mediaRequested = false
   readonly stream: MediaStream
   private readonly vdTrack: MediaStreamTrack
   constructor(aTrack: MediaStreamTrack) {
     this.vdTrack = dummyTrack()
-    this.stream = new MediaStream([ aTrack, this.vdTrack ])
+    this.stream = new MediaStream([ aTrack, this.vdTrack, ])
   }
 
   toggleVideo(): Promise<boolean> {
     if (!this.mediaRequested) {
-      return navigator.mediaDevices.getUserMedia({video:true})
+      return navigator.mediaDevices.getUserMedia({video:true,})
       .then(vStream => {
         const vTrack = vStream.getVideoTracks()[0]
         if (!vTrack) {
-          throw new Error("No video track provided")
+          throw new Error('No video track provided')
         }
         this.stream.addTrack(vTrack)
         this.stream.removeTrack(this.vdTrack)
diff --git a/tracker/tracker-assist/src/Mouse.ts b/tracker/tracker-assist/src/Mouse.ts
index 52858ccf6..a6164e153 100644
--- a/tracker/tracker-assist/src/Mouse.ts
+++ b/tracker/tracker-assist/src/Mouse.ts
@@ -3,24 +3,24 @@ type XY = [number, number]
 
 export default class Mouse {
   private mouse: HTMLDivElement
-  private position: [number,number] = [0,0]
+  private position: [number,number] = [0,0,]
   constructor() {
-    this.mouse = document.createElement('div');
+    this.mouse = document.createElement('div')
     Object.assign(this.mouse.style, {
-      width: "20px",
-      height: "20px",
-      opacity: ".4",
-      borderRadius: "50%",
-      position: "absolute",
-      zIndex: "999998",
-      background: "radial-gradient(red, transparent)",
-    });
+      width: '20px',
+      height: '20px',
+      opacity: '.4',
+      borderRadius: '50%',
+      position: 'absolute',
+      zIndex: '999998',
+      background: 'radial-gradient(red, transparent)',
+    })
   }
 
   mount() {
     document.body.appendChild(this.mouse)
-    window.addEventListener("scroll", this.handleWScroll)
-    window.addEventListener("resize", this.resetLastScrEl)
+    window.addEventListener('scroll', this.handleWScroll)
+    window.addEventListener('resize', this.resetLastScrEl)
   }
 
   move(pos: XY) {
@@ -28,16 +28,16 @@ export default class Mouse {
       this.resetLastScrEl()
     }
 
-    this.position = pos;
+    this.position = pos
     Object.assign(this.mouse.style, {
       left: `${pos[0] || 0}px`,
-      top: `${pos[1] || 0}px`
+      top: `${pos[1] || 0}px`,
     })
 
   }
 
   getPosition(): XY {
-    return this.position;
+    return this.position
   }
 
   click(pos: XY) {
@@ -51,18 +51,18 @@ export default class Mouse {
   }
 
   private readonly pScrEl = document.scrollingElement || document.documentElement // Is it always correct
-  private lastScrEl: Element | "window" | null = null
+  private lastScrEl: Element | 'window' | null = null
   private resetLastScrEl = () => { this.lastScrEl = null }
   private handleWScroll = e => {
     if (e.target !== this.lastScrEl &&
-      this.lastScrEl !== "window") {
+      this.lastScrEl !== 'window') {
       this.resetLastScrEl()
     }
   }
   scroll(delta: XY) {
     // what would be the browser-like logic?
-    const [mouseX, mouseY] = this.position
-    const [dX, dY] = delta
+    const [mouseX, mouseY,] = this.position
+    const [dX, dY,] = delta
 
     let el = this.lastScrEl
 
@@ -72,7 +72,7 @@ export default class Mouse {
       el.scrollTop += dY
       return  // TODO: if not scrolled
     }
-    if (el === "window") {
+    if (el === 'window') {
       window.scroll(this.pScrEl.scrollLeft + dX, this.pScrEl.scrollTop + dY)
       return
     }
@@ -85,7 +85,7 @@ export default class Mouse {
       // el.scrollTopMax > 0 // available in firefox
       if (el.scrollHeight > el.clientHeight || el.scrollWidth > el.clientWidth) { 
         const styles = getComputedStyle(el)
-        if (styles.overflow.indexOf("scroll") >= 0 || styles.overflow.indexOf("auto") >= 0) { // returns true for body in habr.com but it's not scrollable
+        if (styles.overflow.indexOf('scroll') >= 0 || styles.overflow.indexOf('auto') >= 0) { // returns true for body in habr.com but it's not scrollable
           const esl = el.scrollLeft
           const est = el.scrollTop
           el.scrollLeft += dX
@@ -101,14 +101,14 @@ export default class Mouse {
 
     // If not scrolled
     window.scroll(this.pScrEl.scrollLeft + dX, this.pScrEl.scrollTop + dY)
-    this.lastScrEl = "window"
+    this.lastScrEl = 'window'
   }
 
   remove() {
     if (this.mouse.parentElement) {
-      document.body.removeChild(this.mouse);
+      document.body.removeChild(this.mouse)
     }
-    window.removeEventListener("scroll", this.handleWScroll)
-    window.removeEventListener("resize", this.resetLastScrEl)
+    window.removeEventListener('scroll', this.handleWScroll)
+    window.removeEventListener('resize', this.resetLastScrEl)
   }
 }
\ No newline at end of file
diff --git a/tracker/tracker-assist/src/RemoteControl.ts b/tracker/tracker-assist/src/RemoteControl.ts
index 50cb717c8..4cbc785f3 100644
--- a/tracker/tracker-assist/src/RemoteControl.ts
+++ b/tracker/tracker-assist/src/RemoteControl.ts
@@ -1,7 +1,7 @@
-import Mouse from './Mouse.js';
-import ConfirmWindow from './ConfirmWindow/ConfirmWindow.js';
-import { controlConfirmDefault } from './ConfirmWindow/defaults.js';
-import type { Options as AssistOptions } from './Assist';
+import Mouse from './Mouse.js'
+import ConfirmWindow from './ConfirmWindow/ConfirmWindow.js'
+import { controlConfirmDefault, } from './ConfirmWindow/defaults.js'
+import type { Options as AssistOptions, } from './Assist'
 
 enum RCStatus {
   Disabled,
@@ -11,7 +11,7 @@ enum RCStatus {
 
 
 let setInputValue = function(this: HTMLInputElement | HTMLTextAreaElement,  value: string) { this.value = value }
-const nativeInputValueDescriptor = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value")
+const nativeInputValueDescriptor = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value')
 if (nativeInputValueDescriptor && nativeInputValueDescriptor.set) {
   setInputValue = nativeInputValueDescriptor.set
 }
@@ -93,7 +93,7 @@ export default class RemoteControl {
     if (this.focused instanceof HTMLTextAreaElement 
       || this.focused instanceof HTMLInputElement) {
       setInputValue.call(this.focused, value)
-      const ev = new Event('input', { bubbles: true})
+      const ev = new Event('input', { bubbles: true,})
       this.focused.dispatchEvent(ev)
     } else if (this.focused.isContentEditable) {
       this.focused.innerText = value
diff --git a/tracker/tracker-assist/src/_slim.ts b/tracker/tracker-assist/src/_slim.ts
index ce86863be..760a9b8d2 100644
--- a/tracker/tracker-assist/src/_slim.ts
+++ b/tracker/tracker-assist/src/_slim.ts
@@ -5,4 +5,4 @@
  */
 
 // @ts-ignore
-typeof window !== "undefined" && (window.parcelRequire = window.parcelRequire || undefined);
+typeof window !== 'undefined' && (window.parcelRequire = window.parcelRequire || undefined)
diff --git a/tracker/tracker-assist/src/dnd.ts b/tracker/tracker-assist/src/dnd.ts
index 818bb0b89..622d86b94 100644
--- a/tracker/tracker-assist/src/dnd.ts
+++ b/tracker/tracker-assist/src/dnd.ts
@@ -9,7 +9,7 @@ export default function attachDND(
   dropArea: Element,
 ) {
 
-  dragArea.addEventListener('pointerdown', userPressed, { passive: true })
+  dragArea.addEventListener('pointerdown', userPressed, { passive: true, })
 
   let bbox, 
     startX, startY, 
@@ -20,9 +20,9 @@ export default function attachDND(
     startX = event.clientX
     startY = event.clientY
     bbox = movingEl.getBoundingClientRect()
-    dropArea.addEventListener('pointermove', userMoved, { passive: true })
-    dropArea.addEventListener('pointerup', userReleased, { passive: true })
-    dropArea.addEventListener('pointercancel', userReleased, { passive: true })
+    dropArea.addEventListener('pointermove', userMoved, { passive: true, })
+    dropArea.addEventListener('pointerup', userReleased, { passive: true, })
+    dropArea.addEventListener('pointercancel', userReleased, { passive: true, })
   };
 
   /* 
@@ -46,8 +46,8 @@ export default function attachDND(
   }
 
   function userMovedRaf() {
-    movingEl.style.transform = "translate3d("+deltaX+"px,"+deltaY+"px, 0px)";
-    raf = null;
+    movingEl.style.transform = 'translate3d('+deltaX+'px,'+deltaY+'px, 0px)'
+    raf = null
   }
 
   function userReleased() {
@@ -58,9 +58,9 @@ export default function attachDND(
       cancelAnimationFrame(raf)
       raf = null
     }
-    movingEl.style.left = bbox.left + deltaX + "px"
-    movingEl.style.top = bbox.top + deltaY + "px"
-    movingEl.style.transform = "translate3d(0px,0px,0px)"
+    movingEl.style.left = bbox.left + deltaX + 'px'
+    movingEl.style.top = bbox.top + deltaY + 'px'
+    movingEl.style.transform = 'translate3d(0px,0px,0px)'
     deltaX = deltaY = 0
   }
 }
\ No newline at end of file
diff --git a/tracker/tracker-assist/src/icons.ts b/tracker/tracker-assist/src/icons.ts
index 763b015b9..c844812f4 100644
--- a/tracker/tracker-assist/src/icons.ts
+++ b/tracker/tracker-assist/src/icons.ts
@@ -4,7 +4,7 @@
 
 export const declineCall = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-telephone" viewBox="0 0 16 16">
 <path d="M3.654 1.328a.678.678 0 0 0-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 0 0 4.168 6.608 17.569 17.569 0 0 0 6.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 0 0-.063-1.015l-2.307-1.794a.678.678 0 0 0-.58-.122l-2.19.547a1.745 1.745 0 0 1-1.657-.459L5.482 8.062a1.745 1.745 0 0 1-.46-1.657l.548-2.19a.678.678 0 0 0-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 0 1 2.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 0 0 .178.643l2.457 2.457a.678.678 0 0 0 .644.178l2.189-.547a1.745 1.745 0 0 1 1.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 0 1-7.01-4.42 18.634 18.634 0 0 1-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511z"/>
-</svg>`;
+</svg>`
 
 export const acceptCall = declineCall.replace('fill="#ef5261"', 'fill="green"')
 
@@ -13,4 +13,4 @@ export const cross = `<svg xmlns="http://www.w3.org/2000/svg" class="bi bi-x-lg"
   <path  fill-rule="evenodd" d="M2.146 2.146a.5.5 0 0 0 0 .708l11 11a.5.5 0 0 0 .708-.708l-11-11a.5.5 0 0 0-.708 0Z"/>
 </svg>`
 
-export const remoteControl = `<svg fill="green" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M638.59 368.22l-33.37-211.59c-8.86-50.26-48.4-90.77-100.66-103.13h-.07a803.14 803.14 0 0 0-369 0C83.17 65.86 43.64 106.36 34.78 156.63L1.41 368.22C-8.9 426.73 38.8 480 101.51 480c49.67 0 93.77-30.07 109.48-74.64l7.52-21.36h203l7.49 21.36C444.72 449.93 488.82 480 538.49 480c62.71 0 110.41-53.27 100.1-111.78zm-45.11 54.88c-13.28 15.82-33.33 24.9-55 24.9-36.2 0-68.07-21.41-79.29-53.27l-7.53-21.36-7.52-21.37H195.86l-7.53 21.37-7.53 21.36C169.58 426.59 137.71 448 101.51 448c-21.66 0-41.71-9.08-55-24.9A59.93 59.93 0 0 1 33 373.2l33.28-211c6.66-37.7 36.72-68.14 76.53-77.57a771.07 771.07 0 0 1 354.38 0c39.84 9.42 69.87 39.86 76.42 77l33.47 212.15c3.11 17.64-1.72 35.16-13.6 49.32zm-339.3-218.74h-42.54v-42.54a9.86 9.86 0 0 0-9.82-9.82h-19.64a9.86 9.86 0 0 0-9.82 9.82v42.54h-42.54a9.86 9.86 0 0 0-9.82 9.82v19.64a9.86 9.86 0 0 0 9.82 9.82h42.54v42.54a9.86 9.86 0 0 0 9.82 9.82h19.64a9.86 9.86 0 0 0 9.82-9.82v-42.54h42.54a9.86 9.86 0 0 0 9.82-9.82v-19.64a9.86 9.86 0 0 0-9.82-9.82zM416 224a32 32 0 1 0 32 32 32 32 0 0 0-32-32zm64-64a32 32 0 1 0 32 32 32 32 0 0 0-32-32z"/></svg>`
+export const remoteControl = '<svg fill="green" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M638.59 368.22l-33.37-211.59c-8.86-50.26-48.4-90.77-100.66-103.13h-.07a803.14 803.14 0 0 0-369 0C83.17 65.86 43.64 106.36 34.78 156.63L1.41 368.22C-8.9 426.73 38.8 480 101.51 480c49.67 0 93.77-30.07 109.48-74.64l7.52-21.36h203l7.49 21.36C444.72 449.93 488.82 480 538.49 480c62.71 0 110.41-53.27 100.1-111.78zm-45.11 54.88c-13.28 15.82-33.33 24.9-55 24.9-36.2 0-68.07-21.41-79.29-53.27l-7.53-21.36-7.52-21.37H195.86l-7.53 21.37-7.53 21.36C169.58 426.59 137.71 448 101.51 448c-21.66 0-41.71-9.08-55-24.9A59.93 59.93 0 0 1 33 373.2l33.28-211c6.66-37.7 36.72-68.14 76.53-77.57a771.07 771.07 0 0 1 354.38 0c39.84 9.42 69.87 39.86 76.42 77l33.47 212.15c3.11 17.64-1.72 35.16-13.6 49.32zm-339.3-218.74h-42.54v-42.54a9.86 9.86 0 0 0-9.82-9.82h-19.64a9.86 9.86 0 0 0-9.82 9.82v42.54h-42.54a9.86 9.86 0 0 0-9.82 9.82v19.64a9.86 9.86 0 0 0 9.82 9.82h42.54v42.54a9.86 9.86 0 0 0 9.82 9.82h19.64a9.86 9.86 0 0 0 9.82-9.82v-42.54h42.54a9.86 9.86 0 0 0 9.82-9.82v-19.64a9.86 9.86 0 0 0-9.82-9.82zM416 224a32 32 0 1 0 32 32 32 32 0 0 0-32-32zm64-64a32 32 0 1 0 32 32 32 32 0 0 0-32-32z"/></svg>'
diff --git a/tracker/tracker-assist/src/index.ts b/tracker/tracker-assist/src/index.ts
index 2a3161089..32af38d3f 100644
--- a/tracker/tracker-assist/src/index.ts
+++ b/tracker/tracker-assist/src/index.ts
@@ -1,7 +1,7 @@
-import './_slim.js';
+import './_slim.js'
 
-import type { App } from '@openreplay/tracker';
-import type { Options } from './Assist.js'
+import type { App, } from '@openreplay/tracker'
+import type { Options, } from './Assist.js'
 import Assist from './Assist.js'
 
 
@@ -9,13 +9,13 @@ export default function(opts?: Partial<Options>) {
   return function(app: App | null, appOptions: { __DISABLE_SECURE_MODE?: boolean } = {}) {
     // @ts-ignore
     if (app === null || !navigator?.mediaDevices?.getUserMedia) { // 93.04% browsers
-      return;
-    }
-    if (!app.checkRequiredVersion || !app.checkRequiredVersion("REQUIRED_TRACKER_VERSION")) {
-      console.warn("OpenReplay Assist: couldn't load. The minimum required version of @openreplay/tracker@REQUIRED_TRACKER_VERSION is not met")
       return
     }
-    app.notify.log("OpenReplay Assist initializing.")
+    if (!app.checkRequiredVersion || !app.checkRequiredVersion('REQUIRED_TRACKER_VERSION')) {
+      console.warn('OpenReplay Assist: couldn\'t load. The minimum required version of @openreplay/tracker@REQUIRED_TRACKER_VERSION is not met')
+      return
+    }
+    app.notify.log('OpenReplay Assist initializing.')
     const assist = new Assist(app, opts, appOptions.__DISABLE_SECURE_MODE)
     app.debug.log(assist)
     return assist
diff --git a/tracker/tracker/.eslintignore b/tracker/tracker/.eslintignore
new file mode 100644
index 000000000..94b2f339c
--- /dev/null
+++ b/tracker/tracker/.eslintignore
@@ -0,0 +1,8 @@
+node_modules
+npm-debug.log
+lib
+cjs
+build
+.cache
+.eslintrc.cjs
+src/common/messages.ts
diff --git a/tracker/tracker/.eslintrc.cjs b/tracker/tracker/.eslintrc.cjs
index b0c6b42eb..1e2170eee 100644
--- a/tracker/tracker/.eslintrc.cjs
+++ b/tracker/tracker/.eslintrc.cjs
@@ -1,8 +1,10 @@
+/* eslint-disable */
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    project: ['./tsconfig.json'],
+    project: ['./tsconfig-base.json', './src/main/tsconfig-cjs.json'],
+    tsconfigRootDir: __dirname,
   },
   plugins: ['prettier', '@typescript-eslint'],
   extends: [
@@ -11,7 +13,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:prettier/recommended',
     'plugin:@typescript-eslint/recommended-requiring-type-checking',
-    'prettier/@typescript-eslint',
+    'prettier',
   ],
   rules: {
     'prettier/prettier': ['error', require('./.prettierrc.json')],
@@ -27,8 +29,21 @@ module.exports = {
     '@typescript-eslint/unbound-method': 'off',
     '@typescript-eslint/explicit-function-return-type': 'warn',
     '@typescript-eslint/prefer-readonly': 'warn',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+    '@typescript-eslint/restrict-plus-operands': 'warn',
+    '@typescript-eslint/no-unsafe-return': 'warn',
+    'no-useless-escape': 'warn',
+    'no-control-regex': 'warn',
+    '@typescript-eslint/restrict-template-expressions': 'warn',
+    '@typescript-eslint/no-useless-constructor': 'warn',
+    '@typescript-eslint/no-this-alias': 'off',
+    '@typescript-eslint/no-floating-promises': 'warn',
+    '@typescript-eslint/no-unsafe-argument': 'warn',
     'no-unused-expressions': 'off',
     '@typescript-eslint/no-unused-expressions': 'warn',
     '@typescript-eslint/no-useless-constructor': 'warn',
   },
-};
+}; 
diff --git a/tracker/tracker/.prettierrc.json b/tracker/tracker/.prettierrc.json
index a20502b7f..5e2863a11 100644
--- a/tracker/tracker/.prettierrc.json
+++ b/tracker/tracker/.prettierrc.json
@@ -1,4 +1,5 @@
 {
+  "printWidth": 100,
   "singleQuote": true,
   "trailingComma": "all"
 }
diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index 183006c05..797569e33 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -14,33 +14,50 @@
   "type": "module",
   "main": "./lib/index.js",
   "scripts": {
-    "lint": "eslint src --ext .ts,.js --fix && tsc --noEmit",
+    "lint": "eslint src --ext .ts,.js --fix --quiet",
     "clean": "rm -Rf build && rm -Rf lib && rm -Rf cjs",
-    "tsc": "tsc -b src/main && tsc -b src/webworker && tsc --project src/main/tsconfig-cjs.json",
+    "tscRun": "tsc -b src/main && tsc -b src/webworker && tsc --project src/main/tsconfig-cjs.json",
     "rollup": "rollup --config rollup.config.js",
     "compile": "node --experimental-modules --experimental-json-modules scripts/compile.cjs",
-    "build": "npm run clean && npm run tsc && npm run rollup && npm run compile",
-    "prepare": "node scripts/checkver.cjs && npm run build"
+    "build": "npm run clean && npm run tscRun && npm run rollup && npm run compile",
+    "prepare": "cd ../../ && husky install tracker/.husky/",
+    "lint-front": "lint-staged"
   },
   "devDependencies": {
     "@babel/core": "^7.10.2",
     "@rollup/plugin-babel": "^5.0.3",
     "@rollup/plugin-node-resolve": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
     "eslint": "^7.8.0",
-    "eslint-plugin-prettier": "^4.1.4",
-    "prettier": "^2.0.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
     "replace-in-files": "^2.0.3",
     "rollup": "^2.17.0",
     "rollup-plugin-terser": "^6.1.0",
     "semver": "^6.3.0",
-    "typescript": "^4.6.0-dev.20211126"
+    "typescript": "4.6.0-dev.20211126"
   },
   "dependencies": {
     "error-stack-parser": "^2.0.6"
   },
   "engines": {
     "node": ">=14.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "sh lint.sh"
+    }
+  },
+  "lint-staged": {
+    "*.{js,mjs,jsx,ts,tsx}": [
+      "eslint --fix --quiet"
+    ],
+    "*.{json,md,html,js,jsx,ts,tsx}": [
+      "prettier --write"
+    ]
   }
 }
diff --git a/tracker/tracker/scripts/compile.cjs b/tracker/tracker/scripts/compile.cjs
index ec30ac21e..998ef3eca 100644
--- a/tracker/tracker/scripts/compile.cjs
+++ b/tracker/tracker/scripts/compile.cjs
@@ -12,7 +12,7 @@ async function main() {
   await replaceInFiles({
     files: 'build/**/*',
     from: 'WEBWORKER_BODY',
-    to: webworker.replace(/'/g, "\\'"),
+    to: webworker.replace(/'/g, "\\'").replace(/\n/g, ""),
   });
   await fs.rename('build/main', 'lib');
   await fs.rename('build/common', 'lib/common');
diff --git a/tracker/tracker/src/common/webworker.ts b/tracker/tracker/src/common/webworker.ts
index 3f6de9c35..5abf9b8fc 100644
--- a/tracker/tracker/src/common/webworker.ts
+++ b/tracker/tracker/src/common/webworker.ts
@@ -1,19 +1,19 @@
 export interface Options {
-  connAttemptCount?: number
-  connAttemptGap?:   number
+  connAttemptCount?: number;
+  connAttemptGap?: number;
 }
 
 type Start = {
-  type:             "start",
-  ingestPoint:      string
-  pageNo:           number
-  timestamp:        number
-} & Options
+  type: 'start';
+  ingestPoint: string;
+  pageNo: number;
+  timestamp: number;
+} & Options;
 
 type Auth = {
-  type:             "auth"
-  token:            string
-  beaconSizeLimit?:  number
-}
+  type: 'auth';
+  token: string;
+  beaconSizeLimit?: number;
+};
 
-export type WorkerMessageData = null | "stop" | Start | Auth | Array<{ _id: number }>
+export type WorkerMessageData = null | 'stop' | Start | Auth | Array<{ _id: number }>;
diff --git a/tracker/tracker/src/main/app/guards.ts b/tracker/tracker/src/main/app/guards.ts
index c3f36d398..5304950de 100644
--- a/tracker/tracker/src/main/app/guards.ts
+++ b/tracker/tracker/src/main/app/guards.ts
@@ -3,31 +3,32 @@ export function isSVGElement(node: Element): node is SVGElement {
 }
 
 export function isElementNode(node: Node): node is Element {
-  return node.nodeType === Node.ELEMENT_NODE
+  return node.nodeType === Node.ELEMENT_NODE;
 }
 
 export function isTextNode(node: Node): node is Text {
-  return node.nodeType === Node.TEXT_NODE
+  return node.nodeType === Node.TEXT_NODE;
 }
 
 export function isRootNode(node: Node): boolean {
-  return node.nodeType === Node.DOCUMENT_NODE || 
-    node.nodeType === Node.DOCUMENT_FRAGMENT_NODE
+  return node.nodeType === Node.DOCUMENT_NODE || node.nodeType === Node.DOCUMENT_FRAGMENT_NODE;
 }
 
-
 type TagTypeMap = {
-  HTML: HTMLHtmlElement
-  IMG: HTMLImageElement
-  INPUT: HTMLInputElement
-  TEXTAREA: HTMLTextAreaElement
-  SELECT: HTMLSelectElement
-  LABEL: HTMLLabelElement
-  IFRAME: HTMLIFrameElement
-  STYLE: HTMLStyleElement
-  style: SVGStyleElement
-  LINK: HTMLLinkElement
-}
-export function hasTag<T extends keyof TagTypeMap>(el: Node, tagName: T): el is TagTypeMap[typeof tagName] {
-  return el.nodeName === tagName
+  HTML: HTMLHtmlElement;
+  IMG: HTMLImageElement;
+  INPUT: HTMLInputElement;
+  TEXTAREA: HTMLTextAreaElement;
+  SELECT: HTMLSelectElement;
+  LABEL: HTMLLabelElement;
+  IFRAME: HTMLIFrameElement;
+  STYLE: HTMLStyleElement;
+  style: SVGStyleElement;
+  LINK: HTMLLinkElement;
+};
+export function hasTag<T extends keyof TagTypeMap>(
+  el: Node,
+  tagName: T,
+): el is TagTypeMap[typeof tagName] {
+  return el.nodeName === tagName;
 }
diff --git a/tracker/tracker/src/main/app/index.ts b/tracker/tracker/src/main/app/index.ts
index be03a968c..b96fab257 100644
--- a/tracker/tracker/src/main/app/index.ts
+++ b/tracker/tracker/src/main/app/index.ts
@@ -1,45 +1,45 @@
-import type Message from "../../common/messages.js";
-import { Timestamp, Metadata, UserID } from "../../common/messages.js";
-import { timestamp, deprecationWarn } from "../utils.js";
-import Nodes from "./nodes.js";
-import Observer from "./observer/top_observer.js";
-import Sanitizer from "./sanitizer.js";
-import Ticker from "./ticker.js";
-import Logger, { LogLevel } from "./logger.js";
-import Session from "./session.js";
+import type Message from '../../common/messages.js';
+import { Timestamp, Metadata, UserID } from '../../common/messages.js';
+import { timestamp, deprecationWarn } from '../utils.js';
+import Nodes from './nodes.js';
+import Observer from './observer/top_observer.js';
+import Sanitizer from './sanitizer.js';
+import Ticker from './ticker.js';
+import Logger, { LogLevel } from './logger.js';
+import Session from './session.js';
 
-import { deviceMemory, jsHeapSizeLimit } from "../modules/performance.js";
+import { deviceMemory, jsHeapSizeLimit } from '../modules/performance.js';
 
-import type { Options as ObserverOptions } from "./observer/top_observer.js";
-import type { Options as SanitizerOptions } from "./sanitizer.js";
-import type { Options as LoggerOptions } from "./logger.js"
-import type { Options as WebworkerOptions, WorkerMessageData } from "../../common/webworker.js";
+import type { Options as ObserverOptions } from './observer/top_observer.js';
+import type { Options as SanitizerOptions } from './sanitizer.js';
+import type { Options as LoggerOptions } from './logger.js';
+import type { Options as WebworkerOptions, WorkerMessageData } from '../../common/webworker.js';
 
 // TODO: Unify and clearly describe options logic
 export interface StartOptions {
-  userID?: string,
-  metadata?: Record<string, string>,
-  forceNew?: boolean,
+  userID?: string;
+  metadata?: Record<string, string>;
+  forceNew?: boolean;
 }
 
 interface OnStartInfo {
-  sessionID: string, 
-  sessionToken: string, 
-  userUUID: string,
+  sessionID: string;
+  sessionToken: string;
+  userUUID: string;
 }
-const CANCELED = "canceled" as const
-const START_ERROR = ":(" as const
-type SuccessfulStart = OnStartInfo & { success: true }
+const CANCELED = 'canceled' as const;
+const START_ERROR = ':(' as const;
+type SuccessfulStart = OnStartInfo & { success: true };
 type UnsuccessfulStart = {
-  reason: typeof CANCELED | string
-  success: false
-}
-const UnsuccessfulStart = (reason: string): UnsuccessfulStart => ({ reason,  success: false})
-const SuccessfulStart = (body: OnStartInfo): SuccessfulStart => ({ ...body,  success: true})
-export type StartPromiseReturn = SuccessfulStart | UnsuccessfulStart
+  reason: typeof CANCELED | string;
+  success: false;
+};
+const UnsuccessfulStart = (reason: string): UnsuccessfulStart => ({ reason, success: false });
+const SuccessfulStart = (body: OnStartInfo): SuccessfulStart => ({ ...body, success: true });
+export type StartPromiseReturn = SuccessfulStart | UnsuccessfulStart;
 
-type StartCallback = (i: OnStartInfo) => void
-type CommitCallback = (messages: Array<Message>) => void
+type StartCallback = (i: OnStartInfo) => void;
+type CommitCallback = (messages: Array<Message>) => void;
 enum ActivityState {
   NotActive,
   Starting,
@@ -54,7 +54,7 @@ type AppOptions = {
   session_reset_key: string;
   local_uuid_key: string;
   ingestPoint: string;
-  resourceBaseHref: string | null, // resourceHref?
+  resourceBaseHref: string | null; // resourceHref?
   //resourceURLRewriter: (url: string) => string | boolean,
   verbose: boolean;
   __is_snippet: boolean;
@@ -67,8 +67,7 @@ type AppOptions = {
   onStart?: StartCallback;
 } & WebworkerOptions;
 
-export type Options = AppOptions & ObserverOptions & SanitizerOptions
-
+export type Options = AppOptions & ObserverOptions & SanitizerOptions;
 
 // TODO: use backendHost only
 export const DEFAULT_INGEST_POINT = 'https://api.openreplay.com/ingest';
@@ -86,19 +85,18 @@ export default class App {
   private readonly messages: Array<Message> = [];
   private readonly observer: Observer;
   private readonly startCallbacks: Array<StartCallback> = [];
-  private readonly stopCallbacks: Array<Function> = [];
+  private readonly stopCallbacks: Array<() => any> = [];
   private readonly commitCallbacks: Array<CommitCallback> = [];
   private readonly options: AppOptions;
   private readonly revID: string;
   private activityState: ActivityState = ActivityState.NotActive;
-  private version = 'TRACKER_VERSION'; // TODO: version compatability check inside each plugin.
+  private readonly version = 'TRACKER_VERSION'; // TODO: version compatability check inside each plugin.
   private readonly worker?: Worker;
   constructor(
     projectKey: string,
     sessionToken: string | null | undefined,
     options: Partial<Options>,
   ) {
-
     // if (options.onStart !== undefined) {
     //   deprecationWarn("'onStart' option", "tracker.start().then(/* handle session info */)")
     // } ?? maybe onStart is good
@@ -133,13 +131,14 @@ export default class App {
     this.notify = new Logger(this.options.verbose ? LogLevel.Warnings : LogLevel.Silent);
     this.session = new Session();
     this.session.attachUpdateCallback(({ userID, metadata }) => {
-      if (userID != null) { // TODO: nullable userID
-        this.send(new UserID(userID))
+      if (userID != null) {
+        // TODO: nullable userID
+        this.send(new UserID(userID));
       }
       if (metadata != null) {
-        Object.entries(metadata).forEach(([key, value]) => this.send(new Metadata(key, value)))
+        Object.entries(metadata).forEach(([key, value]) => this.send(new Metadata(key, value)));
       }
-    })
+    });
     this.localStorage = this.options.localStorage;
     this.sessionStorage = this.options.sessionStorage;
 
@@ -149,57 +148,57 @@ export default class App {
 
     try {
       this.worker = new Worker(
-        URL.createObjectURL(
-          new Blob([`WEBWORKER_BODY`], { type: 'text/javascript' }),
-        ),
+        URL.createObjectURL(new Blob(['WEBWORKER_BODY'], { type: 'text/javascript' })),
       );
-      this.worker.onerror = e => {
-        this._debug("webworker_error", e)
-      }
+      this.worker.onerror = (e) => {
+        this._debug('webworker_error', e);
+      };
       this.worker.onmessage = ({ data }: MessageEvent) => {
-        if (data === "failed") {
+        if (data === 'failed') {
           this.stop();
-          this._debug("worker_failed", {})  // add context (from worker)
-        } else if (data === "restart") {
+          this._debug('worker_failed', {}); // add context (from worker)
+        } else if (data === 'restart') {
           this.stop();
           this.start({ forceNew: true });
         }
-      }
+      };
       const alertWorker = () => {
         if (this.worker) {
           this.worker.postMessage(null);
         }
-      }
+      };
       // keep better tactics, discard others?
       this.attachEventListener(window, 'beforeunload', alertWorker, false);
       this.attachEventListener(document.body, 'mouseleave', alertWorker, false, false);
       // TODO: stop session after inactivity timeout (make configurable)
       this.attachEventListener(document, 'visibilitychange', alertWorker, false);
-    } catch (e) { 
-      this._debug("worker_start", e);
+    } catch (e) {
+      this._debug('worker_start', e);
     }
   }
 
   private _debug(context: string, e: any) {
-    if(this.options.__debug_report_edp !== null) {
+    if (this.options.__debug_report_edp !== null) {
       fetch(this.options.__debug_report_edp, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
           context,
-          error: `${e}`
-        })
+          error: `${e}`,
+        }),
       });
     }
-    this.debug.error("OpenReplay error: ", context, e)
+    this.debug.error('OpenReplay error: ', context, e);
   }
 
   send(message: Message, urgent = false): void {
-    if (this.activityState === ActivityState.NotActive) { return }
+    if (this.activityState === ActivityState.NotActive) {
+      return;
+    }
     this.messages.push(message);
-    // TODO: commit on start if there were `urgent` sends; 
+    // TODO: commit on start if there were `urgent` sends;
     // Clearify where urgent can be used for;
-    // Clearify workflow for each type of message in case it was sent before start 
+    // Clearify workflow for each type of message in case it was sent before start
     //      (like Fetch before start; maybe add an option "preCapture: boolean" or sth alike)
     if (this.activityState === ActivityState.Active && urgent) {
       this.commit();
@@ -209,7 +208,7 @@ export default class App {
     if (this.worker && this.messages.length) {
       this.messages.unshift(new Timestamp(timestamp()));
       this.worker.postMessage(this.messages);
-      this.commitCallbacks.forEach(cb => cb(this.messages));
+      this.commitCallbacks.forEach((cb) => cb(this.messages));
       this.messages.length = 0;
     }
   }
@@ -220,22 +219,22 @@ export default class App {
       try {
         fn.apply(this, args);
       } catch (e) {
-        app._debug("safe_fn_call", e)
+        app._debug('safe_fn_call', e);
         // time: timestamp(),
         // name: e.name,
         // message: e.message,
         // stack: e.stack
       }
-    } as any // TODO: correct typing
+    } as any; // TODO: correct typing
   }
 
   attachCommitCallback(cb: CommitCallback): void {
-    this.commitCallbacks.push(cb)
+    this.commitCallbacks.push(cb);
   }
   attachStartCallback(cb: StartCallback): void {
     this.startCallbacks.push(cb);
   }
-  attachStopCallback(cb: Function): void {
+  attachStopCallback(cb: () => any): void {
     this.stopCallbacks.push(cb);
   }
   attachEventListener(
@@ -248,24 +247,20 @@ export default class App {
     if (useSafe) {
       listener = this.safe(listener);
     }
-    this.attachStartCallback(() =>
-      target.addEventListener(type, listener, useCapture),
-    );
-    this.attachStopCallback(() =>
-      target.removeEventListener(type, listener, useCapture),
-    );
+    this.attachStartCallback(() => target.addEventListener(type, listener, useCapture));
+    this.attachStopCallback(() => target.removeEventListener(type, listener, useCapture));
   }
 
   // TODO: full correct semantic
   checkRequiredVersion(version: string): boolean {
-    const reqVer = version.split(/[.-]/)
-    const ver = this.version.split(/[.-]/)
+    const reqVer = version.split(/[.-]/);
+    const ver = this.version.split(/[.-]/);
     for (let i = 0; i < 3; i++) {
       if (Number(ver[i]) < Number(reqVer[i]) || isNaN(Number(ver[i])) || isNaN(Number(reqVer[i]))) {
-        return false
+        return false;
       }
     }
-    return true
+    return true;
   }
 
   private getStartInfo() {
@@ -276,13 +271,13 @@ export default class App {
       timestamp: timestamp(), // shouldn't it be set once?
       trackerVersion: this.version,
       isSnippet: this.options.__is_snippet,
-    }
+    };
   }
   getSessionInfo() {
     return {
       ...this.session.getInfo(),
-      ...this.getStartInfo()
-    }
+      ...this.getStartInfo(),
+    };
   }
   getSessionToken(): string | undefined {
     const token = this.sessionStorage.getItem(this.options.session_token_key);
@@ -294,38 +289,39 @@ export default class App {
     return this.session.getInfo().sessionID || undefined;
   }
   getHost(): string {
-    return new URL(this.options.ingestPoint).hostname
+    return new URL(this.options.ingestPoint).hostname;
   }
   getProjectKey(): string {
-    return this.projectKey
+    return this.projectKey;
   }
   getBaseHref(): string {
     if (typeof this.options.resourceBaseHref === 'string') {
-      return this.options.resourceBaseHref
+      return this.options.resourceBaseHref;
     } else if (typeof this.options.resourceBaseHref === 'object') {
       //switch between  types
     }
     if (document.baseURI) {
-      return document.baseURI
+      return document.baseURI;
     }
     // IE only
-    return document.head
-      ?.getElementsByTagName("base")[0]
-      ?.getAttribute("href") || location.origin + location.pathname
+    return (
+      document.head?.getElementsByTagName('base')[0]?.getAttribute('href') ||
+      location.origin + location.pathname
+    );
   }
   resolveResourceURL(resourceURL: string): string {
-    const base = new URL(this.getBaseHref())
-    base.pathname += "/" + new URL(resourceURL).pathname
-    base.pathname.replace(/\/+/g, "/")
-    return base.toString()
+    const base = new URL(this.getBaseHref());
+    base.pathname += '/' + new URL(resourceURL).pathname;
+    base.pathname.replace(/\/+/g, '/');
+    return base.toString();
   }
 
   isServiceURL(url: string): boolean {
-    return url.startsWith(this.options.ingestPoint)
+    return url.startsWith(this.options.ingestPoint);
   }
 
   active(): boolean {
-    return this.activityState === ActivityState.Active
+    return this.activityState === ActivityState.Active;
   }
 
   resetNextPageSession(flag: boolean) {
@@ -337,14 +333,18 @@ export default class App {
   }
   private _start(startOpts: StartOptions): Promise<StartPromiseReturn> {
     if (!this.worker) {
-      return Promise.resolve(UnsuccessfulStart("No worker found: perhaps, CSP is not set."))
+      return Promise.resolve(UnsuccessfulStart('No worker found: perhaps, CSP is not set.'));
     }
-    if (this.activityState !== ActivityState.NotActive) { 
-      return Promise.resolve(UnsuccessfulStart("OpenReplay: trying to call `start()` on the instance that has been started already.")) 
+    if (this.activityState !== ActivityState.NotActive) {
+      return Promise.resolve(
+        UnsuccessfulStart(
+          'OpenReplay: trying to call `start()` on the instance that has been started already.',
+        ),
+      );
     }
     this.activityState = ActivityState.Starting;
 
-    let pageNo: number = 0;
+    let pageNo = 0;
     const pageNoStr = this.sessionStorage.getItem(this.options.session_pageno_key);
     if (pageNoStr != null) {
       pageNo = parseInt(pageNoStr);
@@ -352,95 +352,104 @@ export default class App {
     }
     this.sessionStorage.setItem(this.options.session_pageno_key, pageNo.toString());
 
-    const startInfo = this.getStartInfo()
+    const startInfo = this.getStartInfo();
     const startWorkerMsg: WorkerMessageData = {
-      type: "start",
+      type: 'start',
       pageNo,
       ingestPoint: this.options.ingestPoint,
       timestamp: startInfo.timestamp,
       connAttemptCount: this.options.connAttemptCount,
       connAttemptGap: this.options.connAttemptGap,
-    }
-    this.worker.postMessage(startWorkerMsg)
+    };
+    this.worker.postMessage(startWorkerMsg);
 
-    this.session.update({ // TODO: transparent "session" module logic AND explicit internal api for plugins.
-      // "updating" with old metadata in order to trigger session's UpdateCallbacks. 
+    this.session.update({
+      // TODO: transparent "session" module logic AND explicit internal api for plugins.
+      // "updating" with old metadata in order to trigger session's UpdateCallbacks.
       // (for the case of internal .start() calls, like on "restart" webworker signal or assistent connection in tracker-assist )
       metadata: startOpts.metadata || this.session.getInfo().metadata,
       userID: startOpts.userID,
-    })
+    });
 
     const sReset = this.sessionStorage.getItem(this.options.session_reset_key);
     this.sessionStorage.removeItem(this.options.session_reset_key);
 
-    return window.fetch(this.options.ingestPoint + '/v1/web/start', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        ...startInfo,
-        userID: this.session.getInfo().userID,
-        token: this.sessionStorage.getItem(this.options.session_token_key),
-        deviceMemory,
-        jsHeapSizeLimit,
-        reset: startOpts.forceNew || sReset !== null,
-      }),
-    })
-    .then(r => {
-      if (r.status === 200) {
-        return r.json()
-      } else {
-        return r.text().then(text => text === CANCELED 
-          ? Promise.reject(CANCELED)
-          : Promise.reject(`Server error: ${r.status}. ${text}`)
-        );
-      }
-    })
-    .then(r => {
-      if (!this.worker) {
-        return Promise.reject("no worker found after start request (this might not happen)");
-      }
-      const { token, userUUID, sessionID, beaconSizeLimit } = r;
-      if (typeof token !== 'string' ||
+    return window
+      .fetch(this.options.ingestPoint + '/v1/web/start', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          ...startInfo,
+          userID: this.session.getInfo().userID,
+          token: this.sessionStorage.getItem(this.options.session_token_key),
+          deviceMemory,
+          jsHeapSizeLimit,
+          reset: startOpts.forceNew || sReset !== null,
+        }),
+      })
+      .then((r) => {
+        if (r.status === 200) {
+          return r.json();
+        } else {
+          return r
+            .text()
+            .then((text) =>
+              text === CANCELED
+                ? Promise.reject(CANCELED)
+                : Promise.reject(`Server error: ${r.status}. ${text}`),
+            );
+        }
+      })
+      .then((r) => {
+        if (!this.worker) {
+          return Promise.reject('no worker found after start request (this might not happen)');
+        }
+        const { token, userUUID, sessionID, beaconSizeLimit } = r;
+        if (
+          typeof token !== 'string' ||
           typeof userUUID !== 'string' ||
-          (typeof beaconSizeLimit !== 'number' && typeof beaconSizeLimit !== 'undefined')) {
-        return Promise.reject(`Incorrect server response: ${ JSON.stringify(r) }`);
-      }
-      this.sessionStorage.setItem(this.options.session_token_key, token);
-      this.localStorage.setItem(this.options.local_uuid_key, userUUID);
-      this.session.update({ sessionID }) // TODO: no no-explicit 'any'
-      const startWorkerMsg: WorkerMessageData = {
-        type: "auth",
-        token,
-        beaconSizeLimit
-      }
-      this.worker.postMessage(startWorkerMsg)
+          (typeof beaconSizeLimit !== 'number' && typeof beaconSizeLimit !== 'undefined')
+        ) {
+          return Promise.reject(`Incorrect server response: ${JSON.stringify(r)}`);
+        }
+        this.sessionStorage.setItem(this.options.session_token_key, token);
+        this.localStorage.setItem(this.options.local_uuid_key, userUUID);
+        this.session.update({ sessionID }); // TODO: no no-explicit 'any'
+        const startWorkerMsg: WorkerMessageData = {
+          type: 'auth',
+          token,
+          beaconSizeLimit,
+        };
+        this.worker.postMessage(startWorkerMsg);
 
-      this.activityState = ActivityState.Active
-      
-      const onStartInfo = { sessionToken: token, userUUID, sessionID };
+        this.activityState = ActivityState.Active;
 
-      this.startCallbacks.forEach((cb) => cb(onStartInfo)); // TODO: start as early as possible (before receiving the token)
-      this.observer.observe();
-      this.ticker.start();
+        const onStartInfo = { sessionToken: token, userUUID, sessionID };
 
-      this.notify.log("OpenReplay tracking started.");
-      // get rid of onStart ?
-      if (typeof this.options.onStart === 'function') {
-        this.options.onStart(onStartInfo)
-      }
-      return SuccessfulStart(onStartInfo)
-    })
-    .catch(reason => {        
-      this.sessionStorage.removeItem(this.options.session_token_key)
-      this.stop()
-      if (reason === CANCELED) { return UnsuccessfulStart(CANCELED) }
+        this.startCallbacks.forEach((cb) => cb(onStartInfo)); // TODO: start as early as possible (before receiving the token)
+        this.observer.observe();
+        this.ticker.start();
 
-      this.notify.log("OpenReplay was unable to start. ", reason)
-      this._debug("session_start", reason)
-      return UnsuccessfulStart(START_ERROR)
-    })
+        this.notify.log('OpenReplay tracking started.');
+        // get rid of onStart ?
+        if (typeof this.options.onStart === 'function') {
+          this.options.onStart(onStartInfo);
+        }
+        return SuccessfulStart(onStartInfo);
+      })
+      .catch((reason) => {
+        this.sessionStorage.removeItem(this.options.session_token_key);
+        this.stop();
+        if (reason === CANCELED) {
+          return UnsuccessfulStart(CANCELED);
+        }
+
+        this.notify.log('OpenReplay was unable to start. ', reason);
+        this._debug('session_start', reason);
+        return UnsuccessfulStart(START_ERROR);
+      });
   }
 
   start(options: StartOptions = {}): Promise<StartPromiseReturn> {
@@ -450,31 +459,31 @@ export default class App {
       return new Promise((resolve) => {
         const onVisibilityChange = () => {
           if (!document.hidden) {
-            document.removeEventListener("visibilitychange", onVisibilityChange);
-            resolve(this._start(options))
+            document.removeEventListener('visibilitychange', onVisibilityChange);
+            resolve(this._start(options));
           }
-        }
-        document.addEventListener("visibilitychange", onVisibilityChange);
-      })
+        };
+        document.addEventListener('visibilitychange', onVisibilityChange);
+      });
     }
   }
   stop(calledFromAPI = false): void {
     if (this.activityState !== ActivityState.NotActive) {
       try {
-        this.sanitizer.clear()
-        this.observer.disconnect()
-        this.nodes.clear()
-        this.ticker.stop()
-        this.stopCallbacks.forEach((cb) => cb())
+        this.sanitizer.clear();
+        this.observer.disconnect();
+        this.nodes.clear();
+        this.ticker.stop();
+        this.stopCallbacks.forEach((cb) => cb());
         if (calledFromAPI) {
-          this.session.reset()
+          this.session.reset();
         }
-        this.notify.log("OpenReplay tracking stopped.")
+        this.notify.log('OpenReplay tracking stopped.');
         if (this.worker) {
-          this.worker.postMessage("stop")
+          this.worker.postMessage('stop');
         }
       } finally {
-        this.activityState = ActivityState.NotActive
+        this.activityState = ActivityState.NotActive;
       }
     }
   }
diff --git a/tracker/tracker/src/main/app/logger.ts b/tracker/tracker/src/main/app/logger.ts
index 34d8c12c6..c810cb4ce 100644
--- a/tracker/tracker/src/main/app/logger.ts
+++ b/tracker/tracker/src/main/app/logger.ts
@@ -1,4 +1,3 @@
-
 export const LogLevel = {
   Verbose: 5,
   Log: 4,
@@ -6,54 +5,60 @@ export const LogLevel = {
   Errors: 2,
   Silent: 0,
 } as const;
-type LogLevel = typeof LogLevel[keyof typeof LogLevel]
-
+type LogLevel = typeof LogLevel[keyof typeof LogLevel];
 
 type CustomLevel = {
-  error: boolean
-  warn: boolean
-  log: boolean
-}
+  error: boolean;
+  warn: boolean;
+  log: boolean;
+};
 
 function IsCustomLevel(l: LogLevel | CustomLevel): l is CustomLevel {
-  return typeof l === 'object'
+  return typeof l === 'object';
 }
 
-
 interface _Options {
-  level: LogLevel | CustomLevel,
-  messages?: number[],
+  level: LogLevel | CustomLevel;
+  messages?: number[];
 }
 
-
-export type Options = true | _Options | LogLevel
+export type Options = true | _Options | LogLevel;
 
 export default class Logger {
   private readonly options: _Options;
   constructor(options: Options = LogLevel.Silent) {
-    this.options = options === true 
-      ? { level: LogLevel.Verbose } 
-      : typeof options === "number" ? { level: options } : options;
+    this.options =
+      options === true
+        ? { level: LogLevel.Verbose }
+        : typeof options === 'number'
+        ? { level: options }
+        : options;
   }
   log(...args: any) {
-    if (IsCustomLevel(this.options.level) 
-      ? this.options.level.log
-      : this.options.level >= LogLevel.Log) {
-      console.log(...args)
+    if (
+      IsCustomLevel(this.options.level)
+        ? this.options.level.log
+        : this.options.level >= LogLevel.Log
+    ) {
+      console.log(...args);
     }
   }
   warn(...args: any) {
-    if (IsCustomLevel(this.options.level) 
-      ? this.options.level.warn
-      : this.options.level >= LogLevel.Warnings) {
-      console.warn(...args)
+    if (
+      IsCustomLevel(this.options.level)
+        ? this.options.level.warn
+        : this.options.level >= LogLevel.Warnings
+    ) {
+      console.warn(...args);
     }
   }
   error(...args: any) {
-    if (IsCustomLevel(this.options.level) 
-      ? this.options.level.error
-      : this.options.level >= LogLevel.Errors) {
-      console.error(...args)
+    if (
+      IsCustomLevel(this.options.level)
+        ? this.options.level.error
+        : this.options.level >= LogLevel.Errors
+    ) {
+      console.error(...args);
     }
   }
 }
diff --git a/tracker/tracker/src/main/app/nodes.ts b/tracker/tracker/src/main/app/nodes.ts
index a1c87b6e2..4bdab642a 100644
--- a/tracker/tracker/src/main/app/nodes.ts
+++ b/tracker/tracker/src/main/app/nodes.ts
@@ -13,11 +13,7 @@ export default class Nodes {
   attachNodeCallback(nodeCallback: NodeCallback): void {
     this.nodeCallbacks.push(nodeCallback);
   }
-  attachElementListener(
-    type: string,
-    node: Element,
-    elementListener: EventListener,
-  ): void {
+  attachElementListener(type: string, node: Element, elementListener: EventListener): void {
     const id = this.getID(node);
     if (id === undefined) {
       return;
@@ -50,9 +46,7 @@ export default class Nodes {
       const listeners = this.elementListeners.get(id);
       if (listeners !== undefined) {
         this.elementListeners.delete(id);
-        listeners.forEach((listener) =>
-          node.removeEventListener(listener[0], listener[1]),
-        );
+        listeners.forEach((listener) => node.removeEventListener(listener[0], listener[1]));
       }
     }
     return id;
diff --git a/tracker/tracker/src/main/app/observer/iframe_observer.ts b/tracker/tracker/src/main/app/observer/iframe_observer.ts
index 1f50e588a..faea6a5e6 100644
--- a/tracker/tracker/src/main/app/observer/iframe_observer.ts
+++ b/tracker/tracker/src/main/app/observer/iframe_observer.ts
@@ -1,19 +1,20 @@
-import Observer from "./observer.js";
-import { CreateIFrameDocument } from "../../../common/messages.js";
+import Observer from './observer.js';
+import { CreateIFrameDocument } from '../../../common/messages.js';
 
 export default class IFrameObserver extends Observer {
   observe(iframe: HTMLIFrameElement) {
     const doc = iframe.contentDocument;
     const hostID = this.app.nodes.getID(iframe);
-    if (!doc || hostID === undefined) { return } //log TODO common app.logger
+    if (!doc || hostID === undefined) {
+      return;
+    } //log TODO common app.logger
     // Have to observe document, because the inner <html> might be changed
     this.observeRoot(doc, (docID) => {
       if (docID === undefined) {
-        console.log("OpenReplay: Iframe document not bound")
+        console.log('OpenReplay: Iframe document not bound');
         return;
       }
-      this.app.send(CreateIFrameDocument(hostID, docID)); 
+      this.app.send(CreateIFrameDocument(hostID, docID));
     });
   }
-
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/src/main/app/observer/observer.ts b/tracker/tracker/src/main/app/observer/observer.ts
index 940a7eefb..8f2e60177 100644
--- a/tracker/tracker/src/main/app/observer/observer.ts
+++ b/tracker/tracker/src/main/app/observer/observer.ts
@@ -8,40 +8,35 @@ import {
   CreateElementNode,
   MoveNode,
   RemoveNode,
-} from "../../../common/messages.js";
-import App from "../index.js";
-import { 
-  isRootNode,
-  isTextNode,
-  isElementNode,
-  isSVGElement,
-  hasTag,
-} from "../guards.js";
+} from '../../../common/messages.js';
+import App from '../index.js';
+import { isRootNode, isTextNode, isElementNode, isSVGElement, hasTag } from '../guards.js';
 
 function isIgnored(node: Node): boolean {
-  if (isTextNode(node)) { return false }
-  if (!isElementNode(node)) { return true }
+  if (isTextNode(node)) {
+    return false;
+  }
+  if (!isElementNode(node)) {
+    return true;
+  }
   const tag = node.tagName.toUpperCase();
   if (tag === 'LINK') {
     const rel = node.getAttribute('rel');
     const as = node.getAttribute('as');
-    return !(rel?.includes('stylesheet') || as === "style" || as === "font");
+    return !(rel?.includes('stylesheet') || as === 'style' || as === 'font');
   }
   return (
-    tag === 'SCRIPT' ||
-    tag === 'NOSCRIPT' ||
-    tag === 'META' ||
-    tag === 'TITLE' ||
-    tag === 'BASE'
+    tag === 'SCRIPT' || tag === 'NOSCRIPT' || tag === 'META' || tag === 'TITLE' || tag === 'BASE'
   );
 }
 
 function isObservable(node: Node): boolean {
-  if (isRootNode(node)) { return true }
-  return !isIgnored(node)
+  if (isRootNode(node)) {
+    return true;
+  }
+  return !isIgnored(node);
 }
 
-
 /*
   TODO:
     - fix unbinding logic + send all removals first (ensure sequence is correct)
@@ -57,14 +52,15 @@ enum RecentsType {
 export default abstract class Observer {
   private readonly observer: MutationObserver;
   private readonly commited: Array<boolean | undefined> = [];
-  private readonly recents: Map<number, RecentsType> = new Map()
+  private readonly recents: Map<number, RecentsType> = new Map();
   private readonly indexes: Array<number> = [];
   private readonly attributesMap: Map<number, Set<string>> = new Map();
   private readonly textSet: Set<number> = new Set();
   constructor(protected readonly app: App, protected readonly isTopContext = false) {
     this.observer = new MutationObserver(
       this.app.safe((mutations) => {
-        for (const mutation of mutations) {  // mutations order is sequential
+        for (const mutation of mutations) {
+          // mutations order is sequential
           const target = mutation.target;
           const type = mutation.type;
 
@@ -85,16 +81,16 @@ export default abstract class Observer {
             continue;
           }
           if (!this.recents.has(id)) {
-            this.recents.set(id, RecentsType.Changed) // TODO only when altered
+            this.recents.set(id, RecentsType.Changed); // TODO only when altered
           }
           if (type === 'attributes') {
             const name = mutation.attributeName;
             if (name === null) {
               continue;
             }
-            let attr = this.attributesMap.get(id)
+            let attr = this.attributesMap.get(id);
             if (attr === undefined) {
-              this.attributesMap.set(id, attr = new Set())
+              this.attributesMap.set(id, (attr = new Set()));
             }
             attr.add(name);
             continue;
@@ -110,18 +106,13 @@ export default abstract class Observer {
   }
   private clear(): void {
     this.commited.length = 0;
-    this.recents.clear()
+    this.recents.clear();
     this.indexes.length = 1;
     this.attributesMap.clear();
     this.textSet.clear();
   }
 
-  private sendNodeAttribute(
-    id: number,
-    node: Element,
-    name: string,
-    value: string | null,
-  ): void {
+  private sendNodeAttribute(id: number, node: Element, name: string, value: string | null): void {
     if (isSVGElement(node)) {
       if (name.substr(0, 6) === 'xlink:') {
         name = name.substr(6);
@@ -150,7 +141,7 @@ export default abstract class Observer {
     }
     if (
       name === 'value' &&
-      hasTag(node, "INPUT") &&
+      hasTag(node, 'INPUT') &&
       node.type !== 'button' &&
       node.type !== 'reset' &&
       node.type !== 'submit'
@@ -161,7 +152,7 @@ export default abstract class Observer {
       this.app.send(new RemoveNodeAttribute(id, name));
       return;
     }
-    if (name === 'style' || name === 'href' && hasTag(node, "LINK")) {
+    if (name === 'style' || (name === 'href' && hasTag(node, 'LINK'))) {
       this.app.send(new SetNodeAttributeURLBased(id, name, value, this.app.getBaseHref()));
       return;
     }
@@ -172,26 +163,27 @@ export default abstract class Observer {
   }
 
   private sendNodeData(id: number, parentElement: Element, data: string): void {
-    if (hasTag(parentElement, "STYLE") || hasTag(parentElement, "style")) {
+    if (hasTag(parentElement, 'STYLE') || hasTag(parentElement, 'style')) {
       this.app.send(new SetCSSDataURLBased(id, data, this.app.getBaseHref()));
       return;
     }
-    data = this.app.sanitizer.sanitize(id, data)
+    data = this.app.sanitizer.sanitize(id, data);
     this.app.send(new SetNodeData(id, data));
   }
 
   private bindNode(node: Node): void {
-    const [ id,  isNew ]= this.app.nodes.registerNode(node);
-    if (isNew){
-      this.recents.set(id, RecentsType.New)
-    } else if (this.recents.get(id) !== RecentsType.New) { // can we do just `else` here?
-      this.recents.set(id, RecentsType.Removed)
+    const [id, isNew] = this.app.nodes.registerNode(node);
+    if (isNew) {
+      this.recents.set(id, RecentsType.New);
+    } else if (this.recents.get(id) !== RecentsType.New) {
+      // can we do just `else` here?
+      this.recents.set(id, RecentsType.Removed);
     }
   }
 
   private bindTree(node: Node): void {
     if (!isObservable(node)) {
-      return
+      return;
     }
     this.bindNode(node);
     const walker = document.createTreeWalker(
@@ -229,7 +221,7 @@ export default abstract class Observer {
     // Disable parent check for the upper context HTMLHtmlElement, because it is root there... (before)
     // TODO: get rid of "special" cases (there is an issue with CreateDocument altered behaviour though)
     // TODO: Clean the logic (though now it workd fine)
-    if (!hasTag(node, "HTML") || !this.isTopContext) {
+    if (!hasTag(node, 'HTML') || !this.isTopContext) {
       if (parent === null) {
         // Sometimes one observation contains attribute mutations for the removimg node, which gets ignored here.
         // That shouldn't affect the visual rendering ( should it? )
@@ -264,15 +256,15 @@ export default abstract class Observer {
     if (sibling === null) {
       this.indexes[id] = 0;
     }
-    const recentsType = this.recents.get(id)
-    const isNew = recentsType === RecentsType.New
-    const index = this.indexes[id]
+    const recentsType = this.recents.get(id);
+    const isNew = recentsType === RecentsType.New;
+    const index = this.indexes[id];
     if (index === undefined) {
       throw 'commitNode: missing node index';
     }
     if (isNew) {
       if (isElementNode(node)) {
-        let el: Element = node
+        let el: Element = node;
         if (parentID !== undefined) {
           if (this.app.sanitizer.isMaskedContainer(id)) {
             const width = el.clientWidth;
@@ -282,15 +274,7 @@ export default abstract class Observer {
             (el as HTMLElement | SVGElement).style.height = height + 'px';
           }
 
-          this.app.send(new
-            CreateElementNode(
-              id,
-              parentID,
-              index,
-              el.tagName,
-              isSVGElement(node),
-            ),
-          );
+          this.app.send(new CreateElementNode(id, parentID, index, el.tagName, isSVGElement(node)));
         }
         for (let i = 0; i < el.attributes.length; i++) {
           const attr = el.attributes[i];
@@ -335,19 +319,23 @@ export default abstract class Observer {
     }
     return (this.commited[id] = this._commitNode(id, node));
   }
-  private commitNodes(isStart: boolean = false): void {
+  private commitNodes(isStart = false): void {
     let node;
     this.recents.forEach((type, id) => {
       this.commitNode(id);
       if (type === RecentsType.New && (node = this.app.nodes.getNode(id))) {
-        this.app.nodes.callNodeCallbacks(node, isStart)
+        this.app.nodes.callNodeCallbacks(node, isStart);
       }
-    })
+    });
     this.clear();
   }
 
   // ISSSUE
-  protected observeRoot(node: Node, beforeCommit: (id?: number) => unknown, nodeToBind: Node = node) {
+  protected observeRoot(
+    node: Node,
+    beforeCommit: (id?: number) => unknown,
+    nodeToBind: Node = node,
+  ) {
     this.observer.observe(node, {
       childList: true,
       attributes: true,
@@ -357,8 +345,8 @@ export default abstract class Observer {
       characterDataOldValue: false,
     });
     this.bindTree(nodeToBind);
-    beforeCommit(this.app.nodes.getID(node))
-    this.commitNodes(true)
+    beforeCommit(this.app.nodes.getID(node));
+    this.commitNodes(true);
   }
 
   disconnect(): void {
diff --git a/tracker/tracker/src/main/app/observer/shadow_root_observer.ts b/tracker/tracker/src/main/app/observer/shadow_root_observer.ts
index ea37bb30f..f6059e2f5 100644
--- a/tracker/tracker/src/main/app/observer/shadow_root_observer.ts
+++ b/tracker/tracker/src/main/app/observer/shadow_root_observer.ts
@@ -1,18 +1,19 @@
-import Observer from "./observer.js";
-import { CreateIFrameDocument } from "../../../common/messages.js";
+import Observer from './observer.js';
+import { CreateIFrameDocument } from '../../../common/messages.js';
 
 export default class ShadowRootObserver extends Observer {
   observe(el: Element) {
     const shRoot = el.shadowRoot;
     const hostID = this.app.nodes.getID(el);
-    if (!shRoot || hostID === undefined) { return } // log
+    if (!shRoot || hostID === undefined) {
+      return;
+    } // log
     this.observeRoot(shRoot, (rootID) => {
       if (rootID === undefined) {
-        console.log("OpenReplay: Shadow Root was not bound")
+        console.log('OpenReplay: Shadow Root was not bound');
         return;
       }
-      this.app.send(CreateIFrameDocument(hostID,rootID));
+      this.app.send(CreateIFrameDocument(hostID, rootID));
     });
   }
-
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/src/main/app/observer/top_observer.ts b/tracker/tracker/src/main/app/observer/top_observer.ts
index 469ad2388..cc921967f 100644
--- a/tracker/tracker/src/main/app/observer/top_observer.ts
+++ b/tracker/tracker/src/main/app/observer/top_observer.ts
@@ -1,101 +1,112 @@
-import Observer from "./observer.js";
-import { 
-  isElementNode,
-  hasTag,
-} from "../guards.js";
+import Observer from './observer.js';
+import { isElementNode, hasTag } from '../guards.js';
 
-import IFrameObserver from "./iframe_observer.js";
-import ShadowRootObserver from "./shadow_root_observer.js";
+import IFrameObserver from './iframe_observer.js';
+import ShadowRootObserver from './shadow_root_observer.js';
 
-import { CreateDocument } from "../../../common/messages.js";
-import App from "../index.js";
-import { IN_BROWSER, hasOpenreplayAttribute } from '../../utils.js'
+import { CreateDocument } from '../../../common/messages.js';
+import App from '../index.js';
+import { IN_BROWSER, hasOpenreplayAttribute } from '../../utils.js';
 
 export interface Options {
-  captureIFrames: boolean
+  captureIFrames: boolean;
 }
 
-const attachShadowNativeFn = IN_BROWSER ? Element.prototype.attachShadow : ()=>new ShadowRoot();
+const attachShadowNativeFn = IN_BROWSER ? Element.prototype.attachShadow : () => new ShadowRoot();
 
-export default class TopObserver extends Observer { 
+export default class TopObserver extends Observer {
   private readonly options: Options;
   constructor(app: App, options: Partial<Options>) {
     super(app, true);
-    this.options = Object.assign({
-      captureIFrames: true
-    }, options);
+    this.options = Object.assign(
+      {
+        captureIFrames: true,
+      },
+      options,
+    );
 
     // IFrames
-    this.app.nodes.attachNodeCallback(node => {
-      if (hasTag(node, "IFRAME") && 
-         ((this.options.captureIFrames && !hasOpenreplayAttribute(node, "obscured")) 
-           || hasOpenreplayAttribute(node, "capture"))
+    this.app.nodes.attachNodeCallback((node) => {
+      if (
+        hasTag(node, 'IFRAME') &&
+        ((this.options.captureIFrames && !hasOpenreplayAttribute(node, 'obscured')) ||
+          hasOpenreplayAttribute(node, 'capture'))
       ) {
-        this.handleIframe(node)
+        this.handleIframe(node);
       }
-    })
+    });
 
     // ShadowDOM
-    this.app.nodes.attachNodeCallback(node => {
+    this.app.nodes.attachNodeCallback((node) => {
       if (isElementNode(node) && node.shadowRoot !== null) {
-        this.handleShadowRoot(node.shadowRoot)
+        this.handleShadowRoot(node.shadowRoot);
       }
-    })
+    });
   }
 
-
   private iframeObservers: IFrameObserver[] = [];
   private handleIframe(iframe: HTMLIFrameElement): void {
-    let doc: Document | null = null
+    let doc: Document | null = null;
     const handle = this.app.safe(() => {
-      const id = this.app.nodes.getID(iframe)
-      if (id === undefined) { return } //log
-      if (iframe.contentDocument === doc) { return } // How frequently can it happen?
-      doc = iframe.contentDocument
-      if (!doc || !iframe.contentWindow) { return }
-      const observer = new IFrameObserver(this.app)
+      const id = this.app.nodes.getID(iframe);
+      if (id === undefined) {
+        return;
+      } //log
+      if (iframe.contentDocument === doc) {
+        return;
+      } // How frequently can it happen?
+      doc = iframe.contentDocument;
+      if (!doc || !iframe.contentWindow) {
+        return;
+      }
+      const observer = new IFrameObserver(this.app);
 
-      this.iframeObservers.push(observer)
-      observer.observe(iframe)
-    })
-    iframe.addEventListener("load", handle) // why app.attachEventListener not working?
-    handle()
+      this.iframeObservers.push(observer);
+      observer.observe(iframe);
+    });
+    iframe.addEventListener('load', handle); // why app.attachEventListener not working?
+    handle();
   }
 
-  private shadowRootObservers: ShadowRootObserver[] = []
+  private shadowRootObservers: ShadowRootObserver[] = [];
   private handleShadowRoot(shRoot: ShadowRoot) {
-    const observer = new ShadowRootObserver(this.app)
-    this.shadowRootObservers.push(observer)
-    observer.observe(shRoot.host)
+    const observer = new ShadowRootObserver(this.app);
+    this.shadowRootObservers.push(observer);
+    observer.observe(shRoot.host);
   }
 
   observe(): void {
     // Protection from several subsequent calls?
+
     const observer = this;
-    Element.prototype.attachShadow = function() {
-      const shadow = attachShadowNativeFn.apply(this, arguments)
-      observer.handleShadowRoot(shadow)
-      return shadow
-    }
+    Element.prototype.attachShadow = function () {
+      // eslint-disable-next-line
+      const shadow = attachShadowNativeFn.apply(this, arguments);
+      observer.handleShadowRoot(shadow);
+      return shadow;
+    };
 
     // Can observe documentElement (<html>) here, because it is not supposed to be changing.
     // However, it is possible in some exotic cases and may cause an ignorance of the newly created <html>
-    // In this case context.document have to be observed, but this will cause 
-    // the change in the re-player behaviour caused by CreateDocument message: 
+    // In this case context.document have to be observed, but this will cause
+    // the change in the re-player behaviour caused by CreateDocument message:
     //   the 0-node ("fRoot") will become #document rather than documentElement as it is now.
     // Alternatively - observe(#document) then bindNode(documentElement)
-    this.observeRoot(window.document, () => {
-      this.app.send(new CreateDocument())
-    }, window.document.documentElement);
+    this.observeRoot(
+      window.document,
+      () => {
+        this.app.send(new CreateDocument());
+      },
+      window.document.documentElement,
+    );
   }
 
   disconnect() {
-    Element.prototype.attachShadow = attachShadowNativeFn
-    this.iframeObservers.forEach(o => o.disconnect())
-    this.iframeObservers = []
-    this.shadowRootObservers.forEach(o => o.disconnect())
-    this.shadowRootObservers = []
-    super.disconnect()
+    Element.prototype.attachShadow = attachShadowNativeFn;
+    this.iframeObservers.forEach((o) => o.disconnect());
+    this.iframeObservers = [];
+    this.shadowRootObservers.forEach((o) => o.disconnect());
+    this.shadowRootObservers = [];
+    super.disconnect();
   }
-
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/src/main/app/sanitizer.ts b/tracker/tracker/src/main/app/sanitizer.ts
index d870cfaca..358913f93 100644
--- a/tracker/tracker/src/main/app/sanitizer.ts
+++ b/tracker/tracker/src/main/app/sanitizer.ts
@@ -1,6 +1,6 @@
-import type App from "./index.js";
-import { stars, hasOpenreplayAttribute } from "../utils.js";
-import { isElementNode } from "./guards.js";
+import type App from './index.js';
+import { stars, hasOpenreplayAttribute } from '../utils.js';
+import { isElementNode } from './guards.js';
 
 export interface Options {
   obscureTextEmails: boolean;
@@ -13,36 +13,39 @@ export default class Sanitizer {
   private readonly options: Options;
 
   constructor(private readonly app: App, options: Partial<Options>) {
-    this.options = Object.assign({
-      obscureTextEmails: true,
-      obscureTextNumbers: false,
-    }, options);
+    this.options = Object.assign(
+      {
+        obscureTextEmails: true,
+        obscureTextNumbers: false,
+      },
+      options,
+    );
   }
 
   handleNode(id: number, parentID: number, node: Node) {
     if (
-        this.masked.has(parentID) ||
-        (isElementNode(node) &&
-          hasOpenreplayAttribute(node, 'masked'))
-      ) {
-        this.masked.add(id);
-      }
-      if (
-          this.maskedContainers.has(parentID) ||
-          (isElementNode(node) && 
-            hasOpenreplayAttribute(node, 'htmlmasked'))
-        ) {
-        this.maskedContainers.add(id);
-      }
+      this.masked.has(parentID) ||
+      (isElementNode(node) && hasOpenreplayAttribute(node, 'masked'))
+    ) {
+      this.masked.add(id);
+    }
+    if (
+      this.maskedContainers.has(parentID) ||
+      (isElementNode(node) && hasOpenreplayAttribute(node, 'htmlmasked'))
+    ) {
+      this.maskedContainers.add(id);
+    }
   }
 
   sanitize(id: number, data: string): string {
     if (this.masked.has(id)) {
       // TODO: is it the best place to put trim() ? Might trimmed spaces be considered in layout in certain cases?
-      return data.trim().replace(
-        /[^\f\n\r\t\v\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/g,
-        '█',
-      );
+      return data
+        .trim()
+        .replace(
+          /[^\f\n\r\t\v\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/g,
+          '█',
+        );
     }
     if (this.options.obscureTextNumbers) {
       data = data.replace(/\d/g, '0');
@@ -50,11 +53,10 @@ export default class Sanitizer {
     if (this.options.obscureTextEmails) {
       data = data.replace(
         /([^\s]+)@([^\s]+)\.([^\s]+)/g,
-        (...f: Array<string>) =>
-          stars(f[1]) + '@' + stars(f[2]) + '.' + stars(f[3]),
+        (...f: Array<string>) => stars(f[1]) + '@' + stars(f[2]) + '.' + stars(f[3]),
       );
     }
-    return data
+    return data;
   }
 
   isMasked(id: number): boolean {
@@ -65,15 +67,15 @@ export default class Sanitizer {
   }
 
   getInnerTextSecure(el: HTMLElement): string {
-    const id = this.app.nodes.getID(el)
-    if (!id) { return '' }
-    return this.sanitize(id, el.innerText)
-
+    const id = this.app.nodes.getID(el);
+    if (!id) {
+      return '';
+    }
+    return this.sanitize(id, el.innerText);
   }
 
   clear(): void {
     this.masked.clear();
     this.maskedContainers.clear();
   }
-
 }
diff --git a/tracker/tracker/src/main/app/session.ts b/tracker/tracker/src/main/app/session.ts
index d7815309a..938883359 100644
--- a/tracker/tracker/src/main/app/session.ts
+++ b/tracker/tracker/src/main/app/session.ts
@@ -1,54 +1,52 @@
-import { UserID, UserAnonymousID, Metadata } from "../../common/messages.js";
-
+import { UserID, UserAnonymousID, Metadata } from '../../common/messages.js';
 
 interface SessionInfo {
-  sessionID: string | null,
-  metadata: Record<string, string>,
-  userID: string | null,
+  sessionID: string | null;
+  metadata: Record<string, string>;
+  userID: string | null;
 }
-type OnUpdateCallback = (i: Partial<SessionInfo>) => void
-
+type OnUpdateCallback = (i: Partial<SessionInfo>) => void;
 
 export default class Session {
-  private metadata: Record<string, string> = {}
-  private userID: string | null = null
-  private sessionID: string | null = null
-  private callbacks: OnUpdateCallback[] = []
-
+  private metadata: Record<string, string> = {};
+  private userID: string | null = null;
+  private sessionID: string | null = null;
+  private readonly callbacks: OnUpdateCallback[] = [];
 
   attachUpdateCallback(cb: OnUpdateCallback) {
-    this.callbacks.push(cb)
+    this.callbacks.push(cb);
   }
   private handleUpdate(newInfo: Partial<SessionInfo>) {
     if (newInfo.userID == null) {
-      delete newInfo.userID
+      delete newInfo.userID;
     }
     if (newInfo.sessionID == null) {
-      delete newInfo.sessionID
+      delete newInfo.sessionID;
     }
-    this.callbacks.forEach(cb => cb(newInfo))
+    this.callbacks.forEach((cb) => cb(newInfo));
   }
 
   update(newInfo: Partial<SessionInfo>) {
-    if (newInfo.userID !== undefined) { // TODO clear nullable/undefinable types
-      this.userID = newInfo.userID
+    if (newInfo.userID !== undefined) {
+      // TODO clear nullable/undefinable types
+      this.userID = newInfo.userID;
     }
     if (newInfo.metadata !== undefined) {
-      Object.entries(newInfo.metadata).forEach(([k,v]) => this.metadata[k] = v)
+      Object.entries(newInfo.metadata).forEach(([k, v]) => (this.metadata[k] = v));
     }
     if (newInfo.sessionID !== undefined) {
-      this.sessionID = newInfo.sessionID 
+      this.sessionID = newInfo.sessionID;
     }
-    this.handleUpdate(newInfo)
+    this.handleUpdate(newInfo);
   }
 
   setMetadata(key: string, value: string) {
-    this.metadata[key] = value
-    this.handleUpdate({ metadata: { [key]: value } })
+    this.metadata[key] = value;
+    this.handleUpdate({ metadata: { [key]: value } });
   }
   setUserID(userID: string) {
-    this.userID = userID
-    this.handleUpdate({ userID })
+    this.userID = userID;
+    this.handleUpdate({ userID });
   }
 
   getInfo(): SessionInfo {
@@ -56,12 +54,12 @@ export default class Session {
       sessionID: this.sessionID,
       metadata: this.metadata,
       userID: this.userID,
-    }
+    };
   }
 
   reset(): void {
-    this.metadata = {}
-    this.userID = null
-    this.sessionID = null
+    this.metadata = {};
+    this.userID = null;
+    this.sessionID = null;
   }
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/src/main/app/ticker.ts b/tracker/tracker/src/main/app/ticker.ts
index 2a4ee52f7..81bf7b6a8 100644
--- a/tracker/tracker/src/main/app/ticker.ts
+++ b/tracker/tracker/src/main/app/ticker.ts
@@ -1,4 +1,4 @@
-import App from "./index.js";
+import App from './index.js';
 
 type Callback = () => void;
 function wrap(callback: Callback, n: number): Callback {
diff --git a/tracker/tracker/src/main/index.ts b/tracker/tracker/src/main/index.ts
index b5b991bf7..310545dd9 100644
--- a/tracker/tracker/src/main/index.ts
+++ b/tracker/tracker/src/main/index.ts
@@ -1,30 +1,39 @@
-import App, { DEFAULT_INGEST_POINT } from "./app/index.js";
+import App, { DEFAULT_INGEST_POINT } from './app/index.js';
 export { default as App } from './app/index.js';
 
-import { UserID, UserAnonymousID, Metadata, RawCustomEvent, CustomIssue } from "../common/messages.js";
-import * as _Messages from "../common/messages.js";
+import {
+  UserID,
+  UserAnonymousID,
+  Metadata,
+  RawCustomEvent,
+  CustomIssue,
+} from '../common/messages.js';
+import * as _Messages from '../common/messages.js';
 export const Messages = _Messages;
 
-import Connection from "./modules/connection.js";
-import Console from "./modules/console.js";
-import Exception, { getExceptionMessageFromEvent, getExceptionMessage } from "./modules/exception.js";
-import Img from "./modules/img.js";
-import Input from "./modules/input.js";
-import Mouse from "./modules/mouse.js";
-import Timing from "./modules/timing.js";
-import Performance from "./modules/performance.js";
-import Scroll from "./modules/scroll.js";
-import Viewport from "./modules/viewport.js";
-import CSSRules from "./modules/cssrules.js";
-import { IN_BROWSER, deprecationWarn, DOCS_HOST } from "./utils.js";
+import Connection from './modules/connection.js';
+import Console from './modules/console.js';
+import Exception, {
+  getExceptionMessageFromEvent,
+  getExceptionMessage,
+} from './modules/exception.js';
+import Img from './modules/img.js';
+import Input from './modules/input.js';
+import Mouse from './modules/mouse.js';
+import Timing from './modules/timing.js';
+import Performance from './modules/performance.js';
+import Scroll from './modules/scroll.js';
+import Viewport from './modules/viewport.js';
+import CSSRules from './modules/cssrules.js';
+import { IN_BROWSER, deprecationWarn, DOCS_HOST } from './utils.js';
 
-import type { Options as AppOptions } from "./app/index.js";
-import type { Options as ConsoleOptions } from "./modules/console.js";
-import type { Options as ExceptionOptions } from "./modules/exception.js";
-import type { Options as InputOptions } from "./modules/input.js";
-import type { Options as PerformanceOptions } from "./modules/performance.js";
-import type { Options as TimingOptions } from "./modules/timing.js";
-import type { StartOptions } from './app/index.js'
+import type { Options as AppOptions } from './app/index.js';
+import type { Options as ConsoleOptions } from './modules/console.js';
+import type { Options as ExceptionOptions } from './modules/exception.js';
+import type { Options as InputOptions } from './modules/input.js';
+import type { Options as PerformanceOptions } from './modules/performance.js';
+import type { Options as TimingOptions } from './modules/timing.js';
+import type { StartOptions } from './app/index.js';
 //TODO: unique options init
 import type { StartPromiseReturn } from './app/index.js';
 
@@ -44,25 +53,32 @@ const DOCS_SETUP = '/installation/setup-or';
 
 function processOptions(obj: any): obj is Options {
   if (obj == null) {
-    console.error(`OpenReplay: invalid options argument type. Please, check documentation on ${DOCS_HOST}${DOCS_SETUP}`);
+    console.error(
+      `OpenReplay: invalid options argument type. Please, check documentation on ${DOCS_HOST}${DOCS_SETUP}`,
+    );
     return false;
   }
   if (typeof obj.projectKey !== 'string') {
     if (typeof obj.projectKey !== 'number') {
-      if (typeof obj.projectID !== 'number') { // Back compatability
-        console.error(`OpenReplay: projectKey is missing or wrong type (string is expected). Please, check ${DOCS_HOST}${DOCS_SETUP} for more information.`)
-        return false
+      if (typeof obj.projectID !== 'number') {
+        // Back compatability
+        console.error(
+          `OpenReplay: projectKey is missing or wrong type (string is expected). Please, check ${DOCS_HOST}${DOCS_SETUP} for more information.`,
+        );
+        return false;
       } else {
         obj.projectKey = obj.projectID.toString();
-        deprecationWarn("`projectID` option", "`projectKey` option", DOCS_SETUP)
+        deprecationWarn('`projectID` option', '`projectKey` option', DOCS_SETUP);
       }
     } else {
-      console.warn("OpenReplay: projectKey is expected to have a string type.")
-      obj.projectKey = obj.projectKey.toString()
+      console.warn('OpenReplay: projectKey is expected to have a string type.');
+      obj.projectKey = obj.projectKey.toString();
     }
   }
   if (typeof obj.sessionToken !== 'string' && obj.sessionToken != null) {
-    console.warn(`OpenReplay: invalid options argument type. Please, check documentation on ${DOCS_HOST}${DOCS_SETUP}`)
+    console.warn(
+      `OpenReplay: invalid options argument type. Please, check documentation on ${DOCS_HOST}${DOCS_SETUP}`,
+    );
   }
   return true;
 }
@@ -74,18 +90,22 @@ export default class API {
       return;
     }
     if ((window as any).__OPENREPLAY__) {
-      console.error("OpenReplay: one tracker instance has been initialised already")
-      return
-    }
-    if (!options.__DISABLE_SECURE_MODE && location.protocol !== 'https:') {
-      console.error("OpenReplay: Your website must be publicly accessible and running on SSL in order for OpenReplay to properly capture and replay the user session. You can disable this check by setting `__DISABLE_SECURE_MODE` option to `true` if you are testing in localhost. Keep in mind, that asset files on a local machine are not available to the outside world. This might affect tracking if you use css files.")
+      console.error('OpenReplay: one tracker instance has been initialised already');
       return;
     }
-    const doNotTrack = options.respectDoNotTrack && 
-      (navigator.doNotTrack == '1' 
+    if (!options.__DISABLE_SECURE_MODE && location.protocol !== 'https:') {
+      console.error(
+        'OpenReplay: Your website must be publicly accessible and running on SSL in order for OpenReplay to properly capture and replay the user session. You can disable this check by setting `__DISABLE_SECURE_MODE` option to `true` if you are testing in localhost. Keep in mind, that asset files on a local machine are not available to the outside world. This might affect tracking if you use css files.',
+      );
+      return;
+    }
+    const doNotTrack =
+      options.respectDoNotTrack &&
+      (navigator.doNotTrack == '1' ||
         // @ts-ignore
-        || window.doNotTrack == '1');
-    const app = this.app = doNotTrack ||
+        window.doNotTrack == '1');
+    const app = (this.app =
+      doNotTrack ||
       !('Map' in window) ||
       !('Set' in window) ||
       !('MutationObserver' in window) ||
@@ -95,7 +115,7 @@ export default class API {
       !('Blob' in window) ||
       !('Worker' in window)
         ? null
-        : new App(options.projectKey, options.sessionToken, options);
+        : new App(options.projectKey, options.sessionToken, options));
     if (app !== null) {
       Viewport(app);
       CSSRules(app);
@@ -114,29 +134,33 @@ export default class API {
         const wOpen = window.open;
         app.attachStartCallback(() => {
           // @ts-ignore ?
-          window.open = function(...args) {
-            app.resetNextPageSession(true)
-            wOpen.call(window, ...args)
-            app.resetNextPageSession(false)
-          }
-        })
+          window.open = function (...args) {
+            app.resetNextPageSession(true);
+            wOpen.call(window, ...args);
+            app.resetNextPageSession(false);
+          };
+        });
         app.attachStopCallback(() => {
           window.open = wOpen;
-        })
+        });
       }
     } else {
-      console.log("OpenReplay: browser doesn't support API required for tracking or doNotTrack is set to 1.")
+      console.log(
+        "OpenReplay: browser doesn't support API required for tracking or doNotTrack is set to 1.",
+      );
       const req = new XMLHttpRequest();
       const orig = options.ingestPoint || DEFAULT_INGEST_POINT;
-      req.open("POST", orig + "/v1/web/not-started");
+      req.open('POST', orig + '/v1/web/not-started');
       // no-cors issue only with text/plain or not-set Content-Type
       // req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-      req.send(JSON.stringify({
-        trackerVersion: 'TRACKER_VERSION',
-        projectKey: options.projectKey,
-        doNotTrack,
-        // TODO: add precise reason (an exact API missing)
-      }));
+      req.send(
+        JSON.stringify({
+          trackerVersion: 'TRACKER_VERSION',
+          projectKey: options.projectKey,
+          doNotTrack,
+          // TODO: add precise reason (an exact API missing)
+        }),
+      );
     }
   }
 
@@ -151,10 +175,12 @@ export default class API {
     return this.app.active();
   }
 
-  start(startOpts?: Partial<StartOptions>) : Promise<StartPromiseReturn> {
+  start(startOpts?: Partial<StartOptions>): Promise<StartPromiseReturn> {
     if (!IN_BROWSER) {
-      console.error(`OpenReplay: you are trying to start Tracker on a node.js environment. If you want to use OpenReplay with SSR, please, use componentDidMount or useEffect API for placing the \`tracker.start()\` line. Check documentation on ${DOCS_HOST}${DOCS_SETUP}`)
-      return Promise.reject("Trying to start not in browser.");
+      console.error(
+        `OpenReplay: you are trying to start Tracker on a node.js environment. If you want to use OpenReplay with SSR, please, use componentDidMount or useEffect API for placing the \`tracker.start()\` line. Check documentation on ${DOCS_HOST}${DOCS_SETUP}`,
+      );
+      return Promise.reject('Trying to start not in browser.');
     }
     if (this.app === null) {
       return Promise.reject("Browser doesn't support required api, or doNotTrack is active.");
@@ -182,7 +208,7 @@ export default class API {
     return this.app.getSessionID();
   }
   sessionID(): string | null | undefined {
-    deprecationWarn("'sessionID' method", "'getSessionID' method", "/");
+    deprecationWarn("'sessionID' method", "'getSessionID' method", '/');
     return this.getSessionID();
   }
 
@@ -192,7 +218,7 @@ export default class API {
     }
   }
   userID(id: string): void {
-    deprecationWarn("'userID' method", "'setUserID' method", "/");
+    deprecationWarn("'userID' method", "'setUserID' method", '/');
     this.setUserID(id);
   }
 
@@ -202,25 +228,21 @@ export default class API {
     }
   }
   userAnonymousID(id: string): void {
-    deprecationWarn("'userAnonymousID' method", "'setUserAnonymousID' method", "/")
+    deprecationWarn("'userAnonymousID' method", "'setUserAnonymousID' method", '/');
     this.setUserAnonymousID(id);
   }
 
   setMetadata(key: string, value: string): void {
-    if (
-      typeof key === 'string' &&
-      typeof value === 'string' &&
-      this.app !== null
-    ) {
+    if (typeof key === 'string' && typeof value === 'string' && this.app !== null) {
       this.app.session.setMetadata(key, value);
     }
   }
   metadata(key: string, value: string): void {
-    deprecationWarn("'metadata' method", "'setMetadata' method", "/")
+    deprecationWarn("'metadata' method", "'setMetadata' method", '/');
     this.setMetadata(key, value);
   }
 
-  event(key: string, payload: any, issue: boolean = false): void {
+  event(key: string, payload: any, issue = false): void {
     if (typeof key === 'string' && this.app !== null) {
       if (issue) {
         return this.issue(key, payload);
@@ -247,10 +269,13 @@ export default class API {
   }
 
   handleError = (e: Error | ErrorEvent | PromiseRejectionEvent) => {
-    if (this.app === null) { return; }
+    if (this.app === null) {
+      return;
+    }
     if (e instanceof Error) {
       this.app.send(getExceptionMessage(e, []));
-    } else if (e instanceof ErrorEvent ||
+    } else if (
+      e instanceof ErrorEvent ||
       ('PromiseRejectionEvent' in window && e instanceof PromiseRejectionEvent)
     ) {
       const msg = getExceptionMessageFromEvent(e);
@@ -258,5 +283,5 @@ export default class API {
         this.app.send(msg);
       }
     }
-  }
+  };
 }
diff --git a/tracker/tracker/src/main/modules/connection.ts b/tracker/tracker/src/main/modules/connection.ts
index 72ef972f7..ecf9e9fe9 100644
--- a/tracker/tracker/src/main/modules/connection.ts
+++ b/tracker/tracker/src/main/modules/connection.ts
@@ -1,13 +1,13 @@
-import App from "../app/index.js";
-import { ConnectionInformation } from "../../common/messages.js";
+import App from '../app/index.js';
+import { ConnectionInformation } from '../../common/messages.js';
 
-export default function(app: App): void {
+export default function (app: App): void {
   const connection:
     | {
-      downlink: number;
-      type?: string;
-      addEventListener: (type: 'change', cb: () => void) => void;
-    }
+        downlink: number;
+        type?: string;
+        addEventListener: (type: 'change', cb: () => void) => void;
+      }
     | undefined =
     (navigator as any).connection ||
     (navigator as any).mozConnection ||
diff --git a/tracker/tracker/src/main/modules/console.ts b/tracker/tracker/src/main/modules/console.ts
index 40925c83c..33ad34957 100644
--- a/tracker/tracker/src/main/modules/console.ts
+++ b/tracker/tracker/src/main/modules/console.ts
@@ -1,7 +1,7 @@
-import type App from "../app/index.js";
-import { hasTag } from "../app/guards.js";
-import { IN_BROWSER } from "../utils.js";
-import { ConsoleLog } from "../../common/messages.js";
+import type App from '../app/index.js';
+import { hasTag } from '../app/guards.js';
+import { IN_BROWSER } from '../utils.js';
+import { ConsoleLog } from '../../common/messages.js';
 
 const printError: (e: Error) => string =
   IN_BROWSER && 'InstallTrigger' in window // detect Firefox
@@ -104,10 +104,7 @@ export default function (app: App, opts: Partial<Options>): void {
     },
     opts,
   );
-  if (
-    !Array.isArray(options.consoleMethods) ||
-    options.consoleMethods.length === 0
-  ) {
+  if (!Array.isArray(options.consoleMethods) || options.consoleMethods.length === 0) {
     return;
   }
 
@@ -139,18 +136,21 @@ export default function (app: App, opts: Partial<Options>): void {
     });
   patchConsole(window.console);
 
-  app.nodes.attachNodeCallback(app.safe(node => {
-    if (hasTag(node, "IFRAME")) { // TODO: newContextCallback
-      let context = node.contentWindow
-      if (context) {
-        patchConsole((context as (Window & typeof globalThis)).console)
-      }
-      app.attachEventListener(node, "load", () => {
-        if (node.contentWindow !== context) {
-          context = node.contentWindow
-          patchConsole((context as (Window & typeof globalThis)).console)
+  app.nodes.attachNodeCallback(
+    app.safe((node) => {
+      if (hasTag(node, 'IFRAME')) {
+        // TODO: newContextCallback
+        let context = node.contentWindow;
+        if (context) {
+          patchConsole((context as Window & typeof globalThis).console);
         }
-      })
-    }
-  }))
+        app.attachEventListener(node, 'load', () => {
+          if (node.contentWindow !== context) {
+            context = node.contentWindow;
+            patchConsole((context as Window & typeof globalThis).console);
+          }
+        });
+      }
+    }),
+  );
 }
diff --git a/tracker/tracker/src/main/modules/cssrules.ts b/tracker/tracker/src/main/modules/cssrules.ts
index 5007bbd26..53c805722 100644
--- a/tracker/tracker/src/main/modules/cssrules.ts
+++ b/tracker/tracker/src/main/modules/cssrules.ts
@@ -1,57 +1,53 @@
-import type App from "../app/index.js";
-import { CSSInsertRuleURLBased, CSSDeleteRule, TechnicalInfo } from "../../common/messages.js";
-import { hasTag } from "../app/guards.js";
+import type App from '../app/index.js';
+import { CSSInsertRuleURLBased, CSSDeleteRule, TechnicalInfo } from '../../common/messages.js';
+import { hasTag } from '../app/guards.js';
 
-
-export default function(app: App | null) {
+export default function (app: App | null) {
   if (app === null) {
     return;
   }
   if (!window.CSSStyleSheet) {
-    app.send(new  TechnicalInfo("no_stylesheet_prototype_in_window", ""))
+    app.send(new TechnicalInfo('no_stylesheet_prototype_in_window', ''));
     return;
   }
 
-  const processOperation = app.safe(
-    (stylesheet: CSSStyleSheet, index: number, rule?: string) => {
-      const sendMessage = typeof rule === 'string' 
-        ? (nodeID: number) => app.send(new CSSInsertRuleURLBased(nodeID, rule, index, app.getBaseHref()))
+  const processOperation = app.safe((stylesheet: CSSStyleSheet, index: number, rule?: string) => {
+    const sendMessage =
+      typeof rule === 'string'
+        ? (nodeID: number) =>
+            app.send(new CSSInsertRuleURLBased(nodeID, rule, index, app.getBaseHref()))
         : (nodeID: number) => app.send(new CSSDeleteRule(nodeID, index));
-      // TODO: Extend messages to maintain nested rules (CSSGroupingRule prototype, as well as CSSKeyframesRule)
-      if (stylesheet.ownerNode == null) { 
-        throw new Error("Owner Node not found");
-      }
-      const nodeID = app.nodes.getID(stylesheet.ownerNode);
-      if (nodeID !== undefined) {
-        sendMessage(nodeID);
-      } // else error?
+    // TODO: Extend messages to maintain nested rules (CSSGroupingRule prototype, as well as CSSKeyframesRule)
+    if (stylesheet.ownerNode == null) {
+      throw new Error('Owner Node not found');
     }
-  )
+    const nodeID = app.nodes.getID(stylesheet.ownerNode);
+    if (nodeID !== undefined) {
+      sendMessage(nodeID);
+    } // else error?
+  });
 
   const { insertRule, deleteRule } = CSSStyleSheet.prototype;
 
-  CSSStyleSheet.prototype.insertRule = function(
-    rule: string,
-    index: number = 0,
-  ) {
+  CSSStyleSheet.prototype.insertRule = function (rule: string, index = 0) {
     processOperation(this, index, rule);
     return insertRule.call(this, rule, index);
   };
-  CSSStyleSheet.prototype.deleteRule = function(index: number) {
+  CSSStyleSheet.prototype.deleteRule = function (index: number) {
     processOperation(this, index);
     return deleteRule.call(this, index);
   };
 
   app.nodes.attachNodeCallback((node: Node): void => {
-    if (!hasTag(node, "STYLE") || !node.sheet) {
+    if (!hasTag(node, 'STYLE') || !node.sheet) {
       return;
     }
     if (node.textContent !== null && node.textContent.trim().length > 0) {
       return; // Only fully virtual sheets maintained so far
-    } 
+    }
     const rules = node.sheet.cssRules;
     for (let i = 0; i < rules.length; i++) {
-      processOperation(node.sheet, i, rules[i].cssText)
+      processOperation(node.sheet, i, rules[i].cssText);
     }
   });
 }
diff --git a/tracker/tracker/src/main/modules/exception.ts b/tracker/tracker/src/main/modules/exception.ts
index 03dc84d72..2cb66885e 100644
--- a/tracker/tracker/src/main/modules/exception.ts
+++ b/tracker/tracker/src/main/modules/exception.ts
@@ -1,6 +1,6 @@
-import type App from "../app/index.js";
-import type Message from "../../common/messages.js";
-import { JSException } from "../../common/messages.js";
+import type App from '../app/index.js';
+import type Message from '../../common/messages.js';
+import { JSException } from '../../common/messages.js';
 import ErrorStackParser from 'error-stack-parser';
 
 export interface Options {
@@ -8,53 +8,56 @@ export interface Options {
 }
 
 interface StackFrame {
-  columnNumber?: number,
-  lineNumber?: number,
-  fileName?: string,
-  functionName?: string,
-  source?: string,
+  columnNumber?: number;
+  lineNumber?: number;
+  fileName?: string;
+  functionName?: string;
+  source?: string;
 }
 
 function getDefaultStack(e: ErrorEvent): Array<StackFrame> {
-  return [{
-    columnNumber: e.colno,
-    lineNumber: e.lineno,
-    fileName: e.filename,
-    functionName: "",
-    source: "",
-  }];
+  return [
+    {
+      columnNumber: e.colno,
+      lineNumber: e.lineno,
+      fileName: e.filename,
+      functionName: '',
+      source: '',
+    },
+  ];
 }
 
 export function getExceptionMessage(error: Error, fallbackStack: Array<StackFrame>): Message {
   let stack = fallbackStack;
   try {
     stack = ErrorStackParser.parse(error);
-  } catch (e) {
-  }
+  } catch (e) {}
   return new JSException(error.name, error.message, JSON.stringify(stack));
 }
 
-export function getExceptionMessageFromEvent(e: ErrorEvent | PromiseRejectionEvent): Message | null {
+export function getExceptionMessageFromEvent(
+  e: ErrorEvent | PromiseRejectionEvent,
+): Message | null {
   if (e instanceof ErrorEvent) {
     if (e.error instanceof Error) {
-      return getExceptionMessage(e.error, getDefaultStack(e))
+      return getExceptionMessage(e.error, getDefaultStack(e));
     } else {
       let [name, message] = e.message.split(':');
       if (!message) {
         name = 'Error';
-        message = e.message
+        message = e.message;
       }
       return new JSException(name, message, JSON.stringify(getDefaultStack(e)));
     }
   } else if ('PromiseRejectionEvent' in window && e instanceof PromiseRejectionEvent) {
     if (e.reason instanceof Error) {
-      return getExceptionMessage(e.reason, [])
+      return getExceptionMessage(e.reason, []);
     } else {
       let message: string;
       try {
-        message = JSON.stringify(e.reason)
-      } catch(_) {
-        message = String(e.reason)
+        message = JSON.stringify(e.reason);
+      } catch (_) {
+        message = String(e.reason);
       }
       return new JSException('Unhandled Promise Rejection', message, '[]');
     }
@@ -62,7 +65,6 @@ export function getExceptionMessageFromEvent(e: ErrorEvent | PromiseRejectionEve
   return null;
 }
 
-
 export default function (app: App, opts: Partial<Options>): void {
   const options: Options = Object.assign(
     {
@@ -76,17 +78,11 @@ export default function (app: App, opts: Partial<Options>): void {
       if (msg != null) {
         app.send(msg);
       }
-    }
+    };
 
-    app.attachEventListener(
-      window,
-      'unhandledrejection',
-      (e: PromiseRejectionEvent): void => handler(e),
-    );
-    app.attachEventListener(
-      window,
-      'error',
-      (e: ErrorEvent): void => handler(e),
+    app.attachEventListener(window, 'unhandledrejection', (e: PromiseRejectionEvent): void =>
+      handler(e),
     );
+    app.attachEventListener(window, 'error', (e: ErrorEvent): void => handler(e));
   }
 }
diff --git a/tracker/tracker/src/main/modules/img.ts b/tracker/tracker/src/main/modules/img.ts
index b462f7705..f34675074 100644
--- a/tracker/tracker/src/main/modules/img.ts
+++ b/tracker/tracker/src/main/modules/img.ts
@@ -1,34 +1,38 @@
-import type App from "../app/index.js";
-import { timestamp, isURL } from "../utils.js";
-import { ResourceTiming, SetNodeAttributeURLBased, SetNodeAttribute } from "../../common/messages.js";
-import { hasTag } from "../app/guards.js";
+import type App from '../app/index.js';
+import { timestamp, isURL } from '../utils.js';
+import {
+  ResourceTiming,
+  SetNodeAttributeURLBased,
+  SetNodeAttribute,
+} from '../../common/messages.js';
+import { hasTag } from '../app/guards.js';
 
 function resolveURL(url: string, location: Location = document.location) {
-  url = url.trim()
-  if  (url.startsWith('/')) {
-    return location.origin + url
+  url = url.trim();
+  if (url.startsWith('/')) {
+    return location.origin + url;
   } else if (
     url.startsWith('http://') ||
     url.startsWith('https://') ||
     url.startsWith('data:') // any other possible value here?
-   ){
-    return url
+  ) {
+    return url;
   } else {
-   return location.origin + location.pathname + url
+    return location.origin + location.pathname + url;
   }
 }
 
-const PLACEHOLDER_SRC = "https://static.openreplay.com/tracker/placeholder.jpeg";
+const PLACEHOLDER_SRC = 'https://static.openreplay.com/tracker/placeholder.jpeg';
 
 export default function (app: App): void {
   function sendPlaceholder(id: number, node: HTMLImageElement): void {
-    app.send(new SetNodeAttribute(id, "src", PLACEHOLDER_SRC))
+    app.send(new SetNodeAttribute(id, 'src', PLACEHOLDER_SRC));
     const { width, height } = node.getBoundingClientRect();
-    if (!node.hasAttribute("width")){
-      app.send(new SetNodeAttribute(id, "width", String(width)))
+    if (!node.hasAttribute('width')) {
+      app.send(new SetNodeAttribute(id, 'width', String(width)));
     }
-    if (!node.hasAttribute("height")){
-      app.send(new SetNodeAttribute(id, "height", String(height)))
+    if (!node.hasAttribute('height')) {
+      app.send(new SetNodeAttribute(id, 'height', String(height)));
     }
   }
 
@@ -41,35 +45,38 @@ export default function (app: App): void {
     if (!complete) {
       return;
     }
-    const resolvedSrc = resolveURL(src || '') // Src type is null sometimes. - is it true?
+    const resolvedSrc = resolveURL(src || ''); // Src type is null sometimes. - is it true?
     if (naturalWidth === 0 && naturalHeight === 0) {
       if (isURL(resolvedSrc)) {
         app.send(new ResourceTiming(timestamp(), 0, 0, 0, 0, 0, resolvedSrc, 'img'));
       }
     } else if (resolvedSrc.length >= 1e5 || app.sanitizer.isMasked(id)) {
-      sendPlaceholder(id, this)
+      sendPlaceholder(id, this);
     } else {
-      app.send(new SetNodeAttribute(id, 'src', resolvedSrc))
+      app.send(new SetNodeAttribute(id, 'src', resolvedSrc));
       if (srcset) {
-        const resolvedSrcset = srcset.split(',').map(str => resolveURL(str)).join(',')
-        app.send(new SetNodeAttribute(id, 'srcset', resolvedSrcset))
+        const resolvedSrcset = srcset
+          .split(',')
+          .map((str) => resolveURL(str))
+          .join(',');
+        app.send(new SetNodeAttribute(id, 'srcset', resolvedSrcset));
       }
     }
   });
 
   const observer = new MutationObserver((mutations) => {
     for (const mutation of mutations) {
-      if (mutation.type === "attributes") {
-        const target = (mutation.target as HTMLImageElement);
+      if (mutation.type === 'attributes') {
+        const target = mutation.target as HTMLImageElement;
         const id = app.nodes.getID(target);
         if (id === undefined) {
           return;
         }
-        if (mutation.attributeName === "src") {
+        if (mutation.attributeName === 'src') {
           const src = target.src;
           app.send(new SetNodeAttributeURLBased(id, 'src', src, app.getBaseHref()));
         }
-        if (mutation.attributeName === "srcset") {
+        if (mutation.attributeName === 'srcset') {
           const srcset = target.srcset;
           app.send(new SetNodeAttribute(id, 'srcset', srcset));
         }
@@ -78,12 +85,12 @@ export default function (app: App): void {
   });
 
   app.nodes.attachNodeCallback((node: Node): void => {
-    if (!hasTag(node, "IMG")) {
+    if (!hasTag(node, 'IMG')) {
       return;
     }
     app.nodes.attachElementListener('error', node, sendImgSrc);
     app.nodes.attachElementListener('load', node, sendImgSrc);
     sendImgSrc.call(node);
-    observer.observe(node, { attributes: true, attributeFilter: [ "src", "srcset" ] });
+    observer.observe(node, { attributes: true, attributeFilter: ['src', 'srcset'] });
   });
 }
diff --git a/tracker/tracker/src/main/modules/input.ts b/tracker/tracker/src/main/modules/input.ts
index 496d642a2..4e7989ac3 100644
--- a/tracker/tracker/src/main/modules/input.ts
+++ b/tracker/tracker/src/main/modules/input.ts
@@ -1,45 +1,38 @@
-import type App from "../app/index.js";
-import {
-  normSpaces,
-  IN_BROWSER,
-  getLabelAttribute,
-  hasOpenreplayAttribute,
-} from "../utils.js";
-import { hasTag } from "../app/guards.js";
-import { SetInputTarget, SetInputValue, SetInputChecked } from "../../common/messages.js";
+import type App from '../app/index.js';
+import { normSpaces, IN_BROWSER, getLabelAttribute, hasOpenreplayAttribute } from '../utils.js';
+import { hasTag } from '../app/guards.js';
+import { SetInputTarget, SetInputValue, SetInputChecked } from '../../common/messages.js';
 
-const INPUT_TYPES = ['text', 'password', 'email', 'search', 'number', 'range', 'date']
+const INPUT_TYPES = ['text', 'password', 'email', 'search', 'number', 'range', 'date'];
 
 // TODO: take into consideration "contenteditable" attribute
-type TextEditableElement = HTMLInputElement | HTMLTextAreaElement
+type TextEditableElement = HTMLInputElement | HTMLTextAreaElement;
 function isTextEditable(node: any): node is TextEditableElement {
-  if (hasTag(node, "TEXTAREA")) {
+  if (hasTag(node, 'TEXTAREA')) {
     return true;
   }
-  if (!hasTag(node, "INPUT")) {
+  if (!hasTag(node, 'INPUT')) {
     return false;
   }
 
-  return INPUT_TYPES.includes(node.type)
+  return INPUT_TYPES.includes(node.type);
 }
 
 function isCheckable(node: any): node is HTMLInputElement {
-  if (!hasTag(node, "INPUT")) {
+  if (!hasTag(node, 'INPUT')) {
     return false;
   }
   const type = node.type;
   return type === 'checkbox' || type === 'radio';
 }
 
-const labelElementFor: (
-  element: TextEditableElement,
-) => HTMLLabelElement | undefined =
+const labelElementFor: (element: TextEditableElement) => HTMLLabelElement | undefined =
   IN_BROWSER && 'labels' in HTMLInputElement.prototype
     ? (node) => {
         let p: Node | null = node;
         while ((p = p.parentNode) !== null) {
-          if (hasTag(p, "LABEL")) {
-            return p
+          if (hasTag(p, 'LABEL')) {
+            return p;
           }
         }
         const labels = node.labels;
@@ -50,8 +43,8 @@ const labelElementFor: (
     : (node) => {
         let p: Node | null = node;
         while ((p = p.parentNode) !== null) {
-          if (hasTag(p, "LABEL")) {
-            return p as HTMLLabelElement;
+          if (hasTag(p, 'LABEL')) {
+            return p;
           }
         }
         const id = node.id;
@@ -67,12 +60,13 @@ export function getInputLabel(node: TextEditableElement): string {
   let label = getLabelAttribute(node);
   if (label === null) {
     const labelElement = labelElementFor(node);
-    label = (labelElement && labelElement.innerText)
-      || node.placeholder
-      || node.name
-      || node.id
-      || node.className
-      || node.type
+    label =
+      (labelElement && labelElement.innerText) ||
+      node.placeholder ||
+      node.name ||
+      node.id ||
+      node.className ||
+      node.type;
   }
   return normSpaces(label).slice(0, 100);
 }
@@ -116,8 +110,7 @@ export default function (app: App, opts: Partial<Options>): void {
       (inputMode === InputMode.Plain &&
         ((options.obscureInputNumbers && node.type !== 'date' && /\d\d\d\d/.test(value)) ||
           (options.obscureInputDates && node.type === 'date') ||
-          (options.obscureInputEmails &&
-            (node.type === 'email' || !!~value.indexOf('@')))))
+          (options.obscureInputEmails && (node.type === 'email' || !!~value.indexOf('@')))))
     ) {
       inputMode = InputMode.Obscured;
     }
@@ -183,11 +176,11 @@ export default function (app: App, opts: Partial<Options>): void {
         return;
       }
       // TODO: support multiple select (?): use selectedOptions; Need send target?
-      if (hasTag(node, "SELECT")) {
-        sendInputValue(id, node)
-        app.attachEventListener(node, "change", () => {
-          sendInputValue(id, node)
-        })
+      if (hasTag(node, 'SELECT')) {
+        sendInputValue(id, node);
+        app.attachEventListener(node, 'change', () => {
+          sendInputValue(id, node);
+        });
       }
       if (isTextEditable(node)) {
         inputValues.set(id, node.value);
diff --git a/tracker/tracker/src/main/modules/longtasks.ts b/tracker/tracker/src/main/modules/longtasks.ts
index 959d748f7..8ac5f789a 100644
--- a/tracker/tracker/src/main/modules/longtasks.ts
+++ b/tracker/tracker/src/main/modules/longtasks.ts
@@ -1,5 +1,5 @@
-import type App from "../app/index.js";
-import { LongTask } from "../../common/messages.js";
+import type App from '../app/index.js';
+import { LongTask } from '../../common/messages.js';
 
 // https://w3c.github.io/performance-timeline/#the-performanceentry-interface
 interface TaskAttributionTiming extends PerformanceEntry {
@@ -7,22 +7,35 @@ interface TaskAttributionTiming extends PerformanceEntry {
   readonly containerSrc: string;
   readonly containerId: string;
   readonly containerName: string;
-};
+}
 
 // https://www.w3.org/TR/longtasks/#performancelongtasktiming
 interface PerformanceLongTaskTiming extends PerformanceEntry {
   readonly attribution: ReadonlyArray<TaskAttributionTiming>;
-};
+}
 
 export default function (app: App): void {
   if (!('PerformanceObserver' in window) || !('PerformanceLongTaskTiming' in window)) {
     return;
   }
 
-  const contexts: string[] = [ "unknown", "self", "same-origin-ancestor", "same-origin-descendant", "same-origin", "cross-origin-ancestor", "cross-origin-descendant", "cross-origin-unreachable", "multiple-contexts" ];
-  const containerTypes: string[] = [ "window", "iframe", "embed", "object" ];
+  const contexts: string[] = [
+    'unknown',
+    'self',
+    'same-origin-ancestor',
+    'same-origin-descendant',
+    'same-origin',
+    'cross-origin-ancestor',
+    'cross-origin-descendant',
+    'cross-origin-unreachable',
+    'multiple-contexts',
+  ];
+  const containerTypes: string[] = ['window', 'iframe', 'embed', 'object'];
   function longTask(entry: PerformanceLongTaskTiming): void {
-    let type: string = "", src: string = "", id: string = "", name: string = "";
+    let type = '',
+      src = '',
+      id = '',
+      name = '';
     const container = entry.attribution[0];
     if (container != null) {
       type = container.containerType;
@@ -48,4 +61,4 @@ export default function (app: App): void {
     list.getEntries().forEach(longTask),
   );
   observer.observe({ entryTypes: ['longtask'] });
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/src/main/modules/mouse.ts b/tracker/tracker/src/main/modules/mouse.ts
index 09a06e0ca..c46ed84ea 100644
--- a/tracker/tracker/src/main/modules/mouse.ts
+++ b/tracker/tracker/src/main/modules/mouse.ts
@@ -1,44 +1,43 @@
-import type App from "../app/index.js";
-import { hasTag, isSVGElement } from "../app/guards.js";
-import { 
-  normSpaces,
-  hasOpenreplayAttribute,
-  getLabelAttribute,
-} from "../utils.js";
-import { MouseMove, MouseClick } from "../../common/messages.js";
-import { getInputLabel } from "./input.js";
+import type App from '../app/index.js';
+import { hasTag, isSVGElement } from '../app/guards.js';
+import { normSpaces, hasOpenreplayAttribute, getLabelAttribute } from '../utils.js';
+import { MouseMove, MouseClick } from '../../common/messages.js';
+import { getInputLabel } from './input.js';
 
 function _getSelector(target: Element): string {
-  let el: Element | null = target
-  let selector: string | null = null
+  let el: Element | null = target;
+  let selector: string | null = null;
   do {
     if (el.id) {
-      return `#${el.id}` + (selector ? ` > ${selector}` : '')
+      return `#${el.id}` + (selector ? ` > ${selector}` : '');
     }
     selector =
-      el.className.split(' ')
-        .map(cn => cn.trim())
-        .filter(cn => cn !== '')
-        .reduce((sel, cn) => `${sel}.${cn}`, el.tagName.toLowerCase()) + 
-      (selector ?  ` > ${selector}` : '');
-     if (el === document.body) {
-       return selector
-     }
-     el = el.parentElement
-  } while (el !== document.body && el !== null)
-  return selector
+      el.className
+        .split(' ')
+        .map((cn) => cn.trim())
+        .filter((cn) => cn !== '')
+        .reduce((sel, cn) => `${sel}.${cn}`, el.tagName.toLowerCase()) +
+      (selector ? ` > ${selector}` : '');
+    if (el === document.body) {
+      return selector;
+    }
+    el = el.parentElement;
+  } while (el !== document.body && el !== null);
+  return selector;
 }
 
 function isClickable(element: Element): boolean {
-  const tag = element.tagName.toUpperCase()
-  return tag === 'BUTTON' ||
+  const tag = element.tagName.toUpperCase();
+  return (
+    tag === 'BUTTON' ||
     tag === 'A' ||
     tag === 'LI' ||
     tag === 'SELECT' ||
     (element as HTMLElement).onclick != null ||
-    element.getAttribute('role') === 'button' 
-    //|| element.className.includes("btn")
-    // MBTODO: intersect addEventListener
+    element.getAttribute('role') === 'button'
+  );
+  //|| element.className.includes("btn")
+  // MBTODO: intersect addEventListener
 }
 
 //TODO: fix (typescript doesn't allow work when the guard is inside the function)
@@ -73,9 +72,7 @@ function _getTarget(target: Element): Element | null {
     if (tag === 'INPUT') {
       return element;
     }
-    if (isClickable(element) ||
-      getLabelAttribute(element) !== null
-    ) {
+    if (isClickable(element) || getLabelAttribute(element) !== null) {
       return element;
     }
     element = element.parentElement;
@@ -84,22 +81,21 @@ function _getTarget(target: Element): Element | null {
 }
 
 export default function (app: App): void {
-
   function getTargetLabel(target: Element): string {
     const dl = getLabelAttribute(target);
     if (dl !== null) {
       return dl;
     }
-    if (hasTag(target, "INPUT")) {
-      return getInputLabel(target)
+    if (hasTag(target, 'INPUT')) {
+      return getInputLabel(target);
     }
     if (isClickable(target)) {
-        let label = ''
-        if (target instanceof HTMLElement) {
-          label = app.sanitizer.getInnerTextSecure(target)
-        }
-        label = label || target.id || target.className
-      return normSpaces(label).slice(0, 100)
+      let label = '';
+      if (target instanceof HTMLElement) {
+        label = app.sanitizer.getInnerTextSecure(target);
+      }
+      label = label || target.id || target.className;
+      return normSpaces(label).slice(0, 100);
     }
     return '';
   }
@@ -124,22 +120,18 @@ export default function (app: App): void {
     }
   };
 
-  const selectorMap: {[id:number]: string} = {};
+  const selectorMap: { [id: number]: string } = {};
   function getSelector(id: number, target: Element): string {
-    return selectorMap[id] = selectorMap[id] || _getSelector(target);
+    return (selectorMap[id] = selectorMap[id] || _getSelector(target));
   }
 
-  app.attachEventListener(
-    document.documentElement,
-    'mouseover',
-    (e: MouseEvent): void => {
-      const target = getTarget(e.target);
-      if (target !== mouseTarget) {
-        mouseTarget = target;
-        mouseTargetTime = performance.now();
-      }
-    },
-  );
+  app.attachEventListener(document.documentElement, 'mouseover', (e: MouseEvent): void => {
+    const target = getTarget(e.target);
+    if (target !== mouseTarget) {
+      mouseTarget = target;
+      mouseTargetTime = performance.now();
+    }
+  });
   app.attachEventListener(
     document,
     'mousemove',
@@ -158,12 +150,10 @@ export default function (app: App): void {
     const id = app.nodes.getID(target);
     if (id !== undefined) {
       sendMouseMove();
-      app.send(new
-        MouseClick(
+      app.send(
+        new MouseClick(
           id,
-          mouseTarget === target
-            ? Math.round(performance.now() - mouseTargetTime)
-            : 0,
+          mouseTarget === target ? Math.round(performance.now() - mouseTargetTime) : 0,
           getTargetLabel(target),
           getSelector(id, target),
         ),
diff --git a/tracker/tracker/src/main/modules/performance.ts b/tracker/tracker/src/main/modules/performance.ts
index c69293225..c921e45eb 100644
--- a/tracker/tracker/src/main/modules/performance.ts
+++ b/tracker/tracker/src/main/modules/performance.ts
@@ -1,20 +1,19 @@
-import type App from "../app/index.js";
-import { IN_BROWSER } from "../utils.js";
-import { PerformanceTrack } from "../../common/messages.js";
-
+import type App from '../app/index.js';
+import { IN_BROWSER } from '../utils.js';
+import { PerformanceTrack } from '../../common/messages.js';
 
 type Perf = {
-  memory: { 
-    totalJSHeapSize?: number,
-    usedJSHeapSize?: number,
-    jsHeapSizeLimit?: number,
-  }
-}
-
-const perf: Perf = IN_BROWSER && 'performance' in window && 'memory' in performance // works in Chrome only
-  ? performance as any
-  : { memory: {} }
+  memory: {
+    totalJSHeapSize?: number;
+    usedJSHeapSize?: number;
+    jsHeapSizeLimit?: number;
+  };
+};
 
+const perf: Perf =
+  IN_BROWSER && 'performance' in window && 'memory' in performance // works in Chrome only
+    ? (performance as any)
+    : { memory: {} };
 
 export const deviceMemory = IN_BROWSER ? ((navigator as any).deviceMemory || 0) * 1024 : 0;
 export const jsHeapSizeLimit = perf.memory.jsHeapSizeLimit || 0;
@@ -30,7 +29,9 @@ export default function (app: App, opts: Partial<Options>): void {
     },
     opts,
   );
-  if (!options.capturePerformance) { return; }
+  if (!options.capturePerformance) {
+    return;
+  }
 
   let frames: number | undefined;
   let ticks: number | undefined;
@@ -58,8 +59,8 @@ export default function (app: App, opts: Partial<Options>): void {
     if (frames === undefined || ticks === undefined) {
       return;
     }
-    app.send(new 
-      PerformanceTrack(
+    app.send(
+      new PerformanceTrack(
         frames,
         ticks,
         perf.memory.totalJSHeapSize || 0,
diff --git a/tracker/tracker/src/main/modules/scroll.ts b/tracker/tracker/src/main/modules/scroll.ts
index 3515b58e6..656408824 100644
--- a/tracker/tracker/src/main/modules/scroll.ts
+++ b/tracker/tracker/src/main/modules/scroll.ts
@@ -1,14 +1,14 @@
-import type App from "../app/index.js";
-import { SetViewportScroll, SetNodeScroll } from "../../common/messages.js";
-import { isElementNode } from "../app/guards.js";
+import type App from '../app/index.js';
+import { SetViewportScroll, SetNodeScroll } from '../../common/messages.js';
+import { isElementNode } from '../app/guards.js';
 
 export default function (app: App): void {
   let documentScroll = false;
   const nodeScroll: Map<Element, [number, number]> = new Map();
 
   const sendSetViewportScroll = app.safe((): void =>
-    app.send(new 
-      SetViewportScroll(
+    app.send(
+      new SetViewportScroll(
         window.pageXOffset ||
           (document.documentElement && document.documentElement.scrollLeft) ||
           (document.body && document.body.scrollLeft) ||
@@ -39,7 +39,7 @@ export default function (app: App): void {
     if (isStart && isElementNode(node) && node.scrollLeft + node.scrollTop > 0) {
       nodeScroll.set(node, [node.scrollLeft, node.scrollTop]);
     }
-  })
+  });
 
   app.attachEventListener(window, 'scroll', (e: Event): void => {
     const target = e.target;
diff --git a/tracker/tracker/src/main/modules/timing.ts b/tracker/tracker/src/main/modules/timing.ts
index 30183dfa6..1ca670562 100644
--- a/tracker/tracker/src/main/modules/timing.ts
+++ b/tracker/tracker/src/main/modules/timing.ts
@@ -1,8 +1,7 @@
-import type App from "../app/index.js";
-import { hasTag } from "../app/guards.js";
-import { isURL } from "../utils.js";
-import { ResourceTiming, PageLoadTiming, PageRenderTiming } from "../../common/messages.js";
-
+import type App from '../app/index.js';
+import { hasTag } from '../app/guards.js';
+import { isURL } from '../utils.js';
+import { ResourceTiming, PageLoadTiming, PageRenderTiming } from '../../common/messages.js';
 
 // Inspired by https://github.com/WPO-Foundation/RUM-SpeedIndex/blob/master/src/rum-speedindex.js
 
@@ -22,13 +21,11 @@ function getPaintBlocks(resources: ResourcesTimeMap): Array<PaintBlock> {
   for (let i = 0; i < elements.length; i++) {
     const element = elements[i];
     let src = '';
-    if (hasTag(element, "IMG")) {
+    if (hasTag(element, 'IMG')) {
       src = element.currentSrc || element.src;
     }
     if (!src) {
-      const backgroundImage = getComputedStyle(element).getPropertyValue(
-        'background-image',
-      );
+      const backgroundImage = getComputedStyle(element).getPropertyValue('background-image');
       if (backgroundImage) {
         const matches = styleURL.exec(backgroundImage);
         if (matches !== null) {
@@ -53,9 +50,7 @@ function getPaintBlocks(resources: ResourcesTimeMap): Array<PaintBlock> {
     );
     const right = Math.min(
       rect.right,
-      window.innerWidth ||
-        (document.documentElement && document.documentElement.clientWidth) ||
-        0,
+      window.innerWidth || (document.documentElement && document.documentElement.clientWidth) || 0,
     );
     if (bottom <= top || right <= left) continue;
     const area = (bottom - top) * (right - left);
@@ -64,18 +59,14 @@ function getPaintBlocks(resources: ResourcesTimeMap): Array<PaintBlock> {
   return paintBlocks;
 }
 
-function calculateSpeedIndex(
-  firstContentfulPaint: number,
-  paintBlocks: Array<PaintBlock>,
-): number {
+function calculateSpeedIndex(firstContentfulPaint: number, paintBlocks: Array<PaintBlock>): number {
   let a =
     (Math.max(
       (document.documentElement && document.documentElement.clientWidth) || 0,
       window.innerWidth || 0,
     ) *
       Math.max(
-        (document.documentElement && document.documentElement.clientHeight) ||
-          0,
+        (document.documentElement && document.documentElement.clientHeight) || 0,
         window.innerHeight || 0,
       )) /
     10;
@@ -106,25 +97,23 @@ export default function (app: App, opts: Partial<Options>): void {
   if (!('PerformanceObserver' in window)) {
     options.captureResourceTimings = false;
   }
-  if (!options.captureResourceTimings) { return } // Resources are necessary for all timings
+  if (!options.captureResourceTimings) {
+    return;
+  } // Resources are necessary for all timings
 
-  let resources: ResourcesTimeMap | null = {}
+  let resources: ResourcesTimeMap | null = {};
 
   function resourceTiming(entry: PerformanceResourceTiming): void {
     if (entry.duration < 0 || !isURL(entry.name) || app.isServiceURL(entry.name)) return;
     if (resources !== null) {
       resources[entry.name] = entry.startTime + entry.duration;
     }
-    app.send(new 
-      ResourceTiming(
+    app.send(
+      new ResourceTiming(
         entry.startTime + performance.timing.navigationStart,
         entry.duration,
-        entry.responseStart && entry.startTime
-          ? entry.responseStart - entry.startTime
-          : 0,
-        entry.transferSize > entry.encodedBodySize
-          ? entry.transferSize - entry.encodedBodySize
-          : 0,
+        entry.responseStart && entry.startTime ? entry.responseStart - entry.startTime : 0,
+        entry.transferSize > entry.encodedBodySize ? entry.transferSize - entry.encodedBodySize : 0,
         entry.encodedBodySize || 0,
         entry.decodedBodySize || 0,
         entry.name,
@@ -133,48 +122,45 @@ export default function (app: App, opts: Partial<Options>): void {
     );
   }
 
-  const observer: PerformanceObserver = new PerformanceObserver(
-    (list) => list.getEntries().forEach(resourceTiming),
-  )
+  const observer: PerformanceObserver = new PerformanceObserver((list) =>
+    list.getEntries().forEach(resourceTiming),
+  );
 
-  let prevSessionID: string | undefined
-  app.attachStartCallback(function({ sessionID }) {
-    if (sessionID !== prevSessionID) { // Send past page resources on a newly started session
-      performance.getEntriesByType('resource').forEach(resourceTiming)
-      prevSessionID = sessionID
+  let prevSessionID: string | undefined;
+  app.attachStartCallback(function ({ sessionID }) {
+    if (sessionID !== prevSessionID) {
+      // Send past page resources on a newly started session
+      performance.getEntriesByType('resource').forEach(resourceTiming);
+      prevSessionID = sessionID;
     }
-    observer.observe({ entryTypes: ['resource'] })
-  })
-
-  app.attachStopCallback(function() {
-    observer.disconnect()
-  })
+    observer.observe({ entryTypes: ['resource'] });
+  });
 
+  app.attachStopCallback(function () {
+    observer.disconnect();
+  });
 
   let firstPaint = 0,
     firstContentfulPaint = 0;
 
   if (options.capturePageLoadTimings) {
-
-    let pageLoadTimingSent: boolean = false;
+    let pageLoadTimingSent = false;
     app.ticker.attach(() => {
       if (pageLoadTimingSent) {
         return;
       }
       if (firstPaint === 0 || firstContentfulPaint === 0) {
-        performance
-          .getEntriesByType('paint')
-          .forEach((entry: PerformanceEntry) => {
-            const { name, startTime } = entry;
-            switch (name) {
-              case 'first-paint':
-                firstPaint = startTime;
-                break;
-              case 'first-contentful-paint':
-                firstContentfulPaint = startTime;
-                break;
-            }
-          });
+        performance.getEntriesByType('paint').forEach((entry: PerformanceEntry) => {
+          const { name, startTime } = entry;
+          switch (name) {
+            case 'first-paint':
+              firstPaint = startTime;
+              break;
+            case 'first-contentful-paint':
+              firstContentfulPaint = startTime;
+              break;
+          }
+        });
       }
       if (performance.timing.loadEventEnd || performance.now() > 30000) {
         pageLoadTimingSent = true;
@@ -188,8 +174,8 @@ export default function (app: App, opts: Partial<Options>): void {
           loadEventStart,
           loadEventEnd,
         } = performance.timing;
-        app.send(new 
-          PageLoadTiming(
+        app.send(
+          new PageLoadTiming(
             requestStart - navigationStart || 0,
             responseStart - navigationStart || 0,
             responseEnd - navigationStart || 0,
@@ -211,7 +197,7 @@ export default function (app: App, opts: Partial<Options>): void {
       interactiveWindowTickTime: number | null = 0,
       paintBlocks: Array<PaintBlock> | null = null;
 
-    let pageRenderTimingSent: boolean = false;
+    let pageRenderTimingSent = false;
     app.ticker.attach(() => {
       if (pageRenderTimingSent) {
         return;
@@ -231,37 +217,28 @@ export default function (app: App, opts: Partial<Options>): void {
         if (time - interactiveWindowTickTime > 50) {
           interactiveWindowStartTime = time;
         }
-        interactiveWindowTickTime =
-          time - interactiveWindowStartTime > 5000 ? null : time;
+        interactiveWindowTickTime = time - interactiveWindowStartTime > 5000 ? null : time;
       }
-      if (
-        (paintBlocks !== null && interactiveWindowTickTime === null) ||
-        time > 30000
-      ) {
+      if ((paintBlocks !== null && interactiveWindowTickTime === null) || time > 30000) {
         pageRenderTimingSent = true;
         resources = null;
         const speedIndex =
           paintBlocks === null
             ? 0
-            : calculateSpeedIndex(
-                firstContentfulPaint || firstPaint,
-                paintBlocks,
-              );
+            : calculateSpeedIndex(firstContentfulPaint || firstPaint, paintBlocks);
         const timeToInteractive =
           interactiveWindowTickTime === null
             ? Math.max(
                 interactiveWindowStartTime,
                 firstContentfulPaint,
-                performance.timing.domContentLoadedEventEnd -
-                  performance.timing.navigationStart || 0,
+                performance.timing.domContentLoadedEventEnd - performance.timing.navigationStart ||
+                  0,
               )
             : 0;
-        app.send(new 
-          PageRenderTiming(
+        app.send(
+          new PageRenderTiming(
             speedIndex,
-            firstContentfulPaint > visuallyComplete
-              ? firstContentfulPaint
-              : visuallyComplete,
+            firstContentfulPaint > visuallyComplete ? firstContentfulPaint : visuallyComplete,
             timeToInteractive,
           ),
         );
diff --git a/tracker/tracker/src/main/modules/viewport.ts b/tracker/tracker/src/main/modules/viewport.ts
index 29eac6806..b576b5384 100644
--- a/tracker/tracker/src/main/modules/viewport.ts
+++ b/tracker/tracker/src/main/modules/viewport.ts
@@ -1,9 +1,5 @@
-import type App from "../app/index.js";
-import {
-  SetPageLocation,
-  SetViewportSize,
-  SetPageVisibility,
-} from "../../common/messages.js";
+import type App from '../app/index.js';
+import { SetPageLocation, SetViewportSize, SetPageVisibility } from '../../common/messages.js';
 
 export default function (app: App): void {
   let url: string, width: number, height: number;
diff --git a/tracker/tracker/src/main/utils.ts b/tracker/tracker/src/main/utils.ts
index 20dcb3a25..67aa68a94 100644
--- a/tracker/tracker/src/main/utils.ts
+++ b/tracker/tracker/src/main/utils.ts
@@ -13,48 +13,53 @@ export function normSpaces(str: string): string {
 
 // isAbsoluteUrl regexp:  /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url)
 export function isURL(s: string): boolean {
-  return s.startsWith('https://')|| s.startsWith('http://');
+  return s.startsWith('https://') || s.startsWith('http://');
 }
 
-export const IN_BROWSER = !(typeof window === "undefined");
-
+export const IN_BROWSER = !(typeof window === 'undefined');
 
 // TODO: JOIN IT WITH LOGGER somehow (use logging decorators?); Don't forget about index.js loggin when there is no logger instance.
 
 export const DOCS_HOST = 'https://docs.openreplay.com';
 
-const warnedFeatures: { [key: string]: boolean; } = {};
-export function deprecationWarn(nameOfFeature: string, useInstead: string, docsPath: string = "/"): void {
-	if (warnedFeatures[ nameOfFeature ]) {
-		return;
-	}
-	console.warn(`OpenReplay: ${ nameOfFeature } is deprecated. ${ useInstead ? `Please, use ${ useInstead } instead.` : "" } Visit ${DOCS_HOST}${docsPath} for more information.`)
-	warnedFeatures[ nameOfFeature ] = true;
+const warnedFeatures: { [key: string]: boolean } = {};
+export function deprecationWarn(nameOfFeature: string, useInstead: string, docsPath = '/'): void {
+  if (warnedFeatures[nameOfFeature]) {
+    return;
+  }
+  console.warn(
+    `OpenReplay: ${nameOfFeature} is deprecated. ${
+      useInstead ? `Please, use ${useInstead} instead.` : ''
+    } Visit ${DOCS_HOST}${docsPath} for more information.`,
+  );
+  warnedFeatures[nameOfFeature] = true;
 }
 
 export function getLabelAttribute(e: Element): string | null {
-	let value = e.getAttribute("data-openreplay-label");
-	if (value !== null) {
-		return value;
-	}
-	value = e.getAttribute("data-asayer-label");
-	if (value !== null) {
-		deprecationWarn(`"data-asayer-label" attribute`, `"data-openreplay-label" attribute`, "/");
-	}
-	return value;
+  let value = e.getAttribute('data-openreplay-label');
+  if (value !== null) {
+    return value;
+  }
+  value = e.getAttribute('data-asayer-label');
+  if (value !== null) {
+    deprecationWarn('"data-asayer-label" attribute', '"data-openreplay-label" attribute', '/');
+  }
+  return value;
 }
 
 export function hasOpenreplayAttribute(e: Element, name: string): boolean {
-	const newName = `data-openreplay-${name}`;
-	if (e.hasAttribute(newName)) {
-		return true
-	}
-	const oldName = `data-asayer-${name}`;
-	if (e.hasAttribute(oldName)) {
-		deprecationWarn(`"${oldName}" attribute`, `"${newName}" attribute`, "/installation/sanitize-data");
-		return true;
-	}
-	return false;
+  const newName = `data-openreplay-${name}`;
+  if (e.hasAttribute(newName)) {
+    return true;
+  }
+  const oldName = `data-asayer-${name}`;
+  if (e.hasAttribute(oldName)) {
+    deprecationWarn(
+      `"${oldName}" attribute`,
+      `"${newName}" attribute`,
+      '/installation/sanitize-data',
+    );
+    return true;
+  }
+  return false;
 }
-
-
diff --git a/tracker/tracker/src/main/vendors/finder/finder.ts b/tracker/tracker/src/main/vendors/finder/finder.ts
index fc9f64af2..547ed2b08 100644
--- a/tracker/tracker/src/main/vendors/finder/finder.ts
+++ b/tracker/tracker/src/main/vendors/finder/finder.ts
@@ -1,10 +1,10 @@
 type Node = {
-  name: string
-  penalty: number
-  level?: number
-}
+  name: string;
+  penalty: number;
+  level?: number;
+};
 
-type Path = Node[]
+type Path = Node[];
 
 enum Limit {
   All,
@@ -13,27 +13,27 @@ enum Limit {
 }
 
 export type Options = {
-  root: Element
-  idName: (name: string) => boolean
-  className: (name: string) => boolean
-  tagName: (name: string) => boolean
-  attr: (name: string, value: string) => boolean
-  seedMinLength: number
-  optimizedMinLength: number
-  threshold: number
-  maxNumberOfTries: number
-}
+  root: Element;
+  idName: (name: string) => boolean;
+  className: (name: string) => boolean;
+  tagName: (name: string) => boolean;
+  attr: (name: string, value: string) => boolean;
+  seedMinLength: number;
+  optimizedMinLength: number;
+  threshold: number;
+  maxNumberOfTries: number;
+};
 
-let config: Options
+let config: Options;
 
-let rootDocument: Document | Element
+let rootDocument: Document | Element;
 export function finder(input: Element, options?: Partial<Options>) {
   if (input.nodeType !== Node.ELEMENT_NODE) {
-    throw new Error(`Can't generate CSS selector for non-element node type.`)
+    throw new Error("Can't generate CSS selector for non-element node type.");
   }
 
-  if ("html" === input.tagName.toLowerCase()) {
-    return "html"
+  if ('html' === input.tagName.toLowerCase()) {
+    return 'html';
   }
 
   const defaults: Options = {
@@ -46,356 +46,370 @@ export function finder(input: Element, options?: Partial<Options>) {
     optimizedMinLength: 2,
     threshold: 1000,
     maxNumberOfTries: 10000,
-  }
+  };
 
-  config = {...defaults, ...options}
+  config = { ...defaults, ...options };
 
-  rootDocument = findRootDocument(config.root, defaults)
+  rootDocument = findRootDocument(config.root, defaults);
 
-  let path =
-    bottomUpSearch(input, Limit.All, () =>
-      bottomUpSearch(input, Limit.Two, () =>
-        bottomUpSearch(input, Limit.One)))
+  let path = bottomUpSearch(input, Limit.All, () =>
+    bottomUpSearch(input, Limit.Two, () => bottomUpSearch(input, Limit.One)),
+  );
 
   if (path) {
-    const optimized = sort(optimize(path, input))
+    const optimized = sort(optimize(path, input));
 
     if (optimized.length > 0) {
-      path = optimized[0]
+      path = optimized[0];
     }
 
-    return selector(path)
+    return selector(path);
   } else {
-    throw new Error(`Selector was not found.`)
+    throw new Error('Selector was not found.');
   }
 }
 
 function findRootDocument(rootNode: Element | Document, defaults: Options) {
   if (rootNode.nodeType === Node.DOCUMENT_NODE) {
-    return rootNode
+    return rootNode;
   }
   if (rootNode === defaults.root) {
-    return rootNode.ownerDocument as Document
+    return rootNode.ownerDocument;
   }
-  return rootNode
+  return rootNode;
 }
 
 function bottomUpSearch(input: Element, limit: Limit, fallback?: () => Path | null): Path | null {
-  let path: Path | null = null
-  let stack: Node[][] = []
-  let current: Element | null = input
-  let i = 0
+  let path: Path | null = null;
+  const stack: Node[][] = [];
+  let current: Element | null = input;
+  let i = 0;
 
   while (current && current !== config.root.parentElement) {
-    let level: Node[] = maybe(id(current)) || maybe(...attr(current)) || maybe(...classNames(current)) || maybe(tagName(current)) || [any()]
+    let level: Node[] = maybe(id(current)) ||
+      maybe(...attr(current)) ||
+      maybe(...classNames(current)) ||
+      maybe(tagName(current)) || [any()];
 
-    const nth = index(current)
+    const nth = index(current);
 
     if (limit === Limit.All) {
       if (nth) {
-        level = level.concat(level.filter(dispensableNth).map(node => nthChild(node, nth)))
+        level = level.concat(level.filter(dispensableNth).map((node) => nthChild(node, nth)));
       }
     } else if (limit === Limit.Two) {
-      level = level.slice(0, 1)
+      level = level.slice(0, 1);
 
       if (nth) {
-        level = level.concat(level.filter(dispensableNth).map(node => nthChild(node, nth)))
+        level = level.concat(level.filter(dispensableNth).map((node) => nthChild(node, nth)));
       }
     } else if (limit === Limit.One) {
-      const [node] = level = level.slice(0, 1)
+      const [node] = (level = level.slice(0, 1));
 
       if (nth && dispensableNth(node)) {
-        level = [nthChild(node, nth)]
+        level = [nthChild(node, nth)];
       }
     }
 
-    for (let node of level) {
-      node.level = i
+    for (const node of level) {
+      node.level = i;
     }
 
-    stack.push(level)
+    stack.push(level);
 
     if (stack.length >= config.seedMinLength) {
-      path = findUniquePath(stack, fallback)
+      path = findUniquePath(stack, fallback);
       if (path) {
-        break
+        break;
       }
     }
 
-    current = current.parentElement
-    i++
+    current = current.parentElement;
+    i++;
   }
 
   if (!path) {
-    path = findUniquePath(stack, fallback)
+    path = findUniquePath(stack, fallback);
   }
 
-  return path
+  return path;
 }
 
 function findUniquePath(stack: Node[][], fallback?: () => Path | null): Path | null {
-  const paths = sort(combinations(stack))
+  const paths = sort(combinations(stack));
 
   if (paths.length > config.threshold) {
-    return fallback ? fallback() : null
+    return fallback ? fallback() : null;
   }
 
-  for (let candidate of paths) {
+  for (const candidate of paths) {
     if (unique(candidate)) {
-      return candidate
+      return candidate;
     }
   }
 
-  return null
+  return null;
 }
 
 function selector(path: Path): string {
-  let node = path[0]
-  let query = node.name
+  let node = path[0];
+  let query = node.name;
   for (let i = 1; i < path.length; i++) {
-    const level = path[i].level || 0
+    const level = path[i].level || 0;
 
     if (node.level === level - 1) {
-      query = `${path[i].name} > ${query}`
+      query = `${path[i].name} > ${query}`;
     } else {
-      query = `${path[i].name} ${query}`
+      query = `${path[i].name} ${query}`;
     }
 
-    node = path[i]
+    node = path[i];
   }
-  return query
+  return query;
 }
 
 function penalty(path: Path): number {
-  return path.map(node => node.penalty).reduce((acc, i) => acc + i, 0)
+  return path.map((node) => node.penalty).reduce((acc, i) => acc + i, 0);
 }
 
 function unique(path: Path) {
   switch (rootDocument.querySelectorAll(selector(path)).length) {
     case 0:
-      throw new Error(`Can't select any node with this selector: ${selector(path)}`)
+      throw new Error(`Can't select any node with this selector: ${selector(path)}`);
     case 1:
-      return true
+      return true;
     default:
-      return false
+      return false;
   }
 }
 
 function id(input: Element): Node | null {
-  const elementId = input.getAttribute("id")
+  const elementId = input.getAttribute('id');
   if (elementId && config.idName(elementId)) {
     return {
-      name: "#" + cssesc(elementId, {isIdentifier: true}),
+      name: '#' + cssesc(elementId, { isIdentifier: true }),
       penalty: 0,
-    }
+    };
   }
-  return null
+  return null;
 }
 
 function attr(input: Element): Node[] {
-  const attrs = Array.from(input.attributes).filter((attr) => config.attr(attr.name, attr.value))
+  const attrs = Array.from(input.attributes).filter((attr) => config.attr(attr.name, attr.value));
 
-  return attrs.map((attr): Node => ({
-    name: "[" + cssesc(attr.name, {isIdentifier: true}) + "=\"" + cssesc(attr.value) + "\"]",
-    penalty: 0.5
-  }))
+  return attrs.map(
+    (attr): Node => ({
+      name: '[' + cssesc(attr.name, { isIdentifier: true }) + '="' + cssesc(attr.value) + '"]',
+      penalty: 0.5,
+    }),
+  );
 }
 
 function classNames(input: Element): Node[] {
-  const names = Array.from(input.classList)
-    .filter(config.className)
+  const names = Array.from(input.classList).filter(config.className);
 
-  return names.map((name): Node => ({
-    name: "." + cssesc(name, {isIdentifier: true}),
-    penalty: 1
-  }))
+  return names.map(
+    (name): Node => ({
+      name: '.' + cssesc(name, { isIdentifier: true }),
+      penalty: 1,
+    }),
+  );
 }
 
 function tagName(input: Element): Node | null {
-  const name = input.tagName.toLowerCase()
+  const name = input.tagName.toLowerCase();
   if (config.tagName(name)) {
     return {
       name,
-      penalty: 2
-    }
+      penalty: 2,
+    };
   }
-  return null
+  return null;
 }
 
 function any(): Node {
   return {
-    name: "*",
-    penalty: 3
-  }
+    name: '*',
+    penalty: 3,
+  };
 }
 
 function index(input: Element): number | null {
-  const parent = input.parentNode
+  const parent = input.parentNode;
   if (!parent) {
-    return null
+    return null;
   }
 
-  let child = parent.firstChild
+  let child = parent.firstChild;
   if (!child) {
-    return null
+    return null;
   }
 
-  let i = 0
+  let i = 0;
   while (child) {
     if (child.nodeType === Node.ELEMENT_NODE) {
-      i++
+      i++;
     }
 
     if (child === input) {
-      break
+      break;
     }
 
-    child = child.nextSibling
+    child = child.nextSibling;
   }
 
-  return i
+  return i;
 }
 
 function nthChild(node: Node, i: number): Node {
   return {
     name: node.name + `:nth-child(${i})`,
-    penalty: node.penalty + 1
-  }
+    penalty: node.penalty + 1,
+  };
 }
 
 function dispensableNth(node: Node) {
-  return node.name !== "html" && !node.name.startsWith("#")
+  return node.name !== 'html' && !node.name.startsWith('#');
 }
 
 function maybe(...level: (Node | null)[]): Node[] | null {
-  const list = level.filter(notEmpty)
+  const list = level.filter(notEmpty);
   if (list.length > 0) {
-    return list
+    return list;
   }
-  return null
+  return null;
 }
 
 function notEmpty<T>(value: T | null | undefined): value is T {
-  return value !== null && value !== undefined
+  return value !== null && value !== undefined;
 }
 
 function combinations(stack: Node[][], path: Node[] = []): Node[][] {
-  const paths: Node[][] = []
+  const paths: Node[][] = [];
   if (stack.length > 0) {
-    for (let node of stack[0]) {
-      paths.push(...combinations(stack.slice(1, stack.length), path.concat(node)))
+    for (const node of stack[0]) {
+      paths.push(...combinations(stack.slice(1, stack.length), path.concat(node)));
     }
   } else {
-    paths.push(path)
+    paths.push(path);
   }
-  return paths
+  return paths;
 }
 
 function sort(paths: Iterable<Path>): Path[] {
-  return Array.from(paths).sort((a, b) => penalty(a) - penalty(b))
+  return Array.from(paths).sort((a, b) => penalty(a) - penalty(b));
 }
 
 type Scope = {
-  counter: number
-  visited: Map<string, boolean>
-}
+  counter: number;
+  visited: Map<string, boolean>;
+};
 
-function optimize(path: Path, input: Element, scope: Scope = {
-  counter: 0,
-  visited: new Map<string, boolean>()
-}): Node[][] {
-  const paths: Node[][] = []
+function optimize(
+  path: Path,
+  input: Element,
+  scope: Scope = {
+    counter: 0,
+    visited: new Map<string, boolean>(),
+  },
+): Node[][] {
+  const paths: Node[][] = [];
   if (path.length > 2 && path.length > config.optimizedMinLength) {
     for (let i = 1; i < path.length - 1; i++) {
       if (scope.counter > config.maxNumberOfTries) {
-        return paths // Okay At least I tried!
+        return paths; // Okay At least I tried!
       }
-      scope.counter += 1
-      const newPath = [...path]
-      newPath.splice(i, 1)
-      const newPathKey = selector(newPath)
+      scope.counter += 1;
+      const newPath = [...path];
+      newPath.splice(i, 1);
+      const newPathKey = selector(newPath);
       if (scope.visited.has(newPathKey)) {
-        return paths
+        return paths;
       }
       if (unique(newPath) && same(newPath, input)) {
-        paths.push(newPath)
-        scope.visited.set(newPathKey, true)
-        paths.push(...optimize(newPath, input, scope))
+        paths.push(newPath);
+        scope.visited.set(newPathKey, true);
+        paths.push(...optimize(newPath, input, scope));
       }
     }
   }
-  return paths
+  return paths;
 }
 
 function same(path: Path, input: Element) {
-  return rootDocument.querySelector(selector(path)) === input
+  return rootDocument.querySelector(selector(path)) === input;
 }
 
-const regexAnySingleEscape = /[ -,\.\/:-@\[-\^`\{-~]/
-const regexSingleEscape = /[ -,\.\/:-@\[\]\^`\{-~]/
-const regexExcessiveSpaces = /(^|\\+)?(\\[A-F0-9]{1,6})\x20(?![a-fA-F0-9\x20])/g
+const regexAnySingleEscape = /[ -,\.\/:-@\[-\^`\{-~]/;
+const regexSingleEscape = /[ -,\.\/:-@\[\]\^`\{-~]/;
+const regexExcessiveSpaces = /(^|\\+)?(\\[A-F0-9]{1,6})\x20(?![a-fA-F0-9\x20])/g;
 
 const defaultOptions = {
-  "escapeEverything": false,
-  "isIdentifier": false,
-  "quotes": "single",
-  "wrap": false
-}
+  escapeEverything: false,
+  isIdentifier: false,
+  quotes: 'single',
+  wrap: false,
+};
 
 function cssesc(string: string, opt: Partial<typeof defaultOptions> = {}) {
-  const options = {...defaultOptions, ...opt}
-  if (options.quotes != "single" && options.quotes != "double") {
-    options.quotes = "single"
+  const options = { ...defaultOptions, ...opt };
+  if (options.quotes != 'single' && options.quotes != 'double') {
+    options.quotes = 'single';
   }
-  const quote = options.quotes == "double" ? "\"" : "'"
-  const isIdentifier = options.isIdentifier
+  const quote = options.quotes == 'double' ? '"' : "'";
+  const isIdentifier = options.isIdentifier;
 
-  const firstChar = string.charAt(0)
-  let output = ""
-  let counter = 0
-  const length = string.length
+  const firstChar = string.charAt(0);
+  let output = '';
+  let counter = 0;
+  const length = string.length;
   while (counter < length) {
-    const character = string.charAt(counter++)
-    let codePoint = character.charCodeAt(0)
-    let value: string | undefined = void 0
+    const character = string.charAt(counter++);
+    let codePoint = character.charCodeAt(0);
+    let value: string | undefined = void 0;
     // If it’s not a printable ASCII character…
-    if (codePoint < 0x20 || codePoint > 0x7E) {
-      if (codePoint >= 0xD800 && codePoint <= 0xDBFF && counter < length) {
+    if (codePoint < 0x20 || codePoint > 0x7e) {
+      if (codePoint >= 0xd800 && codePoint <= 0xdbff && counter < length) {
         // It’s a high surrogate, and there is a next character.
-        const extra = string.charCodeAt(counter++)
-        if ((extra & 0xFC00) == 0xDC00) {
+        const extra = string.charCodeAt(counter++);
+        if ((extra & 0xfc00) == 0xdc00) {
           // next character is low surrogate
-          codePoint = ((codePoint & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000
+          codePoint = ((codePoint & 0x3ff) << 10) + (extra & 0x3ff) + 0x10000;
         } else {
           // It’s an unmatched surrogate; only append this code unit, in case
           // the next code unit is the high surrogate of a surrogate pair.
-          counter--
+          counter--;
         }
       }
-      value = "\\" + codePoint.toString(16).toUpperCase() + " "
+      value = '\\' + codePoint.toString(16).toUpperCase() + ' ';
     } else {
       if (options.escapeEverything) {
         if (regexAnySingleEscape.test(character)) {
-          value = "\\" + character
+          value = '\\' + character;
         } else {
-          value = "\\" + codePoint.toString(16).toUpperCase() + " "
+          value = '\\' + codePoint.toString(16).toUpperCase() + ' ';
         }
       } else if (/[\t\n\f\r\x0B]/.test(character)) {
-        value = "\\" + codePoint.toString(16).toUpperCase() + " "
-      } else if (character == "\\" || !isIdentifier && (character == "\"" && quote == character || character == "'" && quote == character) || isIdentifier && regexSingleEscape.test(character)) {
-        value = "\\" + character
+        value = '\\' + codePoint.toString(16).toUpperCase() + ' ';
+      } else if (
+        character == '\\' ||
+        (!isIdentifier &&
+          ((character == '"' && quote == character) || (character == "'" && quote == character))) ||
+        (isIdentifier && regexSingleEscape.test(character))
+      ) {
+        value = '\\' + character;
       } else {
-        value = character
+        value = character;
       }
     }
-    output += value
+    output += value;
   }
 
   if (isIdentifier) {
     if (/^-[-\d]/.test(output)) {
-      output = "\\-" + output.slice(1)
+      output = '\\-' + output.slice(1);
     } else if (/\d/.test(firstChar)) {
-      output = "\\3" + firstChar + " " + output.slice(1)
+      output = '\\3' + firstChar + ' ' + output.slice(1);
     }
   }
 
@@ -405,14 +419,14 @@ function cssesc(string: string, opt: Partial<typeof defaultOptions> = {}) {
   output = output.replace(regexExcessiveSpaces, function ($0, $1, $2) {
     if ($1 && $1.length % 2) {
       // It’s not safe to remove the space, so don’t.
-      return $0
+      return $0;
     }
     // Strip the space.
-    return ($1 || "") + $2
-  })
+    return ($1 || '') + $2;
+  });
 
   if (!isIdentifier && options.wrap) {
-    return quote + output + quote
+    return quote + output + quote;
   }
-  return output
+  return output;
 }
diff --git a/tracker/tracker/src/webworker/BatchWriter.ts b/tracker/tracker/src/webworker/BatchWriter.ts
index 181663300..be0aed933 100644
--- a/tracker/tracker/src/webworker/BatchWriter.ts
+++ b/tracker/tracker/src/webworker/BatchWriter.ts
@@ -1,76 +1,74 @@
-import type Message from "../common/messages.js";
-import PrimitiveWriter from "./PrimitiveWriter.js";
-import { 
-  BatchMeta,
-  Timestamp,
-} from "../common/messages.js";
+import type Message from '../common/messages.js';
+import PrimitiveWriter from './PrimitiveWriter.js';
+import { BatchMeta, Timestamp } from '../common/messages.js';
 
 export default class BatchWriter {
-  private nextIndex = 0
-  private beaconSize = 2 * 1e5 // Default 200kB
-  private writer = new PrimitiveWriter(this.beaconSize)
-  private isEmpty = true
+  private nextIndex = 0;
+  private beaconSize = 2 * 1e5; // Default 200kB
+  private writer = new PrimitiveWriter(this.beaconSize);
+  private isEmpty = true;
 
   constructor(
-    private readonly pageNo: number, 
+    private readonly pageNo: number,
     private timestamp: number,
-    private onBatch: (batch: Uint8Array) => void
+    private readonly onBatch: (batch: Uint8Array) => void,
   ) {
-    this.prepare()
+    this.prepare();
   }
 
   private prepare(): void {
     if (!this.writer.isEmpty()) {
-      return
+      return;
     }
-    new BatchMeta(this.pageNo, this.nextIndex, this.timestamp).encode(this.writer)
+    new BatchMeta(this.pageNo, this.nextIndex, this.timestamp).encode(this.writer);
   }
 
   private write(message: Message): boolean {
-    const wasWritten = message.encode(this.writer)
+    const wasWritten = message.encode(this.writer);
     if (wasWritten) {
-      this.isEmpty = false
-      this.writer.checkpoint()
-      this.nextIndex++
+      this.isEmpty = false;
+      this.writer.checkpoint();
+      this.nextIndex++;
     }
-    return wasWritten
+    return wasWritten;
   }
 
-  private beaconSizeLimit = 1e6
+  private beaconSizeLimit = 1e6;
   setBeaconSizeLimit(limit: number) {
-    this.beaconSizeLimit = limit
+    this.beaconSizeLimit = limit;
   }
 
   writeMessage(message: Message) {
     if (message instanceof Timestamp) {
-      this.timestamp = (<any>message).timestamp
+      this.timestamp = (<any>message).timestamp;
     }
     while (!this.write(message)) {
-      this.finaliseBatch()
+      this.finaliseBatch();
       if (this.beaconSize === this.beaconSizeLimit) {
-        console.warn("OpenReplay: beacon size overflow. Skipping large message.");
-        this.writer.reset()
-        this.prepare()
-        this.isEmpty = true
-        return
+        console.warn('OpenReplay: beacon size overflow. Skipping large message.');
+        this.writer.reset();
+        this.prepare();
+        this.isEmpty = true;
+        return;
       }
       // MBTODO: tempWriter for one message?
-      this.beaconSize = Math.min(this.beaconSize*2, this.beaconSizeLimit)
-      this.writer = new PrimitiveWriter(this.beaconSize)
-      this.prepare()
-      this.isEmpty = true
+      this.beaconSize = Math.min(this.beaconSize * 2, this.beaconSizeLimit);
+      this.writer = new PrimitiveWriter(this.beaconSize);
+      this.prepare();
+      this.isEmpty = true;
     }
   }
 
   finaliseBatch() {
-    if (this.isEmpty) { return }
-    this.onBatch(this.writer.flush())
-    this.prepare()
-    this.isEmpty = true
+    if (this.isEmpty) {
+      return;
+    }
+    this.onBatch(this.writer.flush());
+    this.prepare();
+    this.isEmpty = true;
   }
 
   clean() {
-    this.writer.reset()
+    this.writer.reset();
   }
-
 }
diff --git a/tracker/tracker/src/webworker/PrimitiveWriter.ts b/tracker/tracker/src/webworker/PrimitiveWriter.ts
index 587291bea..87924bf75 100644
--- a/tracker/tracker/src/webworker/PrimitiveWriter.ts
+++ b/tracker/tracker/src/webworker/PrimitiveWriter.ts
@@ -8,13 +8,13 @@ const textEncoder: { encode(str: string): Uint8Array } =
           const Len = str.length,
             resArr = new Uint8Array(Len * 3);
           let resPos = -1;
-          for (var point = 0, nextcode = 0, i = 0; i !== Len; ) {
+          for (let point = 0, nextcode = 0, i = 0; i !== Len; ) {
             (point = str.charCodeAt(i)), (i += 1);
             if (point >= 0xd800 && point <= 0xdbff) {
               if (i === Len) {
-                resArr[(resPos += 1)] = 0xef /*0b11101111*/;
-                resArr[(resPos += 1)] = 0xbf /*0b10111111*/;
-                resArr[(resPos += 1)] = 0xbd /*0b10111101*/;
+                resArr[(resPos += 1)] = 0xef; /*0b11101111*/
+                resArr[(resPos += 1)] = 0xbf; /*0b10111111*/
+                resArr[(resPos += 1)] = 0xbd; /*0b10111101*/
                 break;
               }
               // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
@@ -23,21 +23,18 @@ const textEncoder: { encode(str: string): Uint8Array } =
                 point = (point - 0xd800) * 0x400 + nextcode - 0xdc00 + 0x10000;
                 i += 1;
                 if (point > 0xffff) {
+                  resArr[(resPos += 1)] = (0x1e /*0b11110*/ << 3) | (point >>> 18);
                   resArr[(resPos += 1)] =
-                    (0x1e /*0b11110*/ << 3) | (point >>> 18);
+                    (0x2 /*0b10*/ << 6) | ((point >>> 12) & 0x3f); /*0b00111111*/
                   resArr[(resPos += 1)] =
-                    (0x2 /*0b10*/ << 6) |
-                    ((point >>> 12) & 0x3f) /*0b00111111*/;
-                  resArr[(resPos += 1)] =
-                    (0x2 /*0b10*/ << 6) | ((point >>> 6) & 0x3f) /*0b00111111*/;
-                  resArr[(resPos += 1)] =
-                    (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/;
+                    (0x2 /*0b10*/ << 6) | ((point >>> 6) & 0x3f); /*0b00111111*/
+                  resArr[(resPos += 1)] = (0x2 /*0b10*/ << 6) | (point & 0x3f); /*0b00111111*/
                   continue;
                 }
               } else {
-                resArr[(resPos += 1)] = 0xef /*0b11101111*/;
-                resArr[(resPos += 1)] = 0xbf /*0b10111111*/;
-                resArr[(resPos += 1)] = 0xbd /*0b10111101*/;
+                resArr[(resPos += 1)] = 0xef; /*0b11101111*/
+                resArr[(resPos += 1)] = 0xbf; /*0b10111111*/
+                resArr[(resPos += 1)] = 0xbd; /*0b10111101*/
                 continue;
               }
             }
@@ -45,14 +42,11 @@ const textEncoder: { encode(str: string): Uint8Array } =
               resArr[(resPos += 1)] = (0x0 /*0b0*/ << 7) | point;
             } else if (point <= 0x07ff) {
               resArr[(resPos += 1)] = (0x6 /*0b110*/ << 5) | (point >>> 6);
-              resArr[(resPos += 1)] =
-                (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/;
+              resArr[(resPos += 1)] = (0x2 /*0b10*/ << 6) | (point & 0x3f); /*0b00111111*/
             } else {
               resArr[(resPos += 1)] = (0xe /*0b1110*/ << 4) | (point >>> 12);
-              resArr[(resPos += 1)] =
-                (0x2 /*0b10*/ << 6) | ((point >>> 6) & 0x3f) /*0b00111111*/;
-              resArr[(resPos += 1)] =
-                (0x2 /*0b10*/ << 6) | (point & 0x3f) /*0b00111111*/;
+              resArr[(resPos += 1)] = (0x2 /*0b10*/ << 6) | ((point >>> 6) & 0x3f); /*0b00111111*/
+              resArr[(resPos += 1)] = (0x2 /*0b10*/ << 6) | (point & 0x3f); /*0b00111111*/
             }
           }
           return resArr.subarray(0, resPos + 1);
@@ -60,13 +54,13 @@ const textEncoder: { encode(str: string): Uint8Array } =
       };
 
 export default class PrimitiveWriter {
-  private offset: number = 0;
-  private checkpointOffset: number = 0;
+  private offset = 0;
+  private checkpointOffset = 0;
   private readonly data: Uint8Array;
   constructor(private readonly size: number) {
     this.data = new Uint8Array(size);
   }
-  checkpoint(): void {
+  checkpoint() {
     this.checkpointOffset = this.offset;
   }
   isEmpty(): boolean {
@@ -78,7 +72,7 @@ export default class PrimitiveWriter {
   }
   uint(value: number): boolean {
     if (value < 0 || value > Number.MAX_SAFE_INTEGER) {
-      value = 0
+      value = 0;
     }
     while (value >= 0x80) {
       this.data[this.offset++] = value % 0x100 | 0x80;
@@ -95,7 +89,7 @@ export default class PrimitiveWriter {
     const encoded = textEncoder.encode(value);
     const length = encoded.byteLength;
     if (!this.uint(length) || this.offset + length > this.size) {
-      return false
+      return false;
     }
     this.data.set(encoded, this.offset);
     this.offset += length;
diff --git a/tracker/tracker/src/webworker/QueueSender.ts b/tracker/tracker/src/webworker/QueueSender.ts
index d4686539d..b6aa3ed98 100644
--- a/tracker/tracker/src/webworker/QueueSender.ts
+++ b/tracker/tracker/src/webworker/QueueSender.ts
@@ -1,6 +1,6 @@
-const INGEST_PATH = "/v1/web/i"
+const INGEST_PATH = '/v1/web/i';
 
-const KEEPALIVE_SIZE_LIMIT = 64 << 10 // 64 kB
+const KEEPALIVE_SIZE_LIMIT = 64 << 10; // 64 kB
 
 // function sendXHR(url: string, token: string, batch: Uint8Array): Promise<XMLHttpRequest> {
 //   const req = new XMLHttpRequest()
@@ -20,88 +20,83 @@ const KEEPALIVE_SIZE_LIMIT = 64 << 10 // 64 kB
 //   })
 // }
 
-
 export default class QueueSender {
-  private attemptsCount = 0
-  private busy = false
-  private readonly queue: Array<Uint8Array> = []
-  private readonly ingestURL
-  private token: string | null = null
+  private attemptsCount = 0;
+  private busy = false;
+  private readonly queue: Array<Uint8Array> = [];
+  private readonly ingestURL;
+  private token: string | null = null;
   constructor(
-    ingestBaseURL: string, 
-    private readonly onUnauthorised: Function,
-    private readonly onFailure: Function,
+    ingestBaseURL: string,
+    private readonly onUnauthorised: () => any,
+    private readonly onFailure: () => any,
     private readonly MAX_ATTEMPTS_COUNT = 10,
     private readonly ATTEMPT_TIMEOUT = 1000,
   ) {
-    this.ingestURL = ingestBaseURL + INGEST_PATH
+    this.ingestURL = ingestBaseURL + INGEST_PATH;
   }
 
-  authorise(token: string) {
-    this.token = token
+  authorise(token: string): void {
+    this.token = token;
   }
 
-  push(batch: Uint8Array) {
+  push(batch: Uint8Array): void {
     if (this.busy || !this.token) {
-      this.queue.push(batch)
+      this.queue.push(batch);
     } else {
-      this.sendBatch(batch)
+      this.sendBatch(batch);
     }
   }
 
-  private retry(batch: Uint8Array) {
+  private retry(batch: Uint8Array): void {
     if (this.attemptsCount >= this.MAX_ATTEMPTS_COUNT) {
-      this.onFailure()
-      return
+      this.onFailure();
+      return;
     }
-    this.attemptsCount++
-    setTimeout(() => this.sendBatch(batch), this.ATTEMPT_TIMEOUT * this.attemptsCount)
+    this.attemptsCount++;
+    setTimeout(() => this.sendBatch(batch), this.ATTEMPT_TIMEOUT * this.attemptsCount);
   }
 
   // would be nice to use Beacon API, but it is not available in WebWorker
-  private sendBatch(batch: Uint8Array):void {
-    this.busy = true
+  private sendBatch(batch: Uint8Array): void {
+    this.busy = true;
 
     fetch(this.ingestURL, {
       body: batch,
       method: 'POST',
       headers: {
-        "Authorization": "Bearer " + this.token,
+        Authorization: 'Bearer ' + this.token,
         //"Content-Type": "",
       },
       keepalive: batch.length < KEEPALIVE_SIZE_LIMIT,
     })
-    .then(r => {
-      if (r.status === 401) { // TODO: continuous session ?
-        this.busy = false
-        this.onUnauthorised()
-        return
-      } else if (r.status >= 400) {
-        this.retry(batch)
-        return
-      }
-
-      // Success
-      this.attemptsCount = 0
-      const nextBatch = this.queue.shift()
-      if (nextBatch) {
-        this.sendBatch(nextBatch)
-      } else {
-        this.busy = false
-      }
-    })
-    .catch(e => {
-      console.warn("OpenReplay:", e)
-      this.retry(batch)
-    })
+      .then((r) => {
+        if (r.status === 401) {
+          // TODO: continuous session ?
+          this.busy = false;
+          this.onUnauthorised();
+          return;
+        } else if (r.status >= 400) {
+          this.retry(batch);
+          return;
+        }
 
+        // Success
+        this.attemptsCount = 0;
+        const nextBatch = this.queue.shift();
+        if (nextBatch) {
+          this.sendBatch(nextBatch);
+        } else {
+          this.busy = false;
+        }
+      })
+      .catch((e) => {
+        console.warn('OpenReplay:', e);
+        this.retry(batch);
+      });
   }
 
   clean() {
-    this.queue.length = 0
+    this.queue.length = 0;
   }
-
 }
-
-
-
diff --git a/tracker/tracker/src/webworker/index.ts b/tracker/tracker/src/webworker/index.ts
index 7d1cb0393..a22e75303 100644
--- a/tracker/tracker/src/webworker/index.ts
+++ b/tracker/tracker/src/webworker/index.ts
@@ -1,126 +1,125 @@
-import type Message from "../common/messages.js";
-import { WorkerMessageData } from "../common/webworker.js";
+import type Message from '../common/messages.js';
+import { WorkerMessageData } from '../common/webworker.js';
 
-import { 
-  classes,
-  SetPageVisibility,
-  MouseMove,
-} from "../common/messages.js";
-import QueueSender from "./QueueSender.js";
-import BatchWriter from "./BatchWriter.js";
+import { classes, SetPageVisibility } from '../common/messages.js';
+import QueueSender from './QueueSender.js';
+import BatchWriter from './BatchWriter.js';
 
 enum WorkerStatus {
   NotActive,
   Starting,
   Stopping,
-  Active
+  Active,
 }
 
-const AUTO_SEND_INTERVAL = 10 * 1000
+const AUTO_SEND_INTERVAL = 10 * 1000;
 
-let sender: QueueSender | null = null
-let writer: BatchWriter | null = null
+let sender: QueueSender | null = null;
+let writer: BatchWriter | null = null;
 let workerStatus: WorkerStatus = WorkerStatus.NotActive;
 
 function send(): void {
   if (!writer) {
-    return
+    return;
   }
-  writer.finaliseBatch()
+  writer.finaliseBatch();
 }
 
-
-function reset() {
-  workerStatus = WorkerStatus.Stopping
+function reset(): void {
+  workerStatus = WorkerStatus.Stopping;
   if (sendIntervalID !== null) {
     clearInterval(sendIntervalID);
     sendIntervalID = null;
   }
   if (writer) {
-    writer.clean()
-    writer = null
+    writer.clean();
+    writer = null;
   }
-  workerStatus = WorkerStatus.NotActive
+  workerStatus = WorkerStatus.NotActive;
 }
 
-function resetCleanQueue() {
+function resetCleanQueue(): void {
   if (sender) {
-    sender.clean()
-    sender = null
-  } 
-  reset()  
+    sender.clean();
+    sender = null;
+  }
+  reset();
 }
 
-let sendIntervalID: ReturnType<typeof setInterval> | null = null
-let restartTimeoutID: ReturnType<typeof setTimeout>
+let sendIntervalID: ReturnType<typeof setInterval> | null = null;
+let restartTimeoutID: ReturnType<typeof setTimeout>;
 
-self.onmessage = ({ data }: MessageEvent<WorkerMessageData>) => {
+self.onmessage = ({ data }: MessageEvent<WorkerMessageData>): any => {
   if (data == null) {
-    send() // TODO: sendAll?
-    return
+    send(); // TODO: sendAll?
+    return;
   }
-  if (data === "stop") {
-    send()
-    reset()
-    return
+  if (data === 'stop') {
+    send();
+    reset();
+    return;
   }
 
   if (Array.isArray(data)) {
     if (!writer) {
-      throw new Error("WebWorker: writer not initialised. Service Should be Started.")
+      throw new Error('WebWorker: writer not initialised. Service Should be Started.');
     }
-    const w = writer
+    const w = writer;
     // Message[]
     data.forEach((data) => {
-      const message: Message = new (<any>classes.get(data._id))();
-      Object.assign(message, data)
+      // @ts-ignore
+      const message: Message = new (classes.get(data._id))();
+      Object.assign(message, data);
       if (message instanceof SetPageVisibility) {
-        if ( (<any>message).hidden) {
-          restartTimeoutID = setTimeout(() => self.postMessage("restart"), 30*60*1000)
+        // @ts-ignore
+        if ((<any>message).hidden) {
+          restartTimeoutID = setTimeout(() => self.postMessage('restart'), 30 * 60 * 1000);
         } else {
-          clearTimeout(restartTimeoutID)
+          clearTimeout(restartTimeoutID);
         }
-      }     
-      w.writeMessage(message)
-    })
-    return
+      }
+      w.writeMessage(message);
+    });
+    return;
   }
 
   if (data.type === 'start') {
-    workerStatus = WorkerStatus.Starting
+    workerStatus = WorkerStatus.Starting;
     sender = new QueueSender(
       data.ingestPoint,
-      () => { // onUnauthorised
-        self.postMessage("restart")
+      () => {
+        // onUnauthorised
+        self.postMessage('restart');
       },
-      () => { // onFailure
-        resetCleanQueue()
-        self.postMessage("failed")
+      () => {
+        // onFailure
+        resetCleanQueue();
+        self.postMessage('failed');
       },
       data.connAttemptCount,
       data.connAttemptGap,
-    )
+    );
     writer = new BatchWriter(
       data.pageNo,
       data.timestamp,
       // onBatch
-      batch => sender && sender.push(batch)
-    )
+      (batch) => sender && sender.push(batch),
+    );
     if (sendIntervalID === null) {
-      sendIntervalID = setInterval(send, AUTO_SEND_INTERVAL)
+      sendIntervalID = setInterval(send, AUTO_SEND_INTERVAL);
     }
-    return workerStatus = WorkerStatus.Active
+    return (workerStatus = WorkerStatus.Active);
   }
 
-  if (data.type === "auth") {
+  if (data.type === 'auth') {
     if (!sender) {
-      throw new Error("WebWorker: sender not initialised. Received auth.")
+      throw new Error('WebWorker: sender not initialised. Received auth.');
     }
     if (!writer) {
-      throw new Error("WebWorker: writer not initialised. Received auth.")
+      throw new Error('WebWorker: writer not initialised. Received auth.');
     }
-    sender.authorise(data.token)
-    data.beaconSizeLimit && writer.setBeaconSizeLimit(data.beaconSizeLimit)
-    return
+    sender.authorise(data.token);
+    data.beaconSizeLimit && writer.setBeaconSizeLimit(data.beaconSizeLimit);
+    return;
   }
 };
diff --git a/tracker/tracker/src/webworker/tsconfig.json b/tracker/tracker/src/webworker/tsconfig.json
index 6794ea55c..52228f9af 100644
--- a/tracker/tracker/src/webworker/tsconfig.json
+++ b/tracker/tracker/src/webworker/tsconfig.json
@@ -3,7 +3,5 @@
   "compilerOptions": {
     "lib": ["es6", "webworker"]
   },
-  "references": [
-    { "path": "../common" }
-  ]
+  "references": [{ "path": "../common" }]
 }

From bdfa17c95b87e17334e5475e8889f17486357cc9 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Mon, 25 Jul 2022 15:12:59 +0200
Subject: [PATCH 69/77] feat(assist): support search operators feat(chalice):
 support search operators for assist

---
 api/chalicelib/core/assist.py   |   5 +-
 api/schemas.py                  |   2 +
 ee/utilities/package-lock.json  |  12 ++--
 ee/utilities/utils/helper-ee.js |   1 +
 utilities/package-lock.json     | 112 ++++++++++++++++----------------
 utilities/utils/helper.js       |  33 ++++++++--
 6 files changed, 93 insertions(+), 72 deletions(-)

diff --git a/api/chalicelib/core/assist.py b/api/chalicelib/core/assist.py
index efbc7b5c6..6fc8bcd90 100644
--- a/api/chalicelib/core/assist.py
+++ b/api/chalicelib/core/assist.py
@@ -35,9 +35,10 @@ def get_live_sessions_ws(project_id, body: schemas.LiveSessionsSearchPayloadSche
     }
     for f in body.filters:
         if f.type == schemas.LiveFilterType.metadata:
-            data["filter"][f.source] = f.value
+            data["filter"][f.source] = {"values": f.value, "operator": f.operator}
+
         else:
-            data["filter"][f.type.value] = f.value
+            data["filter"][f.type.value] = {"values": f.value, "operator": f.operator}
     return __get_live_sessions_ws(project_id=project_id, data=data)
 
 
diff --git a/api/schemas.py b/api/schemas.py
index f0f20e657..314a0f7d2 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -1031,6 +1031,8 @@ class LiveSessionSearchFilterSchema(BaseModel):
     value: Union[List[str], str] = Field(...)
     type: LiveFilterType = Field(...)
     source: Optional[str] = Field(None)
+    operator: Literal[SearchEventOperator._is.value,
+                      SearchEventOperator._contains.value] = Field(SearchEventOperator._contains.value)
 
     @root_validator
     def validator(cls, values):
diff --git a/ee/utilities/package-lock.json b/ee/utilities/package-lock.json
index 8aa6c9196..6b9dbdf1c 100644
--- a/ee/utilities/package-lock.json
+++ b/ee/utilities/package-lock.json
@@ -112,9 +112,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "node_modules/@types/node": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
-      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -1179,9 +1179,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "@types/node": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
-      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
     },
     "accepts": {
       "version": "1.3.8",
diff --git a/ee/utilities/utils/helper-ee.js b/ee/utilities/utils/helper-ee.js
index 50b414b7a..86997f0c4 100644
--- a/ee/utilities/utils/helper-ee.js
+++ b/ee/utilities/utils/helper-ee.js
@@ -91,6 +91,7 @@ const extractPayloadFromRequest = async function (req, res) {
         return helper.extractPayloadFromRequest(req);
     }
     filters.filter = helper.objectToObjectOfArrays(filters.filter);
+    filters.filter = helper.transformFilters(filters.filter);
     debug && console.log("payload/filters:" + JSON.stringify(filters))
     return Object.keys(filters).length > 0 ? filters : undefined;
 }
diff --git a/utilities/package-lock.json b/utilities/package-lock.json
index 8e90703f3..f4eb45944 100644
--- a/utilities/package-lock.json
+++ b/utilities/package-lock.json
@@ -42,9 +42,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "node_modules/@types/node": {
-      "version": "17.0.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.42.tgz",
-      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -61,12 +61,12 @@
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "engines": {
         "node": ">=0.8"
       }
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -185,12 +185,12 @@
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -270,6 +270,14 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/engine.io/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -345,18 +353,10 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "engines": [
         "node >=0.6.0"
       ]
@@ -504,7 +504,7 @@
     "node_modules/lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
     },
     "node_modules/map-obj": {
       "version": "4.3.0",
@@ -541,12 +541,12 @@
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -641,7 +641,7 @@
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
@@ -808,9 +808,9 @@
       "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dependencies": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",
@@ -938,7 +938,7 @@
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -946,7 +946,7 @@
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -954,7 +954,7 @@
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "engines": [
         "node >=0.6.0"
       ],
@@ -1013,9 +1013,9 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
     },
     "@types/node": {
-      "version": "17.0.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.42.tgz",
-      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -1029,12 +1029,12 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
     },
     "base64id": {
       "version": "2.0.0",
@@ -1109,19 +1109,19 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "cors": {
       "version": "2.8.5",
@@ -1177,6 +1177,11 @@
         "ws": "~8.2.3"
       },
       "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+        },
         "debug": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -1243,19 +1248,12 @@
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-        }
       }
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
     },
     "finalhandler": {
       "version": "1.2.0",
@@ -1367,7 +1365,7 @@
     "lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
     },
     "map-obj": {
       "version": "4.3.0",
@@ -1391,12 +1389,12 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "mime": {
       "version": "1.6.0",
@@ -1457,7 +1455,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "proxy-addr": {
       "version": "2.0.7",
@@ -1594,9 +1592,9 @@
       "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="
     },
     "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "requires": {
         "@types/component-emitter": "^1.2.10",
         "component-emitter": "~1.3.0",
@@ -1660,17 +1658,17 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index 7088d2b77..f31b9e0ba 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -40,19 +40,20 @@ const extractSessionIdFromRequest = function (req) {
 }
 const isValidSession = function (sessionInfo, filters) {
     let foundAll = true;
-    for (const [key, values] of Object.entries(filters)) {
+    for (const [key, body] of Object.entries(filters)) {
         let found = false;
-        if (values !== undefined && values !== null) {
+        if (body.values !== undefined && body.values !== null) {
             for (const [skey, svalue] of Object.entries(sessionInfo)) {
                 if (svalue !== undefined && svalue !== null) {
                     if (typeof (svalue) === "object") {
-                        if (isValidSession(svalue, {[key]: values})) {
+                        if (isValidSession(svalue, {[key]: body})) {
                             found = true;
                             break;
                         }
                     } else if (skey.toLowerCase() === key.toLowerCase()) {
-                        for (let v of values) {
-                            if (String(svalue).toLowerCase().indexOf(v.toLowerCase()) >= 0) {
+                        for (let v of body["values"]) {
+                            if (body.operator === "is" && String(svalue).toLowerCase() === v.toLowerCase()
+                                || body.operator !== "is" && String(svalue).toLowerCase().indexOf(v.toLowerCase()) >= 0) {
                                 found = true;
                                 break;
                             }
@@ -108,10 +109,26 @@ const objectToObjectOfArrays = function (obj) {
     }
     return _obj;
 }
+const transformFilters = function (filter) {
+    for (let key of Object.keys(filter)) {
+        //To support old v1.7.0 payload
+        if (Array.isArray(filter[key]) || filter[key] === undefined || filter[key] === null) {
+            debug && console.log(`[WS]old format for key=${key}`);
+            filter[key] = {"values": filter[key]};
+        }
+        if (filter[key].operator) {
+            debug && console.log(`[WS]where operator=${filter[key].operator}`);
+        } else {
+            debug && console.log(`[WS]where operator=DEFAULT-contains`);
+            filter[key].operator = "contains";
+        }
+    }
+    return filter;
+}
 const extractPayloadFromRequest = function (req) {
     let filters = {
-        "query": {},
-        "filter": {},
+        "query": {}, // for autocomplete
+        "filter": {}, // for sessions search
         "sort": {
             "key": req.body.sort && req.body.sort.key ? req.body.sort.key : undefined,
             "order": req.body.sort && req.body.sort.order === "DESC"
@@ -135,6 +152,7 @@ const extractPayloadFromRequest = function (req) {
     }
     filters.filter = objectToObjectOfArrays(filters.filter);
     filters.filter = {...filters.filter, ...(req.body.filter || {})};
+    filters.filter = transformFilters(filters.filter);
     debug && console.log("payload/filters:" + JSON.stringify(filters))
     return filters;
 }
@@ -194,6 +212,7 @@ const uniqueAutocomplete = function (list) {
     return _list;
 }
 module.exports = {
+    transformFilters,
     extractPeerId,
     request_logger,
     getValidAttributes,

From 04eaf84e4cf1e05213d84c8e3ed2bf11a1d58418 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 25 Jul 2022 16:47:28 +0200
Subject: [PATCH 70/77] fix(ui) - active sessions modal scroll

---
 .../components/Assist/components/SessionList/SessionList.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/components/Assist/components/SessionList/SessionList.tsx b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
index ed0af5625..dc8b54025 100644
--- a/frontend/app/components/Assist/components/SessionList/SessionList.tsx
+++ b/frontend/app/components/Assist/components/SessionList/SessionList.tsx
@@ -24,7 +24,7 @@ function SessionList(props: Props) {
 
     return (
         <div style={{ width: '50vw' }}>
-            <div className="border-r shadow h-screen" style={{ backgroundColor: '#FAFAFA', zIndex: 999, width: '100%', minWidth: '700px' }}>
+            <div className="border-r shadow h-screen overflow-y-auto" style={{ backgroundColor: '#FAFAFA', zIndex: 999, width: '100%', minWidth: '700px' }}>
                 <div className="p-4">
                     <div className="text-2xl">
                         {props.userId}'s <span className="color-gray-medium">Live Sessions</span>{' '}

From 2a43c048641a304bef31b0b2eadb8bf38087e5aa Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 25 Jul 2022 17:01:56 +0200
Subject: [PATCH 71/77] fix(ui) - integration project dropdown

---
 .../app/components/Client/Integrations/IntegrationForm.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app/components/Client/Integrations/IntegrationForm.js b/frontend/app/components/Client/Integrations/IntegrationForm.js
index a26576fc3..aeb28fe31 100644
--- a/frontend/app/components/Client/Integrations/IntegrationForm.js
+++ b/frontend/app/components/Client/Integrations/IntegrationForm.js
@@ -35,9 +35,9 @@ export default class IntegrationForm extends React.PureComponent {
 
   onChangeSelect = ({ value }) => {
     const { sites, list, name } = this.props;
-    const site = sites.find(s => s.id === value);
+    const site = sites.find(s => s.id === value.value);
     this.setState({ currentSiteId: site.id })
-    this.init(value);
+    this.init(value.value);
   }
 
   init = (siteId) => {

From b65f45bf031a09a2be46b6e9cee5cbf066de0f6e Mon Sep 17 00:00:00 2001
From: sylenien <nikita@openreplay.com>
Date: Mon, 25 Jul 2022 17:26:09 +0200
Subject: [PATCH 72/77] feat(tracker): cut orphan child nodes to prevent memory
 leaks

---
 tracker/tracker-assist/package.json           |  2 +-
 tracker/tracker-axios/src/index.ts            |  2 +-
 tracker/tracker/package.json                  |  2 +-
 tracker/tracker/src/main/app/index.ts         |  9 ++++--
 tracker/tracker/src/main/app/nodes.ts         | 32 +++++++++++++------
 .../tracker/src/main/app/observer/observer.ts | 26 ++++++++++++---
 tracker/tracker/src/main/modules/input.ts     |  2 ++
 tracker/tracker/src/webworker/QueueSender.ts  |  3 --
 8 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index 3d363cffd..d04faef0d 100644
--- 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": "3.5.15",
+  "version": "3.5.16",
   "keywords": [
     "WebRTC",
     "assistance",
diff --git a/tracker/tracker-axios/src/index.ts b/tracker/tracker-axios/src/index.ts
index e7abce84e..14d3387dc 100644
--- a/tracker/tracker-axios/src/index.ts
+++ b/tracker/tracker-axios/src/index.ts
@@ -216,4 +216,4 @@ export default function(opts: Partial<Options> = {}) {
 	    return Promise.reject(error);
 	  });
   }
-}
\ No newline at end of file
+}
diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index 183006c05..7a6fdbe01 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "3.5.15",
+  "version": "3.5.16",
   "keywords": [
     "logging",
     "replay"
diff --git a/tracker/tracker/src/main/app/index.ts b/tracker/tracker/src/main/app/index.ts
index be03a968c..16d472c90 100644
--- a/tracker/tracker/src/main/app/index.ts
+++ b/tracker/tracker/src/main/app/index.ts
@@ -426,6 +426,7 @@ export default class App {
       this.ticker.start();
 
       this.notify.log("OpenReplay tracking started.");
+    
       // get rid of onStart ?
       if (typeof this.options.onStart === 'function') {
         this.options.onStart(onStartInfo)
@@ -458,7 +459,7 @@ export default class App {
       })
     }
   }
-  stop(calledFromAPI = false): void {
+  stop(calledFromAPI = false, restarting = false): void {
     if (this.activityState !== ActivityState.NotActive) {
       try {
         this.sanitizer.clear()
@@ -470,7 +471,7 @@ export default class App {
           this.session.reset()
         }
         this.notify.log("OpenReplay tracking stopped.")
-        if (this.worker) {
+        if (this.worker && !restarting) {
           this.worker.postMessage("stop")
         }
       } finally {
@@ -478,4 +479,8 @@ export default class App {
       }
     }
   }
+  restart() {
+    this.stop(false, true);
+    this.start({ forceNew: false });
+  }
 }
diff --git a/tracker/tracker/src/main/app/nodes.ts b/tracker/tracker/src/main/app/nodes.ts
index a1c87b6e2..536ba4efc 100644
--- a/tracker/tracker/src/main/app/nodes.ts
+++ b/tracker/tracker/src/main/app/nodes.ts
@@ -2,14 +2,14 @@ type NodeCallback = (node: Node, isStart: boolean) => void;
 type ElementListener = [string, EventListener];
 
 export default class Nodes {
-  private readonly nodes: Array<Node | undefined>;
-  private readonly nodeCallbacks: Array<NodeCallback>;
-  private readonly elementListeners: Map<number, Array<ElementListener>>;
-  constructor(private readonly node_id: string) {
-    this.nodes = [];
-    this.nodeCallbacks = [];
-    this.elementListeners = new Map();
-  }
+  private nodes: Array<Node | void> = [];
+  private readonly nodeCallbacks: Array<NodeCallback> = [];
+  private readonly elementListeners: Map<number, Array<ElementListener>> = new Map();
+
+  constructor(
+    private readonly node_id: string, 
+  ) {}
+
   attachNodeCallback(nodeCallback: NodeCallback): void {
     this.nodeCallbacks.push(nodeCallback);
   }
@@ -46,7 +46,7 @@ export default class Nodes {
     const id = (node as any)[this.node_id];
     if (id !== undefined) {
       delete (node as any)[this.node_id];
-      this.nodes[id] = undefined;
+      delete this.nodes[id];
       const listeners = this.elementListeners.get(id);
       if (listeners !== undefined) {
         this.elementListeners.delete(id);
@@ -57,13 +57,25 @@ export default class Nodes {
     }
     return id;
   }
+  cleanTree() {
+    // sadly we keep empty items in array here resulting in some memory still being used
+    // but its still better than keeping dead nodes or undef elements
+    // plus we keep our index positions for new/alive nodes
+    // performance test: 3ms for 30k nodes with 17k dead ones
+    for (let i = 0; i < this.nodes.length; i++) {
+      const node = this.nodes[i];
+      if (node && !document.contains(node)) {
+        this.unregisterNode(node);
+      }
+    }
+  }
   callNodeCallbacks(node: Node, isStart: boolean): void {
     this.nodeCallbacks.forEach((cb) => cb(node, isStart));
   }
   getID(node: Node): number | undefined {
     return (node as any)[this.node_id];
   }
-  getNode(id: number): Node | undefined {
+  getNode(id: number) {
     return this.nodes[id];
   }
 
diff --git a/tracker/tracker/src/main/app/observer/observer.ts b/tracker/tracker/src/main/app/observer/observer.ts
index 940a7eefb..8c59d6029 100644
--- a/tracker/tracker/src/main/app/observer/observer.ts
+++ b/tracker/tracker/src/main/app/observer/observer.ts
@@ -48,10 +48,17 @@ function isObservable(node: Node): boolean {
     - use document as a 0-node in the upper context (should be updated in player at first)
 */
 
+/* 
+  Nikita:
+    - rn we only send unbind event for parent (all child nodes will be cut in the live replay anyways) 
+      to prevent sending 1k+ unbinds for child nodes and making replay file bigger than it should be 
+*/
+
 enum RecentsType {
   New,
   Removed,
   Changed,
+  RemovedChild,
 }
 
 export default abstract class Observer {
@@ -73,7 +80,7 @@ export default abstract class Observer {
           }
           if (type === 'childList') {
             for (let i = 0; i < mutation.removedNodes.length; i++) {
-              this.bindTree(mutation.removedNodes[i]);
+              this.bindTree(mutation.removedNodes[i], true);
             }
             for (let i = 0; i < mutation.addedNodes.length; i++) {
               this.bindTree(mutation.addedNodes[i]);
@@ -188,8 +195,12 @@ export default abstract class Observer {
       this.recents.set(id, RecentsType.Removed)
     }
   }
+  private unbindChildNode(node: Node): void {
+    const [ id ]= this.app.nodes.registerNode(node);
+    this.recents.set(id, RecentsType.RemovedChild)
+  }
 
-  private bindTree(node: Node): void {
+  private bindTree(node: Node, isChildUnbinding: boolean = false): void {
     if (!isObservable(node)) {
       return
     }
@@ -199,7 +210,8 @@ export default abstract class Observer {
       NodeFilter.SHOW_ELEMENT + NodeFilter.SHOW_TEXT,
       {
         acceptNode: (node) =>
-          isIgnored(node) || this.app.nodes.getID(node) !== undefined
+          isIgnored(node) 
+          || (this.app.nodes.getID(node) !== undefined && !isChildUnbinding)
             ? NodeFilter.FILTER_REJECT
             : NodeFilter.FILTER_ACCEPT,
       },
@@ -207,11 +219,15 @@ export default abstract class Observer {
       false,
     );
     while (walker.nextNode()) {
-      this.bindNode(walker.currentNode);
+      if (isChildUnbinding) {
+        this.unbindChildNode(walker.currentNode);
+      } else {
+        this.bindNode(walker.currentNode);
+      }
     }
   }
 
-  private unbindNode(node: Node): void {
+  private unbindNode(node: Node) {
     const id = this.app.nodes.unregisterNode(node);
     if (id !== undefined && this.recents.get(id) === RecentsType.Removed) {
       this.app.send(new RemoveNode(id));
diff --git a/tracker/tracker/src/main/modules/input.ts b/tracker/tracker/src/main/modules/input.ts
index 496d642a2..f4d80ebf0 100644
--- a/tracker/tracker/src/main/modules/input.ts
+++ b/tracker/tracker/src/main/modules/input.ts
@@ -149,6 +149,7 @@ export default function (app: App, opts: Partial<Options>): void {
   app.ticker.attach((): void => {
     inputValues.forEach((value, id) => {
       const node = app.nodes.getNode(id);
+      if (!node) return;
       if (!isTextEditable(node)) {
         inputValues.delete(id);
         return;
@@ -164,6 +165,7 @@ export default function (app: App, opts: Partial<Options>): void {
     });
     checkableValues.forEach((checked, id) => {
       const node = app.nodes.getNode(id);
+      if (!node) return;
       if (!isCheckable(node)) {
         checkableValues.delete(id);
         return;
diff --git a/tracker/tracker/src/webworker/QueueSender.ts b/tracker/tracker/src/webworker/QueueSender.ts
index d4686539d..b5fc8c8ee 100644
--- a/tracker/tracker/src/webworker/QueueSender.ts
+++ b/tracker/tracker/src/webworker/QueueSender.ts
@@ -102,6 +102,3 @@ export default class QueueSender {
   }
 
 }
-
-
-

From 4e8ce5ce6c434575e6d205e83f53172d813c02dd Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Mon, 25 Jul 2022 17:43:44 +0200
Subject: [PATCH 73/77] feat(assist): fixed objectToObjectOfArrays

---
 utilities/utils/helper.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index f31b9e0ba..b012ccf6c 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -98,11 +98,11 @@ const objectToObjectOfArrays = function (obj) {
         for (let k of Object.keys(obj)) {
             if (obj[k] !== undefined && obj[k] !== null) {
                 _obj[k] = obj[k];
-                if (!Array.isArray(_obj[k])) {
+                if (!Array.isArray(_obj[k].values)) {
                     _obj[k] = [_obj[k]];
                 }
-                for (let i = 0; i < _obj[k].length; i++) {
-                    _obj[k][i] = String(_obj[k][i]);
+                for (let i = 0; i < _obj[k].values.length; i++) {
+                    _obj[k].values[i] = String(_obj[k].values[i]);
                 }
             }
         }

From 49b961968f5f69fe38002836a98de366abfb49ff Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 26 Jul 2022 14:48:54 +0200
Subject: [PATCH 74/77] fix(ui) - smtp check

---
 .../components/Client/Users/components/UserForm/UserForm.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx b/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
index d2df0431d..477e42d8f 100644
--- a/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
+++ b/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
@@ -153,6 +153,7 @@ function UserForm(props: Props) {
     ));
 }
 
-export default connect(state => ({
+export default connect((state: any) => ({
     isEnterprise: state.getIn([ 'user', 'account', 'edition' ]) === 'ee',
+    isSmtp: state.getIn([ 'user', 'account', 'smtp' ]),
 }))(UserForm);
\ No newline at end of file

From c36c380a5d87ac6ff88ddbdccbff06ab59834264 Mon Sep 17 00:00:00 2001
From: Delirium <sylenien@gmail.com>
Date: Tue, 26 Jul 2022 17:06:15 +0300
Subject: [PATCH 75/77] fix(ui): fix timezone settings (#643)

---
 .../SessionList/SessionListHeader.js          | 12 +++---
 .../SelectDateRange/SelectDateRange.tsx       |  4 +-
 frontend/app/dateRange.js                     | 38 ++++++++--------
 frontend/app/store.js                         |  7 ++-
 frontend/app/types/app/period.js              | 43 ++++++++-----------
 5 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/frontend/app/components/BugFinder/SessionList/SessionListHeader.js b/frontend/app/components/BugFinder/SessionList/SessionListHeader.js
index 5e2702639..606ecaf67 100644
--- a/frontend/app/components/BugFinder/SessionList/SessionListHeader.js
+++ b/frontend/app/components/BugFinder/SessionList/SessionListHeader.js
@@ -26,7 +26,7 @@ function SessionListHeader({ activeTab, count, applyFilter, filter }) {
     }, [label]);
 
     const { startDate, endDate, rangeValue } = filter;
-    const period = new Record({ start: startDate, end: endDate, rangeName: rangeValue });
+    const period = new Record({ start: startDate, end: endDate, rangeName: rangeValue, timezoneOffset: getTimeZoneOffset() });
 
     const onDateChange = (e) => {
         const dateValues = e.toJSON();
@@ -36,10 +36,12 @@ function SessionListHeader({ activeTab, count, applyFilter, filter }) {
     };
 
     React.useEffect(() => {
-        const dateValues = period.toJSON();
-        dateValues.startDate = moment(dateValues.startDate).startOf('day').utcOffset(getTimeZoneOffset(), true).valueOf();
-        dateValues.endDate = moment(dateValues.endDate).endOf('day').utcOffset(getTimeZoneOffset(), true).valueOf();
-        applyFilter(dateValues);
+        if (label) {
+            const dateValues = period.toJSON();
+            dateValues.startDate = moment(dateValues.startDate).startOf('day').utcOffset(getTimeZoneOffset(), true).valueOf();
+            dateValues.endDate = moment(dateValues.endDate).endOf('day').utcOffset(getTimeZoneOffset(), true).valueOf();
+            applyFilter(dateValues);
+        }
     }, [label]);
 
     return (
diff --git a/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx b/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
index da8a940a5..7eaabc252 100644
--- a/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
+++ b/frontend/app/components/shared/SelectDateRange/SelectDateRange.tsx
@@ -39,7 +39,7 @@ function SelectDateRange(props: Props) {
     };
 
     const isCustomRange = period.rangeName === CUSTOM_RANGE;
-    const customRange = isCustomRange ? period.rangeFormatted(undefined, timezone) : '';
+    const customRange = isCustomRange ? period.rangeFormatted() : '';
     return (
         <div className="relative">
             <Select
@@ -75,7 +75,7 @@ function SelectDateRange(props: Props) {
                             width: '770px',
                         }}
                     >
-                        <DateRangePopup onApply={onApplyDateRange} onCancel={() => setIsCustom(false)} selectedDateRange={period.range} />
+                        <DateRangePopup timezone={timezone} onApply={onApplyDateRange} onCancel={() => setIsCustom(false)} selectedDateRange={period.range} />
                     </div>
                 </OutsideClickDetectingDiv>
             )}
diff --git a/frontend/app/dateRange.js b/frontend/app/dateRange.js
index 0a1ae3410..70f674665 100644
--- a/frontend/app/dateRange.js
+++ b/frontend/app/dateRange.js
@@ -2,6 +2,7 @@ import origMoment from "moment";
 import { extendMoment } from "moment-range";
 export const moment = extendMoment(origMoment);
 import { DateTime } from "luxon";
+import { TIMEZONE } from 'App/constants/storageKeys';
 
 export const CUSTOM_RANGE = "CUSTOM_RANGE";
 
@@ -42,39 +43,42 @@ export function getDateRangeLabel(value) {
 }
 
 export function getDateRangeFromValue(value) {
+    const tz = JSON.parse(localStorage.getItem(TIMEZONE));
+    const offset = tz ? tz.label.slice(-6) : 0;
+    
     switch (value) {
         case DATE_RANGE_VALUES.LAST_30_MINUTES:
             return moment.range(
-                moment().startOf("hour").subtract(30, "minutes"),
-                moment().startOf("hour")
+                moment().utcOffset(offset, true).startOf("hour").subtract(30, "minutes"),
+                moment().utcOffset(offset, true).startOf("hour")
             );
+            case DATE_RANGE_VALUES.YESTERDAY:
+                return moment.range(
+                    moment().utcOffset(offset, true).subtract(1, "days").startOf("day"),
+                    moment().utcOffset(offset, true).subtract(1, "days").endOf("day")
+                    );
         case DATE_RANGE_VALUES.TODAY:
-            return moment.range(moment().startOf("day"), moment().endOf("day"));
-        case DATE_RANGE_VALUES.YESTERDAY:
-            return moment.range(
-                moment().subtract(1, "days").startOf("day"),
-                moment().subtract(1, "days").endOf("day")
-            );
+            return moment.range(moment().utcOffset(offset, true).startOf("day"), moment().utcOffset(offset, true).endOf("day"));
         case DATE_RANGE_VALUES.LAST_24_HOURS:
-            return moment.range(moment().subtract(24, "hours"), moment());
+            return moment.range(moment().utcOffset(offset, true).subtract(24, "hours"), moment().utcOffset(offset, true));
         case DATE_RANGE_VALUES.LAST_7_DAYS:
             return moment.range(
-                moment().subtract(7, "days").startOf("day"),
-                moment().endOf("day")
+                moment().utcOffset(offset, true).subtract(7, "days").startOf("day"),
+                moment().utcOffset(offset, true).endOf("day")
             );
         case DATE_RANGE_VALUES.LAST_30_DAYS:
             return moment.range(
-                moment().subtract(30, "days").startOf("day"),
-                moment().endOf("day")
+                moment().utcOffset(offset, true).subtract(30, "days").startOf("day"),
+                moment().utcOffset(offset, true).endOf("day")
             );
         case DATE_RANGE_VALUES.THIS_MONTH:
-            return moment().range("month");
+            return moment().utcOffset(offset, true).range("month");
         case DATE_RANGE_VALUES.LAST_MONTH:
-            return moment().subtract(1, "months").range("month");
+            return moment().utcOffset(offset, true).subtract(1, "months").range("month");
         case DATE_RANGE_VALUES.THIS_YEAR:
-            return moment().range("year");
+            return moment().utcOffset(offset, true).range("year");
         case DATE_RANGE_VALUES.CUSTOM_RANGE:
-            return moment.range(moment(), moment());
+            return moment.range(moment().utcOffset(offset, true), moment().utcOffset(offset, true));
     }
     return null;
 }
diff --git a/frontend/app/store.js b/frontend/app/store.js
index f907a579c..dd1434a0c 100644
--- a/frontend/app/store.js
+++ b/frontend/app/store.js
@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware } from 'redux';
+import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import { Map } from 'immutable';
 import indexReducer from './duck';
@@ -9,13 +9,16 @@ const storage = new LocalStorage({
   jwt: String,
 });
 
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ && window.env.NODE_ENV === "development" 
+  ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ : compose;
+
 const storageState = storage.state();
 const initialState = Map({
   jwt: storageState.jwt,
   // TODO: store user
 });
 
-const store = createStore(indexReducer, initialState, applyMiddleware(thunk, apiMiddleware));
+const store = createStore(indexReducer, initialState, composeEnhancers(applyMiddleware(thunk, apiMiddleware)));
 store.subscribe(() => {
   const state = store.getState();
   storage.sync({
diff --git a/frontend/app/types/app/period.js b/frontend/app/types/app/period.js
index 027e324ce..da69519b0 100644
--- a/frontend/app/types/app/period.js
+++ b/frontend/app/types/app/period.js
@@ -26,43 +26,43 @@ const RANGE_LABELS = {
     [THIS_YEAR]: "This Year",
 };
 
-function getRange(rangeName) {
+function getRange(rangeName, offset) {
     switch (rangeName) {
         case TODAY:
             return moment.range(moment().startOf("day"), moment().endOf("day"));
         case YESTERDAY:
             return moment.range(
-                moment().subtract(1, "days").startOf("day"),
-                moment().subtract(1, "days").endOf("day")
+                moment().utcOffset(offset).subtract(1, "days").startOf("day"),
+                moment().utcOffset(offset).subtract(1, "days").endOf("day")
             );
         case LAST_24_HOURS:
             return moment.range(
                 // moment().startOf("hour").subtract(24, "hours"),
                 // moment().startOf("hour")
-				moment().subtract(24, 'hours'),
-        		moment(),
+				moment().utcOffset(offset).subtract(24, 'hours'),
+        		moment().utcOffset(offset),
             );
         case LAST_30_MINUTES:
             return moment.range(
-                moment().startOf("hour").subtract(30, "minutes"),
-                moment().startOf("hour")
+                moment().utcOffset(offset).startOf("hour").subtract(30, "minutes"),
+                moment().utcOffset(offset).startOf("hour")
             );
         case LAST_7_DAYS:
             return moment.range(
-                moment().subtract(7, "days").startOf("day"),
-                moment().endOf("day")
+                moment().utcOffset(offset).subtract(7, "days").startOf("day"),
+                moment().utcOffset(offset).endOf("day")
             );
         case LAST_30_DAYS:
             return moment.range(
-                moment().subtract(30, "days").startOf("day"),
-                moment().endOf("day")
+                moment().utcOffset(offset).subtract(30, "days").startOf("day"),
+                moment().utcOffset(offset).endOf("day")
             );
         case THIS_MONTH:
-            return moment().range("month");
+            return moment().utcOffset(offset).range("month");
         case LAST_MONTH:
-            return moment().subtract(1, "months").range("month");
+            return moment().utcOffset(offset).subtract(1, "months").range("month");
         case THIS_YEAR:
-            return moment().range("year");
+            return moment().utcOffset(offset).range("year");
         default:
             return moment.range();
     }
@@ -77,10 +77,11 @@ export default Record(
     },
     {
         fromJS: (period) => {
+            const offset = period.timezoneOffset || 0
             if (!period.rangeName || period.rangeName === CUSTOM_RANGE) {
                 const range = moment.range(
-                    moment(period.start || 0),
-                    moment(period.end || 0)
+                    moment(period.start || 0).utcOffset(offset),
+                    moment(period.end || 0).utcOffset(offset)
                 );
                 return {
                     ...period,
@@ -89,7 +90,7 @@ export default Record(
                     end: range.end.unix() * 1000,
                 };
             }
-            const range = getRange(period.rangeName);
+            const range = getRange(period.rangeName, offset);
             return {
                 ...period,
                 range,
@@ -97,14 +98,6 @@ export default Record(
                 end: range.end.unix() * 1000,
             };
         },
-        // fromFilter: filter => {
-        // 	const range = getRange(filter.rangeName);
-        // 	return {
-        // 		start: range.start.unix() * 1000,
-        // 		end: range.end.unix() * 1000,
-        // 		rangeName: filter.rangeName,
-        // 	}
-        // },
         methods: {
             toJSON() {
                 return {

From 15f1c2d6ee39480297c736bab836d2290affc3bf Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 26 Jul 2022 16:21:40 +0200
Subject: [PATCH 76/77] chore(helm): Updating nginx ingress

---
 .../charts/ingress-nginx/CHANGELOG.md         | 133 +++++++++++++-----
 .../charts/ingress-nginx/Chart.yaml           |  53 +++++--
 .../openreplay/charts/ingress-nginx/README.md |  30 ++--
 .../charts/ingress-nginx/README.md.gotmpl     |   4 +-
 ...emonset-tcp-udp-portNamePrefix-values.yaml |  18 +++
 ...loyment-tcp-udp-portNamePrefix-values.yaml |  17 +++
 .../deployment-webhook-extraEnvs-values.yaml  |  12 ++
 .../ingress-nginx/templates/_helpers.tpl      |  29 ++++
 .../job-patch/job-createSecret.yaml           |   3 +
 .../job-patch/job-patchWebhook.yaml           |   3 +
 .../ingress-nginx/templates/clusterrole.yaml  |   7 +
 .../templates/controller-daemonset.yaml       |  18 +--
 .../templates/controller-deployment.yaml      |   9 +-
 .../templates/controller-prometheusrules.yaml |   2 +-
 .../templates/controller-psp.yaml             |   3 +
 .../templates/controller-role.yaml            |  15 ++
 .../controller-service-internal.yaml          |   8 +-
 .../templates/controller-service.yaml         |  12 +-
 .../charts/ingress-nginx/values.yaml          |  41 ++++--
 19 files changed, 325 insertions(+), 92 deletions(-)
 create mode 100644 scripts/helmcharts/openreplay/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml
 create mode 100644 scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml
 create mode 100644 scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml

diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/CHANGELOG.md b/scripts/helmcharts/openreplay/charts/ingress-nginx/CHANGELOG.md
index f3f44c336..bedb9f720 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/CHANGELOG.md
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/CHANGELOG.md
@@ -2,39 +2,104 @@
 
 This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
 
+### 4.2.0
+
+- Support for Kubernetes v1.19.0 was removed
+- "[8810](https://github.com/kubernetes/ingress-nginx/pull/8810) Prepare for v1.3.0"
+- "[8808](https://github.com/kubernetes/ingress-nginx/pull/8808) revert arch var name"
+- "[8805](https://github.com/kubernetes/ingress-nginx/pull/8805) Bump k8s.io/klog/v2 from 2.60.1 to 2.70.1"
+- "[8803](https://github.com/kubernetes/ingress-nginx/pull/8803) Update to nginx base with alpine v3.16"
+- "[8802](https://github.com/kubernetes/ingress-nginx/pull/8802) chore: start v1.3.0 release process"
+- "[8798](https://github.com/kubernetes/ingress-nginx/pull/8798) Add v1.24.0 to test matrix"
+- "[8796](https://github.com/kubernetes/ingress-nginx/pull/8796) fix: add MAC_OS variable for static-check"
+- "[8793](https://github.com/kubernetes/ingress-nginx/pull/8793) changed to alpine-v3.16"
+- "[8781](https://github.com/kubernetes/ingress-nginx/pull/8781) Bump github.com/stretchr/testify from 1.7.5 to 1.8.0"
+- "[8778](https://github.com/kubernetes/ingress-nginx/pull/8778) chore: remove stable.txt from release process"
+- "[8775](https://github.com/kubernetes/ingress-nginx/pull/8775) Remove stable"
+- "[8773](https://github.com/kubernetes/ingress-nginx/pull/8773) Bump github/codeql-action from 2.1.14 to 2.1.15"
+- "[8772](https://github.com/kubernetes/ingress-nginx/pull/8772) Bump ossf/scorecard-action from 1.1.1 to 1.1.2"
+- "[8771](https://github.com/kubernetes/ingress-nginx/pull/8771) fix bullet md format"
+- "[8770](https://github.com/kubernetes/ingress-nginx/pull/8770) Add condition for monitoring.coreos.com/v1 API"
+- "[8769](https://github.com/kubernetes/ingress-nginx/pull/8769) Fix typos and add links to developer guide"
+- "[8767](https://github.com/kubernetes/ingress-nginx/pull/8767) change v1.2.0 to v1.2.1 in deploy doc URLs"
+- "[8765](https://github.com/kubernetes/ingress-nginx/pull/8765) Bump github/codeql-action from 1.0.26 to 2.1.14"
+- "[8752](https://github.com/kubernetes/ingress-nginx/pull/8752) Bump github.com/spf13/cobra from 1.4.0 to 1.5.0"
+- "[8751](https://github.com/kubernetes/ingress-nginx/pull/8751) Bump github.com/stretchr/testify from 1.7.2 to 1.7.5"
+- "[8750](https://github.com/kubernetes/ingress-nginx/pull/8750) added announcement"
+- "[8740](https://github.com/kubernetes/ingress-nginx/pull/8740) change sha e2etestrunner and echoserver"
+- "[8738](https://github.com/kubernetes/ingress-nginx/pull/8738) Update docs to make it easier for noobs to follow step by step"
+- "[8737](https://github.com/kubernetes/ingress-nginx/pull/8737) updated baseimage sha"
+- "[8736](https://github.com/kubernetes/ingress-nginx/pull/8736) set ld-musl-path"
+- "[8733](https://github.com/kubernetes/ingress-nginx/pull/8733) feat: migrate leaderelection lock to leases"
+- "[8726](https://github.com/kubernetes/ingress-nginx/pull/8726) prometheus metric: upstream_latency_seconds"
+- "[8720](https://github.com/kubernetes/ingress-nginx/pull/8720) Ci pin deps"
+- "[8719](https://github.com/kubernetes/ingress-nginx/pull/8719) Working OpenTelemetry sidecar (base nginx image)"
+- "[8714](https://github.com/kubernetes/ingress-nginx/pull/8714) Create Openssf scorecard"
+- "[8708](https://github.com/kubernetes/ingress-nginx/pull/8708) Bump github.com/prometheus/common from 0.34.0 to 0.35.0"
+- "[8703](https://github.com/kubernetes/ingress-nginx/pull/8703) Bump actions/dependency-review-action from 1 to 2"
+- "[8701](https://github.com/kubernetes/ingress-nginx/pull/8701) Fix several typos"
+- "[8699](https://github.com/kubernetes/ingress-nginx/pull/8699) fix the gosec test and a make target for it"
+- "[8698](https://github.com/kubernetes/ingress-nginx/pull/8698) Bump actions/upload-artifact from 2.3.1 to 3.1.0"
+- "[8697](https://github.com/kubernetes/ingress-nginx/pull/8697) Bump actions/setup-go from 2.2.0 to 3.2.0"
+- "[8695](https://github.com/kubernetes/ingress-nginx/pull/8695) Bump actions/download-artifact from 2 to 3"
+- "[8694](https://github.com/kubernetes/ingress-nginx/pull/8694) Bump crazy-max/ghaction-docker-buildx from 1.6.2 to 3.3.1"
+
+### 4.1.2
+
+- "[8587](https://github.com/kubernetes/ingress-nginx/pull/8587) Add CAP_SYS_CHROOT to DS/PSP when needed"
+- "[8458](https://github.com/kubernetes/ingress-nginx/pull/8458) Add portNamePreffix Helm chart parameter"
+- "[8522](https://github.com/kubernetes/ingress-nginx/pull/8522) Add documentation for controller.service.loadBalancerIP in Helm chart"
+
+### 4.1.0
+
+- "[8481](https://github.com/kubernetes/ingress-nginx/pull/8481) Fix log creation in chroot script"
+- "[8479](https://github.com/kubernetes/ingress-nginx/pull/8479) changed nginx base img tag to img built with alpine3.14.6"
+- "[8478](https://github.com/kubernetes/ingress-nginx/pull/8478) update base images and protobuf gomod"
+- "[8468](https://github.com/kubernetes/ingress-nginx/pull/8468) Fallback to ngx.var.scheme for redirectScheme with use-forward-headers when X-Forwarded-Proto is empty"
+- "[8456](https://github.com/kubernetes/ingress-nginx/pull/8456) Implement object deep inspector"
+- "[8455](https://github.com/kubernetes/ingress-nginx/pull/8455) Update dependencies"
+- "[8454](https://github.com/kubernetes/ingress-nginx/pull/8454) Update index.md"
+- "[8447](https://github.com/kubernetes/ingress-nginx/pull/8447) typo fixing"
+- "[8446](https://github.com/kubernetes/ingress-nginx/pull/8446) Fix suggested annotation-value-word-blocklist"
+- "[8444](https://github.com/kubernetes/ingress-nginx/pull/8444) replace deprecated topology key in example with current one"
+- "[8443](https://github.com/kubernetes/ingress-nginx/pull/8443) Add dependency review enforcement"
+- "[8434](https://github.com/kubernetes/ingress-nginx/pull/8434) added new auth-tls-match-cn annotation"
+- "[8426](https://github.com/kubernetes/ingress-nginx/pull/8426) Bump github.com/prometheus/common from 0.32.1 to 0.33.0"
+
 ### 4.0.18
-"[8291](https://github.com/kubernetes/ingress-nginx/pull/8291) remove git tag env from cloud build"
-"[8286](https://github.com/kubernetes/ingress-nginx/pull/8286) Fix OpenTelemetry sidecar image build"
-"[8277](https://github.com/kubernetes/ingress-nginx/pull/8277) Add OpenSSF Best practices badge"
-"[8273](https://github.com/kubernetes/ingress-nginx/pull/8273) Issue#8241"
-"[8267](https://github.com/kubernetes/ingress-nginx/pull/8267) Add fsGroup value to admission-webhooks/job-patch charts"
-"[8262](https://github.com/kubernetes/ingress-nginx/pull/8262) Updated confusing error"
-"[8256](https://github.com/kubernetes/ingress-nginx/pull/8256) fix: deny locations with invalid auth-url annotation"
-"[8253](https://github.com/kubernetes/ingress-nginx/pull/8253) Add a certificate info metric"
-"[8236](https://github.com/kubernetes/ingress-nginx/pull/8236) webhook: remove useless code."
-"[8227](https://github.com/kubernetes/ingress-nginx/pull/8227) Update libraries in webhook image"
-"[8225](https://github.com/kubernetes/ingress-nginx/pull/8225) fix inconsistent-label-cardinality for prometheus metrics: nginx_ingress_controller_requests"
-"[8221](https://github.com/kubernetes/ingress-nginx/pull/8221) Do not validate ingresses with unknown ingress class in admission webhook endpoint"
-"[8210](https://github.com/kubernetes/ingress-nginx/pull/8210) Bump github.com/prometheus/client_golang from 1.11.0 to 1.12.1"
-"[8209](https://github.com/kubernetes/ingress-nginx/pull/8209) Bump google.golang.org/grpc from 1.43.0 to 1.44.0"
-"[8204](https://github.com/kubernetes/ingress-nginx/pull/8204) Add Artifact Hub lint"
-"[8203](https://github.com/kubernetes/ingress-nginx/pull/8203) Fix Indentation of example and link to cert-manager tutorial"
-"[8201](https://github.com/kubernetes/ingress-nginx/pull/8201) feat(metrics): add path and method labels to requests countera"
-"[8199](https://github.com/kubernetes/ingress-nginx/pull/8199) use functional options to reduce number of methods creating an EchoDeployment"
-"[8196](https://github.com/kubernetes/ingress-nginx/pull/8196) docs: fix inconsistent controller annotation"
-"[8191](https://github.com/kubernetes/ingress-nginx/pull/8191) Using Go install for misspell"
-"[8186](https://github.com/kubernetes/ingress-nginx/pull/8186) prometheus+grafana using servicemonitor"
-"[8185](https://github.com/kubernetes/ingress-nginx/pull/8185) Append elements on match, instead of removing for cors-annotations"
-"[8179](https://github.com/kubernetes/ingress-nginx/pull/8179) Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0"
-"[8173](https://github.com/kubernetes/ingress-nginx/pull/8173) Adding annotations to the controller service account"
-"[8163](https://github.com/kubernetes/ingress-nginx/pull/8163) Update the $req_id placeholder description"
-"[8162](https://github.com/kubernetes/ingress-nginx/pull/8162) Versioned static manifests"
-"[8159](https://github.com/kubernetes/ingress-nginx/pull/8159) Adding some geoip variables and default values"
-"[8155](https://github.com/kubernetes/ingress-nginx/pull/8155) #7271 feat: avoid-pdb-creation-when-default-backend-disabled-and-replicas-gt-1"
-"[8151](https://github.com/kubernetes/ingress-nginx/pull/8151) Automatically generate helm docs"
-"[8143](https://github.com/kubernetes/ingress-nginx/pull/8143) Allow to configure delay before controller exits"
-"[8136](https://github.com/kubernetes/ingress-nginx/pull/8136) add ingressClass option to helm chart - back compatibility with ingress.class annotations"
-"[8126](https://github.com/kubernetes/ingress-nginx/pull/8126) Example for JWT"
+
+- "[8291](https://github.com/kubernetes/ingress-nginx/pull/8291) remove git tag env from cloud build"
+- "[8286](https://github.com/kubernetes/ingress-nginx/pull/8286) Fix OpenTelemetry sidecar image build"
+- "[8277](https://github.com/kubernetes/ingress-nginx/pull/8277) Add OpenSSF Best practices badge"
+- "[8273](https://github.com/kubernetes/ingress-nginx/pull/8273) Issue#8241"
+- "[8267](https://github.com/kubernetes/ingress-nginx/pull/8267) Add fsGroup value to admission-webhooks/job-patch charts"
+- "[8262](https://github.com/kubernetes/ingress-nginx/pull/8262) Updated confusing error"
+- "[8256](https://github.com/kubernetes/ingress-nginx/pull/8256) fix: deny locations with invalid auth-url annotation"
+- "[8253](https://github.com/kubernetes/ingress-nginx/pull/8253) Add a certificate info metric"
+- "[8236](https://github.com/kubernetes/ingress-nginx/pull/8236) webhook: remove useless code."
+- "[8227](https://github.com/kubernetes/ingress-nginx/pull/8227) Update libraries in webhook image"
+- "[8225](https://github.com/kubernetes/ingress-nginx/pull/8225) fix inconsistent-label-cardinality for prometheus metrics: nginx_ingress_controller_requests"
+- "[8221](https://github.com/kubernetes/ingress-nginx/pull/8221) Do not validate ingresses with unknown ingress class in admission webhook endpoint"
+- "[8210](https://github.com/kubernetes/ingress-nginx/pull/8210) Bump github.com/prometheus/client_golang from 1.11.0 to 1.12.1"
+- "[8209](https://github.com/kubernetes/ingress-nginx/pull/8209) Bump google.golang.org/grpc from 1.43.0 to 1.44.0"
+- "[8204](https://github.com/kubernetes/ingress-nginx/pull/8204) Add Artifact Hub lint"
+- "[8203](https://github.com/kubernetes/ingress-nginx/pull/8203) Fix Indentation of example and link to cert-manager tutorial"
+- "[8201](https://github.com/kubernetes/ingress-nginx/pull/8201) feat(metrics): add path and method labels to requests countera"
+- "[8199](https://github.com/kubernetes/ingress-nginx/pull/8199) use functional options to reduce number of methods creating an EchoDeployment"
+- "[8196](https://github.com/kubernetes/ingress-nginx/pull/8196) docs: fix inconsistent controller annotation"
+- "[8191](https://github.com/kubernetes/ingress-nginx/pull/8191) Using Go install for misspell"
+- "[8186](https://github.com/kubernetes/ingress-nginx/pull/8186) prometheus+grafana using servicemonitor"
+- "[8185](https://github.com/kubernetes/ingress-nginx/pull/8185) Append elements on match, instead of removing for cors-annotations"
+- "[8179](https://github.com/kubernetes/ingress-nginx/pull/8179) Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0"
+- "[8173](https://github.com/kubernetes/ingress-nginx/pull/8173) Adding annotations to the controller service account"
+- "[8163](https://github.com/kubernetes/ingress-nginx/pull/8163) Update the $req_id placeholder description"
+- "[8162](https://github.com/kubernetes/ingress-nginx/pull/8162) Versioned static manifests"
+- "[8159](https://github.com/kubernetes/ingress-nginx/pull/8159) Adding some geoip variables and default values"
+- "[8155](https://github.com/kubernetes/ingress-nginx/pull/8155) #7271 feat: avoid-pdb-creation-when-default-backend-disabled-and-replicas-gt-1"
+- "[8151](https://github.com/kubernetes/ingress-nginx/pull/8151) Automatically generate helm docs"
+- "[8143](https://github.com/kubernetes/ingress-nginx/pull/8143) Allow to configure delay before controller exits"
+- "[8136](https://github.com/kubernetes/ingress-nginx/pull/8136) add ingressClass option to helm chart - back compatibility with ingress.class annotations"
+- "[8126](https://github.com/kubernetes/ingress-nginx/pull/8126) Example for JWT"
 
 
 ### 4.0.15
@@ -119,11 +184,11 @@ This file documents all notable changes to [ingress-nginx](https://github.com/ku
 
 - [7707] https://github.com/kubernetes/ingress-nginx/pull/7707 Release v1.0.2 of ingress-nginx
 
-### 4.0.2 
+### 4.0.2
 
 - [7681] https://github.com/kubernetes/ingress-nginx/pull/7681 Release v1.0.1 of ingress-nginx
 
-### 4.0.1 
+### 4.0.1
 
 - [7535] https://github.com/kubernetes/ingress-nginx/pull/7535 Release v1.0.0 ingress-nginx
 
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/Chart.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/Chart.yaml
index 6445231d5..7040a29cd 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/Chart.yaml
@@ -1,13 +1,46 @@
 annotations:
   artifacthub.io/changes: |
-    - "#8253 Add a certificate info metric"
-    - "#8225 fix inconsistent-label-cardinality for prometheus metrics: nginx_ingress_controller_requests"
-    - "#8162 Versioned static manifests"
-    - "#8159 Adding some geoip variables and default values"
-    - "#8221 Do not validate ingresses with unknown ingress class in admission webhook endpoint"
+    - "[8810](https://github.com/kubernetes/ingress-nginx/pull/8810) Prepare for v1.3.0"
+    - "[8808](https://github.com/kubernetes/ingress-nginx/pull/8808) revert arch var name"
+    - "[8805](https://github.com/kubernetes/ingress-nginx/pull/8805) Bump k8s.io/klog/v2 from 2.60.1 to 2.70.1"
+    - "[8803](https://github.com/kubernetes/ingress-nginx/pull/8803) Update to nginx base with alpine v3.16"
+    - "[8802](https://github.com/kubernetes/ingress-nginx/pull/8802) chore: start v1.3.0 release process"
+    - "[8798](https://github.com/kubernetes/ingress-nginx/pull/8798) Add v1.24.0 to test matrix"
+    - "[8796](https://github.com/kubernetes/ingress-nginx/pull/8796) fix: add MAC_OS variable for static-check"
+    - "[8793](https://github.com/kubernetes/ingress-nginx/pull/8793) changed to alpine-v3.16"
+    - "[8781](https://github.com/kubernetes/ingress-nginx/pull/8781) Bump github.com/stretchr/testify from 1.7.5 to 1.8.0"
+    - "[8778](https://github.com/kubernetes/ingress-nginx/pull/8778) chore: remove stable.txt from release process"
+    - "[8775](https://github.com/kubernetes/ingress-nginx/pull/8775) Remove stable"
+    - "[8773](https://github.com/kubernetes/ingress-nginx/pull/8773) Bump github/codeql-action from 2.1.14 to 2.1.15"
+    - "[8772](https://github.com/kubernetes/ingress-nginx/pull/8772) Bump ossf/scorecard-action from 1.1.1 to 1.1.2"
+    - "[8771](https://github.com/kubernetes/ingress-nginx/pull/8771) fix bullet md format"
+    - "[8770](https://github.com/kubernetes/ingress-nginx/pull/8770) Add condition for monitoring.coreos.com/v1 API"
+    - "[8769](https://github.com/kubernetes/ingress-nginx/pull/8769) Fix typos and add links to developer guide"
+    - "[8767](https://github.com/kubernetes/ingress-nginx/pull/8767) change v1.2.0 to v1.2.1 in deploy doc URLs"
+    - "[8765](https://github.com/kubernetes/ingress-nginx/pull/8765) Bump github/codeql-action from 1.0.26 to 2.1.14"
+    - "[8752](https://github.com/kubernetes/ingress-nginx/pull/8752) Bump github.com/spf13/cobra from 1.4.0 to 1.5.0"
+    - "[8751](https://github.com/kubernetes/ingress-nginx/pull/8751) Bump github.com/stretchr/testify from 1.7.2 to 1.7.5"
+    - "[8750](https://github.com/kubernetes/ingress-nginx/pull/8750) added announcement"
+    - "[8740](https://github.com/kubernetes/ingress-nginx/pull/8740) change sha e2etestrunner and echoserver"
+    - "[8738](https://github.com/kubernetes/ingress-nginx/pull/8738) Update docs to make it easier for noobs to follow step by step"
+    - "[8737](https://github.com/kubernetes/ingress-nginx/pull/8737) updated baseimage sha"
+    - "[8736](https://github.com/kubernetes/ingress-nginx/pull/8736) set ld-musl-path"
+    - "[8733](https://github.com/kubernetes/ingress-nginx/pull/8733) feat: migrate leaderelection lock to leases"
+    - "[8726](https://github.com/kubernetes/ingress-nginx/pull/8726) prometheus metric: upstream_latency_seconds"
+    - "[8720](https://github.com/kubernetes/ingress-nginx/pull/8720) Ci pin deps"
+    - "[8719](https://github.com/kubernetes/ingress-nginx/pull/8719) Working OpenTelemetry sidecar (base nginx image)"
+    - "[8714](https://github.com/kubernetes/ingress-nginx/pull/8714) Create Openssf scorecard"
+    - "[8708](https://github.com/kubernetes/ingress-nginx/pull/8708) Bump github.com/prometheus/common from 0.34.0 to 0.35.0"
+    - "[8703](https://github.com/kubernetes/ingress-nginx/pull/8703) Bump actions/dependency-review-action from 1 to 2"
+    - "[8701](https://github.com/kubernetes/ingress-nginx/pull/8701) Fix several typos"
+    - "[8699](https://github.com/kubernetes/ingress-nginx/pull/8699) fix the gosec test and a make target for it"
+    - "[8698](https://github.com/kubernetes/ingress-nginx/pull/8698) Bump actions/upload-artifact from 2.3.1 to 3.1.0"
+    - "[8697](https://github.com/kubernetes/ingress-nginx/pull/8697) Bump actions/setup-go from 2.2.0 to 3.2.0"
+    - "[8695](https://github.com/kubernetes/ingress-nginx/pull/8695) Bump actions/download-artifact from 2 to 3"
+    - "[8694](https://github.com/kubernetes/ingress-nginx/pull/8694) Bump crazy-max/ghaction-docker-buildx from 1.6.2 to 3.3.1"
   artifacthub.io/prerelease: "false"
 apiVersion: v2
-appVersion: 1.1.2
+appVersion: 1.3.0
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
   load balancer
 home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +48,13 @@ icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/5
 keywords:
 - ingress
 - nginx
-kubeVersion: '>=1.19.0-0'
+kubeVersion: '>=1.20.0-0'
 maintainers:
-- name: ChiefAlexander
+- name: rikatz
+- name: strongjz
+- name: tao12345666333
 name: ingress-nginx
 sources:
 - https://github.com/kubernetes/ingress-nginx
 type: application
-version: 4.0.18
+version: 4.2.0
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md b/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md
index ad641f726..942cf0467 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md
@@ -2,7 +2,7 @@
 
 [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
 
-![Version: 4.0.18](https://img.shields.io/badge/Version-4.0.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square)
+![Version: 4.2.0](https://img.shields.io/badge/Version-4.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
 
 To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
 
@@ -111,7 +111,7 @@ controller:
 
 ### AWS L7 ELB with SSL Termination
 
-Annotate the controller as shown in the [nginx-ingress l7 patch](https://github.com/kubernetes/ingress-nginx/blob/main/deploy/aws/l7/service-l7.yaml):
+Annotate the controller as shown in the [nginx-ingress l7 patch](https://github.com/kubernetes/ingress-nginx/blob/ab3a789caae65eec4ad6e3b46b19750b481b6bce/deploy/aws/l7/service-l7.yaml):
 
 ```yaml
 controller:
@@ -128,7 +128,7 @@ controller:
 
 ### AWS route53-mapper
 
-To configure the LoadBalancer service with the [route53-mapper addon](https://github.com/kubernetes/kops/tree/master/addons/route53-mapper), add the `domainName` annotation and `dns` label:
+To configure the LoadBalancer service with the [route53-mapper addon](https://github.com/kubernetes/kops/blob/be63d4f1a7a46daaf1c4c482527328236850f111/addons/route53-mapper/README.md), add the `domainName` annotation and `dns` label:
 
 ```yaml
 controller:
@@ -231,7 +231,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 
 ## Requirements
 
-Kubernetes: `>=1.19.0-0`
+Kubernetes: `>=1.20.0-0`
 
 ## Values
 
@@ -244,7 +244,8 @@ Kubernetes: `>=1.19.0-0`
 | controller.admissionWebhooks.createSecretJob.resources | object | `{}` |  |
 | controller.admissionWebhooks.enabled | bool | `true` |  |
 | controller.admissionWebhooks.existingPsp | string | `""` | Use an existing PSP instead of creating one |
-| controller.admissionWebhooks.failurePolicy | string | `"Fail"` |  |
+| controller.admissionWebhooks.extraEnvs | list | `[]` | Additional environment variables to set |
+| controller.admissionWebhooks.failurePolicy | string | `"Fail"` | Admission Webhook failure policy to use |
 | controller.admissionWebhooks.key | string | `"/usr/local/certificates/key"` |  |
 | controller.admissionWebhooks.labels | object | `{}` | Labels to be added to admission webhooks |
 | controller.admissionWebhooks.namespaceSelector | object | `{}` |  |
@@ -254,7 +255,7 @@ Kubernetes: `>=1.19.0-0`
 | controller.admissionWebhooks.patch.image.digest | string | `"sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660"` |  |
 | controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` |  |
 | controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` |  |
-| controller.admissionWebhooks.patch.image.registry | string | `"k8s.gcr.io"` |  |
+| controller.admissionWebhooks.patch.image.registry | string | `"registry.k8s.io"` |  |
 | controller.admissionWebhooks.patch.image.tag | string | `"v1.1.1"` |  |
 | controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
 | controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` |  |
@@ -306,12 +307,14 @@ Kubernetes: `>=1.19.0-0`
 | controller.hostPort.ports.https | int | `443` | 'hostPort' https port |
 | controller.hostname | object | `{}` | Optionally customize the pod hostname. |
 | controller.image.allowPrivilegeEscalation | bool | `true` |  |
-| controller.image.digest | string | `"sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c"` |  |
+| controller.image.chroot | bool | `false` |  |
+| controller.image.digest | string | `"sha256:d1707ca76d3b044ab8a28277a2466a02100ee9f58a86af1535a3edf9323ea1b5"` |  |
+| controller.image.digestChroot | string | `"sha256:0fcb91216a22aae43b374fc2e6a03b8afe9e8c78cbf07a09d75636dc4ea3c191"` |  |
 | controller.image.image | string | `"ingress-nginx/controller"` |  |
 | controller.image.pullPolicy | string | `"IfNotPresent"` |  |
-| controller.image.registry | string | `"k8s.gcr.io"` |  |
+| controller.image.registry | string | `"registry.k8s.io"` |  |
 | controller.image.runAsUser | int | `101` |  |
-| controller.image.tag | string | `"v1.1.2"` |  |
+| controller.image.tag | string | `"v1.3.0"` |  |
 | controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
 | controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
 | controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |
@@ -399,6 +402,7 @@ Kubernetes: `>=1.19.0-0`
 | controller.service.ipFamilies | list | `["IPv4"]` | List of IP families (e.g. IPv4, IPv6) assigned to the service. This field is usually assigned automatically based on cluster configuration and the ipFamilyPolicy field. |
 | controller.service.ipFamilyPolicy | string | `"SingleStack"` | Represents the dual-stack-ness requested or required by this Service. Possible values are SingleStack, PreferDualStack or RequireDualStack. The ipFamilies and clusterIPs fields depend on the value of this field. |
 | controller.service.labels | object | `{}` |  |
+| controller.service.loadBalancerIP | string | `""` | Used by cloud providers to connect the resulting `LoadBalancer` to a pre-existing static IP according to https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer |
 | controller.service.loadBalancerSourceRanges | list | `[]` |  |
 | controller.service.nodePorts.http | string | `""` |  |
 | controller.service.nodePorts.https | string | `""` |  |
@@ -409,6 +413,7 @@ Kubernetes: `>=1.19.0-0`
 | controller.service.targetPorts.http | string | `"http"` |  |
 | controller.service.targetPorts.https | string | `"https"` |  |
 | controller.service.type | string | `"LoadBalancer"` |  |
+| controller.shareProcessNamespace | bool | `false` |  |
 | controller.sysctls | object | `{}` | See https://kubernetes.io/docs/tasks/administer-cluster/sysctl-cluster/ for notes on enabling and using sysctls |
 | controller.tcp.annotations | object | `{}` | Annotations to be added to the tcp config configmap |
 | controller.tcp.configMapNamespace | string | `""` | Allows customization of the tcp-services-configmap; defaults to $(POD_NAMESPACE) |
@@ -437,7 +442,7 @@ Kubernetes: `>=1.19.0-0`
 | defaultBackend.image.image | string | `"defaultbackend-amd64"` |  |
 | defaultBackend.image.pullPolicy | string | `"IfNotPresent"` |  |
 | defaultBackend.image.readOnlyRootFilesystem | bool | `true` |  |
-| defaultBackend.image.registry | string | `"k8s.gcr.io"` |  |
+| defaultBackend.image.registry | string | `"registry.k8s.io"` |  |
 | defaultBackend.image.runAsNonRoot | bool | `true` |  |
 | defaultBackend.image.runAsUser | int | `65534` |  |
 | defaultBackend.image.tag | string | `"1.5"` |  |
@@ -474,6 +479,7 @@ Kubernetes: `>=1.19.0-0`
 | dhParam | string | `nil` | A base64-encoded Diffie-Hellman parameter. This can be generated with: `openssl dhparam 4096 2> /dev/null | base64` |
 | imagePullSecrets | list | `[]` | Optional array of imagePullSecrets containing private registry credentials |
 | podSecurityPolicy.enabled | bool | `false` |  |
+| portNamePrefix | string | `""` | Prefix for TCP and UDP ports names in ingress controller service |
 | rbac.create | bool | `true` |  |
 | rbac.scope | bool | `false` |  |
 | revisionHistoryLimit | int | `10` | Rollback limit |
@@ -481,6 +487,6 @@ Kubernetes: `>=1.19.0-0`
 | serviceAccount.automountServiceAccountToken | bool | `true` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
-| tcp | object | `{}` | TCP service key:value pairs |
-| udp | object | `{}` | UDP service key:value pairs |
+| tcp | object | `{}` | TCP service key-value pairs |
+| udp | object | `{}` | UDP service key-value pairs |
 
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md.gotmpl b/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md.gotmpl
index 5cd9e59e1..895996111 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md.gotmpl
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/README.md.gotmpl
@@ -110,7 +110,7 @@ controller:
 
 ### AWS L7 ELB with SSL Termination
 
-Annotate the controller as shown in the [nginx-ingress l7 patch](https://github.com/kubernetes/ingress-nginx/blob/main/deploy/aws/l7/service-l7.yaml):
+Annotate the controller as shown in the [nginx-ingress l7 patch](https://github.com/kubernetes/ingress-nginx/blob/ab3a789caae65eec4ad6e3b46b19750b481b6bce/deploy/aws/l7/service-l7.yaml):
 
 ```yaml
 controller:
@@ -127,7 +127,7 @@ controller:
 
 ### AWS route53-mapper
 
-To configure the LoadBalancer service with the [route53-mapper addon](https://github.com/kubernetes/kops/tree/master/addons/route53-mapper), add the `domainName` annotation and `dns` label:
+To configure the LoadBalancer service with the [route53-mapper addon](https://github.com/kubernetes/kops/blob/be63d4f1a7a46daaf1c4c482527328236850f111/addons/route53-mapper/README.md), add the `domainName` annotation and `dns` label:
 
 ```yaml
 controller:
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml
new file mode 100644
index 000000000..90b0f57a5
--- /dev/null
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml
@@ -0,0 +1,18 @@
+controller:
+  kind: DaemonSet
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+  admissionWebhooks:
+    enabled: false
+  service:
+    type: ClusterIP
+
+tcp:
+  9000: "default/test:8080"
+
+udp:
+  9001: "default/test:8080"
+
+portNamePrefix: "port"
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml
new file mode 100644
index 000000000..56323c5ee
--- /dev/null
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml
@@ -0,0 +1,17 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+  admissionWebhooks:
+    enabled: false
+  service:
+    type: ClusterIP
+
+tcp:
+  9000: "default/test:8080"
+
+udp:
+  9001: "default/test:8080"
+
+portNamePrefix: "port"
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
new file mode 100644
index 000000000..95487b071
--- /dev/null
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
@@ -0,0 +1,12 @@
+controller:
+  service:
+    type: ClusterIP
+  admissionWebhooks:
+    enabled: true
+    extraEnvs:
+      - name: FOO
+        value: foo
+      - name: TEST
+        value: test
+    patch:
+      enabled: true
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/_helpers.tpl b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/_helpers.tpl
index a72af5d9d..e69de0c41 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/_helpers.tpl
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/_helpers.tpl
@@ -43,11 +43,40 @@ capabilities:
   - ALL
   add:
   - NET_BIND_SERVICE
+  {{- if .Values.controller.image.chroot }}
+  - SYS_CHROOT
+  {{- end }}
 runAsUser: {{ .Values.controller.image.runAsUser }}
 allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }}
 {{- end }}
 {{- end -}}
 
+{{/*
+Get specific image
+*/}}
+{{- define "ingress-nginx.image" -}}
+{{- if .chroot -}}
+{{- printf "%s-chroot" .image -}}
+{{- else -}}
+{{- printf "%s" .image -}}
+{{- end }}
+{{- end -}}
+
+{{/*
+Get specific image digest
+*/}}
+{{- define "ingress-nginx.imageDigest" -}}
+{{- if .chroot -}}
+{{- if .digestChroot -}}
+{{- printf "@%s" .digestChroot -}}
+{{- end }}
+{{- else -}}
+{{ if .digest -}}
+{{- printf "@%s" .digest -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified controller name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
index f20e247f9..72c17eae4 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -56,6 +56,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+          {{- if .Values.controller.admissionWebhooks.extraEnvs }}
+            {{- toYaml .Values.controller.admissionWebhooks.extraEnvs | nindent 12 }}
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
           {{- if .Values.controller.admissionWebhooks.createSecretJob.resources }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
index 8583685fa..3a1637a64 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -58,6 +58,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+          {{- if .Values.controller.admissionWebhooks.extraEnvs }}
+            {{- toYaml .Values.controller.admissionWebhooks.extraEnvs | nindent 12 }}
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
           {{- if .Values.controller.admissionWebhooks.patchWebhookJob.resources }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/clusterrole.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/clusterrole.yaml
index c093f048a..0e725ec06 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/clusterrole.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/clusterrole.yaml
@@ -29,6 +29,13 @@ rules:
     verbs:
       - list
       - watch
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - list
+      - watch
 {{- if and .Values.controller.scope.enabled .Values.controller.scope.namespace }}
   - apiGroups:
       - ""
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-daemonset.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-daemonset.yaml
index 72811fbe4..2dca8e5c1 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-daemonset.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-daemonset.yaml
@@ -67,11 +67,14 @@ spec:
         - name: {{ $sysctl | quote }}
           value: {{ $value | quote }}
     {{- end }}
+    {{- end }}
+    {{- if .Values.controller.shareProcessNamespace }}
+      shareProcessNamespace: {{ .Values.controller.shareProcessNamespace }}
     {{- end }}
       containers:
         - name: {{ .Values.controller.containerName }}
           {{- with .Values.controller.image }}
-          image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{- end -}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
+          image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{- end -}}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}"
           {{- end }}
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
         {{- if .Values.controller.lifecycle }}
@@ -79,14 +82,7 @@ spec:
         {{- end }}
           args:
             {{- include "ingress-nginx.params" . | nindent 12 }}
-          securityContext:
-            capabilities:
-                drop:
-                - ALL
-                add:
-                - NET_BIND_SERVICE
-            runAsUser: {{ .Values.controller.image.runAsUser }}
-            allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }}
+          securityContext: {{ include "controller.containerSecurityContext" . | nindent 12 }}
           env:
             - name: POD_NAME
               valueFrom:
@@ -128,7 +124,7 @@ spec:
               protocol: TCP
           {{- end }}
           {{- range $key, $value := .Values.tcp }}
-            - name: {{ $key }}-tcp
+            - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
               containerPort: {{ $key }}
               protocol: TCP
               {{- if $.Values.controller.hostPort.enabled }}
@@ -136,7 +132,7 @@ spec:
               {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.udp }}
-            - name: {{ $key }}-udp
+            - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
               containerPort: {{ $key }}
               protocol: UDP
               {{- if $.Values.controller.hostPort.enabled }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-deployment.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-deployment.yaml
index a1943cd91..5b781f8de 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-deployment.yaml
@@ -71,11 +71,14 @@ spec:
         - name: {{ $sysctl | quote }}
           value: {{ $value | quote }}
     {{- end }}
+    {{- end }}
+    {{- if .Values.controller.shareProcessNamespace }}
+      shareProcessNamespace: {{ .Values.controller.shareProcessNamespace }}
     {{- end }}
       containers:
         - name: {{ .Values.controller.containerName }}
           {{- with .Values.controller.image }}
-          image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{- end -}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
+          image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{- end -}}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}"
           {{- end }}
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
         {{- if .Values.controller.lifecycle }}
@@ -125,7 +128,7 @@ spec:
               protocol: TCP
           {{- end }}
           {{- range $key, $value := .Values.tcp }}
-            - name: {{ $key }}-tcp
+            - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
               containerPort: {{ $key }}
               protocol: TCP
               {{- if $.Values.controller.hostPort.enabled }}
@@ -133,7 +136,7 @@ spec:
               {{- end }}
           {{- end }}
           {{- range $key, $value := .Values.udp }}
-            - name: {{ $key }}-udp
+            - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
               containerPort: {{ $key }}
               protocol: UDP
               {{- if $.Values.controller.hostPort.enabled }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-prometheusrules.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-prometheusrules.yaml
index ca5427523..78b5362e8 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-prometheusrules.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-prometheusrules.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.prometheusRule.enabled -}}
+{{- if and ( .Values.controller.metrics.enabled ) ( .Values.controller.metrics.prometheusRule.enabled ) ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-psp.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-psp.yaml
index a859594d1..fe34408c8 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-psp.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-psp.yaml
@@ -12,6 +12,9 @@ metadata:
 spec:
   allowedCapabilities:
     - NET_BIND_SERVICE
+  {{- if .Values.controller.image.chroot }}
+    - SYS_CHROOT
+  {{- end }}
 {{- if .Values.controller.sysctls }}
   allowedUnsafeSysctls:
   {{- range $sysctl, $value := .Values.controller.sysctls }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-role.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-role.yaml
index 47bbc32d0..8e5f8a0d7 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-role.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-role.yaml
@@ -73,6 +73,21 @@ rules:
       - configmaps
     verbs:
       - create
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    resourceNames:
+      - {{ .Values.controller.electionID }}
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - create
   - apiGroups:
       - ""
     resources:
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service-internal.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service-internal.yaml
index 599449836..aae3e155e 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service-internal.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service-internal.yaml
@@ -52,10 +52,10 @@ spec:
     {{- end }}
   {{- end }}
   {{- range $key, $value := .Values.tcp }}
-    - name: {{ $key }}-tcp
+    - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
       port: {{ $key }}
       protocol: TCP
-      targetPort: {{ $key }}-tcp
+      targetPort: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
     {{- if $.Values.controller.service.nodePorts.tcp }}
     {{- if index $.Values.controller.service.nodePorts.tcp $key }}
       nodePort: {{ index $.Values.controller.service.nodePorts.tcp $key }}
@@ -63,10 +63,10 @@ spec:
     {{- end }}
   {{- end }}
   {{- range $key, $value := .Values.udp }}
-    - name: {{ $key }}-udp
+    - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
       port: {{ $key }}
       protocol: UDP
-      targetPort: {{ $key }}-udp
+      targetPort: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
     {{- if $.Values.controller.service.nodePorts.udp }}
     {{- if index $.Values.controller.service.nodePorts.udp $key }}
       nodePort: {{ index $.Values.controller.service.nodePorts.udp $key }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service.yaml
index 05fb2041e..2b28196de 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/templates/controller-service.yaml
@@ -37,12 +37,12 @@ spec:
 {{- if .Values.controller.service.healthCheckNodePort }}
   healthCheckNodePort: {{ .Values.controller.service.healthCheckNodePort }}
 {{- end }}
-{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version -}}
 {{- if .Values.controller.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.controller.service.ipFamilyPolicy }}
 {{- end }}
 {{- end }}
-{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version -}}
+{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version -}}
 {{- if .Values.controller.service.ipFamilies }}
   ipFamilies: {{ toYaml .Values.controller.service.ipFamilies | nindent 4 }}
 {{- end }}
@@ -74,10 +74,10 @@ spec:
     {{- end }}
   {{- end }}
   {{- range $key, $value := .Values.tcp }}
-    - name: {{ $key }}-tcp
+    - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
       port: {{ $key }}
       protocol: TCP
-      targetPort: {{ $key }}-tcp
+      targetPort: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
     {{- if $.Values.controller.service.nodePorts.tcp }}
     {{- if index $.Values.controller.service.nodePorts.tcp $key }}
       nodePort: {{ index $.Values.controller.service.nodePorts.tcp $key }}
@@ -85,10 +85,10 @@ spec:
     {{- end }}
   {{- end }}
   {{- range $key, $value := .Values.udp }}
-    - name: {{ $key }}-udp
+    - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
       port: {{ $key }}
       protocol: UDP
-      targetPort: {{ $key }}-udp
+      targetPort: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-udp
     {{- if $.Values.controller.service.nodePorts.udp }}
     {{- if index $.Values.controller.service.nodePorts.udp $key }}
       nodePort: {{ index $.Values.controller.service.nodePorts.udp $key }}
diff --git a/scripts/helmcharts/openreplay/charts/ingress-nginx/values.yaml b/scripts/helmcharts/openreplay/charts/ingress-nginx/values.yaml
index c887dc051..cddc2c742 100644
--- a/scripts/helmcharts/openreplay/charts/ingress-nginx/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/ingress-nginx/values.yaml
@@ -16,13 +16,16 @@ commonLabels: {}
 controller:
   name: controller
   image:
-    registry: k8s.gcr.io
+    ## Keep false as default for now!
+    chroot: false
+    registry: registry.k8s.io
     image: ingress-nginx/controller
     ## for backwards compatibility consider setting the full image url via the repository value below
     ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
     ## repository:
-    tag: "v1.1.2"
-    digest: sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c
+    tag: "v1.3.0"
+    digest: sha256:d1707ca76d3b044ab8a28277a2466a02100ee9f58a86af1535a3edf9323ea1b5
+    digestChroot: sha256:0fcb91216a22aae43b374fc2e6a03b8afe9e8c78cbf07a09d75636dc4ea3c191
     pullPolicy: IfNotPresent
     # www-data -> uid 101
     runAsUser: 101
@@ -272,7 +275,7 @@ controller:
   ##
   topologySpreadConstraints: []
     # - maxSkew: 1
-    #   topologyKey: failure-domain.beta.kubernetes.io/zone
+    #   topologyKey: topology.kubernetes.io/zone
     #   whenUnsatisfiable: DoNotSchedule
     #   labelSelector:
     #     matchLabels:
@@ -457,7 +460,8 @@ controller:
     ##
     externalIPs: []
 
-    # loadBalancerIP: ""
+    # -- Used by cloud providers to connect the resulting `LoadBalancer` to a pre-existing static IP according to https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+    loadBalancerIP: ""
     loadBalancerSourceRanges: []
 
     enableHttp: true
@@ -529,6 +533,10 @@ controller:
       ## Ref: https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer
       # externalTrafficPolicy: ""
 
+  # shareProcessNamespace enables process namespace sharing within the pod.
+  # This can be used for example to signal log rotation using `kill -USR1` from a sidecar.
+  shareProcessNamespace: false
+
   # -- Additional containers to be added to the controller pod.
   # See https://github.com/lemonldap-ng-controller/lemonldap-ng-controller as example.
   extraContainers: []
@@ -572,7 +580,7 @@ controller:
   extraModules: []
   ## Modules, which are mounted into the core nginx image
   # - name: opentelemetry
-  #   image: busybox
+  #   image: registry.k8s.io/ingress-nginx/opentelemetry:v20220415-controller-v1.2.0-beta.0-2-g81c2afd97@sha256:ce61e2cf0b347dffebb2dcbf57c33891d2217c1bad9c0959c878e5be671ef941
   #
   # The image must contain a `/usr/local/bin/init_module.sh` executable, which
   # will be executed as initContainers, to move its config files within the
@@ -586,6 +594,15 @@ controller:
     ## These annotations will be added to the ValidatingWebhookConfiguration and
     ## the Jobs Spec of the admission webhooks.
     enabled: true
+    # -- Additional environment variables to set
+    extraEnvs: []
+    # extraEnvs:
+    #   - name: FOO
+    #     valueFrom:
+    #       secretKeyRef:
+    #         key: FOO
+    #         name: secret-resource
+    # -- Admission Webhook failure policy to use
     failurePolicy: Fail
     # timeoutSeconds: 10
     port: 8443
@@ -623,7 +640,7 @@ controller:
     patch:
       enabled: true
       image:
-        registry: k8s.gcr.io
+        registry: registry.k8s.io
         image: ingress-nginx/kube-webhook-certgen
         ## for backwards compatibility consider setting the full image url via the repository value below
         ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
@@ -750,7 +767,7 @@ defaultBackend:
 
   name: defaultbackend
   image:
-    registry: k8s.gcr.io
+    registry: registry.k8s.io
     image: defaultbackend-amd64
     ## for backwards compatibility consider setting the full image url via the repository value below
     ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
@@ -901,18 +918,22 @@ serviceAccount:
 imagePullSecrets: []
 # - name: secretName
 
-# -- TCP service key:value pairs
+# -- TCP service key-value pairs
 ## Ref: https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/exposing-tcp-udp-services.md
 ##
 tcp: {}
 #  8080: "default/example-tcp-svc:9000"
 
-# -- UDP service key:value pairs
+# -- UDP service key-value pairs
 ## Ref: https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/exposing-tcp-udp-services.md
 ##
 udp: {}
 #  53: "kube-system/kube-dns:53"
 
+# -- Prefix for TCP and UDP ports names in ingress controller service
+## Some cloud providers, like Yandex Cloud may have a requirements for a port name regex to support cloud load balancer integration
+portNamePrefix: ""
+
 # -- (string) A base64-encoded Diffie-Hellman parameter.
 # This can be generated with: `openssl dhparam 4096 2> /dev/null | base64`
 ## Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param

From d3c630e42110ec7dbb7f7edd1beb248565d80a54 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 28 Jul 2022 12:23:03 +0200
Subject: [PATCH 77/77] feat(chalice): get all integrations status

---
 api/chalicelib/core/integration_github.py     |  3 +-
 api/chalicelib/core/integration_jira_cloud.py |  3 +-
 api/chalicelib/core/integrations_global.py    | 61 +++++++++++++++++++
 api/routers/core.py                           | 10 ++-
 api/schemas.py                                | 17 +++++-
 ee/api/chalicelib/core/integrations_global.py | 61 +++++++++++++++++++
 .../db/init_dbs/postgresql/init_schema.sql    | 32 +++++-----
 7 files changed, 167 insertions(+), 20 deletions(-)
 create mode 100644 api/chalicelib/core/integrations_global.py
 create mode 100644 ee/api/chalicelib/core/integrations_global.py

diff --git a/api/chalicelib/core/integration_github.py b/api/chalicelib/core/integration_github.py
index a05c946f4..2de8cc518 100644
--- a/api/chalicelib/core/integration_github.py
+++ b/api/chalicelib/core/integration_github.py
@@ -1,8 +1,9 @@
+import schemas
 from chalicelib.core import integration_base
 from chalicelib.core.integration_github_issue import GithubIntegrationIssue
 from chalicelib.utils import pg_client, helper
 
-PROVIDER = "GITHUB"
+PROVIDER = schemas.IntegrationType.github
 
 
 class GitHubIntegration(integration_base.BaseIntegration):
diff --git a/api/chalicelib/core/integration_jira_cloud.py b/api/chalicelib/core/integration_jira_cloud.py
index 7d8c956cf..469723e4e 100644
--- a/api/chalicelib/core/integration_jira_cloud.py
+++ b/api/chalicelib/core/integration_jira_cloud.py
@@ -1,8 +1,9 @@
+import schemas
 from chalicelib.core import integration_base
 from chalicelib.core.integration_jira_cloud_issue import JIRACloudIntegrationIssue
 from chalicelib.utils import pg_client, helper
 
-PROVIDER = "JIRA"
+PROVIDER = schemas.IntegrationType.jira
 
 
 def obfuscate_string(string):
diff --git a/api/chalicelib/core/integrations_global.py b/api/chalicelib/core/integrations_global.py
new file mode 100644
index 000000000..5b00a28bd
--- /dev/null
+++ b/api/chalicelib/core/integrations_global.py
@@ -0,0 +1,61 @@
+import schemas
+from chalicelib.utils import pg_client
+
+
+def get_global_integrations_status(tenant_id, user_id, project_id):
+    with pg_client.PostgresClient() as cur:
+        cur.execute(
+            cur.mogrify(f"""\
+                    SELECT EXISTS((SELECT 1
+                               FROM public.oauth_authentication
+                               WHERE user_id = %(user_id)s
+                                 AND provider = 'github')) AS {schemas.IntegrationType.github},
+                           EXISTS((SELECT 1
+                                   FROM public.jira_cloud
+                                   WHERE user_id = %(user_id)s)) AS {schemas.IntegrationType.jira},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='bugsnag')) AS {schemas.IntegrationType.bugsnag},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='cloudwatch')) AS {schemas.IntegrationType.cloudwatch},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='datadog')) AS {schemas.IntegrationType.datadog},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='newrelic')) AS {schemas.IntegrationType.newrelic},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='rollbar')) AS {schemas.IntegrationType.rollbar},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='sentry')) AS {schemas.IntegrationType.sentry},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='stackdriver')) AS {schemas.IntegrationType.stackdriver},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='sumologic')) AS {schemas.IntegrationType.sumologic},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='elasticsearch')) AS {schemas.IntegrationType.elasticsearch},
+                           EXISTS((SELECT 1
+                                   FROM public.webhooks
+                                   WHERE type='slack')) AS {schemas.IntegrationType.slack};""",
+                        {"user_id": user_id, "tenant_id": tenant_id, "project_id": project_id})
+        )
+        current_integrations = cur.fetchone()
+    result = []
+    for k in current_integrations.keys():
+        result.append({"name": k, "integrated": current_integrations[k]})
+    return result
diff --git a/api/routers/core.py b/api/routers/core.py
index 2c3ff5b90..f9629d8bb 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -12,7 +12,7 @@ from chalicelib.core import log_tool_rollbar, sourcemaps, events, sessions_assig
     log_tool_cloudwatch, log_tool_sentry, log_tool_sumologic, log_tools, errors, sessions, \
     log_tool_newrelic, announcements, log_tool_bugsnag, weekly_report, integration_jira_cloud, integration_github, \
     assist, heatmaps, mobile, signup, tenants, errors_favorite_viewed, boarding, notifications, webhook, users, \
-    custom_metrics, saved_search
+    custom_metrics, saved_search, integrations_global
 from chalicelib.core.collaboration_slack import Slack
 from chalicelib.utils import email_helper, helper, captcha
 from chalicelib.utils.TimeUTC import TimeUTC
@@ -180,6 +180,14 @@ def session_top_filter_values(projectId: int, context: schemas.CurrentContext =
     return {'data': sessions_metas.get_top_key_values(projectId)}
 
 
+@app.get('/{projectId}/integrations', tags=["integrations"])
+def get_integrations_status(projectId: int, context: schemas.CurrentContext = Depends(OR_context)):
+    data = integrations_global.get_global_integrations_status(tenant_id=context.tenant_id,
+                                                               user_id=context.user_id,
+                                                               project_id=projectId)
+    return {"data": data}
+
+
 @app.post('/{projectId}/integrations/{integration}/notify/{integrationId}/{source}/{sourceId}', tags=["integrations"])
 @app.put('/{projectId}/integrations/{integration}/notify/{integrationId}/{source}/{sourceId}', tags=["integrations"])
 def integration_notify(projectId: int, integration: str, integrationId: int, source: str, sourceId: str,
diff --git a/api/schemas.py b/api/schemas.py
index 314a0f7d2..81d2bffab 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -1024,7 +1024,7 @@ class LiveFilterType(str, Enum):
     user_UUID = "USERUUID"
     tracker_version = "TRACKERVERSION"
     user_browser_version = "USERBROWSERVERSION"
-    user_device_type = "USERDEVICETYPE",
+    user_device_type = "USERDEVICETYPE"
 
 
 class LiveSessionSearchFilterSchema(BaseModel):
@@ -1068,3 +1068,18 @@ class LiveSessionsSearchPayloadSchema(_PaginatedSchema):
 
     class Config:
         alias_generator = attribute_to_camel_case
+
+
+class IntegrationType(str, Enum):
+    github = "GITHUB"
+    jira = "JIRA"
+    slack = "SLACK"
+    sentry = "SENTRY"
+    bugsnag = "BUGSNAG"
+    rollbar = "ROLLBAR"
+    elasticsearch = "ELASTICSEARCH"
+    datadog = "DATADOG"
+    sumologic = "SUMOLOGIC"
+    stackdriver = "STACKDRIVER"
+    cloudwatch = "CLOUDWATCH"
+    newrelic = "NEWRELIC"
diff --git a/ee/api/chalicelib/core/integrations_global.py b/ee/api/chalicelib/core/integrations_global.py
new file mode 100644
index 000000000..b923fc5ab
--- /dev/null
+++ b/ee/api/chalicelib/core/integrations_global.py
@@ -0,0 +1,61 @@
+import schemas
+from chalicelib.utils import pg_client
+
+
+def get_global_integrations_status(tenant_id, user_id, project_id):
+    with pg_client.PostgresClient() as cur:
+        cur.execute(
+            cur.mogrify(f"""\
+                    SELECT EXISTS((SELECT 1
+                               FROM public.oauth_authentication
+                               WHERE user_id = %(user_id)s
+                                 AND provider = 'github')) AS {schemas.IntegrationType.github},
+                           EXISTS((SELECT 1
+                                   FROM public.jira_cloud
+                                   WHERE user_id = %(user_id)s)) AS {schemas.IntegrationType.jira},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='bugsnag')) AS {schemas.IntegrationType.bugsnag},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='cloudwatch')) AS {schemas.IntegrationType.cloudwatch},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='datadog')) AS {schemas.IntegrationType.datadog},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='newrelic')) AS {schemas.IntegrationType.newrelic},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='rollbar')) AS {schemas.IntegrationType.rollbar},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='sentry')) AS {schemas.IntegrationType.sentry},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='stackdriver')) AS {schemas.IntegrationType.stackdriver},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='sumologic')) AS {schemas.IntegrationType.sumologic},
+                           EXISTS((SELECT 1
+                                   FROM public.integrations
+                                   WHERE project_id=%(project_id)s 
+                                        AND provider='elasticsearch')) AS {schemas.IntegrationType.elasticsearch},
+                           EXISTS((SELECT 1
+                                   FROM public.webhooks
+                                   WHERE type='slack' AND tenant_id=%(tenant_id)s)) AS {schemas.IntegrationType.slack};""",
+                        {"user_id": user_id, "tenant_id": tenant_id, "project_id": project_id})
+        )
+        current_integrations = cur.fetchone()
+    result = []
+    for k in current_integrations.keys():
+        result.append({"name": k, "integrated": current_integrations[k]})
+    return result
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index e236ce90e..dfae901c5 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -659,24 +659,24 @@ $$
             );
 
             CREATE UNIQUE INDEX IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
-            CREATE index IF NOT EXISTS autocomplete_project_id_idx ON autocomplete (project_id);
+            CREATE INDEX IF NOT EXISTS autocomplete_project_id_idx ON autocomplete (project_id);
             CREATE INDEX IF NOT EXISTS autocomplete_type_idx ON public.autocomplete (type);
 
-            CREATE INDEX autocomplete_value_clickonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CLICK';
-            CREATE INDEX autocomplete_value_customonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CUSTOM';
-            CREATE INDEX autocomplete_value_graphqlonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'GRAPHQL';
-            CREATE INDEX autocomplete_value_inputonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'INPUT';
-            CREATE INDEX autocomplete_value_locationonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'LOCATION';
-            CREATE INDEX autocomplete_value_referreronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REFERRER';
-            CREATE INDEX autocomplete_value_requestonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REQUEST';
-            CREATE INDEX autocomplete_value_revidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REVID';
-            CREATE INDEX autocomplete_value_stateactiononly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'STATEACTION';
-            CREATE INDEX autocomplete_value_useranonymousidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERANONYMOUSID';
-            CREATE INDEX autocomplete_value_userbrowseronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERBROWSER';
-            CREATE INDEX autocomplete_value_usercountryonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERCOUNTRY';
-            CREATE INDEX autocomplete_value_userdeviceonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERDEVICE';
-            CREATE INDEX autocomplete_value_useridonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERID';
-            CREATE INDEX autocomplete_value_userosonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USEROS';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_clickonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CLICK';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_customonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CUSTOM';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_graphqlonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'GRAPHQL';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_inputonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'INPUT';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_locationonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'LOCATION';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_referreronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REFERRER';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_requestonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REQUEST';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_revidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REVID';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_stateactiononly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'STATEACTION';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_useranonymousidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERANONYMOUSID';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_userbrowseronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERBROWSER';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_usercountryonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERCOUNTRY';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_userdeviceonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERDEVICE';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_useridonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERID';
+            CREATE INDEX IF NOT EXISTS autocomplete_value_userosonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USEROS';
 
             BEGIN
                 IF NOT EXISTS(SELECT *