Added ADB blacklist

Author: ItsRiprod

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

@@ -137,6 +137,38 @@ export const deviceHandler: ClientHandlerMap = {
         return await thingifyStore.upload(data.payload)
       case 'file':
         return await thingifyStore.selectStagedFile(data.payload)
+      case 'latest':
+        progressBus.startOperation(
+          ProgressChannel.IPC_DEVICES,
+          'Downloading Recommneded Firmware',
+          'Initializing download...',
+          [
+            {
+              channel: ProgressChannel.ST_THINGIFY_RECOMMENDED_DOWNLOAD,
+              weight: 100
+            }
+          ]
+        )
+        try {
+          const file = await thingifyStore.downloadRecommendedFirmware()
+
+          return {
+            status: true,
+            statusText: `Successfully downloaded ${file}`,
+            operationText: 'Download Success'
+          }
+        } catch (error) {
+          progressBus.error(
+            ProgressChannel.IPC_DEVICES,
+            'Error downloading recommended firmware',
+            handleError(error)
+          )
+          return {
+            status: false,
+            statusText: `Failed to download the recommended version`,
+            operationText: handleError(error)
+          }
+        }
     }
   }
 }

DeskThingServer/src/main/static/defaultSettings.ts

@@ -24,6 +24,7 @@ export const defaultSettings: Settings = {
   adb_useGlobal: false,
   adb_autoConfig: false,
   adb_autoDetect: false,
+  adb_blacklist: [],
 
   // flags
   flag_firstClose: true,

DeskThingServer/src/main/stores/platforms/superbird/adbService.ts

@@ -26,10 +26,34 @@ export class ADBService implements ADBServiceClass {
       reject: (error: unknown) => void
     }[]
   } = {}
