Added app discovery + fixed config logic

ItsRiprod · ItsRiprod · commit 92ecc28c845e · 2025-08-13T18:56:34.000-04:00
diff --git a/DeskThingServer/src/main/services/client/clientService.ts b/DeskThingServer/src/main/services/client/clientService.ts
@@ -115,8 +115,10 @@ export const getClientManifest = async (): Promise<ClientManifest | null> => {
     // TODO: Client validation
     return JSON.parse(data) as ClientManifest
   } catch (error) {
-    logger.error('Error getting client manifest:', {
-      error: error as Error
+    logger.error('(nonfatal) Error getting client manifest:', {
+      error: error as Error,
+      store: 'releaseUtils',
+      method: 'getClientManifest'
     })
     return null
   }
diff --git a/DeskThingServer/src/main/services/releases/releaseUtils.ts b/DeskThingServer/src/main/services/releases/releaseUtils.ts
@@ -459,6 +459,8 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
 
       const repositories = releaseFile.repositories || []
 
+      const updatedAppReleases: AppLatestServer[] = []
+
       try {
         update(`Fetching the new list of available apps`, 80)
         const githubStore = await storeProvider.getStore('githubStore')
@@ -486,13 +488,62 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
           repositories.push(...newRepos)
         }
 
-        update(`Found ${repositories.length} apps with ${newRepos.length} new repositories`, 95)
+        update(`Found ${repositories.length} apps with ${newRepos.length} new repositories`, 90)
 
         // Now just as a bonus, see if there are any new app IDs included in the multi release
         // TODO: Actually do that for the love of *** I'll never be done with having to update my stupid release logic
         // I'm debating if I should re-couple the multi release wit the individual releases cuz release discovery is *stupid* and I think I would rather *die*
         // send help
 
+        // Now just quickly go over the available apps and see if there are any new ones
+
+        // First get an easily mappable list of existing app IDs
+        const existingAppIds = migratedReleases.map((release) => release.id)
+
+        // Then iterate over the server's app IDs and find any new ones
+
+        if (
+          'fileIds' in latestJSON &&
+          Array.isArray(latestJSON.fileIds) &&
+          latestJSON.fileIds.length > 0
+        ) {
+          const newAppIds = latestJSON.fileIds.filter((id) => !existingAppIds.includes(id))
+
+          if (newAppIds.length > 0) {
+            // If there are new ones, then add those just like the addMultiReleaseServer does
+            update(`Found ${newAppIds.length} new app IDs`, 93)
+
+            const results = await Promise.allSettled(
+              newAppIds.map(async (fileId) =>
+                convertIdToReleaseServer(fileId, appsRepo, allReleases)
+              ) ?? []
+            )
+
+            // Get the successful results
+            const apps = results
+              .filter((result) => result.status === 'fulfilled')
+              .map((result) => result.value) as AppLatestServer[]
+
+            // Handle logging the errors
+            results
+              .filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+              .forEach((result, index) => {
+                const fileId = newAppIds[index]
+                logger.warn(
+                  `Unable to convert ${fileId} to a full release using ${appsRepo} because ${handleError(result.reason)}`,
+                  { function: 'refreshReleaseFile', source: 'handleRefreshReleaseFile' }
+                )
+              })
+
+            updatedAppReleases.push(...apps)
+          }
+        }
+
+        // If there are new ones, then add those just like the addMultiReleaseServer does
+
+        // Add those to the current working structure
+
+        // Stonks?
       } catch (error) {
         logger.warn(`Error fetching releases for ${appsRepo}: ${handleError(error)}`)
         update(`Failed to find new repos, reverting and continuing anyways`, 95)
@@ -502,7 +553,7 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
         version: '0.11.11',
         type: 'app',
         repositories: releaseFile.repositories,
-        releases: migratedReleases as AppLatestServer[],
+        releases: [...updatedAppReleases, ...(migratedReleases as AppLatestServer[])],
         timestamp: Date.now()
       }
       update('Saving app release file', 100)
@@ -543,8 +594,10 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
 
       const repositories = releaseFile.repositories || []
 
+      const updatedClientReleases: ClientLatestServer[] = []
+
       try {
-        update(`Fetching the new list of available apps`, 80)
+        update(`Fetching the new list of available clients`, 80)
         const githubStore = await storeProvider.getStore('githubStore')
         const allReleases = await githubStore.getAllReleases(clientRepo, force)
 
@@ -570,7 +623,58 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
           repositories.push(...newRepos)
         }
 
-        update(`Found ${repositories.length} apps with ${newRepos.length} new repositories`, 95)
+        update(`Found ${repositories.length} apps with ${newRepos.length} new repositories`, 90)
+
+        // Now just as a bonus, see if there are any new app IDs included in the multi release
+        // TODO: Actually do that for the love of *** I'll never be done with having to update my stupid release logic
+        // I'm debating if I should re-couple the multi release wit the individual releases cuz release discovery is *stupid* and I think I would rather *die*
+        // send help
+
+        // Now just quickly go over the available apps and see if there are any new ones
+
+        // First get an easily mappable list of existing app IDs
+        const existingAppIds = migratedReleases.map((release) => release.id)
+
+        // Then iterate over the server's app IDs and find any new ones
+
+        if (
+          'fileIds' in latestJSON &&
+          Array.isArray(latestJSON.fileIds) &&
+          latestJSON.fileIds.length > 0
+        ) {
+          const newAppIds = latestJSON.fileIds.filter((id) => !existingAppIds.includes(id))
+
+          if (newAppIds.length > 0) {
+            // If there are new ones, then add those just like the addMultiReleaseServer does
+            update(`Found ${newAppIds.length} new app IDs`, 93)
+
+            const results = await Promise.allSettled(
+              newAppIds.map(async (fileId) =>
+                convertIdToReleaseServer(fileId, clientRepo, allReleases)
+              ) ?? []
+            )
+
+            // Get the successful results
+            const apps = results
+              .filter((result) => result.status === 'fulfilled')
+              .map((result) => result.value) as ClientLatestServer[]
+
+            // Handle logging the errors
+            results
+              .filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+              .forEach((result, index) => {
+                const fileId = newAppIds[index]
+                logger.warn(
+                  `Unable to convert ${fileId} to a full release using ${clientRepo} because ${handleError(result.reason)}`,
+                  { function: 'refreshReleaseFile', source: 'handleRefreshReleaseFile' }
+                )
+              })
+
+            update(`Found ${apps.length} new apps`, 95)
+
+            updatedClientReleases.push(...apps)
+          }
+        }
       } catch (error) {
         logger.warn(`Error fetching releases for ${clientRepo}: ${handleError(error)}`)
         update(`Failed to find new repos, reverting and continuing anyways`, 95)
@@ -580,7 +684,7 @@ export async function handleRefreshReleaseFile<T extends 'app' | 'client'>(
         version: '0.11.11',
         type: 'client',
         repositories: repositories,
-        releases: migratedReleases as ClientLatestServer[],
+        releases: [...updatedClientReleases, ...(migratedReleases as ClientLatestServer[])],
         timestamp: Date.now()
       }
       update('Saving client release file', 100)
diff --git a/DeskThingServer/src/main/stores/platforms/superbird/adbService.ts b/DeskThingServer/src/main/stores/platforms/superbird/adbService.ts
@@ -26,6 +26,7 @@ export class ADBService implements ADBServiceClass {
       reject: (error: unknown) => void
     }[]
   } = {}
