Added Purge + Final Touches for prerelease

Author: ItsRiprod

.gitignore

@@ -28,5 +28,5 @@ yarn-error.log*
 tsconfig.tsbuildinfo
 DeskThing/server/auth_data.json
 AppExamples/spotify/node_modules/
-releases/Linux/deskthing-1.0.0.AppImage
+releases/Linux/deskthing-0.3.0.AppImage
 /AppExamples/utility/node_modules

AppExamples/utility/builds/index.js

@@ -51,6 +51,12 @@ var require_utility = __commonJS({
           case "previous_track":
             this.sendDataToMainFn("toApp", this.settings.playback_location.value, type, "previous_track", payload);
             break;
+          case "device_info":
+            this.sendDataToMainFn("toApp", this.settings.playback_location.value, type, "device_info", payload);
+            break;
+          case "song_info":
+            this.sendDataToMainFn("toApp", this.settings.playback_location.value, type, "song_info", payload);
+            break;
           default:
             console.warn("Unsupported command:", command);
             break;

AppExamples/utility/utility.js

@@ -47,6 +47,12 @@ class UtilityHandler {
       case 'previous_track':
         this.sendDataToMainFn('toApp', this.settings.playback_location.value, type, 'previous_track', payload);
         break;
+      case 'device_info':
+        this.sendDataToMainFn('toApp', this.settings.playback_location.value, type, 'device_info', payload);
+        break;
+      case 'song_info':
+        this.sendDataToMainFn('toApp', this.settings.playback_location.value, type, 'song_info', payload);
+        break;
       default:
         console.warn('Unsupported command:', command);
         break;

DeskThingServer/src/main/index.ts

@@ -9,7 +9,8 @@ import {
   handleZip,
   loadAndRunEnabledApps,
   disableApp,
-  stopApp
+  stopApp,
+  purgeAppData
 } from './utility/appHandler'
 import './utility/authHandler'
 import './utility/websocketServer'
@@ -82,6 +83,10 @@ app.whenReady().then(async () => {
   ipcMain.on('disable-app', async (_event, appName: string) => {
     disableApp(appName)
   })
+  ipcMain.on('purge-app', async (_event, appName: string) => {
+    console.log(`====== PURGING APP ${appName} ========`)
+    purgeAppData(_event, appName)
+  })
 
   ipcMain.on('handle-zip', async (event, zipFilePath: string) => {
     console.log('SERVER: handling zip file event', event)

DeskThingServer/src/main/utility/appHandler.ts

@@ -3,8 +3,15 @@ import { app, ipcMain } from 'electron'
 import { join } from 'path'
 import * as fs from 'fs'
 import * as unzipper from 'unzipper'
-import { getAppData, setAppData, getAppByName, addAppManifest, getConfig } from './configHandler'
-import { getData, setData, addData } from './dataHandler'
+import {
+  getAppData,
+  setAppData,
+  getAppByName,
+  addAppManifest,
+  getConfig,
+  purgeAppConfig
+} from './configHandler'
+import { getData, setData, addData, purgeData } from './dataHandler'
 import { sendIpcMessage, openAuthWindow } from '../index'
 import { sendMessageToClients } from './websocketServer'
 interface AppInstance {
@@ -82,7 +89,6 @@ function handleDataFromApp(app: string, type: string, ...args: any[]): void {
   }
 }
 async function requestAuthData(appName: string, scope: Array<string>): Promise<void> {
-
   // Send IPC message to renderer to display the form
   sendIpcMessage('request-user-data', appName, scope)
 
@@ -339,6 +345,21 @@ async function addApp(_event, appName: string): Promise<void> {
     console.error('Error adding app:', error)
   }
 }
+async function purgeAppData(_event, appName: string): Promise<void> {
+  console.log('SERVER: Purging Data...')
+  purgeData(appName)
+  console.log('SERVER: Purging Config...')
+  purgeAppConfig(appName)
+
+  console.log('SERVER: Purging File...')
+  const appDirectory = join(app.getPath('userData'), 'apps', appName)
+  if (fs.existsSync(appDirectory)) {
+    fs.rmSync(appDirectory, { recursive: true })
+    console.log(`Deleted app directory: ${appDirectory}`)
+  } else {
+    console.log(`App directory not found: ${appDirectory}`)
+  }
+}
 
 export {
   runApp,
@@ -348,5 +369,6 @@ export {
   handleZip,
   loadAndRunEnabledApps,
   addApp,
-  disableApp
+  disableApp,
+  purgeAppData
 }

DeskThingServer/src/main/utility/configHandler.ts

@@ -168,4 +168,29 @@ const getAppByIndex = (index: number): App | undefined => {
   return foundApp
 }
 
-export { setAppData, getAppData, getAppByName, getAppByIndex, addAppManifest, addConfig, getConfig }
+const purgeAppConfig = (appName: string): void => {
+  console.log('SERVER: Deleting App From Config...', appName)
+  const data = readData()
+
+  // Filter out the app to be purged
+  const filteredApps = data.apps.filter((app: App) => app.name !== appName)
+  data.apps = filteredApps
+
+  if (Array.isArray(data.config.audiosources)) {
+    const updatedAudiosources = data.config.audiosources.filter((source) => source !== appName)
+    data.config.audiosources = updatedAudiosources
+  }
+
+  writeData(data)
+}
+
+export {
+  setAppData,
+  getAppData,
+  getAppByName,
+  getAppByIndex,
+  addAppManifest,
+  addConfig,
+  getConfig,
+  purgeAppConfig
+}

DeskThingServer/src/main/utility/dataHandler.ts

@@ -20,7 +20,6 @@ const readData = (): Data => {
       fs.writeFileSync(dataFilePath, JSON.stringify(defaultData, null, 2))
       return defaultData
     }
-
     const rawData = fs.readFileSync(dataFilePath)
     return JSON.parse(rawData.toString())
   } catch (err) {
@@ -62,4 +61,11 @@ const getData = (key): { [key: string]: string } => {
   return data[key]
 }
 
-export { setData, getData, addData, readData }
+const purgeData = (appName: string): void => {
+  console.log('SERVER: Deleting app data...')
+  const data = readData()
+  delete data[appName]
+  writeData(data)
+}
+
+export { setData, getData, addData, readData, purgeData }

DeskThingServer/src/renderer/src/components/Overlays/DisplayAppData.tsx

@@ -16,6 +16,11 @@ const DisplayAppData = ({ appIndex, setEnabled, data }: DisplayAppDataProps): JS
   const handleExit = (): void => {
     setEnabled(false)
   }
+  const handlePurge = (appName: string): void => {
+    window.electron.ipcRenderer.send('purge-app', appName)
+    window.electron.ipcRenderer.send('get-apps')
+    setEnabled(false)
+  }
   return (
     <>
       {appData != null ? (
@@ -61,14 +66,20 @@ const DisplayAppData = ({ appIndex, setEnabled, data }: DisplayAppDataProps): JS
                 </div>
               </div>
             )}
-            <div className="bg-slate-700 p-5 m-1 rounded-lg drop-shadow-lg"></div>
-
-            <button
-              className="bg-slate-700 hover:bg-red-500 transition-colors p-5 self-end rounded-lg drop-shadow-lg"
-              onClick={handleExit}
-            >
-              Exit
-            </button>
+            <div className="bg-slate-700 p-5 m-1 flex justify-between rounded-lg drop-shadow-lg">
+              <button
+                className="bg-red-700 hover:bg-red-500 transition-colors p-5 self-end rounded-lg drop-shadow-lg"
+                onClick={() => handlePurge(appData.name)}
+              >
+                Purge App (Cannot be undone)
+              </button>
+              <button
+                className="bg-slate-700 hover:bg-red-500 transition-colors p-5 self-end rounded-lg drop-shadow-lg"
+                onClick={handleExit}
+              >
+                Exit
+              </button>
+            </div>
           </div>
         </div>
       ) : (