ilia/nanobot
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge PR #289: add Telegram proxy support and channel startup error handling

Browse Source
This commit is contained in:
Re-bin 2026-02-07 17:56:45 +00:00
commit d2fef6059d
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nanobot/channels/manager.py
View File

@ -78,8 +78,15 @@ class ChannelManager:
except ImportError as e: except ImportError as e:
logger.warning(f"Feishu channel not available: {e}") logger.warning(f"Feishu channel not available: {e}")
async def _start_channel(self, name: str, channel: BaseChannel) -> None:
"""Start a channel and log any exceptions."""
try:
await channel.start()
except Exception as e:
logger.error(f"Failed to start channel {name}: {e}")
async def start_all(self) -> None: async def start_all(self) -> None:
"""Start WhatsApp channel and the outbound dispatcher.""" """Start all channels and the outbound dispatcher."""
if not self.channels: if not self.channels:
logger.warning("No channels enabled") logger.warning("No channels enabled")
return return
@ -87,11 +94,11 @@ class ChannelManager:
# Start outbound dispatcher # Start outbound dispatcher
self._dispatch_task = asyncio.create_task(self._dispatch_outbound()) self._dispatch_task = asyncio.create_task(self._dispatch_outbound())
# Start WhatsApp channel # Start channels
tasks = [] tasks = []
for name, channel in self.channels.items(): for name, channel in self.channels.items():
logger.info(f"Starting {name} channel...") logger.info(f"Starting {name} channel...")
tasks.append(asyncio.create_task(channel.start())) tasks.append(asyncio.create_task(self._start_channel(name, channel)))
# Wait for all to complete (they should run forever) # Wait for all to complete (they should run forever)
await asyncio.gather(*tasks, return_exceptions=True) await asyncio.gather(*tasks, return_exceptions=True)

9
nanobot/channels/telegram.py
View File

@ -101,11 +101,10 @@ class TelegramChannel(BaseChannel):
self._running = True self._running = True
# Build the application # Build the application
self._app = ( builder = Application.builder().token(self.config.token)
Application.builder() if self.config.proxy:
.token(self.config.token) builder = builder.proxy(self.config.proxy).get_updates_proxy(self.config.proxy)
.build() self._app = builder.build()
)
# Add message handler for text, photos, voice, documents # Add message handler for text, photos, voice, documents
self._app.add_handler( self._app.add_handler(

5
pyproject.toml
View File

@ -23,13 +23,14 @@ dependencies = [
"pydantic-settings>=2.0.0", "pydantic-settings>=2.0.0",
"websockets>=12.0", "websockets>=12.0",
"websocket-client>=1.6.0", "websocket-client>=1.6.0",
"httpx>=0.25.0", "httpx[socks]>=0.25.0",
"loguru>=0.7.0", "loguru>=0.7.0",
"readability-lxml>=0.8.0", "readability-lxml>=0.8.0",
"rich>=13.0.0", "rich>=13.0.0",
"croniter>=2.0.0", "croniter>=2.0.0",
"python-telegram-bot>=21.0", "python-telegram-bot[socks]>=21.0",
"lark-oapi>=1.0.0", "lark-oapi>=1.0.0",
"socksio>=1.0.0",
] ]
[project.optional-dependencies] [project.optional-dependencies]