Merge pull request #14526 from brave/riastradh-tor-cookieportorder

Fix order of reading notifications for tor launch.

app/tor.js

@@ -133,6 +133,7 @@ class TorDaemon extends EventEmitter {
     // Begin watching for the control port file to be written.
     const watchDir = torWatchDirPath()
     const watchOpts = {persistent: false}
+    assert(this._watcher === null)
     this._watcher = fs.watch(watchDir, watchOpts, (event, filename) => {
       this._watchEvent(event, filename)
     })
@@ -150,6 +151,9 @@ class TorDaemon extends EventEmitter {
    * Kill the tor daemon.
    */
   kill () {
+    assert(this._watcher)
+    this._watcher.close()
+    this._watcher = null
     if (!this._process) {
       assert(this._process === null)
       assert(this._control === null)
@@ -173,14 +177,15 @@ class TorDaemon extends EventEmitter {
    * @param {string} filename
    */
   _watchEvent (event, filename) {
-    assert(this._watcher)
-
     // If the process died in the interim, give up.
     if (!this._process) {
       console.log('tor: process dead, ignoring watch event')
       return
     }
 
+    // Watcher shouldn't be there without process.
+    assert(this._watcher)
+
     // If the control connection is already open, nothing to do.
     if (this._control) {
       return
@@ -228,7 +233,7 @@ class TorDaemon extends EventEmitter {
     assert(this._control === null)
     assert(this._polling)
 
-    this._eatControlPort((err, portno, portMtime) => {
+    this._eatControlCookie((err, cookie, cookieMtime) => {
       if (err) {
         // If there's an error, don't worry: the file may have been
         // written incompletely, and we will, with any luck, be notified
@@ -248,7 +253,7 @@ class TorDaemon extends EventEmitter {
       assert(this._control === null)
       assert(this._polling)
 
-      this._eatControlCookie((err, cookie, cookieMtime) => {
+      this._eatControlPort((err, portno, portMtime) => {
         if (err) {
           // If there's an error, don't worry: the file may not be
           // ready yet, and we'll be notified when it is.
@@ -288,7 +293,7 @@ class TorDaemon extends EventEmitter {
    */
   _polled () {
     assert(this._polling)
-    if (this._retry_polling && this._control === null) {
+    if (this._retry_poll && this._control === null) {
       return process.nextTick(() => this._doPoll())
     }
     this._polling = false