mijiaAPI 1.3.12__tar.gz → 1.3.13__tar.gz

{mijiaapi-1.3.12 → mijiaapi-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mijiaAPI
-Version: 1.3.12
+Version: 1.3.13
 Summary: A Python API for Xiaomi Mijia
 License: GPLv3
 Author: Do1e

{mijiaapi-1.3.12 → mijiaapi-1.3.13}/mijiaAPI/apis.py

@@ -1,4 +1,6 @@
+from datetime import datetime
 from typing import Union
+
 import requests
 import requests.cookies
 
@@ -43,13 +45,12 @@ class mijiaAPI(object):
         Returns:
             bool: API可用返回True，否则返回False。
         """
-        uri = '/home/device_list'
-        data = {"getVirtualModel": False, "getHuamiDevices": 0}
-        try:
-            post_data(self.session, self.ssecurity, uri, data)
+        if 'expireTime' in self.session.cookies:
+            expire_time = datetime.strptime(self.session.cookies['expireTime'], '%Y-%m-%d %H:%M:%S')
+            if expire_time < datetime.now():
+                return False
             return True
-        except PostDataError:
-            return False
+        return False
 
     def get_devices_list(self) -> dict:
         """

{mijiaapi-1.3.12 → mijiaapi-1.3.13}/mijiaAPI/login.py

@@ -1,18 +1,20 @@
-from typing import Optional
 import hashlib
 import json
 import os
 import random
+import re
 import string
 import time
+from datetime import datetime, timedelta
+from typing import Optional
 from urllib import parse
 
-from qrcode import QRCode
 import requests
+from qrcode import QRCode
 
+from .logger import logger
 from .urls import msgURL, loginURL, qrURL, accountURL
 from .utils import defaultUA
-from .logger import logger
 
 
 class LoginError(Exception):
@@ -94,6 +96,34 @@ class mijiaLogin(object):
         }
         return data
 
+    @staticmethod
+    def extract_latest_gmt_datetime(data: dict) -> datetime:
+        """
+        提取过期时间并转换为中国时区。
+
+        Args:
+            data (dict): 用户凭证数据，包含GMT时间的键值对。
+
+        Returns:
+            datetime: 转换后的中国时区时间。
+
+        Raises:
+            LoginError: 如果没有找到GMT时间键或解析失败，抛出登录错误。
+        """
+
+        gmt_time_keys = [
+            k for k in data.keys() if
+            isinstance(k, str) and re.match(r'\d{2}-[A-Za-z]{3}-\d{4} \d{2}:\d{2}:\d{2} GMT', k)
+        ]
+
+        if not gmt_time_keys:
+            raise LoginError(-1, 'No GMT time keys found in the data')
+        parsed_times = [datetime.strptime(k, '%d-%b-%Y %H:%M:%S GMT') for k in gmt_time_keys]
+        latest_utc_time = max(parsed_times)
+        china_time = latest_utc_time + timedelta(hours=8)
+
+        return china_time
+
     def _save_auth(self) -> None:
         """
         保存认证数据到文件。
@@ -127,7 +157,8 @@ class mijiaLogin(object):
         Raises:
             LoginError: 登录失败时抛出。
         """
-        logger.warning('There is a high probability of verification code with account and password. Please try other login methods')
+        logger.warning(
+            'There is a high probability of verification code with account and password. Please try other login methods')
         data = self._get_index()
         post_data = {
             'qs': data['qs'],
@@ -148,21 +179,22 @@ class mijiaLogin(object):
             raise LoginError(-1, 'Failed to get location')
         if 'notificationUrl' in ret_data:
             raise LoginError(-1, 'Verification code required, please try other login methods')
-        auth_data = {
-            'userId': ret_data['userId'],
-            'ssecurity': ret_data['ssecurity'],
-            'deviceId': data['deviceId'],
-        }
         ret = self.session.get(ret_data['location'])
         if ret.status_code != 200:
             raise LoginError(ret.status_code, f'Failed to get location, {ret.text}')
         cookies = self.session.cookies.get_dict()
-        auth_data['serviceToken'] = cookies['serviceToken']
-        self.auth_data = auth_data
-        self.auth_data.update(self._get_account(auth_data['userId']))
+
+        self.auth_data = {
+            'userId': ret_data['userId'],
+            'ssecurity': ret_data['ssecurity'],
+            'deviceId': data['deviceId'],
+            'serviceToken': cookies['serviceToken'],
+            'expireTime': self.extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
+            **self._get_account(ret_data['userId'])
+        }
 
         self._save_auth()
-        return auth_data
+        return self.auth_data
 
     @staticmethod
     def _print_qr(loginurl: str, box_size: int = 10) -> None:
@@ -232,21 +264,22 @@ class mijiaLogin(object):
         ret_data = json.loads(ret.text[11:])
         if ret_data['code'] != 0:
             raise LoginError(ret_data['code'], ret_data['desc'])
-        auth_data = {
-            'userId': ret_data['userId'],
-            'ssecurity': ret_data['ssecurity'],
-            'deviceId': data['deviceId'],
-        }
         ret = self.session.get(ret_data['location'])
         if ret.status_code != 200:
             raise LoginError(ret.status_code, f'Failed to get location, {ret.text}')
         cookies = self.session.cookies.get_dict()
-        auth_data['serviceToken'] = cookies['serviceToken']
-        self.auth_data = auth_data
-        self.auth_data.update(self._get_account(auth_data['userId']))
+
+        self.auth_data = {
+            'userId': ret_data['userId'],
+            'ssecurity': ret_data['ssecurity'],
+            'deviceId': data['deviceId'],
+            'serviceToken': cookies['serviceToken'],
+            'expireTime': self.extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
+            **self._get_account(ret_data['userId'])
+        }
 
         self._save_auth()
-        return auth_data
+        return self.auth_data
 
     def __del__(self):
         """

{mijiaapi-1.3.12 → mijiaapi-1.3.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mijiaAPI"
-version = "1.3.12"
+version = "1.3.13"
 description = "A Python API for Xiaomi Mijia"
 readme = "README.md"
 requires-python = ">=3.9,<4.0"
@@ -12,7 +12,7 @@ dependencies = [
 
 [tool.poetry]
 name = "mijiaAPI"
-version = "1.3.12"
+version = "1.3.13"
 description = "A Python API for Xiaomi Mijia"
 authors = ["Do1e <dpj.email@qq.com>"]
 license = "GPLv3"

mijiaapi-1.3.12/mijiaAPI/__main__.py

@@ -1,27 +0,0 @@
-import argparse
-import sys
-
-from .login import mijiaLogin
-
-def parse_args(args):
-    parser = argparse.ArgumentParser(description="Mijia API CLI")
-    parser.add_argument(
-        '-i', '--login',
-        action='store_true',
-        help="Login by QR code and save cookies to file",
-    )
-    parser.add_argument(
-        '-c', '--cookie_path',
-        type=str,
-        help="Path to the cookies file",
-    )
-    return parser.parse_args(args)
-
-def main(args):
-    args = parse_args(args)
-    if args.login:
-        api = mijiaLogin(save_path=args.cookie_path)
-        auth = api.QRlogin()
-
-if __name__ == "__main__":
-    main(sys.argv[1:])