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

package/lib/api/user.d.ts

@@ -82,26 +82,6 @@ export declare const getUserList: (params: getUserListParams) => Promise<{
     user: UserListItem[];
     hasNext: boolean;
 }>;
-interface GetUserDetailParams {
-    devId: string;
-    userId: string;
-}
-interface UserDetail {
-    allOpenType: number[];
-    avatarUrl: string;
-    lockUserId: number;
-    nickName: string;
-    phase: number;
-    productAttribute: number;
-    status: number;
-    supportOpenType: number[];
-    uid: string;
-    userContact: string;
-    userId: string;
-    userTimeSet: string;
-    userType: number;
-}
-export declare const getUserDetail: (params: GetUserDetailParams) => Promise<UserDetail>;
 interface GetUserDetailQueryParams {
     devId: string;
     userId: string;

package/lib/api/user.js

@@ -38,13 +38,6 @@ export const getUserList = (params) => {
         data: params,
     });
 };
-export const getUserDetail = (params) => {
-    return requestApi({
-        api: "m.lock.device.member.detail",
-        version: "1.0",
-        data: params,
-    });
-};
 export const getUserDetailQuery = (params) => {
     return requestApi({
         api: "m.lock.user.detail.query",

package/lib/unlock-method.js

@@ -1,17 +1,15 @@
 import dpUtils from "@ray-js/tuya-dp-transform";
 import { bindUnlockMethodToUser, bindUnlockMethodToUserByRecord, checkFreeUnlockMethods, createUnlockMethod, removeUnlockMethod, editUnlockMethod, fetchCreatePasswordSN, fetchFreeUnlockMethods, getUnlockMethodInfo, unbindMemberUnlockMethod, } from "./api/lock";
-import { getUserDetail } from "./api/user";
 import config from "./config";
 import dpCodes from "./config/dp-code";
 import { add as addMap, reportAdd as reportAddMap, remove as removeMap, reportRemove as reportRemoveMap, } from "./config/dp-map/unlock-method";
 import { add as addBigMap, reportAdd as reportAddBigMap, remove as removeBigMap, reportRemove as reportRemoveBigMap, } from "./config/dp-map/unlock-method-big";
-import { validConfigDpMap } from "./config/dp-map/common";
 import { getPermanentSetting, getUnlockMethodTypeByDpCode, getUnlockMethodTypeByType, isAdmin, parallelOnly, sleep, } from "./utils";
 import { getError } from "./utils/errors";
 import { publishDps } from "./utils/publishDps";
 import { encrypt } from "./utils/device";
 import emitter from "./utils/event";
-import { DPCHANGE, UNLOCK_METHOD_EVENT } from "./utils/constant";
+import { DPCHANGE, LoopTypes, UNLOCK_METHOD_EVENT } from "./utils/constant";
 import { getFileRemoteUrl, sendPhoneVerifyCode } from "./api";
 import { getUserInfo } from "./user";
 import { getDeviceAdvancedAbilities } from "./capability";
@@ -58,8 +56,7 @@ const getUnlockMethodBase = async (type, userId) => {
         : dpCodes.unlockMethodCreate;
     const dpId = idsByCode[unlockMethodConfig.code];
     const [user, sn] = await Promise.all([
-        getUserDetail({
-            devId: devId,
+        getUserInfo({
             userId: userId,
         }),
         fetchCreatePasswordSN({
@@ -67,10 +64,40 @@ const getUnlockMethodBase = async (type, userId) => {
             dpId,
         }),
     ]);
-    const { userType, lockUserId, userTimeSet } = user;
+    const { userType, lockUserId, timeScheduleInfo } = user;
     let validConfig;
-    if (userTimeSet) {
-        validConfig = dpUtils.parse(userTimeSet, validConfigDpMap.childMap);
+    if (timeScheduleInfo) {
+        const { permanent, effectiveTime, expiredTime, scheduleDetails } = timeScheduleInfo;
+        if (permanent) {
+            validConfig = {
+                startTime: Math.floor((effectiveTime || +new Date()) / 1000),
+                endTime: Math.floor((expiredTime || 0x72bc9b7f) / 1000),
+                loop: LoopTypes.NONE,
+                loopConfig: 0,
+                weeks: [0, 0, 0, 0, 0, 0, 0],
+                days: [],
+                startHour: 0,
+                startMinute: 0,
+                endHour: 0,
+                endMinute: 0,
+            };
+        }
+        else {
+            validConfig = {
+                startTime: Math.floor((effectiveTime || +new Date()) / 1000),
+                endTime: Math.floor((expiredTime || 0x72bc9b7f) / 1000),
+                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,
+            };
+        }
     }
     else {
         validConfig = getPermanentSetting();
@@ -350,6 +377,7 @@ export const startAddUnlockMethod = async (params) => {
     const res = await publishDps({
         [addDpCode]: dpUtils.format(dpData, addDpMap),
     }, {
+        timeout: params.timeout,
         checkReport: (dpData) => {
             if (typeof dpData[addDpCode] !== "undefined") {
                 const result = dpUtils.parse(dpData[addDpCode], addDpReportMap);
@@ -375,6 +403,7 @@ export const startAddUnlockMethod = async (params) => {
     });
     if (res.stage === 0) {
         monitoringAddReport({
+            timeout: params.timeout,
             unlockMethodConfig,
             total: res.total,
             dpCode: addDpCode,

package/lib/user.d.ts

@@ -1,4 +1,4 @@
-import { EffectiveConfig, UnlockMethodBaseInfo, UserInfo } from "./interface";
+import { EffectiveConfig, UserInfo } from "./interface";
 interface getUsersParams {
     page?: number;
     pageSize?: number;
@@ -11,27 +11,7 @@ export declare const getUsers: (params?: getUsersParams) => Promise<{
 interface getUserInfoParams {
     userId: string;
 }
-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";
-}>;
+export declare const getUserInfo: (params: getUserInfoParams) => Promise<UserInfo>;
 interface updateUserLimitTimeParams {
     userId: string;
     lockUserId: number;
@@ -45,6 +25,6 @@ export declare const openFamilyUserDetail: (userId: string) => Promise<undefined
 interface AddUserParams {
     name: string;
 }
-export declare const addUser: (params: AddUserParams) => Promise<import("./api/user").AddNormalUserResponse>;
+export declare const addUser: (params: AddUserParams) => Promise<void>;
 export declare const removeUser: (userId: string) => Promise<void>;
 export {};

package/lib/user.js

@@ -1,4 +1,4 @@
-import { getUserDetail, getUserDetailQuery, getUserList, } from "./api/user";
+import { 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";
@@ -118,8 +118,11 @@ export const updateUserLimitTime = async (params) => {
     if (!permanent) {
         validateEffectiveConfig(effective);
     }
-    const { userType } = await getUserDetail({
-        devId: config.devInfo.devId,
+    const currentUser = await getCurrentUser();
+    if (!isAdmin(currentUser.userType)) {
+        throw getError(1069);
+    }
+    const { userType } = await getUserInfo({
         userId,
     });
     if (isAdmin(userType)) {
@@ -259,17 +262,24 @@ export const addUser = async (params) => {
     if (!params.name) {
         throw getError(1009, "name");
     }
-    return addNormalUser({
-        devId: config.devInfo.devId,
-        name: params.name,
-    });
+    try {
+        await addNormalUser({
+            devId: config.devInfo.devId,
+            name: params.name,
+        });
+    }
+    catch (e) {
+        if (e?.innerError?.errorCode === "DEFINITION_PARAM_NAME_REPEAT") {
+            throw getError(1068);
+        }
+        throw e;
+    }
 };
 export const removeUser = async (userId) => {
     if (!config.supportBigData) {
         throw getError(1060);
     }
-    const res = await getUserDetail({
-        devId: config.devInfo.devId,
+    const res = await getUserInfo({
         userId,
     });
     if (isUseNearChannel()) {

package/lib/utils/errors.js

@@ -66,6 +66,8 @@ const errors = {
     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",
+    1068: "There is already a member with the same name",
+    1069: "No permission to modify member validity",
 };
 export const getError = (code, ...places) => {
     if (errors[code]) {

package/package.json

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