@ray-js/lock-sdk 1.2.0 → 1.2.1-beta.0

package/lib/api/user.d.ts

@@ -57,6 +57,7 @@ export interface UserListItem {
     nickName: string;
     offlineUnlock: boolean;
     timeScheduleInfo: {
+        userTimeSet: string;
         effectiveTime: number;
         expiredTime: number;
         permanent: boolean;
@@ -143,4 +144,7 @@ export interface LockShareAvailableResult {
     errorCode: string;
 }
 export declare const checkLockShareAvailable: (params: LockShareAvailableParams) => Promise<LockShareAvailableResult>;
+export declare const getPermanentValidTime: (devId: string) => Promise<{
+    timeSetHex: string;
+}>;
 export {};

package/lib/api/user.js

@@ -88,3 +88,11 @@ export const checkLockShareAvailable = (params) => {
         data: { ...params },
     });
 };
+export const getPermanentValidTime = (devId) => {
+    return requestApi({
+        logName: "getPermanentValidTime",
+        api: "m.lock.perm.time.get",
+        version: "1.0",
+        data: { devId, scene: "SCHEDULE" },
+    });
+};

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

@@ -1,6 +1,7 @@
+import DpUtils from "@ray-js/tuya-dp-transform";
 import dpCodes from "../../../../config/dp-code";
-import { fitAdd, fitReportAdd } from "../../../../config/dp-map/unlock-method-fit";
-import { getPermanentSetting, isAdmin } from "../../../../utils";
+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";
@@ -8,24 +9,14 @@ 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) {
-        return getPermanentSetting();
+        throw getError(1106);
     }
