Skip to content

Commit eb6ba36

Browse files
dlechdlech
committed
enable format on save and format src/
1 parent c068db8 commit eb6ba36

File tree

9 files changed

+351
-356
lines changed

9 files changed

+351
-356
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"out": true // set this to false to include "out" folder in search results
88
},
99
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
10-
"typescript.tsc.autoDetect": "off"
10+
"typescript.tsc.autoDetect": "off",
11+
"editor.formatOnSave": true
1112
}

‎src/brickd.ts‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -53,69 +53,69 @@ export class Brickd extends events.EventEmitter {
5353

5454
// everything else is handled from state machine
5555
switch (state) {
56-
case BrickdConnectionState.start:
57-
if (m1 === "BRICKD") {
58-
const version = m2[1];
59-
if (compareVersions(version, minBrickdVersion) < 0) {
56+
case BrickdConnectionState.start:
57+
if (m1 === "BRICKD") {
58+
const version = m2[1];
59+
if (compareVersions(version, minBrickdVersion) < 0) {
60+
state = BrickdConnectionState.bad;
61+
this.emit('error', new Error(`Brickd is too old. Please upgrade to version >= ${minBrickdVersion}`));
62+
break;
63+
}
64+
if (compareVersions(version, maxBrickdVersion) >= 0) {
65+
state = BrickdConnectionState.bad;
66+
this.emit('error', new Error('Brickd version is too new.'));
67+
break;
68+
}
69+
state = BrickdConnectionState.handshake;
70+
channel.write('YOU ARE A ROBOT\n');
71+
}
72+
else {
73+
state = BrickdConnectionState.bad;
74+
this.emit('error', new Error('Brickd server did not send expected welcome message.'));
75+
}
76+
break;
77+
case BrickdConnectionState.handshake:
78+
if (m1 === "OK") {
79+
state = BrickdConnectionState.watchPower;
80+
channel.write("WATCH POWER\n");
81+
}
82+
else if (m1 === "BAD") {
6083
state = BrickdConnectionState.bad;
61-
this.emit('error', new Error(`Brickd is too old. Please upgrade to version >= ${minBrickdVersion}`));
62-
break;
84+
this.emit('error', new Error("Brickd handshake failed."));
85+
}
86+
break;
87+
case BrickdConnectionState.watchPower:
88+
if (m1 === "OK") {
89+
state = BrickdConnectionState.getBatteryVoltage;
90+
channel.write("GET system.battery.voltage\n");
91+
}
92+
else {
93+
state = BrickdConnectionState.bad;
94+
this.emit('error', new Error("Brickd failed to register for power events."));
95+
}
96+
break;
97+
case BrickdConnectionState.getBatteryVoltage:
98+
if (m1 === "OK") {
99+
this.emit('message', `PROPERTY system.battery.voltage ${m2.join(' ')}`);
100+
state = BrickdConnectionState.getSerialNum;
101+
channel.write("GET system.info.serial\n");
102+
}
103+
else {
104+
state = BrickdConnectionState.bad;
105+
this.emit('error', new Error("Brickd failed to get battery voltage"));
106+
}
107+
break;
108+
case BrickdConnectionState.getSerialNum:
109+
if (m1 === "OK") {
110+
this._serialNumber = m2.join(' ');
111+
state = BrickdConnectionState.ok;
112+
this.emit('ready');
63113
}
64-
if (compareVersions(version, maxBrickdVersion) >= 0) {
114+
else {
65115
state = BrickdConnectionState.bad;
66-
this.emit('error', new Error('Brickd version is too new.'));
67-
break;
116+
this.emit('error', new Error("Brickd failed to get serial number"));
68117
}
69-
state = BrickdConnectionState.handshake;
70-
channel.write('YOU ARE A ROBOT\n');
71-
}
72-
else {
73-
state = BrickdConnectionState.bad;
74-
this.emit('error', new Error('Brickd server did not send expected welcome message.'));
75-
}
76-
break;
77-
case BrickdConnectionState.handshake:
78-
if (m1 === "OK") {
79-
state = BrickdConnectionState.watchPower;
80-
channel.write("WATCH POWER\n");
81-
}
82-
else if (m1 === "BAD") {
83-
state = BrickdConnectionState.bad;
84-
this.emit('error', new Error("Brickd handshake failed."));
85-
}
86-
break;
87-
case BrickdConnectionState.watchPower:
88-
if (m1 === "OK") {
89-
state = BrickdConnectionState.getBatteryVoltage;
90-
channel.write("GET system.battery.voltage\n");
91-
}
92-
else {
93-
state = BrickdConnectionState.bad;
94-
this.emit('error', new Error("Brickd failed to register for power events."));
95-
}
96-
break;
97-
case BrickdConnectionState.getBatteryVoltage:
98-
if (m1 === "OK") {
99-
this.emit('message', `PROPERTY system.battery.voltage ${m2.join(' ')}`);
100-
state = BrickdConnectionState.getSerialNum;
101-
channel.write("GET system.info.serial\n");
102-
}
103-
else {
104-
state = BrickdConnectionState.bad;
105-
this.emit('error', new Error("Brickd failed to get battery voltage"));
106-
}
107-
break;
108-
case BrickdConnectionState.getSerialNum:
109-
if (m1 === "OK") {
110-
this._serialNumber = m2.join(' ');
111-
state = BrickdConnectionState.ok;
112-
this.emit('ready');
113-
}
114-
else {
115-
state = BrickdConnectionState.bad;
116-
this.emit('error', new Error("Brickd failed to get serial number"));
117-
}
118-
break;
118+
break;
119119
}
120120
});
121121
}

