feat(discovery): detect printer model from USB product ID

Resolve the model from the firmware-set USB product ID (discovery packet
offset 0x88) before falling back to productType (0x5A02, 5M-family only)
and the user-mutable name. The product ID matches the /detail pid field and
the update-checker keys, so it cleanly distinguishes 5M / 5M Pro / AD5X
where productType cannot.

- Add MODERN_PRODUCT_IDS map and pass productId into detectModernModel.
- Add Creator5 / Creator5Pro to PrinterModel; register pids 40/41 in
  KNOWN_HTTP_PIDS and expose IsCreator5 on FFMachineInfo / FiveMClient.
- Cover PID-first detection with PrinterDiscovery tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: GhostTypes

src/FiveMClient.ts

@@ -57,6 +57,7 @@ export class FiveMClient {
   public printerName: string = '';
   public isPro: boolean = false;
   public isAD5X: boolean = false;
+  public isCreator5: boolean = false;
   public firmwareVersion: string = '';
   public firmVer: string = '';
   public cameraStreamUrl: string = '';
@@ -199,6 +200,7 @@ export class FiveMClient {
     this.printerName = info.Name || '';
     this.isPro = info.IsPro; // Use the value from MachineInfo
     this.isAD5X = info.IsAD5X; // Cache the AD5X status
+    this.isCreator5 = info.IsCreator5; // Cache the Creator 5 status
     this.firmwareVersion = info.FirmwareVersion || '';
     this.firmVer = info.FirmwareVersion ? info.FirmwareVersion.split('-')[0] : '';
     this.cameraStreamUrl = info.CameraStreamUrl || '';

src/api/PrinterDiscovery.test.ts

@@ -421,6 +421,30 @@ describe('PrinterDiscovery', () => {
                     PrinterModel.Unknown
                 );
             });
+
+            it('should prefer USB product ID over name/productType', () => {
+                const discovery = createDiscovery();
+                // PID is authoritative even when the (user-mutable) name disagrees.
+                expect(discovery['detectModernModel']('My Renamed Printer', 0x5a02, 0x0024)).toBe(
+                    PrinterModel.Adventurer5MPro
+                );
+                expect(discovery['detectModernModel']('My Renamed Printer', 0x5a02, 0x0023)).toBe(
+                    PrinterModel.Adventurer5M
+                );
+                expect(discovery['detectModernModel']('whatever', 0x0000, 0x0026)).toBe(
+                    PrinterModel.AD5X
+                );
+            });
+
+            it('should detect Creator 5 / Creator 5 Pro by product ID', () => {
+                const discovery = createDiscovery();
+                expect(discovery['detectModernModel']('Creator 5', 0x0000, 0x0028)).toBe(
+                    PrinterModel.Creator5
+                );
+                expect(discovery['detectModernModel']('Creator 5 Pro', 0x0000, 0x0029)).toBe(
+                    PrinterModel.Creator5Pro
+                );
+            });
         });
 
         describe('Legacy Protocol', () => {

src/api/PrinterDiscovery.ts

@@ -55,6 +55,21 @@ const LEGACY_PRODUCT_IDS = {
     Adventurer4Pro: 0x001e,
 } as const;
 
+/**
+ * Canonical USB Product IDs (offset 0x88 of the discovery packet) for modern
+ * printers. This is the same value space as the firmware `/detail` `pid` field
+ * and the FlashForge update-checker keys, so it is the authoritative model
+ * discriminator — unlike `productType` (0x5A02), which only identifies the 5M
+ * *family* and cannot distinguish 5M / 5M Pro / AD5X from one another.
+ */
+const MODERN_PRODUCT_IDS: Readonly<Record<number, PrinterModel>> = {
+    0x0023: PrinterModel.Adventurer5M,
+    0x0024: PrinterModel.Adventurer5MPro,
+    0x0026: PrinterModel.AD5X,
+    0x0028: PrinterModel.Creator5,
+    0x0029: PrinterModel.Creator5Pro,
+};
+
 /**
  * EventEmitter-based continuous discovery monitor.
  *
@@ -522,7 +537,7 @@ export class PrinterDiscovery {
         const serialNumber = buffer.toString('utf8', 0x92, 0x92 + 128).replace(/\0.*$/, '');
 
         // Detect model
-        const model = this.detectModernModel(name, productType);
+        const model = this.detectModernModel(name, productType, productId);
 
         return {
             model,
@@ -593,32 +608,47 @@ export class PrinterDiscovery {
     }
 
     /**
-     * Detects printer model from modern protocol response.
+     * Detects printer model from a modern protocol response.
      *
-     * Uses both printer name and product type for accurate detection.
+     * Resolution order:
+     *  1. USB Product ID (offset 0x88) — the authoritative, user-immutable
+     *     discriminator (matches the firmware `/detail` pid and update-checker
+     *     keys). This is the only signal that distinguishes 5M / 5M Pro / AD5X /
+     *     Creator 5 / Creator 5 Pro from one another.
+     *  2. `productType` 0x5A02 (5M *family*) + name — fallback for firmware that
+     *     reports an unknown/zero product ID.
+     *  3. Name heuristics — last resort.
      *
-     * @param name Printer name from response
-     * @param productType Product type code (e.g., 0x5A02 for 5M series)
+     * @param name Printer name from response (user-mutable)
+     * @param productType Product type code (e.g., 0x5A02 for the 5M family)
+     * @param productId USB product ID from offset 0x88
      * @returns Detected printer model
      * @private
      */
-    protected detectModernModel(name: string, productType: number): PrinterModel {
-        const upperName = name.toUpperCase();
-
-        // Direct name matches (highest priority)
-        if (upperName === 'AD5X') {
-            return PrinterModel.AD5X;
+    protected detectModernModel(name: string, productType: number, productId?: number): PrinterModel {
+        // Product ID is authoritative (firmware-set, not user-mutable).
+        if (productId !== undefined && productId in MODERN_PRODUCT_IDS) {
+            return MODERN_PRODUCT_IDS[productId];
         }
 
-        // Product type-based detection (0x5A02 = 5M series)
+        const upperName = name.toUpperCase();
+
+        // Fallback: 0x5A02 identifies the 5M family but not the specific model,
+        // so we still need the name to separate base from Pro.
         if (productType === 0x5A02) {
+            if (upperName === 'AD5X') {
+                return PrinterModel.AD5X;
+            }
             if (upperName.includes('PRO')) {
                 return PrinterModel.Adventurer5MPro;
             }
             return PrinterModel.Adventurer5M;
         }
 
-        // Name-based fallback
+        // Last-resort name heuristics.
+        if (upperName === 'AD5X') {
+            return PrinterModel.AD5X;
+        }
         if (upperName.includes('ADVENTURER 5M') || upperName.includes('AD5M')) {
             if (upperName.includes('PRO')) {
                 return PrinterModel.Adventurer5MPro;

src/models/MachineInfo.ts

@@ -8,7 +8,15 @@ import { type FFMachineInfo, type FFPrinterDetail, MachineState } from './ff-mod
 const PID_5M = 35;
 const PID_5M_PRO = 36;
 const PID_AD5X = 38;
-const KNOWN_HTTP_PIDS = new Set<number>([PID_5M, PID_5M_PRO, PID_AD5X]);
+const PID_CREATOR5 = 40;
+const PID_CREATOR5_PRO = 41;
+const KNOWN_HTTP_PIDS = new Set<number>([
+  PID_5M,
+  PID_5M_PRO,
+  PID_AD5X,
+  PID_CREATOR5,
+  PID_CREATOR5_PRO,
+]);
 
 /**
  * Transforms printer detail data from the API response format into a structured `FFMachineInfo` object.
@@ -43,15 +51,18 @@ export class MachineInfo {
       const pid = detail.pid;
       let isAD5X: boolean;
       let isPro: boolean;
+      let isCreator5: boolean;
       if (pid !== undefined && KNOWN_HTTP_PIDS.has(pid)) {
         isAD5X = pid === PID_AD5X;
         isPro = pid === PID_5M_PRO;
+        isCreator5 = pid === PID_CREATOR5 || pid === PID_CREATOR5_PRO;
       } else {
         // Fallback for firmware that doesn't report pid: legacy
         // name+capability heuristic. Vulnerable to user renames, which
         // is why pid-based detection is preferred when available.
         isAD5X = detail.name === 'AD5X' || hasMaterialStation;
         isPro = (detail.name || '').includes('Pro') && !isAD5X;
+        isCreator5 = (detail.name || '').includes('Creator 5');
       }
       const printEta = this.formatTimeFromSeconds(detail.estimatedTime || 0);
       const completionTime = new Date(Date.now() + (detail.estimatedTime || 0) * 1000);
@@ -120,6 +131,7 @@ export class MachineInfo {
         Pid: pid,
         IsPro: isPro,
         IsAD5X: isAD5X,
+        IsCreator5: isCreator5,
         NozzleSize: detail.nozzleModel || '',
 
         // Material Station Info

src/models/PrinterDiscovery.ts

@@ -21,6 +21,10 @@ export enum PrinterModel {
     Adventurer4 = 'Adventurer4',
     /** Adventurer 3 model */
     Adventurer3 = 'Adventurer3',
+    /** Creator 5 tool-changer model */
+    Creator5 = 'Creator5',
+    /** Creator 5 Pro tool-changer model */
+    Creator5Pro = 'Creator5Pro',
     /** Unknown or unrecognized printer model */
     Unknown = 'Unknown'
 }

src/models/ff-models.ts

@@ -242,6 +242,8 @@ export interface FFMachineInfo {
   IsPro: boolean;
   /** Indicates if the printer is an AD5X model. */
   IsAD5X: boolean;
+  /** Indicates if the printer is a Creator 5 / Creator 5 Pro (4-head tool-changer). */
+  IsCreator5: boolean;
   /** Nozzle size (e.g., "0.4mm"). */
   NozzleSize: string;