Merge branch 'main' into node-version

Murderlon · Murderlon · commit 9e714512c87f · 2025-03-13T16:31:15.000+01:00
* main: [ci] release (#721) @tus/s3-store: fix unhandled promise rejection (#728) Bump @aws-sdk/client-s3 from 3.717.0 to 3.758.0 (#733) Bump @types/node from 22.10.1 to 22.13.7 (#734) Bump typescript from 5.6.2 to 5.8.2 (#731) @tus/azure-store: fix non-ASCII characters error on metadata (#725) Fix package-lock.json
diff --git a/.changeset/thin-keys-whisper.md b/.changeset/thin-keys-whisper.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,6 +17,6 @@
     "@biomejs/biome": "1.9.4",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.10",
-    "typescript": "^5.6.2"
+    "typescript": "^5.8.2"
   }
 }
diff --git a/packages/azure-store/CHANGELOG.md b/packages/azure-store/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tus/azure-store
 
+## 0.1.3
+
+### Patch Changes
+
+- f47f371: Fix error on saving metadata when it contains non-ASCII characters
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/azure-store/package.json b/packages/azure-store/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "mocha": "^11.0.1",
     "should": "^13.2.3"
   },
diff --git a/packages/azure-store/src/index.ts b/packages/azure-store/src/index.ts
@@ -7,6 +7,7 @@ import {
   type KvStore,
   MemoryKvStore,
   TUS_RESUMABLE,
+  Metadata,
 } from '@tus/utils'
 import {
   type AppendBlobClient,
@@ -78,7 +79,11 @@ export class AzureStore extends DataStore {
     await appendBlobClient.setMetadata(
       {
         tus_version: TUS_RESUMABLE,
-        upload: JSON.stringify(upload),
+        upload: JSON.stringify({
+          ...upload,
+          // Base64 encode the metadata to avoid errors for non-ASCII characters
+          metadata: Metadata.stringify(upload.metadata ?? {}),
+        }),
       },
       {}
     )
@@ -110,6 +115,9 @@ export class AzureStore extends DataStore {
       throw ERRORS.FILE_NOT_FOUND
     }
     const upload = JSON.parse(propertyData.metadata.upload) as Upload
+    // Metadata is base64 encoded to avoid errors for non-ASCII characters
+    // so we need to decode it separately
+    upload.metadata = Metadata.parse(JSON.stringify(upload.metadata ?? {}))
 
     await this.cache.set(appendBlobClient.url, upload)
 
diff --git a/packages/file-store/package.json b/packages/file-store/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "mocha": "^11.0.1",
     "should": "^13.2.3"
   },
diff --git a/packages/gcs-store/package.json b/packages/gcs-store/package.json
@@ -27,7 +27,7 @@
     "@tus/server": "^1.10.0",
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "mocha": "^11.0.1",
     "should": "^13.2.3"
   },
diff --git a/packages/s3-store/CHANGELOG.md b/packages/s3-store/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @tus/s3-store
 
+## 1.9.1
+
+### Patch Changes
+
+- 274a0d1: Bump @aws-sdk/client-s3 from 3.717.0 to 3.758.0
+- 81eb03a: Add missing documentation for `maxMultipartParts` option added in #712
+- c8e78bd: Fix unhandled promise rejection when uploading a part fails, in which case we returned too early, leaving other parts running in the background.
+
 ## 1.9.0
 
 ### Minor Changes
diff --git a/packages/s3-store/package.json b/packages/s3-store/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@tus/s3-store",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "AWS S3 store for @tus/server",
   "main": "dist/index.js",
   "homepage": "https://github.com/tus/tus-node-server#readme",
@@ -16,10 +16,11 @@
   ],
   "scripts": {
     "build": "tsc --build",
+    "pretest": "tsc --build",
     "test": "mocha --timeout 40000 --exit --extension ts --require ts-node/register"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.717.0",
+    "@aws-sdk/client-s3": "^3.758.0",
     "@shopify/semaphore": "^3.1.0",
     "@tus/utils": "^0.5.1",
     "debug": "^4.3.4",
@@ -29,7 +30,7 @@
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
     "@types/multistream": "^4.1.3",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "mocha": "^11.0.1",
     "should": "^13.2.3"
   },
