From b74a7d1e8ceee2a9822bb3f612b506092cd75af3 Mon Sep 17 00:00:00 2001
From: zodern <zodern@users.noreply.github.com>
Date: Tue, 13 Jun 2023 12:12:33 -0500
Subject: [PATCH] Clean up run-app.js

---
 tools/runners/run-app.js | 66 ++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index 6bbed38ec9..26d714d006 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -13,7 +13,7 @@ import { pluginVersionsFromStarManifest } from '../cordova/index.js';
 import { closeAllWatchers } from "../fs/safe-watcher";
 import { eachline } from "../utils/eachline";
 import { loadIsopackage } from '../tool-env/isopackets.js';
-import { once , EventEmitter, on }  from "events"
+
 // Parse out s as if it were a bash command line.
 var bashParse = function (s) {
   if (s.search("\"") !== -1 || s.search("'") !== -1) {
@@ -419,38 +419,26 @@ Object.assign(AppRunner.prototype, {
     self.startPromise = null;
   },
 
-  _findCachedEE: function (name) {
-    if (!this._promiseResolvers[name]) {
-      this._promiseResolvers[name] = new EventEmitter();
-    }
-    return this._promiseResolvers[name];
+  // Creates a promise that can be resolved later by calling _resolvePromise
+  _makePromise (name) {
+    return new Promise((resolve) => {
+      this._promiseResolvers[name] = resolve;
+    });
   },
 
-  /**
-   * @param name
-   * @return {Promise<[any]>}
-   * @private
-   */
-  _makePromise: function (name) {
-    var self = this;
-    const ee = self._findCachedEE(name);
-    return once(ee, name);
-  },
-
-  _resolvePromise: function (name, value) {
-    const ee = this._promiseResolvers[name];
-    if (ee) {
-      ee.emit(name, value);
+  // Resolves a promise already created by _makePromise
+  _resolvePromise (name, value) {
+    const resolve = this._promiseResolvers[name];
+    if (resolve) {
       this._promiseResolvers[name] = null;
+      resolve(value);
     }
   },
 
   _cleanUpPromises: function () {
     if (this._promiseResolvers) {
-      _.each(this._promiseResolvers, (ee,name) => {
-        if (ee) {
-          ee.emit(name, null);
-        }
+      Object.values(this._promiseResolvers).forEach(resolve => {
+        resolve && resolve();
       });
       this._promiseResolvers = null;
     }
@@ -474,8 +462,10 @@ Object.assign(AppRunner.prototype, {
 
     // The existence of this promise makes the fiber break out of its loop.
     self.exitPromise = self._makePromise("exit");
+
     self._resolvePromise("run", { outcome: 'stopped' });
     self._resolvePromise("watch");
+
     if (self._beforeStartPromise) {
       // If we stopped before mongod started (eg, due to mongod startup
       // failure), unblock the runner fiber from waiting for mongod to start.
@@ -520,6 +510,7 @@ Object.assign(AppRunner.prototype, {
         // it even if we refreshed previously, since that might have been a
         // little while ago.
         catalog.triedToRefreshRecently = false;
+
         // If this isn't the first time we've run, we need to reset the project
         // context since everything we have cached may have changed.
         // XXX We can try to be a little less conservative here:
@@ -540,7 +531,9 @@ Object.assign(AppRunner.prototype, {
           // shown from the previous solution.
           preservePackageMap: true
         });
-        var messages = await buildmessage.capture(() => self.projectContext.readProjectMetadata());
+        var messages = await buildmessage.capture(() => {
+          return self.projectContext.readProjectMetadata()
+        });
         if (messages.hasMessages()) {
           return {
             runResult: {
@@ -759,11 +752,12 @@ Object.assign(AppRunner.prototype, {
     });
 
     if (options.firstRun && self._beforeStartPromise) {
-        var [stopped] = await self._beforeStartPromise;
-        if (stopped) {
-          return true;
-        }
+      var stopped = await self._beforeStartPromise;
+      if (stopped) {
+        return true;
+      }
     }
+
     await appProcess.start();
 
     function maybePrintLintWarnings(bundleResult) {
@@ -816,7 +810,7 @@ Object.assign(AppRunner.prototype, {
     }
 
     var setupClientWatcher = function () {
-      clientWatcher &&  clientWatcher.stop();
+      clientWatcher && clientWatcher.stop();
       clientWatcher = new watch.Watcher({
         watchSet: bundleResult.clientWatchSet,
         onChange: function () {
@@ -896,7 +890,7 @@ Object.assign(AppRunner.prototype, {
 
     // Wait for either the process to exit, or (if watchForChanges) a
     // source file to change. Or, for stop() to be called.
-    var [ret] = await runPromise;
+    var ret = await runPromise;
     try {
       while (ret.outcome === 'changed-refreshable') {
         if (! canRefreshClient) {
@@ -927,7 +921,7 @@ Object.assign(AppRunner.prototype, {
         if (postStartupResult) return postStartupResult;
 
         // Wait until another file changes.
-        [ret] = await oldPromise;
+        ret = await oldPromise;
       }
     } finally {
       self.runPromise = null;
@@ -942,8 +936,8 @@ Object.assign(AppRunner.prototype, {
       }
       await appProcess.stop();
 
-      serverWatcher &&  serverWatcher.stop();
-      clientWatcher &&  clientWatcher.stop();
+      serverWatcher && serverWatcher.stop();
+      clientWatcher && clientWatcher.stop();
     }
 
     return ret;
@@ -1014,7 +1008,7 @@ Object.assign(AppRunner.prototype, {
       }
 
       if (self.watchForChanges) {
-        self.watchPromise =  self._makePromise("watch");
+        self.watchPromise = self._makePromise("watch");
 
         if (!runResult.watchSet) {
           throw Error("watching for changes with no watchSet?");