From 3db467c67b5a2f88e7f2c99bf381fa9a5be74f1f Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Mon, 22 Sep 2025 20:22:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AF=B7=E6=B1=82=E5=A4=B4):=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=8E=B7=E5=8F=96=E8=AF=B7=E6=B1=82=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TopList/TopList.vue       | 147 +++++++++++++++++++++++++++-
 src/views/WeeklyStar/WeeklyStar.vue | 136 ++++++++++++++++++++++++-
 2 files changed, 280 insertions(+), 3 deletions(-)

diff --git a/src/views/TopList/TopList.vue b/src/views/TopList/TopList.vue
index 9a27a04..87ac364 100644
--- a/src/views/TopList/TopList.vue
+++ b/src/views/TopList/TopList.vue
@@ -638,7 +638,18 @@
 </template>
 
 <script setup>
-import { isInApp } from '../../utils/appBridge.js'
+import {
+  connectApplication,
+  parseAccessOrigin,
+  parseHeader,
+  setHttpHeaders,
+  isInApp,
+} from '@/utils/appBridge.js'
+import {
+  appConnectionManager,
+  isAppConnected,
+  getAppHeaderInfo,
+} from '@/utils/appConnectionManager.js'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import borderImg from '../../components/TopList/borderImg.vue'
 import maskLayer from '../../components/MaskLayer.vue'
@@ -661,6 +672,139 @@ const images = Object.fromEntries(
   })
 )
 
+const appConnected = ref(false)
+const headerInfo = ref({})
+
+/**
+ * 连接APP并获取认证信息（优化版 - 仅专注连接）
+ */
+const connectToApp = async () => {
+  console.group('🔗 APP Connection Process')
+  console.debug('🚀 Starting APP connection...')
+
+  try {
+    // 检查是否在APP环境中
+    if (!isInApp()) {
+      console.debug('🌐 Browser environment detected')
+      appConnected.value = true
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'browser' })
+      // }
+
+      return { success: true, environment: 'browser' }
+    }
+
+    // 检查是否已经连接且未过期
+    if (isAppConnected()) {
+      console.debug('✅ APP already connected and valid')
+      appConnected.value = true
+
+      // 使用缓存的头部信息
+      const cachedHeaderInfo = getAppHeaderInfo()
+      if (cachedHeaderInfo) {
+        headerInfo.value = cachedHeaderInfo
+        console.debug('🔧 Using cached HTTP headers')
+      }
+
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'app', fromCache: true })
+      // }
+
+      return { success: true, environment: 'app', fromCache: true }
+    }
+
+    // 检查是否有正在进行的连接
+    if (appConnectionManager.isConnecting()) {
+      console.debug('⏳ Connection already in progress, waiting...')
+      await appConnectionManager.getConnectionPromise()
+      appConnected.value = true
+      console.debug('✅ Connected via existing process')
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'app', fromCache: true })
+      // }
+
+      return { success: true, environment: 'app', fromCache: true }
+    }
+
+    // 建立新的APP连接
+    console.debug('📱 Establishing new APP connection...')
+
+    const connectionResult = await new Promise((resolve, reject) => {
+      const connectionPromise = new Promise((connectResolve, connectReject) => {
+        connectApplication(async (access) => {
+          try {
+            const result = parseAccessOrigin(access)
+
+            if (result.success) {
+              // 解析头部信息
+              headerInfo.value = parseHeader(result.data)
+
+              // 设置HTTP请求头
+              console.debug('🔧 Setting HTTP headers...')
+              await setHttpHeaders(headerInfo.value)
+
+              // 标记连接成功
+              appConnected.value = true
+              appConnectionManager.setConnected(headerInfo.value)
+
+              console.debug('🎉 APP connection established successfully')
+              connectResolve({ success: true, environment: 'app', fromCache: false })
+            } else {
+              console.error('❌ Failed to parse access origin:', result.error)
+              appConnectionManager.reset()
+              connectReject(new Error(result.error))
+            }
+          } catch (error) {
+            console.error('❌ Connection process failed:', error)
+            appConnectionManager.reset()
+            connectReject(error)
+          }
+        })
+      })
+
+      // 设置连接状态
+      appConnectionManager.setConnecting(connectionPromise)
+
+      connectionPromise.then(resolve).catch(reject)
+    })
+
+    console.debug('✅ Connection completed successfully')
+    console.groupEnd()
+
+    // 触发连接成功回调
+    // if (onConnectionSuccess) {
+    //   onConnectionSuccess(connectionResult)
+    // }
+
+    return connectionResult
+  } catch (error) {
+    console.error('❌ Connection failed:', error)
+    appConnected.value = false
+    console.groupEnd()
+
+    // 触发连接失败回调
+    if (onConnectionFailed) {
+      onConnectionFailed(error)
+    }
+
+    // 连接失败的特殊处理
+    if (error.message && error.message.includes('parse access')) {
+      router.push({ path: '/not_app', query: { message: error.message } })
+    }
+
+    return { success: false, error: error.message }
+  }
+}
+
 const userInfo = ref({})
 
 const visibleKingList = ref(true)
