@pnt-team/pnt-component-frontend 0.0.96 → 0.0.99

package/lib/esm/hooks/useHighSecurity.js

@@ -4,6 +4,8 @@ import { useCallback, useMemo, useSyncExternalStore } from 'react';
 
 /** 单个解锁项 */
 
+/** 单次请求的接口配置覆盖（优先级 > PntProvider 全局配置） */
+
 /** 高敏数据解锁请求参数（组件层友好命名，库内部转换为后端 snake_case） */
 
 /** hook 初始化 scope：传入后 securityData/isUnlocked 自动按该业务+环境过滤 */
@@ -83,7 +85,8 @@ const getDefaultPageId = () => typeof window !== 'undefined' && window.location
  */
 export const useHighSecurity = options => {
   const {
-    http
+    http,
+    highSecurity: globalHighSecurity
   } = usePntConfig();
   const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   const scopeGameId = options?.gameId === undefined ? undefined : String(options.gameId);
@@ -109,23 +112,34 @@ export const useHighSecurity = options => {
     gameId,
     env,
     pageId,
-    param
+    param,
+    apiConfig
   }) => {
     const gid = String(gameId);
-    const eid = String(env);
+    const eid = String(env ?? 0);
+
+    // 合并接口配置：单次传入 > PntProvider 全局
+    const merged = {
+      ...globalHighSecurity,
+      ...apiConfig
+    };
+    const successCodeField = merged.successCodeField || 'code';
     const result = new Array(param.length);
     const missing = [];
     const missingIndexes = [];
 
-    // 已缓存的 key 不再请求
+    // 已缓存的 key（cacheKey 优先）不再请求
     param.forEach((item, index) => {
-      const cached = snapshot.get(buildCacheKey(gid, eid, item.key));
+      const storeKey = item.cacheKey || item.key;
+      const cached = snapshot.get(buildCacheKey(gid, eid, storeKey));
       if (cached !== undefined) {
         result[index] = {
           key: item.key,
-          value: cached
+          value: cached,
+          cacheKey: storeKey
         };
       } else {
+        // 请求体只用 key/value，不含 cacheKey
         missing.push({
           key: item.key,
           value: item.value
@@ -138,19 +152,27 @@ export const useHighSecurity = options => {
     }
     const body = {
       game_id: Number(gameId),
-      env: Number(env),
+      env: Number(env ?? 0),
       page_id: pageId || getDefaultPageId(),
       param: missing
     };
 
+    // 拼接 URL：decryptUrl 优先；否则用 audience 覆盖默认
+    let url = merged.decryptUrl;
+    if (!url) {
+      const audience = merged.audience || '/laas-pnt';
+      url = `/v3/business/game_info/high-security-decrypt?audience=${audience}`;
+    }
+
     // 请求级并发去重：同一业务+环境+参数列表指纹在途时复用
     const requestKey = `${gid}:${eid}:${missing.map(item => `${item.key}\u0001${item.value}`).join('\u0002')}`;
     const existing = inflightRequests.get(requestKey);
     if (existing) return existing;
     const promise = (async () => {
       try {
-        const res = await businessGameInfoHighSecurityDecrypt(http, body);
-        if (res.code === 0 && Array.isArray(res.data)) {
+        const res = await businessGameInfoHighSecurityDecrypt(http, body, url);
+        const successCode = Number(res[successCodeField] ?? res.code);
+        if (successCode === 0 && Array.isArray(res.data)) {
           // yapi 生成类型为 Record<string, unknown>[]，按运行时结构收窄
           const decrypted = res.data.map(raw => {
             if (raw && typeof raw === 'object' && 'key' in raw) {
@@ -164,14 +186,24 @@ export const useHighSecurity = options => {
             }
             return null;
           }).filter(item => item !== null);
-          setEntries(gid, eid, decrypted);
+          // 写入缓存时用调用方提供的 cacheKey 映射
+          const toStore = decrypted.map(d => {
+            const matchIdx = missingIndexes.find(i => param[i].key === d.key);
+            const storeKey = matchIdx !== undefined ? param[matchIdx].cacheKey || d.key : d.key;
+            return {
+              key: d.key,
+              value: d.value,
+              cacheKey: storeKey
+            };
+          });
+          setEntries(gid, eid, toStore);
           decrypted.forEach(item => {
             const index = missingIndexes.find(i => param[i].key === item.key);
             if (index !== undefined) result[index] = item;
           });
         } else {
           // eslint-disable-next-line no-console
-          console.warn('[pnt-component-frontend] high-security-decrypt 解锁失败', res?.msg ?? res?.code);
+          console.warn('[pnt-component-frontend] high-security-decrypt 解锁失败', res?.msg ?? res[successCodeField]);
         }
       } catch (error) {
         // eslint-disable-next-line no-console
@@ -183,7 +215,7 @@ export const useHighSecurity = options => {
     })();
     inflightRequests.set(requestKey, promise);
     return promise;
-  }, [http, snapshot]);
+  }, [http, snapshot, globalHighSecurity]);
   const clearSecurityData = useCallback(filter => {
     clearEntries(filter);
   }, []);

package/lib/esm/index.d.ts

@@ -1,4 +1,4 @@
-export { PntProvider, usePntConfig, type PntConfig, type commonEesType, } from './config';
+export { PntProvider, usePntConfig, type PntConfig, type PntHttpLike, type PntHighSecurityConfig, type commonEesType, } from './config';
 export { default as PntImage } from './components/PntImage';
 export { default as PntBusinessSelect } from './components/PntBusinessSelect';
 export { default as PntSecureBox } from './components/PntSecureBox';
@@ -6,6 +6,6 @@ export { default as PntUpload } from './components/PntUpload';
 export type { PntUploadErrorPhase, PntUploadProps, PntUploadTexts, } from './components/PntUpload';
 export { createPntCosUploader, normalizeSnakeCredential, default as usePntCosUploader, type CosScene, type FileNameStrategy, type GetCosCredentialParams, type NormalizeCredential, type NormalizedCosCredential, type PntCosRequestOverrides, type PntCosUploadOptions, type PntCosUploadResult, type PntCosUploader as PntCosUploaderInstance, } from './components/PntCosUploader';
 export { useHighSecurity } from './hooks/useHighSecurity';
-export type { ClearSecurityDataFilter, HighSecurityParamItem, HighSecurityRequestParams, UseHighSecurityOptions, UseHighSecurityResult, } from './hooks/useHighSecurity';
+export type { ClearSecurityDataFilter, HighSecurityApiConfig, HighSecurityParamItem, HighSecurityRequestParams, UseHighSecurityOptions, UseHighSecurityResult, } from './hooks/useHighSecurity';
 export { isSecurityData } from './utils';
 export { default as PntGeneralLayout } from './components/PntGeneralLayout';