Revert "Refactor logging and formatting"

This reverts commit 83ce890ef4.

canvas_node.py

@@ -49,24 +49,11 @@ except ImportError as e:
     # Fallback jeśli logger nie jest dostępny
     print(f"Warning: Logger module not available: {e}")
     
-
     # Proste funkcje zastępcze
-    def log_debug(*args):
+    def log_debug(*args): print("[DEBUG]", *args)
-        print("[DEBUG]", *args)
+    def log_info(*args): print("[INFO]", *args)
-
+    def log_warn(*args): print("[WARN]", *args)
-
+    def log_error(*args): print("[ERROR]", *args)
-    def log_info(*args):
-        print("[INFO]", *args)
-
-
-    def log_warn(*args):
-        print("[WARN]", *args)
-
-
-    def log_error(*args):
-        print("[ERROR]", *args)
-
-
     def log_exception(*args):
         print("[ERROR]", *args)
         traceback.print_exc()
@@ -260,12 +247,10 @@ class CanvasNode:
     # Zmienna blokująca równoczesne wykonania
     _processing_lock = threading.Lock()
 
-    def process_canvas_image(self, trigger, output_switch, cache_enabled, node_id, prompt=None, unique_id=None,
+    def process_canvas_image(self, trigger, output_switch, cache_enabled, node_id, prompt=None, unique_id=None, input_image=None,
-                             input_image=None,
                              input_mask=None):
         
-        log_info(
+        log_info(f"[CanvasNode] 🔍 process_canvas_image wejście – node_id={node_id!r}, unique_id={unique_id!r}, trigger={trigger}, output_switch={output_switch}")
-            f"[CanvasNode] 🔍 process_canvas_image wejście – node_id={node_id!r}, unique_id={unique_id!r}, trigger={trigger}, output_switch={output_switch}")
         
         try:
             # Sprawdź czy już trwa przetwarzanie
@@ -274,8 +259,7 @@ class CanvasNode:
                 # Return cached data if available to avoid breaking the flow
                 return self.get_cached_data()
 
-            log_info(
+            log_info(f"Lock acquired. Starting process_canvas_image for node_id: {node_id} (fallback unique_id: {unique_id})")
-                f"Lock acquired. Starting process_canvas_image for node_id: {node_id} (fallback unique_id: {unique_id})")
             
             # Use node_id as the primary key, as unique_id is proving unreliable
             storage_key = node_id
@@ -312,6 +296,7 @@ class CanvasNode:
                     log_info("Using provided input_mask as fallback")
                     processed_mask = input_mask
 
+
             # Fallback to default tensors if nothing is loaded
             if processed_image is None:
                 log_warn(f"Processed image is still None, creating default blank image.")
@@ -320,12 +305,12 @@ class CanvasNode:
                 log_warn(f"Processed mask is still None, creating default blank mask.")
                 processed_mask = torch.zeros((1, 512, 512), dtype=torch.float32)
 
+
             if not output_switch:
                 log_debug(f"Output switch is OFF, returning empty tuple")
                 return (None, None)
 
-            log_debug(
+            log_debug(f"About to return output - Image shape: {processed_image.shape}, Mask shape: {processed_mask.shape}")
-                f"About to return output - Image shape: {processed_image.shape}, Mask shape: {processed_mask.shape}")
             
             self.update_persistent_cache()
             
@@ -694,7 +679,6 @@ class BiRefNetMatting:
 # Zmienna blokująca równoczesne wywołania matting
 _matting_lock = None
 
-
 @PromptServer.instance.routes.post("/matting")
 async def matting(request):
     global _matting_lock

js/Canvas.js

@@ -7,7 +7,6 @@ import {CanvasRenderer} from "./CanvasRenderer.js";
 import {CanvasIO} from "./CanvasIO.js";
 import {ImageReferenceManager} from "./ImageReferenceManager.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-
 const log = createModuleLogger('Canvas');
 
 export class Canvas {
@@ -138,7 +137,6 @@ export class Canvas {
             this.onSelectionChange();
         }
     }
-
     async copySelectedLayers() {
         return this.canvasLayers.copySelectedLayers();
     }
@@ -267,6 +265,8 @@ export class Canvas {
     }
 
 
+
+
     async getFlattenedCanvasAsBlob() {
         return this.canvasLayers.getFlattenedCanvasAsBlob();
     }

js/CanvasIO.js

@@ -35,6 +35,7 @@ export class CanvasIO {
                 log.debug(`Save completed for node ${nodeId}, lock released`);
             }
         } else {
+            // For RAM mode, we don't need the lock/state management as it's synchronous
             log.info(`Starting saveToServer (RAM) for node: ${this.canvas.node.id}`);
             return this._performSave(fileName, outputMode);
         }
