@ray-js/lock-sdk 1.2.0-beta.6 → 1.2.0-beta.8

package/lib/api/notify.d.ts

@@ -0,0 +1,28 @@
+export interface VasNotifyPushConfig {
+    appNotify?: boolean;
+    iosVoip?: boolean;
+    cloudPhone?: boolean;
+}
+export interface VasNotifyScene {
+    enable: boolean;
+    pushConfig?: VasNotifyPushConfig;
+}
+export interface VasNotifyConfig {
+    alert?: boolean | VasNotifyScene;
+    doorBell?: VasNotifyScene;
+    lockDoor?: VasNotifyScene;
+    unlockDoor?: VasNotifyScene & {
+        contacts?: Array<Record<string, any>>;
+    };
+    cloudPhone?: boolean;
+    iosVoip?: boolean;
+    appNotify?: boolean;
+    [k: string]: any;
+}
+export interface UpdateVasNotifyConfigParams {
+    key: string;
+    enable: boolean;
+    userId?: string;
+}
+export declare const getVasNotifyConfigApi: (devId: string) => Promise<VasNotifyConfig>;
+export declare const updateVasNotifyConfigApi: (devId: string, params: UpdateVasNotifyConfigParams) => Promise<VasNotifyConfig>;

package/lib/api/notify.js

@@ -0,0 +1,17 @@
+import { requestApi } from "./request";
+export const getVasNotifyConfigApi = (devId) => {
+    return requestApi({
+        logName: "getVasNotifyConfig",
+        api: "m.lock.vas.notify.config.get",
+        version: "1.0",
+        data: { devId },
+    });
+};
+export const updateVasNotifyConfigApi = (devId, params) => {
+    return requestApi({
+        logName: "updateVasNotifyConfig",
+        api: "m.lock.vas.notify.config.update",
+        version: "1.0",
+        data: { devId, ...params },
+    });
+};

package/lib/api/video.d.ts

@@ -28,4 +28,9 @@ export declare const getIPCConfig: (devId: string) => Promise<{
         hardwareCapability: number[];
     };
 }>;
+export interface MediaViewTimesResult {
+    count: number;
+}
+export declare const getMediaViewTimes: (devId: string) => Promise<MediaViewTimesResult>;
+export declare const setMediaViewTimes: (devId: string) => Promise<MediaViewTimesResult>;
 export {};

package/lib/api/video.js

@@ -30,3 +30,23 @@ export const getIPCConfig = (devId) => {
         },
     });
 };