@@ -941,6 +1085,7 @@ const updatePageData = () => {
 // 组件挂载时检测环境
 onMounted(() => {
   isInAppEnvironment.value = isInApp()
+  connectToApp()
 
   getCountdown()
   timer = setInterval(getCountdown, 1000) //每秒更新
diff --git a/src/views/WeeklyStar/WeeklyStar.vue b/src/views/WeeklyStar/WeeklyStar.vue
index 4ffd1f0..3bac2b6 100644
--- a/src/views/WeeklyStar/WeeklyStar.vue
+++ b/src/views/WeeklyStar/WeeklyStar.vue
@@ -742,7 +742,6 @@ import itemCenter from '@/components/WeeklyStar/itemCenter.vue'
 import TopUser from '@/components/WeeklyStar/topUser.vue'
 import maskLayer from '../../components/MaskLayer.vue'
 import { useDebounce, useThrottle } from '@/utils/useDebounce'
-import { usePageInitializationWithConfig } from '@/utils/pageConfig.js'
 import { getMemberProfile } from '@/api/wallet'
 import { showError, showWarning, showInfo, showSuccess } from '@/utils/toast.js'
 import {
@@ -765,6 +764,139 @@ const images = Object.fromEntries(
   })
 )
 
+const appConnected = ref(false)
+const headerInfo = ref({})
+
+/**
+ * 连接APP并获取认证信息（优化版 - 仅专注连接）
+ */
+const connectToApp = async () => {
+  console.group('🔗 APP Connection Process')
+  console.debug('🚀 Starting APP connection...')
+
+  try {
+    // 检查是否在APP环境中
+    if (!isInApp()) {
+      console.debug('🌐 Browser environment detected')
+      appConnected.value = true
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'browser' })
+      // }
+
+      return { success: true, environment: 'browser' }
+    }
+
+    // 检查是否已经连接且未过期
+    if (isAppConnected()) {
+      console.debug('✅ APP already connected and valid')
+      appConnected.value = true
+
+      // 使用缓存的头部信息
+      const cachedHeaderInfo = getAppHeaderInfo()
+      if (cachedHeaderInfo) {
+        headerInfo.value = cachedHeaderInfo
+        console.debug('🔧 Using cached HTTP headers')
+      }
+
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'app', fromCache: true })
+      // }
+
+      return { success: true, environment: 'app', fromCache: true }
+    }
+
+    // 检查是否有正在进行的连接
+    if (appConnectionManager.isConnecting()) {
+      console.debug('⏳ Connection already in progress, waiting...')
+      await appConnectionManager.getConnectionPromise()
+      appConnected.value = true
+      console.debug('✅ Connected via existing process')
+      console.groupEnd()
+
+      // 触发连接成功回调
+      // if (onConnectionSuccess) {
+      //   onConnectionSuccess({ environment: 'app', fromCache: true })
+      // }
+
+      return { success: true, environment: 'app', fromCache: true }
+    }
+
+    // 建立新的APP连接
+    console.debug('📱 Establishing new APP connection...')
+
+    const connectionResult = await new Promise((resolve, reject) => {
+      const connectionPromise = new Promise((connectResolve, connectReject) => {
+        connectApplication(async (access) => {
+          try {
+            const result = parseAccessOrigin(access)
+
+            if (result.success) {
+              // 解析头部信息
+              headerInfo.value = parseHeader(result.data)
+
+              // 设置HTTP请求头
+              console.debug('🔧 Setting HTTP headers...')
+              await setHttpHeaders(headerInfo.value)
+
+              // 标记连接成功
+              appConnected.value = true
+              appConnectionManager.setConnected(headerInfo.value)
+
+              console.debug('🎉 APP connection established successfully')
+              connectResolve({ success: true, environment: 'app', fromCache: false })
+            } else {
+              console.error('❌ Failed to parse access origin:', result.error)
+              appConnectionManager.reset()
+              connectReject(new Error(result.error))
+            }
+          } catch (error) {
+            console.error('❌ Connection process failed:', error)
+            appConnectionManager.reset()
+            connectReject(error)
+          }
+        })
+      })
+
+      // 设置连接状态
+      appConnectionManager.setConnecting(connectionPromise)
+
+      connectionPromise.then(resolve).catch(reject)
+    })
+
+    console.debug('✅ Connection completed successfully')
+    console.groupEnd()
+
+    // 触发连接成功回调
+    // if (onConnectionSuccess) {
+    //   onConnectionSuccess(connectionResult)
+    // }
+
+    return connectionResult
+  } catch (error) {
+    console.error('❌ Connection failed:', error)
+    appConnected.value = false
+    console.groupEnd()
+
+    // 触发连接失败回调
+    if (onConnectionFailed) {
+      onConnectionFailed(error)
+    }
+
+    // 连接失败的特殊处理
+    if (error.message && error.message.includes('parse access')) {
+      router.push({ path: '/not_app', query: { message: error.message } })
+    }
+
+    return { success: false, error: error.message }
+  }
+}
+
 const userInfo = ref({})
 
 const isInAppEnvironment = ref(false) // 检测是否在APP环境中
@@ -1087,7 +1219,7 @@ const observer = new IntersectionObserver((entries) => {
 
 // 组件挂载时检测环境
 onMounted(() => {
-  usePageInitializationWithConfig('APPLY')
+  connectToApp()
   isInAppEnvironment.value = isInApp()
 
   getCountdown()