@5minds/node-red-contrib-processcube 1.5.10-develop-c37022-m4mt2dwt → 1.5.10-develop-8d0d8e-m4r2qa4i

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.10-develop-c37022-m4mt2dwt",
+    "version": "1.5.10-develop-8d0d8e-m4r2qa4i",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processinstance-delete.html

@@ -6,8 +6,9 @@
             name: { value: '' },
             engine: { value: '', type: 'processcube-engine-config' },
             modelid: { value: '' },
-            time: { value: '', type: 'number' },
-            time_type: { value: 'hours' },
+            duration: { value: '', type: 'number' },
+            time_unit: { value: 'hours' },
+            batch_size: { value: '100', type: 'number' },
         },
         inputs: 1,
         outputs: 1,
@@ -32,16 +33,20 @@
         <input type="text" id="node-input-modelid" />
     </div>
     <div class="form-row">
-        <label for="node-input-time"><i class="fa fa-tag"></i> Duration</label>
-        <input type="text" id="node-input-time" />
+        <label for="node-input-duration"><i class="fa fa-tag"></i> Duration</label>
+        <input type="text" id="node-input-duration" />
     </div>
     <div class="form-row">
-        <label for="node-input-time_type"><i class="fa fa-sliders"></i> Time Unit</label>
-        <select id="node-input-time_type" style="width: 70%;">
+        <label for="node-input-time_unit"><i class="fa fa-sliders"></i> Time Unit</label>
+        <select id="node-input-time_unit" style="width: 70%;">
             <option value="hours">Hours</option>
             <option value="days">Days</option>
         </select>
     </div>
+    <div class="form-row">
+        <label for="node-input-batch-size"><i class="fa fa-tag"></i> Batch Size</label>
+        <input type="text" id="node-input-batch_size" />
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="processinstance-delete">
@@ -49,12 +54,54 @@ Delete old instances of a process model in the ProcessCube.
 
 ## Inputs
 
-: payload.time (number): The number of given time periods.
-: payload.time_type ('hours' | 'days'): The type of time period to use.
+: payload.duration (number): The number of given time periods.
+: payload.time_unit ('hours' | 'days'): The type of time period to use.
+: payload.batch_size (number): The number of instances to be deleted simultaneously. (default 100)
 
 ## Outputs
 
-: payload (string[]): The ids of the processinstances that were deleted.
+: Explanation of the payload:
+
+Object
+{
+    successfulDeletions: [Array of strings],
+    failedDeletions: [Array of objects]
+}
+
+- successfulDeletions:
+    - Type: Array<String>
+    - Content: A list of successfully deleted process instance IDs.
+
+    - excample:
+        successfulDeletions: [
+        "instanceId1",
+        "instanceId2",
+        "instanceId3"
+       ]
+
+- failedDeletions:
+    - Type: Array<Object>
+    - Content: A list of objects containing details of the failed deletions.
+    - Each object has the following fields:
+        - id: The ID of the process instance that could not be deleted.
+        - error: The error message or the reason for the error.
+
+- Example of a complete output:
+    {
+        successfulDeletions: [
+            "instanceId1",
+            "instanceId2",
+            "instanceId3"
+        ],
+        failedDeletions: [
+            { id: "instanceId4", error: "Permission denied" },
+            { id: "instanceId5", error: "Instance not found" }
+        ]
+    }
+
+The node processes the IDs in configurable batches (default value: 100) and inserts successfully deleted or failed instances into the arrays accordingly.
+As processing is currently forced to batch, a detailed error output is not possible. 
+If an error occurs during the processing of a batch, all Id's of this batch are marked as faulty.
 
 ### References
 

package/processinstance-delete.js

@@ -11,14 +11,15 @@ module.exports = function (RED) {
                 node.error('No engine configured.');
                 return;
             }
+
             let timeMultiplier;
-            if (msg.payload.time_type) {
-                timeMultiplier = msg.payload.time_type == 'hours' ? 1 : 24;
+            if (msg.payload.time_unit) {
+                timeMultiplier = msg.payload.time_unit == 'hours' ? 1 : 24;
             } else {
-                timeMultiplier = config.time_type == 'hours' ? 1 : 24;
+                timeMultiplier = config.time_unit == 'hours' ? 1 : 24;
             }
 
-            const timeToUse = msg.payload.time ? msg.payload.time : config.time;
+            const timeToUse = msg.payload.duration ? msg.payload.duration : config.duration;
             const modelId = msg.payload.processModelId
                 ? msg.payload.processModelId != ''
                     ? msg.payload.processModelId
@@ -27,12 +28,14 @@ module.exports = function (RED) {
                 ? config.modelid
                 : undefined;
 
+            const batchSize = config.batch_size || 100; // Konfigurierbare Batchgröße, Standardwert 100
+
             try {
                 const result = await client.processInstances.query({
                     processModelId: modelId
                 }, { identity: engine.identity });
 
-                let allInstances = result.processInstances.filter((instance) => instance.state != 'suspended');
+                let allInstances = result.processInstances.filter((instance) => instance.state != 'suspended' && instance.state != 'running');
 
                 const today = new Date();
 
@@ -43,12 +46,28 @@ module.exports = function (RED) {
                 });
 
                 const ids = oldTasks.map((obj) => obj.processInstanceId);
-                msg.payload = ids;
 
-                await client.processInstances.deleteProcessInstances(ids, true, engine.identity);
+                msg.payload = {
+                    successfulDeletions: [],
+                    failedDeletions: []
+                };
+
+                for (let i = 0; i < ids.length; i += batchSize) {
+                    const batch = ids.slice(i, i + batchSize);
+                    try {
+                        await client.processInstances.deleteProcessInstances(batch, true, engine.identity);
+                        msg.payload.successfulDeletions.push(...batch); // Erfolgreiche IDs hinzufügen
+                    } catch (deleteError) {
+                        batch.forEach(id => {
+                            msg.payload.failedDeletions.push({ id, error: deleteError.message }); // Fehler protokollieren
+                        });
+                        node.warn(`Failed to delete process instances in batch: ${batch.join(', ')}. Error: ${deleteError.message}`);
+                    }
+                }
+
                 node.send(msg);
-            } catch (error) {
-                node.error(JSON.stringify(error));
+            } catch (queryError) {
+                node.error(`Failed to query process instances: ${queryError.message}`);
             }
         });
     }