@salesforce/source-deploy-retrieve 5.8.3 → 5.8.4
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
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [5.8.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.3...v5.8.4) (2022-01-03)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- add variable polling times based on comp. set ([#520](https://github.com/forcedotcom/source-deploy-retrieve/issues/520)) ([e97744f](https://github.com/forcedotcom/source-deploy-retrieve/commit/e97744f243d943c85ca8df22e004c278fbad0715))
|
|
10
|
+
|
|
5
11
|
### [5.8.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.2...v5.8.3) (2022-01-03)
|
|
6
12
|
|
|
7
13
|
### Bug Fixes
|
|
@@ -35,7 +35,7 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
|
|
|
35
35
|
pollStatus(options?: Partial<PollingClient.Options>): Promise<Result>;
|
|
36
36
|
/**
|
|
37
37
|
* Poll for the status of the metadata transfer request.
|
|
38
|
-
* Default frequency is
|
|
38
|
+
* Default frequency is based on the number of SourceComponents, n, in the transfer, it ranges from 100ms -> n
|
|
39
39
|
* Default timeout is 60 minutes.
|
|
40
40
|
*
|
|
41
41
|
* @param frequency Polling frequency in milliseconds.
|
|
@@ -50,6 +50,10 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
|
|
|
50
50
|
protected maybeSaveTempDirectory(target: SfdxFileFormat, cs?: ComponentSet): Promise<void>;
|
|
51
51
|
protected getConnection(): Promise<Connection>;
|
|
52
52
|
private poll;
|
|
53
|
+
/**
|
|
54
|
+
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
55
|
+
*/
|
|
56
|
+
private calculatePollingFrequency;
|
|
53
57
|
abstract checkStatus(): Promise<Status>;
|
|
54
58
|
abstract cancel(): Promise<void>;
|
|
55
59
|
protected abstract pre(): Promise<AsyncResult>;
|
|
@@ -43,8 +43,9 @@ class MetadataTransfer {
|
|
|
43
43
|
return asyncResult;
|
|
44
44
|
}
|
|
45
45
|
async pollStatus(frequencyOrOptions, timeout) {
|
|
46
|
+
var _a, _b;
|
|
46
47
|
let pollingOptions = {
|
|
47
|
-
frequency: kit_1.Duration.milliseconds(
|
|
48
|
+
frequency: kit_1.Duration.milliseconds(this.calculatePollingFrequency()),
|
|
48
49
|
timeout: kit_1.Duration.minutes(60),
|
|
49
50
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
50
51
|
poll: this.poll.bind(this),
|
|
@@ -58,6 +59,10 @@ class MetadataTransfer {
|
|
|
58
59
|
if ((0, ts_types_1.isNumber)(timeout)) {
|
|
59
60
|
pollingOptions.timeout = kit_1.Duration.seconds(timeout);
|
|
60
61
|
}
|
|
62
|
+
// from the overloaded methods, there's a possibility frequency/timeout isn't set
|
|
63
|
+
// guarantee frequency and timeout are set
|
|
64
|
+
(_a = pollingOptions.frequency) !== null && _a !== void 0 ? _a : (pollingOptions.frequency = kit_1.Duration.milliseconds(this.calculatePollingFrequency()));
|
|
65
|
+
(_b = pollingOptions.timeout) !== null && _b !== void 0 ? _b : (pollingOptions.timeout = kit_1.Duration.minutes(60));
|
|
61
66
|
const pollingClient = await core_1.PollingClient.create(pollingOptions);
|
|
62
67
|
try {
|
|
63
68
|
this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);
|
|
@@ -167,6 +172,33 @@ class MetadataTransfer {
|
|
|
167
172
|
this.logger.debug(`MDAPI status update: ${mdapiStatus.status}`);
|
|
168
173
|
return { completed, payload: mdapiStatus };
|
|
169
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
177
|
+
*/
|
|
178
|
+
calculatePollingFrequency() {
|
|
179
|
+
var _a;
|
|
180
|
+
const size = ((_a = this.components) === null || _a === void 0 ? void 0 : _a.getSourceComponents().toArray().length) || 0;
|
|
181
|
+
// take a piece-wise approach to encapsulate discrete deployment sizes in polling frequencies that "feel" good when deployed
|
|
182
|
+
if (size === 0) {
|
|
183
|
+
// no component set size is possible for retrieve
|
|
184
|
+
return 1000;
|
|
185
|
+
}
|
|
186
|
+
else if (size <= 10) {
|
|
187
|
+
return 100;
|
|
188
|
+
}
|
|
189
|
+
else if (size <= 50) {
|
|
190
|
+
return 250;
|
|
191
|
+
}
|
|
192
|
+
else if (size <= 100) {
|
|
193
|
+
return 500;
|
|
194
|
+
}
|
|
195
|
+
else if (size <= 1000) {
|
|
196
|
+
return 1000;
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
return size;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
170
202
|
}
|
|
171
203
|
exports.MetadataTransfer = MetadataTransfer;
|
|
172
204
|
//# sourceMappingURL=metadataTransfer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAAsC;AACtC,+BAA4B;AAC5B,2CAAwG;AACxG,yCAA2C;AAC3C,mDAAyD;AACzD,kCAAkC;AAClC,wCAA+D;AAC/D,sCAAkD;AAClD,gDAA8C;AAC9C,mCAAoG;
|
|
1
|
+
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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"}
|