修复automap gps获取数据签名错误

Author: dscao

custom_components/cloud_gps/autoamap_data_fetcher.py

@@ -64,47 +64,84 @@ def __init__(self, hass, username, password, device_imei, location_key):
         self.address = {}
         self.lastgpstime = datetime.datetime.now()
 
-        # 使用自定义编码器的存储
         self._store = Store(
             hass, 
             version=1, 
             key=f"cloud_gps_{slugify(location_key)}",
             private=False,
-            encoder=DateTimeEncoder  # 使用自定义编码器
+            encoder=DateTimeEncoder  
         )
-
-        # 使用简单标志而不是立即加载
         self._persisted_data_loaded = False
 
-        headers = {
-            'Host': 'ts.amap.com',
-            'Accept': 'application/json',
-            'sessionid': password.split("||")[1],
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
-            'Cookie': 'sessionid=' + password.split("||")[1],
-        }
-        self.session_autoamap.headers.update(headers)
+        # 尝试解析 JSON 格式的新版 password
+        try:
+            self.amap_req_data = json.loads(self.password)
+        except Exception:
+            self.amap_req_data = None
+            # 兼容老版本 || 的逻辑
+            pwd_parts = self.password.split("||")
+            session_id = pwd_parts[1] if len(pwd_parts) > 1 else ""
+            headers = {
+                'Host': 'ts.amap.com',
+                'Accept': 'application/json',
+                'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+                'Cookie': f'sessionid={session_id}',
+            }
+            self.session_autoamap.headers.update(headers)
 
     def _get_devices_info(self):        
-        url = str.format(AUTOAMAP_API_HOST + self.password.split("||")[0])
-        p_data = self.password.split("||")[2]
-        resp = self.session_autoamap.post(url, data=p_data).json()["data"]["carLinkInfoList"]
-        return resp
+        if self.amap_req_data:
+            # === 新版完整 Header 还原逻辑 ===
+            url = f"http://ts.amap.com{self.amap_req_data['url_path']}"
+            
+            # 使用抓包里完整附带的所有 x-sign, x-t 等 Header
+            headers = dict(self.amap_req_data['headers']) 
+            
+            # 必须剔除这些，防止与 requests 冲突
+            for key in ["Content-Length", "content-length", "Host", "host", "Accept-Encoding"]:
+                headers.pop(key, None)
+                
+            raw_bytes = self.amap_req_data['body'].encode('utf-8')
+            
+            try:
+                response = self.session_autoamap.post(url, headers=headers, data=raw_bytes, timeout=15)
+                response.raise_for_status()
+                resp_json = response.json()
+                
+                if "data" in resp_json and "carLinkInfoList" in resp_json["data"]:
+                    return resp_json["data"]["carLinkInfoList"]
+                else:
+                    _LOGGER.error("高德机车 API 响应异常: %s", resp_json)
+                    return []
+            except Exception as e:
+                _LOGGER.error("高德机车 API 请求网络失败: %s", e)
+                return []
+        else:
+            # === 老版兼容逻辑 ===
+            pwd_parts = self.password.split("||")
+            if len(pwd_parts) < 3: return []
+            url = f"{AUTOAMAP_API_HOST}{pwd_parts[0]}"
+            raw_bytes = pwd_parts[2].encode('utf-8')
+            try:
+                response = self.session_autoamap.post(url, data=raw_bytes, timeout=15)
+                return response.json().get("data", {}).get("carLinkInfoList", [])
+            except:
+                return []
 
 
     def time_diff(self, timestamp):
-            result = datetime.datetime.now() - datetime.datetime.fromtimestamp(timestamp)
-            hours = int(result.seconds / 3600)
-            minutes = int(result.seconds % 3600 / 60)
-            seconds = result.seconds%3600%60
-            if result.days > 0:
-                return("{0}天{1}小时{2}分钟".format(result.days,hours,minutes))
-            elif hours > 0:
-                return("{0}小时{1}分钟".format(hours,minutes))
-            elif minutes > 0:
-                return("{0}分钟{1}秒".format(minutes,seconds))
-            else:
-                return("{0}秒".format(seconds))
+        result = datetime.datetime.now() - datetime.datetime.fromtimestamp(timestamp)
+        hours = int(result.seconds / 3600)
+        minutes = int(result.seconds % 3600 / 60)
+        seconds = result.seconds % 3600 % 60
+        if result.days > 0:
+            return f"{result.days}天{hours}小时{minutes}分钟"
+        elif hours > 0:
+            return f"{hours}小时{minutes}分钟"
+        elif minutes > 0:
+            return f"{minutes}分钟{seconds}秒"
+        else:
+            return f"{seconds}秒"
 
 
     def get_distance(self, lat1, lng1, lat2, lng2):
@@ -156,14 +193,15 @@ async def get_data(self):
             await self._load_persisted_data()
             self._persisted_data_loaded = True
 
+        devicesinfodata = []
         try:
-            async with timeout(10): 
-                devicesinfodata =  await self.hass.async_add_executor_job(self._get_devices_info)
+            async with timeout(15): 
+                devicesinfodata = await self.hass.async_add_executor_job(self._get_devices_info)
                 _LOGGER.debug("高德机车 %s 最终数据结果: %s", self.device_imei, devicesinfodata)
         except ClientConnectorError as error:
             _LOGGER.error("高德机车 %s 连接错误: %s", self.device_imei, error)
         except asyncio.TimeoutError:
