tanner/microhard-sms-bridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add timeouts to all telnet read_until's

Browse Source
This commit is contained in:
Tanner Collin 2025-01-20 22:40:25 +00:00
parent cc9fb225e1
commit ce26621119
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.py
View File

@ -27,13 +27,13 @@ async def delete_message(mid):
logging.info('Deleting message ID: %s...', mid) logging.info('Deleting message ID: %s...', mid)
with Telnet('192.168.168.1', 23, timeout=10) as tn: with Telnet('192.168.168.1', 23, timeout=10) as tn:
tn.read_until(b'login: ') tn.read_until(b'login: ', timeout=4)
tn.write(b'admin\n') tn.write(b'admin\n')
tn.read_until(b'Password: ') tn.read_until(b'Password: ', timeout=4)
tn.write(settings.ROUTER_PASS.encode() + b'\n') tn.write(settings.ROUTER_PASS.encode() + b'\n')
tn.read_until(b'UserDevice> ') tn.read_until(b'UserDevice> ', timeout=4)
command = 'AT+CMGD={}\r\n'.format(str(mid)) command = 'AT+CMGD={}\r\n'.format(str(mid))
@ -51,16 +51,16 @@ async def delete_message(mid):
async def send_message(number, text): async def send_message(number, text):
logging.info('Sending to %s message: %s...', number, text) logging.info('Sending to %s message: %s', number, text)
with Telnet('192.168.168.1', 23, timeout=10) as tn: with Telnet('192.168.168.1', 23, timeout=10) as tn:
tn.read_until(b'login: ') tn.read_until(b'login: ', timeout=4)
tn.write(b'admin\n') tn.write(b'admin\n')
tn.read_until(b'Password: ') tn.read_until(b'Password: ', timeout=4)
tn.write(settings.ROUTER_PASS.encode() + b'\n') tn.write(settings.ROUTER_PASS.encode() + b'\n')
tn.read_until(b'UserDevice> ') tn.read_until(b'UserDevice> ', timeout=4)
command = 'AT+CMGS={}\r\n'.format(str(number)) command = 'AT+CMGS={}\r\n'.format(str(number))
@ -88,13 +88,13 @@ async def get_messages():
# handles no messages (empty response) fine # handles no messages (empty response) fine
with Telnet('192.168.168.1', 23, timeout=10) as tn: with Telnet('192.168.168.1', 23, timeout=10) as tn:
tn.read_until(b'login: ') tn.read_until(b'login: ', timeout=4)
tn.write(b'admin\n') tn.write(b'admin\n')
tn.read_until(b'Password: ') tn.read_until(b'Password: ', timeout=4)
tn.write(settings.ROUTER_PASS.encode() + b'\n') tn.write(settings.ROUTER_PASS.encode() + b'\n')
tn.read_until(b'UserDevice> ') tn.read_until(b'UserDevice> ', timeout=4)
tn.write(b'AT+CMGL\r\n') tn.write(b'AT+CMGL\r\n')
res = tn.read_until(b'UserDevice> ', timeout=4).decode() res = tn.read_until(b'UserDevice> ', timeout=4).decode()
@ -180,7 +180,7 @@ async def send(event):
res = await send_message(number, message) res = await send_message(number, message)
if res: if res:
await event.reply('Ok.') await event.reply('ok')
else: else:
await event.reply('Error sending SMS.') await event.reply('Error sending SMS.')