Add to API core.getPIOCommandOutput(args, options)

Author: ivankravets

src/core.js

@@ -119,5 +119,30 @@ export async function runPIOCommand(args, callback, options = {}) {
   if (process.env.PLATFORMIO_CALLER) {
     baseArgs.push('-c', process.env.PLATFORMIO_CALLER);
   }
+  if (options.projectDir) {
+    options.spawnOptions = options.spawnOptions || {};
+    options.spawnOptions.cwd = options.projectDir;
+    delete options.projectDir;
+  }
   proc.runCommand(await getCorePythonExe(), [...baseArgs, ...args], callback, options);
 }
+
+export async function getPIOCommandOutput(args, options = {}) {
+  return new Promise((resolve, reject) => {
+    runPIOCommand(
+      args,
+      (code, stdout, stderr) => {
+        if (code === 0) {
+          return resolve(stdout);
+        } else {
+          const errMessage = stdout ? `${stderr} -> ${stdout}` : stderr;
+          const err = new Error(errMessage);
+          err.stderr = stderr;
+          err.stdout = stdout;
+          return reject(err);
+        }
+      },
+      options
+    );
+  });
+}

src/installer/stages/platformio-core.js

@@ -202,17 +202,11 @@ export default class PlatformIOCoreStage extends BaseStage {
     return true;
   }
 
-  installPIOHome() {
-    return new Promise((resolve) => {
-      core.runPIOCommand(
-        ['home', '--host', '__do_not_start__'],
-        (code, stdout, stderr) => {
-          if (code !== 0) {
-            console.warn(stdout, stderr);
-          }
-          return resolve(true);
-        }
-      );
-    });
+  async installPIOHome() {
+    try {
+      await core.getPIOCommandOutput(['home', '--host', '__do_not_start__']);
+    } catch (err) {
+      console.warn(err);
+    }
   }
 }

src/project/indexer.js

@@ -6,8 +6,8 @@
  * the root directory of this source tree.
  */
 
+import { getPIOCommandOutput } from '../core';
 import path from 'path';
-import { runPIOCommand } from '../core';
 import { terminateCmdsInQueue } from '../proc';
 
 export default class ProjectIndexer {
@@ -98,38 +98,24 @@ export default class ProjectIndexer {
     };
 
     try {
-      await new Promise((resolve, reject) => {
-        const args = ['project', 'init', '--ide', this.options.ide];
-        if (this.observer.getActiveEnvName()) {
-          args.push('--environment', this.observer.getActiveEnvName());
-        }
-        runPIOCommand(
-          args,
-          (code, stdout, stderr) => {
-            if (code === 0) {
-              resolve();
-            } else {
-              reject(new Error(stderr));
-            }
-          },
-          {
-            spawnOptions: {
-              cwd: this.projectDir,
-            },
-            runInQueue: true,
-            onProcCreated: (subprocess) => {
-              if (token) {
-                token.onCancellationRequested(() => {
-                  logMessage('Configuration process has been terminated!', true);
-                  terminateCmdsInQueue();
-                  subprocess.kill();
-                });
-              }
-            },
-            onProcStdout: (data) => logMessage(data),
-            onProcStderr: (data) => logMessage(data, true),
+      const args = ['project', 'init', '--ide', this.options.ide];
+      if (this.observer.getActiveEnvName()) {
+        args.push('--environment', this.observer.getActiveEnvName());
+      }
+      await getPIOCommandOutput(args, {
+        projectDir: this.projectDir,
+        runInQueue: true,
+        onProcCreated: (subprocess) => {
+          if (token) {
+            token.onCancellationRequested(() => {
+              logMessage('Configuration process has been terminated!', true);
+              terminateCmdsInQueue();
+              subprocess.kill();
+            });
           }
-        );
+        },
+        onProcStdout: (data) => logMessage(data),
+        onProcStderr: (data) => logMessage(data, true),
       });
     } catch (err) {
       console.warn(err);