yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate from s3 sdk v2 to v3 (#6731)

Browse Source 
* chore: migrate from s3 sdk v2 to v3

* import signature-v4-crt

* downgrade minor version

* Add s3-presigned-post manually

* Change s3 mock

* Update server/storage/files/S3Storage.ts

* docs

* Upgrade aws-sdk

---------

Co-authored-by: Tom Moor <tom.moor@gmail.com>
This commit is contained in:
Nanguan Lin
2024-05-19 21:01:42 +08:00
committed by GitHub
parent cd4f3f9ff2
commit 3a7dd94e14
9 changed files with 1510 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/storage/files/BaseStorage.ts
View File

@@ -1,6 +1,6 @@
import { Blob } from "buffer";
import { Readable } from "stream";
import { PresignedPost } from "aws-sdk/clients/s3";
import { PresignedPost } from "@aws-sdk/s3-presigned-post";
import { isBase64Url } from "@shared/utils/urls";
import env from "@server/env";
import Logger from "@server/logging/Logger";
@@ -27,11 +27,13 @@ export default abstract class BaseStorage {
): Promise<Partial<PresignedPost>>;
/**
* Returns a stream for reading a file from the storage provider.
* Returns a promise that resolves with a stream for reading a file from the storage provider.
*
* @param key The path to the file
*/
public abstract getFileStream(key: string): NodeJS.ReadableStream | null;
public abstract getFileStream(
key: string
): Promise<NodeJS.ReadableStream | null>;
/**
* Returns the upload URL for the storage provider.
@@ -96,12 +98,13 @@ export default abstract class BaseStorage {
}>;
/**
* Returns a buffer of a file from the storage provider.
* Returns a promise that resolves to a buffer of a file from the storage provider.
*
* @param key The path to the file
* @returns A promise that resolves with the file buffer
*/
public async getFileBuffer(key: string) {
const stream = this.getFileStream(key);
const stream = await this.getFileStream(key);
return new Promise<Buffer>((resolve, reject) => {
const chunks: Buffer[] = [];
if (!stream) {