@salesforce/plugin-info 2.4.7 → 2.5.1
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/commands/doctor.js +23 -8
- package/lib/commands/doctor.js.map +1 -1
- package/lib/doctor.d.ts +22 -1
- package/lib/doctor.js +54 -4
- package/lib/doctor.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +8 -8
package/lib/commands/doctor.js
CHANGED
|
@@ -165,14 +165,29 @@ ${this.doctor
|
|
|
165
165
|
this.log(`${cmdString}\n`);
|
|
166
166
|
this.doctor.addCommandName(cmdString);
|
|
167
167
|
const execPromise = new Promise((resolve) => {
|
|
168
|
-
const
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
168
|
+
const stdoutLogLocation = this.doctor.getDoctoredFilePath(path.join(this.outputDir, 'command-stdout.log'));
|
|
169
|
+
const debugLogLocation = this.doctor.getDoctoredFilePath(path.join(this.outputDir, 'command-debug.log'));
|
|
170
|
+
this.doctor.createStdoutWriteStream(stdoutLogLocation);
|
|
171
|
+
this.doctor.createStderrWriteStream(debugLogLocation);
|
|
172
|
+
const cp = (0, child_process_1.spawn)(cmdString, [], { shell: true, env: Object.assign({}, process.env) });
|
|
173
|
+
cp.on('error', (err) => {
|
|
174
|
+
this.log(`Error executing command: ${err.message}`);
|
|
175
|
+
// no-op
|
|
176
|
+
});
|
|
177
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
178
|
+
cp.stdout.on('data', async (data) => {
|
|
179
|
+
await this.doctor.writeStdout(data.toString());
|
|
180
|
+
});
|
|
181
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
182
|
+
cp.stderr.on('data', async (data) => {
|
|
183
|
+
await this.doctor.writeStderr(data.toString());
|
|
184
|
+
});
|
|
185
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
186
|
+
cp.on('exit', async (code) => {
|
|
187
|
+
this.doctor.setExitCode(code);
|
|
188
|
+
await this.doctor.writeStdout(`\nCommand exit code: ${code}\n`);
|
|
189
|
+
this.doctor.closeStdout();
|
|
190
|
+
this.doctor.closeStderr();
|
|
176
191
|
this.filesWrittenMsgs.push(`Wrote command stdout log to: ${stdoutLogLocation}`);
|
|
177
192
|
this.filesWrittenMsgs.push(`Wrote command debug log to: ${debugLogLocation}`);
|
|
178
193
|
resolve();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|
package/lib/doctor.d.ts
CHANGED
|
@@ -4,12 +4,20 @@ import { VersionDetail } from '@oclif/plugin-version';
|
|
|
4
4
|
import { DiagnosticStatus } from './diagnostics';
|
|
5
5
|
export interface SfDoctor {
|
|
6
6
|
addCommandName(commandName: string): void;
|
|
7
|
-
addSuggestion(suggestion: string): void;
|
|
8
7
|
addDiagnosticStatus(status: DiagnosticStatus): void;
|
|
9
8
|
addPluginData(pluginName: string, data: AnyJson): void;
|
|
9
|
+
addSuggestion(suggestion: string): void;
|
|
10
|
+
closeStderr(): void;
|
|
11
|
+
closeStdout(): void;
|
|
12
|
+
createStderrWriteStream(fullPath: string): void;
|
|
13
|
+
createStdoutWriteStream(fullPath: string): void;
|
|
10
14
|
diagnose(): Array<Promise<void>>;
|
|
11
15
|
getDiagnosis(): SfDoctorDiagnosis;
|
|
16
|
+
getDoctoredFilePath(filePath: string): string;
|
|
17
|
+
setExitCode(code: string | number): void;
|
|
12
18
|
writeFileSync(filePath: string, contents: string): string;
|
|
19
|
+
writeStderr(contents: string): Promise<boolean>;
|
|
20
|
+
writeStdout(contents: string): Promise<boolean>;
|
|
13
21
|
}
|
|
14
22
|
type CliConfig = Partial<Config> & {
|
|
15
23
|
nodeEngine: string;
|
|
@@ -25,12 +33,15 @@ export interface SfDoctorDiagnosis {
|
|
|
25
33
|
diagnosticResults: DiagnosticStatus[];
|
|
26
34
|
suggestions: string[];
|
|
27
35
|
commandName?: string;
|
|
36
|
+
commandExitCode?: string | number;
|
|
28
37
|
logFilePaths: string[];
|
|
29
38
|
}
|
|
30
39
|
export declare class Doctor implements SfDoctor {
|
|
31
40
|
private static instance;
|
|
32
41
|
readonly id: number;
|
|
33
42
|
private diagnosis;
|
|
43
|
+
private stdoutWriteStream;
|
|
44
|
+
private stderrWriteStream;
|
|
34
45
|
private constructor();
|
|
35
46
|
/**
|
|
36
47
|
* Returns a singleton instance of an SfDoctor.
|
|
@@ -93,5 +104,15 @@ export declare class Doctor implements SfDoctor {
|
|
|
93
104
|
* @return The full path to the file.
|
|
94
105
|
*/
|
|
95
106
|
writeFileSync(filePath: string, contents: string): string;
|
|
107
|
+
writeStdout(contents: string): Promise<boolean>;
|
|
108
|
+
writeStderr(contents: string): Promise<boolean>;
|
|
109
|
+
createStdoutWriteStream(fullPath: string): void;
|
|
110
|
+
createStderrWriteStream(fullPath: string): void;
|
|
111
|
+
closeStderr(): void;
|
|
112
|
+
closeStdout(): void;
|
|
113
|
+
getDoctoredFilePath(filePath: string): string;
|
|
114
|
+
setExitCode(code: string | number): void;
|
|
115
|
+
private writeFile;
|
|
116
|
+
private createOutputDir;
|
|
96
117
|
}
|
|
97
118
|
export {};
|
package/lib/doctor.js
CHANGED
|
@@ -39,6 +39,7 @@ class Doctor {
|
|
|
39
39
|
diagnosticResults: [],
|
|
40
40
|
suggestions: [...PINNED_SUGGESTIONS],
|
|
41
41
|
logFilePaths: [],
|
|
42
|
+
commandExitCode: 0,
|
|
42
43
|
};
|
|
43
44
|
}
|
|
44
45
|
/**
|
|
@@ -131,16 +132,65 @@ class Doctor {
|
|
|
131
132
|
* @return The full path to the file.
|
|
132
133
|
*/
|
|
133
134
|
writeFileSync(filePath, contents) {
|
|
135
|
+
const fullPath = this.getDoctoredFilePath(filePath);
|
|
136
|
+
this.createOutputDir(fullPath);
|
|
137
|
+
this.diagnosis.logFilePaths.push(fullPath);
|
|
138
|
+
fs.writeFileSync(fullPath, contents);
|
|
139
|
+
return fullPath;
|
|
140
|
+
}
|
|
141
|
+
writeStdout(contents) {
|
|
142
|
+
if (!this.stdoutWriteStream) {
|
|
143
|
+
throw new core_1.SfError(messages.getMessage('doctorNotInitializedError'), 'SfDoctorInitError');
|
|
144
|
+
}
|
|
145
|
+
return this.writeFile(this.stdoutWriteStream, contents);
|
|
146
|
+
}
|
|
147
|
+
writeStderr(contents) {
|
|
148
|
+
if (!this.stdoutWriteStream) {
|
|
149
|
+
throw new core_1.SfError(messages.getMessage('doctorNotInitializedError'), 'SfDoctorInitError');
|
|
150
|
+
}
|
|
151
|
+
return this.writeFile(this.stderrWriteStream, contents);
|
|
152
|
+
}
|
|
153
|
+
createStdoutWriteStream(fullPath) {
|
|
154
|
+
if (!this.stdoutWriteStream) {
|
|
155
|
+
this.createOutputDir(fullPath);
|
|
156
|
+
this.stdoutWriteStream = fs.createWriteStream(fullPath);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
createStderrWriteStream(fullPath) {
|
|
160
|
+
if (!this.stderrWriteStream) {
|
|
161
|
+
this.createOutputDir(fullPath);
|
|
162
|
+
this.stderrWriteStream = fs.createWriteStream(path.join(fullPath));
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
closeStderr() {
|
|
166
|
+
this.stderrWriteStream?.end();
|
|
167
|
+
this.stderrWriteStream?.close();
|
|
168
|
+
}
|
|
169
|
+
closeStdout() {
|
|
170
|
+
this.stdoutWriteStream?.end();
|
|
171
|
+
this.stdoutWriteStream?.close();
|
|
172
|
+
}
|
|
173
|
+
getDoctoredFilePath(filePath) {
|
|
134
174
|
const dir = path.dirname(filePath);
|
|
135
175
|
const fileName = `${this.id}-${path.basename(filePath)}`;
|
|
136
|
-
if (!fs.existsSync(dir)) {
|
|
137
|
-
fs.mkdirSync(dir, { recursive: true });
|
|
138
|
-
}
|
|
139
176
|
const fullPath = path.join(dir, fileName);
|
|
140
177
|
this.diagnosis.logFilePaths.push(fullPath);
|
|
141
|
-
fs.writeFileSync(fullPath, contents);
|
|
142
178
|
return fullPath;
|
|
143
179
|
}
|
|
180
|
+
setExitCode(code) {
|
|
181
|
+
this.diagnosis.commandExitCode = code;
|
|
182
|
+
}
|
|
183
|
+
// eslint-disable-next-line class-methods-use-this
|
|
184
|
+
writeFile(stream, contents) {
|
|
185
|
+
return Promise.resolve(stream.write(contents));
|
|
186
|
+
}
|
|
187
|
+
// eslint-disable-next-line class-methods-use-this
|
|
188
|
+
createOutputDir(fullPath) {
|
|
189
|
+
const dir = path.dirname(fullPath);
|
|
190
|
+
if (!fs.existsSync(dir)) {
|
|
191
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
192
|
+
}
|
|
193
|
+
}
|
|
144
194
|
}
|
|
145
195
|
exports.Doctor = Doctor;
|
|
146
196
|
//# sourceMappingURL=doctor.js.map
|
package/lib/doctor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,6BAA6B;AAC7B,2CAAqD;AACrD,yCAA4C;AAI5C,+CAA8D;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-info",
|
|
3
3
|
"description": "Plugin for accessing cli info from the command line",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.5.1",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"main": "lib/index.js",
|
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
"tslib": "^2"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@oclif/plugin-command-snapshot": "^3.3.
|
|
23
|
+
"@oclif/plugin-command-snapshot": "^3.3.8",
|
|
24
24
|
"@oclif/plugin-version": "1.2.1",
|
|
25
25
|
"@salesforce/cli-plugins-testkit": "^3.2.20",
|
|
26
26
|
"@salesforce/dev-config": "^3.1.0",
|
|
27
27
|
"@salesforce/dev-scripts": "^3.1.1",
|
|
28
|
-
"@salesforce/plugin-command-reference": "^1.
|
|
28
|
+
"@salesforce/plugin-command-reference": "^1.6.4",
|
|
29
29
|
"@salesforce/prettier-config": "^0.0.2",
|
|
30
30
|
"@salesforce/ts-sinon": "1.4.2",
|
|
31
31
|
"@swc/core": "^1.3.35",
|
|
@@ -35,11 +35,11 @@
|
|
|
35
35
|
"@types/proxy-from-env": "^1.0.1",
|
|
36
36
|
"@types/semver": "^7.3.8",
|
|
37
37
|
"@typescript-eslint/eslint-plugin": "^5.42.1",
|
|
38
|
-
"@typescript-eslint/parser": "^5.
|
|
38
|
+
"@typescript-eslint/parser": "^5.53.0",
|
|
39
39
|
"chai": "^4.3.7",
|
|
40
40
|
"eslint": "^8.31.0",
|
|
41
41
|
"eslint-config-prettier": "^8.6.0",
|
|
42
|
-
"eslint-config-salesforce": "^1.1.
|
|
42
|
+
"eslint-config-salesforce": "^1.1.1",
|
|
43
43
|
"eslint-config-salesforce-license": "^0.2.0",
|
|
44
44
|
"eslint-config-salesforce-typescript": "^1.1.1",
|
|
45
45
|
"eslint-plugin-header": "^3.1.1",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"sinon": "^11.1.1",
|
|
57
57
|
"sinon-chai": "^3.7.0",
|
|
58
58
|
"ts-node": "^10.4.0",
|
|
59
|
-
"typescript": "^4.9.
|
|
59
|
+
"typescript": "^4.9.5"
|
|
60
60
|
},
|
|
61
61
|
"config": {},
|
|
62
62
|
"engines": {
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
"access": "public"
|
|
128
128
|
},
|
|
129
129
|
"sfdx": {
|
|
130
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-info/2.
|
|
131
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-info/2.
|
|
130
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-info/2.5.1.crt",
|
|
131
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-info/2.5.1.sig"
|
|
132
132
|
}
|
|
133
133
|
}
|