refactor: Swap ps-tree for tree-kill because of WMIC removal

Author: colin969

package-lock.json

@@ -50,7 +50,6 @@
     "minimist": "^1.2.7",
     "node-7z": "3.0.0",
     "open": "^10.1.0",
-    "ps-tree": "1.2.0",
     "react": "17.0.2",
     "react-color": "2.18.0",
     "react-contenteditable": "^3.3.7",
@@ -67,6 +66,7 @@
     "remark-gfm": "2.0.0",
     "tail": "2.0.3",
     "terminate": "2.6.1",
+    "tree-kill": "^1.2.2",
     "typesafe-actions": "4.4.2",
     "uuid": "3.3.2",
     "uuid-validate": "0.0.3",

package.json

@@ -3,11 +3,10 @@ import { IBackProcessInfo, INamedBackProcessInfo, ProcessState } from '@shared/i
 import * as Coerce from '@shared/utils/Coerce';
 import { ChildProcess, spawn } from 'child_process';
 import { EventEmitter } from 'events';
-import { kill as processKill } from 'process';
-import * as psTree from 'ps-tree';
 import * as readline from 'readline';
-import { Disposable } from './util/lifecycle';
+import * as kill from 'tree-kill';
 import { onServiceChange } from './util/events';
+import { Disposable } from './util/lifecycle';
 
 const { str } = Coerce;
 
@@ -183,27 +182,18 @@ export class ManagedChildProcess extends EventEmitter {
   }
 
   private treeKill = async (PID: number): Promise<void> => {
-    // This is a re-implementation of *just* the parts of tmbr that we need.
-    // Did this because tmbr wasn't working, not sure why.
-    // psTree takes a callback, so we wrap it in a promise.
     await new Promise<void>((resolve, reject) => {
-      psTree(PID, async (error, children) => {
+      kill(PID, (error) => {
         if (error) {
           reject(error);
-          return;
+        } else {
+          resolve();
         }
-        // Kill each child process.
-        await Promise.all(children.map(async (child) => {
-          processKill(Number(child.PID));
-        }));
-        resolve();
       });
     })
     .catch((error: any) => {
       log.error('Launcher', `Failed to kill process ${this.name} (${this.info.filename}) - ${error}`);
     });
-    // Kill the parent process.
-    processKill(PID);
   };
   /**
    * Set the state of the process.

src/back/ManagedChildProcess.ts

@@ -6,21 +6,21 @@ import { exitApp } from '@back/responses';
 import { BackState, ShowMessageBoxFunc, ShowOpenDialogFunc, ShowSaveDialogFunc, StatusState } from '@back/types';
 import { deepCopy, recursiveReplace, stringifyArray } from '@shared/Util';
 import { BackOut, ComponentState } from '@shared/back/types';
+import { PlatformAppPath, PlatformAppPathSuggestions } from '@shared/curate/types';
 import { getCurationFolder } from '@shared/curate/util';
 import { BrowserApplicationOpts } from '@shared/extensions/interfaces';
 import { IBackProcessInfo, INamedBackProcessInfo, IService, ProcessState } from '@shared/interfaces';
 import { LangContainer, LangFile, autoCode, getDefaultLocalization } from '@shared/lang';
 import { Legacy_IAdditionalApplicationInfo, Legacy_IGameInfo } from '@shared/legacy/interfaces';
+import { newGame } from '@shared/utils/misc';
 import * as child_process from 'child_process';
+import { AdditionalApp, Game, Tag } from 'flashpoint-launcher';
 import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
-import * as psTree from 'ps-tree';
+import * as kill from 'tree-kill';
 import { promisify } from 'util';
 import { uuid } from './uuid';
-import { AdditionalApp, Game, Tag } from 'flashpoint-launcher';
-import { newGame } from '@shared/utils/misc';
-import { PlatformAppPath, PlatformAppPathSuggestions } from '@shared/curate/types';
 
 const unlink = promisify(fs.unlink);
 
@@ -190,15 +190,12 @@ export async function exit(state: BackState, beforeProcessExit?: () => void | Pr
       .catch(e => { console.error(e); });
 
       await new Promise<void>((resolve, reject) => {
-        psTree(process.pid, async (error, children) => {
+        kill(process.pid, (error) => {
           if (error) {
             reject(error);
+          } else {
+            resolve();
           }
-          // Kill each child process.
-          for (const child of children) {
-            process.kill(Number(child.PID));
-          }
-          resolve();
         });
       });
       // Kill the parent process.

src/back/util/misc.ts

@@ -1393,9 +1393,9 @@ export class App extends React.Component<AppProps> {
       devConsole: this.props.main.devConsole,
       creditsData: this.props.main.creditsData,
       creditsDoneLoading: this.props.main.creditsDoneLoading,
-      selectedGameId: this.props.main.selectedGameId,
-      gameRunning: this.checkGameRunningMemo(this.props.main.selectedGameId, this.props.main.services),
-      selectedPlaylistId: this.props.main.selectedPlaylistId,
+      selectedGameId: currentView.selectedGame?.id,
+      gameRunning: this.checkGameRunningMemo(currentView.selectedGame?.id, this.props.main.services),
+      selectedPlaylistId: currentView.selectedPlaylist?.id,
       onDeletePlaylist: this.onPlaylistDelete,
       onUpdatePlaylist: this.onUpdatePlaylist,
       wasNewGameClicked: this.props.main.wasNewGameClicked,
@@ -1720,6 +1720,7 @@ export class App extends React.Component<AppProps> {
   };
 
   private checkGameRunningMemo = memoizeOne((gameId: string | undefined, services: IService[]) => {
+    console.log('checking if running:' + gameId);
     return gameId ? !!services.find(s => s.id === `game.${gameId}`) : false;
   });