mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-08 15:11:21 +02:00
Two tightly-coupled deliverables in one drop -- a new AMS Filament Backup status/control surface, and the #1766 fix that depends on it. Added -- AMS Filament Backup status + control - Parse bit 18 of top-level print.cfg into PrinterState.ams_filament_backup on every push_status. Verified against OrcaSlicer source (DeviceManager.cpp:4961) and a live H2D ON/OFF capture. Tri-state (None = A1 family / pre-cfg push) preserves today's behaviour. - Hold-timer guard (3 s) prevents stale frames from flickering the badge back to the printer's old cfg after a user-initiated toggle. - POST /printers/{id}/ams-backup toggle, set_ams_filament_backup() client method calling _set_print_option("auto_switch_filament", enabled). - GET /printers/{id}/inventory-remain endpoint exposes the same map the dispatcher uses (internal and Spoolman modes both work uniformly). - Small icon badge in the printer card's "Filaments" section header (placement reads as printer-wide because the cfg bit is printer-wide, not per-AMS). Click to toggle, success toast. - 5 i18n keys x 11 locales for the badge UI. Fixed -- #1766: prefer_lowest didn't pick lowest, ignored backup state - Backend gate in _compute_ams_mapping_for_printer: coerce prefer_lowest to False when status.ams_filament_backup is False; log the skip. - New effectivePreferLowest(setting, backup) helper applied at every frontend sort entry point: single-printer PrintModal, multi-printer hook per-printer, PrinterSelector InlineMappingEditor, FilamentMapping standalone editor (the last had NO preferLowest awareness at all before this change). - New preferLowestSortKey(f, inventoryByTrayId) mirrors backend's two-tier key exactly, including the banding tie-break (regular AMS < AMS-HT < external) so the client-side pre-compute matches the dispatch-time pick. An earlier draft used a flat `amsId * 4 + trayId` priority which gave external slots (ams_id = -1) a NEGATIVE priority -- caught in code review before commit. - Settings -> Filament -> "Prefer lowest remaining filament" gets an explanatory note about the printer-side AMS Backup dependency, with i18n key in all 11 locales.
287 lines
12 KiB
TypeScript
287 lines
12 KiB
TypeScript
/**
|
|
* Tests for InlineMappingEditor auto-match and nozzle filtering logic.
|
|
*
|
|
* Regression test for #624: multi-printer filament mapping showed filaments
|
|
* from both nozzles on dual-nozzle printers (H2D). The single-printer path
|
|
* (FilamentMapping.tsx) was fixed in commit 29e9593 but the multi-printer
|
|
* path (InlineMappingEditor in PrinterSelector.tsx) was missed.
|
|
*/
|
|
|
|
import { describe, it, expect } from 'vitest';
|
|
import {
|
|
autoMatchFilament,
|
|
canonicalFilamentType,
|
|
filamentTypesCompatible,
|
|
filterFilamentsByNozzle,
|
|
} from '../../utils/amsHelpers';
|
|
import type { LoadedFilament, FilamentRequirement } from '../../hooks/useFilamentMapping';
|
|
|
|
// -- helpers -----------------------------------------------------------------
|
|
|
|
function makeFilament(overrides: Partial<LoadedFilament> & { globalTrayId: number }): LoadedFilament {
|
|
return {
|
|
type: 'PLA',
|
|
color: '#FFFFFF',
|
|
colorName: 'White',
|
|
amsId: 0,
|
|
trayId: 0,
|
|
isHt: false,
|
|
isExternal: false,
|
|
label: 'AMS1-T1',
|
|
trayInfoIdx: '',
|
|
extruderId: undefined,
|
|
remain: -1,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeReq(overrides: Partial<FilamentRequirement> = {}): FilamentRequirement {
|
|
return {
|
|
slot_id: 1,
|
|
type: 'PLA',
|
|
color: '#FFFFFF',
|
|
used_grams: 10,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
// Dual-nozzle H2D-like setup:
|
|
// Left nozzle (extruderId=1): AMS0 with PLA Black (tray 0) and PETG White (tray 1)
|
|
// Right nozzle (extruderId=0): AMS1 with PLA White (tray 4) and PLA Red (tray 5)
|
|
const H2D_FILAMENTS: LoadedFilament[] = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#000000', colorName: 'Black', amsId: 0, trayId: 0, label: 'AMS1-T1', extruderId: 1 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PETG', color: '#FFFFFF', colorName: 'White', amsId: 0, trayId: 1, label: 'AMS1-T2', extruderId: 1 }),
|
|
makeFilament({ globalTrayId: 4, type: 'PLA', color: '#FFFFFF', colorName: 'White', amsId: 1, trayId: 0, label: 'AMS2-T1', extruderId: 0 }),
|
|
makeFilament({ globalTrayId: 5, type: 'PLA', color: '#FF0000', colorName: 'Red', amsId: 1, trayId: 1, label: 'AMS2-T2', extruderId: 0 }),
|
|
];
|
|
|
|
// -- canonicalFilamentType / filamentTypesCompatible -------------------------
|
|
|
|
describe('canonicalFilamentType', () => {
|
|
it('maps PA-CF variants to the same canonical type', () => {
|
|
const canonical = canonicalFilamentType('PA-CF');
|
|
expect(canonicalFilamentType('PA12-CF')).toBe(canonical);
|
|
expect(canonicalFilamentType('PAHT-CF')).toBe(canonical);
|
|
});
|
|
|
|
it('is case-insensitive', () => {
|
|
expect(canonicalFilamentType('pa-cf')).toBe(canonicalFilamentType('PA-CF'));
|
|
expect(canonicalFilamentType('Pa12-Cf')).toBe(canonicalFilamentType('PA12-CF'));
|
|
});
|
|
|
|
it('returns the type unchanged for non-equivalent types', () => {
|
|
expect(canonicalFilamentType('PLA')).toBe('PLA');
|
|
expect(canonicalFilamentType('PETG')).toBe('PETG');
|
|
expect(canonicalFilamentType('ABS')).toBe('ABS');
|
|
});
|
|
|
|
it('returns empty string for undefined/empty input', () => {
|
|
expect(canonicalFilamentType(undefined)).toBe('');
|
|
expect(canonicalFilamentType('')).toBe('');
|
|
});
|
|
});
|
|
|
|
describe('filamentTypesCompatible', () => {
|
|
it('treats PA-CF and PA12-CF as compatible', () => {
|
|
expect(filamentTypesCompatible('PA-CF', 'PA12-CF')).toBe(true);
|
|
});
|
|
|
|
it('treats PA-CF and PAHT-CF as compatible', () => {
|
|
expect(filamentTypesCompatible('PA-CF', 'PAHT-CF')).toBe(true);
|
|
});
|
|
|
|
it('treats PLA and PETG as incompatible', () => {
|
|
expect(filamentTypesCompatible('PLA', 'PETG')).toBe(false);
|
|
});
|
|
|
|
it('treats same types as compatible', () => {
|
|
expect(filamentTypesCompatible('PLA', 'PLA')).toBe(true);
|
|
});
|
|
});
|
|
|
|
// -- filterFilamentsByNozzle -------------------------------------------------
|
|
|
|
describe('filterFilamentsByNozzle', () => {
|
|
it('returns all filaments when nozzle_id is null', () => {
|
|
const result = filterFilamentsByNozzle(H2D_FILAMENTS, null);
|
|
expect(result).toHaveLength(4);
|
|
});
|
|
|
|
it('returns all filaments when nozzle_id is undefined', () => {
|
|
const result = filterFilamentsByNozzle(H2D_FILAMENTS, undefined);
|
|
expect(result).toHaveLength(4);
|
|
});
|
|
|
|
it('filters to left nozzle (extruderId=1)', () => {
|
|
const result = filterFilamentsByNozzle(H2D_FILAMENTS, 1);
|
|
expect(result).toHaveLength(2);
|
|
expect(result.every((f) => f.extruderId === 1)).toBe(true);
|
|
});
|
|
|
|
it('filters to right nozzle (extruderId=0)', () => {
|
|
const result = filterFilamentsByNozzle(H2D_FILAMENTS, 0);
|
|
expect(result).toHaveLength(2);
|
|
expect(result.every((f) => f.extruderId === 0)).toBe(true);
|
|
});
|
|
});
|
|
|
|
// -- autoMatchFilament -------------------------------------------------------
|
|
|
|
describe('autoMatchFilament', () => {
|
|
it('matches exact type+color on correct nozzle', () => {
|
|
const req = makeReq({ type: 'PLA', color: '#FFFFFF', nozzle_id: 0 });
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, new Set());
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(4); // AMS2-T1 on right nozzle
|
|
});
|
|
|
|
it('does NOT match filament on wrong nozzle — regression #624', () => {
|
|
// Require PLA Black on right nozzle (extruderId=0).
|
|
// PLA Black exists only on left nozzle (tray 0, extruderId=1).
|
|
const req = makeReq({ type: 'PLA', color: '#000000', nozzle_id: 0 });
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, new Set());
|
|
// Should NOT match tray 0 (wrong nozzle). May match tray 4 or 5 as type-only.
|
|
if (result) {
|
|
expect(result.extruderId).toBe(0);
|
|
expect(result.globalTrayId).not.toBe(0);
|
|
}
|
|
});
|
|
|
|
it('matches without nozzle constraint for single-nozzle printers', () => {
|
|
const req = makeReq({ type: 'PLA', color: '#000000' }); // no nozzle_id
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, new Set());
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(0); // Exact match: PLA Black
|
|
});
|
|
|
|
it('falls back to type-only match on correct nozzle', () => {
|
|
// Require PETG Green on left nozzle — no exact color match, but PETG White exists
|
|
const req = makeReq({ type: 'PETG', color: '#00FF00', nozzle_id: 1 });
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, new Set());
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(1); // PETG White on left nozzle
|
|
expect(result!.extruderId).toBe(1);
|
|
});
|
|
|
|
it('returns undefined when no filament matches on required nozzle', () => {
|
|
// Require PETG on right nozzle — PETG only exists on left nozzle
|
|
const req = makeReq({ type: 'PETG', color: '#FFFFFF', nozzle_id: 0 });
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, new Set());
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
it('skips already-used tray IDs', () => {
|
|
const req = makeReq({ type: 'PLA', color: '#FFFFFF', nozzle_id: 0 });
|
|
const used = new Set([4]); // AMS2-T1 already used
|
|
const result = autoMatchFilament(req, H2D_FILAMENTS, used);
|
|
// Should fall back to PLA Red (tray 5) as type-only match
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(5);
|
|
});
|
|
|
|
it('matches PA-CF requirement to PA12-CF filament — #688', () => {
|
|
const filaments: LoadedFilament[] = [
|
|
makeFilament({ globalTrayId: 0, type: 'PA12-CF', color: '#000000', colorName: 'Black' }),
|
|
];
|
|
const req = makeReq({ type: 'PA-CF', color: '#000000' });
|
|
const result = autoMatchFilament(req, filaments, new Set());
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(0);
|
|
});
|
|
|
|
it('matches PAHT-CF requirement to PA-CF filament — #688', () => {
|
|
const filaments: LoadedFilament[] = [
|
|
makeFilament({ globalTrayId: 0, type: 'PA-CF', color: '#333333', colorName: 'Dark Gray' }),
|
|
];
|
|
const req = makeReq({ type: 'PAHT-CF', color: '#333333' });
|
|
const result = autoMatchFilament(req, filaments, new Set());
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(0);
|
|
});
|
|
});
|
|
|
|
// -- autoMatchFilament with preferLowest ------------------------------------
|
|
|
|
describe('autoMatchFilament preferLowest', () => {
|
|
it('picks spool with lowest remain when enabled', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 80 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 30 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const result = autoMatchFilament(req, filaments, new Set(), true);
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(1); // 30% < 80%
|
|
});
|
|
|
|
it('picks first spool when disabled (default behavior)', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 80 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 30 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const result = autoMatchFilament(req, filaments, new Set(), false);
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(0); // First match
|
|
});
|
|
|
|
it('sorts unknown remain (-1) to end', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: -1 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 50 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const result = autoMatchFilament(req, filaments, new Set(), true);
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(1); // Known 50% over unknown
|
|
});
|
|
|
|
it('still respects nozzle constraint with preferLowest', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 10, extruderId: 1 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 80, extruderId: 0 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000', nozzle_id: 0 });
|
|
const result = autoMatchFilament(req, filaments, new Set(), true);
|
|
expect(result).toBeDefined();
|
|
expect(result!.globalTrayId).toBe(1); // Only tray on correct nozzle
|
|
});
|
|
});
|
|
|
|
// #1766: identical-material spools that only differ in inventory grams used to
|
|
// tie at the printer's `remain%` and the first one always won. The map lets
|
|
// the sort see the bound spool's `label_weight - weight_used` instead.
|
|
describe('autoMatchFilament preferLowest with inventory map (#1766)', () => {
|
|
it('picks lower inventory grams when remain% ties', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 100 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 100 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const inventory = new Map<number, number>([[0, 900], [1, 60]]);
|
|
const result = autoMatchFilament(req, filaments, new Set(), true, inventory);
|
|
expect(result!.globalTrayId).toBe(1); // 60 g < 900 g
|
|
});
|
|
|
|
it('inventory-bound spool beats MQTT-only one even when remain% would order them differently', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 10 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 90 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const inventory = new Map<number, number>([[1, 200]]); // Only tray 1 bound.
|
|
const result = autoMatchFilament(req, filaments, new Set(), true, inventory);
|
|
expect(result!.globalTrayId).toBe(1); // Tier 0 always beats tier 1.
|
|
});
|
|
|
|
it('falls back to remain% sort when map is undefined', () => {
|
|
const filaments = [
|
|
makeFilament({ globalTrayId: 0, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 80 }),
|
|
makeFilament({ globalTrayId: 1, type: 'PLA', color: '#FF0000', colorName: 'Red', remain: 30 }),
|
|
];
|
|
const req = makeReq({ type: 'PLA', color: '#FF0000' });
|
|
const result = autoMatchFilament(req, filaments, new Set(), true, undefined);
|
|
expect(result!.globalTrayId).toBe(1); // Same as the pre-#1766 path.
|
|
});
|
|
});
|