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

package/LICENSE.md

@@ -0,0 +1,9 @@
+Copyright © 2014-2022 Tuya.inc
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/lib/sleep.js

@@ -30,7 +30,8 @@ export const hasSleepAbility = () => {
   const {
     dpSchema
   } = config;
-  return (typeof dpSchema[dpCodes.dormantSwitch] !== "undefined" || typeof dpSchema[dpCodes.onlineSwitch] !== "undefined") && typeof dpSchema[dpCodes.dormantSwitch] === "undefined";
+  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 => {
   const {

package/lib/unlock-method.d.ts

@@ -57,7 +57,6 @@ export interface updateUnlockMethodParams {
     /**
      * 是否特殊开锁方式，配置与劫持告警 dp 相关
      * 当开启特殊开锁方式时，appSend 和 msgPhone 必须有一个
-     * 注意：门卡与人脸不支持特殊开锁方式配置
      */
     isSpecial?: boolean;
     /**
@@ -92,6 +91,11 @@ interface StartAddUnlockMethodParams {
      * 用户 id
      */
     userId: string;
+    /**
+     * 每个步骤的超时时间
+     * 默认 15000 毫秒
+     */
+    timeout?: number;
 }
 export declare const startAddUnlockMethod: (params: StartAddUnlockMethodParams) => Promise<{
     total: number;

package/lib/unlock-method.js

@@ -228,9 +228,11 @@ const addUnlockMethodData = {
   timeoutId: 0,
   userId: "",
   // 云端用户 id
-  unlockDpId: 0
+  unlockDpId: 0,
+  timeout: 15000
 };
-const handleAddTimeout = () => {
+const handleAddTimeout = function () {
+  let timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 15000;
   clearTimeout(addUnlockMethodData.timeoutId);
   // @ts-expect-error
   addUnlockMethodData.timeoutId = setTimeout(() => {
@@ -242,7 +244,7 @@ const handleAddTimeout = () => {
       lockUserId: addUnlockMethodData.lockUserId,
       error: getError(1002)
     });
-  }, 15000);
+  }, timeout);
 };
 const handleAddReport = async dps => {
   if (dps[addUnlockMethodData.dpCode]) {
@@ -273,7 +275,7 @@ const handleAddReport = async dps => {
       case 0xfc:
         {
           // 重新计时
-          handleAddTimeout();
+          handleAddTimeout(addUnlockMethodData.timeout);
           // 录入中
           eventData = {
             type,
@@ -370,7 +372,7 @@ const monitoringAddReport = option => {
   emitter.off(DPCHANGE, handleAddReport);
   emitter.on(DPCHANGE, handleAddReport);
   // 超时处理
-  handleAddTimeout();
+  handleAddTimeout(option.timeout);
 };
 export const startAddUnlockMethod = async params => {
   const {
@@ -434,26 +436,6 @@ export const startAddUnlockMethod = async params => {
   throw getError(1027);
 };
 
-// /**
-//  * 添加开锁方式
-//  * @param {AddUnlockMethodParams} params 入参
-//  * @returns
-//  */
-// export const addUnlockMethod = async (params: AddUnlockMethodParams) => {
-//   const specialInfo = checkSpecial(!!params.isSpecial, params.specialInfo);
-//   const recordDpCode = getUnlockMethodTypeByType(params.type).code;
-
-//   const dpId = config.idsByCode[recordDpCode];
-
-//   return await createUnlockMethod({
-//     devId: config.devInfo.devId,
-//     userId: params.userId,
-//     unlockId: `${dpId}-${params.unlockId}`,
-//     unlockName: params.name,
-//     ...specialInfo,
-//   });
-// };
-
 /**
  * 更新开锁方式
  * 仅支持更新开锁方式名称和特殊开锁方式的通知信息

package/lib/user.js

@@ -336,6 +336,9 @@ export const openFamilyUserDetail = async userId => {
  * @returns
  */
 export const addUser = async params => {
+  if (!config.supportBigData) {
+    throw getError(1060);
+  }
   if (!params.name) {
     throw getError(1009, "name");
   }
@@ -352,6 +355,9 @@ export const addUser = async params => {
  * @returns
  */
 export const removeUser = async userId => {
+  if (!config.supportBigData) {
+    throw getError(1060);
+  }
   return removeNormalUser({
     devId: config.devInfo.devId,
     userId,

package/lib/utils/errors.js

@@ -103,7 +103,9 @@ const errors = {
   // 特殊开锁方式 app 消息或手机短信必须开启一个
   1058: "Special unlock method app message notification or phone SMS must be enabled",
   // 门铃通知服务未开通
-  1059: "Doorbell notification service not enabled"
+  1059: "Doorbell notification service not enabled",
+  // 不支持添加普通成员
+  1060: "Does not support adding normal members"
 };
 export const getError = function (code) {
   if (errors[code]) {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.0.0-beta-1",
+  "version": "1.0.0-beta-2",
   "files": [
-    "lib"
+    "lib",
+    "LICENSE.md"
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",