@ray-js/lock-sdk 1.0.0 → 1.0.1-beta-2

package/lib/api/linkage.d.ts

@@ -98,7 +98,7 @@ export interface LinkageRule {
  * @param deviceId
  * @returns {Promise<LinkageList>}
  */
-export declare const getLinkageList: (deviceId: string) => Promise<LinkageRule[]>;
+export declare const getLinkageList: (deviceId: string, homeId: string) => Promise<LinkageRule[]>;
 interface LinkageCondition {
     entityType: number;
     entityId: string;
@@ -145,17 +145,17 @@ interface SaveLinkageParams {
  * @param data
  * @returns
  */
-export declare const saveLinkage: (data: SaveLinkageParams) => Promise<unknown>;
-export declare const enableLinkage: (ruleId: string) => Promise<unknown>;
-export declare const disableLinkage: (ruleId: string) => Promise<unknown>;
+export declare const saveLinkage: (data: SaveLinkageParams, homeId: string) => Promise<unknown>;
+export declare const enableLinkage: (ruleId: string, homeId: string) => Promise<unknown>;
+export declare const disableLinkage: (ruleId: string, homeId: string) => Promise<unknown>;
 /**
  * 获取剩余短信通知次数
  * @returns
  */
-export declare const getRemainingMessage: () => Promise<number>;
+export declare const getRemainingMessage: (homeId: string) => Promise<number>;
 /**
  * 获取剩余语音通知次数
  * @returns
  */
-export declare const getRemainingPhone: () => Promise<number>;
+export declare const getRemainingPhone: (homeId: string) => Promise<number>;
 export {};

package/lib/api/linkage.js

@@ -5,12 +5,15 @@ import { requestCloud } from "../utils/device";
  * @param deviceId
  * @returns {Promise<LinkageList>}
  */
-export const getLinkageList = deviceId => {
+export const getLinkageList = (deviceId, homeId) => {
   return requestCloud({
     api: `${THING}.m.linkage.doorlock.rule.query`,
     version: "2.0",
     data: {
       devId: deviceId
+    },
+    extData: {
+      gid: homeId
     }
   });
 };
@@ -19,30 +22,39 @@ export const getLinkageList = deviceId => {
  * @param data
  * @returns
  */
-export const saveLinkage = data => {
+export const saveLinkage = (data, homeId) => {
   return requestCloud({
     api: `${THING}.m.linkage.device.shell.save`,
     version: "2.0",
     data: {
       shellExpr: data
+    },
+    extData: {
+      gid: homeId
     }
   });
 };
-export const enableLinkage = ruleId => {
+export const enableLinkage = (ruleId, homeId) => {
   return requestCloud({
     api: `${THING}.m.linkage.rule.enable`,
     version: "1.0",
     data: {
       ruleId
+    },
+    extData: {
+      gid: homeId
     }
   });
 };
-export const disableLinkage = ruleId => {
+export const disableLinkage = (ruleId, homeId) => {
   return requestCloud({
     api: `${THING}.m.linkage.rule.disable`,
     version: "1.0",
     data: {
       ruleId
+    },
+    extData: {
+      gid: homeId
     }
   });
 };
@@ -51,12 +63,15 @@ export const disableLinkage = ruleId => {
  * 获取剩余短信通知次数
  * @returns
  */
-export const getRemainingMessage = () => {
+export const getRemainingMessage = homeId => {
   return requestCloud({
     api: `${THING}.m.notification.subscribe.info`,
     version: "1.0",
     data: {
       notificationType: "sms_notification"
+    },
+    extData: {
+      gid: homeId
     }
   });
 };
@@ -65,10 +80,13 @@ export const getRemainingMessage = () => {
  * 获取剩余语音通知次数
  * @returns
  */
-export const getRemainingPhone = () => {
+export const getRemainingPhone = homeId => {
   return requestCloud({
     api: `${THING}.m.mobile.voice.times.count`,
     version: "1.0",
-    data: {}
+    data: {},
+    extData: {
+      gid: homeId
+    }
   });
 };

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

@@ -16,10 +16,11 @@ export const setKey = [{
   name: "endTime",
   bytes: 4
 }, {
-  name: "validNum"
+  name: "validNum",
+  bytes: 2
 }, {
   name: "key",
-  bytes: 8
+  loop: true
 }];
 
 /**
@@ -44,7 +45,7 @@ export const open = [{
   bytes: 2
 }, {
   name: "key",
-  bytes: 8
+  loop: true
 }, {
   name: "type",
   bytes: 2

package/lib/linkage.d.ts

@@ -19,7 +19,7 @@ export declare const enableDoorbellService: () => Promise<void>;
 /**
  * 禁用门铃通知服务
  */
-export declare const disableDoorbellService: () => Promise<never>;
+export declare const disableDoorbellService: () => Promise<void>;
 /**
  * 去配置门铃通知服务
  */

package/lib/linkage.js

@@ -17,7 +17,8 @@ const MESSAGE_TYPE = "smsSend"; // actions对象的actionExecutor属性的类型
  * @returns {Promise<{message: number, phone: number}>}
  */
 export const getRemainingInfo = async () => {
-  const [message, phone] = await Promise.all([getRemainingMessage(), getRemainingPhone()]);
+  const homeInfo = await getHomeInfo();
+  const [message, phone] = await Promise.all([getRemainingMessage(homeInfo.homeId), getRemainingPhone(homeInfo.homeId)]);
   return {
     message,
     phone
@@ -29,15 +30,15 @@ export const getRemainingInfo = async () => {
  * @returns {Promise<boolean>}
  */
 export const getDoorbellService = async () => {
-  const list = await getLinkageList(config.devInfo.devId);
+  const homeInfo = await getHomeInfo();
+  const list = await getLinkageList(config.devInfo.devId, homeInfo.homeId);
   return list.find(item => item.code === DOORBELL_RING_TYPE && item.ruleId);
 };
 const createDoorbellService = async () => {
   const actions = await createAction({
-    createType: "auto",
-    smartType: "remind"
+    createType: "remind",
+    smartType: "auto"
   });
-  console.log("actions", actions);
   await saveDoorbellService(actions);
 };
 const saveDoorbellService = async actions => {
@@ -46,12 +47,14 @@ const saveDoorbellService = async actions => {
   saveLinkage({
     devId: config.devInfo.devId,
     ownerId: homeInfo.homeId,
-    name: "",
+    name: "doorbell",
     enabled: true,
-    extraInfo: {},
-    bizType: DOORBELL_RING_TYPE,
+    extraInfo: {
+      code: DOORBELL_RING_TYPE
+    },
+    bizType: "3",
     logicRuleList: [{
-      name: "",
+      name: "doorbell",
       // 规则名称
       matchType: 2,
       // MatchType枚举，1:任意条件触发，2:全部条件满足触发，3:通过expr来判断整个条件的匹配情况
@@ -61,7 +64,7 @@ const saveDoorbellService = async actions => {
       // 是否在场景列表中展示
       preConditions: [],
       coverIcon: "",
-      displayColor: "",
+      displayColor: "0084FF",
       background: "",
       conditions: [{
         entityType: 23,
@@ -114,7 +117,7 @@ const saveDoorbellService = async actions => {
         return item;
       })
     }]
-  });
+  }, homeInfo.homeId);
 };
 
 /**
@@ -122,9 +125,10 @@ const saveDoorbellService = async actions => {
  * 注意： 首次开通时，会先进入创建动作的页面，创建完成后，会自动启用门铃通知服务
  */
 export const enableDoorbellService = async () => {
+  const homeInfo = await getHomeInfo();
   const service = await getDoorbellService();
   if (service && service.ruleId) {
-    await enableLinkage(service.ruleId);
+    await enableLinkage(service.ruleId, homeInfo.homeId);
   } else {
     await createDoorbellService();
   }
@@ -134,9 +138,11 @@ export const enableDoorbellService = async () => {
  * 禁用门铃通知服务
  */
 export const disableDoorbellService = async () => {
+  const homeInfo = await getHomeInfo();
   const service = await getDoorbellService();
   if (service && service.ruleId) {
-    await disableLinkage(service.ruleId);
+    await disableLinkage(service.ruleId, homeInfo.homeId);
+    return;
   }
   throw getError(1059);
 };
@@ -166,7 +172,6 @@ export const toSetDoorbellService = async () => {
         return item;
       })
     });
-    console.log("actions", actions);
     await saveDoorbellService(actions);
   } else {
     // 去创建

package/lib/open.js

@@ -108,10 +108,20 @@ const _doAction = async (isOpen, timeout) => {
       await syncRemoteSerectKey();
 
       // 蓝牙在线时，通过蓝牙开锁
-      const {
-        password
-      } = await getDoorKey(devInfo.devId);
-      const pw = await decrypt(devInfo.devId, password);
+      let pw = "";
+      try {
+        const {
+          password
+        } = await getDoorKey(devInfo.devId);
+        pw = await decrypt(devInfo.devId, password);
+      } catch (e) {
+        // 获取密钥失败，则尝试同步密钥
+        await syncRemoteSerectKey(true);
+        const {
+          password
+        } = await getDoorKey(devInfo.devId);
+        pw = await decrypt(devInfo.devId, password);
+      }
       const response = await publishDps({
         [dpCodes.remoteNoDpKey]: dpUtils.format({
           status: Number(isOpen),
@@ -123,10 +133,10 @@ const _doAction = async (isOpen, timeout) => {
         timeout,
         checkReport
       });
-      const result = response[dpCodes.remoteNoDpKey];
+
       // 状态码为 0 表示开锁成功，其他  0x01：失败  0x02：失效  0x03：秘钥次数使用完  0x04：秘钥不在有效期内  0x05：秘钥比对错误
-      if (result.status !== 0) {
-        throw getReportError(result.status);
+      if (response.status !== 0) {
+        throw getReportError(response.status);
       }
 
       // 开锁成功

package/lib/sleep.js

@@ -30,7 +30,6 @@ export const hasSleepAbility = () => {
   const {
     dpSchema
   } = config;
-  console.log('dpSchema', dpSchema[dpCodes.dormantSwitch], dpSchema[dpCodes.dormantTimeSet]);
   return (typeof dpSchema[dpCodes.dormantSwitch] !== "undefined" || typeof dpSchema[dpCodes.onlineSwitch] !== "undefined") && typeof dpSchema[dpCodes.dormantTimeSet] !== "undefined";
 };
 const setSleepStatus = async status => {

package/lib/sync/remote-serect-key.d.ts

@@ -1,5 +1,6 @@
 /**
  * 同步密钥
+ * @param force 是否强制同步
  */
-declare const syncRemoteSerectKey: () => Promise<void>;
+declare const syncRemoteSerectKey: (force?: boolean) => Promise<void>;
 export default syncRemoteSerectKey;

package/lib/sync/remote-serect-key.js

@@ -12,21 +12,24 @@ import { ProductCommunicationType } from "../constant";
 
 /**
  * 同步密钥
+ * @param force 是否强制同步
  */
-const syncRemoteSerectKey = async () => {
+const syncRemoteSerectKey = async force => {
   const useNear = isUseNearChannel();
   if (useNear) {
     try {
       const isSupportBle = config.communication.includes(ProductCommunicationType.BLUETOOTH);
       // 双模下
       if (config.communication.length > 1 && isSupportBle) {
-        // 如果当前的远程解锁密钥设置 为空、或失败、或主动请求获取，则进行同步
-        const keyValue = getDpValue(dpCodes.remoteNoPdSetkey);
-        if (keyValue) {
-          const keyData = dpUtils.parse(getDpValue(dpCodes.remoteNoPdSetkey), reportSetKeyMap);
-          // 已成功同步，则不进行同步
-          if (keyData.status === 0) {
-            return;
+        if (!force) {
+          // 如果当前的远程解锁密钥设置 为空、或失败、或主动请求获取，则进行同步
+          const keyValue = getDpValue(dpCodes.remoteNoPdSetkey);
+          if (keyValue) {
+            const keyData = dpUtils.parse(getDpValue(dpCodes.remoteNoPdSetkey), reportSetKeyMap);
+            // 已成功同步，则不进行同步
+            if (keyData.status === 0) {
+              return;
+            }
           }
         }
         const {

package/lib/unlock-method.js

@@ -182,7 +182,6 @@ export const addPassword = async params => {
     checkReport: dpData => {
       if (typeof dpData[addDpCode] !== "undefined") {
         const result = dpUtils.parse(dpData[addDpCode], addDpReportMap);
-        console.log("AddPassword checkReport", result);
         let hasReport = result.type === unlockMethodConfig.id && [0xff, 0xfd].includes(result.stage);
         // 是否严格模式
         if (config.strictMode) {
@@ -359,7 +358,6 @@ const handleAddReport = async dps => {
   }
 };
 const clearMonitoringAddReport = () => {
-  console.log("clearMonitoringAddReport");
   clearTimeout(addUnlockMethodData.timeoutId);
   // 清除监听器
   emitter.off(DPCHANGE, handleAddReport);

package/lib/user.d.ts

@@ -84,7 +84,7 @@ export declare const openAddFamilyUser: () => Promise<unknown>;
  * 支持编辑
  * @param {string} userId 成员id
  */
-export declare const openFamilyUserDetail: (userId: string) => Promise<never>;
+export declare const openFamilyUserDetail: (userId: string) => Promise<undefined>;
 interface AddUserParams {
     /**
      * 用户名称

package/lib/user.js

@@ -213,7 +213,6 @@ export const updateUserLimitTime = async params => {
     checkReport: dps => {
       if (typeof dps[dpCode] !== "undefined") {
         const result = DpUtils.parse(dps[dpCode], config.supportBigData ? reportUpdateMapBig : reportUpdateMap);
-        console.log("reportUpdate result", result);
         if (result.type === 0) {
           if (result.memberId === lockUserId) {
             return result;
@@ -231,7 +230,6 @@ export const updateUserLimitTime = async params => {
   }
   // 更新云端数据
   try {
-    console.log("dpValue.validConfig", dpValue.validConfig);
     await updateUserTimeSchedule({
       devId: config.devInfo.devId,
       userId: userId,
@@ -298,32 +296,25 @@ const userTypeMap = {
  * @param {string} userId 成员id
  */
 export const openFamilyUserDetail = async userId => {
-  const homeId = await getCurrentHomeInfo();
+  const {
+    homeId
+  } = await getCurrentHomeInfo();
   const {
     userType: currentUserType
   } = await getCurrentUser();
   const role = userTypeMap[currentUserType];
   let link = await isSupportShortLink("member_info");
   if (link) {
-    ty.canIUseRouter({
-      url: "member_info",
-      success: res => {
-        if (res !== null && res !== void 0 && res.result) {
-          ty.router({
-            url: `tuyaSmart://member_info?homeId=${homeId}&memberId=${userId}&role=${role}`,
-            success: () => {
-              console.log("跳转成员详情页成功");
-            },
-            fail: e => {
-              console.log("跳转成员详情页失败", e);
-            }
-          });
-        }
+    ty.router({
+      url: `tuyaSmart://member_info?homeId=${homeId}&memberId=${userId}&role=${role}`,
+      success: () => {
+        console.log("openFamilyUserDetail success");
       },
-      fail: err => {
-        console.log(err);
+      fail: e => {
+        console.log("openFamilyUserDetail fail", e);
       }
     });
+    return;
   }
 
   // 不支持跳转

package/lib/utils/device.d.ts

@@ -39,6 +39,7 @@ export declare const requestCloud: <T>(options: {
     api: string;
     version: string;
     data: Record<string, any>;
+    extData?: Record<string, any>;
 }) => Promise<T>;
 export declare const getLaunchOptionsSync: () => any;
 export declare function encrypt(deviceId: string, plaintext: string): Promise<string>;

package/lib/utils/device.js

@@ -146,6 +146,7 @@ export const requestCloud = options => {
       api: options.api,
       version: options.version,
       data: options.data,
+      extData: options.extData,
       success: d => {
         resolve(d);
       },
@@ -210,7 +211,8 @@ export const isSupportShortLink = async link => {
           resolve("");
         }
       },
-      fail: () => {
+      fail: err => {
+        console.warn("isSupportShortLink fail", err);
         resolve("");
       }
     });

package/lib/utils/publishDps.js

@@ -15,7 +15,6 @@ import { getError } from "./errors";
  * @returns
  */
 export const publishDpsOnly = async dpData => {
-  console.log("_publishDps", dpData);
   const {
     devInfo,
     idsByCode
@@ -47,7 +46,6 @@ export const publishDpsOnly = async dpData => {
 // 发送 dp 并等待上报
 export const publishDps = async (dpData, option) => {
   await publishDpsOnly(dpData);
-  console.log("publishDps success");
   // 默认 15s 超时
   const {
     timeout = 15000,

package/package.json

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