Skip to content

Commit 58b1b9b

Browse files
ert78gbmondalaci
authored andcommitted
fix(device): fix IpcRenderer empty data messages (#503)
* fix(device): fix IpcRenderer empty data messages If IpcRenderer send null / undefined data as argument then IpcMain parse it as empty array and not a NULL object * fix else line break
1 parent 95d1d7f commit 58b1b9b

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

packages/uhk-agent/src/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"dependencies": {
1717
"node-hid": "0.5.7"
1818
},
19-
"dataModelVersion": "1.0.0",
20-
"usbProtocolVersion": "1.2.0",
21-
"slaveProtocolVersion": "2.1.0",
22-
"firmwareVersion": "3.0.0"
19+
"firmwareVersion": "4.0.0",
20+
"dataModelVersion": "3.0.0",
21+
"usbProtocolVersion": "2.0.0",
22+
"slaveProtocolVersion": "3.0.0"
2323
}

packages/uhk-agent/src/services/device.service.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class DeviceService {
144144
try {
145145
this.stopPollTimer();
146146

147-
if (data) {
147+
if (data && data.length > 0) {
148148
firmwarePathData = await saveTmpFirmware(data);
149149
await this.operations.updateRightFirmware(firmwarePathData.rightFirmwarePath);
150150
await this.operations.updateLeftModule(firmwarePathData.leftFirmwarePath);
@@ -162,7 +162,9 @@ export class DeviceService {
162162
response.error = err;
163163
}
164164

165-
await emptyDir(firmwarePathData.tmpDirectory.name);
165+
if (firmwarePathData) {
166+
await emptyDir(firmwarePathData.tmpDirectory.name);
167+
}
166168

167169
await snooze(500);
168170
event.sender.send(IpcEvents.device.updateFirmwareReply, response);

packages/uhk-web/src/app/services/device-renderer.service.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ export class DeviceRendererService {
3535
}
3636

3737
updateFirmware(data?: Array<number>): void {
38-
this.ipcRenderer.send(IpcEvents.device.updateFirmware, JSON.stringify(data));
38+
if (data) {
39+
this.ipcRenderer.send(IpcEvents.device.updateFirmware, JSON.stringify(data));
40+
} else {
41+
this.ipcRenderer.send(IpcEvents.device.updateFirmware);
42+
}
3943
}
4044

4145
startConnectionPoller(): void {

0 commit comments

Comments
 (0)