Merge pull request #11 from duinoapp/develop

v3.3.1

Author: mrfrase3

Dockerfile

@@ -7,22 +7,24 @@ RUN mkdir -p /mnt/duino-data
 RUN chmod 0777 /mnt/duino-data
 
 COPY setup /home/duino/setup
+COPY src/utils /home/duino/src/utils
 RUN chmod +x /home/duino/setup/*.sh
 # COPY Arduino /home/duino/Arduino
 
 # RUN mkdir /home/duino
 RUN chown duino:duino /home/duino -R
-RUN apt-get update && apt-get install build-essential -y
+RUN apt-get update && apt-get install build-essential python-pip -y
+RUN pip install pyserial
 
 WORKDIR /home/duino
 USER duino
 
 COPY package*.json /home/duino/
 RUN npm ci
 
-COPY src /home/duino/src
-
 RUN node ./setup/docker-install.js
 
+COPY src /home/duino/src
+
 EXPOSE 3030
 CMD [ "node", "src/index.js" ]

package-lock.json

@@ -23,7 +23,7 @@
     "properties": "^1.2.1",
     "serverless-http": "^2.7.0",
     "socket.io": "^2.4.1",
-    "tar": "^6.1.0",
+    "tar": "^6.1.8",
     "tmp-promise": "^2.0.2",
     "uuid": "^8.3.2",
     "yaml": "^1.10.2"

package.json

@@ -17,7 +17,7 @@ module.exports = async (supportedCores) => {
       if (!line.includes('=')) return line;
       const key = line.replace(/=.*/, '');
       let newLine = line;
-      if (!/\.(upload\.|build\.mcu)/.test(key)) newLine = '';
+      if (!/\.(upload\.|build\.(mcu|bootloader_addr|boot|flash_freq))/.test(key)) newLine = '';
       return newLine;
     }).join('\n');
     return properties.parse(file, { namespaces: true });

setup/process-data.js

@@ -6,6 +6,7 @@ const loadBoards = () => json.loadLargeData('boards');
 const loadLegacyBoards = () => json.parse('/mnt/duino-data/legacy-boards-processed.json');
 
 const searchRegex = (search = '') => new RegExp(`(${search.replace(/[^\w-\s]/g, '.').split(/\s+/g).join(')|(')})`, 'i');