diff --git a/packages/s3-store/src/index.ts b/packages/s3-store/src/index.ts
@@ -409,19 +409,25 @@ export class S3Store extends DataStore {
             bytesUploaded += partSize
             resolve()
           } catch (error) {
+            // If there's an error, destroy the splitter to stop processing more chunks
+            splitterStream.destroy(error)
             reject(error)
           } finally {
             fsProm.rm(path).catch(() => {
               /* ignore */
             })
-            acquiredPermit?.release()
+            acquiredPermit?.release().catch(() => {
+              /* ignore */
+            })
           }
         })
 
         promises.push(deferred)
       })
       .on('chunkError', () => {
-        permit?.release()
+        permit?.release().catch(() => {
+          /* ignore */
+        })
       })
 
     try {
@@ -437,6 +443,10 @@ export class S3Store extends DataStore {
 
       promises.push(Promise.reject(error))
     } finally {
+      // Wait for all promises. We don't want to return
+      // early have have promises running in the background.
+      await Promise.allSettled(promises)
+      // But we do want to reject the promise if any of the promises reject.
       await Promise.all(promises)
     }
 
diff --git a/packages/s3-store/test/index.ts b/packages/s3-store/test/index.ts
@@ -278,14 +278,14 @@ describe('S3DataStore', () => {
     }
   })
 
-  it('should use default maxMultipartParts when not specified', function () {
+  it('should use default maxMultipartParts when not specified', () => {
     const store = new S3Store({
       s3ClientConfig,
     })
     assert.equal(store.maxMultipartParts, 10000)
   })
 
-  it('should use custom maxMultipartParts when specified', function () {
+  it('should use custom maxMultipartParts when specified', () => {
     const customMaxParts = 5000
     const store = new S3Store({
       s3ClientConfig,
@@ -294,6 +294,38 @@ describe('S3DataStore', () => {
     assert.equal(store.maxMultipartParts, customMaxParts)
   })
 
+  it('should handle multiple concurrent part uploads with some failures', async () => {
+    const store = new S3Store({
+      partSize: 5 * 1024 * 1024,
+      maxConcurrentPartUploads: 3, // Allow 3 concurrent uploads
+      s3ClientConfig,
+    })
+
+    const size = 15 * 1024 * 1024 // 15MB will be split into 3 parts
+    const upload = new Upload({
+      id: shared.testId('concurrent-failures'),
+      size,
+      offset: 0,
+    })
+
+    // @ts-expect-error private method
+    const uploadPartStub = sinon.stub(store, 'uploadPart')
+
+    // Make the second part upload fail
+    uploadPartStub.onCall(0).resolves('etag1')
+    uploadPartStub.onCall(1).rejects(new Error('Part 2 upload failed'))
+    uploadPartStub.onCall(2).resolves('etag3')
+
+    await store.create(upload)
+
+    try {
+      await store.write(Readable.from(Buffer.alloc(size)), upload.id, upload.offset)
+      assert.fail('Expected write to fail but it succeeded')
+    } catch (error) {
+      assert.equal(uploadPartStub.callCount, 2, '2 parts should have been attempted')
+    }
+  })
+
   shared.shouldHaveStoreMethods()
   shared.shouldCreateUploads()
   shared.shouldRemoveUploads() // Termination extension
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -27,7 +27,7 @@
     "@types/debug": "^4.1.12",
     "@types/lodash.throttle": "^4.1.9",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "@types/sinon": "^17.0.3",
     "@types/supertest": "^2.0.16",
     "mocha": "^11.0.1",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "ioredis": "^5.4.1",
     "mocha": "^11.0.1",
     "should": "^13.2.3",
diff --git a/test/package.json b/test/package.json
@@ -12,12 +12,12 @@
   "dependencies": {
     "@tus/file-store": "^1.5.1",
     "@tus/gcs-store": "^1.4.2",
-    "@tus/s3-store": "^1.9.0",
+    "@tus/s3-store": "^1.9.1",
     "@tus/server": "^1.10.2"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.13.7",
     "@types/rimraf": "^3.0.2",
     "@types/sinon": "^17.0.3",
     "@types/supertest": "^2.0.16",
diff --git a/test/src/stores.test.ts b/test/src/stores.test.ts
@@ -71,6 +71,18 @@ export const shouldCreateUploads = () => {
       const upload = await this.datastore.getUpload(file.id)
       assert.deepStrictEqual(upload.metadata, file.metadata)
     })
+
+    it('should store `upload_metadata` with non-ASCII characters', async function () {
+      const file = new Upload({
+        id: testId('create-test-non-ascii'),
+        size: 1000,
+        offset: 0,
+        metadata: {filename: '世界_domination_plan.pdf', is_confidential: null},
+      })
+      await this.datastore.create(file)
+      const upload = await this.datastore.getUpload(file.id)
+      assert.deepStrictEqual(upload.metadata, file.metadata)
+    })
   })
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`"@biomejs/biome": "1.9.4",`
`18`	`18`	`"@changesets/changelog-github": "^0.5.0",`
`19`	`19`	`"@changesets/cli": "^2.27.10",`
`20`		`- "typescript": "^5.6.2"`
	`20`	`+ "typescript": "^5.8.2"`
`21`	`21`	`}`
`22`	`22`	`}`