Iain Sproat
96bed71022
* Improves error logging
- use pino error logger correctly by passing in error as first argument
* monitor deployment: Filter logging at INFO level and above
* Use structured logging to create parameters for monitoring results
* Add structured logging to obj fileimport service
* Fileimport service, fix and improve logging
- use child logger with additional context where possible
- select appropriate logging level
- fix duplicated context in log statement
* REST endpoints, add context to structured logging and remove same context from message
* Webhook service provides context to bound logger to properly use structured logging
- Pass bound logger containing context to `makeNetworkRequest`
- do not log url, as it may contain a secret (like Discord's webhook urls), instead log the webhook Id
- log error message when network call fails
* upload: make better use of structured logging when recording data
* pino-pretty when in dev or test mode
- pino-pretty configured to send to stderr
* LOG_PRETTY env var
* Silence structured logging during testing
- can not rely on determining the port number by reading from stdout/stderr
- instead we determine which port is free, then create our server on that port
- we then poll that port until the server is ready before commencing tests
* Allow puppeteer to install chromium
* Do not need to install chromium separately
80 lines
2.4 KiB
JavaScript
80 lines
2.4 KiB
JavaScript
'use strict'
|
|
const zlib = require('zlib')
|
|
const cors = require('cors')
|
|
|
|
const { validatePermissionsReadStream } = require('./authUtils')
|
|
const { SpeckleObjectsStream } = require('./speckleObjectsStream')
|
|
const { getObjectsStream } = require('../services/objects')
|
|
|
|
const { pipeline, PassThrough } = require('stream')
|
|
const { logger } = require('@/logging/logging')
|
|
|
|
module.exports = (app) => {
|
|
app.options('/api/getobjects/:streamId', cors())
|
|
|
|
app.post('/api/getobjects/:streamId', cors(), async (req, res) => {
|
|
const boundLogger = logger.child({
|
|
userId: req.context.userId || '-',
|
|
streamId: req.params.streamId
|
|
})
|
|
const hasStreamAccess = await validatePermissionsReadStream(
|
|
req.params.streamId,
|
|
req
|
|
)
|
|
if (!hasStreamAccess.result) {
|
|
return res.status(hasStreamAccess.status).end()
|
|
}
|
|
|
|
const childrenList = JSON.parse(req.body.objects)
|
|
const simpleText = req.headers.accept === 'text/plain'
|
|
|
|
res.writeHead(200, {
|
|
'Content-Encoding': 'gzip',
|
|
'Content-Type': simpleText ? 'text/plain; charset=UTF-8' : 'application/json'
|
|
})
|
|
|
|
// "output" stream, connected to res with `pipeline` (auto-closing res)
|
|
const speckleObjStream = new SpeckleObjectsStream(simpleText)
|
|
const gzipStream = zlib.createGzip()
|
|
|
|
pipeline(
|
|
speckleObjStream,
|
|
gzipStream,
|
|
new PassThrough({ highWaterMark: 16384 * 31 }),
|
|
res,
|
|
(err) => {
|
|
if (err) {
|
|
boundLogger.error(err, `App error streaming objects`)
|
|
} else {
|
|
boundLogger.info(
|
|
`Streamed ${childrenList.length} objects (size: ${
|
|
gzipStream.bytesWritten / 1000000
|
|
} MB)`
|
|
)
|
|
}
|
|
}
|
|
)
|
|
|
|
const cSize = 1000
|
|
try {
|
|
for (let cStart = 0; cStart < childrenList.length; cStart += cSize) {
|
|
const childrenChunk = childrenList.slice(cStart, cStart + cSize)
|
|
|
|
const dbStream = await getObjectsStream({
|
|
streamId: req.params.streamId,
|
|
objectIds: childrenChunk
|
|
})
|
|
await new Promise((resolve, reject) => {
|
|
dbStream.pipe(speckleObjStream, { end: false })
|
|
dbStream.once('end', resolve)
|
|
dbStream.once('error', reject)
|
|
})
|
|
}
|
|
} catch (ex) {
|
|
boundLogger.error(ex, `DB Error streaming objects`)
|
|
speckleObjStream.emit('error', new Error('Database streaming error'))
|
|
}
|
|
speckleObjStream.end()
|
|
})
|
|
}
|