From 83d45fdcc7c569cbb82ed5b510560d0d2ec15efc Mon Sep 17 00:00:00 2001
From: Krzysztof Sikorski <krzysztof@mksikorscy.pl>
Date: Tue, 16 Nov 2021 00:33:17 +0100
Subject: [PATCH] Remove unnecessary properties from submitted data

---
 src/background.js        | 10 +---------
 src/nexusData.js         | 18 ------------------
 src/nexusDataQueue.js    |  3 ---
 src/nexusDataSender.js   |  3 ---
 src/webRequestMonitor.js |  4 +---
 5 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/src/background.js b/src/background.js
index f8969ac..cf6460e 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,14 +1,6 @@
 /* global NexusDataQueue, NexusDataSender, Preferences, WebRequestMonitor */
 'use strict'
 
-function generateSessionId() {
-  const timestamp = Date.now()
-  const suffix = 1000000 * Math.random()
-  return `${timestamp}_${suffix}`
-}
-
-const sessionId = generateSessionId()
-
 const preferences = new Preferences()
 preferences.load()
 preferences.listenForStorageChanges()
@@ -17,5 +9,5 @@ const nexusDataQueue = new NexusDataQueue()
 
 const nexusDataSender = new NexusDataSender(preferences)
 
-const webRequestMonitor = new WebRequestMonitor(sessionId, nexusDataQueue, nexusDataSender)
+const webRequestMonitor = new WebRequestMonitor(nexusDataQueue, nexusDataSender)
 webRequestMonitor.addListeners()
diff --git a/src/nexusData.js b/src/nexusData.js
index 29ad7d4..ccfd28a 100644
--- a/src/nexusData.js
+++ b/src/nexusData.js
@@ -3,9 +3,7 @@
 
 class NexusData {
   constructor() {
-    this._sessionId = null
     this._requestId = null
-    this._previousRequestId = null
     this._requestStartedAt = null
     this._responseCompletedAt = null
     this._method = null
@@ -14,14 +12,6 @@ class NexusData {
     this._responseBodyParts = []
   }
 
-  get sessionId() {
-    return this._sessionId
-  }
-
-  set sessionId(value) {
-    this._sessionId = value
-  }
-
   get requestId() {
     return this._requestId
   }
@@ -30,14 +20,6 @@ class NexusData {
     this._requestId = value
   }
 
-  get previousRequestId() {
-    return this._previousRequestId
-  }
-
-  set previousRequestId(value) {
-    this._previousRequestId = value
-  }
-
   get requestStartedAt() {
     return this._requestStartedAt
   }
diff --git a/src/nexusDataQueue.js b/src/nexusDataQueue.js
index 1d3ff01..2abeca2 100644
--- a/src/nexusDataQueue.js
+++ b/src/nexusDataQueue.js
@@ -5,15 +5,12 @@
 class NexusDataQueue {
   constructor() {
     this._data = new Map()
-    this._currentRequestId = null
   }
 
   push(nexusData) {
     if (!(nexusData instanceof NexusData)) {
       window.console.error('[NexusDataQueue] push: argument is not an instance of NexusData!')
     }
-    nexusData.previousRequestId = this._currentRequestId
-    this._currentRequestId = nexusData.requestId
     this._data.set(nexusData.requestId, nexusData)
   }
 
diff --git a/src/nexusDataSender.js b/src/nexusDataSender.js
index 4b23676..2d363fa 100644
--- a/src/nexusDataSender.js
+++ b/src/nexusDataSender.js
@@ -25,9 +25,6 @@ class NexusDataSender {
     }
 
     const jsonData = {
-      sessionId: nexusData.sessionId,
-      requestId: nexusData.requestId,
-      previousRequestId: nexusData.previousRequestId,
       requestStartedAt: this._formatDate(nexusData.requestStartedAt),
       responseCompletedAt: this._formatDate(nexusData.responseCompletedAt),
       method: nexusData.method,
diff --git a/src/webRequestMonitor.js b/src/webRequestMonitor.js
index df92c90..05d75c3 100644
--- a/src/webRequestMonitor.js
+++ b/src/webRequestMonitor.js
@@ -3,14 +3,13 @@
 'use strict'
 
 class WebRequestMonitor {
-  constructor(sessionId, nexusDataQueue, nexusDataSender) {
+  constructor(nexusDataQueue, nexusDataSender) {
     if (!(nexusDataQueue instanceof NexusDataQueue)) {
       window.console.error('[NexusDataSender] constructor: argument is not an instance of NexusDataQueue!')
     }
     if (!(nexusDataSender instanceof NexusDataSender)) {
       window.console.error('[NexusDataSender] constructor: argument is not an instance of NexusDataSender!')
     }
-    this._sessionId = sessionId
     this._nexusDataQueue = nexusDataQueue
     this._nexusDataSender = nexusDataSender
   }
@@ -34,7 +33,6 @@ class WebRequestMonitor {
 
   _onBeforeRequest(details) {
     const nexusData = new NexusData()
-    nexusData.sessionId = this._sessionId
     nexusData.requestId = details.requestId
     nexusData.requestStartedAt = details.timeStamp
     nexusData.method = details.method