Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/silver-students-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tus/server": patch
---

Don't use AbortSignal.any to fix memory leak in older Node.js versions and to not break version support.
25 changes: 15 additions & 10 deletions packages/server/src/lockers/MemoryLocker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,23 @@ class MemoryLock implements Lock {

async lock(stopSignal: AbortSignal, requestRelease: RequestRelease): Promise<void> {
const abortController = new AbortController()
const onAbort = () => {
abortController.abort()
}
stopSignal.addEventListener('abort', onAbort)

const abortSignal = AbortSignal.any([stopSignal, abortController.signal])

const lock = await Promise.race([
this.waitTimeout(abortSignal),
this.acquireLock(this.id, requestRelease, abortSignal),
])

abortController.abort()
try {
const lock = await Promise.race([
this.waitTimeout(abortController.signal),
this.acquireLock(this.id, requestRelease, abortController.signal),
])

if (!lock) {
throw ERRORS.ERR_LOCK_TIMEOUT
if (!lock) {
throw ERRORS.ERR_LOCK_TIMEOUT
}
} finally {
stopSignal.removeEventListener('abort', onAbort)
abortController.abort()
}
}

Expand Down