Merge pull request #302 from specklesystems/dim/stream-tutorial-cristi

feat(server): increasing highwatermark in db stream

packages/preview-service/routes/objects.js

@@ -4,7 +4,7 @@ const zlib = require( 'zlib' )
 var express = require( 'express' )
 var { getObject, getObjectChildrenStream } = require( './services/objects_utils' )
 const { SpeckleObjectsStream } = require( './speckleObjectsStream' )
-const { pipeline } = require( 'stream' )
+const { pipeline, PassThrough } = require( 'stream' )
 
 var router = express.Router()
 
@@ -32,6 +32,7 @@ router.get( '/:streamId/:objectId', async function( req, res, next ) {
     dbStream,
     speckleObjStream,
     gzipStream,
+    new PassThrough( { highWaterMark: 16384 * 31 } ),
     res,
     ( err ) => {
       if ( err ) {

packages/preview-service/routes/preview.js

@@ -19,7 +19,7 @@ async function getScreenshot( objectUrl ) {
   const page = await browser.newPage()
   await page.goto( 'http://127.0.0.1:3001/render/' )
 
-  console.log("Page loaded")
+  console.log( 'Page loaded' )
 
   //console.time( 'lo' )
   const ret = await page.evaluate( async ( objectUrl ) => {

packages/server/modules/core/rest/diffDownload.js

@@ -11,7 +11,7 @@ const { validatePermissionsReadStream } = require( './authUtils' )
 const { SpeckleObjectsStream } = require( './speckleObjectsStream' )
 const { getObjectsStream } = require( '../services/objects' )
 
-const { pipeline } = require( 'stream' )
+const { pipeline, PassThrough } = require( 'stream' )
 
 module.exports = ( app ) => {
 
@@ -36,6 +36,7 @@ module.exports = ( app ) => {
       dbStream,
       speckleObjStream,
       gzipStream,
+      new PassThrough( { highWaterMark: 16384 * 31 } ),
       res,
       ( err ) => {
         if ( err ) {

packages/server/modules/core/rest/download.js

@@ -11,7 +11,7 @@ const { validatePermissionsReadStream } = require( './authUtils' )
 
 const { getObject, getObjectChildrenStream } = require( '../services/objects' )
 const { SpeckleObjectsStream } = require( './speckleObjectsStream' )
-const { pipeline } = require( 'stream' )
+const { pipeline, PassThrough } = require( 'stream' )
 
 module.exports = ( app ) => {
 
@@ -44,6 +44,7 @@ module.exports = ( app ) => {
       dbStream,
       speckleObjStream,
       gzipStream,
+      new PassThrough( { highWaterMark: 16384 * 31 } ),
       res,
       ( err ) => {
         if ( err ) {

packages/server/modules/core/services/objects.js

@@ -203,7 +203,7 @@ module.exports = {
     } )
       .where( knex.raw( 'object_children_closure."streamId" = ? AND parent = ?', [ streamId, objectId ] ) )
       .orderBy( 'objects.id' )
-    return q.stream( { highWaterMark: 2 } )
+    return q.stream( { highWaterMark: 10 } )
   },
 
   async getObjectChildren( { streamId, objectId, limit, depth, select, cursor } ) {
@@ -442,7 +442,7 @@ module.exports = {
       .andWhere( 'streamId', streamId )
       .orderBy( 'id' )
       .select( 'id', 'speckleType', 'totalChildrenCount', 'totalChildrenCountByDepth', 'createdAt', 'data' )
-    return res.stream( { highWaterMark: 2 } )
+    return res.stream( { highWaterMark: 10 } )
   },
 
   async hasObjects( { streamId, objectIds } ) {