Skip to content

Commit 4c1af7c

Browse files
author
Stefania
authored
Merge pull request #109 from arduino/v2
V2
2 parents 7aa99a8 + c554839 commit 4c1af7c

File tree

9 files changed

+669
-90
lines changed

9 files changed

+669
-90
lines changed

‎README.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,34 @@ daemon.downloading.subscribe(download => {
7070

7171
```
7272

73+
## Version 2
74+
75+
Version 2 of the arduino-create-agent aims to provide a cleaner api based on promises.
76+
It will remain confined to a v2 property on the daemon object until it will be stable.
77+
At the moment it only supports tool management.
78+
79+
```js
80+
daemon.agentV2Found.subscribe(daemonV2 => {
81+
if (!daemonV2) {
82+
// Your Agent doesn't support v2
83+
}
84+
// Your Agent supports v2
85+
});
86+
87+
daemon.v2.installedTools()
88+
.then(tools => console.debug(tools)) // [{"name":"avrdude","version":"6.3.0-arduino9","packager":"arduino"}]
89+
90+
let payload = {
91+
name: 'avrdude',
92+
version: '6.3.0-arduino9',
93+
packager: 'arduino',
94+
url: 'http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip',
95+
checksum: 'SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f',
96+
signature: '7628b488c7ffd21ae1ca657245751a4043c419fbab5c256a020fb53f17eb88686439f54f18e78a80b40fc2de742f79b78ed4338c959216dc8ae8279e482d2d4117eeaf34a281ce2369d1dc4356f782c0940d82610f1c892e913b637391c39e95d4d4dfe82d8dbc5350b833186a70a62c7952917481bad798a9c8b4905df91bd914fbdfd6e98ef75c8f7fb06284278da449ce05b27741d6eda156bbdb906d519ff7d7d5042379fdfc55962b3777fb9240b368552182758c297e39c72943d75d177f2dbb584b2210301250796dbe8af11f0cf06d762fe4f912294f4cdc8aff26715354cfb33010a81342fbbc438912eb424a39fc0c52a9b2bf722051a6f3b024bd'
97+
}
98+
daemon.v2.installTool(payload) // Will install the tool in the system
99+
```
100+
73101
## Development and test features
74102
Just run `npm run dev` and open your browser on http://localhost:8000
75103

‎demo/app.jsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import React from 'react';
2222
import Daemon from '../src';
2323

2424
import { HEX } from './serial_mirror';
25+
import V2 from './v2/v2.jsx';
2526

2627
const chromeExtensionID = 'hfejhkbipnickajaidoppbadcomekkde';
2728

@@ -266,11 +267,15 @@ class App extends React.Component {
266267
<h2>Serial Monitor</h2>
267268

268269
<form onSubmit={this.handleSend}>
269-
<input id="serial-input" value={this.state.serialInput} onChange={this.handleChangeSerial}/>
270+
<input aria-label="serial input" id="serial-input" value={this.state.serialInput} onChange={this.handleChangeSerial}/>
270271
<input type="submit" value="Send" />
271272
</form>
272273

273-
<textarea id="serial-textarea" value={ this.state.serialMonitorContent } readOnly/>
274+
<textarea aria-label="Serial Monitor output" id="serial-textarea" value={ this.state.serialMonitorContent } readOnly/>
275+
</div>
276+
277+
<div className="v2">
278+
<V2 daemon={daemon}></V2>
274279
</div>
275280

276281
<div className="section">

‎demo/index.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,33 @@
5353
.section {
5454
margin: 20px;
5555
}
56+
57+
.install-tool-container .tool-input {
58+
display: flex;
59+
margin: 10px 0;
60+
}
61+
62+
.install-tool-container .tool-input label {
63+
flex: 0 1 200px;
64+
}
65+
66+
.install-tool-container .tool-input input {
67+
flex: 0 1 500px;
68+
}
69+
70+
.v2 {
71+
background-color: #ecf1f1;
72+
padding: 20px;
73+
}
74+
75+
table {
76+
border-collapse: collapse;
77+
}
78+
79+
table td {
80+
border: 1px solid black;
81+
padding: 3px;
82+
}
5683
</style>
5784
</head>
5885
<body>

‎demo/v2/install_tool.jsx‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
import React from 'react';
2+
import { flatMap } from 'rxjs/operators';
3+
4+
export class V2InstallTool extends React.Component {
5+
constructor() {
6+
super();
7+
this.state = {
8+
name: 'avrdude',
9+
version: '6.3.0-arduino9',
10+
packager: 'arduino',
11+
url: 'http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip',
12+
checksum: 'SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f',
13+
signature: '7628b488c7ffd21ae1ca657245751a4043c419fbab5c256a020fb53f17eb88686439f54f18e78a80b40fc2de742f79b78ed4338c959216dc8ae8279e482d2d4117eeaf34a281ce2369d1dc4356f782c0940d82610f1c892e913b637391c39e95d4d4dfe82d8dbc5350b833186a70a62c7952917481bad798a9c8b4905df91bd914fbdfd6e98ef75c8f7fb06284278da449ce05b27741d6eda156bbdb906d519ff7d7d5042379fdfc55962b3777fb9240b368552182758c297e39c72943d75d177f2dbb584b2210301250796dbe8af11f0cf06d762fe4f912294f4cdc8aff26715354cfb33010a81342fbbc438912eb424a39fc0c52a9b2bf722051a6f3b024bd',
14+
res: ''
15+
};
16+
17+
this.handleChange = this.handleChange.bind(this);
18+
this.handleSubmit = this.handleSubmit.bind(this);
19+
}
20+
21+
componentDidMount() {
22+
this.daemon = this.props.daemon;
23+
24+
this.daemon.agentV2Found.subscribe(daemonV2 => {
25+
if (!daemonV2) {
26+
return;
27+
}
28+
this.daemonV2 = daemonV2;
29+
});
30+
}
31+
32+
handleChange(event) {
33+
this.setState({ [event.target.name]: event.target.value });
34+
}
35+
36+
handleSubmit(event) {
37+
event.preventDefault();
38+
39+
this.daemonV2.installTool({
40+
name: this.state.name,
41+
version: this.state.version,
42+
packager: this.state.packager,
43+
checksum: this.state.checksum,
44+
signature: this.state.signature,
45+
url: this.state.url,
46+
47+
})
48+
.then(res => {
49+
this.setState({
50+
res: JSON.stringify(res, null, 2)
51+
});
52+
})
53+
.catch(err => {
54+
this.setState({
55+
res: JSON.stringify(err, null, 2)
56+
});
57+
});
58+
}
59+
60+
render() {
61+
return (
62+
<section className="install-tool-container">
63+
<h2>Install a new tool</h2>
64+
<form onSubmit={this.handleSubmit}>
65+
<div className="tool-input">
66+
<label htmlFor="name">
67+
Name:
68+
</label>
69+
<input type="text" id="name" value={this.state.name} onChange={this.handleChange} />
70+
</div>
71+
<div className="tool-input">
72+
<label htmlFor="version">
73+
Version:
74+
</label>
75+
<input type="text" id="version" value={this.state.version} onChange={this.handleChange} />
76+
</div>
77+
<div className="tool-input">
78+
<label htmlFor="packager">
79+
Packager:
80+
</label>
81+
<input type="text" id="packager" value={this.state.packager} onChange={this.handleChange} />
82+
</div>
83+
<div className="tool-input">
84+
<label htmlFor="url">
85+
Url:
86+
</label>
87+
<input type="text" id="url" value={this.state.url} onChange={this.handleChange} />
88+
</div>
89+
<div className="tool-input">
90+
<label htmlFor="checksum">
91+
Checksum:
92+
</label>
93+
<input type="text" id="checksum" value={this.state.checksum} onChange={this.handleChange} />
94+
</div>
95+
<div className="tool-input">
96+
<label htmlFor="signature">
97+
Signature:
98+
</label>
99+
<input type="text" id="signature" value={this.state.signature} onChange={this.handleChange} />
100+
</div>
101+
<input type="submit" value="Submit" />
102+
</form>
103+
<textarea aria-label="Install tool output" cols="100" rows="10" value={this.state.res} readOnly></textarea>
104+
</section>
105+
);
106+
}
107+
}

‎demo/v2/v2.jsx‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import React from 'react';
2+
import { V2InstallTool } from './install_tool.jsx';
3+
4+
class V2 extends React.Component {
5+
constructor() {
6+
super();
7+
this.state = {
8+
tools: []
9+
};
10+
}
11+
12+
componentDidMount() {
13+
this.daemon = this.props.daemon;
14+
15+
this.daemon.agentV2Found.subscribe(daemonV2 => {
16+
if (!daemonV2) {
17+
return;
18+
}
19+
this.daemonV2 = daemonV2;
20+
this.daemonV2.installedTools().then(res => {
21+
this.setState({
22+
tools: res
23+
});
24+
});
25+
});
26+
}
27+
28+
render() {
29+
const tools = this.state.tools.map((tool, i) => <tr key={i}>
30+
<td>{tool.packager}</td>
31+
<td>{tool.name}</td>
32+
<td>{tool.version}</td>
33+
</tr>);
34+
35+
return (
36+
<section>
37+
<h2>V2</h2>
38+
<section>
39+
<h3>Installed tools</h3>
40+
<form onSubmit={this.handleInstallTool}>
41+
<table>
42+
<thead>
43+
<tr>
44+
<th>Packager</th>
45+
<th>Name</th>
46+
<th>Version</th>
47+
</tr>
48+
</thead>
49+
<tbody>{tools}</tbody>
50+
</table>
51+
</form>
52+
53+
<V2InstallTool daemon={this.props.daemon}></V2InstallTool>
54+
</section>
55+
</section >
56+
);
57+
}
58+
}
59+
60+
export default V2;

0 commit comments

Comments
 (0)