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

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/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/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/package.json

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