Updated adding apps UI

Author: ItsRiprod

DeskThingServer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskthing",
-  "version": "0.11.13",
+  "version": "0.11.14",
   "description": "A DeskThing server UI to interface with the DeskThing car thing app",
   "main": "./out/main/index.js",
   "author": "Riprod",

DeskThingServer/src/main/services/ipc/releasesIpc.ts

@@ -72,6 +72,16 @@ export const releaseHandler = async (
         return []
       }
       break
+    case IPC_RELEASE_TYPES.GET_REPO_ASSETS:
+      try {
+        const result = await releaseStore.getAllRepositories()
+        logger.debug(`Got ${result.length} repositories!`)
+        return result
+      } catch (error) {
+        logger.error(`Unable to get repositories ${handleError(error)}`)
+        return []
+      }
+      break
     case IPC_RELEASE_TYPES.GET_APPS:
       try {
         return await releaseStore.getAppReleases()

DeskThingServer/src/main/services/releases/migrationUtils.ts

@@ -250,7 +250,6 @@ export async function handleReleaseJSONFileMigration0108(
  * @param newRelease - the new release to be migrated
  * @param pastRelease - the past release to use to fill in missing information
  * @param appId - the ID of the app to use to fill in missing information
- *
  */
 export const handleReleaseJSONMigration = async <
   T extends ClientLatestJSONLatest | AppLatestJSONLatest | MultiReleaseJSONLatest

DeskThingServer/src/main/services/releases/releaseUtils.ts

@@ -196,7 +196,7 @@ export const createAppReleaseFile = async (force = false): Promise<AppReleaseFil
     const adaptedRelease = await handleReleaseJSONMigration(latestJSON)
 
     if (adaptedRelease.meta_type == 'client')
-      throw new Error(`Received meta type 'app' when expecting Multi or Client`)
+      throw new Error(`Received meta type 'client' when expecting Multi or App`)
 
     if (adaptedRelease.meta_type == 'multi') {
       update('Converting multi-release to release server format', 60)

DeskThingServer/src/main/services/releases/repoSummary.ts

@@ -0,0 +1,12 @@
+import { storeProvider } from '@server/stores/storeProvider'
+import { GithubRepository } from '@shared/types'
+
+export const fetchRepoSummary = async (repoUrl: string): Promise<GithubRepository> => {
+  const githubStore = await storeProvider.getStore('githubStore')
+
+  const summary = await githubStore.getRepository(repoUrl)
+
+  if (summary) return summary
+
+  throw new Error('Repository not found')
+}

DeskThingServer/src/main/stores/githubStore.ts

@@ -1,5 +1,11 @@
 import logger from '@server/utils/logger'
-import { CacheableStore, GithubAsset, CacheEntry, GithubRelease } from '@shared/types'
+import {
+  CacheableStore,
+  GithubAsset,
+  CacheEntry,
+  GithubRelease,
+  GithubRepository
+} from '@shared/types'
 import { isCacheValid } from '@server/services/releases/releaseValidation'
 import { GithubStoreClass } from '@shared/stores/githubStore'
 import { handleError } from '@server/utils/errorHandler'
@@ -211,7 +217,7 @@ export class GithubStore implements CacheableStore, GithubStoreClass {
         ;[, owner, repo] = match
       }
 
-      return `https://api.github.com/repos/${owner}/${repo}/releases`
+      return `https://api.github.com/repos/${owner}/${repo}`
     } catch (error) {
       logger.error(`Failed to convert repository URL to API endpoint: ${repoUrl}`, {
         function: 'convertToApiUrl',
@@ -229,7 +235,7 @@ export class GithubStore implements CacheableStore, GithubStoreClass {
    */
   public getAllReleases = async (repoUrl: string, force?: boolean): Promise<GithubRelease[]> => {
     try {
-      const apiUrl = this.convertToApiUrl(repoUrl)
+      const apiUrl = this.convertToApiUrl(repoUrl) + '/releases'
       logger.debug(`Converted url ${repoUrl} to ${apiUrl}`)
 
       // Checking the cache first
@@ -294,6 +300,31 @@ export class GithubStore implements CacheableStore, GithubStoreClass {
     }
   }
 
+  public getRepository = async (repoUrl: string): Promise<GithubRepository | undefined> => {
+    try {
+      const apiUrl = this.convertToApiUrl(repoUrl)
+
+      const response = await this.queueRequest(apiUrl)
+
+      if (!response.ok) {
+        logger.error(`Failed to fetch repository ${repoUrl}: ${response.statusText}`, {
+          function: 'getRepository',
+          source: 'githubStore'
+        })
+        return undefined
+      }
+
+      const data = (await response.json()) as GithubRepository
+      return data
+    } catch (error) {
+      logger.error(`Error fetching repository ${repoUrl}. ${handleError(error)}!`, {
+        function: 'getRepository',
+        source: 'githubStore'
+      })
+      throw error
+    }
+  }
+
   public checkUrlValidity = async (url: string): Promise<boolean> => {
     try {
       // Check if we already validated this URL recently

DeskThingServer/src/main/stores/releaseStore.ts

@@ -11,6 +11,7 @@ import {
   CacheableStore,
   ClientLatestServer,
   ClientReleaseFile01111,
+  GithubRepository,
   ProgressChannel,
   StagedAppManifest
 } from '@shared/types'
@@ -39,6 +40,7 @@ import {
 } from '@server/services/releases/releaseUtils'
 import { storeProvider } from './storeProvider'
 import { ClientManifest, GitRepoUrl, LOGGING_LEVELS } from '@deskthing/types'
+import { fetchRepoSummary } from '@server/services/releases/repoSummary'
 
 /**
  * Temporarily holds the entire repo response information in memory unless manually refreshed
@@ -343,6 +345,31 @@ export class ReleaseStore
     return clients.repositories
   }
 
+  public getAllRepositories = async (): Promise<GithubRepository[]> => {
+    const totalRepos = await this.getAvailableRepositories()
+    const githubRepos: GithubRepository[] = []
+
+    for (const repo of totalRepos) {
+      try {
+        const summary = await fetchRepoSummary(repo)
+        githubRepos.push(summary)
+      } catch (err) {
+        logger.warn(`Failed to fetch summary for repo ${repo}: ${handleError(err)}`, {
+          error: err as Error,
+          function: 'getAllRepositories',
+          source: 'releaseStore'
+        })
+      }
+    }
+
+    logger.info(`Fetched ${githubRepos.length} out of ${totalRepos.length} repositories`, {
+      function: 'getAllRepositories',
+      source: 'releaseStore'
+    })
+
+    return githubRepos
+  }
+
   public getAppReleases = async (): Promise<AppLatestServer[] | undefined> => {
     const apps = await this.getAppReleaseFile()
     if (!apps) return undefined

DeskThingServer/src/main/windows/mainWindow.ts

@@ -35,7 +35,7 @@ export function createMainWindow(): BrowserWindow {
       responseHeaders: {
         ...details.responseHeaders,
         'Content-Security-Policy': [
-          "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data: deskthing: http://localhost:* https://thingify.tools https://*.thingify.tools; connect-src 'self' https://api.github.com https://thingify.tools;"
+          "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data: deskthing: http://localhost:* https://thingify.tools https://*.thingify.tools https://avatars.githubusercontent.com; connect-src 'self' https://api.github.com https://thingify.tools;"
         ]
       }
     })

DeskThingServer/src/preload/api/ipcReleases.ts

@@ -8,7 +8,8 @@ import {
 import {
   AppLatestServer,
   ClientDownloadReturnData,
-  ClientLatestServer
+  ClientLatestServer,
+  GithubRepository
 } from '@shared/types/releases'
 import { ipcRenderer } from 'electron'
 
@@ -27,6 +28,10 @@ export const releases = {
       type: IPC_RELEASE_TYPES.ADD_REPOSITORY,
       payload: repoUrl
     }),
+  getAllRepositories: async (): Promise<GithubRepository[]> => await sendCommand({
+    kind: IPC_HANDLERS.RELEASE,
+    type: IPC_RELEASE_TYPES.GET_REPO_ASSETS
+  }),
   getApps: async (): Promise<AppLatestServer[]> =>
     await sendCommand({
       kind: IPC_HANDLERS.RELEASE,

DeskThingServer/src/renderer/index.html

@@ -6,7 +6,7 @@
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' http://localhost:* https://thingify.tools data: deskthing:;"
+      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' https://avatars.githubusercontent.com http://localhost:* https://thingify.tools data: deskthing:;"
     />
   </head>
   <body style="overflow: hidden; background-color: black">