-            _LOGGER.error("高德机车 %s 获取数据超时 (10秒)", self.device_imei)
+            _LOGGER.error("高德机车 %s 获取数据超时 (15秒)", self.device_imei)
         except Exception as e:
             _LOGGER.error("高德机车 %s 未知错误: %s", self.device_imei, repr(e))
 
@@ -176,16 +214,22 @@ async def get_data(self):
                 if infodata.get("tid") == imei:
                     self.deviceinfo[imei] = infodata
                     self.deviceinfo[imei]["device_model"] = "高德地图车机版"
-                    self.deviceinfo[imei]["sw_version"] = infodata["sysInfo"]["autodiv"]
+                    # 使用 get 保护，防止 API 变化导致报错
+                    self.deviceinfo[imei]["sw_version"] = infodata.get("sysInfo", {}).get("autodiv", "unknown")
 
                     querytime = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    thislat = infodata["naviLocInfo"]["lat"]
-                    thislon = infodata["naviLocInfo"]["lon"]
+                    
+                    # 保护经纬度获取
+                    navi_info = infodata.get("naviLocInfo", {})
+                    thislat = navi_info.get("lat", 0)
+                    thislon = navi_info.get("lon", 0)
+                    
                     lastlat = self.vardata[imei].get("lastlat",0)
                     lastlon = self.vardata[imei].get("lastlon",0)
 
                     distance = self.get_distance(thislat, thislon, lastlat, lastlon)
                     status = "停车"
+                    
                     if distance > 10:
                         _LOGGER.debug("状态为运动: %s ,%s", thislat,thislon)
                         status = "行驶"
@@ -194,12 +238,13 @@ async def get_data(self):
                             self.vardata[imei]["speed"] = round((distance / distancetime * 3.6), 1)
                             self.vardata[imei]["course"] = self.calculate_bearing(thislat, thislon, lastlat, lastlon)
                         self.lastgpstime = datetime.datetime.now()
+                        
                         if self.vardata[imei].get("runorstop","run") == "stop":
                             _LOGGER.debug("变成运动: %s ,%s", thislat,thislon)
                             self.vardata[imei]["lastruntime"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") 
                         self.vardata[imei]["runorstop"] = "run"
                         self.vardata[imei]["lastlat"] = thislat
-                        self.vardata[imei]["lastlon"] = thislon 
+                        self.vardata[imei]["lastlon"] = thislon    
 
                     elif self.vardata[imei].get("runorstop","run") == "run":
                         _LOGGER.debug("变成静止: %s ,%s", thislat,thislon)
@@ -208,15 +253,15 @@ async def get_data(self):
                         self.vardata[imei]["runorstop"] = "stop"
                         self.vardata[imei]["speed"] = 0
 
-                    if infodata['naviStatus'] == 1:
+                    if infodata.get('naviStatus') == 1:
                         naviStatus = "导航中"
                         status = "导航中"
                     else:
                         naviStatus = "未导航"
 
-                    if infodata["onlineStatus"] == 1:
+                    if infodata.get("onlineStatus") == 1:
                         onlinestatus = "在线"
-                    elif infodata["onlineStatus"] == 0:
+                    elif infodata.get("onlineStatus") == 0:
                         onlinestatus = "离线"
                         status = "离线"
                     else:
@@ -234,9 +279,10 @@ async def get_data(self):
                     onlinestatus = self.vardata[imei].get("isonline","离线")
                     laststoptime = self.vardata[imei].get("laststoptime","")
                     lastruntime = self.vardata[imei].get("lastruntime","")
-                    runorstop =  self.vardata[imei].get("runorstop","运动")
+                    runorstop =  self.vardata[imei].get("runorstop","run")
                     speed =  self.vardata[imei].get("speed",0)
                     course =  self.vardata[imei].get("course",0)
+                    
                     await self._persist_data()
 
                     if laststoptime != "" and runorstop ==  "stop":
@@ -255,14 +301,22 @@ async def get_data(self):
                         "parkingtime": parkingtime,
                         "naviStatus": naviStatus,
                         "onlinestatus": onlinestatus,
-                        "lastofflinetime":lastofflinetime,
-                        "lastonlinetime":lastonlinetime
+                        "lastofflinetime": lastofflinetime,
+                        "lastonlinetime": lastonlinetime
                     }
 
-                    self.trackerdata[imei] = {"location_key":self.location_key+imei,"deviceinfo":self.deviceinfo[imei],"thislat":thislat,"thislon":thislon,"imei":imei,"status":status,"attrs":attrs}
+                    self.trackerdata[imei] = {
+                        "location_key": self.location_key + imei,
+                        "deviceinfo": self.deviceinfo[imei],
+                        "thislat": thislat,
+                        "thislon": thislon,
+                        "imei": imei,
+                        "status": status,
+                        "attrs": attrs
+                    }
 
         return self.trackerdata
 
 
 class GetDataError(Exception):
-    """request error or response data is unexpected"""
+    """request error or response data is unexpected"""