@ray-js/lock-sdk 1.2.1 → 1.2.2-beta.1

package/lib/api/log.d.ts

@@ -120,6 +120,7 @@ export interface LockLogListItem {
     unionUnlockInfo?: UnionUnlockInfo[];
     mediaInfoList?: MediaInfoRecord[];
     localOperateRecordInfo?: LocalOperateRecordInfo;
+    localOperateRecord?: LocalOperateRecordInfo;
     data?: boolean | number | string;
     dpId: number;
     matterRecordInfo?: {

package/lib/api/video.d.ts

@@ -11,6 +11,7 @@ interface DeviceSkillResult {
                 height: number;
             }
         ];
+        cloudP2P: 1 | 0;
         audios: [
             {
                 channel: number;

package/lib/constant.d.ts

@@ -61,7 +61,8 @@ export declare enum LocalOperateUserType {
     SUPER_ADMIN = 0,
     ADMIN = 1,
     SPECIAL_USER = 2,
-    NORMAL_USER = 3
+    NORMAL_USER = 3,
+    UNKNOW = 255
 }
 export declare enum LocalOperateCategory {
     ADD_UNLOCK_METHOD = 0,

package/lib/constant.js

@@ -71,6 +71,7 @@ export var LocalOperateUserType;
     LocalOperateUserType[LocalOperateUserType["ADMIN"] = 1] = "ADMIN";
     LocalOperateUserType[LocalOperateUserType["SPECIAL_USER"] = 2] = "SPECIAL_USER";
     LocalOperateUserType[LocalOperateUserType["NORMAL_USER"] = 3] = "NORMAL_USER";
+    LocalOperateUserType[LocalOperateUserType["UNKNOW"] = 255] = "UNKNOW";
 })(LocalOperateUserType || (LocalOperateUserType = {}));
 export var LocalOperateCategory;
 (function (LocalOperateCategory) {

package/lib/feature/log/log.js

@@ -36,6 +36,9 @@ function handleLockLogs(list, cfg) {
             catch {
             }
         }
+        if (type === "setting" && item.logType === "lock_local_record") {
+            type = "local_operation";
+        }
         let userName = item.userName;
         let unlockName = item.unlockName;
         let tempPwdInfo = undefined;
@@ -167,7 +170,7 @@ function handleLockLogs(list, cfg) {
                     position: item.position,
                 };
             }),
-            localRecord: handleLocalOperation(item.localOperateRecordInfo, itemData),
+            localRecord: handleLocalOperation(item.localOperateRecordInfo || item.localOperateRecord, itemData),
             unionUnlockInfo: item.unionUnlockInfo?.map((item1) => {
                 return {
                     userId: item1.userId,
@@ -299,7 +302,7 @@ export async function getLogsForRuntime(rt, params) {
                 dpCode,
                 userName,
                 unlockName,
-                mediaInfo: record.mediaInfoList?.map?.(item => {
+                mediaInfo: record.mediaInfoList?.map?.((item) => {
                     return {
                         mediaPath: item.mediaPath,
                         fileKey: item.fileKey,
@@ -391,7 +394,7 @@ export async function getAlarmsForRuntime(rt, params) {
                 dpCode,
                 userName: record.userName,
                 unlockName: record.unlockName,
-                mediaInfo: record.mediaInfoList?.map?.(item => {
+                mediaInfo: record.mediaInfoList?.map?.((item) => {
                     return {
                         mediaPath: item.mediaPath,
                         fileKey: item.fileKey,

package/lib/feature/misc/capability.js

@@ -4,8 +4,7 @@ import { checkShowMatterMutilpleShare } from "../../platform/device";
 import { ipc } from "../../platform";
 import { getWithLocalCache } from "../storage/swr-cache";
 import { getVideoResolutionMark } from "../../api/video";
-import dpCodes from "../../config/dp-code";
-import { hasDpForRuntime } from "../dp/has-dp";
+import { sdkLog } from "../../utils/sdk-log";
 export const hasCapabilityForRuntime = (runtime, capability) => runtime.config.communication.includes(capability);
 export const isBlePureDeviceForRuntime = (rt) => hasCapabilityForRuntime(rt, ProductCommunicationType.BLUETOOTH) &&
     rt.config.communication.length === 1;
@@ -82,15 +81,14 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
         ])),
         getWithLocalCache(rt, "deviceAdvancedAbility", () => getDeviceAdvancedAbility(devId)),
         ipc.getTTTAbilityKeyList("isSupportedVRMode"),
-        hasDpForRuntime(rt, dpCodes.initiativeMessage)
-            ? getWithLocalCache(rt, "videoResolutionMark", () => getVideoResolutionMark(devId))
-            : Promise.resolve({
-                capability: [],
-                cloudCapability: [],
-            }),
+        getWithLocalCache(rt, "videoResolutionMark", () => getVideoResolutionMark(devId)),
     ]);
     const productAbilities = productAbilitiesRes.status === "fulfilled" ? productAbilitiesRes.value : [];
     const tttAbList = tttList.status === "fulfilled" ? tttList.value.abilityList : [];
+    sdkLog("info", "advancedAbilities", "supportVR", {
+        devId,
+        data: { tttAbList },
+    });
     const videoMark = videoMarkRes.status === "fulfilled"
         ? videoMarkRes.value
         : { capability: [], cloudCapability: [] };
@@ -98,6 +96,7 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
         videoConfig: {
             isLowResolution: videoMark?.cloudCapability?.includes("tyabig3wt9"),
             isHighResolution: videoMark?.cloudCapability?.includes("tyabixkep7"),
+            isSpecial: videoMark?.cloudCapability?.includes("tyabifck5x"),
         },
         cloudStorage: {
             support: false,
@@ -221,7 +220,11 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
             }
         }
         catch (error) {
-            console.warn(`setting [${item.abilityCode}] config error`, error);
+            sdkLog("error", "advancedAbilities", "parseCode Error", {
+                devId,
+                data: { code: item.abilityCode },
+                error,
+            });
         }
     });
     if (deviceAdvancedAbilityRes.status === "fulfilled") {

package/lib/feature/state/init-state.js

@@ -17,8 +17,9 @@ import { fetchDeviceProperties } from "./remote-permissions";
 import { ipc, yuChannelSyncSingleSync } from "../../platform";
 import { sdkLog } from "../../utils/sdk-log";
 import { ProductCommunicationType, RotateType } from "../../constant";
-import { isHarmony } from "../../utils";
+import { isHarmony, isVirtualDevice } from "../../utils";
 import { getError } from "../../utils/errors";
+import { isSupportMediaForRuntime } from "../media/media";
 export const initState = async (runtime) => {
     const { devInfo: { dps, devId, yuNetState }, dpSchema, } = runtime.config;
     const startedAt = Date.now();
@@ -57,12 +58,7 @@ export const initState = async (runtime) => {
                     angle: 0,
                     actualAngle: 0,
                 }),
-            isSupportVideo
-                ? getWithLocalCache(runtime, "deviceSkill", () => getDeviceSkill(devId))
-                : Promise.resolve({
-                    devId,
-                    json: { videos: [{ width: 0, height: 0 }] },
-                }),
+            getWithLocalCache(runtime, "deviceSkill", () => getDeviceSkill(devId)),
             isSupportVideo
                 ? getWithLocalCache(runtime, "ipcConfig", () => getIPCConfig(devId))
                 : Promise.resolve({
@@ -75,6 +71,14 @@ export const initState = async (runtime) => {
         if (userInfoResult.status === "rejected") {
             throw userInfoResult.reason;
         }
+        if (deviceSkill.status === "fulfilled") {
+            runtime.config.mediaWidth =
+                deviceSkill.value?.json?.videos?.[0]?.width ?? 0;
+            runtime.config.mediaHeight =
+                deviceSkill.value?.json?.videos?.[0]?.height ?? 0;
+            runtime.config.deviceSkill.cloudP2P =
+                deviceSkill.value?.json?.cloudP2P || 0;
+        }
         if (advanceAbilities.status === "fulfilled") {
             const abilities = advanceAbilities.value;
             sdkLog("debug", "initState", "advancedAbilitiesFetched", {
@@ -84,11 +88,17 @@ export const initState = async (runtime) => {
                     yuChannelValue: abilities.yuChannel.value,
                 },
             });
-            if (isSupportVideo &&
+            if (isSupportMediaForRuntime(runtime) &&
+                !isVirtualDevice(devId) &&
                 !abilities.videoConfig.isHighResolution &&
                 !abilities.videoConfig.isLowResolution) {
                 throw getError(1107);
             }
+            if (!isSupportVideo &&
+                runtime.config.deviceSkill.cloudP2P === 1 &&
+                !abilities.videoConfig.isSpecial) {
+                throw getError(1109);
+            }
             if (abilities.yuChannel.support) {
                 if (abilities.yuChannel.value === 1) {
                     sdkLog("debug", "initState", "yuChannelSync", {
@@ -115,12 +125,6 @@ export const initState = async (runtime) => {
                 runtime.config.imageAngle = isSEI ? 0 : rotateInfo.value.angle;
                 runtime.config.videoAngle = isSEI ? 0 : rotateInfo.value.actualAngle;
             }
-            if (deviceSkill.status === "fulfilled") {
-                runtime.config.mediaWidth =
-                    deviceSkill.value?.json?.videos?.[0]?.width ?? 0;
-                runtime.config.mediaHeight =
-                    deviceSkill.value?.json?.videos?.[0]?.height ?? 0;
-            }
             if (ipcConfig.status === "fulfilled" &&
                 ipcConfig.value?.audioAttributes?.hardwareCapability?.includes(2)) {
                 runtime.config.supportTalk = true;

package/lib/interface.d.ts

@@ -362,6 +362,7 @@ export interface DeviceAdvancedAbility {
     videoConfig: {
         isLowResolution: boolean;
         isHighResolution: boolean;
+        isSpecial: boolean;
     };
     cloudStorage: {
         support: boolean;

package/lib/runtime/lock-config.d.ts

@@ -27,6 +27,9 @@ export type LockConfigState = {
     cameraConfig: CameraConfig[];
     notSupportWake: boolean;
     isFitting: boolean;
+    deviceSkill: {
+        cloudP2P: 0 | 1;
+    };
 };
 export declare function createDefaultDeviceStatus(): DeviceStatus;
 export declare function createLockConfigState(): LockConfigState;

package/lib/runtime/lock-config.js

@@ -38,6 +38,9 @@ export function createLockConfigState() {
         isTwoWayTalk: false,
         cameraConfig: [],
         notSupportWake: false,
-        isFitting: false
+        isFitting: false,
+        deviceSkill: {
+            cloudP2P: 0,
+        },
     };
 }

package/lib/utils/errors.js

@@ -108,6 +108,7 @@ const errors = {
     1106: "No validity configuration data",
     1107: "Invalid device, please re-authorize",
     1108: "Failed to get configuration",
+    1109: "Invalid device, please re-authorize",
 };
 export const getError = (code, ...places) => {
     if (errors[code]) {

package/lib/utils/index.d.ts

@@ -158,3 +158,4 @@ export declare const getAppUser: () => {
     isTemporaryUser: boolean;
 } | null;
 export declare const isHarmony: () => boolean;
+export declare const isVirtualDevice: (devId: string) => boolean;

package/lib/utils/index.js

@@ -207,3 +207,4 @@ getAppUserAsync().catch(() => {
 export const isHarmony = () => {
     return getSystemInfo().platform === "harmony";
 };
+export const isVirtualDevice = (devId) => /^vdevo\d+$/.test(devId);

package/lib/utils/sdk-log.js

@@ -7,7 +7,7 @@ const levelWeights = {
     trace: 5,
 };
 let config = {
-    level: "warn",
+    level: "info",
     console: false,
 };
 const sensitiveKeyPattern = /password|pwd|token|key|secret|ins|devUnlockId|raw|dpValue/i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.2.1",
+  "version": "1.2.2-beta.1",
   "files": [
     "lib",
     "LICENSE.md"