@salesforce/apex-node 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.
- package/lib/src/common/cancellation.js +6 -17
- package/lib/src/common/cancellation.js.map +1 -1
- package/lib/src/execute/executeService.js +52 -69
- package/lib/src/execute/executeService.js.map +1 -1
- package/lib/src/execute/types.d.ts +3 -3
- package/lib/src/execute/utils.js +1 -1
- package/lib/src/execute/utils.js.map +1 -1
- package/lib/src/i18n/index.js.map +1 -1
- package/lib/src/i18n/localization.d.ts +1 -1
- package/lib/src/i18n/localization.js +1 -1
- package/lib/src/i18n/localization.js.map +1 -1
- package/lib/src/logs/logService.d.ts +1 -1
- package/lib/src/logs/logService.js +73 -101
- package/lib/src/logs/logService.js.map +1 -1
- package/lib/src/logs/types.d.ts +3 -3
- package/lib/src/reporters/coverageReporter.d.ts +1 -1
- package/lib/src/reporters/coverageReporter.js +9 -11
- package/lib/src/reporters/coverageReporter.js.map +1 -1
- package/lib/src/reporters/humanReporter.js +2 -2
- package/lib/src/reporters/humanReporter.js.map +1 -1
- package/lib/src/reporters/junitReporter.js +2 -2
- package/lib/src/reporters/junitReporter.js.map +1 -1
- package/lib/src/reporters/tapReporter.js +6 -6
- package/lib/src/reporters/tapReporter.js.map +1 -1
- package/lib/src/streaming/streamingClient.js +116 -137
- package/lib/src/streaming/streamingClient.js.map +1 -1
- package/lib/src/streaming/types.d.ts +4 -4
- package/lib/src/streaming/types.js +3 -3
- package/lib/src/streaming/types.js.map +1 -1
- package/lib/src/tests/asyncTests.js +234 -246
- package/lib/src/tests/asyncTests.js.map +1 -1
- package/lib/src/tests/codeCoverage.js +86 -100
- package/lib/src/tests/codeCoverage.js.map +1 -1
- package/lib/src/tests/diagnosticUtil.js +1 -2
- package/lib/src/tests/diagnosticUtil.js.map +1 -1
- package/lib/src/tests/syncTests.js +86 -87
- package/lib/src/tests/syncTests.js.map +1 -1
- package/lib/src/tests/testService.js +235 -273
- package/lib/src/tests/testService.js.map +1 -1
- package/lib/src/tests/types.d.ts +31 -31
- package/lib/src/tests/types.js +5 -5
- package/lib/src/tests/types.js.map +1 -1
- package/lib/src/tests/utils.d.ts +2 -0
- package/lib/src/tests/utils.js +29 -24
- package/lib/src/tests/utils.js.map +1 -1
- package/lib/src/utils/authUtil.js +4 -15
- package/lib/src/utils/authUtil.js.map +1 -1
- package/lib/src/utils/dateUtil.js.map +1 -1
- package/lib/src/utils/fileSystemHandler.js +8 -19
- package/lib/src/utils/fileSystemHandler.js.map +1 -1
- package/lib/src/utils/table.js +3 -3
- package/lib/src/utils/table.js.map +1 -1
- package/lib/src/utils/traceFlags.js +95 -122
- package/lib/src/utils/traceFlags.js.map +1 -1
- package/lib/src/utils/types.d.ts +9 -9
- package/package.json +36 -39
|
@@ -68,20 +68,18 @@ class CoverageReporter {
|
|
|
68
68
|
this.options = options;
|
|
69
69
|
}
|
|
70
70
|
generateReports() {
|
|
71
|
-
var _a, _b;
|
|
72
71
|
try {
|
|
73
72
|
this.coverageMap = this.buildCoverageMap();
|
|
74
73
|
fs.statSync(this.reportDir);
|
|
75
74
|
const context = libReport.createContext({
|
|
76
75
|
dir: this.reportDir,
|
|
77
76
|
defaultSummarizer: 'nested',
|
|
78
|
-
watermarks:
|
|
77
|
+
watermarks: this.options?.watermark || exports.DefaultWatermarks,
|
|
79
78
|
coverageMap: this.coverageMap
|
|
80
79
|
});
|
|
81
|
-
const formats =
|
|
82
|
-
formats.forEach(format => {
|
|
83
|
-
|
|
84
|
-
const report = reports.create(format, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.reportOptions[format]) || exports.DefaultReportOptions[format]);
|
|
80
|
+
const formats = this.options?.reportFormats || ['text-summary'];
|
|
81
|
+
formats.forEach((format) => {
|
|
82
|
+
const report = reports.create(format, this.options?.reportOptions[format] || exports.DefaultReportOptions[format]);
|
|
85
83
|
report.execute(context);
|
|
86
84
|
});
|
|
87
85
|
}
|
|
@@ -97,13 +95,13 @@ class CoverageReporter {
|
|
|
97
95
|
const fileRegEx = new RegExp(`${record.ApexClassOrTrigger.Name}\.(cls|trigger)`);
|
|
98
96
|
fileCoverageData.fnMap = {};
|
|
99
97
|
fileCoverageData.branchMap = {};
|
|
100
|
-
fileCoverageData.path = path.join(this.sourceDir, pathsToFiles.find(file => fileRegEx.test(file)) ||
|
|
98
|
+
fileCoverageData.path = path.join(this.sourceDir, pathsToFiles.find((file) => fileRegEx.test(file)) ||
|
|
101
99
|
record.ApexClassOrTrigger.Name);
|
|
102
100
|
fileCoverageData.f = {};
|
|
103
101
|
fileCoverageData.b = {};
|
|
104
102
|
fileCoverageData.s = [
|
|
105
|
-
...record.Coverage.coveredLines.map(line => [line, 1]),
|
|
106
|
-
...record.Coverage.uncoveredLines.map(line => [line, 0])
|
|
103
|
+
...record.Coverage.coveredLines.map((line) => [line, 1]),
|
|
104
|
+
...record.Coverage.uncoveredLines.map((line) => [line, 0])
|
|
107
105
|
]
|
|
108
106
|
.map(([line, covered]) => [Number(line).toString(10), covered])
|
|
109
107
|
.reduce((acc, [line, value]) => {
|
|
@@ -115,7 +113,7 @@ class CoverageReporter {
|
|
|
115
113
|
.readFileSync(fileCoverageData.path, 'utf8')
|
|
116
114
|
.split('\n');
|
|
117
115
|
}
|
|
118
|
-
catch
|
|
116
|
+
catch {
|
|
119
117
|
// file not found
|
|
120
118
|
}
|
|
121
119
|
fileCoverageData.statementMap = [
|
|
@@ -123,7 +121,7 @@ class CoverageReporter {
|
|
|
123
121
|
...record.Coverage.uncoveredLines
|
|
124
122
|
]
|
|
125
123
|
.sort()
|
|
126
|
-
.map(line => {
|
|
124
|
+
.map((line) => {
|
|
127
125
|
const statement = {
|
|
128
126
|
start: {
|
|
129
127
|
line,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverageReporter.js","sourceRoot":"","sources":["../../../src/reporters/coverageReporter.ts"],"names":[],"mappings":";;;AAYA,iDAAiD;AACjD,4CAA4C;AAC5C,qDAAqD;AACrD,6BAA6B;AAC7B,+BAA4B;AAC5B,yBAAyB;AACzB,kCAA8B;AAE9B,MAAM,aAAa,GAAG,CAAC,MAAc,EAAU,EAAE;IAC/C,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"coverageReporter.js","sourceRoot":"","sources":["../../../src/reporters/coverageReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ class HumanReporter {
|
|
|
92
92
|
name: elem.fullName,
|
|
93
93
|
outcome: elem.outcome,
|
|
94
94
|
msg: elem.message ? msg : '',
|
|
95
|
-
runtime: elem.outcome !== "Fail" /* Fail */ ? `${elem.runTime}` : ''
|
|
95
|
+
runtime: elem.outcome !== "Fail" /* ApexTestResultOutcome.Fail */ ? `${elem.runTime}` : ''
|
|
96
96
|
});
|
|
97
97
|
});
|
|
98
98
|
let testResultTable = '\n\n';
|
|
@@ -115,7 +115,7 @@ class HumanReporter {
|
|
|
115
115
|
? `${elem.message}\n${elem.stackTrace}`
|
|
116
116
|
: elem.message;
|
|
117
117
|
if (elem.perClassCoverage) {
|
|
118
|
-
elem.perClassCoverage.forEach(perClassCov => {
|
|
118
|
+
elem.perClassCoverage.forEach((perClassCov) => {
|
|
119
119
|
testRowArray.push({
|
|
120
120
|
name: elem.fullName,
|
|
121
121
|
coveredClassName: perClassCov.apexClassOrTriggerName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"humanReporter.js","sourceRoot":"","sources":["../../../src/reporters/humanReporter.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,oCAAsC;AAOtC,kCAA8B;AAE9B,MAAa,aAAa;IACjB,MAAM,CAAC,UAAsB,EAAE,gBAAyB;QAC7D,IAAI,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"file":"humanReporter.js","sourceRoot":"","sources":["../../../src/reporters/humanReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,8 +55,8 @@ class JUnitReporter {
|
|
|
55
55
|
for (const testCase of tests) {
|
|
56
56
|
const methodName = this.xmlEscape(testCase.methodName);
|
|
57
57
|
junitTests += `${tab}${tab}<testcase name="${methodName}" classname="${testCase.apexClass.fullName}" time="${(0, utils_1.msToSecond)(testCase.runTime)}">\n`;
|
|
58
|
-
if (testCase.outcome === "Fail" /* Fail */ ||
|
|
59
|
-
testCase.outcome === "CompileFail" /* CompileFail */) {
|
|
58
|
+
if (testCase.outcome === "Fail" /* ApexTestResultOutcome.Fail */ ||
|
|
59
|
+
testCase.outcome === "CompileFail" /* ApexTestResultOutcome.CompileFail */) {
|
|
60
60
|
let message = this.isEmpty(testCase.message) ? '' : testCase.message;
|
|
61
61
|
message = this.xmlEscape(message);
|
|
62
62
|
junitTests += `${tab}${tab}${tab}<failure message="${message}">`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junitReporter.js","sourceRoot":"","sources":["../../../src/reporters/junitReporter.ts"],"names":[],"mappings":";;;AAWA,oCAAuD;AAEvD,iEAAiE;AACjE,MAAM,GAAG,GAAG,MAAM,CAAC;AAEnB,MAAM,cAAc,GAAG;IACrB,uBAAuB;IACvB,mBAAmB;IACnB,iBAAiB;CAClB,CAAC;AAEF,mCAAmC;AACnC,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;AACrE,MAAa,aAAa;IACjB,MAAM,CAAC,UAAsB;QAClC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAEtC,IAAI,MAAM,GAAG,0CAA0C,CAAC;QACxD,MAAM,IAAI,gBAAgB,CAAC;QAC3B,MAAM,IAAI,GAAG,GAAG,+BAA+B,CAAC;QAChD,MAAM,IAAI,cAAc,OAAO,CAAC,aAAa,IAAI,CAAC;QAClD,MAAM,IAAI,aAAa,OAAO,CAAC,QAAQ,IAAI,CAAC;QAC5C,MAAM,IAAI,UAAU,OAAO,CAAC,QAAQ,IAAI,CAAC;QACzC,MAAM,IAAI,aAAa,OAAO,CAAC,OAAO,KAAK,CAAC;QAC5C,MAAM,IAAI,cAAc,CAAC;QACzB,MAAM,IAAI,SAAS,IAAA,kBAAU,EAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC;QAEnE,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAErC,MAAM,IAAI,GAAG,GAAG,gBAAgB,CAAC;QACjC,MAAM,IAAI,iBAAiB,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,eAAe,CAAC,UAAsB;QAC5C,IAAI,eAAe,GAAG,GAAG,GAAG,GAAG,GAAG,gBAAgB,CAAC;QAEnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC1D,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"junitReporter.js","sourceRoot":"","sources":["../../../src/reporters/junitReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,13 @@ class TapReporter {
|
|
|
7
7
|
const testPointCount = results.length;
|
|
8
8
|
let out = '';
|
|
9
9
|
out = out.concat(`1..${testPointCount}\n`);
|
|
10
|
-
results.forEach(testPoint => {
|
|
10
|
+
results.forEach((testPoint) => {
|
|
11
11
|
out = out.concat(`${testPoint.outcome} ${testPoint.testNumber} ${testPoint.description}\n`);
|
|
12
|
-
testPoint.diagnostics.forEach(s => {
|
|
12
|
+
testPoint.diagnostics.forEach((s) => {
|
|
13
13
|
out = out.concat(`# ${s}\n`);
|
|
14
14
|
});
|
|
15
15
|
});
|
|
16
|
-
epilog
|
|
16
|
+
epilog?.forEach((c) => {
|
|
17
17
|
out = out.concat(`# ${c}\n`);
|
|
18
18
|
});
|
|
19
19
|
return out;
|
|
@@ -22,7 +22,7 @@ class TapReporter {
|
|
|
22
22
|
const tapResults = [];
|
|
23
23
|
testResult.tests.forEach((test, index) => {
|
|
24
24
|
const testNumber = index + 1;
|
|
25
|
-
const outcome = test.outcome === "Pass" /* Pass */ ? 'ok' : 'not ok';
|
|
25
|
+
const outcome = test.outcome === "Pass" /* ApexTestResultOutcome.Pass */ ? 'ok' : 'not ok';
|
|
26
26
|
tapResults.push({
|
|
27
27
|
testNumber,
|
|
28
28
|
description: test.fullName,
|
|
@@ -38,7 +38,7 @@ class TapReporter {
|
|
|
38
38
|
if (testResult.message) {
|
|
39
39
|
const startsWithNewlineRegex = new RegExp(/^[/\r\n|\r|\n][\w]*/gim);
|
|
40
40
|
if (startsWithNewlineRegex.test(testResult.message)) {
|
|
41
|
-
testResult.message.split(/\r\n|\r|\n/g).forEach(msg => {
|
|
41
|
+
testResult.message.split(/\r\n|\r|\n/g).forEach((msg) => {
|
|
42
42
|
if (msg && msg.length > 0) {
|
|
43
43
|
message.push(msg.trim());
|
|
44
44
|
}
|
|
@@ -52,7 +52,7 @@ class TapReporter {
|
|
|
52
52
|
message.push('Unknown error');
|
|
53
53
|
}
|
|
54
54
|
if (testResult.stackTrace) {
|
|
55
|
-
testResult.stackTrace.split('\n').forEach(line => {
|
|
55
|
+
testResult.stackTrace.split('\n').forEach((line) => {
|
|
56
56
|
message.push(line);
|
|
57
57
|
});
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tapReporter.js","sourceRoot":"","sources":["../../../src/reporters/tapReporter.ts"],"names":[],"mappings":";;;AAmBA,MAAa,WAAW;IACf,MAAM,CAAC,UAAsB,EAAE,MAAiB;QACrD,MAAM,OAAO,GAAgB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;QAEtC,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,cAAc,IAAI,CAAC,CAAC;QAC3C,OAAO,CAAC,OAAO,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"tapReporter.js","sourceRoot":"","sources":["../../../src/reporters/tapReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,15 +5,6 @@
|
|
|
5
5
|
* Licensed under the BSD 3-Clause license.
|
|
6
6
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
7
|
*/
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
9
|
exports.StreamingClient = exports.Deferred = void 0;
|
|
19
10
|
const faye_1 = require("faye");
|
|
@@ -24,11 +15,25 @@ const TEST_RESULT_CHANNEL = '/systemTopic/TestResult';
|
|
|
24
15
|
const DEFAULT_STREAMING_TIMEOUT_MS = 14400;
|
|
25
16
|
class Deferred {
|
|
26
17
|
constructor() {
|
|
27
|
-
this.promise = new Promise(resolve => (this.resolve = resolve));
|
|
18
|
+
this.promise = new Promise((resolve) => (this.resolve = resolve));
|
|
28
19
|
}
|
|
29
20
|
}
|
|
30
21
|
exports.Deferred = Deferred;
|
|
31
22
|
class StreamingClient {
|
|
23
|
+
get subscribedTestRunIdPromise() {
|
|
24
|
+
return this.subscribedTestRunIdDeferred.promise;
|
|
25
|
+
}
|
|
26
|
+
removeTrailingSlashURL(instanceUrl) {
|
|
27
|
+
return instanceUrl ? instanceUrl.replace(/\/+$/, '') : '';
|
|
28
|
+
}
|
|
29
|
+
getStreamURL(instanceUrl) {
|
|
30
|
+
const urlElements = [
|
|
31
|
+
this.removeTrailingSlashURL(instanceUrl),
|
|
32
|
+
'cometd',
|
|
33
|
+
this.apiVersion
|
|
34
|
+
];
|
|
35
|
+
return urlElements.join('/');
|
|
36
|
+
}
|
|
32
37
|
constructor(connection, progress) {
|
|
33
38
|
this.apiVersion = '36.0';
|
|
34
39
|
this.subscribedTestRunIdDeferred = new Deferred();
|
|
@@ -40,23 +45,21 @@ class StreamingClient {
|
|
|
40
45
|
timeout: DEFAULT_STREAMING_TIMEOUT_MS
|
|
41
46
|
});
|
|
42
47
|
this.client.on('transport:up', () => {
|
|
43
|
-
|
|
44
|
-
(_a = this.progress) === null || _a === void 0 ? void 0 : _a.report({
|
|
48
|
+
this.progress?.report({
|
|
45
49
|
type: 'StreamingClientProgress',
|
|
46
50
|
value: 'streamingTransportUp',
|
|
47
51
|
message: i18n_1.nls.localize('streamingTransportUp')
|
|
48
52
|
});
|
|
49
53
|
});
|
|
50
54
|
this.client.on('transport:down', () => {
|
|
51
|
-
|
|
52
|
-
(_a = this.progress) === null || _a === void 0 ? void 0 : _a.report({
|
|
55
|
+
this.progress?.report({
|
|
53
56
|
type: 'StreamingClientProgress',
|
|
54
57
|
value: 'streamingTransportDown',
|
|
55
58
|
message: i18n_1.nls.localize('streamingTransportDown')
|
|
56
59
|
});
|
|
57
60
|
});
|
|
58
61
|
this.client.addExtension({
|
|
59
|
-
incoming: (message, callback) =>
|
|
62
|
+
incoming: async (message, callback) => {
|
|
60
63
|
if (message && message.error) {
|
|
61
64
|
// throw errors on handshake errors
|
|
62
65
|
if (message.channel === '/meta/handshake') {
|
|
@@ -64,8 +67,8 @@ class StreamingClient {
|
|
|
64
67
|
throw new Error(i18n_1.nls.localize('streamingHandshakeFail', message.error));
|
|
65
68
|
}
|
|
66
69
|
// refresh auth on 401 errors
|
|
67
|
-
if (message.error === "401::Authentication invalid" /* ERROR_AUTH_INVALID */) {
|
|
68
|
-
|
|
70
|
+
if (message.error === "401::Authentication invalid" /* StreamingErrors.ERROR_AUTH_INVALID */) {
|
|
71
|
+
await this.init();
|
|
69
72
|
callback(message);
|
|
70
73
|
return;
|
|
71
74
|
}
|
|
@@ -75,7 +78,7 @@ class StreamingClient {
|
|
|
75
78
|
return;
|
|
76
79
|
}
|
|
77
80
|
// call faye callback on 403 unknown client errors
|
|
78
|
-
if (message.error === "403::Unknown client" /* ERROR_UNKNOWN_CLIENT_ID */) {
|
|
81
|
+
if (message.error === "403::Unknown client" /* StreamingErrors.ERROR_UNKNOWN_CLIENT_ID */) {
|
|
79
82
|
callback(message);
|
|
80
83
|
return;
|
|
81
84
|
}
|
|
@@ -84,39 +87,23 @@ class StreamingClient {
|
|
|
84
87
|
throw new Error(message.error);
|
|
85
88
|
}
|
|
86
89
|
callback(message);
|
|
87
|
-
}
|
|
90
|
+
}
|
|
88
91
|
});
|
|
89
92
|
}
|
|
90
|
-
get subscribedTestRunIdPromise() {
|
|
91
|
-
return this.subscribedTestRunIdDeferred.promise;
|
|
92
|
-
}
|
|
93
|
-
removeTrailingSlashURL(instanceUrl) {
|
|
94
|
-
return instanceUrl ? instanceUrl.replace(/\/+$/, '') : '';
|
|
95
|
-
}
|
|
96
|
-
getStreamURL(instanceUrl) {
|
|
97
|
-
const urlElements = [
|
|
98
|
-
this.removeTrailingSlashURL(instanceUrl),
|
|
99
|
-
'cometd',
|
|
100
|
-
this.apiVersion
|
|
101
|
-
];
|
|
102
|
-
return urlElements.join('/');
|
|
103
|
-
}
|
|
104
93
|
// NOTE: There's an intermittent auth issue with Streaming API that requires the connection to be refreshed
|
|
105
94
|
// The builtin org.refreshAuth() util only refreshes the connection associated with the instance of the org you provide, not all connections associated with that username's orgs
|
|
106
|
-
init() {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
116
|
-
});
|
|
95
|
+
async init() {
|
|
96
|
+
await (0, utils_1.refreshAuth)(this.conn);
|
|
97
|
+
const accessToken = this.conn.getConnectionOptions().accessToken;
|
|
98
|
+
if (accessToken) {
|
|
99
|
+
this.client.setHeader('Authorization', `OAuth ${accessToken}`);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
throw new Error(i18n_1.nls.localize('noAccessTokenFound'));
|
|
103
|
+
}
|
|
117
104
|
}
|
|
118
105
|
handshake() {
|
|
119
|
-
return new Promise(resolve => {
|
|
106
|
+
return new Promise((resolve) => {
|
|
120
107
|
this.client.handshake(() => {
|
|
121
108
|
resolve();
|
|
122
109
|
});
|
|
@@ -126,53 +113,29 @@ class StreamingClient {
|
|
|
126
113
|
this.client.disconnect();
|
|
127
114
|
this.hasDisconnected = true;
|
|
128
115
|
}
|
|
129
|
-
subscribe(action, testRunId) {
|
|
130
|
-
return
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
queueItem: result
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
}));
|
|
145
|
-
if (action) {
|
|
146
|
-
action()
|
|
147
|
-
.then(id => {
|
|
148
|
-
this.subscribedTestRunId = id;
|
|
149
|
-
this.subscribedTestRunIdDeferred.resolve(id);
|
|
150
|
-
if (!this.hasDisconnected) {
|
|
151
|
-
intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
|
|
152
|
-
const result = yield this.getCompletedTestRun(id);
|
|
153
|
-
if (result) {
|
|
154
|
-
this.disconnect();
|
|
155
|
-
clearInterval(intervalId);
|
|
156
|
-
subscriptionResolve({
|
|
157
|
-
runId: this.subscribedTestRunId,
|
|
158
|
-
queueItem: result
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
}), types_1.RetreiveResultsInterval);
|
|
162
|
-
}
|
|
163
|
-
})
|
|
164
|
-
.catch(e => {
|
|
165
|
-
this.disconnect();
|
|
166
|
-
clearInterval(intervalId);
|
|
167
|
-
subscriptionReject(e);
|
|
116
|
+
async subscribe(action, testRunId) {
|
|
117
|
+
return new Promise((subscriptionResolve, subscriptionReject) => {
|
|
118
|
+
let intervalId;
|
|
119
|
+
try {
|
|
120
|
+
this.client.subscribe(TEST_RESULT_CHANNEL, async (message) => {
|
|
121
|
+
const result = await this.handler(message);
|
|
122
|
+
if (result) {
|
|
123
|
+
this.disconnect();
|
|
124
|
+
clearInterval(intervalId);
|
|
125
|
+
subscriptionResolve({
|
|
126
|
+
runId: this.subscribedTestRunId,
|
|
127
|
+
queueItem: result
|
|
168
128
|
});
|
|
169
129
|
}
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
130
|
+
});
|
|
131
|
+
if (action) {
|
|
132
|
+
action()
|
|
133
|
+
.then((id) => {
|
|
134
|
+
this.subscribedTestRunId = id;
|
|
135
|
+
this.subscribedTestRunIdDeferred.resolve(id);
|
|
173
136
|
if (!this.hasDisconnected) {
|
|
174
|
-
intervalId = setInterval(() =>
|
|
175
|
-
const result =
|
|
137
|
+
intervalId = setInterval(async () => {
|
|
138
|
+
const result = await this.getCompletedTestRun(id);
|
|
176
139
|
if (result) {
|
|
177
140
|
this.disconnect();
|
|
178
141
|
clearInterval(intervalId);
|
|
@@ -181,16 +144,38 @@ class StreamingClient {
|
|
|
181
144
|
queueItem: result
|
|
182
145
|
});
|
|
183
146
|
}
|
|
184
|
-
}
|
|
147
|
+
}, types_1.RetrieveResultsInterval);
|
|
185
148
|
}
|
|
186
|
-
}
|
|
149
|
+
})
|
|
150
|
+
.catch((e) => {
|
|
151
|
+
this.disconnect();
|
|
152
|
+
clearInterval(intervalId);
|
|
153
|
+
subscriptionReject(e);
|
|
154
|
+
});
|
|
187
155
|
}
|
|
188
|
-
|
|
189
|
-
this.
|
|
190
|
-
|
|
191
|
-
|
|
156
|
+
else {
|
|
157
|
+
this.subscribedTestRunId = testRunId;
|
|
158
|
+
this.subscribedTestRunIdDeferred.resolve(testRunId);
|
|
159
|
+
if (!this.hasDisconnected) {
|
|
160
|
+
intervalId = setInterval(async () => {
|
|
161
|
+
const result = await this.getCompletedTestRun(testRunId);
|
|
162
|
+
if (result) {
|
|
163
|
+
this.disconnect();
|
|
164
|
+
clearInterval(intervalId);
|
|
165
|
+
subscriptionResolve({
|
|
166
|
+
runId: this.subscribedTestRunId,
|
|
167
|
+
queueItem: result
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
}, types_1.RetrieveResultsInterval);
|
|
171
|
+
}
|
|
192
172
|
}
|
|
193
|
-
}
|
|
173
|
+
}
|
|
174
|
+
catch (e) {
|
|
175
|
+
this.disconnect();
|
|
176
|
+
clearInterval(intervalId);
|
|
177
|
+
subscriptionReject(e);
|
|
178
|
+
}
|
|
194
179
|
});
|
|
195
180
|
}
|
|
196
181
|
isValidTestRunID(testRunId, subscribedId) {
|
|
@@ -204,51 +189,45 @@ class StreamingClient {
|
|
|
204
189
|
}
|
|
205
190
|
return true;
|
|
206
191
|
}
|
|
207
|
-
handler(message, runId) {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
const testRunId = runId || message.sobject.Id;
|
|
211
|
-
if (!this.isValidTestRunID(testRunId, this.subscribedTestRunId)) {
|
|
212
|
-
return null;
|
|
213
|
-
}
|
|
214
|
-
const result = yield this.getCompletedTestRun(testRunId);
|
|
215
|
-
if (result) {
|
|
216
|
-
return result;
|
|
217
|
-
}
|
|
218
|
-
(_a = this.progress) === null || _a === void 0 ? void 0 : _a.report({
|
|
219
|
-
type: 'StreamingClientProgress',
|
|
220
|
-
value: 'streamingProcessingTestRun',
|
|
221
|
-
message: i18n_1.nls.localize('streamingProcessingTestRun', testRunId),
|
|
222
|
-
testRunId
|
|
223
|
-
});
|
|
192
|
+
async handler(message, runId) {
|
|
193
|
+
const testRunId = runId || message.sobject.Id;
|
|
194
|
+
if (!this.isValidTestRunID(testRunId, this.subscribedTestRunId)) {
|
|
224
195
|
return null;
|
|
196
|
+
}
|
|
197
|
+
const result = await this.getCompletedTestRun(testRunId);
|
|
198
|
+
if (result) {
|
|
199
|
+
return result;
|
|
200
|
+
}
|
|
201
|
+
this.progress?.report({
|
|
202
|
+
type: 'StreamingClientProgress',
|
|
203
|
+
value: 'streamingProcessingTestRun',
|
|
204
|
+
message: i18n_1.nls.localize('streamingProcessingTestRun', testRunId),
|
|
205
|
+
testRunId
|
|
225
206
|
});
|
|
207
|
+
return null;
|
|
226
208
|
}
|
|
227
|
-
getCompletedTestRun(testRunId) {
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
type: 'TestQueueProgress',
|
|
239
|
-
value: result
|
|
240
|
-
});
|
|
241
|
-
for (let i = 0; i < result.records.length; i++) {
|
|
242
|
-
const item = result.records[i];
|
|
243
|
-
if (item.Status === "Queued" /* Queued */ ||
|
|
244
|
-
item.Status === "Holding" /* Holding */ ||
|
|
245
|
-
item.Status === "Preparing" /* Preparing */ ||
|
|
246
|
-
item.Status === "Processing" /* Processing */) {
|
|
247
|
-
return null;
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
return result;
|
|
209
|
+
async getCompletedTestRun(testRunId) {
|
|
210
|
+
const queryApexTestQueueItem = `SELECT Id, Status, ApexClassId, TestRunResultId FROM ApexTestQueueItem WHERE ParentJobId = '${testRunId}'`;
|
|
211
|
+
const result = await this.conn.tooling.query(queryApexTestQueueItem, {
|
|
212
|
+
autoFetch: true
|
|
213
|
+
});
|
|
214
|
+
if (result.records.length === 0) {
|
|
215
|
+
throw new Error(i18n_1.nls.localize('noTestQueueResults', testRunId));
|
|
216
|
+
}
|
|
217
|
+
this.progress?.report({
|
|
218
|
+
type: 'TestQueueProgress',
|
|
219
|
+
value: result
|
|
251
220
|
});
|
|
221
|
+
for (let i = 0; i < result.records.length; i++) {
|
|
222
|
+
const item = result.records[i];
|
|
223
|
+
if (item.Status === "Queued" /* ApexTestQueueItemStatus.Queued */ ||
|
|
224
|
+
item.Status === "Holding" /* ApexTestQueueItemStatus.Holding */ ||
|
|
225
|
+
item.Status === "Preparing" /* ApexTestQueueItemStatus.Preparing */ ||
|
|
226
|
+
item.Status === "Processing" /* ApexTestQueueItemStatus.Processing */) {
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return result;
|
|
252
231
|
}
|
|
253
232
|
}
|
|
254
233
|
exports.StreamingClient = StreamingClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamingClient.js","sourceRoot":"","sources":["../../../src/streaming/streamingClient.ts"],"names":[],"mappings":";AAAA;;;;;GAKG
|
|
1
|
+
{"version":3,"file":"streamingClient.js","sourceRoot":"","sources":["../../../src/streaming/streamingClient.ts"],"names":[],"mappings":"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"}
|