bambu-printer-mcp 1.1.26 → 1.1.28

package/src/slicer/profile-flatten.ts

@@ -28,6 +28,7 @@ import fs from "node:fs/promises";
 import { existsSync, realpathSync } from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
+import { profileJsonFiles } from './profile-files.js';
 
 export type ProfileKind = "machine" | "process" | "filament";
 
@@ -125,17 +126,7 @@ async function buildNameIndex(
     ...userProfileRoots.flatMap(root => ['process', 'filament'].map(sub => path.join(root, sub))),
   ];
   for (const dir of directories) {
-    let entries: string[];
-    try {
-      entries = await fs.readdir(dir);
-    } catch {
-      // Vendor or subdir missing -- skip silently; flatten will fail later
-      // with a precise "name not found" error.
-      continue;
-    }
-    for (const entry of entries) {
-      if (!entry.endsWith(".json")) continue;
-      const filePath = path.join(dir, entry);
+    for (const filePath of profileJsonFiles(dir)) {
       let raw: string;
       try {
         raw = await fs.readFile(filePath, "utf8");
@@ -344,6 +335,37 @@ function enforceMatchingNozzles(arr: unknown[]): void {
   }
 }
 
+/**
+ * BambuStudio picks each per-variant machine, process, and filament value
+ * (e.g. filament_max_volumetric_speed) by "<extruder_type> <nozzle_volume_type>"
+ * among the variants each extruder declares in extruder_variant_list. A flow
+ * type the preset doesn't declare has no values to pick, so refuse it instead
+ * of labelling a job for a nozzle it wasn't sliced for.
+ */
+function assertNozzleVariantDeclared(
+  flat: Record<string, unknown>,
+  volumeType: string,
+  machineLeaf: string
+): void {
+  const strings = (key: string): string[] =>
+    Array.isArray(flat[key]) ? (flat[key] as unknown[]).map(String) : [];
+  const extruderTypes = strings("extruder_type");
+  const declaredLists = strings("extruder_variant_list");
+  const count = (flat["nozzle_volume_type"] as unknown[]).length;
+  for (let i = 0; i < count; i++) {
+    const extruderType = extruderTypes[i] ?? extruderTypes[0];
+    const declared = (declaredLists[i] ?? declaredLists[0] ?? "").split(",").map((v) => v.trim()).filter(Boolean);
+    const matches = (variant: string) =>
+      extruderType ? variant === `${extruderType} ${volumeType}` : variant.endsWith(` ${volumeType}`);
+    // Presets without variant declarations only have Standard values.
+    if (declared.length === 0 ? volumeType === "Standard" : declared.some(matches)) continue;
+    throw new Error(
+      `Slicing for a ${volumeType} nozzle is refused: "${machineLeaf}" declares no ${volumeType} variant ` +
+        `for extruder ${i + 1} (declared: ${declared.join(", ") || "none"}).`
+    );
+  }
+}
+
 /** Best-effort extruder count for fallback nozzle_volume_type sizing. */
 /** BambuStudio's built-in filament_colour default. */
 export const DEFAULT_FILAMENT_COLOUR = "#00AE42";
@@ -696,6 +718,7 @@ export async function flattenForCli(opts: FlattenOptions): Promise<FlattenedProf
 
   // CLI-specific post-processing on machine profile only.
   deriveNozzleVolumeType(machineFlat, opts.nozzleVolumeType);
+  if (opts.nozzleVolumeType) assertNozzleVariantDeclared(machineFlat, opts.nozzleVolumeType, opts.machineLeaf);
   applyMachineModelBedMetadata(machineFlat, machineIndex);
   // A standalone custom machine can accompany process/filament profiles that
   // need BBL resolution; do not impose bundled model config on that machine.

package/src/stl/stl-manipulator.ts

@@ -10,6 +10,7 @@ import { EventEmitter } from 'events';
 import * as crypto from 'crypto';
 import { execFile } from 'child_process';
 import { flattenForCli, detectProfilesRoot, resolveBblMachineProfile } from '../slicer/profile-flatten.js';
+import { profileJsonFiles } from '../slicer/profile-files.js';
 
 const readFileAsync = promisify(fs.readFile);
 const writeFileAsync = promisify(fs.writeFile);
@@ -165,6 +166,7 @@ export interface BambuSliceOptions {
   filamentColours?: string[];  // positional #RRGGBB per loaded filament slot
   bedType?: string;            // Bambu bed type, e.g. textured_plate or cool_plate
   nozzleType?: string;         // installed hotend material written into the machine preset
+  nozzleVolumeType?: 'Standard' | 'High Flow'; // installed nozzle flow, the machine preset's nozzle_volume_type
   enableTimelapse?: boolean;   // --enable-timelapse: timelapse-aware slicing
   allowMixTemp?: boolean;      // --allow-mix-temp: allow mixed-temp filaments
   scale?: number;              // --scale factor: uniform scale
@@ -232,10 +234,9 @@ export class STLManipulator extends EventEmitter {
     }
 
     for (const root of roots) {
-      const candidate = path.join(root, category, `${profileName}.json`);
-      if (fs.existsSync(candidate)) {
-        return candidate;
-      }
+      const candidate = profileJsonFiles(path.join(root, category))
+        .find(file => path.basename(file) === `${profileName}.json`);
+      if (candidate) return candidate;
     }
 
     return undefined;
@@ -250,12 +251,7 @@ export class STLManipulator extends EventEmitter {
         continue;
       }
 
-      for (const entry of fs.readdirSync(filamentDir)) {
-        if (!entry.endsWith('.json')) {
-          continue;
-        }
-
-        const filePath = path.join(filamentDir, entry);
+      for (const filePath of profileJsonFiles(filamentDir)) {
         try {
           const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8'));
           const filamentId = typeof parsed?.filament_id === 'string' ? parsed.filament_id.trim() : '';
@@ -568,6 +564,7 @@ export class STLManipulator extends EventEmitter {
       userProfileRoots: configuredBambuProfileDirs(),
       tempDir: this.tempDir,
       bedType: this.resolveBambuStudioBedType(bambuOptions?.bedType),
+      nozzleVolumeType: bambuOptions?.nozzleVolumeType,
       filamentColours: bambuOptions?.filamentColours ?? bundle.filamentColours,
       projectTowerPosition: bundle.projectTowerPosition,
       sourceProfiles: {

package/scripts/build-bambu-native.zsh

@@ -1,33 +0,0 @@
-#!/bin/zsh
-
-# Build the optional macOS adapter that calls Bambu Studio's installed
-# networking plug-in at runtime. The plug-in itself is not bundled here.
-set -euo pipefail
-
-if [[ "$(uname -s)" != "Darwin" ]]; then
-  print -u2 "The Bambu native helper currently supports macOS only."
-  exit 1
-fi
-
-SCRIPT_DIR="${0:A:h}"
-PROJECT_ROOT="${SCRIPT_DIR:h}"
-CXX_BIN="${CXX:-clang++}"
-OUTPUT="${PROJECT_ROOT}/native/bambu-native-print"
-SOURCE="${PROJECT_ROOT}/native/bambu-native-print.cpp"
-
-if ! command -v "$CXX_BIN" >/dev/null 2>&1; then
-  print -u2 "C++ compiler not found: $CXX_BIN"
-  exit 1
-fi
-
-"$CXX_BIN" \
-  -std=c++17 \
-  -O2 \
-  -Wall \
-  -Wextra \
-  -o "$OUTPUT" \
-  "$SOURCE" \
-  -ldl
-
-chmod 755 "$OUTPUT"
-print "Built $OUTPUT"