mathieu/HA-EasyComputerManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

don't create new connection each time

Browse Source
This commit is contained in:
Mathieu Broillet 2024-08-26 14:44:20 +02:00
parent 7e6736c8b3
commit e67e29facc
Signed by: mathieu
GPG Key ID: A08E484FE95074C1
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
custom_components/easy_computer_manager/computer.py
View File

@ -1,9 +1,11 @@
import asyncio import asyncio
import asyncssh import asyncssh
from custom_components.easy_computer_manager import const, _LOGGER from asyncssh import SSHClientConnection
from wakeonlan import send_magic_packet from wakeonlan import send_magic_packet
from custom_components.easy_computer_manager import const, _LOGGER
class OSType: class OSType:
WINDOWS = "windows" WINDOWS = "windows"
@ -29,6 +31,8 @@ class Computer:
self._audio_config = None self._audio_config = None
self._bluetooth_devices = None self._bluetooth_devices = None
self._connection: SSHClientConnection | None = None
asyncio.create_task(self.update()) asyncio.create_task(self.update())
async def _open_ssh_connection(self) -> asyncssh.SSHClientConnection: async def _open_ssh_connection(self) -> asyncssh.SSHClientConnection:
@ -52,9 +56,10 @@ class Computer:
async def update(self) -> None: async def update(self) -> None:
"""Setup method that opens an SSH connection and runs setup commands asynchronously.""" """Setup method that opens an SSH connection and runs setup commands asynchronously."""
client = await self._open_ssh_connection()
if not client: # Open SSH connection or renew it if it is closed
return if self._connection is None or self._connection.is_closed:
self._connection = await self._open_ssh_connection()
self._operating_system = OSType.LINUX if (await self.run_manually("uname")).get( self._operating_system = OSType.LINUX if (await self.run_manually("uname")).get(
"return_code") == 0 else OSType.WINDOWS # TODO: improve this "return_code") == 0 else OSType.WINDOWS # TODO: improve this
@ -64,8 +69,6 @@ class Computer:
self._audio_config = {'speakers': None, 'microphones': None} self._audio_config = {'speakers': None, 'microphones': None}
self._bluetooth_devices = {} self._bluetooth_devices = {}
await self._close_ssh_connection(client)
# Getters # Getters
async def is_on(self, timeout: int = 1) -> bool: async def is_on(self, timeout: int = 1) -> bool:
"""Check if the computer is on (ping).""" """Check if the computer is on (ping)."""
@ -188,13 +191,7 @@ class Computer:
async def run_manually(self, command: str) -> dict: async def run_manually(self, command: str) -> dict:
"""Run a command manually (not from predefined commands).""" """Run a command manually (not from predefined commands)."""
# Open SSH connection, execute command, and close connection result = await self._connection.run(command)
client = await self._open_ssh_connection()
if not client:
return {"output": "", "error": "SSH connection failed", "return_code": 1}
result = await client.run(command)
await self._close_ssh_connection(client)
return {"output": result.stdout, "error": result.stderr, return {"output": result.stdout, "error": result.stderr,
"return_code": result.exit_status} "return_code": result.exit_status}

2
custom_components/easy_computer_manager/switch.py
View File

@ -216,6 +216,8 @@ class ComputerSwitch(SwitchEntity):
"""Ping the computer to see if it is online and update the state.""" """Ping the computer to see if it is online and update the state."""
self._state = await self.computer.is_on() self._state = await self.computer.is_on()
await self.computer.update()
# Update the state attributes and the connection only if the computer is on # Update the state attributes and the connection only if the computer is on
if self._state: if self._state:
self._attr_extra_state_attributes = { self._attr_extra_state_attributes = {