@super-protocol/sdk-js 2.2.0-beta.56 → 2.2.0-beta.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -9,9 +9,11 @@ export type S3ClientConfig = S3Credentials & {
|
|
|
9
9
|
export declare class S3StorageProvider implements IStorageProvider {
|
|
10
10
|
private readonly s3Client;
|
|
11
11
|
private readonly bucket;
|
|
12
|
+
private readonly prefix;
|
|
12
13
|
private readonly multipartChunkSizeInBytes;
|
|
13
14
|
private readonly defaultRegion;
|
|
14
15
|
constructor(storageAccess: S3ClientConfig);
|
|
16
|
+
private applyPrefix;
|
|
15
17
|
uploadFile(inputStream: Readable, remotePath: string, contentLength: number, progressListener?: ((total: number, current: number) => void) | undefined): Promise<void>;
|
|
16
18
|
private multipartUpload;
|
|
17
19
|
deleteObject(remotePath: string): Promise<void>;
|
|
@@ -7,10 +7,11 @@ const getStreamChunks_js_1 = require("../../utils/helpers/getStreamChunks.js");
|
|
|
7
7
|
class S3StorageProvider {
|
|
8
8
|
s3Client;
|
|
9
9
|
bucket;
|
|
10
|
+
prefix;
|
|
10
11
|
multipartChunkSizeInBytes = 64 * 1024 * 1024; // 64MB
|
|
11
12
|
defaultRegion = 'us-east-1';
|
|
12
13
|
constructor(storageAccess) {
|
|
13
|
-
const { accessKeyId, secretKey, endpoint, bucket, region } = storageAccess;
|
|
14
|
+
const { accessKeyId, secretKey, endpoint, bucket, region, prefix } = storageAccess;
|
|
14
15
|
if (!accessKeyId)
|
|
15
16
|
throw new Error('Access key id is undefined');
|
|
16
17
|
if (!secretKey)
|
|
@@ -19,7 +20,11 @@ class S3StorageProvider {
|
|
|
19
20
|
throw new Error('Endpoint is undefined');
|
|
20
21
|
if (!bucket)
|
|
21
22
|
throw new Error('Bucket is undefined');
|
|
23
|
+
if (prefix.startsWith('/') || !prefix.endsWith('/')) {
|
|
24
|
+
throw new Error(`Prefix is invalid: it must not start with "/" and must end with "/" (prefix=${prefix})`);
|
|
25
|
+
}
|
|
22
26
|
this.bucket = bucket;
|
|
27
|
+
this.prefix = prefix;
|
|
23
28
|
this.s3Client = new client_s3_1.S3Client({
|
|
24
29
|
credentials: {
|
|
25
30
|
accessKeyId,
|
|
@@ -30,16 +35,20 @@ class S3StorageProvider {
|
|
|
30
35
|
forcePathStyle: true,
|
|
31
36
|
});
|
|
32
37
|
}
|
|
38
|
+
applyPrefix(key) {
|
|
39
|
+
return `${this.prefix}${key}`;
|
|
40
|
+
}
|
|
33
41
|
async uploadFile(inputStream, remotePath, contentLength, progressListener) {
|
|
34
42
|
// For performance & cost optimization
|
|
35
43
|
// https://docs.storj.io/dcs/api-reference/s3-compatible-gateway/multipart-upload/multipart-part-size
|
|
44
|
+
const key = this.applyPrefix(remotePath);
|
|
36
45
|
if (contentLength >= this.multipartChunkSizeInBytes) {
|
|
37
|
-
return this.multipartUpload(inputStream,
|
|
46
|
+
return this.multipartUpload(inputStream, key, contentLength, progressListener);
|
|
38
47
|
}
|
|
39
48
|
const putObjectCommand = new client_s3_1.PutObjectCommand({
|
|
40
49
|
Body: inputStream,
|
|
41
50
|
Bucket: this.bucket,
|
|
42
|
-
Key:
|
|
51
|
+
Key: key,
|
|
43
52
|
ContentLength: contentLength,
|
|
44
53
|
});
|
|
45
54
|
progressListener?.(contentLength, 0);
|
|
@@ -47,9 +56,10 @@ class S3StorageProvider {
|
|
|
47
56
|
progressListener?.(contentLength, contentLength);
|
|
48
57
|
}
|
|
49
58
|
async multipartUpload(inputStream, remotePath, contentLength, progressListener) {
|
|
59
|
+
const key = this.applyPrefix(remotePath);
|
|
50
60
|
const createMultipartUploadCommand = new client_s3_1.CreateMultipartUploadCommand({
|
|
51
61
|
Bucket: this.bucket,
|
|
52
|
-
Key:
|
|
62
|
+
Key: key,
|
|
53
63
|
});
|
|
54
64
|
const multipart = await this.s3Client.send(createMultipartUploadCommand);
|
|
55
65
|
if (!multipart.UploadId) {
|
|
@@ -63,7 +73,7 @@ class S3StorageProvider {
|
|
|
63
73
|
const uploadPartCommand = new client_s3_1.UploadPartCommand({
|
|
64
74
|
Body: streamChunk.data,
|
|
65
75
|
Bucket: this.bucket,
|
|
66
|
-
Key:
|
|
76
|
+
Key: key,
|
|
67
77
|
UploadId: uploadId,
|
|
68
78
|
PartNumber: streamChunk.partNumber,
|
|
69
79
|
});
|
|
@@ -79,7 +89,7 @@ class S3StorageProvider {
|
|
|
79
89
|
}
|
|
80
90
|
const completeMultipartUploadCommand = new client_s3_1.CompleteMultipartUploadCommand({
|
|
81
91
|
Bucket: this.bucket,
|
|
82
|
-
Key:
|
|
92
|
+
Key: key,
|
|
83
93
|
UploadId: multipart.UploadId,
|
|
84
94
|
MultipartUpload: { Parts: parts },
|
|
85
95
|
});
|
|
@@ -88,7 +98,7 @@ class S3StorageProvider {
|
|
|
88
98
|
catch (uploadingError) {
|
|
89
99
|
const abortMultipartUploadCommand = new client_s3_1.AbortMultipartUploadCommand({
|
|
90
100
|
Bucket: this.bucket,
|
|
91
|
-
Key:
|
|
101
|
+
Key: key,
|
|
92
102
|
UploadId: multipart.UploadId,
|
|
93
103
|
});
|
|
94
104
|
await this.s3Client.send(abortMultipartUploadCommand);
|
|
@@ -96,16 +106,18 @@ class S3StorageProvider {
|
|
|
96
106
|
}
|
|
97
107
|
}
|
|
98
108
|
async deleteObject(remotePath) {
|
|
109
|
+
const key = this.applyPrefix(remotePath);
|
|
99
110
|
const deleteObjectCommand = new client_s3_1.DeleteObjectCommand({
|
|
100
111
|
Bucket: this.bucket,
|
|
101
|
-
Key:
|
|
112
|
+
Key: key,
|
|
102
113
|
});
|
|
103
114
|
await this.s3Client.send(deleteObjectCommand);
|
|
104
115
|
}
|
|
105
116
|
async downloadFile(remotePath, config, progressListener) {
|
|
117
|
+
const key = this.applyPrefix(remotePath);
|
|
106
118
|
const getObjectParams = {
|
|
107
119
|
Bucket: this.bucket,
|
|
108
|
-
Key:
|
|
120
|
+
Key: key,
|
|
109
121
|
};
|
|
110
122
|
if (config) {
|
|
111
123
|
const start = config.offset || 0;
|
|
@@ -128,16 +140,16 @@ class S3StorageProvider {
|
|
|
128
140
|
return getObjectResult.Body;
|
|
129
141
|
}
|
|
130
142
|
async listObjects(remotePath) {
|
|
131
|
-
const
|
|
143
|
+
const key = this.applyPrefix(remotePath.endsWith('/') || remotePath === '' ? remotePath : `${remotePath}/`);
|
|
132
144
|
const listObjectsCommand = new client_s3_1.ListObjectsV2Command({
|
|
133
145
|
Bucket: this.bucket,
|
|
134
|
-
Prefix:
|
|
146
|
+
Prefix: key,
|
|
135
147
|
});
|
|
136
148
|
const listObjects = await this.s3Client.send(listObjectsCommand);
|
|
137
149
|
let result = [];
|
|
138
150
|
if (listObjects.Contents) {
|
|
139
151
|
result = listObjects.Contents.map((object) => ({
|
|
140
|
-
name: object.Key || '',
|
|
152
|
+
name: object.Key?.replace(this.prefix, '') || '',
|
|
141
153
|
createdAt: object.LastModified || new Date(),
|
|
142
154
|
size: object.Size || 0,
|
|
143
155
|
}));
|
|
@@ -145,9 +157,10 @@ class S3StorageProvider {
|
|
|
145
157
|
return result;
|
|
146
158
|
}
|
|
147
159
|
async getMetadata(remotePath) {
|
|
160
|
+
const key = this.applyPrefix(remotePath);
|
|
148
161
|
const headObjectCommand = new client_s3_1.HeadObjectCommand({
|
|
149
162
|
Bucket: this.bucket,
|
|
150
|
-
Key:
|
|
163
|
+
Key: key,
|
|
151
164
|
});
|
|
152
165
|
return await this.s3Client.send(headObjectCommand);
|
|
153
166
|
}
|
|
@@ -167,4 +180,4 @@ class S3StorageProvider {
|
|
|
167
180
|
}
|
|
168
181
|
}
|
|
169
182
|
exports.S3StorageProvider = S3StorageProvider;
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3StorageProvider.js","sourceRoot":"","sources":["../../../../src/providers/storage/S3StorageProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,11 @@ export type S3ClientConfig = S3Credentials & {
|
|
|
9
9
|
export declare class S3StorageProvider implements IStorageProvider {
|
|
10
10
|
private readonly s3Client;
|
|
11
11
|
private readonly bucket;
|
|
12
|
+
private readonly prefix;
|
|
12
13
|
private readonly multipartChunkSizeInBytes;
|
|
13
14
|
private readonly defaultRegion;
|
|
14
15
|
constructor(storageAccess: S3ClientConfig);
|
|
16
|
+
private applyPrefix;
|
|
15
17
|
uploadFile(inputStream: Readable, remotePath: string, contentLength: number, progressListener?: ((total: number, current: number) => void) | undefined): Promise<void>;
|
|
16
18
|
private multipartUpload;
|
|
17
19
|
deleteObject(remotePath: string): Promise<void>;
|
|
@@ -4,10 +4,11 @@ import { getStreamChunks } from '../../utils/helpers/getStreamChunks.js';
|
|
|
4
4
|
export class S3StorageProvider {
|
|
5
5
|
s3Client;
|
|
6
6
|
bucket;
|
|
7
|
+
prefix;
|
|
7
8
|
multipartChunkSizeInBytes = 64 * 1024 * 1024; // 64MB
|
|
8
9
|
defaultRegion = 'us-east-1';
|
|
9
10
|
constructor(storageAccess) {
|
|
10
|
-
const { accessKeyId, secretKey, endpoint, bucket, region } = storageAccess;
|
|
11
|
+
const { accessKeyId, secretKey, endpoint, bucket, region, prefix } = storageAccess;
|
|
11
12
|
if (!accessKeyId)
|
|
12
13
|
throw new Error('Access key id is undefined');
|
|
13
14
|
if (!secretKey)
|
|
@@ -16,7 +17,11 @@ export class S3StorageProvider {
|
|
|
16
17
|
throw new Error('Endpoint is undefined');
|
|
17
18
|
if (!bucket)
|
|
18
19
|
throw new Error('Bucket is undefined');
|
|
20
|
+
if (prefix.startsWith('/') || !prefix.endsWith('/')) {
|
|
21
|
+
throw new Error(`Prefix is invalid: it must not start with "/" and must end with "/" (prefix=${prefix})`);
|
|
22
|
+
}
|
|
19
23
|
this.bucket = bucket;
|
|
24
|
+
this.prefix = prefix;
|
|
20
25
|
this.s3Client = new S3Client({
|
|
21
26
|
credentials: {
|
|
22
27
|
accessKeyId,
|
|
@@ -27,16 +32,20 @@ export class S3StorageProvider {
|
|
|
27
32
|
forcePathStyle: true,
|
|
28
33
|
});
|
|
29
34
|
}
|
|
35
|
+
applyPrefix(key) {
|
|
36
|
+
return `${this.prefix}${key}`;
|
|
37
|
+
}
|
|
30
38
|
async uploadFile(inputStream, remotePath, contentLength, progressListener) {
|
|
31
39
|
// For performance & cost optimization
|
|
32
40
|
// https://docs.storj.io/dcs/api-reference/s3-compatible-gateway/multipart-upload/multipart-part-size
|
|
41
|
+
const key = this.applyPrefix(remotePath);
|
|
33
42
|
if (contentLength >= this.multipartChunkSizeInBytes) {
|
|
34
|
-
return this.multipartUpload(inputStream,
|
|
43
|
+
return this.multipartUpload(inputStream, key, contentLength, progressListener);
|
|
35
44
|
}
|
|
36
45
|
const putObjectCommand = new PutObjectCommand({
|
|
37
46
|
Body: inputStream,
|
|
38
47
|
Bucket: this.bucket,
|
|
39
|
-
Key:
|
|
48
|
+
Key: key,
|
|
40
49
|
ContentLength: contentLength,
|
|
41
50
|
});
|
|
42
51
|
progressListener?.(contentLength, 0);
|
|
@@ -44,9 +53,10 @@ export class S3StorageProvider {
|
|
|
44
53
|
progressListener?.(contentLength, contentLength);
|
|
45
54
|
}
|
|
46
55
|
async multipartUpload(inputStream, remotePath, contentLength, progressListener) {
|
|
56
|
+
const key = this.applyPrefix(remotePath);
|
|
47
57
|
const createMultipartUploadCommand = new CreateMultipartUploadCommand({
|
|
48
58
|
Bucket: this.bucket,
|
|
49
|
-
Key:
|
|
59
|
+
Key: key,
|
|
50
60
|
});
|
|
51
61
|
const multipart = await this.s3Client.send(createMultipartUploadCommand);
|
|
52
62
|
if (!multipart.UploadId) {
|
|
@@ -60,7 +70,7 @@ export class S3StorageProvider {
|
|
|
60
70
|
const uploadPartCommand = new UploadPartCommand({
|
|
61
71
|
Body: streamChunk.data,
|
|
62
72
|
Bucket: this.bucket,
|
|
63
|
-
Key:
|
|
73
|
+
Key: key,
|
|
64
74
|
UploadId: uploadId,
|
|
65
75
|
PartNumber: streamChunk.partNumber,
|
|
66
76
|
});
|
|
@@ -76,7 +86,7 @@ export class S3StorageProvider {
|
|
|
76
86
|
}
|
|
77
87
|
const completeMultipartUploadCommand = new CompleteMultipartUploadCommand({
|
|
78
88
|
Bucket: this.bucket,
|
|
79
|
-
Key:
|
|
89
|
+
Key: key,
|
|
80
90
|
UploadId: multipart.UploadId,
|
|
81
91
|
MultipartUpload: { Parts: parts },
|
|
82
92
|
});
|
|
@@ -85,7 +95,7 @@ export class S3StorageProvider {
|
|
|
85
95
|
catch (uploadingError) {
|
|
86
96
|
const abortMultipartUploadCommand = new AbortMultipartUploadCommand({
|
|
87
97
|
Bucket: this.bucket,
|
|
88
|
-
Key:
|
|
98
|
+
Key: key,
|
|
89
99
|
UploadId: multipart.UploadId,
|
|
90
100
|
});
|
|
91
101
|
await this.s3Client.send(abortMultipartUploadCommand);
|
|
@@ -93,16 +103,18 @@ export class S3StorageProvider {
|
|
|
93
103
|
}
|
|
94
104
|
}
|
|
95
105
|
async deleteObject(remotePath) {
|
|
106
|
+
const key = this.applyPrefix(remotePath);
|
|
96
107
|
const deleteObjectCommand = new DeleteObjectCommand({
|
|
97
108
|
Bucket: this.bucket,
|
|
98
|
-
Key:
|
|
109
|
+
Key: key,
|
|
99
110
|
});
|
|
100
111
|
await this.s3Client.send(deleteObjectCommand);
|
|
101
112
|
}
|
|
102
113
|
async downloadFile(remotePath, config, progressListener) {
|
|
114
|
+
const key = this.applyPrefix(remotePath);
|
|
103
115
|
const getObjectParams = {
|
|
104
116
|
Bucket: this.bucket,
|
|
105
|
-
Key:
|
|
117
|
+
Key: key,
|
|
106
118
|
};
|
|
107
119
|
if (config) {
|
|
108
120
|
const start = config.offset || 0;
|
|
@@ -125,16 +137,16 @@ export class S3StorageProvider {
|
|
|
125
137
|
return getObjectResult.Body;
|
|
126
138
|
}
|
|
127
139
|
async listObjects(remotePath) {
|
|
128
|
-
const
|
|
140
|
+
const key = this.applyPrefix(remotePath.endsWith('/') || remotePath === '' ? remotePath : `${remotePath}/`);
|
|
129
141
|
const listObjectsCommand = new ListObjectsV2Command({
|
|
130
142
|
Bucket: this.bucket,
|
|
131
|
-
Prefix:
|
|
143
|
+
Prefix: key,
|
|
132
144
|
});
|
|
133
145
|
const listObjects = await this.s3Client.send(listObjectsCommand);
|
|
134
146
|
let result = [];
|
|
135
147
|
if (listObjects.Contents) {
|
|
136
148
|
result = listObjects.Contents.map((object) => ({
|
|
137
|
-
name: object.Key || '',
|
|
149
|
+
name: object.Key?.replace(this.prefix, '') || '',
|
|
138
150
|
createdAt: object.LastModified || new Date(),
|
|
139
151
|
size: object.Size || 0,
|
|
140
152
|
}));
|
|
@@ -142,9 +154,10 @@ export class S3StorageProvider {
|
|
|
142
154
|
return result;
|
|
143
155
|
}
|
|
144
156
|
async getMetadata(remotePath) {
|
|
157
|
+
const key = this.applyPrefix(remotePath);
|
|
145
158
|
const headObjectCommand = new HeadObjectCommand({
|
|
146
159
|
Bucket: this.bucket,
|
|
147
|
-
Key:
|
|
160
|
+
Key: key,
|
|
148
161
|
});
|
|
149
162
|
return await this.s3Client.send(headObjectCommand);
|
|
150
163
|
}
|
|
@@ -163,4 +176,4 @@ export class S3StorageProvider {
|
|
|
163
176
|
return metadata.LastModified;
|
|
164
177
|
}
|
|
165
178
|
}
|
|
166
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3StorageProvider.js","sourceRoot":"","sources":["../../../../src/providers/storage/S3StorageProvider.ts"],"names":[],"mappings":"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"}
|