From b6581adc51697c15d0ef6e40fef9817b2e886e94 Mon Sep 17 00:00:00 2001
From: XuqmGroup <noreply@xuqm.com>
Date: Tue, 16 Jun 2026 14:48:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=20=E2=80=94=20XWebView=20Pressable/Clipboard?=
 =?UTF-8?q?=E3=80=81configCrypto=20=E6=B6=88=E9=99=A4=20any=E3=80=81Update?=
 =?UTF-8?q?SDK=20AsyncStorage=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- XWebViewView/XWebViewScreen: TouchableOpacity → Pressable
- XWebViewView/XWebViewScreen: Clipboard 改用 @react-native-clipboard/clipboard
- configCrypto.ts: 6 处 any 替换为 SubtleCryptoLike 接口
- UpdateSDK: CachedRnBundle 移除 source 字段，AsyncStorage 仅存版本元数据
- xwebview 添加 @react-native-clipboard/clipboard peerDependency
---
 packages/common/package.json             |  1 +
 packages/common/src/configCrypto.ts      | 20 +++++++++++---------
 packages/update/src/UpdateSDK.ts         |  4 +---
 packages/xwebview/package.json           |  2 ++
 packages/xwebview/src/XWebViewScreen.tsx | 24 ++++++++++++------------
 packages/xwebview/src/XWebViewView.tsx   | 17 +++++++----------
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/packages/common/package.json b/packages/common/package.json
index 9a13f5a..26cad39 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -28,6 +28,7 @@
     "@react-native-async-storage/async-storage": "^2.1.2",
     "axios": "^1.7.0",
     "react": "^19.0.0",
+    "react-native": "^0.85.0",
     "zod": "^3.23.0"
   }
 }
