tweaks

Author: mrfrase3

package-lock.json

@@ -2,4 +2,4 @@ board_manager:
   additional_urls:
     - http://arduino.esp8266.com/stable/package_esp8266com_index.json
 arduino_data: './data'
-downloads_dir: '../../data/arduino-downloads'
+downloads_dir: '../../data/arduino-downloads/'

src/bin/arduino-cli.yaml

@@ -17,7 +17,7 @@ const initFiles = [
 
 io.on('connection', async (socket) => {
   await files.loadTempFiles(initFiles, socket);
-  await cores.indexUpdate(socket);
+  await cores._autoUpdate(socket);
   await libs.indexUpdate(socket);
 
   socket.on('files.new', (fileObjects, done) => files.loadTempFiles(fileObjects, socket, 'files', done));
@@ -47,4 +47,12 @@ io.on('connection', async (socket) => {
   socket.on('upload.start', (data, done) => program.upload(data, socket, done));
 
   socket.on('disconnect', () => socket.tmpDir.cleanup());
+
+  socket.emit('ready');
+});
+
+io.of('/ping').on('connect', (socket) => {
+  socket.on('p', done => done());
 });
+
+console.log(`🚀 Server Launched on localhost:${process.env.PORT || 3030}`);

src/index.js

@@ -1,18 +1,20 @@
 const { spawn } = require('child_process');
+const _ = require('lodash');
 
 export default (commands, args, socket, options) => new Promise((resolve) => {
   const opts = Object.assign({}, {
     emit: true,
   }, options);
   let res = '';
   const log = (data) => {
-    res += data;
-    if (opts.emit) socket.emit('console.log', data);
+    res += data.toString('utf-8');
+    // console.log(data.toString('utf-8'));
+    if (opts.emit) socket.emit('console.log', data.toString('utf-8'));
   };
 
   const exec = spawn(`${__dirname}/../bin/arduino-cli`, [
     ...(Array.isArray(commands) ? commands : commands.split('.')),
-    args.map(arg => `"${`${arg}`.replace(/"/g, '')}"`),
+    ..._.castArray(args).map(arg => `${`${arg}`.replace(/"/g, '')}`),
     '--config-file',
     `${socket.tmpDir.path}/arduino-cli.yaml`,
     '--format',

src/utils/arduino-exec.js

@@ -2,26 +2,29 @@ import cli from './arduino-exec';
 
 const boards = {
 
+  // Print details about a board.
   details: async (fqbn = '', socket, done) => {
     const res = await cli('board.details', [fqbn], socket, { emit: false });
     const response = JSON.parse(res);
     if (done) done(response);
     return response;
   },
 
+  // List connected boards.
   list: async (socket, done) => {
     const res = await cli('board.list', [], socket, { emit: false });
     const response = JSON.parse(res);
     if (done) done(response);
     return response;
   },
 
+  // List all known boards and their corresponding FQBN.
   listall: async (socket, done) => {
-    const res = await cli('board.listall', socket);
+    const res = await cli('board.listall', [], socket);
     const response = JSON.parse(res);
     await Promise.all(response.boards.map(async (board) => {
       // eslint-disable-next-line no-param-reassign
-      board.options = (await boards.details(board.fqbn)).ConfigOptions;
+      board.options = (await boards.details(board.fqbn, socket)).ConfigOptions;
     }));
     if (done) done(response);
     return response;

src/utils/boards.js

@@ -18,47 +18,58 @@ const cores = {
     await fs.readFile(`${socket.tmpDir.path}/arduino-cli.yaml`, configFile);
   },
 
+  _autoUpdate: async (socket) => {
+    if (!socket.coresAutoUpdated) {
+      await cores.indexUpdate(socket);
+      // eslint-disable-next-line no-param-reassign
+      socket.coresAutoUpdated = true;
+    }
+  },
 
+  // returns the indexes of cores used.
   indexList: async (socket, done) => {
     const config = await cores.readConfig(socket);
-    const response = _.get(config, indPath) || [];
-    if (done) done(response);
-    return response;
+    const res = _.get(config, indPath) || [];
+    if (done) done(res);
+    return res;
   },
 
+  // Updates the index of cores.
   indexUpdate: async (socket, done) => {
-    await cli('cores.update-index', [], socket);
+    await cli('core.update-index', [], socket);
     if (done) done();
   },
 
+  // adds new core indexes
   indexNew: async (indexes, socket, done) => {
     const config = await cores.readConfig(socket);
     const existing = _.get(config, indPath) || [];
     await cores.writeConfig(_.set(config, indPath, _.uniq([...existing, ...indexes])));
     await cores.indexUpdate(socket, done);
   },
 
+  // Search for a core in the package index.
   search: async (searchTerm = '', socket, done) => {
-    const res = await cli('cores.search', [searchTerm], socket, { emit: false });
-    const response = JSON.parse(res);
+    await cores._autoUpdate(socket);
+    const res = await cli('core.search', [searchTerm], socket, { emit: false });
+    const response = res ? JSON.parse(res) : [];
     if (done) done(response);
     return response;
   },
 
+  // Shows the list of installed platforms.
   list: async (socket, done) => {
-    const res = await cli('cores.list', [], socket, { emit: false });
+    await cores._autoUpdate(socket);
+    const res = await cli('core.list', [], socket, { emit: false });
     const response = JSON.parse(res);
     if (done) done(response);
     return response;
   },
 
+  // Installs one or more cores and corresponding tool dependencies.
   install: async (coreIds, socket, done) => {
-    if (!socket.coresAutoUpdated) {
-      await cores.indexUpdate();
-      // eslint-disable-next-line no-param-reassign
-      socket.coresAutoUpdated = true;
-    }
-    await cli('cores.install', coreIds, socket);
+    await cores._autoUpdate(socket);
+    await cli('core.install', coreIds, socket);
     cores.list(socket, done);
   },
 };