+const exactSearchRegex = (search = '') => new RegExp(`^${search.replace(/[^\w-\s]/g, '.?')}$`, 'i');
 
 module.exports.server = (socket, done) => done && done({
   name: process.env.SERVER_INFO_NAME || 'Test Compile Server',
@@ -24,17 +25,24 @@ module.exports.librariesSearch = async (data, socket, done) => {
   const reg = searchRegex(data.search);
   const { sortBy = 'name' } = data;
   const sortDesc = !(typeof data.sortDesc === 'undefined' || `${data.sortDesc}` === 'false');
+  const exact = !(typeof data.exact === 'undefined' || `${data.exact}` === 'false');
   const eq = (a, b) => a.toLowerCase() === b.toLowerCase();
-  const res = [
-    ...libs.filter((lib) => eq(lib.name, data.search)),
-    ...libs.filter((lib) => !eq(lib.name, data.search) && reg.test(lib.name))
-      .sort((a, b) => {
-        const ai = `${a[sortBy]}`.toLowerCase();
-        const bi = `${b[sortBy]}`.toLowerCase();
-        if (ai === bi) return 0;
-        return (ai < bi ? -1 : 1) * (sortDesc ? -1 : 1);
-      }),
-  ];
+  let res;
+  if (exact) {
+    const nameRegs = data.search.split(/\s*,\s*/g).map(exactSearchRegex);
+    res = libs.filter((lib) => nameRegs.some((nr) => nr.test(lib.name)));
+  } else {
+    res = [
+      ...libs.filter((lib) => eq(lib.name, data.search)),
+      ...libs.filter((lib) => !eq(lib.name, data.search) && reg.test(lib.name))
+        .sort((a, b) => {
+          const ai = `${a[sortBy]}`.toLowerCase();
+          const bi = `${b[sortBy]}`.toLowerCase();
+          if (ai === bi) return 0;
+          return (ai < bi ? -1 : 1) * (sortDesc ? -1 : 1);
+        }),
+    ];
+  }
   const response = {
     limit, skip, total: res.length, data: res.slice(skip * limit, (skip + 1) * limit),
   };

src/actions/info.js

@@ -3,6 +3,17 @@ const fs = require('fs').promises;
 const net = require('net');
 const cli = require('../utils/arduino-exec');
 const tmpFiles = require('../utils/files');
+const json = require('../utils/json');
+
+const exists = async (path) => {
+  try {
+    await fs.access(path);
+    return true;
+  } catch (err) {
+    Math.random(err);
+    return false;
+  }
+};
 
 const program = {
 
@@ -35,11 +46,58 @@ const program = {
     const response = program.getError(res);
     if (!response.error && !noHex) {
       const ref = socket.sketchPath.split('/').pop();
-      try {
-        const hex = await fs.readFile(`${socket.sketchPath}/output/${ref}.ino.hex`, 'base64');
-        response.hex = hex;
-      } catch (err) {
-        console.error(err);
+      if (fqbn.indexOf('esp') !== 0) {
+        try {
+          const hex = await fs.readFile(`${socket.sketchPath}/output/${ref}.ino.hex`, 'base64');
+          response.hex = hex;
+        } catch (err) {
+          console.error(err);
+        }
+      } else if (fqbn.indexOf('esp8266') === 0) {
+        try {
+          const bin = await fs.readFile(`${socket.sketchPath}/output/${ref}.ino.bin`, 'base64');
+          response.files = [{ data: bin, address: 0 }];
+        } catch (err) {
+          console.error(err);
+        }
+      } else if (fqbn.indexOf('esp32') === 0) {
+        const boards = await json.loadLargeData('boards');
+        const baseFqbn = fqbn.split(':').slice(0, 4).join(':');
+        const board = boards.find((b) => b.fqbn === baseFqbn);
+        if (board) {
+          const flashFreq = `${
+            (fqbn.split(':').find((part) => part.includes('FlashFreq=')) || '').replace('FlashFreq=', '')
+            || (board.config_options.find((o) => o.option === 'FlashFreq')
+              || { values: [{ selected: true, value: '' }] }).values.find((v) => v.selected).value
+            || board.properties.build.flash_freq
+          }m`.replace('mm', 'm');
+          const flashMode = (fqbn.split(':').find((part) => part.includes('FlashMode=')) || '').replace('FlashMode=', '')
+            || (board.config_options.find((o) => o.option === 'FlashMode')
+              || { values: [{ selected: true, value: '' }] }).values.find((v) => v.selected).value
+            || board.properties.build.boot;
+          const espToolsPath = '/mnt/duino-data/.arduino15/packages/esp32/hardware/esp32/1.0.6/tools';
+          let bootPath = `${espToolsPath}/sdk/bin/bootloader_${flashMode}_${flashFreq}.bin`;
+          // account for the new path for the bin in the next arduino-esp32 release. (2021-07-18)
+          if (!(await exists(bootPath))) {
+            bootPath = `${espToolsPath}/sdk/${board.properties.build.mcu}/bin/bootloader_${flashMode}_${flashFreq}.bin`;
+          }
+          try {
+            const appBin = await fs.readFile(`${socket.sketchPath}/output/${ref}.ino.bin`, 'base64');
+            const partBin = await fs.readFile(`${socket.sketchPath}/output/${ref}.ino.partitions.bin`, 'base64');
+            const app0Bin = await fs.readFile(`${espToolsPath}/partitions/boot_app0.bin`, 'base64');
+            const bootBin = await fs.readFile(bootPath, 'base64');
+            response.files = [
+              { data: app0Bin, address: 0xe000 },
+              { data: bootBin, address: Number(board.properties.build.bootloader_addr) || 0x1000 },
+              { data: appBin, address: 0x10000 },
+              { data: partBin, address: 0x8000 },
+            ];
+            response.flash_freq = flashFreq;
+            response.flash_mode = flashMode;
+          } catch (err) {
+            console.error(err);
+          }
+        }
       }
     }
     response.log = libRes + res;

src/actions/program.js

@@ -18,7 +18,7 @@ module.exports = (commands, args, socket, options) => new Promise((resolve) => {
     ...(Array.isArray(commands) ? commands : commands.split('.')),
     ...(Array.isArray(args) ? args : [args]).map((arg) => `${`${arg}`.replace(/"/g, '')}`),
     ...(cliArgs).split(' '),
-  ], { cwd: socket ? socket.tmpDir.path : `${__dirname}/../../`, env: { HOME: '/mnt/duino-data' } });
+  ], { cwd: socket ? socket.tmpDir.path : `${__dirname}/../../`, env: { HOME: '/mnt/duino-data', PATH: process.env.PATH } });
   exec.stdout.on('data', (data) => log(data));
   exec.stderr.on('data', (data) => log(data));