@@ -99,36 +100,50 @@ export class CanvasIO {
             maskCtx.putImageData(maskData, 0, 0);
             const toolMaskCanvas = this.canvas.maskTool.getMask();
             if (toolMaskCanvas) {
+                // Create a temp canvas for processing the mask
                 const tempMaskCanvas = document.createElement('canvas');
                 tempMaskCanvas.width = this.canvas.width;
                 tempMaskCanvas.height = this.canvas.height;
                 const tempMaskCtx = tempMaskCanvas.getContext('2d');
+                
+                // Clear the canvas
                 tempMaskCtx.clearRect(0, 0, tempMaskCanvas.width, tempMaskCanvas.height);
+                
+                // Calculate the correct position to extract the mask
+                // The mask's position in world space
                 const maskX = this.canvas.maskTool.x;
                 const maskY = this.canvas.maskTool.y;
                 
                 log.debug(`Extracting mask from world position (${maskX}, ${maskY}) for output area (0,0) to (${this.canvas.width}, ${this.canvas.height})`);
-                const sourceX = Math.max(0, -maskX);
+                
+                // Calculate the source rectangle in the mask canvas that corresponds to the output area
+                const sourceX = Math.max(0, -maskX);  // Where in the mask canvas to start reading
                 const sourceY = Math.max(0, -maskY);
-                const destX = Math.max(0, maskX);
+                const destX = Math.max(0, maskX);     // Where in the output canvas to start writing
                 const destY = Math.max(0, maskY);
+                
+                // Calculate the dimensions of the area to copy
                 const copyWidth = Math.min(
-                    toolMaskCanvas.width - sourceX,
+                    toolMaskCanvas.width - sourceX,   // Available width in source
-                    this.canvas.width - destX
+                    this.canvas.width - destX         // Available width in destination
                 );
                 const copyHeight = Math.min(
-                    toolMaskCanvas.height - sourceY,
+                    toolMaskCanvas.height - sourceY,  // Available height in source
-                    this.canvas.height - destY
+                    this.canvas.height - destY        // Available height in destination
                 );
+                
+                // Only draw if there's an actual intersection
                 if (copyWidth > 0 && copyHeight > 0) {
                     log.debug(`Copying mask region: source(${sourceX}, ${sourceY}) to dest(${destX}, ${destY}) size(${copyWidth}, ${copyHeight})`);
                     
                     tempMaskCtx.drawImage(
                         toolMaskCanvas,
-                        sourceX, sourceY, copyWidth, copyHeight,
+                        sourceX, sourceY, copyWidth, copyHeight,  // Source rectangle
-                        destX, destY, copyWidth, copyHeight
+                        destX, destY, copyWidth, copyHeight       // Destination rectangle
                     );
                 }
+                
+                // Convert to proper mask format
                 const tempMaskData = tempMaskCtx.getImageData(0, 0, this.canvas.width, this.canvas.height);
                 for (let i = 0; i < tempMaskData.data.length; i += 4) {
                     const alpha = tempMaskData.data[i + 3];
@@ -136,6 +151,8 @@ export class CanvasIO {
                     tempMaskData.data[i + 3] = alpha;
                 }
                 tempMaskCtx.putImageData(tempMaskData, 0, 0);
+                
+                // Draw the processed mask to the final mask canvas
                 maskCtx.globalCompositeOperation = 'source-over';
                 maskCtx.drawImage(tempMaskCanvas, 0, 0);
             }
@@ -146,6 +163,8 @@ export class CanvasIO {
                 resolve({ image: imageData, mask: maskData });
                 return;
             }
+
+            // --- Disk Mode (original logic) ---
             const fileNameWithoutMask = fileName.replace('.png', '_without_mask.png');
             log.info(`Saving image without mask as: ${fileNameWithoutMask}`);
             
@@ -228,17 +247,20 @@ export class CanvasIO {
         return new Promise((resolve) => {
             const { canvas: tempCanvas, ctx: tempCtx } = createCanvas(this.canvas.width, this.canvas.height);
             const { canvas: maskCanvas, ctx: maskCtx } = createCanvas(this.canvas.width, this.canvas.height);
+    
+            // This logic is mostly mirrored from _performSave to ensure consistency
             tempCtx.fillStyle = '#ffffff';
             tempCtx.fillRect(0, 0, this.canvas.width, this.canvas.height);
             const visibilityCanvas = document.createElement('canvas');
             visibilityCanvas.width = this.canvas.width;
             visibilityCanvas.height = this.canvas.height;
             const visibilityCtx = visibilityCanvas.getContext('2d', { alpha: true });
-            maskCtx.fillStyle = '#ffffff';
+            maskCtx.fillStyle = '#ffffff'; // Start with a white mask (nothing masked)
             maskCtx.fillRect(0, 0, this.canvas.width, this.canvas.height);
             
             const sortedLayers = this.canvas.layers.sort((a, b) => a.zIndex - b.zIndex);
             sortedLayers.forEach((layer) => {
+                // Render layer to main canvas
                 tempCtx.save();
                 tempCtx.globalCompositeOperation = layer.blendMode || 'normal';
                 tempCtx.globalAlpha = layer.opacity !== undefined ? layer.opacity : 1;
@@ -246,28 +268,39 @@ export class CanvasIO {
                 tempCtx.rotate(layer.rotation * Math.PI / 180);
                 tempCtx.drawImage(layer.image, -layer.width / 2, -layer.height / 2, layer.width, layer.height);
                 tempCtx.restore();
+                
+                // Render layer to visibility canvas for the mask
                 visibilityCtx.save();
                 visibilityCtx.translate(layer.x + layer.width / 2, layer.y + layer.height / 2);
                 visibilityCtx.rotate(layer.rotation * Math.PI / 180);
                 visibilityCtx.drawImage(layer.image, -layer.width / 2, -layer.height / 2, layer.width, layer.height);
                 visibilityCtx.restore();
             });
+    
+            // Create layer visibility mask
             const visibilityData = visibilityCtx.getImageData(0, 0, this.canvas.width, this.canvas.height);
             const maskData = maskCtx.getImageData(0, 0, this.canvas.width, this.canvas.height);
             for (let i = 0; i < visibilityData.data.length; i += 4) {
                 const alpha = visibilityData.data[i + 3];
-                const maskValue = 255 - alpha;
+                const maskValue = 255 - alpha; // Invert alpha to create the mask
                 maskData.data[i] = maskData.data[i + 1] = maskData.data[i + 2] = maskValue;
-                maskData.data[i + 3] = 255;
+                maskData.data[i + 3] = 255; // Solid mask
             }
             maskCtx.putImageData(maskData, 0, 0);
+    
+            // Composite the tool mask on top
             const toolMaskCanvas = this.canvas.maskTool.getMask();
             if (toolMaskCanvas) {
+                // Create a temp canvas for processing the mask
                 const tempMaskCanvas = document.createElement('canvas');
                 tempMaskCanvas.width = this.canvas.width;
                 tempMaskCanvas.height = this.canvas.height;
                 const tempMaskCtx = tempMaskCanvas.getContext('2d');
+                
+                // Clear the canvas
                 tempMaskCtx.clearRect(0, 0, tempMaskCanvas.width, tempMaskCanvas.height);
+                
+                // Calculate the correct position to extract the mask
                 const maskX = this.canvas.maskTool.x;
                 const maskY = this.canvas.maskTool.y;
                 
@@ -288,13 +321,19 @@ export class CanvasIO {
                         destX, destY, copyWidth, copyHeight
                     );
                 }
+                
+                // Convert the brush mask (white with alpha) to a solid white mask on black background.
                 const tempMaskData = tempMaskCtx.getImageData(0, 0, this.canvas.width, this.canvas.height);
                 for (let i = 0; i < tempMaskData.data.length; i += 4) {
                     const alpha = tempMaskData.data[i + 3];
+                    // The painted area (alpha > 0) should become white (255).
                     tempMaskData.data[i] = tempMaskData.data[i+1] = tempMaskData.data[i+2] = alpha;
-                    tempMaskData.data[i + 3] = 255;
+                    tempMaskData.data[i + 3] = 255; // Solid alpha
                 }
                 tempMaskCtx.putImageData(tempMaskData, 0, 0);
+                
+                // Use 'screen' blending mode. This correctly adds the white brush mask
+                // to the existing layer visibility mask. (white + anything = white)
                 maskCtx.globalCompositeOperation = 'screen';
                 maskCtx.drawImage(tempMaskCanvas, 0, 0);
             }
@@ -318,12 +357,14 @@ export class CanvasIO {
                 nodeId: String(nodeId),
                 image: image,
                 mask: mask,
-            }, true);
+            }, true); // `true` requires an acknowledgment
             
             log.info(`Data for node ${nodeId} has been sent and acknowledged by the server.`);
             return true;
         } catch (error) {
             log.error(`Failed to send data for node ${nodeId}:`, error);
+            // We can alert the user here or handle it silently.
+            // For now, let's throw to make it clear the process failed.
             throw new Error(`Failed to get confirmation from server for node ${nodeId}. The workflow might not have the latest canvas data.`);
         }
     }

