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

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

@@ -37,4 +37,15 @@ export interface getAlbumDateListResult {
     dateList: string[];
 }
 export declare const getAlbumDateList: (devId: string) => Promise<getAlbumDateListResult>;
+interface GetDeviceCurrentMeidaConfigResult {
+    audioAttributes: {
+        callMode: Array<1 | 2>;
+        hardwareCapability: Array<1 | 2>;
+    };
+    maxZoomInTimes: number;
+    skill: string;
+    vedioClarity: number;
+    vedioClaritys: number[];
+}
+export declare const getDeviceCurrentMeidaConfig: (devId: string) => Promise<GetDeviceCurrentMeidaConfigResult>;
 export {};

package/lib/api/video.js

@@ -60,3 +60,13 @@ export const getAlbumDateList = (devId) => {
         },
     });
 };
+export const getDeviceCurrentMeidaConfig = (devId) => {
+    return requestApi({
+        logName: "getDeviceCurrentMeidaConfig",
+        api: "m.ipc.device.ability.get",
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};

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

@@ -1,8 +1,6 @@
 import type { ProductCommunicationType } from "../../../constant";
 export declare function hasCapability(capability: ProductCommunicationType): boolean;
 export declare function isBlePureDevice(): boolean;
-export declare function isShareThead(): boolean;
-export declare function isActiveThread(): Promise<boolean>;
 export declare function getDeviceAdvancedAbilities(): Promise<import("../../..").DeviceAdvancedAbility>;
 export declare function getDeviceAdvancedAbilitiesSync(): import("../../..").DeviceAdvancedAbility | undefined;
 export declare function getDeviceCapabilities(): import("../../..").CapabilityInfo | null;

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

@@ -1,17 +1,11 @@
 import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
-import { hasCapabilityForRuntime, isBlePureDeviceForRuntime, isShareTheadForRuntime, isActiveThreadForRuntime, getDeviceAdvancedAbilitiesForRuntime, getDeviceAdvancedAbilitiesSyncForRuntime, getDeviceCapabilitiesForRuntime, } from "../../../feature/misc/capability";
+import { hasCapabilityForRuntime, isBlePureDeviceForRuntime, getDeviceAdvancedAbilitiesForRuntime, getDeviceAdvancedAbilitiesSyncForRuntime, getDeviceCapabilitiesForRuntime, } from "../../../feature/misc/capability";
 export function hasCapability(capability) {
     return hasCapabilityForRuntime(resolveRuntimeFromExportThis(this), capability);
 }
 export function isBlePureDevice() {
     return isBlePureDeviceForRuntime(resolveRuntimeFromExportThis(this));
 }
-export function isShareThead() {
-    return isShareTheadForRuntime(resolveRuntimeFromExportThis(this));
-}
-export async function isActiveThread() {
-    return isActiveThreadForRuntime(resolveRuntimeFromExportThis(this));
-}
 export async function getDeviceAdvancedAbilities() {
     return getDeviceAdvancedAbilitiesForRuntime(resolveRuntimeFromExportThis(this));
 }

package/lib/entries/main/exports/fit-sdk/device.d.ts

@@ -24,4 +24,3 @@ interface RemoveFitBleKeyParams {
 export declare function removeFitBleKey(params: RemoveFitBleKeyParams): Promise<unknown>;
 export declare function renameFitBleKey(params: RenameFitBleKeyParams): Promise<unknown>;
 export declare function getFitUsers(): Promise<FitUserItem[]>;
-export declare function setFitSetting(dpCode: string, value: string | number | boolean): Promise<void>;

package/lib/entries/main/exports/fit-sdk/device.js

@@ -6,7 +6,6 @@ import { offFitAddUnlockMethodForRuntime, onFitAddUnlockMethodForRuntime, } from
 import { getFitUnlockMethodListForRuntime } from "../../../../feature/fit/method/list";
 import { syncOpenModeRiseForRuntime } from "../../../../feature/fit/sync";
 import { getFitBleKeyListForRuntime, addFitBleKeyForRuntime, createFitPermanentBleKeyForRuntime, createFitTemporaryBleKeyForRuntime, updateFitTemporaryBleKeyForRuntime, removeFitBleKeyForRuntime, renameFitBleKeyForRuntime, } from "../../../../feature/fit/ble-key";
-import { setFitSettingForRuntime } from "../../../../feature/fit/setting";
 import { getFitUsersForRuntime, } from "../../../../feature/fit/users";
 export function fitAddPassword(params) {
     return fitAddPasswordForRuntime(resolveRuntimeFromExportThis(this), params);
@@ -59,6 +58,3 @@ export function renameFitBleKey(params) {
 export function getFitUsers() {
     return getFitUsersForRuntime(resolveRuntimeFromExportThis(this));
 }
-export function setFitSetting(dpCode, value) {
-    return setFitSettingForRuntime(resolveRuntimeFromExportThis(this), dpCode, value);
-}

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

@@ -7,7 +7,7 @@ export declare function openLocalAlbum(params?: OpenLocalAlbumParams): Promise<v
 export declare function gotoPlayback(params?: GotoPlaybackParams): Promise<void>;
 export declare function isSupportMultiCamera(): boolean;
 export declare function getCameraInfo(): import("../../../feature/media/camera").CameraDpInfo | undefined;
-export declare function queryCameraInfo(): Promise<import("../../../feature/media/camera").CameraInfo | undefined>;
+export declare function queryCameraInfo(): Promise<import("../../../feature/media/camera").CameraDpInfo | undefined>;
 export declare function switchCamera(index: number): Promise<true>;
 export declare function getMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;
 export declare function addMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;

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

@@ -3,6 +3,7 @@ import type { LockSDKInstance, FitSDKInstance } from "./build-instance";
 export * from "./exports";
 export type { LockSDKInstance, FitSDKInstance };
 export type { LockSdkBoundExportThis } from "./bootstrap/resolve-runtime-from-export-this";
-export declare const createSDK: (options?: Omit<LockSDKOption, "preFetch">) => Promise<LockSDKInstance>;
+export type SDKOptions = Omit<LockSDKOption, "preFetch">;
+export declare const createSDK: (options?: SDKOptions) => Promise<LockSDKInstance>;
 export declare const init: (options?: LockSDKOption) => Promise<void>;
 export declare const destroy: () => void;

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

@@ -1,7 +1,5 @@
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
-import type { CameraConfig, DpMapDataType } from "../../interface";
-import { locationSelectReportMap } from "../../config/dp-map/media";
-export type CameraInfo = DpMapDataType<typeof locationSelectReportMap>;
+import type { CameraConfig } from "../../interface";
 export declare const isSupportMultiCameraForRuntime: (runtime: LockDeviceRuntime) => boolean;
 interface CameraItem {
     index: number;
@@ -12,7 +10,7 @@ export interface CameraDpInfo {
     list: CameraItem[];
 }
 export declare const getCameraInfoForRuntime: (runtime: LockDeviceRuntime) => CameraDpInfo | undefined;
-export declare const queryCameraInfoForRuntime: (runtime: LockDeviceRuntime) => Promise<CameraInfo | undefined>;
+export declare const queryCameraInfoForRuntime: (runtime: LockDeviceRuntime) => Promise<CameraDpInfo | undefined>;
 export declare const switchCameraForRuntime: (runtime: LockDeviceRuntime, index: number) => Promise<true>;
 export declare const getCameraConfigForRuntime: (runtime: LockDeviceRuntime) => CameraConfig[];
 export {};

package/lib/feature/misc/capability.d.ts

@@ -3,7 +3,7 @@ import { DeviceAdvancedAbility } from "../../interface";
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
 export declare const hasCapabilityForRuntime: (runtime: LockDeviceRuntime, capability: ProductCommunicationType) => boolean;
 export declare const isBlePureDeviceForRuntime: (rt: LockDeviceRuntime) => boolean;
-export declare const isShareTheadForRuntime: (rt: LockDeviceRuntime) => boolean;
+export declare const isShareThreadForRuntime: (rt: LockDeviceRuntime) => boolean;
 export declare const isActiveThreadForRuntime: (rt: LockDeviceRuntime) => Promise<boolean>;
 export declare const getDeviceAdvancedAbilitiesSyncForRuntime: (rt: LockDeviceRuntime) => DeviceAdvancedAbility | undefined;
 export declare const getDeviceAdvancedAbilitiesForRuntime: (rt: LockDeviceRuntime) => Promise<DeviceAdvancedAbility>;

package/lib/feature/misc/capability.js

@@ -6,7 +6,7 @@ import { getWithLocalCache } from "../storage/swr-cache";
 export const hasCapabilityForRuntime = (runtime, capability) => runtime.config.communication.includes(capability);
 export const isBlePureDeviceForRuntime = (rt) => hasCapabilityForRuntime(rt, ProductCommunicationType.BLUETOOTH) &&
     rt.config.communication.length === 1;
-export const isShareTheadForRuntime = (rt) => {
+export const isShareThreadForRuntime = (rt) => {
     const hasThread = hasCapabilityForRuntime(rt, ProductCommunicationType.THREAD);
     return (hasThread &&
         !rt.config.devInfo.meta?.["threadWithBLE"] &&

package/lib/feature/state/init-state.js

@@ -14,7 +14,7 @@ import syncT0 from "./sync/t0";
 import { getDeviceStatusForRuntime, updateOnlineType } from "./device-status";
 import { handleDpChange } from "./dp-change";
 import { fetchDeviceProperties } from "./remote-permissions";
-import { ipc, yuChannelSyncSingleSync, } from "../../platform";
+import { ipc, yuChannelSyncSingleSync } from "../../platform";
 import { sdkLog } from "../../utils/sdk-log";
 import { ProductCommunicationType, RotateType } from "../../constant";
 import { isHarmony } from "../../utils";
@@ -85,14 +85,11 @@ export const initState = async (runtime) => {
             }
             if (ipcConfig.status === "fulfilled" &&
                 ipcConfig.value?.audioAttributes?.hardwareCapability?.includes(2)) {
-                if (isHarmony()) {
-                    runtime.config.supportTalk = true;
-                    runtime.config.isTwoWayTalk =
-                        ipcConfig.value?.audioAttributes?.callMode?.includes(2);
-                }
-                else {
+                runtime.config.supportTalk = true;
+                runtime.config.isTwoWayTalk =
+                    ipcConfig.value?.audioAttributes?.callMode?.[0] === 2;
+                if (!isHarmony()) {
                     try {
-                        runtime.config.supportTalk = true;
                         const modeRes = await ipc.getCurrentSupportedTalkMode(devId);
                         runtime.config.isTwoWayTalk = modeRes.talkbackMode === 2;
                         sdkLog("info", "initState", "supportTalk", {

package/lib/feature/state/internal/share-thread-local.js

@@ -1,4 +1,4 @@
-import { isShareTheadForRuntime } from "../../misc/capability";
+import { isShareThreadForRuntime } from "../../misc/capability";
 export function isShareThreadRuntimeLocal(rt) {
-    return isShareTheadForRuntime(rt);
+    return isShareThreadForRuntime(rt);
 }

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.1",
   "files": [
     "lib",
     "LICENSE.md"