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

package/lib/api/fit.d.ts

@@ -134,7 +134,7 @@ interface UpdateFitOpenModeParams {
     hijack: boolean;
 }
 export declare const updateFitOpenMode: (params: UpdateFitOpenModeParams) => Promise<unknown>;
-export declare const removeFitOpenMode: (fittingId: string, opModeId: string) => Promise<unknown>;
+export declare const removeFitOpenMode: (fittingId: string, opModeId: number) => Promise<unknown>;
 export interface RawFitOpenModeScheduleItem {
     allDay: boolean;
     effectiveTime: number;

package/lib/api/log.js

@@ -29,7 +29,10 @@ export const getLockLogList = (params) => {
         logName: "getLockLogList",
         api: `${THING}.m.device.lock.log.list`,
         version: "1.0",
-        data: params,
+        data: {
+            ...params,
+            logCategories: params.logCategories?.join(","),
+        },
     });
 };
 export const uploadOperationLog = (params) => {

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

@@ -26,6 +26,7 @@ declare const dpCodes: {
     readonly unlockKey: "unlock_key";
     readonly unlockCard: "unlock_card";
     readonly unlockFace: "unlock_face";
+    readonly unlockPhoneKey: "unlock_phonekey";
     readonly unlockTemporary: "unlock_temporary";
     readonly unlockOfflinePd: "unlock_offline_pd";
     readonly unlockOfflineClear: "unlock_offline_clear";

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

@@ -26,6 +26,7 @@ const dpCodes = {
     unlockKey: "unlock_key",
     unlockCard: "unlock_card",
     unlockFace: "unlock_face",
+    unlockPhoneKey: "unlock_phonekey",
     unlockTemporary: "unlock_temporary",
     unlockOfflinePd: "unlock_offline_pd",
     unlockOfflineClear: "unlock_offline_clear",

package/lib/entries/main/exports/index.d.ts

@@ -27,3 +27,4 @@ export * from "./fit-sdk/binding";
 export * from "./fit-sdk/device";
 export * from "./fit-sdk/log";
 export * from "./fit-sdk/temp";
+export * from "./yu-channel";

package/lib/entries/main/exports/index.js

@@ -27,3 +27,4 @@ export * from "./fit-sdk/binding";
 export * from "./fit-sdk/device";
 export * from "./fit-sdk/log";
 export * from "./fit-sdk/temp";
+export * from "./yu-channel";

package/lib/feature/fit/method/internal/base.d.ts

@@ -1,8 +1,8 @@
 import type { DpMap } from "@ray-js/tuya-dp-transform";
 import { fitAdd } from "../../../../config/dp-map/unlock-method-fit";
-import type { DpMapDataType, UnlockMethodConfig, UnlockMethodType, UserInfo } from "../../../../interface";
+import type { DpMapDataType, UnlockMethodConfig, UnlockMethodType } from "../../../../interface";
 import type { LockDeviceRuntime } from "../../../../runtime/LockDeviceRuntime";
-export declare function buildValidConfigFromTimeSchedule(timeScheduleInfo: UserInfo["timeScheduleInfo"] | null | undefined): DpMapDataType<typeof fitAdd>["validConfig"];
+export declare function buildValidConfigFromUserTimeSet(userTimeSet: string | null | undefined): DpMapDataType<typeof fitAdd>["validConfig"];
 export interface FitUnlockMethodBase {
     unlockMethodConfig: UnlockMethodConfig;
     fittingId: string;
@@ -10,7 +10,6 @@ export interface FitUnlockMethodBase {
     slaveId: number;
     lockUserId: number;
     userType: number;
-    lockUserInfo: UserInfo;
     addDpCode: string;
     addDpMap: DpMap;
     addDpReportMap: DpMap;

package/lib/feature/fit/method/internal/base.js

@@ -3,35 +3,17 @@ import dpCodes from "../../../../config/dp-code";
 import { fitAdd, fitReportAdd, } from "../../../../config/dp-map/unlock-method-fit";
 import { isAdmin } from "../../../../utils";
 import { getError } from "../../../../utils/errors";
-import { LoopTypes } from "../../../../utils/constant";
 import { sdkLog } from "../../../../utils/sdk-log";
 import { getUnlockMethodTypeByTypeForRuntime } from "../../../utils";
-import { getUserInfoOnDevForRuntime } from "../../../user/user";
 import { getBoundLockListForRuntime } from "../../list";
 import { resolveSlaveId } from "../../resolve-slave-id";
 import { validConfigDpMap } from "../../../../config/dp-map/common";
-export function buildValidConfigFromTimeSchedule(timeScheduleInfo) {
-    if (!timeScheduleInfo) {
+import { getFitUsersForRuntime } from "../../users";
+export function buildValidConfigFromUserTimeSet(userTimeSet) {
+    if (!userTimeSet) {
         throw getError(1106);
     }
-    const { permanent, userTimeSet, effectiveTime, expiredTime, scheduleDetails, } = timeScheduleInfo;
-    if (permanent) {
-        return DpUtils.parse(userTimeSet, validConfigDpMap.childMap);
-    }
-    return {
-        startTime: Math.floor((effectiveTime || +new Date()) / 1000),
-        endTime: expiredTime ? Math.floor(expiredTime / 1000) : 0x72bc9b7f,
-        loop: scheduleDetails?.repeat ? LoopTypes.WEEK : LoopTypes.NONE,
-        loopConfig: 0,
-        weeks: scheduleDetails?.repeat
-            ? scheduleDetails.weeks
-            : [0, 0, 0, 0, 0, 0, 0],
-        days: [],
-        startHour: Math.floor((scheduleDetails?.effectiveTime ?? 0) / 60),
-        startMinute: (scheduleDetails?.effectiveTime ?? 0) % 60,
-        endHour: Math.floor((scheduleDetails?.invalidTime ?? 0) / 60),
-        endMinute: (scheduleDetails?.invalidTime ?? 0) % 60,
-    };
+    return DpUtils.parse(userTimeSet, validConfigDpMap.childMap);
 }
 async function resolveLockDevId(rt, lockDevId) {
     const list = await getBoundLockListForRuntime(rt);
@@ -80,12 +62,20 @@ export async function getFitUnlockMethodBase(rt, type, userId, lockDevId) {
     const unlockMethodConfig = getUnlockMethodTypeByTypeForRuntime(rt, type);
     const slaveId = await resolveSlaveId(rt, lockDevId);
     const resolvedLockDevId = await resolveLockDevId(rt, lockDevId);
-    const lockUserInfo = await getUserInfoOnDevForRuntime(rt, {
-        devId: resolvedLockDevId,
-        userId,
-    });
-    const { lockUserId, userType, timeScheduleInfo } = lockUserInfo;
-    const validConfig = buildValidConfigFromTimeSchedule(timeScheduleInfo);
+    const fitUsers = await getFitUsersForRuntime(rt);
+    const fitUserInfo = fitUsers.find((item) => item.userId === userId);
+    if (!fitUserInfo) {
+        const error = getError(1048);
+        sdkLog("warn", "fitUnlockMethod", "buildBaseUserNotFound", {
+            devId: rt.devId,
+            duration: Date.now() - startedAt,
+            data: { userId, userCount: fitUsers.length },
+            error,
+        });
+        throw error;
+    }
+    const { lockUserId, userType, userTimeSet } = fitUserInfo;
+    const validConfig = buildValidConfigFromUserTimeSet(userTimeSet);
     const dpData = {
         slaveId,
         type: unlockMethodConfig.id,
@@ -105,7 +95,6 @@ export async function getFitUnlockMethodBase(rt, type, userId, lockDevId) {
         slaveId,
         lockUserId,
         userType,
-        lockUserInfo,
         addDpCode: dpCodes.unlockMethodCreate,
         addDpMap: fitAdd,
         addDpReportMap: fitReportAdd,
@@ -117,8 +106,9 @@ export async function getFitUnlockMethodBase(rt, type, userId, lockDevId) {
         data: {
             type,
             lockDevId: resolvedLockDevId,
+            lockUserId,
             userType,
-            hasSchedule: !!timeScheduleInfo,
+            hasSchedule: !!userTimeSet,
         },
     });
     return result;

package/lib/feature/fit/method/update-remove.js

@@ -1,5 +1,5 @@
 import dpUtils from "@ray-js/tuya-dp-transform";
-import { getFitOpenModeList, removeFitOpenMode, updateFitOpenMode, } from "../../../api/fit";
+import { getFitPasswordList, getFitOpenModeList, removeFitOpenMode, updateFitOpenMode, } from "../../../api/fit";
 import dpCodes from "../../../config/dp-code";
 import { fitRemove, fitReportRemove, } from "../../../config/dp-map/unlock-method-fit";
 import { isAdmin } from "../../../utils";
@@ -14,7 +14,29 @@ const FIT_DELETABLE_UNLOCK_METHOD_TYPES = [
     "hand",
     "fingerVein",
 ];
+function isOperateNotSupported(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const cloudError = error;
+    return (cloudError.innerError?.errorCode === "OPERATE_NOT_SUPPORTED" ||
+        cloudError.ext?.errorCode === "OPERATE_NOT_SUPPORTED" ||
+        cloudError.errorCode === "OPERATE_NOT_SUPPORTED");
+}
 async function findFitOpenModeRawById(rt, id) {
+    let passwordConfig;
+    try {
+        passwordConfig = getUnlockMethodTypeByTypeForRuntime(rt, "password");
+    }
+    catch {
+    }
+    if (passwordConfig) {
+        const passwordList = await getFitPasswordList(rt.devId);
+        const password = (passwordList ?? []).find((item) => item.unlockBindingId === id && item.opModeType === 2);
+        if (password) {
+            return { raw: password, unlockMethodConfig: passwordConfig };
+        }
+    }
     for (const type of FIT_DELETABLE_UNLOCK_METHOD_TYPES) {
         let unlockMethodConfig;
         try {
@@ -27,7 +49,20 @@ async function findFitOpenModeRawById(rt, id) {
         if (!dpId) {
             continue;
         }
-        const raw = await getFitOpenModeList(rt.devId, dpId);
+        let raw;
+        try {
+            raw = await getFitOpenModeList(rt.devId, dpId);
+        }
+        catch (error) {
+            if (!isOperateNotSupported(error)) {
+                throw error;
+            }
+            sdkLog("info", "fitUnlockMethod", "deleteLookupTypeUnsupported", {
+                devId: rt.devId,
+                data: { id, type, dpId },
+            });
+            continue;
+        }
         const hit = (raw ?? []).find((item) => item.unlockBindingId === id);
         if (hit) {
             return { raw: hit, unlockMethodConfig };
@@ -77,13 +112,12 @@ export const fitDeleteUnlockMethodForRuntime = parallelOnlyForRuntime(async func
     });
     const found = await findFitOpenModeRawById(rt, id);
     if (!found) {
-        const error = getError(1040);
-        sdkLog("warn", "fitUnlockMethod", "deleteRecordNotFound", {
+        sdkLog("info", "fitUnlockMethod", "deleteAlreadyAbsent", {
             devId: rt.devId,
+            duration: Date.now() - startedAt,
             data: { id },
-            error,
         });
-        throw error;
+        return;
     }
     const { raw, unlockMethodConfig } = found;
     const lockUserId = raw.lockUserId;
@@ -166,7 +200,7 @@ export const fitDeleteUnlockMethodForRuntime = parallelOnlyForRuntime(async func
         }
     }
     try {
-        await removeFitOpenMode(rt.devId, String(id));
+        await removeFitOpenMode(rt.devId, id);
         sdkLog("info", "fitUnlockMethod", "deleteSuccess", {
             devId: rt.devId,
             duration: Date.now() - startedAt,

package/lib/feature/log/log.js

@@ -78,6 +78,20 @@ function handleLockLogs(list, cfg) {
                     };
                     break;
                 }
+                case "offline_pwd_achieve": {
+                    const [name, effectiveDate, expiredDate] = itemData;
+                    tempPwdInfo = {
+                        name: name,
+                        effectiveConfig: {
+                            effectiveDate: effectiveDate,
+                            expiredDate: expiredDate,
+                        },
+                    };
+                    break;
+                }
+                case "dynamic_pwd_achieve": {
+                    break;
+                }
                 case "offline_pwd_clear_achieve": {
                     const [name, effectiveDate, expiredDate] = itemData;
                     clearInfo = {

package/lib/feature/user/user.js

@@ -39,7 +39,21 @@ const handleUserDetail = (rt, user) => {
             },
         });
     }
-    let unlockDetails = unlockDetail.map((detail) => {
+    const unlockDetails = unlockDetail.reduce((result, detail) => {
+        let unlockMethodConfig;
+        try {
+            unlockMethodConfig = getUnlockMethodTypeByDpCodeForRuntime(rt, detail.dpCode);
+        }
+        catch (error) {
+            if (error?.errorCode !== 1014) {
+                throw error;
+            }
+            sdkLog("debug", "user", "detailUnlockTypeSkipped", {
+                devId: rt.devId,
+                data: { dpCode: detail.dpCode },
+            });
+            return result;
+        }
         const unlockList = detail.unlockList.map((unlockItem) => {
             return {
                 unlockId: +unlockItem.unlockId.split("-")[1],
@@ -50,15 +64,15 @@ const handleUserDetail = (rt, user) => {
                 isSpecial: unlockItem.unlockAttr === 1,
             };
         });
-        const unlockMethodConfig = getUnlockMethodTypeByDpCodeForRuntime(rt, detail.dpCode);
-        return {
+        result.push({
             count: unlockList.length,
             dpCode: detail.dpCode,
             dpId: detail.dpId,
             type: unlockMethodConfig.type,
             unlockList,
-        };
-    });
+        });
+        return result;
+    }, []);
     return {
         ...rest,
         timeScheduleInfo: scheduleInfo,

package/lib/feature/utils/index.js

@@ -32,6 +32,11 @@ const unlockMethodConfigs = [
         codes: [dpCodes.unlockFingerVein, dpCodes.unlockFingerVeinKit],
         id: 6,
     },
+    {
+        type: "phoneKey",
+        codes: [dpCodes.unlockPhoneKey],
+        id: 10,
+    },
 ];
 export const unlockMethodDpCodes = unlockMethodConfigs.reduce((res, item) => res.concat(item.codes), []);
 const getUnlockMethodTypeForRuntime = (rt, cb) => {

package/lib/interface.d.ts

@@ -101,7 +101,7 @@ export interface UnlockMethodBaseInfo {
     photoUnlock: boolean;
     isSpecial: boolean;
 }
-export type UnlockMethodType = "finger" | "face" | "password" | "card" | "fingerVein" | "hand" | "eye";
+export type UnlockMethodType = "finger" | "face" | "password" | "card" | "fingerVein" | "hand" | "eye" | "phoneKey";
 export interface UnlockMethodConfig {
     type: UnlockMethodType;
     code: string;
@@ -278,7 +278,7 @@ export interface MediaInfo {
 }
 export type LogType = "alarm_record" | "close_record" | "unlock_record" | "operation" | "local_operation";
 export type CloseValue = "UNDEFINED" | "VOICE_REMOTE" | "APP_REMOTE" | "AUTO" | "LOCAL_MANUAL" | "FITTINGS" | "APP" | "GEO_FENCE";
-export type OperationType = "dev_bind" | "member_schedule_update" | "unlock_add" | "unlock_del" | "temp_pwd_create" | "temp_pwd_del" | "temp_pwd_meta_update" | "temp_pwd_name_update" | "offline_pwd_achieve" | "offline_pwd_clear_achieve" | "offline_pwd_clear_single_achieve" | "offline_pwd_name_update" | "arming_switch" | "unlock_switch" | "automatic_lock" | "auto_lock_time" | "verify_lock_switch" | "do_not_disturb" | "special_control" | "special_function" | "beep_volume" | "remote_unlock_setting" | "remote_voice_pwd_setting";
+export type OperationType = "dev_bind" | "member_schedule_update" | "unlock_add" | "unlock_del" | "temp_pwd_create" | "temp_pwd_del" | "temp_pwd_meta_update" | "temp_pwd_name_update" | "offline_pwd_achieve" | "offline_pwd_clear_achieve" | "offline_pwd_clear_single_achieve" | "offline_pwd_name_update" | "dynamic_pwd_achieve" | "arming_switch" | "unlock_switch" | "automatic_lock" | "auto_lock_time" | "verify_lock_switch" | "do_not_disturb" | "special_control" | "special_function" | "beep_volume" | "remote_unlock_setting" | "remote_voice_pwd_setting";
 export interface LogData {
     logId: string;
     time: number;

package/package.json

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