From 1f00654a14f2861e8d4722cf8190fc105878d3df Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Mon, 3 Nov 2025 14:11:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=B7=A5=E5=85=B7=E7=B1=BB):=20?=
 =?UTF-8?q?=E5=B0=86=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4=E7=9A=84=E6=96=B9=E6=B3=95=E5=B0=81=E8=A3=85=E6=88=90?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/appConnector.js                     | 125 ++++++++++++++++++
 src/views/Invitation/InvitationToRegister.vue |  20 +--
 2 files changed, 126 insertions(+), 19 deletions(-)
 create mode 100644 src/utils/appConnector.js

diff --git a/src/utils/appConnector.js b/src/utils/appConnector.js
new file mode 100644
index 0000000..0cc7511
--- /dev/null
+++ b/src/utils/appConnector.js
@@ -0,0 +1,125 @@
+// src/utils/appConnector.js
+import {
+  connectApplication,
+  parseAccessOrigin,
+  parseHeader,
+  setHttpHeaders,
+  isInApp,
+} from '@/utils/appBridge.js'
+import {
+  appConnectionManager,
+  isAppConnected,
+  getAppHeaderInfo,
+} from '@/utils/appConnectionManager.js'
+
+/**
+ * 统一的APP连接工具函数
+ * @param {Function} onConnected - 连接成功回调
+ * @param {Function} onFailed - 连接失败回调
+ * @returns {Promise<Object>} 连接结果
+ */
+export const connectToApp = async (onConnected, onFailed) => {
+  console.group('🔗 APP Connection Process')
+  console.debug('🚀 Starting APP connection...')
+
+  try {
+    // 检查是否在APP环境中
+    if (!isInApp()) {
+      console.debug('🌐 Browser environment detected')
+      console.groupEnd()
+
+      // 触发连接成功回调
+      if (onConnected) onConnected()
+
+      return { success: true, environment: 'browser' }
+    }
+
+    // 检查是否已经连接且未过期
+    if (isAppConnected()) {
+      console.debug('✅ APP already connected and valid')
+
+      // 使用缓存的头部信息
+      const cachedHeaderInfo = getAppHeaderInfo()
+      if (cachedHeaderInfo) {
+        console.debug('🔧 Using cached HTTP headers')
+      }
+
+      console.groupEnd()
+
+      // 触发连接成功回调
+      if (onConnected) onConnected()
+
+      return { success: true, environment: 'app', fromCache: true }
+    }
+
+    // 检查是否有正在进行的连接
+    if (appConnectionManager.isConnecting()) {
+      console.debug('⏳ Connection already in progress, waiting...')
+      await appConnectionManager.getConnectionPromise()
+      console.debug('✅ Connected via existing process')
+      console.groupEnd()
+
+      // 触发连接成功回调
+      if (onConnected) onConnected()
+
+      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) {
+              // 解析头部信息
+              const headerInfo = parseHeader(result.data)
+
+              // 设置HTTP请求头
+              console.debug('🔧 Setting HTTP headers...')
+              await setHttpHeaders(headerInfo)
+
+              // 标记连接成功
+              appConnectionManager.setConnected(headerInfo)
+
+              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 (onConnected) onConnected()
+
+    return connectionResult
+  } catch (error) {
+    console.error('❌ Connection failed:', error)
+    console.groupEnd()
+
+    // 触发连接失败回调
+    if (onFailed) onFailed(error)
+
+    return { success: false, error: error.message }
+  }
+}
diff --git a/src/views/Invitation/InvitationToRegister.vue b/src/views/Invitation/InvitationToRegister.vue
index 543553f..12fc5b4 100644
--- a/src/views/Invitation/InvitationToRegister.vue
+++ b/src/views/Invitation/InvitationToRegister.vue
@@ -428,23 +428,10 @@
 </template>
 
 <script setup>
-import {
-  connectApplication,
-  parseAccessOrigin,
-  parseHeader,
-  setHttpHeaders,
-  isInApp,
-  gotoPrivateChat,
-} from '@/utils/appBridge.js'
-import {
-  appConnectionManager,
-  isAppConnected,
-  getAppHeaderInfo,
-} from '@/utils/appConnectionManager.js'
+import { gotoPrivateChat } from '@/utils/appBridge.js'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import GeneralHeader from '@/components/GeneralHeader.vue'
 import maskLayer from '../../components/MaskLayer.vue'
-import { getMemberProfile } from '@/api/wallet'
 import { showError, showWarning, showInfo, showSuccess } from '@/utils/toast.js'
 import { useClipboard } from '@vueuse/core'
 import {
@@ -472,10 +459,6 @@ const images = Object.fromEntries(
 
 const { copy, isSupported } = useClipboard()
 
-const isInAppEnvironment = ref(false) // 检测是否在APP环境中
-const appConnected = ref(false)
-const headerInfo = ref({})
-
 const helpInfoShow = ref(false) //帮助模块
 const enterCodeShow = ref(false) //交易弹窗
 const tipShow = ref(false) //提示弹窗
@@ -634,7 +617,6 @@ const connectToAppHandler = async () => {
 
 onMounted(() => {
   connectToAppHandler()
-  isInAppEnvironment.value = isInApp()
 })
 </script>