-    const { permanent, effectiveTime, expiredTime, scheduleDetails } = timeScheduleInfo;
+    const { permanent, userTimeSet, effectiveTime, expiredTime, scheduleDetails, } = timeScheduleInfo;
     if (permanent) {
-        return {
-            startTime: effectiveTime ? Math.floor(effectiveTime / 1000) : 0x386cd300,
-            endTime: expiredTime ? Math.floor(expiredTime / 1000) : 0x72bc9b7f,
-            loop: LoopTypes.NONE,
-            loopConfig: 0,
-            weeks: [0, 0, 0, 0, 0, 0, 0],
-            days: [],
-            startHour: 0,
-            startMinute: 0,
-            endHour: 0,
-            endMinute: 0,
-        };
+        return DpUtils.parse(userTimeSet, validConfigDpMap.childMap);
     }
     return {
         startTime: Math.floor((effectiveTime || +new Date()) / 1000),

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

@@ -1,11 +1,14 @@
+import DpUtils from "@ray-js/tuya-dp-transform";
 import { fetchCreatePasswordSN } from "../../../../api/lock";
 import dpCodes from "../../../../config/dp-code";
 import { add as addMap, reportAdd as reportAddMap, } from "../../../../config/dp-map/unlock-method";
 import { add as addBigMap, reportAdd as reportAddBigMap, } from "../../../../config/dp-map/unlock-method-big";
 import { getUnlockMethodTypeByTypeForRuntime } from "../../../utils";
-import { getPermanentSetting, isAdmin } from "../../../../utils";
+import { isAdmin } from "../../../../utils";
 import { LoopTypes } from "../../../../utils/constant";
 import { getUserInfoForRuntime } from "../../../user/user";
+import { getError } from "../../../../utils/errors";
+import { validConfigDpMap } from "../../../../config/dp-map/common";
 export async function getUnlockMethodBase(rt, type, userId) {
     const { idsByCode, devInfo: { devId }, supportBigData, } = rt.config;
     const unlockMethodConfig = getUnlockMethodTypeByTypeForRuntime(rt, type);
@@ -27,20 +30,7 @@ export async function getUnlockMethodBase(rt, type, userId) {
     if (timeScheduleInfo) {
         const { permanent, effectiveTime, expiredTime, scheduleDetails } = timeScheduleInfo;
         if (permanent) {
-            validConfig = {
-                startTime: effectiveTime
-                    ? Math.floor(effectiveTime / 1000)
-                    : 0x386cd300,
-                endTime: expiredTime ? Math.floor(expiredTime / 1000) : 0x72bc9b7f,
-                loop: LoopTypes.NONE,
-                loopConfig: 0,
-                weeks: [0, 0, 0, 0, 0, 0, 0],
-                days: [],
-                startHour: 0,
-                startMinute: 0,
-                endHour: 0,
-                endMinute: 0,
-            };
+            validConfig = DpUtils.parse(timeScheduleInfo.userTimeSet, validConfigDpMap.childMap);
         }
         else {
             validConfig = {
@@ -60,7 +50,7 @@ export async function getUnlockMethodBase(rt, type, userId) {
         }
     }
     else {
-        validConfig = getPermanentSetting();
+        throw getError(1106);
     }
     const dpData = {
         type: unlockMethodConfig.id,

package/lib/feature/user/user.js

@@ -1,4 +1,4 @@
-import { getCurrentUserInfo, getUserDetailQuery, getUserList, } from "../../api/user";
+import { getCurrentUserInfo, getPermanentValidTime, getUserDetailQuery, getUserList, } from "../../api/user";
 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";
 import { publishDpsForRuntime } from "../dp/publish-dps";
@@ -9,7 +9,7 @@ import { updateUserTimeSchedule, addNormalUser, removeNormalUser, } from "../../
 import { validConfigDpMap } from "../../config/dp-map/common";
 import { isUseNearChannelForRuntime } from "../misc/is-use-near-channel-for-runtime";
 import { getUnlockMethodTypeByDpCodeForRuntime } from "../utils";
-import { formatTimestampToMilliseconds, formatWeek, getPermanentSetting, isAdmin, parseWeek, validateEffectiveConfig, } from "../../utils";
+import { formatTimestampToMilliseconds, formatWeek, isAdmin, parseWeek, validateEffectiveConfig, } from "../../utils";
 import { getCurrentHomeInfo, isSupportShortLink } from "../../platform/device";
 import { LoopTypes } from "../../utils/constant";
 import { getCurrentUserForRuntime } from "./current-user";
@@ -21,6 +21,7 @@ const handleUserDetail = (rt, user) => {
     const { timeScheduleInfo, unlockDetail, ...rest } = user;
     let scheduleInfo = {
         permanent: true,
+        userTimeSet: timeScheduleInfo.userTimeSet,
     };
     if (!timeScheduleInfo.permanent &&
         timeScheduleInfo.scheduleDetails &&
@@ -214,6 +215,27 @@ export async function updateUserLimitTimeForRuntime(rt, params) {
         ?
             LoopTypes[repeat.toUpperCase()]
         : LoopTypes.NONE;
+    let validConfig;
+    if (permanent) {
+        const { timeSetHex } = await getPermanentValidTime(cfg.devInfo.devId);
+        validConfig = DpUtils.parse(timeSetHex, validConfigDpMap.childMap);
+    }
+    else {
+        validConfig = {
+            startTime: effective.effectiveDate,
+            endTime: effective.expiredDate,
+            loop: loopType,
+            loopConfig: 0,
+            weeks: effective?.repeat !== "week" || effective?.weeks === undefined
+                ? [0, 0, 0, 0, 0, 0, 0]
+                : effective.weeks,
+            days: [],
+            startHour: Math.floor(effectiveTime / 60),
+            startMinute: effectiveTime % 60,
+            endHour: Math.floor(expiredTime / 60),
+            endMinute: expiredTime % 60,
+        };
+    }
     const dpValue = {
         type: 0,
         stage: 0,
@@ -223,22 +245,7 @@ export async function updateUserLimitTimeForRuntime(rt, params) {
         validNum: 0,
         pwdLength: 0,
         pwd: [],
-        validConfig: permanent
-            ? getPermanentSetting()
-            : {
-                startTime: effective.effectiveDate,
-                endTime: effective.expiredDate,
-                loop: loopType,
-                loopConfig: 0,
-                weeks: effective?.repeat !== "week" || effective?.weeks === undefined
-                    ? [0, 0, 0, 0, 0, 0, 0]
-                    : effective.weeks,
-                days: [],
-                startHour: Math.floor(effectiveTime / 60),
-                startMinute: effectiveTime % 60,
-                endHour: Math.floor(expiredTime / 60),
-                endMinute: expiredTime % 60,
-            },
+        validConfig,
     };
     const res = (await publishDpsForRuntime(rt, {
         [dpCode]: DpUtils.format(dpValue, (cfg.supportBigData ? updateMapBig : updateMap)),

package/lib/interface.d.ts

@@ -116,6 +116,7 @@ export interface UserInfo {
     nickName: string;
     offlineUnlock: boolean;
     timeScheduleInfo: {
+        userTimeSet: string;
         effectiveTime: number;
         expiredTime: number;
         permanent: boolean;

package/lib/utils/errors.js

@@ -105,6 +105,7 @@ const errors = {
     1103: "Binding failed",
     1104: "Failed to switch cameras",
     1105: "Camera switching is not supported",
+    1106: "No validity configuration data",
 };
 export const getError = (code, ...places) => {
     if (errors[code]) {

package/lib/utils/index.d.ts

@@ -123,18 +123,6 @@ export declare function getCapabilities(capability: number): ({
 export declare const formatWeek: (value: number[]) => number;
 export declare const formatCloudUnlockId: (dpId: number | string, sn: number) => string;
 export declare const parseWeek: (value: number) => Week;
-export declare const getPermanentSetting: () => {
-    startTime: number;
-    endTime: number;
-    loop: LoopTypes;
-    loopConfig: number;
-    weeks: number[];
-    days: never[];
-    startHour: number;
-    startMinute: number;
-    endHour: number;
-    endMinute: number;
-};
 export declare const isAdmin: (userType: UserType) => boolean;
 export declare const validateEffectiveConfig: (effective?: EffectiveConfig) => void;
 export declare const formatTimestampToMilliseconds: (timestamp: number) => number;

package/lib/utils/index.js

@@ -66,20 +66,6 @@ export const parseWeek = (value) => {
         .map(Number)
         .slice(0, 7);
 };
-export const getPermanentSetting = () => {
-    return {
-        startTime: 0x386cd300,
-        endTime: 0x72bc9b7f,
-        loop: LoopTypes.NONE,
-        loopConfig: 0,
-        weeks: [0, 0, 0, 0, 0, 0, 0],
-        days: [],
-        startHour: 0,
-        startMinute: 0,
-        endHour: 0,
-        endMinute: 0,
-    };
-};
 export const isAdmin = (userType) => userType === 10 || userType === 50 ? true : false;
 export const validateEffectiveConfig = (effective) => {
     if (!effective) {

package/package.json

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