@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
|
@@ -4,15 +4,6 @@
|
|
|
4
4
|
* Licensed under the MIT License.
|
|
5
5
|
* See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
|
|
6
6
|
*--------------------------------------------------------------------------------------------*/
|
|
7
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
8
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
9
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
11
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
12
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
13
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
14
|
-
});
|
|
15
|
-
};
|
|
16
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
8
|
exports.CancellationTokenSource = void 0;
|
|
18
9
|
class Token {
|
|
@@ -33,14 +24,12 @@ class CancellationTokenSource {
|
|
|
33
24
|
constructor() {
|
|
34
25
|
this.token = new Token();
|
|
35
26
|
}
|
|
36
|
-
asyncCancel() {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
this.token.callbacks = [];
|
|
43
|
-
});
|
|
27
|
+
async asyncCancel() {
|
|
28
|
+
this.token.isCancellationRequested = true;
|
|
29
|
+
for (const callback of this.token.callbacks) {
|
|
30
|
+
await callback();
|
|
31
|
+
}
|
|
32
|
+
this.token.callbacks = [];
|
|
44
33
|
}
|
|
45
34
|
}
|
|
46
35
|
exports.CancellationTokenSource = CancellationTokenSource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../../src/common/cancellation.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG
|
|
1
|
+
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../../src/common/cancellation.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG;;;AA2BhG,MAAM,KAAK;IAAX;QACS,4BAAuB,GAAG,KAAK,CAAC;QAChC,cAAS,GAAe,EAAE,CAAC;IAQpC,CAAC;IAPC,uBAAuB,CAAC,QAAkB;QACxC,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,QAAQ,EAAE,CAAC;QACb,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;CACF;AAED,MAAa,uBAAuB;IAApC;QACE,UAAK,GAAU,IAAI,KAAK,EAAE,CAAC;IAQ7B,CAAC;IAPC,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,KAAK,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAC1C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,MAAM,QAAQ,EAAE,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;IAC5B,CAAC;CACF;AATD,0DASC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ExecuteService = void 0;
|
|
13
4
|
const fs_1 = require("fs");
|
|
@@ -20,45 +11,41 @@ class ExecuteService {
|
|
|
20
11
|
constructor(connection) {
|
|
21
12
|
this.connection = connection;
|
|
22
13
|
}
|
|
23
|
-
executeAnonymous(options) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
14
|
+
async executeAnonymous(options) {
|
|
15
|
+
const data = await this.getApexCode(options);
|
|
16
|
+
let count = 0;
|
|
17
|
+
while (count < 2) {
|
|
18
|
+
try {
|
|
19
|
+
const request = this.buildExecRequest(data);
|
|
20
|
+
const result = await this.connectionRequest(request);
|
|
21
|
+
return this.jsonFormat(result);
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
if (e.name === 'ERROR_HTTP_500' &&
|
|
25
|
+
e.message &&
|
|
26
|
+
e.message.includes('INVALID_SESSION_ID')) {
|
|
27
|
+
await (0, utils_1.refreshAuth)(this.connection);
|
|
28
|
+
count += 1;
|
|
32
29
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
e.message &&
|
|
36
|
-
e.message.includes('INVALID_SESSION_ID')) {
|
|
37
|
-
yield (0, utils_1.refreshAuth)(this.connection);
|
|
38
|
-
count += 1;
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
throw new Error(i18n_1.nls.localize('unexpectedExecuteCommandError', e.message));
|
|
42
|
-
}
|
|
30
|
+
else {
|
|
31
|
+
throw new Error(i18n_1.nls.localize('unexpectedExecuteCommandError', e.message));
|
|
43
32
|
}
|
|
44
33
|
}
|
|
45
|
-
}
|
|
34
|
+
}
|
|
46
35
|
}
|
|
47
|
-
getApexCode(options) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
});
|
|
36
|
+
async getApexCode(options) {
|
|
37
|
+
if (options.apexCode) {
|
|
38
|
+
return String(options.apexCode);
|
|
39
|
+
}
|
|
40
|
+
else if (options.apexFilePath) {
|
|
41
|
+
return this.readApexFile(options.apexFilePath);
|
|
42
|
+
}
|
|
43
|
+
else if (options.userInput) {
|
|
44
|
+
return await this.getUserInput();
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
throw new Error(i18n_1.nls.localize('optionExecAnonError'));
|
|
48
|
+
}
|
|
62
49
|
}
|
|
63
50
|
readApexFile(filepath) {
|
|
64
51
|
if (!(0, fs_1.existsSync)(filepath)) {
|
|
@@ -66,27 +53,25 @@ class ExecuteService {
|
|
|
66
53
|
}
|
|
67
54
|
return (0, fs_1.readFileSync)(filepath, 'utf8');
|
|
68
55
|
}
|
|
69
|
-
getUserInput() {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
reject(new Error(i18n_1.nls.localize('unexpectedExecAnonInputError', err.message)));
|
|
89
|
-
});
|
|
56
|
+
async getUserInput() {
|
|
57
|
+
process.stdout.write(i18n_1.nls.localize('execAnonInputPrompt'));
|
|
58
|
+
return new Promise((resolve, reject) => {
|
|
59
|
+
const readInterface = readline.createInterface(process.stdin, process.stdout);
|
|
60
|
+
const timeout = setTimeout(() => {
|
|
61
|
+
reject(new Error(i18n_1.nls.localize('execAnonInputTimeout')));
|
|
62
|
+
readInterface.close();
|
|
63
|
+
}, 60000);
|
|
64
|
+
let apexCode = '';
|
|
65
|
+
readInterface.on('line', (input) => {
|
|
66
|
+
timeout.refresh();
|
|
67
|
+
apexCode = apexCode + input + '\n';
|
|
68
|
+
});
|
|
69
|
+
readInterface.on('close', () => {
|
|
70
|
+
resolve(apexCode);
|
|
71
|
+
clearTimeout(timeout);
|
|
72
|
+
});
|
|
73
|
+
readInterface.on('error', (err) => {
|
|
74
|
+
reject(new Error(i18n_1.nls.localize('unexpectedExecAnonInputError', err.message)));
|
|
90
75
|
});
|
|
91
76
|
});
|
|
92
77
|
}
|
|
@@ -133,10 +118,8 @@ class ExecuteService {
|
|
|
133
118
|
}
|
|
134
119
|
return formattedResponse;
|
|
135
120
|
}
|
|
136
|
-
connectionRequest(requestData) {
|
|
137
|
-
return
|
|
138
|
-
return (yield this.connection.request(requestData));
|
|
139
|
-
});
|
|
121
|
+
async connectionRequest(requestData) {
|
|
122
|
+
return (await this.connection.request(requestData));
|
|
140
123
|
}
|
|
141
124
|
}
|
|
142
125
|
exports.ExecuteService = ExecuteService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeService.js","sourceRoot":"","sources":["../../../src/execute/executeService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executeService.js","sourceRoot":"","sources":["../../../src/execute/executeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ApexDiagnostic, CommonOptions } from '../utils';
|
|
3
|
-
export
|
|
3
|
+
export type ApexExecuteOptions = CommonOptions & {
|
|
4
4
|
targetUsername?: string;
|
|
5
5
|
apexFilePath?: string;
|
|
6
6
|
apexCode?: string | Buffer;
|
|
@@ -35,13 +35,13 @@ export interface RequestData {
|
|
|
35
35
|
body: string;
|
|
36
36
|
headers: {};
|
|
37
37
|
}
|
|
38
|
-
export
|
|
38
|
+
export type ExecuteAnonymousResponse = {
|
|
39
39
|
compiled: boolean;
|
|
40
40
|
success: boolean;
|
|
41
41
|
logs?: string;
|
|
42
42
|
diagnostic?: ApexDiagnostic[];
|
|
43
43
|
};
|
|
44
|
-
export
|
|
44
|
+
export type ExecAnonApiResponse = {
|
|
45
45
|
column: number;
|
|
46
46
|
compiled: string;
|
|
47
47
|
compileProblem: string | object;
|
package/lib/src/execute/utils.js
CHANGED
|
@@ -10,7 +10,7 @@ exports.encodeBody = void 0;
|
|
|
10
10
|
const types_1 = require("./types");
|
|
11
11
|
const util = require("util");
|
|
12
12
|
function escapeXml(data) {
|
|
13
|
-
return data.replace(/[<>&'"]/g, char => {
|
|
13
|
+
return data.replace(/[<>&'"]/g, (char) => {
|
|
14
14
|
return types_1.xmlCharMap[char];
|
|
15
15
|
});
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/execute/utils.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAA2D;AAC3D,6BAA6B;AAE7B,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/execute/utils.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAA2D;AAC3D,6BAA6B;AAE7B,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,OAAO,kBAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,UAAU,CAAC,WAAmB,EAAE,IAAY;IAC1D,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,aAAa,WAAW,aAAa,CAAC;IACzD,MAAM,WAAW,GACf,2FAA2F,CAAC;IAC9F,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CACtB,oBAAY,EACZ,WAAW,EACX,WAAW,EACX,cAAM,EACN,UAAU,EACV,cAAM,CACP,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,gCAcC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/i18n/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAAkC;AAClC,iDAAuD;AAEvD,SAAS,iBAAiB;IACxB,IAAI;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/i18n/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAAkC;AAClC,iDAAuD;AAEvD,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,sBAAO,CAAC,eAAQ,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAEY,QAAA,GAAG,GAAG,IAAI,2BAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC;AACzD,+CAAuD;AAA9C,4GAAA,YAAY,OAAA;AAAE,uGAAA,OAAO,OAAA"}
|
|
@@ -6,7 +6,7 @@ export declare class Localization implements LocalizationProvider {
|
|
|
6
6
|
constructor(delegate: Message);
|
|
7
7
|
localize(label: string, args?: string | string[]): string;
|
|
8
8
|
}
|
|
9
|
-
export
|
|
9
|
+
export type MessageBundle = {
|
|
10
10
|
readonly [index: string]: string;
|
|
11
11
|
};
|
|
12
12
|
export declare class Message implements LocalizationProvider {
|
|
@@ -39,7 +39,7 @@ class Message {
|
|
|
39
39
|
console.warn(`Missing label for key: ${label}`);
|
|
40
40
|
possibleLabel = `${MISSING_LABEL_MSG} ${label}`;
|
|
41
41
|
if (Array.isArray(args) && args.length >= 1) {
|
|
42
|
-
args.forEach(arg => {
|
|
42
|
+
args.forEach((arg) => {
|
|
43
43
|
possibleLabel += ` (${arg})`;
|
|
44
44
|
});
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localization.js","sourceRoot":"","sources":["../../../src/i18n/localization.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAMlD,MAAa,YAAY;IAGvB,YAAmB,QAAiB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAVD,oCAUC;AAMD,MAAa,OAAO;IAGlB,YAAmB,QAAuB;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,aAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"localization.js","sourceRoot":"","sources":["../../../src/i18n/localization.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAMlD,MAAa,YAAY;IAGvB,YAAmB,QAAiB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAVD,oCAUC;AAMD,MAAa,OAAO;IAGlB,YAAmB,QAAuB;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,aAAa,EAAE,CAAC;YACjD,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,oFAAoF;QACpF,8BAA8B;QAC9B,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/D,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;YAChD,aAAa,GAAG,GAAG,iBAAiB,IAAI,KAAK,EAAE,CAAC;YAEhD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACnB,aAAa,IAAI,KAAK,GAAG,GAAG,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC5C,MAAM,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7D,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,EAAE,CAAC;gBACpC,sEAAsE;gBACtE,OAAO,CAAC,GAAG,CACT,qCAAqC,KAAK,UAAU,IAAI,CAAC,MAAM,aAAa,eAAe,EAAE,CAC9F,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5B,yCAAyC;YACzC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,QAAQ,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;CACF;AA1DD,0BA0DC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Connection, Org, StreamingClient } from '@salesforce/core';
|
|
2
2
|
import { AnyJson } from '@salesforce/ts-types';
|
|
3
3
|
import { ApexLogGetOptions, LogRecord, LogResult } from './types';
|
|
4
|
-
|
|
4
|
+
type StreamingLogMessage = {
|
|
5
5
|
errorName?: string;
|
|
6
6
|
sobject: {
|
|
7
7
|
Id: string;
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.LogService = void 0;
|
|
13
4
|
/*
|
|
@@ -27,125 +18,106 @@ class LogService {
|
|
|
27
18
|
constructor(connection) {
|
|
28
19
|
this.connection = connection;
|
|
29
20
|
}
|
|
30
|
-
getLogIds(options) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return [options.logId];
|
|
41
|
-
});
|
|
21
|
+
async getLogIds(options) {
|
|
22
|
+
if (!(typeof options.logId === 'string' ||
|
|
23
|
+
typeof options.numberOfLogs === 'number')) {
|
|
24
|
+
throw new Error(i18n_1.nls.localize('missingInfoLogError'));
|
|
25
|
+
}
|
|
26
|
+
if (typeof options.numberOfLogs === 'number') {
|
|
27
|
+
const logIdRecordList = await this.getLogRecords(options.numberOfLogs);
|
|
28
|
+
return logIdRecordList.map((logRecord) => logRecord.Id);
|
|
29
|
+
}
|
|
30
|
+
return [options.logId];
|
|
42
31
|
}
|
|
43
32
|
// TODO: readableStream cannot be used until updates are made in jsforce and sfdx-core
|
|
44
|
-
getLogs(options) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
(0, utils_1.createFile)(logPath, logRecord);
|
|
55
|
-
}
|
|
56
|
-
return String(logRecord);
|
|
57
|
-
}));
|
|
58
|
-
const logs = yield Promise.all(connectionRequests);
|
|
59
|
-
if (logPaths.length > 0) {
|
|
60
|
-
const logMap = [];
|
|
61
|
-
for (let i = 0; i < logs.length; i++) {
|
|
62
|
-
logMap.push({ log: logs[i], logPath: logPaths[i] });
|
|
63
|
-
}
|
|
64
|
-
return logMap;
|
|
33
|
+
async getLogs(options) {
|
|
34
|
+
const logIdList = await this.getLogIds(options);
|
|
35
|
+
const logPaths = [];
|
|
36
|
+
const connectionRequests = logIdList.map(async (id) => {
|
|
37
|
+
const url = `${this.connection.tooling._baseUrl()}/sobjects/ApexLog/${id}/Body`;
|
|
38
|
+
const logRecord = await this.toolingRequest(url);
|
|
39
|
+
if (options.outputDir) {
|
|
40
|
+
const logPath = path.join(options.outputDir, `${id}.log`);
|
|
41
|
+
logPaths.push(logPath);
|
|
42
|
+
(0, utils_1.createFile)(logPath, logRecord);
|
|
65
43
|
}
|
|
66
|
-
return
|
|
67
|
-
return { log };
|
|
68
|
-
});
|
|
44
|
+
return String(logRecord);
|
|
69
45
|
});
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
return
|
|
46
|
+
const logs = await Promise.all(connectionRequests);
|
|
47
|
+
if (logPaths.length > 0) {
|
|
48
|
+
const logMap = [];
|
|
49
|
+
for (let i = 0; i < logs.length; i++) {
|
|
50
|
+
logMap.push({ log: logs[i], logPath: logPaths[i] });
|
|
51
|
+
}
|
|
52
|
+
return logMap;
|
|
53
|
+
}
|
|
54
|
+
return logs.map((log) => {
|
|
55
|
+
return { log };
|
|
77
56
|
});
|
|
78
57
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
58
|
+
async getLogById(logId) {
|
|
59
|
+
const baseUrl = this.connection.tooling._baseUrl();
|
|
60
|
+
const url = `${baseUrl}/sobjects/ApexLog/${logId}/Body`;
|
|
61
|
+
const response = (await this.connection.tooling.request(url));
|
|
62
|
+
return { log: response.toString() || '' };
|
|
63
|
+
}
|
|
64
|
+
async getLogRecords(numberOfLogs) {
|
|
65
|
+
let apexLogQuery = `
|
|
82
66
|
SELECT Id, Application, DurationMilliseconds, Location, LogLength, LogUser.Name,
|
|
83
67
|
Operation, Request, StartTime, Status
|
|
84
68
|
FROM ApexLog
|
|
85
69
|
ORDER BY StartTime DESC
|
|
86
70
|
`;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
91
|
-
numberOfLogs = Math.min(numberOfLogs, constants_1.MAX_NUM_LOGS);
|
|
92
|
-
apexLogQuery += ` LIMIT ${numberOfLogs}`;
|
|
71
|
+
if (typeof numberOfLogs === 'number') {
|
|
72
|
+
if (numberOfLogs <= 0) {
|
|
73
|
+
throw new Error(i18n_1.nls.localize('numLogsError'));
|
|
93
74
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}
|
|
75
|
+
numberOfLogs = Math.min(numberOfLogs, constants_1.MAX_NUM_LOGS);
|
|
76
|
+
apexLogQuery += ` LIMIT ${numberOfLogs}`;
|
|
77
|
+
}
|
|
78
|
+
const response = (await this.connection.tooling.query(apexLogQuery));
|
|
79
|
+
return response.records;
|
|
97
80
|
}
|
|
98
|
-
tail(org, tailer) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
this.logger.debug(i18n_1.nls.localize('subscribeStarted'));
|
|
108
|
-
}));
|
|
81
|
+
async tail(org, tailer) {
|
|
82
|
+
this.logger = await core_1.Logger.child('apexLogApi', { tag: 'tail' });
|
|
83
|
+
this.logTailer = tailer;
|
|
84
|
+
const stream = await this.createStreamingClient(org);
|
|
85
|
+
this.logger.debug(i18n_1.nls.localize('startHandshake'));
|
|
86
|
+
await stream.handshake();
|
|
87
|
+
this.logger.debug(i18n_1.nls.localize('finishHandshake'));
|
|
88
|
+
await stream.subscribe(async () => {
|
|
89
|
+
this.logger.debug(i18n_1.nls.localize('subscribeStarted'));
|
|
109
90
|
});
|
|
110
91
|
}
|
|
111
|
-
createStreamingClient(org) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
return yield core_1.StreamingClient.create(options);
|
|
116
|
-
});
|
|
92
|
+
async createStreamingClient(org) {
|
|
93
|
+
const options = new core_1.StreamingClient.DefaultOptions(org, constants_1.STREAMING_LOG_TOPIC, this.streamingCallback.bind(this));
|
|
94
|
+
options.setSubscribeTimeout(kit_1.Duration.minutes(constants_1.LOG_TIMER_LENGTH_MINUTES));
|
|
95
|
+
return await core_1.StreamingClient.create(options);
|
|
117
96
|
}
|
|
118
|
-
logCallback(message) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
this.logTailer(log.log);
|
|
124
|
-
}
|
|
97
|
+
async logCallback(message) {
|
|
98
|
+
if (message.sobject && message.sobject.Id) {
|
|
99
|
+
const log = await this.getLogById(message.sobject.Id);
|
|
100
|
+
if (log && this.logTailer) {
|
|
101
|
+
this.logTailer(log.log);
|
|
125
102
|
}
|
|
126
|
-
}
|
|
103
|
+
}
|
|
127
104
|
}
|
|
128
105
|
streamingCallback(message) {
|
|
129
|
-
var _a;
|
|
130
106
|
if (message.errorName === constants_1.LISTENER_ABORTED_ERROR_NAME) {
|
|
131
107
|
return { completed: true };
|
|
132
108
|
}
|
|
133
|
-
if (
|
|
109
|
+
if (message.sobject?.Id) {
|
|
134
110
|
this.logCallback(message);
|
|
135
111
|
}
|
|
136
112
|
return { completed: false };
|
|
137
113
|
}
|
|
138
|
-
prepareTraceFlag(requestedDebugLevel) {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
yield flags.ensureTraceFlags(requestedDebugLevel);
|
|
142
|
-
});
|
|
114
|
+
async prepareTraceFlag(requestedDebugLevel) {
|
|
115
|
+
const flags = new traceFlags_1.TraceFlags(this.connection);
|
|
116
|
+
await flags.ensureTraceFlags(requestedDebugLevel);
|
|
143
117
|
}
|
|
144
|
-
toolingRequest(url) {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
return log;
|
|
148
|
-
});
|
|
118
|
+
async toolingRequest(url) {
|
|
119
|
+
const log = (await this.connection.tooling.request(url));
|
|
120
|
+
return log;
|
|
149
121
|
}
|
|
150
122
|
}
|
|
151
123
|
exports.LogService = LogService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logService.js","sourceRoot":"","sources":["../../../src/logs/logService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logService.js","sourceRoot":"","sources":["../../../src/logs/logService.ts"],"names":[],"mappings":"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"}
|
package/lib/src/logs/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CommonOptions } from '../utils';
|
|
2
|
-
export
|
|
2
|
+
export type ApexLogGetOptions = CommonOptions & {
|
|
3
3
|
numberOfLogs?: number;
|
|
4
4
|
logId?: string;
|
|
5
5
|
outputDir?: string;
|
|
@@ -46,10 +46,10 @@ export interface LogRecord {
|
|
|
46
46
|
*/
|
|
47
47
|
Status: string;
|
|
48
48
|
}
|
|
49
|
-
export
|
|
49
|
+
export type LogQueryResult = {
|
|
50
50
|
records: LogRecord[];
|
|
51
51
|
};
|
|
52
|
-
export
|
|
52
|
+
export type LogResult = {
|
|
53
53
|
logPath?: string;
|
|
54
54
|
log: string;
|
|
55
55
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ApexCodeCoverage, ApexCodeCoverageAggregate } from '../tests/types';
|
|
2
2
|
import * as libReport from 'istanbul-lib-report';
|
|
3
3
|
import * as reports from 'istanbul-reports';
|
|
4
|
-
export
|
|
4
|
+
export type CoverageReportFormats = Exclude<reports.ReportType, 'lcov' | 'text-lcov'>;
|
|
5
5
|
export declare const DefaultWatermarks: libReport.Watermarks;
|
|
6
6
|
export declare const DefaultReportOptions: Omit<reports.ReportOptions, 'lcov' | 'text-lcov'>;
|
|
7
7
|
export interface CoverageReporterOptions {
|