From cfde1971982761636ee580ee4ee2da00dc6c1028 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Fri, 17 Jul 2020 16:23:45 +0200 Subject: [PATCH] Use CLI 0.11.0. - LS does not work, - Cannot reconnect to the daemon on browser refresh. Signed-off-by: Akos Kitta --- arduino-ide-extension/scripts/download-cli.js | 2 +- arduino-ide-extension/src/node/arduino-daemon-impl.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arduino-ide-extension/scripts/download-cli.js b/arduino-ide-extension/scripts/download-cli.js index f84ebede..609ac9e0 100755 --- a/arduino-ide-extension/scripts/download-cli.js +++ b/arduino-ide-extension/scripts/download-cli.js @@ -10,7 +10,7 @@ (() => { - const DEFAULT_VERSION = '0.11.0-rc1-62-g72c9655f'; // require('moment')().format('YYYYMMDD'); + const DEFAULT_VERSION = '0.11.0'; // require('moment')().format('YYYYMMDD'); const path = require('path'); const shell = require('shelljs'); diff --git a/arduino-ide-extension/src/node/arduino-daemon-impl.ts b/arduino-ide-extension/src/node/arduino-daemon-impl.ts index a315a40f..394d0412 100644 --- a/arduino-ide-extension/src/node/arduino-daemon-impl.ts +++ b/arduino-ide-extension/src/node/arduino-daemon-impl.ts @@ -166,9 +166,11 @@ export class ArduinoDaemonImpl implements ArduinoDaemon, BackendApplicationContr if (error) { ready.reject(error); } - if (message.includes('Daemon is now listening on 127.0.0.1')) { - grpcServerIsReady = true; - ready.resolve(daemon); + for (const expected of ['Daemon is listening on TCP port', 'Daemon is now listening on 127.0.0.1']) { + if (message.includes(expected)) { + grpcServerIsReady = true; + ready.resolve(daemon); + } } } });