+export const getMediaViewTimes = (devId) => {
+    return requestApi({
+        logName: "getMediaViewTimes",
+        api: `${THING}.m.device.lock.media.view.times.get`,
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};
+export const setMediaViewTimes = (devId) => {
+    return requestApi({
+        logName: "setMediaViewTimes",
+        api: `${THING}.m.device.lock.media.view.times.set`,
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};

package/lib/api/voip.d.ts

@@ -0,0 +1,10 @@
+export interface VoipAuth {
+    isAuth: boolean;
+    isValid: boolean;
+    userId: string;
+    userName: string;
+    avatarUrl: string;
+    [k: string]: any;
+}
+export declare const getVoipAuthApi: (devId: string) => Promise<VoipAuth>;
+export declare const saveVoipAuthApi: (devId: string, userId: string) => Promise<boolean>;

package/lib/api/voip.js

@@ -0,0 +1,17 @@
+import { requestApi } from "./request";
+export const getVoipAuthApi = (devId) => {
+    return requestApi({
+        logName: "getVoipAuth",
+        api: "m.lock.device.voip.auth.get",
+        version: "1.0",
+        data: { devId },
+    });
+};
+export const saveVoipAuthApi = (devId, userId) => {
+    return requestApi({
+        logName: "saveVoipAuth",
+        api: "m.lock.device.voip.auth.save",
+        version: "1.0",
+        data: { devId, userId },
+    });
+};

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

@@ -12,6 +12,8 @@ export * from "./signal";
 export * from "./sleep";
 export * from "./misc";
 export * from "./service";
+export * from "./notify";
+export * from "./voip";
 export * from "./media";
 export * from "./voice-file";
 export * from "./linkage";

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

@@ -12,6 +12,8 @@ export * from "./signal";
 export * from "./sleep";
 export * from "./misc";
 export * from "./service";
+export * from "./notify";
+export * from "./voip";
 export * from "./media";
 export * from "./voice-file";
 export * from "./linkage";

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

@@ -9,3 +9,5 @@ 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>;
+export declare function getMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;
+export declare function addMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;

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

@@ -1,5 +1,5 @@
 import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
-import { getMediaUrlForRuntime, isSupportMediaForRuntime, openLocalAlbumForRuntime, gotoPlaybackForRuntime, getMediaInfoForRuntime, } from "../../../feature/media/media";
+import { getMediaUrlForRuntime, isSupportMediaForRuntime, openLocalAlbumForRuntime, gotoPlaybackForRuntime, getMediaInfoForRuntime, getMediaViewTimesForRuntime, setMediaViewTimesForRuntime, } from "../../../feature/media/media";
 import { getMediaRotateForRuntime } from "../../../feature/media/rotate";
 import { isSupportMultiCameraForRuntime, getCameraInfoForRuntime, queryCameraInfoForRuntime, switchCameraForRuntime, } from "../../../feature/media/camera";
 export async function getMediaUrl(params) {
@@ -32,3 +32,9 @@ export async function queryCameraInfo() {
 export async function switchCamera(index) {
     return switchCameraForRuntime(resolveRuntimeFromExportThis(this), index);
 }
+export async function getMediaViewTimes() {
+    return getMediaViewTimesForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function addMediaViewTimes() {
+    return setMediaViewTimesForRuntime(resolveRuntimeFromExportThis(this));
+}

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

@@ -0,0 +1,7 @@
+export type { VasNotifyConfig, VasNotifyScene, VasNotifyPushConfig, UpdateVasNotifyConfigParams, } from "../../../api/notify";
+export declare function getVasNotifyConfig(): Promise<import("../../../api/notify").VasNotifyConfig>;
+export declare function updateVasNotifyConfig(params: {
+    key: string;
+    enable: boolean;
+    userId?: string;
+}): Promise<import("../../../api/notify").VasNotifyConfig>;

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

@@ -0,0 +1,8 @@
+import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
+import { getVasNotifyConfigForRuntime, updateVasNotifyConfigForRuntime, } from "../../../feature/notify/notify";
+export async function getVasNotifyConfig() {
+    return getVasNotifyConfigForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function updateVasNotifyConfig(params) {
+    return updateVasNotifyConfigForRuntime(resolveRuntimeFromExportThis(this), params);
+}

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

@@ -0,0 +1,3 @@
+export type { VoipAuth } from "../../../api/voip";
+export declare function getVoipAuth(): Promise<import("../../../api/voip").VoipAuth>;
+export declare function saveVoipAuth(userId: string): Promise<boolean>;

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

@@ -0,0 +1,8 @@
+import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
+import { getVoipAuthForRuntime, saveVoipAuthForRuntime, } from "../../../feature/voip/voip";
+export async function getVoipAuth() {
+    return getVoipAuthForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function saveVoipAuth(userId) {
+    return saveVoipAuthForRuntime(resolveRuntimeFromExportThis(this), userId);
+}

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

@@ -1,4 +1,5 @@
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+import { MediaViewTimesResult } from "../../api/video";
 export interface GetMediaUrlParams {
     mediaPath: string;
     mediaBucket: string;
@@ -35,3 +36,5 @@ export interface MediaInfo {
     isTwoWayTalk: boolean;
 }
 export declare const getMediaInfoForRuntime: (runtime: LockDeviceRuntime) => MediaInfo;
+export declare const getMediaViewTimesForRuntime: (runtime: LockDeviceRuntime) => Promise<MediaViewTimesResult>;
+export declare const setMediaViewTimesForRuntime: (runtime: LockDeviceRuntime) => Promise<MediaViewTimesResult>;

package/lib/feature/media/media.js

@@ -4,6 +4,7 @@ import dpCodes from "../../config/dp-code";
 import { RotateType, VedioType } from "../../constant";
 import { isSupportShortLink } from "../../platform";
 import { getError } from "../../utils/errors";
+import { getMediaViewTimes, setMediaViewTimes, } from "../../api/video";
 export const getMediaUrlForRuntime = async (runtime, params) => {
     const devId = runtime.config.devInfo.devId;
     if ("mediaPath" in params && "mediaBucket" in params) {
@@ -85,3 +86,9 @@ export const getMediaInfoForRuntime = (runtime) => {
         isTwoWayTalk: runtime.config.isTwoWayTalk,
     };
 };
+export const getMediaViewTimesForRuntime = (runtime) => {
+    return getMediaViewTimes(runtime.config.devInfo.devId);
+};
+export const setMediaViewTimesForRuntime = (runtime) => {
+    return setMediaViewTimes(runtime.config.devInfo.devId);
+};

package/lib/feature/misc/capability.js

@@ -34,28 +34,52 @@ export const isActiveThreadForRuntime = async (rt) => {
     }
     return false;
 };
+const allModes = [
+    {
+        mode: "VR",
+        value: 1,
+    },
+    {
+        mode: "original",
+        value: 0,
+    },
+    {
+        mode: "vertical",
+        value: 3,
+    },
+    {
+        mode: "horizontal",
+        value: 2,
+    },
+];
 export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
     if (rt.cache.deviceAdvanceAbilityCache) {
         return rt.cache.deviceAdvanceAbilityCache;
     }
-    const [productAbilities, deviceAdvancedAbility] = await Promise.all([
+    const [productAbilitiesRes, deviceAdvancedAbilityRes] = await Promise.allSettled([
         getProductAbilities(rt.config.devInfo.devId, [
             "tyabi4ucx5",
             "tyabis9tpe",
             "tyabiwxrn9",
             "tyabipd4hh",
             "tyabin4u5v",
+            "visual_door_lock_cloud_store",
         ]),
         getDeviceAdvancedAbility(rt.config.devInfo.devId),
     ]);
+    const productAbilities = productAbilitiesRes.status === "fulfilled" ? productAbilitiesRes.value : [];
+    const deviceAdvancedAbility = deviceAdvancedAbilityRes.status === "fulfilled"
+        ? deviceAdvancedAbilityRes.value
+        : undefined;
     const deviceAdvanceAbilityCache = {
         cloudStorage: {
-            support: deviceAdvancedAbility.types.includes(0),
+            support: deviceAdvancedAbility?.types?.includes(0) ?? false,
         },
         vr: {
             support: false,
-            defaultMode: "",
+            defaultMode: "VR",
             modes: [],
+            coverMode: "VR",
         },
         ai: {
             support: false,
@@ -66,12 +90,12 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
             config: {},
         },
         voip: {
-            support: deviceAdvancedAbility.types.includes(1),
+            support: false,
             config: {},
         },
         wechatVoip: {
             support: false,
-            config: {},
+            isPublice: true,
         },
         unlockGuide: {
             support: false,
@@ -85,8 +109,11 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
     productAbilities.forEach((item) => {
         try {
             if (item.isOpen) {
-                const data = JSON.parse(item.extConfig);
+                const data = item.extConfig ? JSON.parse(item.extConfig) : {};
                 switch (item.abilityCode) {
+                    case "visual_door_lock_cloud_store":
+                        deviceAdvanceAbilityCache.cloudStorage.support = true;
+                        break;
                     case "tyabi4ucx5": {
                         deviceAdvanceAbilityCache.ai.config = data;
                         const dataReport = data?.ai_data_report ?? false;
@@ -100,6 +127,37 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
                                 petRecognition ||
                                 voice ||
                                 message;
+                        deviceAdvanceAbilityCache.vr.support = !!data?.lock_VR;
+                        if (deviceAdvanceAbilityCache.vr.support) {
+                            const modeMap = {
+                                original: {
+                                    mode: "original",
+                                    value: 0,
+                                },
+                                VR: {
+                                    mode: "VR",
+                                    value: 1,
+                                },
+                                horizontal: {
+                                    mode: "horizontal",
+                                    value: 2,
+                                },
+                                vertical: {
+                                    mode: "vertical",
+                                    value: 3,
+                                },
+                            };
+                            deviceAdvanceAbilityCache.vr.modes = allModes.filter((item) => {
+                                return data?.modes?.includes(item.mode);
+                            });
+                            deviceAdvanceAbilityCache.vr.defaultMode = data.default_mode;
+                            const exist = deviceAdvanceAbilityCache.vr.modes.find((x) => x.mode === deviceAdvanceAbilityCache.vr.defaultMode);
+                            if (!exist) {
+                                deviceAdvanceAbilityCache.vr.defaultMode =
+                                    deviceAdvanceAbilityCache.vr.modes?.[0].mode;
+                            }
+                            deviceAdvanceAbilityCache.vr.coverMode = data.photo_cover_format;
+                        }
                         break;
                     }
                     case "tyabis9tpe": {
@@ -109,8 +167,16 @@ export const getDeviceAdvancedAbilitiesForRuntime = async (rt) => {
                     }
                     case "tyabiwxrn9": {
                         deviceAdvanceAbilityCache.wechatVoip.support =
+                            deviceAdvancedAbility?.types?.includes(1) ?? false;
+                        deviceAdvanceAbilityCache.wechatVoip.isPublice =
+                            data?.WechatType === "0";
+                        if (!deviceAdvanceAbilityCache.wechatVoip.isPublice) {
+                            deviceAdvanceAbilityCache.wechatVoip.appId =
+                                data["WechatMPAppid"];
+                            deviceAdvanceAbilityCache.wechatVoip.modeId = data["WechatMPMid"];
+                        }
+                        deviceAdvanceAbilityCache.voip.support =
                             !!data?.voipType?.includes("0");
-                        deviceAdvanceAbilityCache.wechatVoip.config = data;
                         break;
                     }
                     case "tyabipd4hh": {

package/lib/feature/notify/notify.d.ts

@@ -0,0 +1,4 @@
+import { type UpdateVasNotifyConfigParams } from "../../api/notify";
+import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+export declare const getVasNotifyConfigForRuntime: (rt: LockDeviceRuntime) => Promise<import("../../api/notify").VasNotifyConfig>;
+export declare const updateVasNotifyConfigForRuntime: (rt: LockDeviceRuntime, params: UpdateVasNotifyConfigParams) => Promise<import("../../api/notify").VasNotifyConfig>;

package/lib/feature/notify/notify.js

@@ -0,0 +1,3 @@
+import { getVasNotifyConfigApi, updateVasNotifyConfigApi, } from "../../api/notify";
+export const getVasNotifyConfigForRuntime = (rt) => getVasNotifyConfigApi(rt.config.devInfo.devId);
+export const updateVasNotifyConfigForRuntime = (rt, params) => updateVasNotifyConfigApi(rt.config.devInfo.devId, params);

package/lib/feature/service/goto-service.d.ts

@@ -1,6 +1,6 @@
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
 export interface GotoServiceParams {
-    tab?: "cloudStorage" | "AI";
+    tab?: "cloudStorage" | "AI" | "voip";
     showGift?: boolean;
 }
 export declare function gotoServiceForRuntime(rt: LockDeviceRuntime, params?: GotoServiceParams): Promise<unknown>;

package/lib/feature/service/goto-service.js

@@ -4,6 +4,9 @@ export function gotoServiceForRuntime(rt, params) {
     if (params?.tab === "AI") {
         type = 3;
     }
+    else if (params?.tab === "voip") {
+        type = 1;
+    }
     return new Promise((resolve, reject) => {
         let url = `godzilla://tyawqoyej4wi3pqebb?deviceId=${rt.config.devInfo.devId}&commodityType=${type}`;
         if (params?.showGift) {

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

@@ -84,8 +84,8 @@ export const initState = async (runtime) => {
                 }
                 else {
                     try {
-                        const modeRes = await ipc.getCurrentSupportedTalkMode(devId);
                         runtime.config.supportTalk = true;
+                        const modeRes = await ipc.getCurrentSupportedTalkMode(devId);
                         runtime.config.isTwoWayTalk = modeRes.talkbackMode === 2;
                         sdkLog("info", "initState", "supportTalk", {
                             devId,
@@ -99,7 +99,7 @@ export const initState = async (runtime) => {
                         sdkLog("error", "initState", "supportTalk", {
                             devId,
                             duration: Date.now() - startedAt,
-                            data: {},
+                            error: e,
                         });
                     }
                 }

package/lib/feature/storage/index.d.ts

@@ -0,0 +1,5 @@
+import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+export declare const setStorageForRuntime: (rt: LockDeviceRuntime, key: string, data: unknown) => void;
+export declare const getStorageForRuntime: <T = unknown>(rt: LockDeviceRuntime, key: string) => T | null;
+export declare const removeStorageForRuntime: (rt: LockDeviceRuntime, key: string) => void;
+export declare const clearStorageForRuntime: (rt: LockDeviceRuntime, keys: string[]) => void;

package/lib/feature/storage/index.js

@@ -0,0 +1,32 @@
+import { getStorageSync, removeStorageSync, setStorageSync, } from "../../platform";
+const buildStorageKey = (rt, key) => {
+    const { devId, activeTime } = rt.config.devInfo;
+    return `${devId}_${activeTime}_${key}`;
+};
+export const setStorageForRuntime = (rt, key, data) => {
+    const value = typeof data === "string" ? data : JSON.stringify(data);
+    setStorageSync(buildStorageKey(rt, key), value);
+};
+export const getStorageForRuntime = (rt, key) => {
+    const raw = getStorageSync(buildStorageKey(rt, key));
+    if (raw == null || raw === "") {
+        return null;
+    }
+    if (typeof raw === "string") {
+        try {
+            return JSON.parse(raw);
+        }
+        catch {
+            return raw;
+        }
+    }
+    return raw;
+};
+export const removeStorageForRuntime = (rt, key) => {
+    removeStorageSync(buildStorageKey(rt, key));
+};
+export const clearStorageForRuntime = (rt, keys) => {
+    keys.forEach((key) => {
+        removeStorageSync(buildStorageKey(rt, key));
+    });
+};

package/lib/feature/voip/voip.d.ts

@@ -0,0 +1,3 @@
+import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+export declare const getVoipAuthForRuntime: (rt: LockDeviceRuntime) => Promise<import("../../api/voip").VoipAuth>;
+export declare const saveVoipAuthForRuntime: (rt: LockDeviceRuntime, userId: string) => Promise<boolean>;

package/lib/feature/voip/voip.js

@@ -0,0 +1,3 @@
+import { getVoipAuthApi, saveVoipAuthApi } from "../../api/voip";
+export const getVoipAuthForRuntime = (rt) => getVoipAuthApi(rt.config.devInfo.devId);
+export const saveVoipAuthForRuntime = (rt, userId) => saveVoipAuthApi(rt.config.devInfo.devId, userId);

package/lib/interface.d.ts

@@ -334,14 +334,19 @@ export interface AlbumMessage extends MediaInfo {
     type: number;
     createTime: number;
 }
+export type VRModeType = "original" | "VR" | "horizontal" | "vertical";
 export interface DeviceAdvancedAbility {
     cloudStorage: {
         support: boolean;
     };
     vr: {
         support: boolean;
-        defaultMode: string;
-        modes: string[];
+        coverMode: VRModeType;
+        modes: Array<{
+            mode: VRModeType;
+            value: number;
+        }>;
+        defaultMode: VRModeType;
     };
     ai: {
         support: boolean;
@@ -353,7 +358,9 @@ export interface DeviceAdvancedAbility {
     };
     wechatVoip: {
         support: boolean;
-        config: Record<string, any>;
+        isPublice: boolean;
+        appId?: string;
+        modeId?: string;
     };
     voip: {
         support: boolean;

package/lib/platform/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./device";
+export * from "./storage";
 export { default as ipc } from "./ipc";

package/lib/platform/index.js

@@ -1,2 +1,3 @@
 export * from "./device";
+export * from "./storage";
 export { default as ipc } from "./ipc";

package/lib/platform/storage.d.ts

@@ -0,0 +1,3 @@
+export declare const setStorageSync: (key: string, data: unknown) => void;
+export declare const getStorageSync: (key: string) => any;
+export declare const removeStorageSync: (key: string) => void;

package/lib/platform/storage.js

@@ -0,0 +1,9 @@
+export const setStorageSync = (key, data) => {
+    ty.setStorageSync({ key, data });
+};
+export const getStorageSync = (key) => {
+    return ty.getStorageSync({ key });
+};
+export const removeStorageSync = (key) => {
+    ty.removeStorageSync({ key });
+};

package/package.json

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