bambu-printer-mcp 1.1.6 → 1.1.9

package/src/printers/bambu.ts

@@ -47,6 +47,7 @@ const MODEL_ID_TO_NAME: Record<string, string> = {
   O1D: "H2D",
   O1E: "H2D Pro",
   O1S: "H2S",
+  N6: "X2D",
   N2S: "A1",
   A1M: "A1 Mini",
   C11: "P1P",
@@ -58,10 +59,23 @@ const MODEL_ID_TO_NAME: Record<string, string> = {
 
 const H2_MODEL_NAMES = new Set(["h2", "h2c", "h2d", "h2dpro", "h2d pro", "h2s"]);
 
+export function assertDirectPrintSupported(model: string | undefined, serial?: string): void {
+  if (model?.trim().toLowerCase() === "x2d" || serial?.trim().toUpperCase().startsWith("20P")) {
+    throw new Error(
+      "X2D direct printing is not supported pending native eMMC transport support. " +
+      "X2D status and slicing remain available; use a supported slicer to print."
+    );
+  }
+}
+
 function isH2ModelName(model: unknown): boolean {
   return H2_MODEL_NAMES.has(String(model ?? "").trim().toLowerCase().replace(/\s+/g, " "));
 }
 
+function isP2SModelName(model: unknown): boolean {
+  return String(model ?? "").trim().toLowerCase() === "p2s";
+}
+
 interface BambuPrintOptionsInternal {
   projectName: string;
   filePath: string;
@@ -145,11 +159,15 @@ class TolerantBambuClient extends BambuClient {
     const sn = this.config.serialNumber;
     if (sn.startsWith("093")) return "H2S";
     if (sn.startsWith("094")) return "H2D";
+    if (sn.startsWith("239")) return "H2C";
+    if (sn.startsWith("31B")) return "H2DPRO";
+    if (sn.startsWith("20P")) return "X2D";
     if (sn.startsWith("00M")) return "X1C";
     if (sn.startsWith("00W")) return "X1";
     if (sn.startsWith("03W")) return "X1E";
     if (sn.startsWith("01S")) return "P1P";
     if (sn.startsWith("01P")) return "P1S";
+    if (sn.startsWith("22E")) return "P2S";
     if (sn.startsWith("030")) return "A1";
     if (sn.startsWith("039")) return "A1M";
     return undefined;
@@ -561,6 +579,7 @@ export class BambuImplementation {
     token: string,
     options: BambuPrintOptionsInternal
   ): Promise<any> {
+    assertDirectPrintSupported(options.bambuModel, serial);
     if (!options.filePath.toLowerCase().endsWith(".3mf")) {
       throw new Error("print3mf requires a .3mf input file.");
     }
@@ -572,27 +591,36 @@ export class BambuImplementation {
     remoteFileName = remoteFileName.replace(/\.gcode\.3mf\.gcode\.3mf$/i, ".gcode.3mf");
 
     // H2-series printers land files at the FTP root and reference them via ftp:///<name>.
-    // P1/A1/X1 use /cache/<name> and file:///sdcard/cache/<name>.
+    // Full-size A1 uses SD root/project_file (reported on firmware 01.08.01.00).
+    // P1/X1/A1 mini retain their legacy cache/gcode_file route.
+    // P2S keeps the /cache/<name> upload but only accepts the H2-style
+    // project_file command, referenced via ftp:///cache/<name> (verified on
+    // P2S firmware 01.02.00.00; file:///sdcard/... fails with ERROR STATE).
     const isH2 =
       serial.startsWith("093") ||
       serial.startsWith("094") ||
       isH2ModelName(options.bambuModel);
-    const remoteProjectPath = isH2 ? remoteFileName : `cache/${remoteFileName}`;
-    const remoteUploadPath = isH2 ? `/${remoteFileName}` : `/cache/${remoteFileName}`;
-    const projectUrl = isH2
-      ? `ftp:///${remoteFileName}`
+    const isP2S = serial.startsWith("22E") || isP2SModelName(options.bambuModel);
+    const isA1 = String(options.bambuModel ?? "").trim().toLowerCase() === "a1" ||
+      (!options.bambuModel && serial.startsWith("030"));
+    const usesH2ProjectFile = isH2 || isP2S;
+    const remoteProjectPath = isH2 || isA1 ? remoteFileName : `cache/${remoteFileName}`;
+    const remoteUploadPath = `/${remoteProjectPath}`;
+    const projectUrl = usesH2ProjectFile
+      ? `ftp:///${remoteProjectPath}`
       : `file:///sdcard/${remoteProjectPath}`;
 
     // Upload via basic-ftp directly (bypasses bambu-js double-path bug)
     await this.ftpUpload(host, token, options.filePath, remoteUploadPath);
 
     // Pre-sliced .gcode.3mf files: routing depends on firmware generation.
-    // P1/A1/X1 series: project_file returns 405004002 for .gcode.3mf (firmware
+    // Legacy P1/X1/A1 mini: project_file returns 405004002 for .gcode.3mf (firmware
     // doesn't recognise the container), so use gcode_file instead.
-    // H2-series: gcode_file is not supported; project_file works because the
+    // H2-series and P2S: gcode_file is not supported (P2S answers 0500-4002
+    // "Unsupported file path or name"); project_file works because the
     // firmware can open the zip and find Metadata/plate_<n>.gcode directly.
     if (options.filePath.toLowerCase().endsWith(".gcode.3mf")) {
-      if (!isH2) {
+      if (!usesH2ProjectFile && !isA1) {
         const printer = await this.getPrinter(host, serial, token);
         await invokeWithoutAck(printer, new GCodeFileCommand({ fileName: remoteProjectPath }));
         return {
@@ -601,7 +629,7 @@ export class BambuImplementation {
           remoteProjectPath,
         };
       }
-      // H2-series: fall through to project_file path below
+      // H2-series and P2S: fall through to project_file path below
     }
 
     const projectMetadata = await this.resolveProjectFileMetadata(
@@ -687,7 +715,7 @@ export class BambuImplementation {
 
     let amsMapping: number[];
     let amsMapping2: Array<{ ams_id: number; slot_id: number }>;
-    if (isH2) {
+    if (usesH2ProjectFile) {
       const projLen = Math.max(projectMetadata.projectFilamentCount, baseMapping.length, 1);
       amsMapping = Array.from({ length: projLen }, (_, i) =>
         i < baseMapping.length ? baseMapping[i] : -1
@@ -699,7 +727,7 @@ export class BambuImplementation {
         return { ams_id: Math.floor(v / 4), slot_id: v % 4 };
       });
     } else {
-      amsMapping = Array.from({ length: 5 }, (_, i) =>
+      amsMapping = Array.from({ length: Math.max(5, baseMapping.length, projectMetadata.projectFilamentCount) }, (_, i) =>
         i < baseMapping.length ? baseMapping[i] : -1
       );
       amsMapping2 = [];
@@ -707,7 +735,7 @@ export class BambuImplementation {
 
     const b = (v: any) => (v ? 1 : 0);
     let projectFileCmd: Record<string, any>;
-    if (isH2) {
+    if (usesH2ProjectFile) {
       const submissionId = String(Date.now() & 0x7fffffff);
       projectFileCmd = {
         print: {
@@ -1143,8 +1171,10 @@ export class BambuImplementation {
     token: string,
     filePath: string,
     filename: string,
-    print: boolean
+    print: boolean,
+    bambuModel?: string
   ) {
+    if (print) assertDirectPrintSupported(bambuModel, serial);
     await fs.access(filePath);
 
     const normalizedFileName = filename.replace(/^\/+/, "");
@@ -1164,7 +1194,7 @@ export class BambuImplementation {
 
     if (print) {
       if (remotePath.toLowerCase().endsWith(".gcode")) {
-        response.startResult = await this.startJob(host, serial, token, remotePath);
+        response.startResult = await this.startJob(host, serial, token, remotePath, bambuModel);
       } else if (remotePath.toLowerCase().endsWith(".3mf")) {
         response.note =
           "3MF upload complete. Use print_3mf to start a project print with plate and metadata options.";
@@ -1178,7 +1208,8 @@ export class BambuImplementation {
     return response;
   }
 
-  async startJob(host: string, serial: string, token: string, filename: string) {
+  async startJob(host: string, serial: string, token: string, filename: string, bambuModel?: string) {
+    assertDirectPrintSupported(bambuModel, serial);
     const lower = filename.toLowerCase();
     if (lower.endsWith(".3mf") && !lower.endsWith(".gcode.3mf")) {
       throw new Error("Use print_3mf for .3mf project files.");
@@ -1265,15 +1296,15 @@ export class BambuImplementation {
     // P1/A1 series still use the proprietary TCP-on-6000 framed JPEG path
     // (per https://github.com/Doridian/OpenBambuAPI/blob/main/video.md).
     const TCP_CAMERA_MODELS = new Set(["a1", "a1mini", "p1s", "p1p"]);
-    // X1, P2S, AND H2 (H2S/H2D/H2C) all use RTSP on port 322. The
+    // X1, P2S, H2 (H2S/H2D/H2C), AND X2D all use RTSP on port 322. The
     // OpenBambuAPI doc only mentions X1/P2S, but the HA bambulab
     // integration's models.py shows the printer reports its own
     // `ipcam.rtsp_url` for these models, and Parker (H2S) rejects the
     // A1/P1 80-byte auth packet on port 6000 (verified 2026-04-27 --
-    // see PROGRESS.md "H2 probe results").
+    // confirmed by local H2 camera transport probes).
     const RTSP_MODELS = new Set([
       "x1", "x1c", "x1carbon", "x1e", "p2s",
-      "h2", "h2s", "h2d", "h2c", "h2dpro",
+      "h2", "h2s", "h2d", "h2c", "h2dpro", "x2d",
     ]);
 
     if (!model) {