@salesforce/source-deploy-retrieve 10.5.2 → 10.5.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.
|
@@ -49,6 +49,7 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
|
|
|
49
49
|
onError(subscriber: (result: Error) => void): void;
|
|
50
50
|
protected maybeSaveTempDirectory(target: SfdxFileFormat, cs?: ComponentSet): Promise<void>;
|
|
51
51
|
protected getConnection(): Promise<Connection>;
|
|
52
|
+
private isRetryableError;
|
|
52
53
|
private poll;
|
|
53
54
|
/**
|
|
54
55
|
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
@@ -141,6 +141,31 @@ class MetadataTransfer {
|
|
|
141
141
|
}
|
|
142
142
|
return getConnectionNoHigherThanOrgAllows(this.usernameOrConnection, this.apiVersion);
|
|
143
143
|
}
|
|
144
|
+
// eslint-disable-next-line class-methods-use-this
|
|
145
|
+
isRetryableError(error) {
|
|
146
|
+
if (!(error instanceof Error))
|
|
147
|
+
return false;
|
|
148
|
+
const retryableErrors = [
|
|
149
|
+
'ENOMEM',
|
|
150
|
+
'ETIMEDOUT',
|
|
151
|
+
'ENOTFOUND',
|
|
152
|
+
'ECONNRESET',
|
|
153
|
+
'socket hang up',
|
|
154
|
+
'connection timeout',
|
|
155
|
+
'INVALID_QUERY_LOCATOR',
|
|
156
|
+
'ERROR_HTTP_502',
|
|
157
|
+
'ERROR_HTTP_503',
|
|
158
|
+
'ERROR_HTTP_420',
|
|
159
|
+
'<h1>Bad Message 400</h1><pre>reason: Bad Request</pre>',
|
|
160
|
+
'Unable to complete the creation of the query cursor at this time',
|
|
161
|
+
'Failed while fetching query cursor data for this QueryLocator',
|
|
162
|
+
'Client network socket disconnected before secure TLS connection was established',
|
|
163
|
+
'Unexpected internal servlet state',
|
|
164
|
+
];
|
|
165
|
+
const isRetryable = (retryableNetworkError) => error.message.includes(retryableNetworkError) ||
|
|
166
|
+
('errorCode' in error && typeof error.errorCode === 'string' && error.errorCode.includes(retryableNetworkError));
|
|
167
|
+
return retryableErrors.some(isRetryable);
|
|
168
|
+
}
|
|
144
169
|
async poll() {
|
|
145
170
|
let completed = false;
|
|
146
171
|
let mdapiStatus;
|
|
@@ -172,20 +197,7 @@ class MetadataTransfer {
|
|
|
172
197
|
return { completed: false };
|
|
173
198
|
}
|
|
174
199
|
// tolerate intermittent network errors upto retry limit
|
|
175
|
-
if (
|
|
176
|
-
'ENOMEM',
|
|
177
|
-
'ETIMEDOUT',
|
|
178
|
-
'ENOTFOUND',
|
|
179
|
-
'ECONNRESET',
|
|
180
|
-
'socket hang up',
|
|
181
|
-
'connection timeout',
|
|
182
|
-
'INVALID_QUERY_LOCATOR',
|
|
183
|
-
'<h1>Bad Message 400</h1><pre>reason: Bad Request</pre>',
|
|
184
|
-
'Unable to complete the creation of the query cursor at this time',
|
|
185
|
-
'Failed while fetching query cursor data for this QueryLocator',
|
|
186
|
-
'Client network socket disconnected before secure TLS connection was established',
|
|
187
|
-
'Unexpected internal servlet state',
|
|
188
|
-
].some((retryableNetworkError) => e.message.includes(retryableNetworkError))) {
|
|
200
|
+
if (this.isRetryableError(e)) {
|
|
189
201
|
this.logger.debug('Network error on the request', e);
|
|
190
202
|
await core_1.Lifecycle.getInstance().emitWarning('Network error occurred. Continuing to poll.');
|
|
191
203
|
return { completed: false };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,6 +94,12 @@ class ReplacementMarkingStream extends node_stream_1.Transform {
|
|
|
94
94
|
if (!chunk.isMarkedForDelete() && this.replacementConfigs?.length) {
|
|
95
95
|
try {
|
|
96
96
|
chunk.replacements = await (0, exports.getReplacements)(chunk, this.replacementConfigs);
|
|
97
|
+
if (chunk.replacements && chunk.parent && chunk.type.name === 'CustomLabel') {
|
|
98
|
+
// Set replacements on the parent of a CustomLabel as well so that recomposing
|
|
99
|
+
// doesn't use the non-replaced content from parent cache.
|
|
100
|
+
// See RecompositionFinalizer.recompose() in convertContext.ts
|
|
101
|
+
chunk.parent.replacements = chunk.replacements;
|
|
102
|
+
}
|
|
97
103
|
}
|
|
98
104
|
catch (e) {
|
|
99
105
|
if (!(e instanceof Error)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+CAA4C;AAC5C,6CAAkD;AAClD,yCAAuC;AACvC,2CAA2E;AAC3E,uCAAuC;AACvC,yCAAsC;AACtC,mDAA8D;;AAM9D,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAEpF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;AAEpD;;GAEG;AACI,MAAM,+BAA+B,GAAG,CAC7C,SAA0B,EAC1B,IAAgB,EACc,EAAE,CAChC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC;IAC5B,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AANrB,QAAA,+BAA+B,mCAMV;AAElC;;;GAGG;AACH,MAAM,iBAAkB,SAAQ,uBAAS;IACvC,YAAoC,YAAiC;QACnE,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QADM,iBAAY,GAAZ,YAAY,CAAqB;IAErE,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,KAAa,EACb,QAAgB,EAChB,QAAgD;QAEhD,IAAI,KAAwB,CAAC;QAC7B,uCAAuC;QACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAA,6BAAqB,EAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjG,CAAC;CACF;AAED;;;GAGG;AACI,MAAM,qBAAqB,GAAG,KAAK,EAAE,KAAa,EAAE,YAAiC,EAAmB,EAAE;IAC/G,MAAM,iBAAiB,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IAClD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,+DAA+D;QAC/D,MAAM,KAAK,GACT,OAAO,WAAW,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC;QAC7G,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAEtE,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,GAAG,QAAQ,CAAC;YAClB,4CAA4C;YAC5C,MAAM,iBAAiB,CAAC,IAAI,CAAC,aAAa,EAAE;gBAC1C,QAAQ,EAAE,WAAW,CAAC,eAAe;gBACrC,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE;aACvB,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;YAClC,4CAA4C;YAC5C,4CAA4C;YAC5C,MAAM,iBAAiB,CAAC,WAAW,CACjC,yCAAyC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,0BACvE,WAAW,CAAC,eACd,yBAAyB,CAC1B,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3BW,QAAA,qBAAqB,yBA2BhC;AAEF;;GAEG;AACI,MAAM,2BAA2B,GAAG,KAAK,EAC9C,UAAmB,EAC4B,EAAE;IACjD,+CAA+C;IAC/C,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC;IACtF,IAAI,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAChC,OAAO,IAAI,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC;AARW,QAAA,2BAA2B,+BAQtC;AAEF;;;;GAIG;AACH,MAAM,wBAAyB,SAAQ,uBAAS;IAC9C,YAAoC,kBAAuC;QACzE,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QADM,uBAAkB,GAAlB,kBAAkB,CAAqB;IAE3E,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,KAAsB,EACtB,QAAgB,EAChB,QAAiE;QAEjE,IAAI,GAAsB,CAAC;QAC3B,gDAAgD;QAChD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;YAClE,IAAI,CAAC;gBACH,KAAK,CAAC,YAAY,GAAG,MAAM,IAAA,uBAAe,EAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "10.5.
|
|
3
|
+
"version": "10.5.4",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"ts-retry-promise": "^0.7.1"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@salesforce/cli-plugins-testkit": "^5.1.
|
|
43
|
+
"@salesforce/cli-plugins-testkit": "^5.1.11",
|
|
44
44
|
"@salesforce/dev-scripts": "^8.4.2",
|
|
45
45
|
"@types/deep-equal-in-any-order": "^1.0.1",
|
|
46
46
|
"@types/fast-levenshtein": "^0.0.4",
|