js/CanvasInteractions.js

@@ -1,6 +1,5 @@
 import {createModuleLogger} from "./utils/LoggerUtils.js";
 import {snapToGrid, getSnapAdjustment} from "./utils/CommonUtils.js";
-
 const log = createModuleLogger('CanvasInteractions');
 
 export class CanvasInteractions {
@@ -503,6 +502,8 @@ export class CanvasInteractions {
                 layer.x -= finalX;
                 layer.y -= finalY;
             });
+            
+            // Update mask position when moving canvas
             this.canvas.maskTool.updatePosition(-finalX, -finalY);
             
             this.canvas.viewport.x -= finalX;
@@ -689,6 +690,8 @@ export class CanvasInteractions {
                 layer.x -= rectX;
                 layer.y -= rectY;
             });
+            
+            // Update mask position when resizing canvas
             this.canvas.maskTool.updatePosition(-rectX, -rectY);
 
             this.canvas.viewport.x -= rectX;

js/CanvasLayers.js

@@ -2,7 +2,6 @@ import {saveImage, removeImage} from "./db.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
 import {generateUUID, generateUniqueFileName} from "./utils/CommonUtils.js";
 import {withErrorHandling, createValidationError} from "./ErrorHandler.js";
-
 const log = createModuleLogger('CanvasLayers');
 
 export class CanvasLayers {
@@ -359,7 +358,6 @@ export class CanvasLayers {
         this.canvasLayers.selectedLayer = layer;
         this.canvasLayers.render();
     }
-
     isRotationHandle(x, y) {
         if (!this.canvasLayers.selectedLayer) return false;
 
@@ -430,18 +428,12 @@ export class CanvasLayers {
         const handleRadius = 5;
         const handles = {
             'nw': {x: this.canvasLayers.selectedLayer.x, y: this.canvasLayers.selectedLayer.y},
-            'ne': {
+            'ne': {x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width, y: this.canvasLayers.selectedLayer.y},
-                x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width,
-                y: this.canvasLayers.selectedLayer.y
-            },
             'se': {
                 x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width,
                 y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height
             },
-            'sw': {
+            'sw': {x: this.canvasLayers.selectedLayer.x, y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height}
-                x: this.canvasLayers.selectedLayer.x,
-                y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height
-            }
         };
 
         for (const [position, point] of Object.entries(handles)) {
@@ -451,7 +443,6 @@ export class CanvasLayers {
         }
         return null;
     }
-
     showBlendModeMenu(x, y) {
         const existingMenu = document.getElementById('blend-mode-menu');
         if (existingMenu) {
@@ -603,7 +594,6 @@ export class CanvasLayers {
             modeElement.appendChild(slider);
         }
     }
-
     async getFlattenedCanvasAsBlob() {
         return new Promise((resolve, reject) => {
             const tempCanvas = document.createElement('canvas');
@@ -643,7 +633,6 @@ export class CanvasLayers {
             }, 'image/png');
         });
     }
-
     async getFlattenedSelectionAsBlob() {
         if (this.canvasLayers.selectedLayers.length === 0) {
             return null;

js/CanvasRenderer.js

@@ -1,5 +1,4 @@
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-
 const log = createModuleLogger('CanvasRenderer');
 
 export class CanvasRenderer {
@@ -84,7 +83,10 @@ export class CanvasRenderer {
         this.drawCanvasOutline(ctx);
         const maskImage = this.canvas.maskTool.getMask();
         if (maskImage) {
+            // Create a clipping region to only show mask content that overlaps with the output area
             ctx.save();
+            
+            // Only show what's visible inside the output area
             if (this.canvas.maskTool.isActive) {
                 ctx.globalCompositeOperation = 'source-over';
                 ctx.globalAlpha = 0.5;
@@ -92,6 +94,8 @@ export class CanvasRenderer {
                 ctx.globalCompositeOperation = 'source-over';
                 ctx.globalAlpha = 1.0;
             }
+            
+            // Draw the mask at its world space position
             ctx.drawImage(maskImage, this.canvas.maskTool.x, this.canvas.maskTool.y);
             
             ctx.globalAlpha = 1.0;

js/CanvasState.js

@@ -2,7 +2,6 @@ import {getCanvasState, setCanvasState, saveImage, getImage} from "./db.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
 import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
 import {withErrorHandling} from "./ErrorHandler.js";
-
 const log = createModuleLogger('CanvasState');
 
 export class CanvasState {

js/CanvasView.js

@@ -742,6 +742,8 @@ async function createCanvasWidget(node, widget, app) {
     const triggerWidget = node.widgets.find(w => w.name === "trigger");
 
     const updateOutput = async () => {
+        // Only increment trigger and run step - don't save to disk here
+        // Saving to disk will happen during execution_start event
         triggerWidget.value = (triggerWidget.value + 1) % 99999999;
         app.graph.runStep();
     };
@@ -786,6 +788,10 @@ async function createCanvasWidget(node, widget, app) {
         canvas.render();
     };
 
+    // Remove automatic saving on mouse events - only save during execution
+    // canvas.canvas.addEventListener('mouseup', updateOutput);
+    // canvas.canvas.addEventListener('mouseleave', updateOutput);
+
 
     const mainContainer = $el("div.painterMainContainer", {
         style: {
@@ -917,6 +923,7 @@ async function createCanvasWidget(node, widget, app) {
     }
     
 
+
     node.canvasWidget = canvas;
 
     setTimeout(() => {
@@ -936,6 +943,7 @@ app.registerExtension({
     name: "Comfy.CanvasNode",
 
     init() {
+        // Monkey-patch the queuePrompt function to send canvas data via WebSocket before sending the prompt
         const originalQueuePrompt = app.queuePrompt;
         app.queuePrompt = async function(number, prompt) {
             log.info("Preparing to queue prompt...");
@@ -945,26 +953,33 @@ app.registerExtension({
                 
                 const sendPromises = [];
                 for (const [nodeId, canvasWidget] of canvasNodeInstances.entries()) {
+                    // Ensure the node still exists on the graph before sending data
                     if (app.graph.getNodeById(nodeId) && canvasWidget.canvas && canvasWidget.canvas.canvasIO) {
                         log.debug(`Sending data for canvas node ${nodeId}`);
+                        // This now returns a promise that resolves upon server ACK
                         sendPromises.push(canvasWidget.canvas.canvasIO.sendDataViaWebSocket(nodeId));
                     } else {
+                        // If node doesn't exist, it might have been deleted, so we can clean up the map
                         log.warn(`Node ${nodeId} not found in graph, removing from instances map.`);
                         canvasNodeInstances.delete(nodeId);
                     }
                 }
 
                 try {
+                    // Wait for all WebSocket messages to be acknowledged
                     await Promise.all(sendPromises);
                     log.info("All canvas data has been sent and acknowledged by the server.");
                 } catch (error) {
                     log.error("Failed to send canvas data for one or more nodes. Aborting prompt.", error);
+                    // IMPORTANT: Stop the prompt from queueing if data transfer fails.
+                    // You might want to show a user-facing error here.
                     alert(`CanvasNode Error: ${error.message}`);
-                    return;
+                    return; // Stop execution
                 }
             }
             
             log.info("All pre-prompt tasks complete. Proceeding with original queuePrompt.");
+            // Proceed with the original queuePrompt logic
             return originalQueuePrompt.apply(this, arguments);
         };
     },
@@ -974,16 +989,25 @@ app.registerExtension({
             const onNodeCreated = nodeType.prototype.onNodeCreated;
             nodeType.prototype.onNodeCreated = function () {
                 log.debug("CanvasNode onNodeCreated: Base widget setup.");
+                // Call original onNodeCreated to ensure widgets are created
                 const r = onNodeCreated?.apply(this, arguments);
+                // The main initialization is moved to onAdded
                 return r;
             };
+
+            // onAdded is the most reliable callback for when a node is fully added to the graph and has an ID
             nodeType.prototype.onAdded = async function() {
                 log.info(`CanvasNode onAdded, ID: ${this.id}`);
                 log.debug(`Available widgets in onAdded:`, this.widgets.map(w => w.name));
+
+                // Prevent re-initialization if the widget already exists
                 if (this.canvasWidget) {
                     log.warn(`CanvasNode ${this.id} already initialized. Skipping onAdded setup.`);
                     return;
                 }
+
+                // Now that we are in onAdded, this.id is guaranteed to be correct.
+                // Set the hidden node_id widget's value for backend communication.
                 const nodeIdWidget = this.widgets.find(w => w.name === "node_id");
                 if (nodeIdWidget) {
                     nodeIdWidget.value = String(this.id);
@@ -991,6 +1015,9 @@ app.registerExtension({
                 } else {
                     log.error("Could not find the hidden node_id widget!");
                 }
+                
+                // Create the main canvas widget and register it in our global map
+                // We pass `null` for the widget parameter as we are not using a pre-defined widget.
                 const canvasWidget = await createCanvasWidget(this, null, app);
                 canvasNodeInstances.set(this.id, canvasWidget);
                 log.info(`Registered CanvasNode instance for ID: ${this.id}`);
@@ -999,8 +1026,12 @@ app.registerExtension({
             const onRemoved = nodeType.prototype.onRemoved;
             nodeType.prototype.onRemoved = function () {
                 log.info(`Cleaning up canvas node ${this.id}`);
+                
+                // Clean up from our instance map
                 canvasNodeInstances.delete(this.id);
                 log.info(`Deregistered CanvasNode instance for ID: ${this.id}`);
+
+                // Clean up execution state
                 if (window.canvasExecutionStates) {
                     window.canvasExecutionStates.delete(this.id);
                 }
@@ -1013,6 +1044,8 @@ app.registerExtension({
                 if (backdrop && backdrop.contains(this.canvasWidget?.canvas)) {
                     document.body.removeChild(backdrop);
                 }
+
+                // Cleanup canvas resources including garbage collection
                 if (this.canvasWidget && this.canvasWidget.destroy) {
                     this.canvasWidget.destroy();
                 }

js/ErrorHandler.js

@@ -224,7 +224,6 @@ export class ErrorHandler {
         log.info('Error history cleared');
     }
 }
-
 const errorHandler = new ErrorHandler();
 
 /**
@@ -347,6 +346,5 @@ export async function retryWithBackoff(operation, maxRetries = 3, baseDelay = 10
     
     throw errorHandler.handle(lastError, context, { attempts: maxRetries + 1 });
 }
-
 export { errorHandler };
 export default errorHandler;

js/ImageCache.js

@@ -1,5 +1,4 @@
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-
 const log = createModuleLogger('ImageCache');
 
 export class ImageCache {

js/ImageReferenceManager.js

@@ -6,14 +6,19 @@ const log = createModuleLogger('ImageReferenceManager');
 export class ImageReferenceManager {
     constructor(canvas) {
         this.canvas = canvas;
-        this.imageReferences = new Map();
+        this.imageReferences = new Map(); // imageId -> count
-        this.imageLastUsed = new Map();
+        this.imageLastUsed = new Map();   // imageId -> timestamp
-        this.gcInterval = 5 * 60 * 1000;
+        this.gcInterval = 5 * 60 * 1000;  // 5 minut (nieużywane)
-        this.maxAge = 30 * 60 * 1000;
+        this.maxAge = 30 * 60 * 1000;     // 30 minut bez użycia
         this.gcTimer = null;
         this.isGcRunning = false;
+        
+        // Licznik operacji dla automatycznego GC
         this.operationCount = 0;
-        this.operationThreshold = 500;
+        this.operationThreshold = 500;   // Uruchom GC po 500 operacjach
+        
+        // Nie uruchamiamy automatycznego GC na czasie
+        // this.startGarbageCollection();
     }
 
     /**
@@ -78,8 +83,14 @@ export class ImageReferenceManager {
      */
     updateReferences() {
         log.debug("Updating image references...");
+        
+        // Wyczyść stare referencje
         this.imageReferences.clear();
+        
+        // Zbierz wszystkie używane imageId
         const usedImageIds = this.collectAllUsedImageIds();
+        
+        // Dodaj referencje dla wszystkich używanych obrazów
         usedImageIds.forEach(imageId => {
             this.addReference(imageId);
         });
@@ -93,11 +104,15 @@ export class ImageReferenceManager {
      */
     collectAllUsedImageIds() {
         const usedImageIds = new Set();
+        
+        // 1. Aktualne warstwy
         this.canvas.layers.forEach(layer => {
             if (layer.imageId) {
                 usedImageIds.add(layer.imageId);
             }
         });
+        
+        // 2. Historia undo
         if (this.canvas.canvasState && this.canvas.canvasState.layersUndoStack) {
             this.canvas.canvasState.layersUndoStack.forEach(layersState => {
                 layersState.forEach(layer => {
@@ -107,6 +122,8 @@ export class ImageReferenceManager {
                 });
             });
         }
+        
+        // 3. Historia redo
         if (this.canvas.canvasState && this.canvas.canvasState.layersRedoStack) {
             this.canvas.canvasState.layersRedoStack.forEach(layersState => {
                 layersState.forEach(layer => {
@@ -128,14 +145,18 @@ export class ImageReferenceManager {
      */
     async findUnusedImages(usedImageIds) {
         try {
+            // Pobierz wszystkie imageId z bazy danych
             const allImageIds = await getAllImageIds();
             const unusedImages = [];
             const now = Date.now();
             
             for (const imageId of allImageIds) {
+                // Sprawdź czy obraz nie jest używany
                 if (!usedImageIds.has(imageId)) {
                     const lastUsed = this.imageLastUsed.get(imageId) || 0;
                     const age = now - lastUsed;
+                    
+                    // Usuń tylko stare obrazy (grace period)
                     if (age > this.maxAge) {
                         unusedImages.push(imageId);
                     } else {
@@ -168,10 +189,15 @@ export class ImageReferenceManager {
         
         for (const imageId of unusedImages) {
             try {
+                // Usuń z bazy danych
                 await removeImage(imageId);
+                
+                // Usuń z cache
                 if (this.canvas.imageCache && this.canvas.imageCache.has(imageId)) {
                     this.canvas.imageCache.delete(imageId);
                 }
+                
+                // Usuń z tracking
                 this.imageReferences.delete(imageId);
                 this.imageLastUsed.delete(imageId);
                 
@@ -200,9 +226,16 @@ export class ImageReferenceManager {
         log.info("Starting garbage collection...");
         
         try {
+            // 1. Aktualizuj referencje
             this.updateReferences();
+            
+            // 2. Zbierz wszystkie używane imageId
             const usedImageIds = this.collectAllUsedImageIds();
+            
+            // 3. Znajdź nieużywane obrazy
             const unusedImages = await this.findUnusedImages(usedImageIds);
+            
+            // 4. Wyczyść nieużywane obrazy
             await this.cleanupUnusedImages(unusedImages);
             
         } catch (error) {
@@ -221,7 +254,8 @@ export class ImageReferenceManager {
         
         if (this.operationCount >= this.operationThreshold) {
             log.info(`Operation threshold reached (${this.operationThreshold}), triggering garbage collection`);
-            this.operationCount = 0;
+            this.operationCount = 0; // Reset counter
+            // Uruchom GC asynchronicznie, żeby nie blokować operacji
             setTimeout(() => {
                 this.performGarbageCollection();
             }, 100);

js/MaskTool.js

@@ -1,5 +1,4 @@
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-
 const log = createModuleLogger('Mask_tool');
 
 export class MaskTool {
@@ -8,6 +7,8 @@ export class MaskTool {
         this.mainCanvas = canvasInstance.canvas;
         this.maskCanvas = document.createElement('canvas');
         this.maskCtx = this.maskCanvas.getContext('2d');
+
+        // Add position coordinates for the mask
         this.x = 0;
         this.y = 0;
 
@@ -26,9 +27,13 @@ export class MaskTool {
     }
 
     initMaskCanvas() {
-        const extraSpace = 2000;
+        // Create a larger mask canvas that can extend beyond the output area
+        const extraSpace = 2000; // Allow for a generous drawing area outside the output area
         this.maskCanvas.width = this.canvasInstance.width + extraSpace;
         this.maskCanvas.height = this.canvasInstance.height + extraSpace;
+        
+        // Position the mask's origin point in the center of the expanded canvas
+        // This allows drawing in any direction from the output area
         this.x = -extraSpace / 2;
         this.y = -extraSpace / 2;
         
@@ -91,10 +96,16 @@ export class MaskTool {
         if (!this.lastPosition) {
             this.lastPosition = worldCoords;
         }
+
+        // Convert world coordinates to mask canvas coordinates
+        // Account for the mask's position in world space
         const canvasLastX = this.lastPosition.x - this.x;
         const canvasLastY = this.lastPosition.y - this.y;
         const canvasX = worldCoords.x - this.x;
         const canvasY = worldCoords.y - this.y;
+
+        // Check if drawing is within the expanded canvas bounds
+        // Since our canvas is much larger now, this should rarely be an issue
         const canvasWidth = this.maskCanvas.width;
         const canvasHeight = this.maskCanvas.height;
         
@@ -169,10 +180,19 @@ export class MaskTool {
         const oldY = this.y;
         const oldWidth = oldMask.width;
         const oldHeight = oldMask.height;
+        
+        // Determine if we're increasing or decreasing the canvas size
         const isIncreasingWidth = width > (this.canvasInstance.width);
         const isIncreasingHeight = height > (this.canvasInstance.height);
+        
+        // Create a new mask canvas
         this.maskCanvas = document.createElement('canvas');
+        
+        // Calculate the new size based on whether we're increasing or decreasing
         const extraSpace = 2000;
+        
+        // If we're increasing the size, expand the mask canvas
+        // If we're decreasing, keep the current mask canvas size to preserve content
         const newWidth = isIncreasingWidth ? width + extraSpace : Math.max(oldWidth, width + extraSpace);
         const newHeight = isIncreasingHeight ? height + extraSpace : Math.max(oldHeight, height + extraSpace);
         
@@ -181,8 +201,11 @@ export class MaskTool {
         this.maskCtx = this.maskCanvas.getContext('2d');
         
         if (oldMask.width > 0 && oldMask.height > 0) {
+            // Calculate offset to maintain the same world position of the mask content
             const offsetX = this.x - oldX;
             const offsetY = this.y - oldY;
+            
+            // Draw the old mask at the correct position to maintain world alignment
             this.maskCtx.drawImage(oldMask, offsetX, offsetY);
             
             log.debug(`Preserved mask content with offset (${offsetX}, ${offsetY})`);
@@ -192,6 +215,7 @@ export class MaskTool {
         log.info(`Canvas size change: width ${isIncreasingWidth ? 'increased' : 'decreased'}, height ${isIncreasingHeight ? 'increased' : 'decreased'}`);
     }
     
+    // Add method to update mask position
     updatePosition(dx, dy) {
         this.x += dx;
         this.y += dy;

js/db.js

@@ -1,5 +1,4 @@
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-
 const log = createModuleLogger('db');
 
 const DB_NAME = 'CanvasNodeDB';

js/logger.js

@@ -314,7 +314,6 @@ class Logger {
         this.log(module, LogLevel.ERROR, ...args);
     }
 }
-
 export const logger = new Logger();
 export const debug = (module, ...args) => logger.debug(module, ...args);
 export const info = (module, ...args) => logger.info(module, ...args);

js/utils/CommonUtils.js

@@ -128,7 +128,7 @@ export function getStateSignature(layers) {
     return JSON.stringify(layers.map((layer, index) => {
         const sig = {
             index: index,
-            x: Math.round(layer.x * 100) / 100,
+            x: Math.round(layer.x * 100) / 100, // Round to avoid floating point precision issues
             y: Math.round(layer.y * 100) / 100,
             width: Math.round(layer.width * 100) / 100,
             height: Math.round(layer.height * 100) / 100,
@@ -137,11 +137,15 @@ export function getStateSignature(layers) {
             blendMode: layer.blendMode || 'normal',
             opacity: layer.opacity !== undefined ? Math.round(layer.opacity * 100) / 100 : 1
         };
+        
+        // Include imageId if available
         if (layer.imageId) {
             sig.imageId = layer.imageId;
         }
+        
+        // Include image src as fallback identifier
         if (layer.image && layer.image.src) {
-            sig.imageSrc = layer.image.src.substring(0, 100);
+            sig.imageSrc = layer.image.src.substring(0, 100); // First 100 chars to avoid huge signatures
         }
         
         return sig;

js/utils/WebSocketManager.js

@@ -10,8 +10,8 @@ class WebSocketManager {
         this.isConnecting = false;
         this.reconnectAttempts = 0;
         this.maxReconnectAttempts = 10;
-        this.reconnectInterval = 5000;
+        this.reconnectInterval = 5000; // 5 seconds
-        this.ackCallbacks = new Map();
+        this.ackCallbacks = new Map(); // Store callbacks for messages awaiting ACK
         this.messageIdCounter = 0;
 
         this.connect();
@@ -54,6 +54,7 @@ class WebSocketManager {
                             this.ackCallbacks.delete(data.nodeId);
                         }
                     }
+                    // Handle other incoming messages if needed
                 } catch (error) {
                     log.error("Error parsing incoming WebSocket message:", error);
                 }
@@ -72,6 +73,7 @@ class WebSocketManager {
             this.socket.onerror = (error) => {
                 this.isConnecting = false;
                 log.error("WebSocket error:", error);
+                // The onclose event will be fired next, which will handle reconnection.
             };
         } catch (error) {
             this.isConnecting = false;
@@ -104,11 +106,12 @@ class WebSocketManager {
                 log.debug("Sent message:", data);
                 if (requiresAck) {
                     log.debug(`Message for nodeId ${nodeId} requires ACK. Setting up callback.`);
+                    // Set a timeout for the ACK
                     const timeout = setTimeout(() => {
                         this.ackCallbacks.delete(nodeId);
                         reject(new Error(`ACK timeout for nodeId ${nodeId}`));
                         log.warn(`ACK timeout for nodeId ${nodeId}.`);
-                    }, 10000);
+                    }, 10000); // 10-second timeout
 
                     this.ackCallbacks.set(nodeId, {
                         resolve: (responseData) => {
@@ -121,14 +124,18 @@ class WebSocketManager {
                         }
                     });
                 } else {
-                    resolve();
+                    resolve(); // Resolve immediately if no ACK is needed
                 }
             } else {
                 log.warn("WebSocket not open. Queuing message.");
+                // Note: The current queueing doesn't support ACK promises well.
+                // For simplicity, we'll focus on the connected case.
+                // A more robust implementation would wrap the queued message in a function.
                 this.messageQueue.push(message);
                 if (!this.isConnecting) {
                     this.connect();
                 }
+                // For now, we reject if not connected and ACK is required.
                 if (requiresAck) {
                     reject(new Error("Cannot send message with ACK required while disconnected."));
                 }
@@ -138,11 +145,16 @@ class WebSocketManager {
 
     flushMessageQueue() {
         log.debug(`Flushing ${this.messageQueue.length} queued messages.`);
+        // Note: This simple flush doesn't handle ACKs for queued messages.
+        // This should be acceptable as data is sent right before queueing a prompt,
+        // at which point the socket should ideally be connected.
         while (this.messageQueue.length > 0) {
             const message = this.messageQueue.shift();
             this.socket.send(message);
         }
     }
 }
-const wsUrl = `ws:
+
+// Create a singleton instance of the WebSocketManager
+const wsUrl = `ws://${window.location.host}/layerforge/canvas_ws`;
 export const webSocketManager = new WebSocketManager(wsUrl);