+  private blacklist: string[] = []
+
+  constructor() {
+    this.initialize()
+  }
+
+  private initialize = async (): Promise<void> => {
+    const settingStore = await storeProvider.getStore('settingsStore')
+    const blacklist = await settingStore.getSetting('adb_blacklist')
+
+    this.blacklist = blacklist || []
+
+    settingStore.on('adb_blacklist', (blacklist) => {
+      this.blacklist = blacklist || []
+    })
+  }
 
   public async sendCommand(command: string, deviceId?: string): Promise<string> {
     const queueKey = deviceId || 'default'
 
+    if (deviceId && this.blacklist.includes(deviceId)) {
+      logger.warn(`Blocked ADB command for blacklisted device: ${deviceId}`, {
+        function: 'sendCommand',
+        source: 'ADBService'
+      })
+      return Promise.reject(new Error(`Device ${deviceId} is blacklisted`))
+    }
+
     return new Promise((resolve, reject) => {
       const queueItem = { command, resolve, reject }
 
@@ -126,7 +150,9 @@ export class ADBService implements ADBServiceClass {
         }
       }, [] as string[])
 
-      return adbDevices
+      const filteredDevices = adbDevices.filter((deviceId) => !this.blacklist.includes(deviceId))
+
+      return filteredDevices
     } catch (error) {
       logger.error('Failed to get ADB devices', {
         error: error as Error,

DeskThingServer/src/main/stores/updateStore.ts

@@ -5,6 +5,8 @@ import electronUpdater, { type AppUpdater } from 'electron-updater'
 import Logger from '@server/utils/logger'
 import { LOGGING_LEVELS } from '@deskthing/types'
 import { handleError } from '@server/utils/errorHandler'
+import { app } from 'electron'
+import { satisfies } from 'semver'
 
 export class UpdateStore
   extends EventEmitter<UpdateStoreEvents>
@@ -102,11 +104,13 @@ export class UpdateStore
   checkForUpdates = async (): Promise<string> => {
     if (!this._autoUpdater) return 'AutoUpdater not initialized'
 
+    const appVersion = app.getVersion()
+
     try {
       const downloadNotification = await this._autoUpdater.checkForUpdatesAndNotify()
       if (
         downloadNotification &&
-        process.env.PACKAGE_VERSION != downloadNotification.updateInfo.version
+        satisfies(appVersion, `<${downloadNotification.updateInfo.version}`)
       ) {
         const updateInfo: UpdateInfoType = {
           updateAvailable: true,

DeskThingServer/src/preload/api/ipcDevice.ts

@@ -135,6 +135,12 @@ export const device = {
       type: IPC_DEVICE_TYPES.THINGIFY_SET,
       request: 'file',
       payload: fileName
+    }),
+  downloadLatestFirmware: async (): Promise<ThingifyArchiveDownloadResult> =>
+    await sendCommand({
+      kind: IPC_HANDLERS.DEVICE,
+      type: IPC_DEVICE_TYPES.THINGIFY_SET,
+      request: 'latest'
     })
 }
 

DeskThingServer/src/renderer/src/overlays/modals/DeviceDetails/ADBDetails.tsx

@@ -6,8 +6,10 @@ import {
   IconPower,
   IconRefresh,
   IconReload,
+  IconStop,
   IconUpload,
-  IconWrench
+  IconWrench,
+  IconX
 } from '@renderer/assets/icons'
 import Button from '@renderer/components/Button'
 import React, { useState, useRef, useMemo } from 'react'
@@ -30,6 +32,8 @@ const ADBDeviceDetails: React.FC<ClientDetailsOverlayProps> = ({ client }) => {
   const pushStaged = usePlatformStore((state) => state.pushStaged)
   const pushScript = usePlatformStore((state) => state.pushScript)
   const progress = useChannelProgress(ProgressChannel.IPC_PLATFORM)
+  const initialSettings = useSettingsStore((settings) => settings.settings)
+  const saveSettings = useSettingsStore((settings) => settings.saveSettings)
 
   // ADB commands
   const [command, setCommand] = useState('')
@@ -151,6 +155,23 @@ const ADBDeviceDetails: React.FC<ClientDetailsOverlayProps> = ({ client }) => {
     await sendCommand(adbId, 'shell poweroff')
   }
 
+  const handleAddToSettings = async (): Promise<void> => {
+    if (!adbId) return
+
+    setLoading(true)
+    const currentBlacklist = initialSettings.adb_blacklist || []
+    if (!currentBlacklist.includes(adbId)) {
+      const updatedBlacklist = [...currentBlacklist, adbId]
+      await saveSettings({ ...initialSettings, adb_blacklist: updatedBlacklist })
+      console.log('ADB ID added to blacklist:', adbId)
+    } else {
+      const updatedBlacklist = currentBlacklist.filter((id) => id !== adbId)
+      await saveSettings({ ...initialSettings, adb_blacklist: updatedBlacklist })
+      console.warn('ADB ID removed from blacklist:', adbId)
+    }
+    setLoading(false)
+  }
+
   return (
     <div className="h-full p-4 overflow-y-auto bg-zinc-950">
       {client.identifiers.adb && (
@@ -230,6 +251,32 @@ const ADBDeviceDetails: React.FC<ClientDetailsOverlayProps> = ({ client }) => {
               )}
               <p className="sm:block text-ellipsis hidden text-nowrap">Setup Restart Script</p>
             </Button>
+            <Button
+              title="Add this device to the blacklist"
+              className="bg-zinc-900 hover:bg-zinc-800 transition-colors duration-200 gap-2 rounded-lg p-3"
+              onClick={handleAddToSettings}
+              disabled={loading}
+            >
+              {initialSettings.adb_blacklist?.includes(adbId!) ? (
+                <>
+                  {loading ? (
+                    <IconLoading className="animate-spin-smooth flex-shrink-0" />
+                  ) : (
+                    <IconX className="flex-shrink-0" />
+                  )}
+                  <p className="sm:block text-ellipsis hidden text-nowrap">Remove From BlackList</p>
+                </>
+              ) : (
+                <>
+                  {loading ? (
+                    <IconLoading className="animate-spin-smooth flex-shrink-0" />
+                  ) : (
+                    <IconStop className="flex-shrink-0" />
+                  )}
+                  <p className="sm:block text-ellipsis hidden text-nowrap">Add to BlackList</p>
+                </>
+              )}
+            </Button>
           </div>
 
           {progress.progress && (

DeskThingServer/src/renderer/src/overlays/settings/ServerSettings.tsx

@@ -194,6 +194,21 @@ const ServerSettings: React.FC = () => {
         </Button>
       </div>
 
+      <div className="w-full p-4 flex justify-between items-center">
+        <h2 className="text-xl">ADB Blacklist</h2>
+        <input
+          type="text"
+          value={settings.adb_blacklist?.join(', ')}
+          onChange={(e) =>
+            handleSettingChange(
+              'adb_blacklist',
+              e.target.value.split(',').map((s) => s.trim())
+            )
+          }
+          className="border border-gray-300 focus:text-black text-gray-500 rounded px-2 py-1 w-1/2"
+        />
+      </div>
+
       <div className="w-full px-4 flex justify-between items-center">
         <h2 className="text-xl">Auto Config</h2>
         <Button