@ray-js/lock-sdk 1.2.0-beta.26 → 1.2.0-beta.27

package/lib/feature/log/log.js

@@ -391,7 +391,20 @@ export async function getAlarmsForRuntime(rt, params) {
                 dpCode,
                 userName: record.userName,
                 unlockName: record.unlockName,
-                mediaInfo: record.mediaInfoList,
+                mediaInfo: record.mediaInfoList?.map?.(item => {
+                    return {
+                        mediaPath: item.mediaPath,
+                        fileKey: item.fileKey,
+                        fileUrl: item.fileUrl,
+                        mediaBucket: item.mediaBucket,
+                        mediaKey: item.mediaKey,
+                        width: item.positionWidth,
+                        height: item.positionHeight,
+                        angle: item.positionAngle,
+                        isVR: !!item.positionVr,
+                        position: item.position,
+                    };
+                }),
                 time: record.gmtCreate,
                 currentUser: +record.userId === +currentUser.userId,
                 bindable: false,

package/lib/feature/misc/capability.js

@@ -1,5 +1,5 @@
 import { getDeviceAdvancedAbility, getProductAbilities } from "../../api";
-import { ProductCommunicationType } from "../../constant";
+import { CommunicationType, ProductCommunicationType } from "../../constant";
 import { checkShowMatterMutilpleShare } from "../../platform/device";
 import { ipc } from "../../platform";
 import { getWithLocalCache } from "../storage/swr-cache";
@@ -17,11 +17,17 @@ export const isActiveThreadForRuntime = async (rt) => {
     if (hasThread) {
         if (rt.deviceStatus.onlineTypes.includes("cloud") ||
             rt.config.communication.length === 1) {
+            rt.cache.isActiveThreadCache = true;
             return true;
         }
         const hasBle = hasCapabilityForRuntime(rt, ProductCommunicationType.BLUETOOTH);
+        if (rt.config.capabilities?.communicationType === CommunicationType.THREAD) {
+            rt.cache.isActiveThreadCache = true;
+            return true;
+        }
         if (hasBle) {
             if (rt.cache.isActiveThreadCache) {
+                rt.cache.isActiveThreadCache = true;
                 return true;
             }
             try {

package/lib/feature/misc/is-use-near-channel-for-runtime.js

@@ -1,17 +1,24 @@
+import dpCodes from "src/config/dp-code";
 import { ProductCommunicationType } from "../../constant";
 import { isOnlineByType } from "../../utils";
+import { hasDpForRuntime } from "../dp/has-dp";
 import { hasCapabilityForRuntime } from "./capability";
 export const isUseNearChannelForRuntime = (rt) => {
     const { onlineType, devInfo } = rt.config;
     const isBleOnline = isOnlineByType(onlineType, 2);
     const isSupportWifi = hasCapabilityForRuntime(rt, ProductCommunicationType.WIFI);
     const isSupportBle = hasCapabilityForRuntime(rt, ProductCommunicationType.BLUETOOTH);
+    if (isSupportWifi &&
+        isSupportBle &&
+        !hasDpForRuntime(rt, dpCodes.unlockBle)) {
+        return false;
+    }
     const isSupportThread = hasCapabilityForRuntime(rt, ProductCommunicationType.THREAD);
     if (isSupportWifi && isSupportBle) {
         return isBleOnline;
     }
     if (isSupportThread && isSupportBle) {
-        return isBleOnline && !devInfo.isCloudOnline && !devInfo.isLocalOnline;
+        return isBleOnline && !devInfo.isCloudOnline;
     }
     return isBleOnline;
 };

package/lib/feature/state/device-status.js

@@ -1,4 +1,4 @@
-import { hasCapabilityForRuntime } from "../misc/capability";
+import { hasCapabilityForRuntime, isActiveThreadForRuntime, } from "../misc/capability";
 import { hasDpForRuntime } from "../dp/has-dp";
 import dpCodes from "../../config/dp-code";
 import { ProductCommunicationType } from "../../constant";
@@ -13,9 +13,14 @@ import { getDpValueForRuntime } from "../dp/get-dp-value";
 import { readIsSleepForRuntime } from "./internal/read-is-sleep";
 import { isShareThreadRuntimeLocal } from "./internal/share-thread-local";
 export const updateOnlineType = async (runtime) => {
+    const hasThreadBle = hasCapabilityForRuntime(runtime, ProductCommunicationType.THREAD) &&
+        hasCapabilityForRuntime(runtime, ProductCommunicationType.BLUETOOTH);
     const [devInfo, onlineType] = await Promise.all([
         getDeviceInfo(runtime.config.devInfo.devId),
         getDeviceOnlineType(runtime.config.devInfo.devId),
+        hasThreadBle && runtime.cache.isActiveThreadCache !== true
+            ? isActiveThreadForRuntime(runtime)
+            : Promise.resolve(false),
     ]);
     runtime.config.onlineType = onlineType;
     runtime.config.devInfo = devInfo;
@@ -34,10 +39,17 @@ export const getDeviceStatusForRuntime = (runtime) => {
         onlineTypes: [],
         isWifiActive: wifiEnableState !== 1,
         isWifiMatter: !!isMatter && supportWifi,
+        isActiveThread: runtime.cache.isActiveThreadCache ?? false,
+        isShareThread: isShareThreadRuntimeLocal(runtime),
     };
     const isMatterLocal = isOnlineByType(onlineType, 8);
     const isBleOnline = isOnlineByType(onlineType, 2);
-    const isLocalOnline = !isCloudOnline && isOnlineByType(onlineType, 1);
+    let isLocalOnline = !isCloudOnline && isOnlineByType(onlineType, 1);
+    if (isLocalOnline &&
+        runtime.cache.isActiveThreadCache !== true &&
+        supportThread) {
+        isLocalOnline = false;
+    }
     const hasWirelessAwakeDp = !notSupportWake && hasDpForRuntime(runtime, dpCodes.wirelessAwake);
     const wirelessAwake = getDpValueForRuntime(runtime, dpCodes.wirelessAwake);
     status.connectEnable = isSupportBleControlForRuntime(runtime) && !isOnline;
@@ -76,8 +88,7 @@ export const getDeviceStatusForRuntime = (runtime) => {
         }
     }
     if (supportThread && supportBle) {
-        const isShareThread = isShareThreadRuntimeLocal(runtime);
-        if (isShareThread && isOnline) {
+        if (status.isShareThread && isOnline) {
             if (!status.onlineTypes.includes("local")) {
                 status.onlineTypes = ["local"];
             }

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

@@ -2,7 +2,7 @@ import dpCodes from "../../config/dp-code";
 import { getDeviceSkill, getIPCConfig, getRotateInfo } from "../../api/video";
 import { getDataWithPreFetchForRuntime } from "../utils";
 import { getWithLocalCache } from "../storage/swr-cache";
-import { getDeviceAdvancedAbilitiesForRuntime, } from "../misc/capability";
+import { getDeviceAdvancedAbilitiesForRuntime, hasCapabilityForRuntime, isActiveThreadForRuntime, } from "../misc/capability";
 import { getCurrentUserForRuntime } from "../user/current-user";
 import { checkOfflineDpUpdateForRuntime } from "../offline-dps";
 import { autoSyncTemp } from "../password/sync-temp";
@@ -14,9 +14,9 @@ import syncT0 from "./sync/t0";
 import { getDeviceStatusForRuntime, updateOnlineType } from "./device-status";
 import { handleDpChange } from "./dp-change";
 import { fetchDeviceProperties } from "./remote-permissions";
-import { ipc, yuChannelSyncSingleSync } from "../../platform";
+import { ipc, yuChannelSyncSingleSync, } from "../../platform";
 import { sdkLog } from "../../utils/sdk-log";
-import { RotateType } from "../../constant";
+import { ProductCommunicationType, RotateType } from "../../constant";
 import { isHarmony } from "../../utils";
 export const initState = async (runtime) => {
     const { devInfo: { dps, devId, yuNetState }, dpSchema, } = runtime.config;
@@ -31,6 +31,7 @@ export const initState = async (runtime) => {
     try {
         handleDpChange(runtime, dps, true);
         const isSupportVideo = !!dpSchema[dpCodes.initiativeMessage];
+        const hasThread = hasCapabilityForRuntime(runtime, ProductCommunicationType.THREAD);
         runtime.deviceStatus = getDeviceStatusForRuntime(runtime);
         sdkLog("debug", "initState", "baseStateReady", {
             devId,
@@ -40,11 +41,12 @@ export const initState = async (runtime) => {
                 isSupportVideo,
             },
         });
-        const [, , , advanceAbilities, rotateInfo, deviceSkill, ipcConfig] = await Promise.allSettled([
+        const [, , , advanceAbilities, isActiveThread, rotateInfo, deviceSkill, ipcConfig,] = await Promise.allSettled([
             updateOnlineType(runtime),
             getCurrentUserForRuntime(runtime),
             fetchDeviceProperties(runtime),
             getDeviceAdvancedAbilitiesForRuntime(runtime),
+            hasThread ? isActiveThreadForRuntime(runtime) : Promise.resolve(false),
             isSupportVideo
                 ?
                     getDataWithPreFetchForRuntime(runtime, "getRotate", () => getWithLocalCache(runtime, "rotateInfo", () => getRotateInfo(devId), {

package/lib/feature/state/platform-routing.js

@@ -39,7 +39,6 @@ const globalHandleDeviceInfoChange = async ({ dps, deviceId, }) => {
         handleDpChange(rt, dps);
     }
     await updateOnlineType(rt);
-    updateDeviceStatus(rt);
 };
 const globalUpdateAllOnlineTypes = async (data) => {
     if (!data?.deviceId) {

package/lib/feature/user/sync-user.js

@@ -3,10 +3,12 @@ import { deleteUserForRuntime } from "./delete-user-dp";
 import { isUseNearChannelForRuntime } from "../misc/is-use-near-channel-for-runtime";
 import { publishDpsOnlyWithRuntime, } from "../dp/publish-dps";
 import dpCodes from "../../config/dp-code";
-import { isBlePureDeviceForRuntime } from "../misc/capability";
+import { hasCapabilityForRuntime, isBlePureDeviceForRuntime } from "../misc/capability";
 import { sdkLog } from "../../utils/sdk-log";
+import { ProductCommunicationType } from "src/constant";
 export async function syncDeleteUsersWithRuntime(runtime) {
-    if (runtime.config.devInfo.wifiEnableState !== 1) {
+    const hasWifi = hasCapabilityForRuntime(runtime, ProductCommunicationType.WIFI);
+    if (hasWifi && runtime.config.devInfo.wifiEnableState !== 1) {
         sdkLog("debug", "syncUser", "deleteUsersSkipped", {
             devId: runtime.devId,
             data: { reason: "wifiActive" },

package/lib/interface.d.ts

@@ -216,6 +216,8 @@ export interface DeviceStatus {
     };
     isWifiActive: boolean;
     isWifiMatter: boolean;
+    isActiveThread: boolean;
+    isShareThread: boolean;
 }
 export interface UnionUnlockInfo {
     userId: string;

package/lib/runtime/lock-config.js

@@ -7,6 +7,8 @@ export function createDefaultDeviceStatus() {
         onlineTypes: [],
         isWifiActive: false,
         isWifiMatter: false,
+        isActiveThread: false,
+        isShareThread: false,
     };
 }
 export function createLockConfigState() {

package/package.json

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