From d201d4391c5585eee4715e830876b64fdfca849d Mon Sep 17 00:00:00 2001
From: Cristian Balas <cristi8@gmail.com>
Date: Mon, 17 May 2021 15:18:08 +0300
Subject: [PATCH] Fixed json construction when downloading stream of objects
 (#246)

---
 .../server/modules/core/rest/diffDownload.js    | 17 ++++++++---------
 packages/server/modules/core/rest/download.js   | 13 ++++++-------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/server/modules/core/rest/diffDownload.js b/packages/server/modules/core/rest/diffDownload.js
index 821e2b9eb..5bdc9750b 100644
--- a/packages/server/modules/core/rest/diffDownload.js
+++ b/packages/server/modules/core/rest/diffDownload.js
@@ -29,8 +29,7 @@ module.exports = ( app ) => {
     let currentChunkSize = 0
     let maxChunkSize = 50000
     let chunk = simpleText ? '' : [ ]
-    let isFirst = true
-
+    let isFirstBuffer = true
 
     res.writeHead( 200, { 'Content-Encoding': 'gzip', 'Content-Type': simpleText ? 'text/plain' : 'application/json' } )
 
@@ -39,18 +38,18 @@ module.exports = ( app ) => {
     if ( !simpleText ) gzip.write( '[' )
 
     // helper func to flush the gzip buffer
-    const writeBuffer = ( addTrailingComma ) => {
-      // console.log( `writing buff ${currentChunkSize}` )
+    const writeBuffer = () => {
       if ( simpleText ) {
         gzip.write( chunk )
       } else {
-        gzip.write( chunk.join( ',' ) )
-        if ( addTrailingComma ) {
+        if ( !isFirstBuffer ) {
           gzip.write( ',' )
         }
+        gzip.write( chunk.join( ',' ) )
       }
       gzip.flush( )
       chunk = simpleText ? '' : [ ]
+      isFirstBuffer = false
     }
 
     let k = 0
@@ -66,7 +65,7 @@ module.exports = ( app ) => {
         }
         if ( currentChunkSize >= maxChunkSize ) {
           currentChunkSize = 0
-          writeBuffer( true )
+          writeBuffer()
         }
         k++
       } catch ( e ) {
@@ -84,9 +83,9 @@ module.exports = ( app ) => {
 
     dbStream.on( 'end', ( ) => {
       if ( currentChunkSize !== 0 ) {
-        writeBuffer( false )
-        if ( !simpleText ) gzip.write( ']' )
+        writeBuffer()
       }
+      if ( !simpleText ) gzip.write( ']' )
       gzip.end( )
     } )
 
diff --git a/packages/server/modules/core/rest/download.js b/packages/server/modules/core/rest/download.js
index 4bc7737ff..35d93c4df 100644
--- a/packages/server/modules/core/rest/download.js
+++ b/packages/server/modules/core/rest/download.js
@@ -47,15 +47,14 @@ module.exports = ( app ) => {
     if ( !simpleText ) gzip.write( '[' )
 
     // helper func to flush the gzip buffer
-    const writeBuffer = ( addTrailingComma ) => {
-      // console.log( `writing buff ${currentChunkSize}` )
+    const writeBuffer = ( addStartingComma ) => {
       if ( simpleText ) {
         gzip.write( chunk )
       } else {
-        gzip.write( chunk.join( ',' ) )
-        if ( addTrailingComma ) {
+        if ( addStartingComma ) {
           gzip.write( ',' )
         }
+        gzip.write( chunk.join( ',' ) )
       }
       gzip.flush( )
       chunk = simpleText ? '' : [ ]
@@ -67,7 +66,7 @@ module.exports = ( app ) => {
     } else {
       chunk.push( objString )
     }
-    writeBuffer( true )
+    writeBuffer( false )
 
     let k = 0
     let requestDropped = false
@@ -100,9 +99,9 @@ module.exports = ( app ) => {
 
     dbStream.on( 'end', ( ) => {
       if ( currentChunkSize !== 0 ) {
-        writeBuffer( false )
-        if ( !simpleText ) gzip.write( ']' )
+        writeBuffer( true )
       }
+      if ( !simpleText ) gzip.write( ']' )
       gzip.end( )
     } )