@ray-js/lock-sdk 1.1.1 → 1.1.2-beta.2

package/lib/api/log.d.ts

@@ -24,6 +24,11 @@ interface LatestLogs {
         unionUnlockInfo?: UnionUnlockInfo[];
         unlockNameRosettaKey?: string;
         data: boolean | number | string;
+        matterRecordInfo?: {
+            matterSn: number;
+            matterSource: number;
+            matterType: number;
+        };
     }[];
 }
 export declare const getLatest2Log: (devId: string) => Promise<LatestLogs>;
@@ -55,6 +60,11 @@ interface LogInfo {
     data?: string;
     unionUnlockInfo?: UnionUnlockInfo[];
     localOperateRecordInfo?: LocalOperateRecordInfo;
+    matterRecordInfo?: {
+        matterSn: number;
+        matterSource: number;
+        matterType: number;
+    };
 }
 export interface LogsResult {
     datas: LogInfo[];

package/lib/config/dp-code/index.d.ts

@@ -58,6 +58,7 @@ declare const dpCodes: {
     doNotDisturb: string;
     muteModePeriod: string;
     matterLanUnlock: string;
+    unlockMatterKw: string;
     doorlockStatus: string;
     unlockInside: string;
     doorOpened: string;

package/lib/config/dp-code/index.js

@@ -1,5 +1,5 @@
 const dpCodes = {
-    lockMotorState: 'lock_motor_state',
+    lockMotorState: "lock_motor_state",
     remoteNoDpKey: "remote_no_dp_key",
     remoteNoPdSetkey: "remote_no_pd_setkey",
     synchMethodW: "synch_method_w",
@@ -58,6 +58,7 @@ const dpCodes = {
     doNotDisturb: "do_not_disturb",
     muteModePeriod: "mute_mode_period",
     matterLanUnlock: "matter_lan_unlock",
+    unlockMatterKw: "unlock_matter_kw",
     doorlockStatus: "doorlock_status",
     unlockInside: "unlock_inside",
     doorOpened: "door_opened",

package/lib/interface.d.ts

@@ -43,6 +43,7 @@ export interface DeviceInfo {
     activeTime: number;
     dpsTime: Record<string, string>;
     parentId?: string;
+    isMatter?: boolean;
 }
 export interface DpSchema {
     type: "raw" | "obj";
@@ -194,6 +195,7 @@ export interface DeviceStatus {
         end: number;
     };
     isWifiActive: boolean;
+    isWifiMatter: boolean;
 }
 export interface UnionUnlockInfo {
     userId: string;
@@ -265,6 +267,11 @@ export interface LogData {
     localRecord?: LocalOperateData;
     isHijack?: boolean;
     unlockMethod?: UnlockMethodType;
+    matterRecord?: {
+        sn: number;
+        source: number;
+        type: number;
+    };
 }
 export type TemporaryPasswordType = "custom" | "once" | "limit" | "clear" | "clearOne";
 export interface TempPasswordResult {

package/lib/log.js

@@ -42,7 +42,7 @@ export const getLatestLogs = async () => {
                 unlockName = item.userName;
                 userName = "";
             }
-            return {
+            const log = {
                 type,
                 logId: item.logId,
                 dpId: item.dpId,
@@ -66,6 +66,14 @@ export const getLatestLogs = async () => {
                 currentUser: !!item.currentUser,
                 bindable: item.memberBindableFlag,
             };
+            if (item.matterRecordInfo) {
+                log.matterRecord = {
+                    sn: item.matterRecordInfo.matterSn,
+                    type: item.matterRecordInfo.matterType,
+                    source: item.matterRecordInfo.matterSource,
+                };
+            }
+            return log;
         });
         return {
             data: list,
@@ -106,6 +114,7 @@ export const openDps = [
     dpCodes.unlockInside,
     dpCodes.doorOpened,
     dpCodes.unlockApp,
+    dpCodes.unlockMatterKw,
 ];
 const closeTypes = [
     "UNDEFINED",
@@ -154,7 +163,7 @@ export const getLogs = async (params) => {
                 unlockName = record.userName;
                 userName = "";
             }
-            return {
+            const log = {
                 type,
                 logId: record.historyId.toString(),
                 userId: record.userId,
@@ -178,6 +187,14 @@ export const getLogs = async (params) => {
                 unlockMethod: type === "unlock_record" ? unlockDp2Type[dpCode] : undefined,
                 localRecord: handleLocalOperation(record.localOperateRecordInfo, dpValue),
             };
+            if (record.matterRecordInfo) {
+                log.matterRecord = {
+                    sn: record.matterRecordInfo.matterSn,
+                    type: record.matterRecordInfo.matterType,
+                    source: record.matterRecordInfo.matterSource,
+                };
+            }
+            return log;
         });
         return {
             list: result,

package/lib/open.js

@@ -48,6 +48,9 @@ export const checkRemoteEnabled = parallelMerge(async () => {
     if (isThreadLocalOnline || deviceStatus.onlineTypes.includes("ble")) {
         return;
     }
+    if (deviceStatus.isWifiMatter && isLocalOnline) {
+        return;
+    }
     if (isLocalOnline) {
         throw getError(1064);
     }
@@ -94,9 +97,17 @@ const _doAction = async (isOpen, timeout) => {
         }
         return false;
     };
-    if (hasThread && deviceStatus.onlineTypes.includes("local") && deviceStatus.onlineTypes.length === 1) {
+    console.log("-------", deviceStatus.isWifiMatter, deviceStatus.onlineTypes);
+    if ((hasThread || deviceStatus.isWifiMatter) &&
+        deviceStatus.onlineTypes.includes("local") &&
+        deviceStatus.onlineTypes.length === 1) {
         await publishDps({ [dpCodes.matterLanUnlock]: isOpen }, {
             checkReport: (dps) => {
+                if (hasDp(dpCodes.lockMotorState)) {
+                    if (typeof dps[dpCodes.lockMotorState] !== "undefined") {
+                        return true;
+                    }
+                }
                 return typeof dps[dpCodes.matterLanUnlock] !== "undefined";
             },
         });

package/lib/state.js

@@ -38,19 +38,21 @@ const updateOnlineType = async () => {
     updateDeviceStatus();
 };
 export const getDeviceStatus = () => {
-    const { onlineType, devInfo: { isCloudOnline, isOnline, wifiEnableState }, } = config;
+    const { onlineType, devInfo: { isCloudOnline, isOnline, wifiEnableState, isMatter }, } = config;
+    const supportWifi = hasCapability(ProductCommunicationType.WIFI);
+    const supportBle = hasCapability(ProductCommunicationType.BLUETOOTH);
+    const supportThread = hasCapability(ProductCommunicationType.THREAD);
     const status = {
         type: isOnline ? "online" : "offline",
         connectEnable: false,
         onlineType: "unknown",
         onlineTypes: [],
         isWifiActive: wifiEnableState !== 1,
+        isWifiMatter: !!isMatter && supportWifi,
     };
     const isBleOnline = isOnlineByType(onlineType, 2);
+    const isMatterLocal = isOnlineByType(onlineType, 8);
     const isLocalOnline = !isCloudOnline && isOnlineByType(onlineType, 1);
-    const supportWifi = hasCapability(ProductCommunicationType.WIFI);
-    const supportBle = hasCapability(ProductCommunicationType.BLUETOOTH);
-    const supportThread = hasCapability(ProductCommunicationType.THREAD);
     const hasWirelessAwakeDp = hasDp(dpCodes.wirelessAwake);
     const wirelessAwake = getDpValue(dpCodes.wirelessAwake);
     status.connectEnable = isSupportBleControl() && !isOnline;
@@ -76,9 +78,14 @@ export const getDeviceStatus = () => {
                 status.onlineTypes.push("cloud");
             }
         }
-        else if (isLocalOnline) {
+        if (isLocalOnline) {
             status.onlineTypes.push("local");
         }
+        if (isMatterLocal) {
+            if (!status.onlineTypes.includes("local")) {
+                status.onlineTypes.push("local");
+            }
+        }
         if (isBleOnline) {
             status.onlineTypes.push("ble");
         }
@@ -89,7 +96,9 @@ export const getDeviceStatus = () => {
     if (supportThread && supportBle) {
         const isShareThread = isShareThead();
         if (isShareThread && isOnline) {
-            status.onlineTypes = ["local"];
+            if (!status.onlineTypes.includes("local")) {
+                status.onlineTypes = ["local"];
+            }
         }
     }
     if (status.onlineTypes.includes("ble")) {

package/lib/sync/user.js

@@ -9,6 +9,9 @@ const syncDeleteUsers = async () => {
     if (deviceStatus.isWifiActive) {
         return;
     }
+    if (deviceStatus.isWifiMatter) {
+        return;
+    }
     if (!isUseNearChannel()) {
         return;
     }

package/lib/user.d.ts

@@ -25,6 +25,6 @@ export declare const openFamilyUserDetail: (userId: string) => Promise<undefined
 interface AddUserParams {
     name: string;
 }
-export declare const addUser: (params: AddUserParams) => Promise<void>;
+export declare const addUser: (params: AddUserParams) => Promise<import("./api/user").AddNormalUserResponse>;
 export declare const removeUser: (userId: string) => Promise<void>;
 export {};

package/lib/user.js

@@ -263,7 +263,7 @@ export const addUser = async (params) => {
         throw getError(1009, "name");
     }
     try {
-        await addNormalUser({
+        return await addNormalUser({
             devId: config.devInfo.devId,
             name: params.name,
         });

package/lib/utils/device.js

@@ -42,6 +42,18 @@ export const setDeviceProperty = async (devId, code, value) => {
     });
 };
 export const publishDeviceDps = (params) => {
+    if (params.pipelines && params.pipelines.length) {
+        return new Promise((resolve, reject) => {
+            ty.device.publishDpsWithPipeType({
+                mode: 2,
+                pipelines: [],
+                options: {},
+                ...params,
+                success: resolve,
+                fail: reject,
+            });
+        });
+    }
     return new Promise((resolve, reject) => {
         ty.device.publishDps({
             mode: 2,

package/lib/utils/publishDps.js

@@ -5,11 +5,15 @@ import emitter from "./event";
 import { DPCHANGE } from "./constant";
 import { getError } from "./errors";
 export const publishDpsOnly = async (dpData) => {
-    const { devInfo, idsByCode } = config;
+    const { devInfo, idsByCode, deviceStatus } = config;
     const option = {};
     if (config.deviceStatus.type === "offline") {
         throw getError(1001);
     }
+    console.log("onlineType", config.onlineType);
+    if (deviceStatus.isWifiMatter && deviceStatus.onlineTypes.includes("cloud")) {
+        option.pipelines = [1];
+    }
     if (isOnlineByType(config.onlineType, 2)) {
         option.pipelines = [3];
     }
@@ -20,6 +24,7 @@ export const publishDpsOnly = async (dpData) => {
         }
         return acc;
     }, {});
+    console.log("--------publishDeviceDps----", option, dps);
     if (Object.keys(dps).length > 0) {
         await publishDeviceDps({
             deviceId: devInfo.devId,

package/package.json

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