优化登录凭据失效的问题

custom_components/ha_cloud_music/browse_media.py

@@ -6,7 +6,6 @@ from homeassistant.util.json import save_json
 from custom_components.ha_cloud_music.http_api import http_get
 from .utils import parse_query
 
-from http.cookies import SimpleCookie
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     BrowseError, BrowseMedia,
@@ -296,19 +295,10 @@ async def async_browse_media(media_player, media_content_type, media_content_id)
     if media_content_id.startswith(CloudMusicRouter.my_login):
         # 用户登录        
         res = await cloud_music.netease_cloud_music(f'/login/qr/check?key={id}&t={int(time.time())}')
-        _LOGGER.debug(res)
         message = res['message']
         if res['code'] == 803:
             title = f'{message}，刷新页面开始使用吧'
-            # ck格式化
-            s = SimpleCookie(res['cookie'])
-            cookie = {v.key:v.value for k,v in s.items()}
-            # 设置cookie
-            cloud_music.userinfo['cookie'] = cookie
-            res = await cloud_music.netease_cloud_music('/user/account')
-            _LOGGER.debug(res)
-            cloud_music.userinfo['uid'] = res['account']['id']
-            save_json(cloud_music.userinfo_filepath, cloud_music.userinfo)
+            await cloud_music.qrcode_login(res['cookie'])
         else:
             title = f'{message}，点击返回重试'
 

custom_components/ha_cloud_music/cloud_music.py

@@ -5,6 +5,7 @@ from .http_api import http_get, http_cookie
 from .models.music_info import MusicInfo, MusicSource
 from homeassistant.helpers.storage import STORAGE_DIR
 from homeassistant.util.json import load_json, save_json
+from http.cookies import SimpleCookie
 
 from .browse_media import (
     async_browse_media, 
@@ -75,6 +76,33 @@ class CloudMusic():
         else:
             print(res_data)
 
+    # 二维码登录
+    async def qrcode_login(self, cookie_str):
+        s = SimpleCookie(cookie_str)
+        cookie = {v.key:v.value for k,v in s.items()}
+        # 设置cookie
+        self.userinfo['cookie'] = cookie
+        res = await self.netease_cloud_music('/user/account')
+        self.userinfo['uid'] = res['account']['id']
+        save_json(self.userinfo_filepath, self.userinfo)
+
+    # 退出
+    def logout(self):
+        self.userinfo = {}
+        self.login_qrcode = {
+            'key': None,
+            'time': None,
+            'url': None
+        }
+        self.notification('用户凭据失效，请重新登录。如果多次失败，请联系插件作者')
+
+    def notification(self, message, notification_id='ha_cloud_music'):
+        self.hass.services.call('persistent_notification', 'create', {
+            'title': '云音乐',
+            'message': message,
+            'notification_id': notification_id
+        })
+
     # 获取播放链接
     def get_play_url(self, id, song, singer, source):
         base_url = get_url(self.hass, prefer_external=True)
@@ -84,7 +112,10 @@ class CloudMusic():
 
     # 网易云音乐接口
     async def netease_cloud_music(self, url):
-        return await http_get(self.api_url + url, self.userinfo.get('cookie', {}))
+        res = await http_get(self.api_url + url, self.userinfo.get('cookie', {}))
+        if res.get('code') == 301 and res.get('msg') == '需要登录':
+            self.logout()
+        return res
 
     # 获取音乐链接
     async def song_url(self, id):

custom_components/ha_cloud_music/manifest.json

@@ -1,7 +1,7 @@
 {
     "domain": "ha_cloud_music",
     "name": "\u4E91\u97F3\u4E50",
-    "version": "2023.4.7",
+    "version": "2023.4.10",
     "config_flow": true,
     "documentation": "https://github.com/shaonianzhentan/ha_cloud_music",
     "requirements": [