maxuserapi 0.1.0__tar.gz → 0.1.1__tar.gz

{maxuserapi-0.1.0 → maxuserapi-0.1.1}/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/maxapi" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/maxuserapi" vcs="Git" />
   </component>
 </project>

{maxuserapi-0.1.0 → maxuserapi-0.1.1}/.idea/workspace.xml

@@ -5,7 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a3f8aa14-c555-40e6-80d3-c0f84ee59f35" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/maxapi/LICENSE" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maxuserapi/LICENSE" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maxuserapi/client.py" beforeDir="false" afterPath="$PROJECT_DIR$/maxuserapi/client.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,23 +14,23 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/maxapi" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/maxuserapi" />
   </component>
-  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
-  "lastFilter": {
-    "state": "OPEN",
-    "assignee": "ReoGentO"
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;ReoGentO&quot;
   }
-}]]></component>
-  <component name="GithubPullRequestsUISettings"><![CDATA[{
-  "selectedUrlAndAccountId": {
-    "url": "https://github.com/ReoGentO/MaxUserAPI",
-    "accountId": "74a2decd-8485-4533-8fb8-6a4614d1b142"
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/ReoGentO/MaxUserAPI&quot;,
+    &quot;accountId&quot;: &quot;74a2decd-8485-4533-8fb8-6a4614d1b142&quot;
   }
-}]]></component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 7
-}]]></component>
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 7
+}</component>
   <component name="ProjectId" id="3Dz3fFblEa364o2TjjMgjub8pjS" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -37,7 +38,9 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "Python.tests.executor": "Run",
     "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
     "git-widget-placeholder": "master",
     "last_opened_file_path": "A:/PythonProjects/MaxAPI"
   }

{maxuserapi-0.1.0 → maxuserapi-0.1.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: maxuserapi
-Version: 0.1.0
+Version: 0.1.1
 Summary: Библиотека для работы с MAX USER API
-Project-URL: Homepage, https://github.com/ReoGenT/MaxAPI
+Project-URL: Homepage, https://github.com/ReoGenT/MaxUserAPI
 Author: ReoGenT
 License-Expression: Apache-2.0
 License-File: LICENSE

{maxuserapi-0.1.0 → maxuserapi-0.1.1}/maxuserapi/client.py

@@ -42,7 +42,6 @@ class Client:
         self.__handshake["payload"]["deviceId"] = str(uuid.uuid4())
         self.favourite = 0
         self.ws = None
-        self.loop = asyncio.get_event_loop()
 
         self._keepalive_task: asyncio.Task = None
 
@@ -223,6 +222,8 @@ class Client:
             while True:
                 try:
                     await self.__listen()
+                except (asyncio.CancelledError, KeyboardInterrupt):
+                    break
                 except websockets.ConnectionClosed as e:
                     print(f"[!] Соединение закрыто ({e}), переподключение через 3с...")
                     await asyncio.sleep(3)
@@ -230,7 +231,10 @@ class Client:
                     print(f"[!] Ошибка: {e}, повтор через 5с...")
                     await asyncio.sleep(5)
 
-        asyncio.run(_run_loop())
+        try:
+            asyncio.run(_run_loop())
+        except KeyboardInterrupt:
+            pass
 
     async def start(self):
         """Метод для запуска внутри уже существующего цикла событий"""
@@ -244,6 +248,14 @@ class Client:
     async def stop(self):
         print("[*] Закрытие соединений MaxAPI...")
 
+        if self._keepalive_task and not self._keepalive_task.done():
+            self._keepalive_task.cancel()
+            try:
+                await self._keepalive_task
+            except asyncio.CancelledError:
+                pass
+            print("[+] Keepalive остановлен")
+
         # 1. Закрываем WebSocket
         if self.ws:
             try:

{maxuserapi-0.1.0 → maxuserapi-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "maxuserapi"
-version = "0.1.0"
+version = "0.1.1"
 description = "Библиотека для работы с MAX USER API"
 readme = "README.md"
 requires-python = ">=3.7"
@@ -19,4 +19,4 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/ReoGenT/MaxAPI"
+Homepage = "https://github.com/ReoGenT/MaxUserAPI"

maxuserapi-0.1.1/session.sessionToken

@@ -0,0 +1,2 @@
+sessionToken=An_Sx6HQ9HDiER4VJ_t7NhBGIBe_GihpYOFJgq0GlBhea1Jw84tmjfObBWv_hGG9tyxsj4gFTzMpW1_APVk0QR5CAqEwJ6pUpzvQz-iaYMcCN6jcxJkDJ4Sop1vfFBc_swPy3i6MW9JVFQj6lYIesWX8Th9q5SDFY-2oEWM8Cm4l982MFaWrauA3b0TbPeMcSnN0O8A63Khi3X_5DMODnmNf3XSs3Dp_jCYWDSUlPP2Unmb_MXhhw_9EYGQBFeQmqqnECCF8tU_yUO4YWtKxm8Yz6uB0EbPIy6U4QMmOXc1hfBZnShX-qhC7_0Mte2iJHRlUCP79aTdFUc-4tCDJINJFxNG7weVA8ZQLQFssCH95bA4VNUtM33yygUYuwh-HJfrPgOS4_6fwQOtu3wqtAoUqoJv181H4ObIpt9YNHuB7FgHuwRhJ5VUQrKfWrvGvMMQiozDiuOwFHBBR8YzjzRmWNlHB_m06giuHwVSfWH4X-aAAF630XM6PPL1XhnWI9ZhhqdXUjGHNYtJroAEfgWEeDPY2HkvoRNKIOC013Cm4MEoztA6FVwUts4QnJI_nSh4zBpLK_D4q_hSNDNiHVWhPFmuJV4Cd3ZcNleuv9ldEUJZp65LXn6gQN3ow2qnGpZFGqy-oLMQ1V88I6B-PNa3s9UeN_jhYVZvrTMIV9on8bkAnSozRTX0K9B7UCHGQQOJ0vJQ
+deviceId=ec1dce54-25ff-4b0a-ae46-0cc3e6fa9fb8

maxuserapi-0.1.1/tests.py

@@ -0,0 +1,19 @@
+import sys
+import asyncio
+
+if sys.platform == 'win32':
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+
+from maxuserapi import Client
+
+app = Client("session")
+
+@app.on_message(chat_id=app.favourite, text_filter="Привет")
+async def handle_message(client, message):
+    await message.reply("Привет! Это ответ от бота.")
+
+if __name__ == "__main__":
+    try:
+        app.run()
+    except KeyboardInterrupt:
+        print("\n[+] Скрипт успешно остановлен пользователем.")