@ray-js/lock-sdk 1.1.1-beta.1 → 1.1.1-beta.10

package/lib/api/index.d.ts

@@ -27,4 +27,12 @@ export declare const fetchOfflineDpData: (deviceId: string) => Promise<{
 }[]>;
 export declare const publishOfflineDpData: (deviceId: string, dpData: Record<string, DpValue>) => Promise<unknown>;
 export declare const clearOfflineDpData: (deviceId: string) => Promise<unknown>;
+export declare const getFileRemoteUrl: ({ biz, resources, }: {
+    biz: string;
+    resources: {
+        objectKey: string;
+    }[];
+}) => Promise<{
+    signedUrls: Record<string, string>;
+}>;
 export {};

package/lib/api/index.js

@@ -70,3 +70,13 @@ export const clearOfflineDpData = async (deviceId) => {
         version: "1.0",
     });
 };
+export const getFileRemoteUrl = ({ biz, resources, }) => {
+    return requestApi({
+        api: `${THING}.web.fastroute.download.sign`,
+        version: "2.0",
+        data: {
+            biz,
+            signedRequest: { resources },
+        },
+    });
+};

package/lib/api/lock.d.ts

@@ -124,4 +124,9 @@ interface BindUnlockMethodToUserByRecordParams {
     unlockIds: string[];
 }
 export declare const bindUnlockMethodToUserByRecord: (params: BindUnlockMethodToUserByRecordParams) => Promise<boolean>;
+interface ValidatePasswordComplexityParams {
+    devId: string;
+    password: string;
+}
+export declare const validatePasswordComplexity: (params: ValidatePasswordComplexityParams) => Promise<boolean>;
 export {};

package/lib/api/lock.js

@@ -116,3 +116,10 @@ export const bindUnlockMethodToUserByRecord = (params) => {
         data: params,
     });
 };
+export const validatePasswordComplexity = (params) => {
+    return requestApi({
+        api: "m.lock.password.simplicity.check",
+        version: "1.0",
+        data: params,
+    });
+};

package/lib/api/user.d.ts

@@ -102,6 +102,12 @@ interface UserDetail {
     userType: number;
 }
 export declare const getUserDetail: (params: GetUserDetailParams) => Promise<UserDetail>;
+interface GetUserDetailQueryParams {
+    devId: string;
+    userId: string;
+    dpIds: string;
+}
+export declare const getUserDetailQuery: (params: GetUserDetailQueryParams) => Promise<UserListItem>;
 export interface RemovedUserData {
     userId: string;
     lockUserId: number;

package/lib/api/user.js

@@ -40,8 +40,15 @@ export const getUserList = (params) => {
 };
 export const getUserDetail = (params) => {
     return requestApi({
-        api: `${THING}.m.device.member.detail`,
-        version: "4.0",
+        api: "m.lock.device.member.detail",
+        version: "1.0",
+        data: params,
+    });
+};
+export const getUserDetailQuery = (params) => {
+    return requestApi({
+        api: "m.lock.user.detail.query",
+        version: "1.0",
         data: params,
     });
 };

package/lib/capability.js

@@ -45,6 +45,7 @@ export const getDeviceAdvancedAbilities = async () => {
             "tyabi4ucx5",
             "tyabis9tpe",
             "tyabiwxrn9",
+            "tyabipd4hh",
         ]),
         getDeviceAdvancedAbility(config.devInfo.devId),
     ]);
@@ -68,27 +69,52 @@ export const getDeviceAdvancedAbilities = async () => {
             support: false,
             config: {},
         },
