update arduino and minor tweaks

Author: mrfrase3

base.Dockerfile

@@ -1,17 +1,19 @@
 FROM node:10-alpine
 
+USER root
 RUN addgroup -S duino && adduser -S duino -G duino
 
 COPY setup /home/duino/setup
 COPY data /home/duino/data
 # COPY Arduino /home/duino/Arduino
 
 RUN chown duino:duino /home/duino -R
+RUN apk update && apk add build-base
 
 WORKDIR /home/duino
 USER duino
 
-RUN wget https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-20190921_Linux_64bit.tar.gz -O - | tar -xz
+RUN wget https://github.com/arduino/arduino-cli/releases/download/0.7.2/arduino-cli_0.7.2_Linux_64bit.tar.gz -O - | tar -xz
 
 RUN ls
 

setup/index.js

@@ -5,7 +5,7 @@ const libs = require('../data/libs.json').libraries;
 // eslint-disable-next-line import/no-unresolved
 const cores = require('../data/cores.json');
 
-const cli = (commands, args) => new Promise((resolve) => {
+const cli = (commands, args, consoleLog = false) => new Promise((resolve) => {
   let res = '';
   const exec = spawn(`${__dirname}/../arduino-cli`, [
     ...(Array.isArray(commands) ? commands : commands.split('.')),
@@ -14,21 +14,24 @@ const cli = (commands, args) => new Promise((resolve) => {
   ], { cwd: `${__dirname}/../` });
 
   exec.on('close', () => resolve(res));
-  const log = (data) => { res += data.toString('utf-8'); };
+  const log = (data) => {
+    if (consoleLog) console.log(data.toString('utf-8'));
+    res += data.toString('utf-8');
+  };
   exec.stdout.on('data', log);
   exec.stderr.on('data', log);
 });
 
 const loadLibs = () => libs.reduce(async (a, lib, i) => {
   await a;
   console.log(`Libs (${i + 1}/${libs.length}) Installing ${lib.name}`);
-  await cli('lib.install', lib.name);
+  await cli('lib.install', lib.name, true);
 }, Promise.resolve());
 
 const loadCores = () => cores.reduce(async (a, core, i) => {
   await a;
   console.log(`Cores (${i + 1}/${cores.length}) Installing ${core.Name} (${core.ID})`);
-  await cli('core.install', core.ID);
+  await cli('core.install', core.ID, true);
 }, Promise.resolve());
 
 const loadBoards = async () => {

src/actions/info.js

@@ -44,7 +44,7 @@ const processedCores = cores.map(lowerCaseKeys);
 let processedBoards = boards;
 processedCores.forEach((core) => {
   const [pack, arch] = core.id.split(':');
-  const path = `${__dirname}/../../data/arduino/packages/${pack}/hardware/${arch}/${core.latest}/boards.txt`;
+  const path = `/home/duino/.arduino15/packages/${pack}/hardware/${arch}/${core.latest}/boards.txt`;
   const props = processFile(path);
   processedBoards = processedBoards.map((board) => (!board.fqbn.includes(`${core.id}:`) ? board : {
     ...board,

src/utils/files.js

@@ -36,6 +36,11 @@ const files = {
     await Promise.all(fileItems.map(async (file) => {
       const filepath = path.join(socket.tmpDir.path, sub, file.name);
       files.checkPath(filepath, socket, sub);
+      try {
+        const parts = filepath.split('/');
+        parts.pop();
+        await fs.mkdir(parts.join('/'), { recursive: true });
+      } catch (err) { console.error(err); }
       await fs.writeFile(filepath, file.content);
       if (/.ino$/.test(file.name)) socket.sketchPath = filepath;
     }));