Pull device filters from build API at startup (betaflight#5043)

Author: blckmn

src/js/BuildApi.js

@@ -222,12 +222,21 @@ export default class BuildApi {
     }
 
     async loadConfiguratorRelease(type) {
-        const url = `${this._url}/api/configurator/releases/${type}`;
+        const url = `${this._url}/api/app/releases/${type}`;
         return await this.fetchJson(url);
     }
 
+    async loadDeviceFilters() {
+        try {
+            return await this.fetchJson(`${this._url}/api/app/devices`);
+        } catch {
+            // offline or network error — caller falls back to cache
+            return null;
+        }
+    }
+
     async loadSponsorTile(mode, page) {
-        const url = `${this._url}/api/configurator/sponsors/${mode}/${page}`;
+        const url = `${this._url}/api/app/sponsors/${mode}/${page}`;
         return await this.fetchText(url);
     }
 }

src/js/main.js

@@ -16,6 +16,7 @@ import NotificationManager from "./utils/notifications.js";
 import { Capacitor } from "@capacitor/core";
 import loginManager from "./LoginManager.js";
 import { enableDevelopmentOptions } from "./utils/developmentOptions.js";
+import { loadDeviceFilters } from "./protocols/devices.js";
 
 // Silence Capacitor bridge debug spam on native platforms
 if (Capacitor?.isNativePlatform?.() && typeof Capacitor.isLoggingEnabled === "boolean") {
@@ -70,6 +71,10 @@ function appReady() {
 
     cleanupLocalStorage();
 
+    loadDeviceFilters().catch((err) => {
+        console.warn("Failed to load device filters, using defaults:", err);
+    });
+
     i18n.init(async function () {
         await startProcess();
 

src/js/protocols/devices.js

@@ -1,4 +1,9 @@
-export const bluetoothDevices = [
+import BuildApi from "../BuildApi.js";
+import { get as getConfig, set as setConfig } from "../ConfigStorage.js";
+
+const STORAGE_KEY = "device-filters";
+
+const defaultBluetoothDevices = [
     {
         name: "CC2541",
         serviceUuid: "0000ffe0-0000-1000-8000-00805f9b34fb",
@@ -50,7 +55,7 @@ export const bluetoothDevices = [
     },
 ];
 
-export const serialDevices = [
+const defaultSerialDevices = [
     { vendorId: 1027, productId: 24577 }, // FT232R USB UART
     { vendorId: 1155, productId: 12886 }, // STM32 in HID mode
     { vendorId: 1155, productId: 14158 }, // 0483:374e STM Electronics STLink Virtual COM Port (NUCLEO boards)
@@ -64,17 +69,15 @@ export const serialDevices = [
     { vendorId: 11914, productId: 9 }, // Raspberry Pi Pico VCP
 ];
 
-export const usbDevices = {
-    filters: [
-        { vendorId: 1155, productId: 57105 }, // STM Device in DFU Mode || Digital Radio in USB mode
-        { vendorId: 10473, productId: 393 }, // GD32 DFU Bootloader
-        { vendorId: 11836, productId: 57105 }, // AT32F435 DFU Bootloader
-        { vendorId: 12619, productId: 262 }, // APM32 DFU Bootloader
-        { vendorId: 11914, productId: 15 }, // Raspberry Pi Pico in Bootloader mode
-    ],
-};
+const defaultUsbFilters = [
+    { vendorId: 1155, productId: 57105 }, // STM Device in DFU Mode || Digital Radio in USB mode
+    { vendorId: 10473, productId: 393 }, // GD32 DFU Bootloader
+    { vendorId: 11836, productId: 57105 }, // AT32F435 DFU Bootloader
+    { vendorId: 12619, productId: 262 }, // APM32 DFU Bootloader
+    { vendorId: 11914, productId: 15 }, // Raspberry Pi Pico in Bootloader mode
+];
 
-export const vendorIdNames = {
+const defaultVendorIdNames = {
     1027: "FTDI",
     1155: "STM Electronics",
     4292: "Silicon Labs",
@@ -83,7 +86,83 @@ export const vendorIdNames = {
     11914: "Raspberry Pi Pico",
 };
 
+export const bluetoothDevices = [...defaultBluetoothDevices];
+export const serialDevices = [...defaultSerialDevices];
+export const usbDevices = { filters: [...defaultUsbFilters] };
+export const vendorIdNames = { ...defaultVendorIdNames };
 export const webSerialDevices = serialDevices.map(({ vendorId, productId }) => ({
     usbVendorId: vendorId,
     usbProductId: productId,
 }));
+
+const UNSAFE_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+
+function isPlainObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+function sanitizeVidPidEntries(arr) {
+    return arr.filter(
+        (entry) => isPlainObject(entry) && typeof entry.vendorId === "number" && typeof entry.productId === "number",
+    );
+}
+
+function applyFilters(data) {
+    if (Array.isArray(data?.bluetoothDevices)) {
+        const sanitized = data.bluetoothDevices.filter((d) => isPlainObject(d) && typeof d.serviceUuid === "string");
+        bluetoothDevices.splice(0, bluetoothDevices.length, ...sanitized);
+    }
+    if (Array.isArray(data?.serialDevices)) {
+        const sanitized = sanitizeVidPidEntries(data.serialDevices);
+        serialDevices.splice(0, serialDevices.length, ...sanitized);
+        webSerialDevices.splice(
+            0,
+            webSerialDevices.length,
+            ...sanitized.map(({ vendorId, productId }) => ({
+                usbVendorId: vendorId,
+                usbProductId: productId,
+            })),
+        );
+    }
+    if (Array.isArray(data?.usbDevices?.filters)) {
+        const sanitized = sanitizeVidPidEntries(data.usbDevices.filters);
+        usbDevices.filters.splice(0, usbDevices.filters.length, ...sanitized);
+    }
+    if (isPlainObject(data?.vendorIdNames)) {
+        for (const key of Object.keys(vendorIdNames)) {
+            delete vendorIdNames[key];
+        }
+        for (const [key, value] of Object.entries(data.vendorIdNames)) {
+            if (UNSAFE_KEYS.has(key) || typeof value !== "string") {
+                continue;
+            }
+            vendorIdNames[key] = value;
+        }
+    }
+}
+
+function isValidPayload(data) {
+    if (!isPlainObject(data)) {
+        return false;
+    }
+    return (
+        Array.isArray(data.bluetoothDevices) ||
+        Array.isArray(data.serialDevices) ||
+        Array.isArray(data.usbDevices?.filters) ||
+        isPlainObject(data.vendorIdNames)
+    );
+}
+
+export async function loadDeviceFilters(buildApi = new BuildApi()) {
+    const remote = await buildApi.loadDeviceFilters();
+    if (isValidPayload(remote)) {
+        applyFilters(remote);
+        setConfig({ [STORAGE_KEY]: remote });
+        return;
+    }
+
+    const cached = getConfig(STORAGE_KEY)?.[STORAGE_KEY];
+    if (cached) {
+        applyFilters(cached);
+    }
+}