‎src/debugServer.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DebugProtocol } from 'vscode-debugprotocol';
55
* This interface should always match the schema found in the mock-debug extension manifest.
66
*/
77
export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArguments {
8-
/** An absolute path to the program to debug. */
8+
/** An absolute path to the program to debug. */
99
program: string;
1010
/** Download files before running. Default is true. */
1111
download?: boolean;
@@ -14,8 +14,7 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum
1414

1515
class Ev3devBrowserDebugSession extends DebugSession {
1616
protected initializeRequest(response: DebugProtocol.InitializeResponse,
17-
args: DebugProtocol.InitializeRequestArguments): void
18-
{
17+
args: DebugProtocol.InitializeRequestArguments): void {
1918
if (response.body) {
2019
response.body.supportTerminateDebuggee = true;
2120
}
@@ -29,16 +28,15 @@ class Ev3devBrowserDebugSession extends DebugSession {
2928

3029
protected customRequest(command: string, response: DebugProtocol.Response, args: any): void {
3130
switch (command) {
32-
case 'ev3devBrowser.debugger.terminate':
33-
this.sendEvent(new TerminatedEvent());
34-
this.sendResponse(response);
35-
break;
31+
case 'ev3devBrowser.debugger.terminate':
32+
this.sendEvent(new TerminatedEvent());
33+
this.sendResponse(response);
34+
break;
3635
}
3736
}
3837

3938
protected disconnectRequest(response: DebugProtocol.DisconnectResponse,
40-
args: DebugProtocol.DisconnectArguments): void
41-
{
39+
args: DebugProtocol.DisconnectArguments): void {
4240
this.sendEvent(new Event('ev3devBrowser.debugger.stop'));
4341
this.sendResponse(response);
4442
}

‎src/device.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class Device extends vscode.Disposable {
6868
const choice = await vscode.window.showInputBox({
6969
ignoreFocusOut: true,
7070
password: !p.echo,
71-
prompt: p.prompt
71+
prompt: p.prompt
7272
});
7373
// FIXME: how to cancel properly?
7474
answers.push(choice || '');
@@ -133,7 +133,7 @@ export class Device extends vscode.Disposable {
133133
// it is enough for the keepalive timeout to expire. So, we ignore
134134
// the keepalive during this operation.
135135
const timer = setInterval(() => {
136-
(<any> this.client)._resetKA();
136+
(<any>this.client)._resetKA();
137137
}, 1000);
138138
this.client.sftp((err, sftp) => {
139139
clearInterval(timer);
@@ -257,7 +257,7 @@ export class Device extends vscode.Disposable {
257257
});
258258
const stderr = new Observable<string>(observer => {
259259
readline.createInterface({
260-
input: <NodeJS.ReadableStream> conn.stderr
260+
input: <NodeJS.ReadableStream>conn.stderr
261261
}).on('line', line => {
262262
observer.next(line);
263263
}).on('close', () => {
@@ -278,7 +278,7 @@ export class Device extends vscode.Disposable {
278278
*/
279279
public shell(window: false | ssh2.PseudoTtyOptions): Promise<ssh2.ClientChannel> {
280280
return new Promise((resolve, reject) => {
281-
const options = <ssh2.ShellOptions> {
281+
const options = <ssh2.ShellOptions>{
282282
env: vscode.workspace.getConfiguration('ev3devBrowser').get('env')
283283
};
284284
this.client.shell(window, options, (err, stream) => {
@@ -513,7 +513,7 @@ export class Device extends vscode.Disposable {
513513
const txt: dnssd.TxtRecords = {};
514514
txt['ev3dev.robot.user'] = device.username || 'robot';
515515
txt['ev3dev.robot.home'] = device.homeDirectory || `/home/${txt['ev3dev.robot.user']}`;
516-
return <dnssd.Service> {
516+
return <dnssd.Service>{
517517
name: device.name,
518518
address: device.ipAddress,
519519
ipv: 'IPv4',
@@ -532,7 +532,7 @@ export class Device extends vscode.Disposable {
532532
const services = new Array<ServiceItem>();
533533
const devices = vscode.workspace.getConfiguration('ev3devBrowser').get<AdditionalDevice[]>('additionalDevices', []);
534534
for (const device of devices) {
535-
services.push(<ServiceItem> {
535+
services.push(<ServiceItem>{
536536
label: device.name,
537537
service: this.additionalDeviceToDnssdService(device)
538538
});
@@ -546,7 +546,7 @@ export class Device extends vscode.Disposable {
546546
*/
547547
public static async pickDevice(): Promise<Device | undefined> {
548548
const configItems = this.getServicesFromConfig();
549-
const manualEntry = <ServiceItem> {
549+
const manualEntry = <ServiceItem>{
550550
label: "I don't see my device..."
551551
};
552552

@@ -638,7 +638,7 @@ export class Device extends vscode.Disposable {
638638
ignoreFocusOut: true,
639639
prompt: "Enter the IP address of the device",
640640
placeHolder: 'Example: "192.168.137.3"',
641-
validateInput: function(v) {
641+
validateInput: (v) => {
642642
if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(v)) {
643643
return 'Not a valid IP address';
644644
}
@@ -650,7 +650,7 @@ export class Device extends vscode.Disposable {
650650
return undefined;
651651
}
652652

653-
const device = <AdditionalDevice> {
653+
const device = <AdditionalDevice>{
654654
name: name,
655655
ipAddress: ipAddress
656656
};
@@ -697,7 +697,7 @@ class ServiceItem implements vscode.QuickPickItem {
697697
public readonly label: string;
698698
public readonly description: string | undefined;
699699

700-
constructor (public service: dnssd.Service) {
700+
constructor(public service: dnssd.Service) {
701701
this.label = service.name;
702702
this.description = (<any>service)['ifaceName'];
703703
}

‎src/dnssd/avahi.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export async function getInstance(): Promise<dnssd.Client> {
4040
}
4141

4242
class AvahiClient implements dnssd.Client {
43-
private destroyOps = new Array<()=>void>();
43+
private destroyOps = new Array<() => void>();
4444

4545
constructor(readonly daemon: avahi.Daemon) {
4646
}
@@ -70,7 +70,7 @@ class AvahiClient implements dnssd.Client {
7070
* @param op operation to add
7171
* @return the op argument
7272
*/
73-
pushDestroyOp(op: ()=>void): ()=>void {
73+
pushDestroyOp(op: () => void): () => void {
7474
this.destroyOps.push(op);
7575
return op;
7676
}
@@ -79,7 +79,7 @@ class AvahiClient implements dnssd.Client {
7979
* Removes an operation that was added with pushDestroyOp()
8080
* @param op the operation to remove
8181
*/
82-
popDestroyOp(op: ()=>void): void {
82+
popDestroyOp(op: () => void): void {
8383
let i = this.destroyOps.findIndex(v => v === op);
8484
if (i >= 0) {
8585
this.destroyOps.splice(i, 1);
@@ -155,12 +155,11 @@ class AvahiService implements dnssd.Service {
155155
public readonly address: string,
156156
public readonly port: number,
157157
txt: Uint8Array[],
158-
flags: number)
159-
{
158+
flags: number) {
160159
const [service, transport] = type.split('.');
161160
// remove leading '_'
162161
this.service = service.slice(1);
163-
this.transport = <'tcp' | 'udp'> transport.slice(1);
162+
this.transport = <'tcp' | 'udp'>transport.slice(1);
164163
this.ipv = protocol === avahi.PROTO_INET6 ? 'IPv6' : 'IPv4';
165164
this.txt = AvahiService.parseText(txt);
166165
}
@@ -171,7 +170,7 @@ class AvahiService implements dnssd.Service {
171170
}
172171

173172
private static parseText(txt?: Uint8Array[]): dnssd.TxtRecords {
174-
const result = <dnssd.TxtRecords> new Object();
173+
const result = <dnssd.TxtRecords>new Object();
175174
if (txt) {
176175
txt.forEach(v => {
177176
const [key, value] = v.toString().split(/=/);

‎src/dnssd/bonjour.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ class BonjourClient extends events.EventEmitter implements dnssd.Client {
8282
// On Windows, we need the full IP address as part of the multicast socket
8383
// interface or things don't work right. On Linux, we have to strip the
8484
// IP address or things don't work right.
85-
const iface = (os.platform() === 'win32') ? ifaceAddress : ifaceAddress.replace(/.*%/,'::%');
85+
const iface = (os.platform() === 'win32') ? ifaceAddress : ifaceAddress.replace(/.*%/, '::%');
8686

8787
// work around bonjour issue where error is not handled
8888
new Promise<bonjour.Bonjour>((resolve, reject) => {
89-
const bClient = bonjour(<any> {
89+
const bClient = bonjour(<any>{
9090
type: 'udp6',
9191
ip: 'ff02::fb',
9292
interface: iface,
9393
});
9494
(<any>bClient)['iface'] = ifaceIndex;
95-
(<any> bClient)._server.mdns.on('ready', () => resolve(bClient));
96-
(<any> bClient)._server.mdns.on('error', (err: any) => reject(err));
95+
(<any>bClient)._server.mdns.on('ready', () => resolve(bClient));
96+
(<any>bClient)._server.mdns.on('error', (err: any) => reject(err));
9797
}).then(bClient => {
9898
if (this.ifaceAddresses.indexOf(ifaceAddress) < 0) {
9999
// iface was removed while we were waiting for promise
@@ -176,7 +176,7 @@ class BonjourBrowser extends events.EventEmitter implements dnssd.Browser {
176176
const [service] = services.splice(index, 1);
177177
this.emit('removed', service, false);
178178
});
179-
this.browsers.push({bClient: bClient, browser: browser, services: services});
179+
this.browsers.push({ bClient: bClient, browser: browser, services: services });
180180
browser.start();
181181
this.updateInterval = setInterval(() => {
182182
// poll again every 1 second
@@ -213,13 +213,13 @@ class BonjourService implements dnssd.Service {
213213
constructor(public readonly bService: bonjour.Service) {
214214
this.name = bService.name;
215215
this.service = bService.type;
216-
this.transport = <'tcp' | 'udp'> bService.protocol;
216+
this.transport = <'tcp' | 'udp'>bService.protocol;
217217
this.iface = (<any>bService)['iface'];
218218
this.host = bService.host;
219-
this.domain = (<any> bService).domain;
219+
this.domain = (<any>bService).domain;
220220
this.ipv = 'IPv6';
221-
this.address = (<any> bService).addresses[0]; // FIXME
221+
this.address = (<any>bService).addresses[0]; // FIXME
222222
this.port = bService.port;
223-
this.txt = <dnssd.TxtRecords> bService.txt;
223+
this.txt = <dnssd.TxtRecords>bService.txt;
224224
}
225225
}

0 commit comments

Comments
 (0)