+        unlockGuide: {
+            support: false,
+            config: {},
+        },
     };
     productAbilities.forEach((item) => {
-        const data = JSON.parse(item.extConfig);
-        if (item.abilityCode === "tyabi4ucx5" && item.isOpen) {
-            deviceAdvanceAbilityCache.ai.config = data;
-            const dataReport = data?.ai_data_report ?? false;
-            const itemRecognition = data?.ai_recognition?.[0]?.item_recognition ?? false;
-            const petRecognition = data?.ai_recognition?.[0]?.pet_recognition ?? false;
-            const voice = data?.ai_voice ?? false;
-            const message = data?.ai_message ?? false;
-            deviceAdvanceAbilityCache.ai.support =
-                dataReport || itemRecognition || petRecognition || voice || message;
-        }
-        else if (item.abilityCode === "tyabis9tpe" && item.isOpen) {
-            deviceAdvanceAbilityCache.wechat.support = true;
-            deviceAdvanceAbilityCache.wechat.config = data;
+        try {
+            if (item.isOpen) {
+                const data = JSON.parse(item.extConfig);
+                switch (item.abilityCode) {
+                    case "tyabi4ucx5": {
+                        deviceAdvanceAbilityCache.ai.config = data;
+                        const dataReport = data?.ai_data_report ?? false;
+                        const itemRecognition = data?.ai_recognition?.[0]?.item_recognition ?? false;
+                        const petRecognition = data?.ai_recognition?.[0]?.pet_recognition ?? false;
+                        const voice = data?.ai_voice ?? false;
+                        const message = data?.ai_message ?? false;
+                        deviceAdvanceAbilityCache.ai.support =
+                            dataReport ||
+                                itemRecognition ||
+                                petRecognition ||
+                                voice ||
+                                message;
+                        break;
+                    }
+                    case "tyabis9tpe": {
+                        deviceAdvanceAbilityCache.wechat.support = true;
+                        deviceAdvanceAbilityCache.wechat.config = data;
+                        break;
+                    }
+                    case "tyabiwxrn9": {
+                        deviceAdvanceAbilityCache.wechatVoip.support =
+                            !!data?.voipType?.includes("0");
+                        deviceAdvanceAbilityCache.wechatVoip.config = data;
+                        break;
+                    }
+                    case "tyabipd4hh": {
+                        deviceAdvanceAbilityCache.unlockGuide.support = true;
+                        deviceAdvanceAbilityCache.unlockGuide.config = data;
+                        break;
+                    }
+                }
+            }
         }
-        else if (item.abilityCode === "tyabiwxrn9" && item.isOpen) {
-            deviceAdvanceAbilityCache.wechatVoip.support =
-                !!data?.voipType?.includes("0");
-            deviceAdvanceAbilityCache.wechatVoip.config = data;
+        catch (error) {
+            console.warn(`setting [${item.abilityCode}] config error`, error);
         }
     });
     return deviceAdvanceAbilityCache;

package/lib/config/dp-map/common.js

@@ -52,7 +52,7 @@ export const validConfigDpMap = {
                     .slice(0, 7);
             },
             format: (value) => {
-                const weekHex = parseInt(value.reverse().join(""), 2)
+                const weekHex = parseInt([...value].reverse().join(""), 2)
                     .toString(16)
                     .padStart(2, "0");
                 return `000000${weekHex}`;

package/lib/config/index.d.ts

@@ -18,9 +18,10 @@ declare const config: {
     videoAngle: number;
     supportMultipleFace: boolean;
     supportOfflineDps: boolean;
+    preFetch: boolean;
     deviceStatus: DeviceStatus;
 };
-type UpdateConfigParams = Omit<LockSDKOption, "devInfo" | "deviceId">;
+type UpdateConfigParams = Omit<LockSDKOption, "devInfo" | "deviceId" | "preFetch">;
 export declare const updateConfig: (options: UpdateConfigParams) => void;
 export declare const hasCapability: (capability: ProductCommunicationType) => boolean;
 export declare const hasDp: (dpCode: string) => boolean;

package/lib/config/index.js

@@ -16,6 +16,7 @@ const config = {
     videoAngle: 0,
     supportMultipleFace: false,
     supportOfflineDps: false,
+    preFetch: false,
     deviceStatus: {
         type: "offline",
         connectEnable: false,

package/lib/index.js

@@ -60,6 +60,7 @@ export const init = async (options) => {
     config.codesById = codesById;
     config.idsByCode = idsByCode;
     config.supportBigData = !!dpSchema[dpCodes.synchMethodW];
+    config.preFetch = options?.preFetch ?? false;
     config.communication = getCapabilities(devInfo.capability).map((item) => item.id);
     addEvents();
     await initState();

package/lib/interface.d.ts

@@ -10,6 +10,7 @@ export interface LockSDKOption {
     passwordSupportZero?: boolean;
     supportMultipleFace?: boolean;
     supportOfflineDps?: boolean;
+    preFetch?: boolean;
 }
 export interface ErrorData {
     errorCode: number;
@@ -81,7 +82,7 @@ export interface CurrentUser {
     permanent: boolean;
 }
 export interface UnlockMethodBaseInfo {
-    unlockId: string;
+    unlockId: number;
     unlockName: string;
     isBound: boolean;
     id: number;
@@ -143,11 +144,13 @@ export type DpMapDataType<T extends DpMapType> = {
 };
 export interface NotifyInfo {
     appSend?: boolean;
+    msgSend?: boolean;
     msgPhone?: string;
     countryCode?: string;
 }
 export interface UnlockMethodDetail {
     isBound: boolean;
+    type: UnlockMethodType;
     phase: number;
     dpId: number;
     isSpecial: boolean;
@@ -312,6 +315,10 @@ export interface DeviceAdvancedAbility {
         support: boolean;
         config: Record<string, any>;
     };
+    unlockGuide: {
+        support: boolean;
+        config: Record<string, any>;
+    };
 }
 export interface OfflineDpInfo {
     value: DpValue;
@@ -320,4 +327,9 @@ export interface OfflineDpInfo {
 export interface OfflineDps {
     [code: string]: OfflineDpInfo;
 }
+export interface UnlockGuide {
+    videoUrl: string;
+    picUrl: string;
+    expireTime: number;
+}
 export {};

package/lib/log.js

@@ -36,6 +36,12 @@ export const getLatestLogs = async () => {
                 catch {
                 }
             }
+            let userName = item.userName;
+            let unlockName = item.unlockName;
+            if (item.dpId === 89 || item.dpId === 69) {
+                unlockName = item.userName;
+                userName = "";
+            }
             return {
                 type,
                 logId: item.logId,
@@ -43,8 +49,8 @@ export const getLatestLogs = async () => {
                 dpCode,
                 data: itemData,
                 userId: item.userId,
-                userName: item.userName,
-                unlockName: item.unlockName,
+                userName,
+                unlockName,
                 mediaInfo: item.mediaInfoList,
                 unionUnlockInfo: item.unionUnlockInfo?.map((item1) => {
                     return {
@@ -142,6 +148,12 @@ export const getLogs = async (params) => {
             if (dpCode === dpCodes.lockLocalRecord) {
                 type = "local_operation";
             }
+            let userName = record.userName;
+            let unlockName = record.unlockName;
+            if (record.dpId === 89 || record.dpId === 69) {
+                unlockName = record.userName;
+                userName = "";
+            }
             return {
                 type,
                 logId: record.historyId.toString(),
@@ -149,8 +161,8 @@ export const getLogs = async (params) => {
                 dpId: record.dpId,
                 data: dpValue,
                 dpCode,
-                userName: record.userName,
-                unlockName: record.unlockName,
+                userName,
+                unlockName,
                 mediaInfo: record.mediaInfoList,
                 unionUnlockInfo: record.unionUnlockInfo?.map((item) => ({
                     userId: item.userId,

package/lib/open.js

@@ -42,18 +42,18 @@ export const checkRemoteEnabled = parallelMerge(async () => {
     if (deviceStatus.type !== "online") {
         throw getError(1001);
     }
-    if (deviceStatus.onlineType === "local") {
-        if (!hasThread) {
-            throw getError(1064);
-        }
+    const isLocalOnline = deviceStatus.onlineTypes.length === 1 &&
+        deviceStatus.onlineTypes.includes("local");
+    const isThreadLocalOnline = hasThread && isLocalOnline;
+    if (isThreadLocalOnline || deviceStatus.onlineTypes.includes("ble")) {
+        return;
+    }
+    if (isLocalOnline) {
+        throw getError(1064);
     }
     if (dpSchema[dpCodes.remoteNoDpKey] === undefined) {
         throw getError(1045);
     }
-    if ((hasThread && deviceStatus.onlineType === "local") ||
-        deviceStatus.onlineType === "ble") {
-        return;
-    }
     if (!remoteOpenEnabled) {
         throw getError(1046);
     }
@@ -65,7 +65,7 @@ export const checkRemoteEnabled = parallelMerge(async () => {
     }
 });
 const _doAction = async (isOpen, timeout) => {
-    const { devInfo, onlineType, capabilities, communication, dpSchema } = config;
+    const { devInfo, communication } = config;
     await checkRemoteEnabled();
     const deviceStatus = getDeviceStatus();
     const hasThread = hasCapability(ProductCommunicationType.THREAD);
@@ -94,7 +94,7 @@ const _doAction = async (isOpen, timeout) => {
         }
         return false;
     };
-    if (hasThread && deviceStatus.onlineType === "local") {
+    if (hasThread && deviceStatus.onlineTypes.includes("local") && deviceStatus.onlineTypes.length === 1) {
         await publishDps({ [dpCodes.matterLanUnlock]: isOpen }, {
             checkReport: (dps) => {
                 return typeof dps[dpCodes.matterLanUnlock] !== "undefined";

package/lib/other.d.ts

@@ -27,4 +27,5 @@ export declare const connectDevice: () => Promise<unknown>;
 export declare const gotoService: (params?: {
     tab?: "cloudStorage" | "AI";
 }) => Promise<unknown>;
+export declare const validatePwdComplexity: (password: string) => Promise<boolean>;
 export {};

package/lib/other.js

@@ -3,13 +3,14 @@ import config, { hasCapability, hasDp } from "./config";
 import dpCodes from "./config/dp-code";
 import { ProductCommunicationType } from "./constant";
 import { getDeviceStatus, getDpValue } from "./state";
-import { connectBLEDevice, getBLEOnlineState, navigateToMiniProgram, offBleChange, offOnlineChange, onBleChange, onOnlineChange, openPanel, } from "./utils/device";
+import { connectBLEDevice, encrypt, getBLEOnlineState, navigateToMiniProgram, offBleChange, offOnlineChange, onBleChange, onOnlineChange, openPanel, } from "./utils/device";
 import { getError } from "./utils/errors";
 import { publishDps } from "./utils/publishDps";
 import ipc from "./utils/ipc";
 import { DPCHANGE } from "./utils/constant";
 import emitter from "./utils/event";
 import { getOfflineDpCache, publishOfflineDps } from "./offline-dps";
+import { validatePasswordComplexity } from "./api/lock";
 const { alarmLock, unlockFingerprint, unlockPassword, unlockCard, unlockKey, unlockPhoneRemote, unlockTemporary, unlockDynamic, unlockFace, unlockHand, unlockEye, unlockFingerVein, unlockInside, doorOpened, unlockApp, unlockOfflinePd, openInside, lockRecord, unlockDoubleKit, lockLocalRecord, wirelessAwake, } = dpCodes;
 const abilityMap = {
     backHome: "supportBackHome",
@@ -281,3 +282,10 @@ export const gotoService = async (params) => {
         });
     });
 };
+export const validatePwdComplexity = async (password) => {
+    const encryptedPassword = await encrypt(config.devInfo.devId, password);
+    return validatePasswordComplexity({
+        devId: config.devInfo.devId,
+        password: encryptedPassword,
+    });
+};

package/lib/state.js

@@ -1,4 +1,4 @@
-import config, { hasCapability } from "./config";
+import config, { hasCapability, hasDp } from "./config";
 import { onDpDataChange, onDeviceInfoUpdated, offDeviceInfoUpdated, offDpDataChange, registerDevice, getDeviceOnlineType, onOnlineChange, offOnlineChange, onBleChange, offBleChange, registerBleStatus, getDeviceInfo, onMqttMessage, registerMQTTDeviceListener, registerMQTTProtocolListener, offMqttMessage, onAppShow, onAppHide, } from "./utils/device";
 import { getDeviceProperties } from "./api/setting";
 import { parseCapabilities } from "./parse";
@@ -38,7 +38,7 @@ const updateOnlineType = async () => {
     updateDeviceStatus();
 };
 export const getDeviceStatus = () => {
-    const { onlineType, dpSchema, communication, capabilities, devInfo: { isCloudOnline, isOnline, wifiEnableState }, } = config;
+    const { onlineType, devInfo: { isCloudOnline, isOnline, wifiEnableState }, } = config;
     const status = {
         type: isOnline ? "online" : "offline",
         connectEnable: false,
@@ -46,26 +46,35 @@ export const getDeviceStatus = () => {
         onlineTypes: [],
         isWifiActive: wifiEnableState !== 1,
     };
-    const isBleOnline = !isCloudOnline && isOnlineByType(onlineType, 2);
+    const isBleOnline = isOnlineByType(onlineType, 2);
     const isLocalOnline = !isCloudOnline && isOnlineByType(onlineType, 1);
     const supportWifi = hasCapability(ProductCommunicationType.WIFI);
     const supportBle = hasCapability(ProductCommunicationType.BLUETOOTH);
     const supportThread = hasCapability(ProductCommunicationType.THREAD);
-    const hasWirelessAwakeDp = !!dpSchema[dpCodes.wirelessAwake];
+    const hasWirelessAwakeDp = hasDp(dpCodes.wirelessAwake);
     const wirelessAwake = getDpValue(dpCodes.wirelessAwake);
-    const isDeviceOnline = hasWirelessAwakeDp
-        ? wirelessAwake && isCloudOnline
-        : isCloudOnline;
     status.connectEnable = isSupportBleControl() && !isOnline;
     if (supportWifi) {
         if (!status.connectEnable) {
-            status.connectEnable =
-                hasWirelessAwakeDp && wirelessAwake === false && !isBleOnline;
+            if (isCloudOnline) {
+                status.connectEnable =
+                    hasWirelessAwakeDp && wirelessAwake === false && !isBleOnline;
+            }
         }
     }
     if (isOnline) {
-        if (isDeviceOnline) {
-            status.onlineTypes.push("cloud");
+        if (isCloudOnline) {
+            if (hasWirelessAwakeDp) {
+                if (wirelessAwake) {
+                    status.onlineTypes.push("cloud");
+                }
+                else {
+                    status.type = "offline";
+                }
+            }
+            else {
+                status.onlineTypes.push("cloud");
+            }
         }
         else if (isLocalOnline) {
             status.onlineTypes.push("local");
@@ -190,24 +199,29 @@ export const permissions = [
     "everyOne",
     "noOne",
 ];
+var DeviceProperties;
+(function (DeviceProperties) {
+    DeviceProperties["REMOTE_UNLOCK_AUTH"] = "REMOTE_UNLOCK_AUTH";
+    DeviceProperties["UNLOCK_PHONE_REMOTE"] = "UNLOCK_PHONE_REMOTE";
+})(DeviceProperties || (DeviceProperties = {}));
+const propsList = [
+    DeviceProperties.REMOTE_UNLOCK_AUTH,
+    DeviceProperties.UNLOCK_PHONE_REMOTE,
+];
 const fetchDeviceProperties = async (isForce) => {
     let result = null;
     if (isForce) {
-        result = await getDeviceProperties(config.devInfo.devId, [
-            "REMOTE_UNLOCK_AUTH",
-            "UNLOCK_PHONE_REMOTE",
-        ]);
+        result = await getDeviceProperties(config.devInfo.devId, propsList);
     }
     else {
         result = await getDataWithPreFetch("getDeviceProperties", () => {
-            return getDeviceProperties(config.devInfo.devId, [
-                "REMOTE_UNLOCK_AUTH",
-                "UNLOCK_PHONE_REMOTE",
-            ]);
+            return getDeviceProperties(config.devInfo.devId, propsList);
         });
     }
-    config.remoteOpenEnabled = result["UNLOCK_PHONE_REMOTE"] === "true";
-    config.remoteOpenPermission = permissions[+result["REMOTE_UNLOCK_AUTH"] || 0];
+    config.remoteOpenEnabled =
+        result[DeviceProperties.UNLOCK_PHONE_REMOTE] === "true";
+    config.remoteOpenPermission =
+        permissions[+result[DeviceProperties.REMOTE_UNLOCK_AUTH] || 0];
 };
 export const initState = async () => {
     const { devInfo: { dps, devId }, dpSchema, } = config;

package/lib/sync/temp.js

@@ -69,7 +69,7 @@ export const syncTemp = async () => {
         });
     }
     catch (e) {
-        console.log(e, "sync temp password error");
+        console.warn(e, "sync temp password error");
     }
 };
 export const autoSyncTemp = () => {

package/lib/temporary.js

@@ -10,19 +10,35 @@ import { publishDps } from "./utils/publishDps";
 import dpCodes from "./config/dp-code";
 import dpUtils from "@ray-js/tuya-dp-transform";
 const PASSWORD_REGEX = /^[0-9]+$/;
-const handleError = (cloudError) => {
-    switch (cloudError.errorCode) {
-        case "USER_PWD_ALREADY_EXIST":
-            throw getError(1037);
-        case "LOCK_PWD_NAME_REPEAT":
-            throw getError(1038);
-        case "START_END_DATE_NOT_RIGHT":
-            throw getError(1039);
-        case "RECORD_NOT_EXIST":
-            throw getError(1040);
-        default:
-            throw cloudError;
+const handleError = (err) => {
+    if (err?.innerError?.errorCode) {
+        let error;
+        switch (err.innerError.errorCode) {
+            case "USER_PWD_ALREADY_EXIST":
+                error = getError(1037);
+                break;
+            case "LOCK_PWD_NAME_REPEAT":
+            case "OFFLINE_PWD_NAME_REPEAT":
+                error = getError(1038);
+                break;
+            case "START_END_DATE_NOT_RIGHT":
+                error = getError(1039);
+                break;
+            case "RECORD_NOT_EXIST":
+                error = getError(1040);
+                break;
+            case "OFFLINE_PWD_EXAUST_IN_PERIOD":
+                error = getError(1067);
+                break;
+            default:
+        }
+        if (error) {
+            error.errorMsg = err.innerError.errorMsg;
+            error.innerError = err.innerError;
+            throw error;
+        }
     }
+    throw err;
 };
 const isValidPassword = async (params) => {
     const validateResult = await validateTempPwd(params);
@@ -83,7 +99,7 @@ export const createTempCustom = parallelOnly(async (params) => {
                 endTime: effective.expiredDate,
                 loop: loopType,
                 loopConfig: 0,
-                weeks: effective.weeks ?? [0, 0, 0, 0, 0, 0, 0],
+                weeks: effective.weeks ? effective.weeks : [0, 0, 0, 0, 0, 0, 0],
                 days: [],
                 startHour: Math.floor(effectiveTime / 60),
                 startMinute: effectiveTime % 60,
@@ -144,7 +160,7 @@ export const createTempCustom = parallelOnly(async (params) => {
             };
         }
         catch (error) {
-            throw handleError(error?.innerError ?? error);
+            throw handleError(error);
         }
     }
 });
@@ -186,7 +202,7 @@ export const removeTempCustom = async (params) => {
         }
     }
     catch (e) {
-        handleError(e?.innerError ?? e);
+        handleError(e);
     }
 };
 export const updateTempCustom = async (params) => {
@@ -220,7 +236,7 @@ export const updateTempCustom = async (params) => {
         });
     }
     catch (error) {
-        handleError(error?.innerError ?? error);
+        handleError(error);
     }
 };
 const getOfflinePassword = async (params) => {
@@ -232,7 +248,7 @@ const getOfflinePassword = async (params) => {
         };
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };
 export const createTempLimit = async (params) => {
@@ -500,7 +516,7 @@ const changePasswordPhase = async (unlockBindingId, phase) => {
         });
     }
     catch (e) {
-        handleError(e?.innerError ?? e);
+        handleError(e);
     }
     return true;
 };
@@ -582,7 +598,7 @@ export const saveTempOnlineUnlimited = async (params) => {
         };
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };
 export const createTempOffline = async (params) => {
@@ -640,7 +656,7 @@ export const removeTempOnlineUnlimited = async (id) => {
         });
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };
 const onLinePasswordStatusMap = {
@@ -674,7 +690,7 @@ export const getTempOnlineUnlimitedList = async () => {
         return newPswList;
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };
 const offlinePasswordTypeMap = {
@@ -693,7 +709,7 @@ export const getTempOfflineEffectiveList = async (pwdTypeCode) => {
         return offLineValidPswList;
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };
 export const getTempOfflineInvalidList = async (pwdTypeCode) => {
@@ -706,6 +722,6 @@ export const getTempOfflineInvalidList = async (pwdTypeCode) => {
         return offLineFailurePswList;
     }
     catch (error) {
-        throw handleError(error?.innerError ?? error);
+        throw handleError(error);
     }
 };

package/lib/unlock-method.d.ts

@@ -1,6 +1,7 @@
-import { ErrorData, UnBindUnlockMethodGroup, UnlockMethodDetail, UnlockMethodType } from "./interface";
+import { ErrorData, UnBindUnlockMethodGroup, UnlockGuide, UnlockMethodDetail, UnlockMethodType } from "./interface";
 export interface SpecialUnlockMethodInfo {
     appSend?: boolean;
+    msgSend?: boolean;
     msgPhone?: string;
     verifyCode?: string;
     countryCode?: string;
@@ -85,4 +86,5 @@ export type AddUnlockMethodEvent = StepEvent | SuccessEvent | ErrorEvent;
 export type AddUnlockMethodListener = (event: AddUnlockMethodEvent) => void;
 export declare const onAddUnlockMethod: (listener: AddUnlockMethodListener) => void;
 export declare const offAddUnlockMethod: (listener: AddUnlockMethodListener) => void;
+export declare const getUnlockGuide: (type: UnlockMethodType) => Promise<UnlockGuide | null>;
 export {};

package/lib/unlock-method.js

@@ -12,8 +12,9 @@ import { publishDps } from "./utils/publishDps";
 import { encrypt } from "./utils/device";
 import emitter from "./utils/event";
 import { DPCHANGE, UNLOCK_METHOD_EVENT } from "./utils/constant";
-import { sendPhoneVerifyCode } from "./api";
+import { getFileRemoteUrl, sendPhoneVerifyCode } from "./api";
 import { getUserInfo } from "./user";
+import { getDeviceAdvancedAbilities } from "./capability";
 const getAddUnlockError = (status) => {
     if (status >= 0 && status <= 10) {
         return getError(1015 + status);
@@ -30,6 +31,7 @@ export const getUnlockMethodDetail = async (id) => {
     });
     const detail = {
         isBound: cloudData.allocateFlag === 1,
+        type: getUnlockMethodTypeByDpCode(config.codesById[Number(cloudData.opmode)])?.type,
         phase: cloudData.phase,
         dpId: Number(cloudData.opmode),
         isSpecial: cloudData.unlockAttr === 1,
@@ -41,6 +43,7 @@ export const getUnlockMethodDetail = async (id) => {
         userType: cloudData.userType,
         notifyInfo: {
             appSend: !!cloudData.notifyInfo?.appSend,
+            msgSend: !!cloudData.notifyInfo?.msgPhone,
             msgPhone: cloudData.notifyInfo?.msgPhone,
             countryCode: cloudData.notifyInfo?.countryCode,
         },
@@ -48,7 +51,7 @@ export const getUnlockMethodDetail = async (id) => {
     return detail;
 };
 const getUnlockMethodBase = async (type, userId) => {
-    const { idsByCode, devInfo: { devId }, supportBigData, dpSchema, } = config;
+    const { idsByCode, devInfo: { devId }, supportBigData, } = config;
     const unlockMethodConfig = getUnlockMethodTypeByType(type);
     const addDpCode = supportBigData
         ? dpCodes.unlockMethodCreateW
@@ -104,11 +107,14 @@ const checkSpecial = (isSpecial, params, oldSetting) => {
             if (!supportedPhone) {
                 throw getError(1057);
             }
-            else if (!params?.msgPhone) {
+            else if (!params?.msgSend) {
                 throw getError(1058);
             }
         }
-        if (supportedPhone && params?.msgPhone) {
+        if (supportedPhone && params?.msgSend) {
+            if (!params.msgPhone) {
+                throw getError(1066);
+            }
             if (!params.countryCode) {
                 throw getError(1056);
             }
@@ -121,9 +127,9 @@ const checkSpecial = (isSpecial, params, oldSetting) => {
         unlockAttr: isSpecial ? 1 : 0,
         notifyInfo: {
             appSend: !!params?.appSend,
-            msgPhone: supportedPhone ? params?.msgPhone : undefined,
-            countryCode: supportedPhone ? params?.countryCode : undefined,
-            msgPhoneVerifyCode: supportedPhone ? params?.verifyCode : undefined,
+            msgPhone: supportedPhone && params?.msgSend ? params?.msgPhone : undefined,
+            countryCode: supportedPhone && params?.msgSend ? params?.countryCode : undefined,
+            msgPhoneVerifyCode: supportedPhone && params?.msgSend ? params?.verifyCode : undefined,
         },
     };
 };
@@ -560,3 +566,49 @@ export const onAddUnlockMethod = (listener) => {
 export const offAddUnlockMethod = (listener) => {
     emitter.off(UNLOCK_METHOD_EVENT, listener);
 };
+const guileTypeMap = {
+    card: ["addCard", "addCardPic"],
+    finger: ["addFingerprint", "addFingerprintPic"],
+    face: ["addFace", "addFacePic"],
+    fingerVein: ["addFingervein", "addFingerveinPic"],
+    hand: ["addPalmvein", "addPalmveinPic"],
+    eye: ["addIris", "addIrisPic"],
+};
+export const getUnlockGuide = async (type) => {
+    if (type === "password") {
+        return null;
+    }
+    const { unlockGuide } = await getDeviceAdvancedAbilities();
+    if (unlockGuide.support) {
+        const [videoKey, picKey] = guileTypeMap[type] || ["", ""];
+        const resources = [];
+        let videoUrlPath = "";
+        let picUrlPath = "";
+        if (unlockGuide.config[picKey]) {
+            picUrlPath = unlockGuide.config[picKey].url;
+            resources.push({
+                objectKey: picUrlPath,
+            });
+        }
+        if (unlockGuide.config[videoKey]) {
+            videoUrlPath = unlockGuide.config[videoKey].url;
+            resources.push({
+                objectKey: videoUrlPath,
+            });
+        }
+        if (resources.length === 0) {
+            return null;
+        }
+        const { signedUrls } = await getFileRemoteUrl({
+            biz: "hulk_video_tutorial_video",
+            resources,
+        });
+        const expireTime = Date.now() + 30 * 60 * 1000;
+        return {
+            videoUrl: signedUrls[videoUrlPath],
+            picUrl: signedUrls[picUrlPath],
+            expireTime,
+        };
+    }
+    return null;
+};

package/lib/user.d.ts

@@ -1,4 +1,4 @@
-import { EffectiveConfig, UserInfo } from "./interface";
+import { EffectiveConfig, UnlockMethodBaseInfo, UserInfo } from "./interface";
 interface getUsersParams {
     page?: number;
     pageSize?: number;
@@ -11,7 +11,27 @@ export declare const getUsers: (params?: getUsersParams) => Promise<{
 interface getUserInfoParams {
     userId: string;
 }
-export declare const getUserInfo: (params: getUserInfoParams) => Promise<UserInfo>;
+export declare const getUserInfo: (params: getUserInfoParams) => Promise<{
+    timeScheduleInfo: any;
+    unlockDetails: {
+        count: number;
+        dpCode: string;
+        dpId: number;
+        type: import("./interface").UnlockMethodType;
+        unlockList: UnlockMethodBaseInfo[];
+    }[];
+    isAccountUser: boolean;
+    userId: string;
+    lockUserId: number;
+    avatarUrl: string;
+    backHomeNotifyAttr: number;
+    effectiveFlag: number;
+    nickName: string;
+    offlineUnlock: boolean;
+    userContact: string;
+    userType: 10 | 20 | 30 | 40 | 50;
+    userListType: "panel_user" | "group_user";
+}>;
 interface updateUserLimitTimeParams {
     userId: string;
     lockUserId: number;

package/lib/user.js

@@ -1,4 +1,4 @@
-import { getUserDetail, getUserList } from "./api/user";
+import { getUserDetail, getUserDetailQuery, getUserList, } from "./api/user";
 import config from "./config";
 import { update as updateMap, reportUpdate as reportUpdateMap, } from "./config/dp-map/unlock-method";
 import { update as updateMapBig, reportUpdate as reportUpdateMapBig, } from "./config/dp-map/unlock-method-big";
@@ -14,58 +14,61 @@ import { LoopTypes } from "./utils/constant";
 import { getCurrentUser } from "./state";
 import { deleteUser } from "./utils/user";
 import { UserType } from "./constant";
-const concactUserList = (list, result) => {
-    return list.reduce((acc, item) => {
-        const { timeScheduleInfo, unlockDetail, ...rest } = item;
-        let scheduleInfo = {
-            permanent: true,
-        };
-        if (!item.timeScheduleInfo.permanent &&
-            item.timeScheduleInfo.scheduleDetails &&
-            item.timeScheduleInfo.scheduleDetails.length > 0) {
-            Object.assign(timeScheduleInfo, {
-                effectiveTime: formatTimestampToMilliseconds(item.timeScheduleInfo.effectiveTime || 0),
-                expiredTime: formatTimestampToMilliseconds(item.timeScheduleInfo.expiredTime || 0),
-                scheduleDetails: {
-                    repeat: !item.timeScheduleInfo.scheduleDetails[0].allDay,
-                    effectiveTime: item.timeScheduleInfo.scheduleDetails[0].effectiveTime,
-                    invalidTime: item.timeScheduleInfo.scheduleDetails[0].invalidTime,
-                    timeZoneId: item.timeScheduleInfo.scheduleDetails[0].timeZoneId,
-                    weeks: parseWeek(item.timeScheduleInfo.scheduleDetails[0].workingDay),
-                },
-            });
-        }
-        let unlockDetails = unlockDetail.map((detail) => {
-            const unlockList = detail.unlockList.map((unlockItem) => {
-                return {
-                    unlockId: unlockItem.unlockId.split("-")[1],
-                    unlockName: unlockItem.unlockName,
-                    id: unlockItem.opModeId,
-                    isBound: unlockItem.allocateFlag === 1,
-                    photoUnlock: unlockItem.photoUnlock,
-                    isSpecial: unlockItem.unlockAttr === 1,
-                };
-            });
-            const unlockMethodConfig = unlockMethodConfigs.find((item) => item.code === detail.dpCode);
+const handleUserDetail = (user) => {
+    const { timeScheduleInfo, unlockDetail, ...rest } = user;
+    let scheduleInfo = {
+        permanent: true,
+    };
+    if (!timeScheduleInfo.permanent &&
+        timeScheduleInfo.scheduleDetails &&
+        timeScheduleInfo.scheduleDetails.length > 0) {
+        Object.assign(scheduleInfo, {
+            permanent: false,
+            effectiveTime: formatTimestampToMilliseconds(timeScheduleInfo.effectiveTime || 0),
+            expiredTime: formatTimestampToMilliseconds(timeScheduleInfo.expiredTime || 0),
+            scheduleDetails: {
+                repeat: !timeScheduleInfo.scheduleDetails[0].allDay,
+                effectiveTime: timeScheduleInfo.scheduleDetails[0].effectiveTime,
+                invalidTime: timeScheduleInfo.scheduleDetails[0].invalidTime,
+                timeZoneId: timeScheduleInfo.scheduleDetails[0].timeZoneId,
+                weeks: parseWeek(timeScheduleInfo.scheduleDetails[0].workingDay),
+            },
+        });
+    }
+    let unlockDetails = unlockDetail.map((detail) => {
+        const unlockList = detail.unlockList.map((unlockItem) => {
             return {
-                count: unlockList.length,
-                dpCode: detail.dpCode,
-                dpId: detail.dpId,
-                type: unlockMethodConfig.type,
-                unlockList,
+                unlockId: +unlockItem.unlockId.split("-")[1],
+                unlockName: unlockItem.unlockName,
+                id: unlockItem.opModeId,
+                isBound: unlockItem.allocateFlag === 1,
+                photoUnlock: unlockItem.photoUnlock,
+                isSpecial: unlockItem.unlockAttr === 1,
             };
         });
-        acc.push({
-            ...rest,
-            timeScheduleInfo: scheduleInfo,
-            unlockDetails,
-            isAccountUser: item.userListType === "group_user",
-        });
+        const unlockMethodConfig = unlockMethodConfigs.find((item) => item.code === detail.dpCode);
+        return {
+            count: unlockList.length,
+            dpCode: detail.dpCode,
+            dpId: detail.dpId,
+            type: unlockMethodConfig.type,
+            unlockList,
+        };
+    });
+    return {
+        ...rest,
+        timeScheduleInfo: scheduleInfo,
+        unlockDetails,
+        isAccountUser: user.userListType === "group_user",
+    };
+};
+const concactUserList = (list, result) => {
+    return list.reduce((acc, item) => {
+        acc.push(handleUserDetail(item));
         return acc;
     }, result);
 };
-export const getUsers = async (params) => {
-    const { page = 1, pageSize = 10, keyword = "" } = params || {};
+const getUserDpCodes = async () => {
     const currentUser = await getCurrentUser();
     const dps = [];
     if (currentUser.allOpenDps) {
@@ -77,6 +80,11 @@ export const getUsers = async (params) => {
             return acc;
         }, dps);
     }
+    return dps;
+};
+export const getUsers = async (params) => {
+    const { page = 1, pageSize = 10, keyword = "" } = params || {};
+    const dps = await getUserDpCodes();
     const res = await getUserList({
         dpCodes: dps.join(","),
         devId: config.devInfo.devId,
@@ -97,18 +105,13 @@ export const getUsers = async (params) => {
     };
 };
 export const getUserInfo = async (params) => {
-    const user = await getUserDetail({
+    const currentUser = await getCurrentUser();
+    const res = await getUserDetailQuery({
         devId: config.devInfo.devId,
         userId: params.userId,
+        dpIds: currentUser.allOpenDps,
     });
-    const data = await getUsers({
-        keyword: user.nickName,
-    });
-    const res = data.list.find((item) => item.userId === params.userId);
-    if (res) {
-        return res;
-    }
-    throw getError(1048);
+    return handleUserDetail(res);
 };
 export const updateUserLimitTime = async (params) => {
     const { userId, lockUserId, permanent, effective } = params;
@@ -153,33 +156,33 @@ export const updateUserLimitTime = async (params) => {
                 endMinute: expiredTime % 60,
             },
     };
-    const dpCode = config.supportBigData
-        ? dpCodes.unlockMethodEditW
-        : dpCodes.unlockMethodEdit;
-    const res = (await publishDps({
-        [dpCode]: DpUtils.format(dpValue, (config.supportBigData ? updateMapBig : updateMap)),
-    }, {
-        checkReport: (dps) => {
-            if (typeof dps[dpCode] !== "undefined") {
-                const result = DpUtils.parse(dps[dpCode], (config.supportBigData
-                    ? reportUpdateMapBig
-                    : reportUpdateMap));
-                if (result.type === 0) {
-                    if (result.memberId === lockUserId) {
-                        return result;
-                    }
-                    else {
-                        console.warn("An incorrect member id was returned");
+    try {
+        const dpCode = config.supportBigData
+            ? dpCodes.unlockMethodEditW
+            : dpCodes.unlockMethodEdit;
+        const res = (await publishDps({
+            [dpCode]: DpUtils.format(dpValue, (config.supportBigData ? updateMapBig : updateMap)),
+        }, {
+            checkReport: (dps) => {
+                if (typeof dps[dpCode] !== "undefined") {
+                    const result = DpUtils.parse(dps[dpCode], (config.supportBigData
+                        ? reportUpdateMapBig
+                        : reportUpdateMap));
+                    if (result.type === 0) {
+                        if (result.memberId === lockUserId) {
+                            return result;
+                        }
+                        else {
+                            console.warn("An incorrect member id was returned");
+                        }
                     }
                 }
-            }
-            return false;
-        },
-    }));
-    if (res.status !== 255) {
-        throw getError(1011);
-    }
-    try {
+                return false;
+            },
+        }));
+        if (res.status !== 255) {
+            throw getError(1011);
+        }
         await updateUserTimeSchedule({
             devId: config.devInfo.devId,
             userId: userId,
@@ -241,11 +244,8 @@ export const openFamilyUserDetail = async (userId) => {
         const url = `tuyaSmart://member_info?homeId=${homeId}&memberId=${userId}&role=${role}`;
         ty.router({
             url: url,
-            success: (d) => {
-                console.log("openFamilyUserDetail success");
-            },
             fail: (e) => {
-                console.log("openFamilyUserDetail fail", e);
+                console.error("openFamilyUserDetail fail", e);
             },
         });
         return;

package/lib/utils/errors.js

@@ -64,6 +64,8 @@ const errors = {
     1063: "Password length only supports 4-6 digits",
     1064: "Non-thread device, not supported in LAN connection to open and close locks",
     1065: "Cloud side has been deleted, but device side synchronization deletion failed",
+    1066: "Phone number cannot be empty",
+    1067: "Password limit reached within this period",
 };
 export const getError = (code, ...places) => {
     if (errors[code]) {

package/lib/utils/index.d.ts

@@ -107,7 +107,7 @@ export declare const parseOfflinePassword: (value: string) => string;
 export declare const formatTimestampToMilliseconds: (timestamp: number) => number;
 export declare const unlockMethodConfigs: UnlockMethodConfig[];
 export declare const getUnlockMethodTypeByDpCode: (dpCode: string) => UnlockMethodConfig;
-export declare const getUnlockMethodTypeById: (id: number) => UnlockMethodConfig;
+export declare const getUnlockMethodTypeById: (id: number | string) => UnlockMethodConfig;
 export declare const getUnlockMethodTypeByType: (type: string) => UnlockMethodConfig;
 export declare const parallelMerge: <T extends (...args: any[]) => Promise<any>>(cb: T) => (...args: Parameters<T>) => ReturnType<T>;
 export declare const parallelOnly: <T extends (...args: any[]) => Promise<any>>(cb: T) => (...args: Parameters<T>) => ReturnType<T>;

package/lib/utils/index.js

@@ -49,7 +49,8 @@ export function getCapabilities(capability) {
     });
 }
 export const formatWeek = (value) => {
-    return parseInt([...value].reverse().join(""), 2);
+    const temp = value.slice(0, 7);
+    return parseInt(temp.reverse().join(""), 2);
 };
 export const parseWeek = (value) => {
     return Number(value)
@@ -258,18 +259,20 @@ onBackgroundFetchData(preFetchKeys, (res) => {
     });
 });
 export const getDataWithPreFetch = async (key, apiCb) => {
-    if (preFetchData[key]) {
-        return preFetchData[key];
-    }
-    try {
-        const result = await getBackgroundFetchData([key]);
-        if (result &&
-            result.fetchedData[key] &&
-            result.fetchedData[key].fetchedData) {
-            return result.fetchedData[key].fetchedData;
+    if (config.preFetch) {
+        if (preFetchData[key]) {
+            return preFetchData[key];
+        }
+        try {
+            const result = await getBackgroundFetchData([key]);
+            if (result &&
+                result.fetchedData[key] &&
+                result.fetchedData[key].fetchedData) {
+                return result.fetchedData[key].fetchedData;
+            }
+        }
+        catch {
         }
-    }
-    catch {
     }
     return apiCb();
 };

package/package.json

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