From ce38c88a18dd64e2f0a03f96481cc02eaa81a65f Mon Sep 17 00:00:00 2001
From: ShiKhu <alex.kaminsky.11@gmail.com>
Date: Thu, 2 Sep 2021 19:40:23 +0200
Subject: [PATCH] feat (tracker-assist): 3.1.0 ignore start callback if
 restarting internally

---
 tracker/tracker-assist/package-lock.json | 15 +++++++++++----
 tracker/tracker-assist/package.json      |  6 +++---
 tracker/tracker-assist/src/index.ts      |  7 ++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tracker/tracker-assist/package-lock.json b/tracker/tracker-assist/package-lock.json
index 82d1c013c..d797a86d4 100644
--- a/tracker/tracker-assist/package-lock.json
+++ b/tracker/tracker-assist/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@openreplay/tracker-assist",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -30,6 +30,12 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "@medv/finder": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@medv/finder/-/finder-2.1.0.tgz",
+      "integrity": "sha512-Egrg5XO4kLol24b1Kv50HDfi5hW0yQ6aWSsO0Hea1eJ4rogKElIN0M86FdVnGF4XIGYyA7QWx0MgbOzVPA0qkA==",
+      "dev": true
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -57,11 +63,12 @@
       }
     },
     "@openreplay/tracker": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@openreplay/tracker/-/tracker-3.0.5.tgz",
-      "integrity": "sha512-hIY7DnQmm7bCe6v+e257WD7OdNuBOWUZ15Q3yUEdyxu7xDNG7brbak9pS97qCt3VY9xGK0RvW/j3ANlRPk8aVg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@openreplay/tracker/-/tracker-3.3.0.tgz",
+      "integrity": "sha512-g9sOG01VaiRLw4TcUbux8j3moa7gsGs8rjZPEVJ5SJqxjje9R7tpUD5UId9ne7QdHSoiHfrWFk3TNRLpXyvImg==",
       "dev": true,
       "requires": {
+        "@medv/finder": "^2.0.0",
         "error-stack-parser": "^2.0.6"
       }
     },
diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index 42f0358f0..067fbe302 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.0.3",
+  "version": "3.1.0",
   "keywords": [
     "WebRTC",
     "assistance",
@@ -24,10 +24,10 @@
     "peerjs": "^1.3.2"
   },
   "peerDependencies": {
-    "@openreplay/tracker": "^3.1.0"
+    "@openreplay/tracker": "^3.3.0"
   },
   "devDependencies": {
-    "@openreplay/tracker": "^3.0.5",
+    "@openreplay/tracker": "^3.3.0",
     "prettier": "^1.18.2",
     "replace-in-files-cli": "^1.0.0",
     "typescript": "^3.6.4"
diff --git a/tracker/tracker-assist/src/index.ts b/tracker/tracker-assist/src/index.ts
index 3ec90b141..e5a7085b6 100644
--- a/tracker/tracker-assist/src/index.ts
+++ b/tracker/tracker-assist/src/index.ts
@@ -34,7 +34,10 @@ export default function(opts: Partial<Options> = {})  {
       return;
     }
 
+    let observerRestart = false;
+
     app.attachStartCallback(function() {
+      if (observerRestart) { return; }
       // @ts-ignore
       const peerID = `${app.projectKey}-${app.getSessionID()}`
       const peer = new Peer(peerID, {
@@ -66,6 +69,8 @@ export default function(opts: Partial<Options> = {})  {
               buffering = false;
             }
           }
+
+          observerRestart = true;
           app.stop();
           //@ts-ignore (should update tracker dependency)
           app.addCommitCallback((messages: Array<Message>): void => {
@@ -78,7 +83,7 @@ export default function(opts: Partial<Options> = {})  {
               sendNext(); 
             }
           });
-          app.start();
+          app.start().then(() => { observerRestart = false; });
         });
       });