@ray-js/ray-ipc-utils 1.1.11 → 1.1.12-beta.1

package/lib/interface.d.ts

@@ -62,6 +62,10 @@ export interface IpcConfigInfo {
      * 最大放大倍数
      */
     maxZoomSettings: number;
+    /**
+     * P2P 业务指令支持情况
+     */
+    p2pBizCmd: number;
 }
 export interface IApiError {
     errorMsg: string;

package/lib/service/index.js

@@ -119,6 +119,7 @@ export const getCameraConfigInfo = async function (deviceId) {
     const supportedIntercomModes = [IntercomMode.OneWay, IntercomMode.TwoWay];
     const defaultMuteMode = MuteMode.OFF;
     let maxZoomSettings = 6;
+    let p2pBizCmdNumber = 0;
     let microphoneSettings = {
       isMicrophoneSupported: true,
       defaultMuteMode,
@@ -137,9 +138,9 @@ export const getCameraConfigInfo = async function (deviceId) {
     };
     // native 缓存Key值
 
-    const nativeStorageInfo = await Promise.all([`${deviceId}_resolution`, `${deviceId}_intercom`, `${deviceId}_microphone`, `${deviceId}_maxZoomSettings`].map(key => getNativeStorage(key)));
+    const nativeStorageInfo = await Promise.all([`${deviceId}_resolution`, `${deviceId}_intercom`, `${deviceId}_microphone`, `${deviceId}_maxZoomSettings`, `${deviceId}_p2pBizCmd`].map(key => getNativeStorage(key)));
     ipcTTTOperatorLog(`Utils: nativeStorageInfo: ${nativeStorageInfo}`);
-    const [resolutionStorage, intercomStorage, microphoneStorage, maxZoomSettingsStorage] = nativeStorageInfo;
+    const [resolutionStorage, intercomStorage, microphoneStorage, maxZoomSettingsStorage, p2pBizCmdStorage, p2pBizCmdNumberStorage] = nativeStorageInfo;
     // 任意缓存为空，则请求接口
 
     console.log(nativeStorageInfo, 'nativeStorageInfo');
@@ -150,7 +151,7 @@ export const getCameraConfigInfo = async function (deviceId) {
     if (noCache) {
       // 非虚拟机设备，请求接口
       if (!isVirtualDevice) {
-        var _microphoneStorage$da, _intercomStorage$data, _resolutionStorage$da, _maxZoomSettingsStora;
+        var _microphoneStorage$da, _intercomStorage$data, _resolutionStorage$da, _maxZoomSettingsStora, _p2pBizCmdStorage$dat;
         const rtcInfo = await getIpcConfigInfo(deviceId);
         ipcTTTOperatorLog(`Utils: rtcInfo: ${rtcInfo}`);
         if (rtcInfo.code === 0) {
@@ -200,6 +201,12 @@ export const getCameraConfigInfo = async function (deviceId) {
 
           // 4. 最大倍数模块
           maxZoomSettings = (rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes) !== 0 ? rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes : 6;
+          // 5. p2pBizCmd 配置
+          const skillObj = typeof (rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.skill) === 'string' ? JsonUtil.parseJSON(rtcApiResult.skill) : rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.skill;
+          const parsedValue = Number((skillObj === null || skillObj === void 0 ? void 0 : skillObj.p2pBizCmd) || 0);
+          if (Number.isFinite(parsedValue)) {
+            p2pBizCmdNumber = parsedValue;
+          }
         }
 
         // 由于utils为统一返回，多加了一层data，所以需要取data.data
@@ -225,6 +232,11 @@ export const getCameraConfigInfo = async function (deviceId) {
         if (!maxZoomSettingsStorageData) {
           setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
         }
+        // 5. 设置 p2pBizCmd 缓存
+        const p2pBizCmdStorageData = p2pBizCmdStorage === null || p2pBizCmdStorage === void 0 || (_p2pBizCmdStorage$dat = p2pBizCmdStorage.data) === null || _p2pBizCmdStorage$dat === void 0 ? void 0 : _p2pBizCmdStorage$dat.data;
+        if (!p2pBizCmdStorageData && typeof p2pBizCmdNumber === 'number') {
+          setNativeStorage(`${deviceId}_p2pBizCmd`, p2pBizCmdNumber);
+        }
       } else {
         // 针对虚拟设备未有数据时设置缓存
         setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
@@ -241,9 +253,10 @@ export const getCameraConfigInfo = async function (deviceId) {
         setNativeStorage(`${deviceId}_intercom`, intercomInfo);
         setNativeStorage(`${deviceId}_resolution`, videoResolution);
         setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
+        setNativeStorage(`${deviceId}_p2pBizCmd`, p2pBizCmdNumber);
       }
     } else {
-      var _intercomStorage$data2, _resolutionStorage$da2, _microphoneStorage$da2, _maxZoomSettingsStora2;
+      var _intercomStorage$data2, _resolutionStorage$da2, _microphoneStorage$da2, _maxZoomSettingsStora2, _p2pBizCmdNumberStora;
       // 都有缓存的情况下，直接返回取缓存
       // 对于对讲缓存的方式每次需从APP获取更新
       const intercomStorageData = intercomStorage === null || intercomStorage === void 0 || (_intercomStorage$data2 = intercomStorage.data) === null || _intercomStorage$data2 === void 0 ? void 0 : _intercomStorage$data2.data;
@@ -264,12 +277,14 @@ export const getCameraConfigInfo = async function (deviceId) {
       videoResolution = resolutionStorage === null || resolutionStorage === void 0 || (_resolutionStorage$da2 = resolutionStorage.data) === null || _resolutionStorage$da2 === void 0 ? void 0 : _resolutionStorage$da2.data;
       microphoneSettings = microphoneStorage === null || microphoneStorage === void 0 || (_microphoneStorage$da2 = microphoneStorage.data) === null || _microphoneStorage$da2 === void 0 ? void 0 : _microphoneStorage$da2.data;
       maxZoomSettings = maxZoomSettingsStorage === null || maxZoomSettingsStorage === void 0 || (_maxZoomSettingsStora2 = maxZoomSettingsStorage.data) === null || _maxZoomSettingsStora2 === void 0 ? void 0 : _maxZoomSettingsStora2.data;
+      p2pBizCmdNumber = p2pBizCmdNumberStorage === null || p2pBizCmdNumberStorage === void 0 || (_p2pBizCmdNumberStora = p2pBizCmdNumberStorage.data) === null || _p2pBizCmdNumberStora === void 0 ? void 0 : _p2pBizCmdNumberStora.data;
     }
     const ipcConfig = {
       videoResolution,
       intercomInfo,
       microphoneSettings,
-      maxZoomSettings
+      maxZoomSettings,
+      p2pBizCmd: Number(p2pBizCmdNumber)
     };
     return Promise.resolve({
       code: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-utils",
-  "version": "1.1.11",
+  "version": "1.1.12-beta.1",
   "description": "IPC 工具库",
   "main": "lib/index",
   "files": [