Skip to content

chore(s3-store): replace @shopify/semaphore with async-mutex #829

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.

Sign up for GitHub

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

Open
Emperiusm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(s3-store): replace @shopify/semaphore with async-mutex #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/s3-store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.758.0",
"@shopify/semaphore": "^3.1.0",
"@tus/utils": "^0.7.0",
"async-mutex": "^0.5.0",
"debug": "^4.3.4",
"multistream": "^4.1.0"
},
Expand Down
17 changes: 7 additions & 10 deletions packages/s3-store/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
MemoryKvStore,
} from '@tus/utils'

import {Semaphore, type Permit} from '@shopify/semaphore'
import {Semaphore} from 'async-mutex'
import MultiStream from 'multistream'
import crypto from 'node:crypto'
import path from 'node:path'
Expand Down Expand Up @@ -369,22 +369,23 @@ export class S3Store extends DataStore {
const promises: Promise<void>[] = []
let pendingChunkFilepath: string | null = null
let bytesUploaded = 0
let permit: Permit | undefined
let releasePermit: (() => void) | undefined

const splitterStream = new StreamSplitter({
chunkSize: this.calcOptimalPartSize(size),
directory: os.tmpdir(),
})
.on('beforeChunkStarted', async () => {
permit = await this.partUploadSemaphore.acquire()
const [, release] = await this.partUploadSemaphore.acquire()
releasePermit = release
})
.on('chunkStarted', (filepath) => {
pendingChunkFilepath = filepath
})
.on('chunkFinished', ({path, size: partSize}) => {
pendingChunkFilepath = null

const acquiredPermit = permit
const acquiredRelease = releasePermit
const partNumber = currentPartNumber++

offset += partSize
Expand Down Expand Up @@ -415,9 +416,7 @@ export class S3Store extends DataStore {
fsProm.rm(path).catch(() => {
/* ignore */
})
acquiredPermit?.release().catch(() => {
/* ignore */
})
acquiredRelease?.()
}
})

Expand All @@ -430,9 +429,7 @@ export class S3Store extends DataStore {
promises.push(deferred)
})
.on('chunkError', () => {
permit?.release().catch(() => {
/* ignore */
})
releasePermit?.()
})

try {
Expand Down