admin/mixly3-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
王立帮
2025-10-04 10:33:41 +08:00
parent 4528544827
commit 1ca644bfa1
35 changed files with 6468 additions and 6454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.eslintrc.cjs Normal file → Executable file
View File

0
.gitignore vendored Normal file → Executable file
View File

0
.gitmodules vendored Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

0
arduino-cli.json Normal file → Executable file
View File

0
cert/server.crt Normal file → Executable file
View File

0
cert/server.key Normal file → Executable file
View File

4
config.json Normal file → Executable file
View File

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

0
config.json.nw Normal file → Executable file
View File

0
nodemon.json Normal file → Executable file
View File

0
package-lock.json generated Normal file → Executable file
View File

0
package.json Normal file → Executable file
View File

0
package.json.nw Normal file → Executable file
View File

4
scripts/arduino-install.js Normal file → Executable file
View File

@@ -10,10 +10,10 @@ import * as tar from 'tar';
import shell from 'shelljs'; 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_AVR_VERSION = '1.8.6';
const ARDUINO_ESP8266_VERSION = '3.1.1'; 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'); const CLI_DIR_PATH = path.resolve(process.cwd(), 'arduino-cli');

0
scripts/cert-generate.js Normal file → Executable file
View File

0
src/common/boards.js Normal file → Executable file
View File

0
src/common/config.js Normal file → Executable file
View File

0
src/common/debug.js Normal file → Executable file
View File

0
src/common/events-base.js Normal file → Executable file
View File

0
src/common/events.js Normal file → Executable file
View File

0
src/common/id-generator.js Normal file → Executable file
View File

0
src/common/mstring.js Normal file → Executable file
View File

0
src/common/registry.js Normal file → Executable file
View File

0
src/common/serial.js Normal file → Executable file
View File

0
src/common/shell-ampy.js Normal file → Executable file
View File

2
src/common/shell-arduino.js Normal file → Executable file
View File

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

0
src/common/shell-micropython.js Normal file → Executable file
View File

0
src/common/shell.js Normal file → Executable file
View File

20
src/common/socket.js Normal file → Executable file
View File

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

0
src/common/utils.js Normal file → Executable file
View File

0
src/index.js Normal file → Executable file
View File

0
webpack.common.cjs Normal file → Executable file
View File

0
webpack.dev.cjs Normal file → Executable file
View File

0
webpack.nw.cjs Normal file → Executable file
View File

0
webpack.prod.cjs Normal file → Executable file
View File