-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from AmiyaBot/feature
Feature
- Loading branch information
Showing
33 changed files
with
443 additions
and
356 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| /dist/ | ||
| /venv/ | ||
| /log/ | ||
| /testTemp/ | ||
| /*.egg-info/ | ||
|
|
||
| .DS_Store | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
amiyabot/adapters/onebot11/package.py → amiyabot/adapters/onebot/v11/package.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
amiyabot/adapters/onebot12/package.py → amiyabot/adapters/onebot/v12/package.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,235 +1,19 @@ | ||
| import sys | ||
| import json | ||
| import asyncio | ||
| from .qqGuild import QQGuildBotInstance, QQGuildSandboxBotInstance | ||
|
|
||
| from websockets.legacy.client import WebSocketClientProtocol | ||
| from typing import Dict, Optional | ||
| from amiyabot.log import LoggerManager | ||
| from amiyabot.util import random_code | ||
| from amiyabot.builtin.message import Message | ||
| from amiyabot.builtin.messageChain import Chain | ||
| from amiyabot.adapters import BotAdapterProtocol, HANDLER_TYPE | ||
|
|
||
| from .api import TencentAPI | ||
| from .model import GateWay, Payload, ShardsRecord, ConnectionHandler | ||
| from .intents import Intents | ||
| from .package import package_tencent_message | ||
| from .builder import build_message_send, TencentMessageCallback | ||
| class TencentBotInstance(QQGuildBotInstance): | ||
| ... | ||
|
|
||
| log = LoggerManager('Tencent') | ||
|
|
||
| class TencentSandboxBotInstance(QQGuildSandboxBotInstance): | ||
| ... | ||
|
|
||
| class TencentBotInstance(BotAdapterProtocol): | ||
| def __init__(self, appid: str, token: str): | ||
| super().__init__(appid, token) | ||
|
|
||
| self.appid = appid | ||
| self.token = token | ||
|
|
||
| self.shards_record: Dict[int, ShardsRecord] = {} | ||
|
|
||
| def __str__(self): | ||
| return 'Tencent' | ||
|
|
||
| @property | ||
| def api(self): | ||
| return TencentAPI(self.appid, self.token) | ||
|
|
||
| def __create_heartbeat(self, websocket, interval: int, record: ShardsRecord): | ||
| heartbeat_key = random_code(10) | ||
| record.heartbeat_key = heartbeat_key | ||
| asyncio.create_task(self.heartbeat_interval(websocket, interval, record.shards_index, heartbeat_key)) | ||
|
|
||
| async def close(self): | ||
| log.info(f'closing {self}(appid {self.appid})...') | ||
| self.keep_run = False | ||
|
|
||
| for _, item in self.shards_record.items(): | ||
| if item.connection: | ||
| await item.connection.close() | ||
|
|
||
| async def start(self, private: bool, handler: HANDLER_TYPE): | ||
| log.info(f'requesting appid {self.appid} gateway') | ||
|
|
||
| resp = await self.api.gateway_bot() | ||
|
|
||
| if not resp: | ||
| if self.keep_run: | ||
| await asyncio.sleep(10) | ||
| asyncio.create_task(self.start(private, handler)) | ||
| return False | ||
|
|
||
| gateway = GateWay(**resp.json) | ||
|
|
||
| log.info( | ||
| f'appid {self.appid} gateway resp: shards {gateway.shards}, remaining %d/%d' | ||
| % ( | ||
| gateway.session_start_limit['remaining'], | ||
| gateway.session_start_limit['total'], | ||
| ) | ||
| ) | ||
|
|
||
| await self.create_connection(ConnectionHandler(private=private, gateway=gateway, message_handler=handler)) | ||
|
|
||
| async def create_connection(self, handler: ConnectionHandler, shards_index: int = 0): | ||
| gateway = handler.gateway | ||
| sign = f'{self.appid} {shards_index + 1}/{gateway.shards}' | ||
|
|
||
| async with self.get_websocket_connection(sign, gateway.url) as websocket: | ||
| if websocket: | ||
| self.shards_record[shards_index] = ShardsRecord(shards_index, connection=websocket) | ||
|
|
||
| while self.keep_run: | ||
| await asyncio.sleep(0) | ||
|
|
||
| recv = await websocket.recv() | ||
| payload = Payload(**json.loads(recv)) | ||
|
|
||
| if payload.op == 0: | ||
| if payload.t == 'READY': | ||
| log.info( | ||
| f'connected({sign}): %s(%s)' | ||
| % ( | ||
| payload.d['user']['username'], | ||
| 'private' if handler.private else 'public', | ||
| ) | ||
| ) | ||
| self.shards_record[shards_index].session_id = payload.d['session_id'] | ||
|
|
||
| if shards_index == 0 and gateway.shards > 1: | ||
| for n in range(gateway.shards - 1): | ||
| asyncio.create_task(self.create_connection(handler, n + 1)) | ||
| else: | ||
| await self.create_package_task(handler, payload) | ||
|
|
||
| if payload.op == 10: | ||
| create_token = { | ||
| 'token': f'Bot {self.appid}.{self.token}', | ||
| 'intents': Intents(handler.private).intents.get_all_intents(), | ||
| 'shard': [shards_index, gateway.shards], | ||
| 'properties': { | ||
| '$os': sys.platform, | ||
| '$browser': '', | ||
| '$device': '', | ||
| }, | ||
| } | ||
| await websocket.send(Payload(op=2, d=create_token).to_json()) | ||
|
|
||
| self.__create_heartbeat( | ||
| websocket, | ||
| payload.d['heartbeat_interval'], | ||
| self.shards_record[shards_index], | ||
| ) | ||
|
|
||
| if payload.s: | ||
| self.shards_record[shards_index].last_s = payload.s | ||
|
|
||
| while self.keep_run and self.shards_record[shards_index].reconnect_limit > 0: | ||
| await self.reconnect(handler, self.shards_record[shards_index], sign) | ||
| await asyncio.sleep(1) | ||
|
|
||
| async def reconnect(self, handler: ConnectionHandler, record: ShardsRecord, sign: str): | ||
| log.info(f'reconnecting({sign})...') | ||
|
|
||
| async with self.get_websocket_connection(sign, handler.gateway.url) as websocket: | ||
| if websocket: | ||
| record.connection = websocket | ||
|
|
||
| while self.keep_run: | ||
| await asyncio.sleep(0) | ||
|
|
||
| recv = await websocket.recv() | ||
| payload = Payload(**json.loads(recv)) | ||
|
|
||
| if payload.op == 0: | ||
| if payload.t == 'RESUMED': | ||
| log.info(f'Bot reconnected({sign}).') | ||
| else: | ||
| await self.create_package_task(handler, payload) | ||
|
|
||
| if payload.op == 10: | ||
| reconnect_token = { | ||
| 'token': f'Bot {self.appid}.{self.token}', | ||
| 'session_id': record.session_id, | ||
| 'seq': record.last_s, | ||
| } | ||
| await websocket.send(Payload(op=6, d=reconnect_token).to_json()) | ||
|
|
||
| self.__create_heartbeat(websocket, payload.d['heartbeat_interval'], record) | ||
|
|
||
| record.reconnect_limit = 3 | ||
|
|
||
| if payload.s: | ||
| record.last_s = payload.s | ||
|
|
||
| record.reconnect_limit -= 1 | ||
|
|
||
| async def heartbeat_interval( | ||
| self, | ||
| websocket: WebSocketClientProtocol, | ||
| interval: int, | ||
| shards_index: int, | ||
| heartbeat_key: str, | ||
| ): | ||
| sec = 0 | ||
| while self.keep_run and self.shards_record[shards_index].heartbeat_key == heartbeat_key: | ||
| await asyncio.sleep(1) | ||
| sec += 1 | ||
| if sec >= interval / 1000: | ||
| sec = 0 | ||
| await websocket.send(Payload(op=1, d=self.shards_record[shards_index].last_s).to_json()) | ||
|
|
||
| async def create_package_task(self, handler: ConnectionHandler, payload: Payload): | ||
| asyncio.create_task( | ||
| handler.message_handler( | ||
| await package_tencent_message(self, payload.t, payload.d), | ||
| ), | ||
| ) | ||
|
|
||
| async def send_chain_message(self, chain: Chain, is_sync: bool = False): | ||
| reqs = await build_message_send(chain) | ||
| res = [] | ||
|
|
||
| for req in reqs.req_list: | ||
| async with log.catch('post error:', ignore=[asyncio.TimeoutError]): | ||
| res.append( | ||
| await self.api.post_message( | ||
| chain.data.guild_id, | ||
| chain.data.src_guild_id, | ||
| chain.data.channel_id, | ||
| req, | ||
| ) | ||
| ) | ||
|
|
||
| return [TencentMessageCallback(chain.data, self, item) for item in res] | ||
|
|
||
| async def build_active_message_chain(self, chain: Chain, user_id: str, channel_id: str, direct_src_guild_id: str): | ||
| data = Message(self) | ||
|
|
||
| data.user_id = user_id | ||
| data.channel_id = channel_id | ||
|
|
||
| if not channel_id and not direct_src_guild_id: | ||
| raise TypeError('send_message() missing argument: "channel_id" or "direct_src_guild_id"') | ||
|
|
||
| if direct_src_guild_id: | ||
| if not user_id: | ||
| raise TypeError('send_message(direct_src_guild_id=...) missing argument: "user_id"') | ||
|
|
||
| data.is_direct = True | ||
| data.src_guild_id = direct_src_guild_id | ||
|
|
||
| message = Chain(data) | ||
| message.chain = chain.chain | ||
| message.builder = chain.builder | ||
|
|
||
| return message | ||
|
|
||
| async def recall_message(self, message_id: str, data: Optional[Message] = None): | ||
| await self.api.delete_message(message_id, data.guild_id if data.is_direct else data.channel_id, data.is_direct) | ||
|
|
||
|
|
||
| class TencentSandboxBotInstance(TencentBotInstance): | ||
| @property | ||
| def api(self): | ||
| return TencentAPI(self.appid, self.token, True) | ||
| notice = ( | ||
| '"{name}" is deprecated and will be removed in future versions. ' | ||
| 'Please using "from amiyabot.adapters.tencent.qqGuild import {new_name}"' | ||
| ) | ||
| print('\n==== Warning ===============================================') | ||
| print(notice.format(name=TencentBotInstance.__name__, new_name=QQGuildBotInstance.__name__)) | ||
| print(notice.format(name=TencentSandboxBotInstance.__name__, new_name=QQGuildSandboxBotInstance.__name__)) | ||
| print('============================================================\n') |
Oops, something went wrong.