Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(server/database streams): remove event listener on batch completion #3938

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/preview-service/src/server/routes/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,18 @@ const apiRouterFactory = () => {
streamId: req.params.streamId,
objectIds: getObjectsRequestBody.objects
})

// https://knexjs.org/faq/recipes.html#manually-closing-streams
// https://github.com/knex/knex/issues/2324
res.on('close', () => {
const responseCloseHandler = () => {
dbStream.end()
dbStream.destroy()
}

dbStream.on('close', () => {
res.removeListener('close', responseCloseHandler)
})
res.on('close', responseCloseHandler)

const speckleObjStream = new SpeckleObjectsStream(isSimpleTextRequested(req))

Expand Down
8 changes: 7 additions & 1 deletion packages/preview-service/src/server/routes/objects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,18 @@ const objectsRouterFactory = () => {
streamId: req.params.streamId,
objectId: req.params.objectId
})

// https://knexjs.org/faq/recipes.html#manually-closing-streams
// https://github.com/knex/knex/issues/2324
res.on('close', () => {
const responseCloseHandler = () => {
dbStream.end()
dbStream.destroy()
}

dbStream.on('close', () => {
res.removeListener('close', responseCloseHandler)
})
res.on('close', responseCloseHandler)

const speckleObjStream = new SpeckleObjectsStream(isSimpleTextRequested(req))
const gzipStream = zlib.createGzip()
Expand Down
8 changes: 7 additions & 1 deletion packages/server/modules/core/rest/diffDownload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,18 @@ export default (app: Application) => {
streamId: req.params.streamId,
objectIds: childrenChunk
})

// https://knexjs.org/faq/recipes.html#manually-closing-streams
// https://github.com/knex/knex/issues/2324
res.on('close', () => {
const responseCloseHandler = () => {
dbStream.end()
dbStream.destroy()
}

dbStream.on('close', () => {
res.removeListener('close', responseCloseHandler)
})
res.on('close', responseCloseHandler)

await new Promise((resolve, reject) => {
dbStream.once('end', resolve)
Expand Down
9 changes: 8 additions & 1 deletion packages/server/modules/core/rest/download.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,19 @@ export default (app: express.Express) => {
streamId: req.params.streamId,
objectId: req.params.objectId
})

// https://knexjs.org/faq/recipes.html#manually-closing-streams
// https://github.com/knex/knex/issues/2324
res.on('close', () => {
const responseCloseHandler = () => {
dbStream.end()
dbStream.destroy()
}

dbStream.on('close', () => {
res.removeListener('close', responseCloseHandler)
})
res.on('close', responseCloseHandler)

const speckleObjStream = new SpeckleObjectsStream(simpleText)
const gzipStream = zlib.createGzip()

Expand Down
Loading