@empiricalrun/r2-uploader 0.3.6 → 0.3.8
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.
- package/CHANGELOG.md +12 -0
- package/dist/upload/stream.js +9 -9
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
package/dist/upload/stream.js
CHANGED
|
@@ -32,13 +32,13 @@ const uploadFileStreams = async (config) => {
|
|
|
32
32
|
ContentType: mimeType,
|
|
33
33
|
};
|
|
34
34
|
const createMultipartUploadCommand = new client_s3_1.CreateMultipartUploadCommand(createMultipartUploadParams);
|
|
35
|
-
logger_1.logger.debug("sending a multipart upload command for file", file.
|
|
35
|
+
logger_1.logger.debug("sending a multipart upload command for file", file.fullPath);
|
|
36
36
|
const { UploadId } = await S3.send(createMultipartUploadCommand);
|
|
37
37
|
const partSize = 5 * 1024 * 1024; // 5MB
|
|
38
38
|
const fileStream = fs_1.default.createReadStream(file.fullPath, {
|
|
39
39
|
highWaterMark: partSize,
|
|
40
40
|
});
|
|
41
|
-
logger_1.logger.debug("file stream created successfully for file", file.
|
|
41
|
+
logger_1.logger.debug("file stream created successfully for file", file.fullPath);
|
|
42
42
|
let partNumber = 1;
|
|
43
43
|
const parts = [];
|
|
44
44
|
for await (const chunk of fileStream) {
|
|
@@ -53,7 +53,7 @@ const uploadFileStreams = async (config) => {
|
|
|
53
53
|
try {
|
|
54
54
|
await (0, async_retry_1.default)(async () => {
|
|
55
55
|
const { ETag } = await S3.send(uploadPartCommand);
|
|
56
|
-
logger_1.logger.debug("upload part command sent successfully for file", file.
|
|
56
|
+
logger_1.logger.debug("upload part command sent successfully for file", file.fullPath);
|
|
57
57
|
parts.push({ ETag: ETag, PartNumber: partNumber });
|
|
58
58
|
partNumber++;
|
|
59
59
|
}, {
|
|
@@ -63,12 +63,12 @@ const uploadFileStreams = async (config) => {
|
|
|
63
63
|
maxTimeout: 60000,
|
|
64
64
|
randomize: true,
|
|
65
65
|
onRetry: (err, i) => {
|
|
66
|
-
logger_1.logger.debug("Upload part retry attempt:", i, ":", file.
|
|
66
|
+
logger_1.logger.debug("Upload part retry attempt:", i, ":", file.fullPath);
|
|
67
67
|
},
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
catch (err) {
|
|
71
|
-
logger_1.logger.error(`R2 Error - ${file.
|
|
71
|
+
logger_1.logger.error(`R2 Error - ${file.fullPath} \nError: ${err}`);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
const completeMultipartUploadParams = {
|
|
@@ -80,16 +80,16 @@ const uploadFileStreams = async (config) => {
|
|
|
80
80
|
},
|
|
81
81
|
};
|
|
82
82
|
const completeMultipartUploadCommand = new client_s3_1.CompleteMultipartUploadCommand(completeMultipartUploadParams);
|
|
83
|
-
logger_1.logger.debug("file uploaded successfully for file. sending complete multipart request", file.
|
|
83
|
+
logger_1.logger.debug("file uploaded successfully for file. sending complete multipart request", file.fullPath);
|
|
84
84
|
await S3.send(completeMultipartUploadCommand);
|
|
85
|
-
logger_1.logger.debug("multipart upload complete for file", file.
|
|
85
|
+
logger_1.logger.debug("multipart upload complete for file", file.fullPath);
|
|
86
86
|
const getObjectCommand = new client_s3_1.GetObjectCommand({
|
|
87
87
|
Bucket: config.bucket,
|
|
88
88
|
Key: fileKey,
|
|
89
89
|
});
|
|
90
|
-
logger_1.logger.debug("getting a signed url for file", file.
|
|
90
|
+
logger_1.logger.debug("getting a signed url for file", file.fullPath);
|
|
91
91
|
const fileUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, getObjectCommand);
|
|
92
|
-
logger_1.logger.debug("signed url successfully fetched for file", file.
|
|
92
|
+
logger_1.logger.debug("signed url successfully fetched for file", file.fullPath);
|
|
93
93
|
urls[file.fileName] = fileUrl;
|
|
94
94
|
}));
|
|
95
95
|
return urls;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@empiricalrun/r2-uploader",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.8",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"registry": "https://registry.npmjs.org/",
|
|
6
6
|
"access": "public"
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
},
|
|
13
13
|
"author": "Empirical Team <hey@empirical.run>",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@aws-sdk/client-s3": "
|
|
16
|
-
"@aws-sdk/s3-request-presigner": "
|
|
15
|
+
"@aws-sdk/client-s3": "3.614.0",
|
|
16
|
+
"@aws-sdk/s3-request-presigner": "3.614.0",
|
|
17
17
|
"@types/async-retry": "^1.4.8",
|
|
18
18
|
"@types/md5": "^2.3.5",
|
|
19
19
|
"@types/mime": "3.0.0",
|