Extend API with "home.showAtStartup"

Author: ivankravets

src/core.js

@@ -57,9 +57,14 @@ export function getVersion() {
 }
 
 export function runPIOCommand(args, callback, options = {}) {
+  const baseArgs = ['-f'];
+  if (process.env.PLATFORMIO_CALLER) {
+    baseArgs.push('-c');
+    baseArgs.push(process.env.PLATFORMIO_CALLER);
+  }
   runCommand(
     'platformio',
-    ['-f', ...args],
+    [...baseArgs, ...args],
     callback,
     options
   );

src/home.js

@@ -6,10 +6,13 @@
  * the root directory of this source tree.
  */
 
+import { getHomeDir, runPIOCommand } from './core';
+
 import SockJS from 'sockjs-client';
+import fs from 'fs-plus';
 import jsonrpc from 'jsonrpc-lite';
+import path from 'path';
 import request from 'request';
-import spawn from 'cross-spawn';
 import tcpPortUsed from 'tcp-port-used';
 
 
@@ -108,9 +111,9 @@ export async function ensureServerStarted(options) {
   if (await isServerStarted()) {
     return params;
   }
-  spawn('platformio', ['home', '--port', HTTP_PORT, '--no-open']);
+  runPIOCommand(['home', '--port', HTTP_PORT, '--no-open']);
   await new Promise((resolve, reject) => {
-    tcpPortUsed.waitUntilUsed(HTTP_PORT, 500, 10000)
+    tcpPortUsed.waitUntilUsed(HTTP_PORT, 500, 15000)
       .then(() => {
         resolve(true);
       }, (err) => {
@@ -126,3 +129,17 @@ export async function ensureServerStarted(options) {
 export function shutdownServer() {
   request.get(`http://${HTTP_HOST}:${HTTP_PORT}?__shutdown__=1`);
 }
+
+export function showAtStartup(caller) {
+  const statePath = path.join(getHomeDir(), 'homestate.json');
+  if (!fs.isFileSync(statePath)) {
+    return true;
+  }
+  try {
+    const state = JSON.parse(fs.readFileSync(statePath, 'utf8'));
+    return !state || !state.storage || !state.storage.showOnStartup || !state.storage.showOnStartup.hasOwnProperty(caller) || state.storage.showOnStartup[caller];
+  } catch (err) {
+    console.error(err);
+    return true;
+  }
+}

src/misc.js

@@ -53,7 +53,7 @@ export function patchOSEnviron({ caller, useBuiltinPIOCore=true, extraPath, extr
   console.warn(process.env);
 }
 
-export function runCommand(cmd, args, callback, options = {}) {
+export function runCommand(cmd, args, callback=undefined, options = {}) {
   console.info('runCommand', cmd, args, options);
   let completed = false;
   const outputLines = [];
@@ -76,7 +76,7 @@ export function runCommand(cmd, args, callback, options = {}) {
   }
 
   function onExit(code) {
-    if (completed) {
+    if (completed || !callback) {
       return;
     }
     completed = true;