diff --git a/packages/common/src/configCrypto.ts b/packages/common/src/configCrypto.ts
index 07b96be..3e9c394 100644
--- a/packages/common/src/configCrypto.ts
+++ b/packages/common/src/configCrypto.ts
@@ -28,10 +28,15 @@ export interface DecryptedConfig {
   expiresAt?: string
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function getSubtle(): any {
+interface SubtleCryptoLike {
+  importKey(format: string, keyData: BufferSource, algorithm: string | Record<string, unknown>, extractable: boolean, keyUsages: string[]): Promise<CryptoKey>
+  deriveKey(algorithm: string | Record<string, unknown>, baseKey: CryptoKey, derivedKeyAlgorithm: string | Record<string, unknown>, extractable: boolean, keyUsages: string[]): Promise<CryptoKey>
+  decrypt(algorithm: string | Record<string, unknown>, key: CryptoKey, data: BufferSource): Promise<ArrayBuffer>
+}
+
+function getSubtle(): SubtleCryptoLike {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const qc = require('react-native-quick-crypto') as any
+  const qc = require('react-native-quick-crypto') as { subtle?: SubtleCryptoLike; default?: { subtle?: SubtleCryptoLike } }
   const subtle = qc.subtle ?? qc.default?.subtle
   if (!subtle) throw new Error('[XuqmSDK] react-native-quick-crypto not available')
   return subtle
@@ -43,8 +48,7 @@ function base64UrlDecode(s: string): Uint8Array {
   return Uint8Array.from({ length: binary.length }, (_, i) => binary.charCodeAt(i))
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function deriveKey(salt: Uint8Array, passphrase: string): Promise<any> {
+async function deriveKey(salt: Uint8Array, passphrase: string): Promise<CryptoKey> {
   const subtle = getSubtle()
   const passphraseKey = await subtle.importKey(
     'raw',
@@ -54,8 +58,7 @@ async function deriveKey(salt: Uint8Array, passphrase: string): Promise<any> {
     ['deriveKey'],
   )
   return subtle.deriveKey(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    { name: 'PBKDF2', salt: salt as any, iterations: PBKDF2_ITERATIONS, hash: 'SHA-256' },
+    { name: 'PBKDF2', salt: salt as unknown as BufferSource, iterations: PBKDF2_ITERATIONS, hash: 'SHA-256' },
     passphraseKey,
     { name: 'AES-GCM', length: 256 },
     false,
@@ -76,8 +79,7 @@ export async function decryptConfigFile(content: string): Promise<DecryptedConfi
   const passphrase = getPassphrase(magic)
   const key = await deriveKey(salt, passphrase)
   const subtle = getSubtle()
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const plainBuffer = await subtle.decrypt({ name: 'AES-GCM', iv } as any, key, ciphertext as any)
+  const plainBuffer = await subtle.decrypt({ name: 'AES-GCM', iv: iv as unknown as BufferSource }, key, ciphertext as unknown as BufferSource)
   const json = new TextDecoder().decode(plainBuffer)
   return JSON.parse(json) as DecryptedConfig
 }
diff --git a/packages/update/src/UpdateSDK.ts b/packages/update/src/UpdateSDK.ts
index 950eb98..5b44d12 100644
--- a/packages/update/src/UpdateSDK.ts
+++ b/packages/update/src/UpdateSDK.ts
@@ -55,7 +55,6 @@ interface CachedRnBundle {
   version: string
   md5: string
   downloadedAt: string
-  source: string
 }
 
 // ─── Internal state ────────────────────────────────────────────────────────────
@@ -435,12 +434,11 @@ export const UpdateSDK = {
       }
     }
 
-    // 写入 AsyncStorage 缓存（版本记录）
+    // 写入 AsyncStorage 缓存（仅版本元数据，不含 bundle 源码）
     const cachePayload: CachedRnBundle = {
       moduleId,
       version:      info.latestVersion,
       md5:          info.md5,
-      source,
       downloadedAt: new Date().toISOString(),
     }
     await AsyncStorage.setItem(bundleCacheKey(moduleId), JSON.stringify(cachePayload))
diff --git a/packages/xwebview/package.json b/packages/xwebview/package.json
index b3694bd..da6bb5c 100644
--- a/packages/xwebview/package.json
+++ b/packages/xwebview/package.json
@@ -32,6 +32,8 @@
     "@types/react": "^19.0.0",
     "@react-navigation/native": "^7.0.0",
     "@react-native-async-storage/async-storage": "^1.21.0",
+    "@react-native-clipboard/clipboard": "^1.16.3",
+    "react-native-safe-area-context": "^5.4.0",
     "typescript": "^5.9.3"
   }
 }
diff --git a/packages/xwebview/src/XWebViewScreen.tsx b/packages/xwebview/src/XWebViewScreen.tsx
index 776e795..fcc9de9 100644
--- a/packages/xwebview/src/XWebViewScreen.tsx
+++ b/packages/xwebview/src/XWebViewScreen.tsx
@@ -9,16 +9,16 @@ import {
   ActionSheetIOS,
   Alert,
   BackHandler,
-  Clipboard,
   Linking,
   Platform,
+  Pressable,
   StatusBar,
   StyleSheet,
   Text,
   ToastAndroid,
-  TouchableOpacity,
   View,
 } from 'react-native'
+import Clipboard from '@react-native-clipboard/clipboard'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import WebView from 'react-native-webview'
 import type {
@@ -82,13 +82,13 @@ function HeaderBackClose({
   return (
     <View style={styles.headerLeft}>
       {canGoBack ? (
-        <TouchableOpacity style={styles.headerBtn} onPress={onBack} hitSlop={HIT_SLOP}>
+        <Pressable style={styles.headerBtn} onPress={onBack} hitSlop={HIT_SLOP}>
           <IconBack size={22} color="#222222" />
-        </TouchableOpacity>
+        </Pressable>
       ) : null}
-      <TouchableOpacity style={styles.headerBtn} onPress={onClose} hitSlop={HIT_SLOP}>
+      <Pressable style={styles.headerBtn} onPress={onClose} hitSlop={HIT_SLOP}>
         <IconClose size={24} color="#222222" />
-      </TouchableOpacity>
+      </Pressable>
     </View>
   )
 }
@@ -144,20 +144,20 @@ function MenuButton({
   if (config.clickMenu) {
     const { clickMenu } = config
     return (
-      <TouchableOpacity
+      <Pressable
         style={styles.headerBtn}
         onPress={clickMenu.onClick}
         hitSlop={HIT_SLOP}
       >
         {clickMenu.view ?? <IconMenu size={22} />}
-      </TouchableOpacity>
+      </Pressable>
     )
   }
 
   return (
-    <TouchableOpacity style={styles.headerBtn} onPress={handleDefaultMenu} hitSlop={HIT_SLOP}>
+    <Pressable style={styles.headerBtn} onPress={handleDefaultMenu} hitSlop={HIT_SLOP}>
       <IconMenu size={22} />
-    </TouchableOpacity>
+    </Pressable>
   )
 }
 
@@ -526,7 +526,7 @@ export function XWebViewScreen() {
         <View style={styles.errorContainer}>
           <Text style={styles.errorTitle}>页面加载失败</Text>
           <Text style={styles.errorMessage}>{loadError}</Text>
-          <TouchableOpacity
+          <Pressable
             style={styles.retryBtn}
             onPress={() => {
               setLoadError(null)
@@ -534,7 +534,7 @@ export function XWebViewScreen() {
             }}
           >
             <Text style={styles.retryText}>重试</Text>
-          </TouchableOpacity>
+          </Pressable>
         </View>
       ) : (
         <WebViewAny
diff --git a/packages/xwebview/src/XWebViewView.tsx b/packages/xwebview/src/XWebViewView.tsx
index 809da6e..d2e8004 100644
--- a/packages/xwebview/src/XWebViewView.tsx
+++ b/packages/xwebview/src/XWebViewView.tsx
@@ -1,14 +1,14 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import {
   Alert,
-  Clipboard,
   Platform,
+  Pressable,
   StatusBar,
   StyleSheet,
   Text,
-  TouchableOpacity,
   View,
 } from 'react-native'
+import Clipboard from '@react-native-clipboard/clipboard'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import WebView from 'react-native-webview'
 import type {
@@ -336,15 +336,12 @@ export function XWebViewView() {
         <View style={styles.errorContainer}>
           <Text style={styles.errorTitle}>页面加载失败</Text>
           <Text style={styles.errorMessage}>{loadError}</Text>
-          <TouchableOpacity
-            style={styles.retryBtn}
-            onPress={() => {
-              setLoadError(null)
-              webViewRef.current?.reload()
-            }}
+          <Pressable
+            onPress={() => webViewRef.current?.reload()}
+            style={({ pressed }) => [styles.retryBtn, pressed && { opacity: 0.7 }]}
           >
-            <Text style={styles.retryText}>重试</Text>
-          </TouchableOpacity>
+            <Text style={styles.retryText}>点击重试</Text>
+          </Pressable>
         </View>
       ) : (
         <WebViewAny