fix: csv.addRow

src/appmixer/utils/csv/AddRow/AddRow.js

@@ -23,34 +23,44 @@ module.exports = {
             parseNumbers,
             parseBooleans
         });
+        let lock;
+        let lockExtendInterval;
+        try {
+            lock = await context.lock(fileId, { ttl: 1000 * 60 * 1, maxRetryCount: 0 });
+            await processor.loadHeaders();
 
-        await processor.loadHeaders();
+            let rowAsArray;
 
-        let rowAsArray;
-
-        if (withHeaders) {
-            const headers = processor.getHeaders();
-            const parsed = expressionTransformer(rowWithColumns);
-            rowAsArray = headers.map(item => '');
-            parsed.forEach(item => {
-                const idx = processor.getHeaderIndex(item.column);
-                rowAsArray[idx] = item.value;
-            });
-        } else {
-            rowAsArray = row.split(delimiter);
-        }
+            if (withHeaders) {
+                const headers = processor.getHeaders();
+                const parsed = expressionTransformer(rowWithColumns);
+                rowAsArray = headers.map(item => '');
+                parsed.forEach(item => {
+                    const idx = processor.getHeaderIndex(item.column);
+                    rowAsArray[idx] = item.value;
+                });
+            } else {
+                rowAsArray = row.split(delimiter);
+            }
 
-        for (let i = 0; i < rowAsArray.length; i++) {
-            const item = rowAsArray[i];
-            if (item === undefined || item === null) {
-                rowAsArray[i] = '';
+            for (let i = 0; i < rowAsArray.length; i++) {
+                const item = rowAsArray[i];
+                if (item === undefined || item === null) {
+                    rowAsArray[i] = '';
+                }
             }
+            lockExtendInterval = setInterval(async () => {
+                if (lock) {
+                    await lock.extend(parseInt(context.config.lockExtendTime, 10) || 1000 * 60 * 1);
+                }
+            }, 30000);
+            const savedFile = await processor.addRow(rowAsArray, (idx, currentRow, isEndOfFile) => {
+                return isEndOfFile;
+            });
+            return context.sendJson({ fileId: savedFile.fileId }, 'fileId');
+        } finally {
+            lock && await lock.unlock();
+            clearInterval(lockExtendInterval);
         }
-
-        const savedFile = await processor.addRow(rowAsArray, (idx, currentRow, isEndOfFile) => {
-            return isEndOfFile;
-        });
-
-        return context.sendJson({ fileId: savedFile.fileId }, 'fileId');
     }
 };

src/appmixer/utils/csv/CSVProcessor.js

@@ -369,7 +369,6 @@ module.exports = class CSVProcessor {
      */
     async addRow(newRow, closure) {
 
-        const lock = await this.context.lock(this.fileId);
         const stream = await this.loadFile();
 
         let idx = 0;
@@ -385,7 +384,6 @@ module.exports = class CSVProcessor {
                 stream.destroy(err);
             }
         }).on('error', (err) => {
-            lock.unlock();
             stream.destroy(err);
         }).on('end', async () => {
             if (closure(idx, null, true)) {
@@ -394,11 +392,7 @@ module.exports = class CSVProcessor {
             writeStream.end();
         });
 
-        try {
-            return await this.context.replaceFileStream(this.fileId, writeStream);
-        } finally {
-            lock.unlock();
-        }
+        return await this.context.replaceFileStream(this.fileId, writeStream);
     }
 
     /**

src/appmixer/utils/csv/bundle.json

@@ -1,6 +1,6 @@
 {
   "name": "appmixer.utils.csv",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "changelog": {
     "1.0.0": [
       "Initial version"
@@ -22,6 +22,9 @@
     ],
     "1.2.4": [
       "Fix issue with CSV module on Appmixer 5.0.0 and higher."
+    ],
+    "1.2.5": [
+      "Added lock mechanism to avoid race condition in 'AddRow' component."
     ]
   }
 }