project-foundry 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-foundry",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Project Foundry CLI & Local Node Daemon Manager",
   "bin": {
     "project-foundry": "bin/foundry.js",

package/src/local-printer-executor.js

@@ -103,20 +103,40 @@ export async function executeLocalPrinterAction({ action, printerId, connectionC
       let status = klippyState === 'ready' ? 'IDLE' : 'ERROR';
       let message = `Klipper: ${klippyState}`;
       let temperatures = {};
+      let progress = 0;
+      let currentLayer = 0;
+      let totalLayers = 0;
+      let filename;
+      let elapsedSeconds = 0;
 
       try {
         const telRes = await fetch(
-          `${baseUrl}/printer/objects/query?print_stats&extruder&heater_bed`,
-          { headers, signal: AbortSignal.timeout(5000) }
+          `${baseUrl}/printer/objects/query?print_stats&display_status&virtual_sdcard&extruder&heater_bed`,
+          { headers, signal: AbortSignal.timeout(6000) }
         );
         if (telRes.ok) {
           const tel = await telRes.json();
-          const stats = tel?.result?.status?.print_stats || {};
-          const ext = tel?.result?.status?.extruder || {};
-          const bed = tel?.result?.status?.heater_bed || {};
-          const st = String(stats.state || '').toLowerCase();
+          const s = tel?.result?.status || {};
+          const printStats = s.print_stats || {};
+          const display = s.display_status || {};
+          const virtualSd = s.virtual_sdcard || {};
+          const ext = s.extruder || {};
+          const bed = s.heater_bed || {};
+
+          const st = String(printStats.state || '').toLowerCase();
           if (st === 'printing') status = 'PRINTING';
           else if (st === 'paused') status = 'PAUSED';
+          else if (st === 'complete') status = 'IDLE';
+          else if (st === 'error') status = 'ERROR';
+
+          const dispProg = Number(display.progress || 0);
+          const sdProg = Number(virtualSd.progress || 0);
+          progress = Math.round(Math.max(dispProg, sdProg) * 100);
+
+          currentLayer = Number(virtualSd.layer || printStats?.info?.current_layer || 0);
+          totalLayers = Number(virtualSd.layer_count || printStats?.info?.total_layer || 0);
+          filename = printStats.filename || undefined;
+          elapsedSeconds = Number(printStats.print_duration || printStats.total_duration || 0);
 
           temperatures = {
             hotend: ext.temperature,
@@ -124,7 +144,7 @@ export async function executeLocalPrinterAction({ action, printerId, connectionC
             bed: bed.temperature,
             bedTarget: bed.target,
           };
-          if (stats.message) message = stats.message;
+          if (printStats.message) message = printStats.message;
         }
       } catch {}
 
@@ -132,6 +152,11 @@ export async function executeLocalPrinterAction({ action, printerId, connectionC
         online: true,
         status,
         message,
+        progress,
+        currentLayer,
+        totalLayers,
+        filename,
+        elapsedSeconds,
         temperatures,
       };
     }
@@ -183,20 +208,41 @@ export async function executeLocalPrinterAction({ action, printerId, connectionC
               isDone = true;
               clearTimeout(timer);
               client.end(true);
+
               const state = String(data.print.gcode_state || 'IDLE').toUpperCase();
               const percent = Number(data.print.mc_percent || 0);
-              const isPrinting = state === 'RUNNING' || state === 'PREPARE';
+              const isFinished = state === 'FINISH' || (state === 'IDLE' && percent === 100);
+              const isPrinting = (state === 'RUNNING' || state === 'PREPARE') && !isFinished;
+              const isPaused = state === 'PAUSE';
+
+              const filename =
+                typeof data.print.subtask_name === 'string' && data.print.subtask_name.trim()
+                  ? data.print.subtask_name.trim()
+                  : typeof data.print.gcode_file === 'string' && data.print.gcode_file.trim()
+                  ? data.print.gcode_file.trim()
+                  : undefined;
+
+              const remainingMins = Number(data.print.mc_remaining_time);
+              const remainingSeconds = Number.isFinite(remainingMins) ? Math.max(0, remainingMins * 60) : undefined;
+
               resolve({
                 online: true,
-                status: isPrinting ? 'PRINTING' : (state === 'PAUSE' ? 'PAUSED' : 'IDLE'),
-                message: `Bambu LAN conectada (${state})`,
+                status: isPrinting ? 'PRINTING' : (isPaused ? 'PAUSED' : 'IDLE'),
+                message: isFinished
+                  ? 'Impressão concluída com sucesso'
+                  : `Bambu LAN conectada (${state})`,
                 progress: percent,
+                currentLayer: Number(data.print.layer_num || 0),
+                totalLayers: Number(data.print.total_layer_num || 0),
+                filename,
+                remainingSeconds,
+                jobFinished: isFinished,
                 temperatures: {
-                  hotend: data.print.nozzle_temper,
-                  hotendTarget: data.print.nozzle_target_temper,
-                  bed: data.print.bed_temper,
-                  bedTarget: data.print.bed_target_temper,
-                  chamber: data.print.chamber_temper,
+                  hotend: Number(data.print.nozzle_temper || 0),
+                  hotendTarget: Number(data.print.nozzle_target_temper || 0),
+                  bed: Number(data.print.bed_temper || 0),
+                  bedTarget: Number(data.print.bed_target_temper || 0),
+                  chamber: Number(data.print.chamber_temper || 0),
                 },
               });
             }