@actions/artifact 2.1.3 → 2.1.5
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.
|
@@ -127,7 +127,6 @@ function streamExtractExternal(url, directory) {
|
|
|
127
127
|
if (!fullPath.startsWith(directory)) {
|
|
128
128
|
reject(new Error(`Malformed extraction path: ${fullPath}`));
|
|
129
129
|
}
|
|
130
|
-
core.debug(`Extracting artifact entry: ${fullPath}`);
|
|
131
130
|
if (entry.type === 'Directory') {
|
|
132
131
|
if (!createdDirectories.has(fullPath)) {
|
|
133
132
|
createdDirectories.add(fullPath);
|
|
@@ -142,6 +141,7 @@ function streamExtractExternal(url, directory) {
|
|
|
142
141
|
}
|
|
143
142
|
}
|
|
144
143
|
else {
|
|
144
|
+
core.info(`Extracting artifact entry: ${fullPath}`);
|
|
145
145
|
if (!createdDirectories.has(path.dirname(fullPath))) {
|
|
146
146
|
createdDirectories.add(path.dirname(fullPath));
|
|
147
147
|
yield resolveOrCreateDirectory(path.dirname(fullPath));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-artifact.js","sourceRoot":"","sources":["../../../src/internal/download/download-artifact.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"download-artifact.js","sourceRoot":"","sources":["../../../src/internal/download/download-artifact.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,14 +42,34 @@ const errors_1 = require("../shared/errors");
|
|
|
42
42
|
function uploadZipToBlobStorage(authenticatedUploadURL, zipUploadStream) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
44
|
let uploadByteCount = 0;
|
|
45
|
+
let lastProgressTime = Date.now();
|
|
46
|
+
let timeoutId;
|
|
47
|
+
const chunkTimer = (timeout) => {
|
|
48
|
+
// clear the previous timeout
|
|
49
|
+
if (timeoutId) {
|
|
50
|
+
clearTimeout(timeoutId);
|
|
51
|
+
}
|
|
52
|
+
timeoutId = setTimeout(() => {
|
|
53
|
+
const now = Date.now();
|
|
54
|
+
// if there's been more than 30 seconds since the
|
|
55
|
+
// last progress event, then we'll consider the upload stalled
|
|
56
|
+
if (now - lastProgressTime > timeout) {
|
|
57
|
+
throw new Error('Upload progress stalled.');
|
|
58
|
+
}
|
|
59
|
+
}, timeout);
|
|
60
|
+
return timeoutId;
|
|
61
|
+
};
|
|
45
62
|
const maxConcurrency = (0, config_1.getConcurrency)();
|
|
46
63
|
const bufferSize = (0, config_1.getUploadChunkSize)();
|
|
47
64
|
const blobClient = new storage_blob_1.BlobClient(authenticatedUploadURL);
|
|
48
65
|
const blockBlobClient = blobClient.getBlockBlobClient();
|
|
66
|
+
const timeoutDuration = 300000; // 30 seconds
|
|
49
67
|
core.debug(`Uploading artifact zip to blob storage with maxConcurrency: ${maxConcurrency}, bufferSize: ${bufferSize}`);
|
|
50
68
|
const uploadCallback = (progress) => {
|
|
51
69
|
core.info(`Uploaded bytes ${progress.loadedBytes}`);
|
|
52
70
|
uploadByteCount = progress.loadedBytes;
|
|
71
|
+
chunkTimer(timeoutDuration);
|
|
72
|
+
lastProgressTime = Date.now();
|
|
53
73
|
};
|
|
54
74
|
const options = {
|
|
55
75
|
blobHTTPHeaders: { blobContentType: 'zip' },
|
|
@@ -62,6 +82,8 @@ function uploadZipToBlobStorage(authenticatedUploadURL, zipUploadStream) {
|
|
|
62
82
|
zipUploadStream.pipe(hashStream).setEncoding('hex'); // This stream is used to compute a hash of the zip content that gets used. Integrity check
|
|
63
83
|
core.info('Beginning upload of artifact content to blob storage');
|
|
64
84
|
try {
|
|
85
|
+
// Start the chunk timer
|
|
86
|
+
timeoutId = chunkTimer(timeoutDuration);
|
|
65
87
|
yield blockBlobClient.uploadStream(uploadStream, bufferSize, maxConcurrency, options);
|
|
66
88
|
}
|
|
67
89
|
catch (error) {
|
|
@@ -70,6 +92,12 @@ function uploadZipToBlobStorage(authenticatedUploadURL, zipUploadStream) {
|
|
|
70
92
|
}
|
|
71
93
|
throw error;
|
|
72
94
|
}
|
|
95
|
+
finally {
|
|
96
|
+
// clear the timeout whether or not the upload completes
|
|
97
|
+
if (timeoutId) {
|
|
98
|
+
clearTimeout(timeoutId);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
73
101
|
core.info('Finished uploading artifact content to blob storage!');
|
|
74
102
|
hashStream.end();
|
|
75
103
|
sha256Hash = hashStream.read();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blob-upload.js","sourceRoot":"","sources":["../../../src/internal/upload/blob-upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA4E;AAG5E,6CAAmE;AACnE,oDAAqC;AACrC,+CAAgC;AAChC,+CAAgC;AAChC,6CAA6C;AAc7C,SAAsB,sBAAsB,CAC1C,sBAA8B,EAC9B,eAAgC;;QAEhC,IAAI,eAAe,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"blob-upload.js","sourceRoot":"","sources":["../../../src/internal/upload/blob-upload.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@actions/artifact",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.5",
|
|
4
4
|
"preview": true,
|
|
5
5
|
"description": "Actions artifact lib",
|
|
6
6
|
"keywords": [
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@octokit/plugin-retry": "^3.0.9",
|
|
50
50
|
"@octokit/request-error": "^5.0.0",
|
|
51
51
|
"@protobuf-ts/plugin": "^2.2.3-alpha.1",
|
|
52
|
-
"archiver": "^
|
|
52
|
+
"archiver": "^7.0.1",
|
|
53
53
|
"crypto": "^1.0.1",
|
|
54
54
|
"jwt-decode": "^3.1.2",
|
|
55
55
|
"twirp-ts": "^2.5.0",
|
|
@@ -62,4 +62,4 @@
|
|
|
62
62
|
"typedoc-plugin-markdown": "^3.17.1",
|
|
63
63
|
"typescript": "^5.2.2"
|
|
64
64
|
}
|
|
65
|
-
}
|
|
65
|
+
}
|