Merge pull request #16 from DarkCat09/device-id

Accept custom device_id so it can be persistently stored

Author: DarkCat09

README.md

@@ -17,20 +17,24 @@ The package is [available on PyPI](https://pypi.org/project/vkmax/)
 More in [examples](examples/)
 ```python
 import asyncio
-import logging
+from pathlib import Path
 
-import requests
-import sys
+import aiohttp
 
 from vkmax.client import MaxClient
 from vkmax.functions.messages import edit_message
 
-from pathlib import Path
+
+# global aiohttp session
+http = None
 
 
 async def get_weather(city: str) -> str:
-    response = requests.get(f"https://ru.wttr.in/{city}?Q&T&format=3")
-    return response.text
+    global http
+    if not http:
+        http = aiohttp.ClientSession()
+    response = await http.get(f"https://ru.wttr.in/{city}?Q&T&format=3")
+    return await response.text()
 
 
 async def packet_callback(client: MaxClient, packet: dict):
@@ -56,26 +60,29 @@ async def packet_callback(client: MaxClient, packet: dict):
 
 async def main():
     client = MaxClient()
-
     await client.connect()
 
-    login_token_file = Path('login_token.txt')
-
-    if login_token_file.exists():
-        login_token_from_file = login_token_file.read_text(encoding='utf-8').strip()
-        try:
-            await client.login_by_token(login_token_from_file)
-        except:
-            print("Couldn't login by token. Falling back to SMS login")
+    session_file = Path('max_session.txt')
 
-    else:
+    if not session_file.exists():
         phone_number = input('Enter your phone number: ')
-        sms_login_token = await client.send_code(phone_number)
+        sms_token = await client.send_code(phone_number)
         sms_code = int(input('Enter SMS code: '))
-        account_data = await client.sign_in(sms_login_token, sms_code)
+        account_data = await client.sign_in(sms_token, sms_code)
 
+        device_id = client.device_id
         login_token = account_data['payload']['tokenAttrs']['LOGIN']['token']
-        login_token_file.write_text(login_token, encoding='utf-8')
+
+        # save device uuid and auth token delimited by newline
+        session_file.write_text(f'{device_id}\n{login_token}')
+
+    else:
+        contents = session_file.read_text()
+        device_id, login_token = contents.split('\n', maxsplit=1)
+        try:
+            await client.login_by_token(login_token, device_id)
+        except:
+            print("Couldn't login by token")
 
     await client.set_callback(packet_callback)
 

example.py

@@ -1,31 +1,32 @@
 import asyncio
 import logging
-
-import requests
 import sys
+from pathlib import Path
+
+import aiohttp
 
 from vkmax.client import MaxClient
 from vkmax.functions.messages import edit_message
 
-from pathlib import Path
-
-date_format = '%d.%m.%Y %H:%M:%S'
-logging_format = '[%(asctime)s] [%(name)s] [%(levelname)s] %(message)s'
-
-handlers = [
-    logging.StreamHandler(sys.stdout)
-]
 
+# setup logging with custom format and level `info`
 logging.basicConfig(
-    format=logging_format,
-    datefmt=date_format,
-    handlers=handlers,
+    format='[%(asctime)s] [%(name)s] [%(levelname)s] %(message)s',
+    datefmt='%d.%m.%Y %H:%M:%S',
+    handlers=[logging.StreamHandler(sys.stdout)],
     level=logging.INFO
 )
 
+# global aiohttp session
+http = None
+
+
 async def get_weather(city: str) -> str:
-    response = requests.get(f"https://ru.wttr.in/{city}?Q&T&format=3")
-    return response.text
+    global http
+    if not http:
+        http = aiohttp.ClientSession()
+    response = await http.get(f"https://ru.wttr.in/{city}?Q&T&format=3")
+    return await response.text()
 
 
 async def packet_callback(client: MaxClient, packet: dict):
@@ -51,26 +52,29 @@ async def packet_callback(client: MaxClient, packet: dict):
 
 async def main():
     client = MaxClient()
-
     await client.connect()
 
-    login_token_file = Path('login_token.txt')
+    session_file = Path('max_session.txt')
 
-    if login_token_file.exists():
-        login_token_from_file = login_token_file.read_text(encoding='utf-8').strip()
-        try:
-            await client.login_by_token(login_token_from_file)
-        except:
-            print("Couldn't login by token. Falling back to SMS login")
-
-    else:
-        phone_number = input('Your phone number: ')
-        sms_login_token = await client.send_code(phone_number)
+    if not session_file.exists():
+        phone_number = input('Enter your phone number: ')
+        sms_token = await client.send_code(phone_number)
         sms_code = int(input('Enter SMS code: '))
-        account_data = await client.sign_in(sms_login_token, sms_code)
+        account_data = await client.sign_in(sms_token, sms_code)
 
+        device_id = client.device_id
         login_token = account_data['payload']['tokenAttrs']['LOGIN']['token']
-        login_token_file.write_text(login_token, encoding='utf-8')
+
+        # save device uuid and auth token delimited by newline
+        session_file.write_text(f'{device_id}\n{login_token}')
+
+    else:
+        contents = session_file.read_text()
+        device_id, login_token = contents.split('\n', maxsplit=1)
+        try:
+            await client.login_by_token(login_token, device_id)
+        except:
+            print("Couldn't login by token")
 
     await client.set_callback(packet_callback)
 

vkmax/client.py

@@ -34,6 +34,7 @@ def __init__(self):
         self._connection: Optional[ClientConnection] = None
         self._http_pool: Optional[aiohttp.ClientSession] = None
         self._is_logged_in: bool = False
+        self._device_id: Optional[str] = None
         self._seq = itertools.count(1)
         self._keepalive_task: Optional[asyncio.Task] = None
         self._recv_task: Optional[asyncio.Task] = None
@@ -166,7 +167,8 @@ async def _stop_keepalive_task(self):
     # --- Authentication ---
 
     @ensure_connected
-    async def _send_hello_packet(self):
+    async def _send_hello_packet(self, device_id: Optional[str] = None):
+        self._device_id = device_id or f'{uuid.uuid4()}'
         return await self.invoke_method(
             opcode=6,
             payload={
@@ -181,7 +183,7 @@ async def _send_hello_packet(self):
                     "screen": "956x1470 2.0x",
                     "timezone": "Asia/Vladivostok"
                 },
-                "deviceId": str(uuid.uuid4())
+                "deviceId": self._device_id,
             }
         )
 
@@ -230,8 +232,8 @@ async def sign_in(self, sms_token: str, sms_code: int):
         return verification_response
 
     @ensure_connected
-    async def login_by_token(self, token: str):
-        await self._send_hello_packet()
+    async def login_by_token(self, token: str, device_id: Optional[str] = None):
+        await self._send_hello_packet(device_id)
         _logger.info("using session")
         login_response = await self.invoke_method(
             opcode=19,
@@ -260,3 +262,7 @@ async def login_by_token(self, token: str):
         await self._start_keepalive_task()
 
         return login_response
+
+    @property
+    def device_id(self) -> Optional[str]:
+        return self._device_id