+  private connectionPort: number = 8891 // Default port for ADB connections
   private blacklist: string[] = []
 
   constructor() {
@@ -41,6 +42,12 @@ export class ADBService implements ADBServiceClass {
     settingStore.on('adb_blacklist', (blacklist) => {
       this.blacklist = blacklist || []
     })
+
+    settingStore.on('device_devicePort', (port) => {
+      if (port && typeof port === 'number') {
+        this.connectionPort = port
+      }
+    })
   }
 
   public async sendCommand(command: string, deviceId?: string): Promise<string> {
@@ -204,8 +211,10 @@ export class ADBService implements ADBServiceClass {
       const manifestData = await this.getDeviceManifest(deviceId)
       return manifestData?.version || '0.0.0'
     } catch (error) {
-      logger.error('Error getting device manifest version:', {
-        error: error as Error
+      logger.error('(nonfatal) Error getting device manifest version!', {
+        error: error as Error,
+        store: 'adbService',
+        method: 'getDeviceManifestVersion'
       })
       return '0.0.0'
     }
@@ -225,7 +234,16 @@ export class ADBService implements ADBServiceClass {
   ): Promise<void> {
     progressBus.start(ProgressChannel.CONFIGURE_DEVICE, 'Configure Device', 'Opening port')
 
-    await this.openPort(deviceId, port)
+    const result = await new Promise((resolve) => {
+      this.openPort(deviceId, port)
+        .then(() => resolve(true))
+        .catch(() => resolve(false))
+    })
+    progressBus.update(
+      ProgressChannel.CONFIGURE_DEVICE,
+      `Port opened ${result ? 'successfully' : 'unsuccessfully'}`,
+      5
+    )
 
     progressBus.update(ProgressChannel.CONFIGURE_DEVICE, 'Finding Client', 10)
 
@@ -257,10 +275,14 @@ export class ADBService implements ADBServiceClass {
       this.configureDevice(deviceId, port, forcePush, attempts + 1)
     }
 
+    // Successfully downloaded the latest client, can move on
+
     progressBus.update(ProgressChannel.CONFIGURE_DEVICE, 'Getting device version', 20)
 
     const deviceVersion = await this.getDeviceManifestVersion(deviceId)
+
     progressBus.update(ProgressChannel.CONFIGURE_DEVICE, 'Getting device manifest', 30)
+
     const clientManifest = await getClientManifest()
 
     progressBus.update(ProgressChannel.CONFIGURE_DEVICE, 'Checking for updates', 40)
@@ -278,7 +300,7 @@ export class ADBService implements ADBServiceClass {
           name: 'Car Thing',
           id: 4,
           ip: 'localhost',
-          port: 8891
+          port: this.connectionPort
         }
       })
 
@@ -289,7 +311,7 @@ export class ADBService implements ADBServiceClass {
           name: 'Car Thing',
           id: 4,
           ip: 'localhost',
-          port: 8891
+          port: this.connectionPort
         }
       })
 
diff --git a/DeskThingServer/src/renderer/src/components/Client/Connection.tsx b/DeskThingServer/src/renderer/src/components/Client/Connection.tsx
@@ -1,9 +1,9 @@
 import {
   IconCarThingSmall,
   IconComputer,
-  IconLogs,
   IconMobile,
   IconRefresh,
+  IconWrench,
   IconX
 } from '@renderer/assets/icons'
 import { ProgressChannel } from '@shared/types'
@@ -186,7 +186,7 @@ const ConnectionComponent: React.FC<ConnectionComponentProps> = ({ client }) =>
           className="group hover:bg-zinc-900 gap-2"
           onClick={() => setEnabled(true)}
         >
-          <IconLogs />
+          <IconWrench />
         </Button>
 
         <Button
