Merge branch 'main' into am/deploy

Author: jnsdls

.changeset/slimy-camels-thank.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/storage": patch
+---
+
+url encode filenames

packages/sdk/test/mock/MockStorage.ts

@@ -10,5 +10,5 @@ export function MockStorage(): ThirdwebStorage {
 
   const uploader = new MockUploader(storage);
   const downloader = new MockDownloader(storage);
-  return new ThirdwebStorage(uploader, downloader);
+  return new ThirdwebStorage({ uploader, downloader });
 }

packages/solana/test/mock/MockStorage.ts

@@ -10,5 +10,5 @@ export function MockStorage(): ThirdwebStorage {
 
   const uploader = new MockUploader(storage);
   const downloader = new MockDownloader(storage);
-  return new ThirdwebStorage(uploader, downloader);
+  return new ThirdwebStorage({ uploader, downloader });
 }

packages/storage/src/core/uploaders/ipfs-uploader.ts

@@ -169,7 +169,8 @@ export class IpfsUploader implements IStorageUploader<IpfsUploadBatchOptions> {
 
     return {
       form,
-      fileNames,
+      // encode the file names on the way out (which is what the upload backend expects)
+      fileNames: fileNames.map((fName) => encodeURIComponent(fName)),
     };
   }
 

packages/storage/test/ipfs.test.ts

@@ -403,4 +403,22 @@ describe("IPFS", async () => {
     const uri = await storage.upload(undefined);
     expect(uri).to.equal(undefined);
   });
+
+  it("should successfully upload files with special characters in their file names", async () => {
+    const bufferWithSpecialCharFileName = {
+      name: "#specialChar^file$Name.jpg",
+      data: readFileSync("test/files/0.jpg"),
+    };
+    const uri = await storage.upload(bufferWithSpecialCharFileName);
+
+    const fileNameEncoded = uri.split("/").at(-1);
+
+    expect(fileNameEncoded).to.equal(
+      encodeURIComponent(bufferWithSpecialCharFileName.name),
+    );
+
+    const res = await storage.download(uri);
+
+    expect(res.status).to.equal(200);
+  });
 });