Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ export const streamLogs = (
}

return new Promise((resolve, reject) => {
let done = false;

socket.addEventListener("message", (event) => {
const data = JSON.parse(event.data);
if (data.event === "line") {
Expand All @@ -93,6 +95,8 @@ export const streamLogs = (
return;
}

done = true;
socket.close();
if (data.code === 0) {
resolve(undefined);
} else {
Expand All @@ -114,7 +118,9 @@ export const streamLogs = (
});

socket.addEventListener("close", () => {
reject(new Error("Unexpected socket closure"));
if (!done) {
reject(new Error("Unexpected socket closure"));
}
});
});
};
2 changes: 1 addition & 1 deletion src/logs-target/logs-target-dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class ESPHomeLogsTargetDialog extends LitElement {
}

private _handleClose() {
this.parentNode!.removeChild(this);
this.parentNode?.removeChild(this);
}

static styles = [
Expand Down