chore: 更新arduino-cli版本 (version: 1.3.1)

config.json

@@ -23,7 +23,7 @@
     },
     "client": {
         "path": "./mixly",
-        "port": 7000,
+        "port": 7100,
         "protocol": "https:"
     },
     "server": {
@@ -32,6 +32,6 @@
         },
         "mode": "all",
         "protocol": "wss:",
-        "port": 7000
+        "port": 7100
     }
 }

scripts/arduino-install.js

@@ -10,10 +10,10 @@ import * as tar from 'tar';
 import shell from 'shelljs';
 
 
-const CLI_VERSION = '1.2.2';
+const CLI_VERSION = '1.3.1';
 const ARDUINO_AVR_VERSION = '1.8.6';
 const ARDUINO_ESP8266_VERSION = '3.1.1';
-const ARDUINO_ESP32_VERSION = '2.0.15';
+const ARDUINO_ESP32_VERSION = '2.0.15-cn';
 const CLI_DIR_PATH = path.resolve(process.cwd(), 'arduino-cli');
 
 

src/common/shell-arduino.js

@@ -19,6 +19,7 @@ export default class ShellArduino extends Shell {
             '--verbose',
             '--libraries', `"${arduino.path.libraries.join('","')}"`,
             '--build-path', `"${arduino.path.build}"`,
+            '--output-dir', `"${arduino.path.output}"`,
             `"${arduino.path.code}"`,
             '--no-color'
         ].join(' ');
@@ -38,6 +39,7 @@ export default class ShellArduino extends Shell {
             '--verbose',
             '--libraries', `"${arduino.path.libraries.join('","')}"`,
             '--build-path', `"${arduino.path.build}"`,
+            '--output-dir', `"${arduino.path.output}"`,
             `"${arduino.path.code}"`,
             '--no-color'
         ].join(' ');

src/common/socket.js

@@ -78,11 +78,14 @@ export default class Socket {
             const shell = this.#shellArduino_.getItem(socket.id);
             config.path = config?.path ?? {};
             config.path.build = path.resolve(TEMP_PATH, socket.id, 'build');
+            config.path.output = path.resolve(TEMP_PATH, socket.id, 'output');
             config.path.code = path.resolve(TEMP_PATH, socket.id, 'testArduino/testArduino.ino');
             let [error1,] = await to(fsExtra.ensureDir(config.path.build));
             error1 && Debug.error(error1);
-            let [error2,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            let [error2,] = await to(fsExtra.ensureDir(config.path.output));
             error2 && Debug.error(error2);
+            let [error3,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            error3 && Debug.error(error3);
             const [error, result] = await to(shell.compile(config));
             if (error) {
                 Debug.error(error);
@@ -100,11 +103,14 @@ export default class Socket {
             const shell = this.#shellArduino_.getItem(socket.id);
             config.path = config?.path ?? {};
             config.path.build = path.resolve(TEMP_PATH, socket.id, 'build');
+            config.path.output = path.resolve(TEMP_PATH, socket.id, 'output');
             config.path.code = path.resolve(TEMP_PATH, socket.id, 'testArduino/testArduino.ino');
             let [error1,] = await to(fsExtra.ensureDir(config.path.build));
             error1 && Debug.error(error1);
-            let [error2,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            let [error2,] = await to(fsExtra.ensureDir(config.path.output));
             error2 && Debug.error(error2);
+            let [error3,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            error3 && Debug.error(error3);
             const [error, result] = await to(shell.compile(config));
             if (error) {
                 Debug.error(error);
@@ -219,11 +225,14 @@ export default class Socket {
             const shell = this.#shellArduino_.getItem(socket.id);
             config.path = config?.path ?? {};
             config.path.build = path.resolve(TEMP_PATH, socket.id, 'build');
+            config.path.output = path.resolve(TEMP_PATH, socket.id, 'output');
             config.path.code = path.resolve(TEMP_PATH, socket.id, 'testArduino/testArduino.ino');
             let [error1,] = await to(fsExtra.ensureDir(config.path.build));
             error1 && Debug.error(error1);
-            let [error2,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            let [error2,] = await to(fsExtra.ensureDir(config.path.output));
             error2 && Debug.error(error2);
+            let [error3,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            error3 && Debug.error(error3);
             const [error, result] = await to(shell.compile(config));
             error && Debug.error(error);
             callback([error, result]);
@@ -233,11 +242,14 @@ export default class Socket {
             config.path = config?.path ?? {};
             const shell = this.#shellArduino_.getItem(socket.id);
             config.path.build = path.resolve(TEMP_PATH, socket.id, 'build');
+            config.path.output = path.resolve(TEMP_PATH, socket.id, 'output');
             config.path.code = path.resolve(TEMP_PATH, socket.id, 'testArduino/testArduino.ino');
             let [error1,] = await to(fsExtra.ensureDir(config.path.build));
             error1 && Debug.error(error1);
-            let [error2,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            let [error2,] = await to(fsExtra.ensureDir(config.path.output));
             error2 && Debug.error(error2);
+            let [error3,] = await to(fsExtra.outputFile(config.path.code, config.code));
+            error3 && Debug.error(error3);
             const [error, result] = await to(shell.upload(config));
             error && Debug.error(error);
             callback([error, result]);