fix: Address a few ancient typing errors

refactor: Remove all references to GameData 'Path' as we shift to building it from scratch each time

Author: colin969

src/back/Downloader.ts

@@ -1,17 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
-import { downloadGameData } from './download';
-import { fpDatabase } from '.';
+import { BackOut } from '@shared/back/types';
+import { getGameDataFilename } from '@shared/utils/misc';
+import { AxiosError } from 'axios';
+import { DownloaderStatus, DownloadTask, DownloadTaskStatus, DownloadWorkerState, Game, GameDataSource } from 'flashpoint-launcher';
 import * as fs from 'fs-extra';
 import * as path from 'node:path';
-import { DownloaderStatus, DownloadTask, DownloadTaskStatus, DownloadWorkerState, Game, GameDataSource } from 'flashpoint-launcher';
+import { fpDatabase } from '.';
 import { axios } from './dns';
+import { downloadGameData } from './download';
 import { BackState } from './types';
-import { BackOut } from '@shared/back/types';
+import { EventQueue } from './util/EventQueue';
 import { promiseSleep } from './util/misc';
 import { WrappedEventEmitter } from './util/WrappedEventEmitter';
-import { EventQueue } from './util/EventQueue';
-import { AxiosError } from 'axios';
-import { getGameDataFilename } from '@shared/utils/misc';
 
 export interface Downloader {
   on  (event: string, listener: (...args: any[]) => void): this;
@@ -319,8 +319,7 @@ class DownloadWorker {
         // Calc the path on disk and check if the file already matches
         const realPath = path.join(this.downloader.flashpointPath, this.downloader.dataPacksFolderPath, getGameDataFilename(gameData));
         if (fs.existsSync(realPath)) {
-          if (gameData.path !== realPath || gameData.presentOnDisk === false) {
-            gameData.path = realPath;
+          if (gameData.presentOnDisk === false) {
             gameData.presentOnDisk = true;
             await new Promise<void>((resolve, reject) => {
               this.downloader.databaseQueue.push(async () => {

src/back/ManagedChildProcess.ts

@@ -4,7 +4,7 @@ import { ChildProcess, spawn } from 'child_process';
 import { EventEmitter } from 'events';
 import { IBackProcessInfo, ManagedChildProcessEvents, ProcessState } from 'flashpoint-launcher';
 import * as readline from 'readline';
-import * as kill from 'tree-kill';
+import _treeKill from 'tree-kill';
 import { TypedEmitter } from 'typed-emitter';
 import { onServiceChange } from './util/events';
 import { Disposable } from './util/lifecycle';
@@ -166,7 +166,7 @@ export class ManagedChildProcess extends (EventEmitter as new () => TypedEmitter
 
   private treeKill = async (PID: number): Promise<void> => {
     await new Promise<void>((resolve, reject) => {
-      kill(PID, (error) => {
+      _treeKill(PID, (error) => {
         if (error) {
           reject(error);
         } else {

src/back/Themes.ts

@@ -54,7 +54,7 @@ export async function newThemeWatcher(id: string, basePath: string, themePath: s
   watcher.on('ready', () => {
     // Add event listeners
     watcher.on('add', onFileAdd);
-    watcher.on('change', (filename: string, offsetPath: string) => {
+    watcher.on('change', (filename, offsetPath) => {
       themeState.queue.push(() => {
         const relativePath = path.join(offsetPath, filename);
         console.log(`CHANGE (File Path: "${filename}", Theme: "${theme.themePath}")`);
@@ -66,7 +66,7 @@ export async function newThemeWatcher(id: string, basePath: string, themePath: s
         }
       });
     });
-    watcher.on('remove', (filename: string, offsetPath: string) => {
+    watcher.on('remove', (filename, stats, offsetPath) => {
       themeState.queue.push(() => {
         const relativePath = path.join(offsetPath, filename);
         if (!theme.files.includes(relativePath)) {

src/back/curate/util.ts

@@ -9,6 +9,7 @@ import { BackOut } from '@shared/back/types';
 import { CURATIONS_FOLDER_WORKING } from '@shared/constants';
 import { getContentFolderByKey } from '@shared/curate/util';
 import { GamePropSuggestions } from '@shared/interfaces';
+import { getGameDataFilename } from '@shared/utils/misc';
 import { AddAppCuration, CurationFpfssInfo, CurationState, CurationWarnings, LangContainer, LoadedCuration } from 'flashpoint-launcher';
 import * as fs from 'fs-extra';
 import * as http from 'http';
@@ -375,9 +376,9 @@ export async function makeCurationFromGame(state: BackState, gameId: string, ski
     if (game.activeDataId) {
       await checkAndDownloadGameData(game.activeDataId);
       const activeData = await fpDatabase.findGameDataById(game.activeDataId);
-      if (activeData && activeData.path && !skipDataPack) {
+      if (activeData && activeData.presentOnDisk && !skipDataPack) {
         // Extract data pack into curation folder
-        const dataPath = path.join(state.config.flashpointPath, state.preferences.dataPacksFolderPath, activeData.path);
+        const dataPath = getGameDataFilename(activeData);
         await extractFullPromise([dataPath, curPath, { $bin: state.sevenZipPath }]);
         // Clean up content.json file from extracted data pack
         await fs.unlink(path.join(curPath, 'content.json'))

src/back/download.ts

@@ -48,7 +48,6 @@ export async function importGameDataSkipHash(gameId: string, filePath: string, d
   const newPath = path.join(dataPacksFolderPath, newFilename);
   await fs.promises.copyFile(filePath, newPath);
   if (existingGameData) {
-    existingGameData.path = newFilename;
     existingGameData.presentOnDisk = true;
     if (databaseQueue !== undefined) {
       return new Promise<GameData>((resolve, reject) => {

src/back/flashpoint/WebgameContentRunner.ts

@@ -221,7 +221,6 @@ export function getApplicationPath(filePath: string, execMappings: ExecMapping[]
 }
 
 function runGameService(state: BackState, launchInfo: LaunchInfo, id: string, name: string): ManagedChildProcess {
-  console.log(launchInfo);
   const dirname = path.dirname(launchInfo.gamePath);
   // Keep file path relative to cwd
   const proc = runService(

src/back/importGame.ts

@@ -304,7 +304,6 @@ function importGameData(gameId: string, filePath: string, dataPacksFolderPath: s
         if (existingGameData) {
           if (existingGameData.presentOnDisk === false) {
             // File wasn't on disk before but is now, update GameData info
-            existingGameData.path = newFilename;
             existingGameData.presentOnDisk = true;
             fpDatabase.saveGameData(existingGameData)
             .then(async (gameData) => {

src/back/responses.ts

@@ -1038,7 +1038,6 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         await onWillUninstallGameData.fire(gameData);
         const gameDataPath = path.join(state.config.flashpointPath, state.preferences.dataPacksFolderPath, gameDataFilename);
         await fs.promises.unlink(gameDataPath);
-        gameData.path = undefined;
         gameData.presentOnDisk = false;
         onDidUninstallGameData.fire(gameData);
       }
@@ -1083,7 +1082,6 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         }
       });
       console.log('deleted file on disk');
-      gameData.path = undefined;
       gameData.presentOnDisk = false;
       await fpDatabase.saveGameData(gameData);
       onDidUninstallGameData.fire(gameData);
@@ -2758,7 +2756,6 @@ async function getGame(state: BackState, id: string) {
     if (game.gameData) {
       for (const gameData of game.gameData) {
         const gameDataFilename = getGameDataFilename(gameData);
-        gameData.path = gameDataFilename;
         try {
           await fs.promises.access(path.join(state.config.flashpointPath, state.preferences.dataPacksFolderPath, gameDataFilename), fs.constants.F_OK);
           if (!gameData.presentOnDisk) {
@@ -2777,4 +2774,3 @@ async function getGame(state: BackState, id: string) {
   }
   return game;
 }
-

src/renderer/components/GameDataBrowser.tsx

@@ -1,12 +1,12 @@
 import { LangContext } from '@renderer/util/lang';
 import { BackIn } from '@shared/back/types';
 import { memoizeOne } from '@shared/memoize';
+import { Game, GameData } from 'flashpoint-launcher';
 import * as React from 'react';
 import { FloatingContainer } from './FloatingContainer';
 import { GameDataInfo } from './GameDataInfo';
 import { OpenIcon } from './OpenIcon';
 import { SimpleButton } from './SimpleButton';
-import { Game, GameData } from 'flashpoint-launcher';
 
 export type GameDataBrowserState = {
   error?: string;
@@ -147,7 +147,6 @@ export class GameDataBrowser extends React.Component<GameDataBrowserProps, GameD
               .then(() => {
                 const newDatas = [...this.state.gameData];
                 newDatas[index].presentOnDisk = false;
-                newDatas[index].path = undefined;
                 this.setState({ gameData: newDatas });
                 this.props.onForceUpdateGameData();
               })

src/renderer/components/GameDataInfo.tsx

@@ -100,9 +100,6 @@ export function GameDataInfo(props: GameDataInfoProps) {
                 props.onUpdateLaunchCommand(event.target.value);
               }} />
           </CurateBoxRow>
-          <CurateBoxRow title='Path'>
-            {data.path || <i>Not Downloaded</i>}
-          </CurateBoxRow>
           <CurateBoxRow title='Size'>
             {`${sizeToString(data.size)} (${data.size} bytes)`}
           </CurateBoxRow>