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

feat: arduino-cli升级到v1.2.2

Browse Source
This commit is contained in:
王立帮
2025-05-08 23:45:10 +08:00
parent c79fcd89dc
commit 20a473d868
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.json
View File

@@ -7,7 +7,6 @@
"libraries": [ "libraries": [
"./arduino-cli/libraries" "./arduino-cli/libraries"
], ],
"cache": "./arduino-cli/cache",
"config": "./arduino-cli/arduino-cli.json" "config": "./arduino-cli/arduino-cli.json"
} }
}, },

2
scripts/arduino-install.js
View File

@@ -10,7 +10,7 @@ import * as tar from 'tar';
import shell from 'shelljs'; import shell from 'shelljs';
const version = '0.35.2'; const version = '1.2.2';
function getPlatformTarget() { function getPlatformTarget() {

2
src/common/shell-arduino.js
View File

@@ -16,7 +16,6 @@ export default class ShellArduino extends Shell {
'compile', 'compile',
'-b', arduino.key, '-b', arduino.key,
'--config-file', `"${arduino.path.config}"`, '--config-file', `"${arduino.path.config}"`,
'--build-cache-path', `"${arduino.path.cache}"`,
'--verbose', '--verbose',
'--libraries', `"${arduino.path.libraries.join('","')}"`, '--libraries', `"${arduino.path.libraries.join('","')}"`,
'--build-path', `"${arduino.path.build}"`, '--build-path', `"${arduino.path.build}"`,
@@ -36,7 +35,6 @@ export default class ShellArduino extends Shell {
'-p', arduino.port, '-p', arduino.port,
'-b', arduino.key, '-b', arduino.key,
'--config-file', `"${arduino.path.config}"`, '--config-file', `"${arduino.path.config}"`,
'--build-cache-path', `"${arduino.path.cache}"`,
'--verbose', '--verbose',
'--libraries', `"${arduino.path.libraries.join('","')}"`, '--libraries', `"${arduino.path.libraries.join('","')}"`,
'--build-path', `"${arduino.path.build}"`, '--build-path', `"${arduino.path.build}"`,

2
src/common/utils.js
View File

@@ -26,9 +26,11 @@ export function getDefaultHosts() {
} }
function generateCertificate() { function generateCertificate() {
const workingPath = process.cwd();
fsExtra.ensureDirSync(CERTS_PATH); fsExtra.ensureDirSync(CERTS_PATH);
shell.cd(CERTS_PATH); shell.cd(CERTS_PATH);
shell.exec(`mkcert -key-file server.key -cert-file server.crt ${getDefaultHosts().join(' ')}`); shell.exec(`mkcert -key-file server.key -cert-file server.crt ${getDefaultHosts().join(' ')}`);
shell.cd(workingPath);
console.log('new certificate generated successfully!'); console.log('new certificate generated successfully!');
const certPem = fsExtra.readFileSync(path.resolve(CERTS_PATH, 'server.crt')); const certPem = fsExtra.readFileSync(path.resolve(CERTS_PATH, 'server.crt'));
const keyPem = fsExtra.readFileSync(path.resolve(CERTS_PATH, 'server.key')); const keyPem = fsExtra.readFileSync(path.resolve(CERTS_PATH, 'server.key'));