Skip to content

Commit 3203205

Browse files
committed
Fix some more sonar issues but not all
1 parent 7d8e682 commit 3203205

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/js/protocols/TauriSerial.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@ class TauriSerial extends EventTarget {
9595
*/
9696
_convertPortsMapToArray(portsMap) {
9797
return Object.entries(portsMap).map(([path, info]) => {
98-
let vendorId = undefined;
99-
let productId = undefined;
100-
101-
if (info.vid) {
102-
vendorId = typeof info.vid === "number" ? info.vid : Number.parseInt(info.vid, 10);
103-
}
104-
if (info.pid) {
105-
productId = typeof info.pid === "number" ? info.pid : Number.parseInt(info.pid, 10);
106-
}
98+
const vendorId = info.vid
99+
? typeof info.vid === "number"
100+
? info.vid
101+
: Number.parseInt(info.vid, 10)
102+
: undefined;
103+
const productId = info.pid
104+
? typeof info.pid === "number"
105+
? info.pid
106+
: Number.parseInt(info.pid, 10)
107+
: undefined;
107108

108109
return {
109110
path,
@@ -142,12 +143,12 @@ class TauriSerial extends EventTarget {
142143

143144
// Check for removed devices
144145
const removedPorts = this.ports.filter(
145-
(oldPort) => !currentPorts.find((newPort) => newPort.path === oldPort.path),
146+
(oldPort) => !currentPorts.some((newPort) => newPort.path === oldPort.path),
146147
);
147148

148149
// Check for added devices
149150
const addedPorts = currentPorts.filter(
150-
(newPort) => !this.ports.find((oldPort) => oldPort.path === newPort.path),
151+
(newPort) => !this.ports.some((oldPort) => oldPort.path === newPort.path),
151152
);
152153

153154
// Emit events for removed devices
@@ -277,7 +278,7 @@ class TauriSerial extends EventTarget {
277278
} catch (error) {
278279
const msg = error?.message || (error?.toString ? error.toString() : "");
279280
// Timeout is expected when no data available
280-
if (msg && msg.toLowerCase().includes("no data received")) {
281+
if (msg?.toLowerCase().includes("no data received")) {
281282
await new Promise((resolve) => setTimeout(resolve, 5));
282283
continue;
283284
}

0 commit comments

Comments
 (0)