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

package/lib/config/dp-code/index.d.ts

@@ -67,6 +67,7 @@ declare const dpCodes: {
     readonly doorOpened: "door_opened";
     readonly unlockApp: "unlock_app";
     readonly initiativeMessage: "initiative_message";
+    readonly locationSelect: "location_select";
     readonly manualLock: "manual_lock";
     readonly checkCodeSet: "check_code_set";
     readonly bleKeyCreate: "ble_key_create";

package/lib/config/dp-code/index.js

@@ -67,6 +67,7 @@ const dpCodes = {
     doorOpened: "door_opened",
     unlockApp: "unlock_app",
     initiativeMessage: "initiative_message",
+    locationSelect: "location_select",
     manualLock: "manual_lock",
     checkCodeSet: "check_code_set",
     bleKeyCreate: "ble_key_create",

package/lib/config/dp-map/media.d.ts

@@ -0,0 +1,13 @@
+export declare const locationSelectReportMap: readonly [{
+    readonly name: "status";
+}, {
+    readonly name: "list";
+    readonly bytes: 2;
+    readonly loop: true;
+    readonly type: "child";
+    readonly childMap: readonly [{
+        readonly name: "index";
+    }, {
+        readonly name: "type";
+    }];
+}];

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

@@ -0,0 +1,19 @@
+export const locationSelectReportMap = [
+    {
+        name: "status",
+    },
+    {
+        name: "list",
+        bytes: 2,
+        loop: true,
+        type: "child",
+        childMap: [
+            {
+                name: "index",
+            },
+            {
+                name: "type",
+            },
+        ],
+    },
+];

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

@@ -4,3 +4,7 @@ export declare function isSupportMedia(): boolean;
 export declare function getMediaRotate(): import("../../../feature/media/rotate").MediaRotate;
 export declare function getMediaInfo(): import("../../../feature/media/media").MediaInfo;
 export declare function openLocalAlbum(params?: OpenLocalAlbumParams): Promise<void>;
+export declare function isSupportMultiCamera(): boolean;
+export declare function getCameraInfo(): import("../../../feature/media/camera").CameraInfo | undefined;
+export declare function queryCameraInfo(): Promise<import("../../../feature/media/camera").CameraInfo | undefined>;
+export declare function switchCamera(index: number): Promise<true>;

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

@@ -1,6 +1,7 @@
 import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
 import { getMediaUrlForRuntime, isSupportMediaForRuntime, openLocalAlbumForRuntime, getMediaInfoForRuntime, } from "../../../feature/media/media";
 import { getMediaRotateForRuntime } from "../../../feature/media/rotate";
+import { isSupportMultiCameraForRuntime, getCameraInfoForRuntime, queryCameraInfoForRuntime, switchCameraForRuntime, } from "../../../feature/media/camera";
 export async function getMediaUrl(params) {
     return getMediaUrlForRuntime(resolveRuntimeFromExportThis(this), params);
 }
@@ -16,3 +17,15 @@ export function getMediaInfo() {
 export function openLocalAlbum(params) {
     return openLocalAlbumForRuntime(resolveRuntimeFromExportThis(this), params);
 }
+export function isSupportMultiCamera() {
+    return isSupportMultiCameraForRuntime(resolveRuntimeFromExportThis(this));
+}
+export function getCameraInfo() {
+    return getCameraInfoForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function queryCameraInfo() {
+    return queryCameraInfoForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function switchCamera(index) {
+    return switchCameraForRuntime(resolveRuntimeFromExportThis(this), index);
+}

package/lib/feature/media/camera.d.ts

@@ -0,0 +1,8 @@
+import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+import type { DpMapDataType } from "../../interface";
+import { locationSelectReportMap } from "../../config/dp-map/media";
+export type CameraInfo = DpMapDataType<typeof locationSelectReportMap>;
+export declare const isSupportMultiCameraForRuntime: (runtime: LockDeviceRuntime) => boolean;
+export declare const getCameraInfoForRuntime: (runtime: LockDeviceRuntime) => CameraInfo | undefined;
+export declare const queryCameraInfoForRuntime: (runtime: LockDeviceRuntime) => Promise<CameraInfo | undefined>;
+export declare const switchCameraForRuntime: (runtime: LockDeviceRuntime, index: number) => Promise<true>;

package/lib/feature/media/camera.js

@@ -0,0 +1,33 @@
+import dpUtils from "@ray-js/tuya-dp-transform";
+import dpCodes from "../../config/dp-code";
+import { locationSelectReportMap } from "../../config/dp-map/media";
+import { getDpValueForRuntime } from "../dp/get-dp-value";
+import { hasDpForRuntime } from "../dp/has-dp";
+import { publishDpsForRuntime } from "../dp/publish-dps";
+import { getError } from "src/utils/errors";
+export const isSupportMultiCameraForRuntime = (runtime) => hasDpForRuntime(runtime, dpCodes.locationSelect);
+export const getCameraInfoForRuntime = (runtime) => {
+    const raw = getDpValueForRuntime(runtime, dpCodes.locationSelect);
+    if (!raw) {
+        return undefined;
+    }
+    return dpUtils.parse(raw, locationSelectReportMap);
+};
+export const queryCameraInfoForRuntime = async (runtime) => {
+    await publishDpsForRuntime(runtime, { [dpCodes.locationSelect]: "ff" });
+    return getCameraInfoForRuntime(runtime);
+};
+export const switchCameraForRuntime = async (runtime, index) => {
+    const value = index.toString(16).padStart(2, "0");
+    await publishDpsForRuntime(runtime, { [dpCodes.locationSelect]: value });
+    const info = getCameraInfoForRuntime(runtime);
+    switch (info?.status) {
+        case 0:
+            return true;
+        case 2:
+            throw getError(1105);
+        case 1:
+        default:
+            throw getError(1104);
+    }
+};

package/lib/feature/password/temporary/custom-dp.js

@@ -52,67 +52,72 @@ export const createTempCustomForRuntime = parallelOnlyForRuntime(async function
             throw handleCloudError(error);
         }
     }
-    await isValidPassword(baseData);
-    const { tyNum, name: createdName } = await createTemporaryPassword({
-        ...baseData,
-        sn: 0,
-        availTime: 0,
-        symbolic: false,
-        dpTunnel: 2,
-    });
-    if (!tyNum) {
-        const error = getError(1043);
-        sdkLog("warn", "tempPassword", "createCustomMissingCloudNo", {
+    try {
+        await isValidPassword(baseData);
+        const { tyNum, name: createdName } = await createTemporaryPassword({
+            ...baseData,
+            sn: 0,
+            availTime: 0,
+            symbolic: false,
+            dpTunnel: 2,
+        });
+        if (!tyNum) {
+            const error = getError(1043);
+            sdkLog("warn", "tempPassword", "createCustomMissingCloudNo", {
+                devId: rt.devId,
+                duration: Date.now() - startedAt,
+                error,
+            });
+            throw error;
+        }
+        const targetDpCode = cfg.supportBigData
+            ? dpCodes.tempPwdCreateW
+            : dpCodes.tempPwdCreate;
+        const dpPayload = dpUtils.format({
+            cloudNo: tyNum,
+            valid: true,
+            validConfig,
+            validNum: 0,
+            pwdLength: params.password.length,
+            pwd: params.password.split("").map(Number),
+        }, (cfg.supportBigData ? addTempPwdBigDpMap : addTempPwdDpMap));
+        const result = await publishDpsForRuntime(rt, {
+            [targetDpCode]: dpPayload,
+        }, {
+            checkReport: (dpsIn) => {
+                const dpDataRow = dpsIn;
+                const reportData = dpDataRow[targetDpCode];
+                if (reportData) {
+                    const data = dpUtils.parse(dpDataRow[targetDpCode], (cfg.supportBigData
+                        ? reportAddTempPwdDBigpMap
+                        : reportAddTempPwdDpMap));
+                    if (data.cloudNo === tyNum) {
+                        return data;
+                    }
+                }
+                return false;
+            },
+        });
+        if (result.status === 0) {
+            sdkLog("info", "tempPassword", "createCustomSuccess", {
+                devId: rt.devId,
+                duration: Date.now() - startedAt,
+                data: { route: "nearDp" },
+            });
+            return buildTempCustomCreateResult(createdName, params.password, result.unlockBindingId, effective);
+        }
+        const error = getError(result.status === 2 ? 1041 : 1042);
+        sdkLog("warn", "tempPassword", "createCustomDpFail", {
             devId: rt.devId,
             duration: Date.now() - startedAt,
+            data: { status: result.status },
             error,
         });
         throw error;
     }
-    const targetDpCode = cfg.supportBigData
-        ? dpCodes.tempPwdCreateW
-        : dpCodes.tempPwdCreate;
-    const dpPayload = dpUtils.format({
-        cloudNo: tyNum,
-        valid: true,
-        validConfig,
-        validNum: 0,
-        pwdLength: params.password.length,
-        pwd: params.password.split("").map(Number),
-    }, (cfg.supportBigData ? addTempPwdBigDpMap : addTempPwdDpMap));
-    const result = await publishDpsForRuntime(rt, {
-        [targetDpCode]: dpPayload,
-    }, {
-        checkReport: (dpsIn) => {
-            const dpDataRow = dpsIn;
-            const reportData = dpDataRow[targetDpCode];
-            if (reportData) {
-                const data = dpUtils.parse(dpDataRow[targetDpCode], (cfg.supportBigData
-                    ? reportAddTempPwdDBigpMap
-                    : reportAddTempPwdDpMap));
-                if (data.cloudNo === tyNum) {
-                    return data;
-                }
-            }
-            return false;
-        },
-    });
-    if (result.status === 0) {
-        sdkLog("info", "tempPassword", "createCustomSuccess", {
-            devId: rt.devId,
-            duration: Date.now() - startedAt,
-            data: { route: "nearDp" },
-        });
-        return buildTempCustomCreateResult(createdName, params.password, result.unlockBindingId, effective);
+    catch (er) {
+        throw handleCloudError(er);
     }
-    const error = getError(result.status === 2 ? 1041 : 1042);
-    sdkLog("warn", "tempPassword", "createCustomDpFail", {
-        devId: rt.devId,
-        duration: Date.now() - startedAt,
-        data: { status: result.status },
-        error,
-    });
-    throw error;
 });
 export async function removeTempCustomForRuntime(rt, params) {
     const cfg = rt.config;

package/lib/utils/errors.js

@@ -102,7 +102,9 @@ const errors = {
     1100: "Binding limit reached",
     1101: "The lock has already been bound, please do not bind it again",
     1102: "Lock is binding",
-    1103: "Binding failed"
+    1103: "Binding failed",
+    1104: "Failed to switch cameras",
+    1105: "Camera switching is not supported",
 };
 export const getError = (code, ...places) => {
     if (errors[code]) {

package/lib/utils/parse.js

@@ -6,7 +6,7 @@ export const parseCapabilities = (dpValue) => {
         return null;
     }
     const data = dpUtils.parse(dpValue, capabilitiesMap);
-    if (data.tyep === ModuleType.M7258) {
+    if (data.type === ModuleType.M7258) {
         return {
             ...data,
             rotateType: data.rotateType === 1 ? 0 : data.rotateType === 0 ? 1 : data.rotateType,

package/package.json

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