@ray-js/lock-sdk 1.1.1-beta.3 → 1.1.1-beta.5

package/lib/api/user.js

@@ -40,8 +40,8 @@ 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,
     });
 };

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/interface.d.ts

@@ -82,7 +82,7 @@ export interface CurrentUser {
     permanent: boolean;
 }
 export interface UnlockMethodBaseInfo {
-    unlockId: string;
+    unlockId: number;
     unlockName: string;
     isBound: boolean;
     id: number;
@@ -144,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;

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

@@ -83,7 +83,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,

package/lib/unlock-method.d.ts

@@ -1,6 +1,7 @@
 import { ErrorData, UnBindUnlockMethodGroup, UnlockGuide, UnlockMethodDetail, UnlockMethodType } from "./interface";
 export interface SpecialUnlockMethodInfo {
     appSend?: boolean;
+    msgSend?: boolean;
     msgPhone?: string;
     verifyCode?: string;
     countryCode?: string;

package/lib/unlock-method.js

@@ -31,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,
@@ -42,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,
         },
@@ -49,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
@@ -105,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);
             }
@@ -122,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,
         },
     };
 };

package/lib/user.js

@@ -23,7 +23,8 @@ const concactUserList = (list, result) => {
         if (!item.timeScheduleInfo.permanent &&
             item.timeScheduleInfo.scheduleDetails &&
             item.timeScheduleInfo.scheduleDetails.length > 0) {
-            Object.assign(timeScheduleInfo, {
+            Object.assign(scheduleInfo, {
+                permanent: false,
                 effectiveTime: formatTimestampToMilliseconds(item.timeScheduleInfo.effectiveTime || 0),
                 expiredTime: formatTimestampToMilliseconds(item.timeScheduleInfo.expiredTime || 0),
                 scheduleDetails: {
@@ -38,7 +39,7 @@ const concactUserList = (list, result) => {
         let unlockDetails = unlockDetail.map((detail) => {
             const unlockList = detail.unlockList.map((unlockItem) => {
                 return {
-                    unlockId: unlockItem.unlockId.split("-")[1],
+                    unlockId: +unlockItem.unlockId.split("-")[1],
                     unlockName: unlockItem.unlockName,
                     id: unlockItem.opModeId,
                     isBound: unlockItem.allocateFlag === 1,
@@ -153,33 +154,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 +242,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,7 @@ 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",
 };
 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)

package/package.json

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