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

package/lib/utils/log.js

@@ -1,78 +1,75 @@
-/**
- * 处理日志数据
- */
-
 import { LocalOperateCategory } from "../constant";
-import { bytesToUint } from "./byte";
+import base64ToHex from "./base64-to-hex";
 import hexToBytes from "./hex-to-bytes";
-const localRecordUnlock = [LocalOperateCategory.ADD_UNLOCK_METHOD, LocalOperateCategory.DELETE_UNLOCK_METHOD, LocalOperateCategory.MODIFY_UNLOCK_METHOD];
-const localRecordUserOperate = [LocalOperateCategory.ADD_USER, LocalOperateCategory.DELETE_USER];
-const unlockMethodMap = ["finger", "face", "password", "card", "fingerVein", "hand", "eye", "remoteControl"];
-export const handleLocalOperation = log => {
-  if (!log) {
-    return;
-  }
-  const {
-    operClassify,
-    userId,
-    userType,
-    operType,
-    operDetail,
-    toUserType,
-    toUserId
-  } = log;
-  const data = hexToBytes(operDetail);
-  const viewData = new DataView(data.buffer);
-  /**
-   * 开锁方式操作
-   */
-  if (localRecordUnlock.includes(operClassify)) {
-    const unlockId = viewData.getInt16(0);
+const localRecordUnlock = [
+    LocalOperateCategory.ADD_UNLOCK_METHOD,
+    LocalOperateCategory.DELETE_UNLOCK_METHOD,
+    LocalOperateCategory.MODIFY_UNLOCK_METHOD,
+];
+const localRecordUserOperate = [
+    LocalOperateCategory.ADD_USER,
+    LocalOperateCategory.DELETE_USER,
+];
+const unlockMethodMap = [
+    "finger",
+    "face",
+    "password",
+    "card",
+    "fingerVein",
+    "hand",
+    "eye",
+    "remoteControl",
+];
+export const handleLocalOperation = (log, dpValue) => {
+    if (!log) {
+        return;
+    }
+    const { operClassify, userId, userType, operType, operDetail, toUserType, toUserId, } = log;
+    if (localRecordUnlock.includes(operClassify)) {
+        const unlockId = Number(operDetail);
+        return {
+            category: operClassify,
+            unlockMethod: unlockMethodMap[operType],
+            unlockId,
+            isRemoveAll: unlockId === 0xffff,
+            userId,
+            userType,
+            toUserId,
+            toUserType,
+        };
+    }
+    if (localRecordUserOperate.includes(operClassify)) {
+        return {
+            category: operClassify,
+            userId,
+            userType,
+            toUserId,
+            toUserType,
+        };
+    }
+    const allData = dpValue ? hexToBytes(base64ToHex(dpValue)) : new Uint8Array();
+    const dataView = new DataView(allData.buffer);
+    const dataLen = dataView.getInt8(5) - 3;
+    const originData = allData.slice(6, dataLen);
+    if (operClassify === LocalOperateCategory.SETTING) {
+        return {
+            category: LocalOperateCategory.SETTING,
+            userId,
+            userType,
+            toUserId,
+            toUserType,
+            type: operType,
+            data: +operDetail,
+            originData,
+        };
+    }
     return {
-      category: operClassify,
-      unlockMethod: unlockMethodMap[operType],
-      unlockId,
-      isRemoveAll: unlockId === 0xffff,
-      userId,
-      userType,
-      toUserId,
-      toUserType
+        category: operClassify,
+        type: operType,
+        data: originData,
+        userId,
+        userType,
+        toUserId,
+        toUserType,
     };
-  }
-  /**
-   * 添加用户操作
-   */
-  if (localRecordUserOperate.includes(operClassify)) {
-    return {
-      category: operClassify,
-      userId,
-      userType,
-      toUserId,
-      toUserType
-    };
-  }
-  /**
-   * 本地设置操作
-   */
-  if (operClassify === LocalOperateCategory.SETTING) {
-    return {
-      category: LocalOperateCategory.SETTING,
-      userId,
-      userType,
-      toUserId,
-      toUserType,
-      type: operType,
-      data: data.length <= 4 ? bytesToUint(data) : data,
-      originData: data
-    };
-  }
-  return {
-    category: operClassify,
-    type: operType,
-    data: data,
-    userId,
-    userType,
-    toUserId,
-    toUserType
-  };
-};
+};

package/lib/utils/publishDps.d.ts

@@ -1,9 +1,4 @@
 import { DpValue } from "../interface";
-/**
- * 执行下发 dp
- * @param dpData
- * @returns
- */
 export declare const publishDpsOnly: (dpData: Record<string, string | number | boolean>) => Promise<void>;
 export declare const publishDps: (dpData: Record<string, DpValue>, option?: {
     timeout?: number;

package/lib/utils/publishDps.js

@@ -1,89 +1,67 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/esnext.iterator.reduce.js";
 import config from "../config";
 import { isOnlineByType } from ".";
 import { publishDeviceDps } from "./device";
 import emitter from "./event";
 import { DPCHANGE } from "./constant";
 import { getError } from "./errors";
-
-/**
- * 执行下发 dp
- * @param dpData
- * @returns
- */
-export const publishDpsOnly = async dpData => {
-  const {
-    devInfo,
-    idsByCode
-  } = config;
-  const option = {};
-  if (config.onlineType === 0) {
-    // 设备离线
-    throw getError(1001);
-  }
-  if (isOnlineByType(config.onlineType, 2)) {
-    // 由于设备只能支持wifi 或蓝牙在线，wifi 在线又可能为假在线，因此当蓝牙在线时，优先走蓝牙通道
-    option.pipelines = [3];
-  }
-  const dps = Object.keys(dpData).reduce((acc, key) => {
-    const id = idsByCode[key];
-    if (id) {
-      acc[id] = dpData[key];
+export const publishDpsOnly = async (dpData) => {
+    const { devInfo, idsByCode } = config;
+    const option = {};
+    if (config.onlineType === 0) {
+        throw getError(1001);
     }
-    return acc;
-  }, {});
-  if (Object.keys(dps).length > 0) {
-    await publishDeviceDps(_objectSpread({
-      deviceId: devInfo.devId,
-      dps
-    }, option));
-  }
-};
-
-// 发送 dp 并等待上报
-export const publishDps = async (dpData, option) => {
-  await publishDpsOnly(dpData);
-  // 默认 15s 超时
-  const {
-    timeout = 15000,
-    checkReport
-  } = option || {};
-  return new Promise((resolve, reject) => {
-    const codes = Object.keys(dpData);
-    const result = {};
-    const handleChangeDp = dpCodes => {
-      // 是否自定义检查上报数据
-      if (checkReport) {
-        const pass = checkReport(dpCodes);
-        if (pass) {
-          emitter.off(DPCHANGE, handleChangeDp);
-          clearTimeout(timer);
-          resolve(typeof pass !== "boolean" ? pass : dpCodes);
+    if (isOnlineByType(config.onlineType, 2)) {
+        option.pipelines = [3];
+    }
+    const dps = Object.keys(dpData).reduce((acc, key) => {
+        const id = idsByCode[key];
+        if (id) {
+            acc[id] = dpData[key];
         }
-      } else {
-        Object.keys(dpCodes).forEach(code => {
-          const eixst = codes.indexOf(code);
-          if (eixst > -1) {
-            codes.splice(eixst, 1)[0];
-            result[code] = dpCodes[code];
-          }
+        return acc;
+    }, {});
+    if (Object.keys(dps).length > 0) {
+        await publishDeviceDps({
+            deviceId: devInfo.devId,
+            dps,
+            ...option,
         });
-        // 所有 dp 都上报了
-        if (codes.length === 0) {
-          emitter.off(DPCHANGE, handleChangeDp);
-          clearTimeout(timer);
-          resolve(result);
-        }
-      }
-    };
-    // 超时处理
-    const timer = setTimeout(() => {
-      emitter.off(DPCHANGE, handleChangeDp);
-      reject(getError(1002));
-    }, timeout);
-    emitter.on(DPCHANGE, handleChangeDp);
-  });
-};
+    }
+};
+export const publishDps = async (dpData, option) => {
+    await publishDpsOnly(dpData);
+    const { timeout = 15000, checkReport } = option || {};
+    return new Promise((resolve, reject) => {
+        const codes = Object.keys(dpData);
+        const result = {};
+        const handleChangeDp = (dpCodes) => {
+            if (checkReport) {
+                const pass = checkReport(dpCodes);
+                if (pass) {
+                    emitter.off(DPCHANGE, handleChangeDp);
+                    clearTimeout(timer);
+                    resolve(typeof pass !== "boolean" ? pass : dpCodes);
+                }
+            }
+            else {
+                Object.keys(dpCodes).forEach((code) => {
+                    const eixst = codes.indexOf(code);
+                    if (eixst > -1) {
+                        codes.splice(eixst, 1)[0];
+                        result[code] = dpCodes[code];
+                    }
+                });
+                if (codes.length === 0) {
+                    emitter.off(DPCHANGE, handleChangeDp);
+                    clearTimeout(timer);
+                    resolve(result);
+                }
+            }
+        };
+        const timer = setTimeout(() => {
+            emitter.off(DPCHANGE, handleChangeDp);
+            reject(getError(1002));
+        }, timeout);
+        emitter.on(DPCHANGE, handleChangeDp);
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.0.1",
+  "version": "1.0.3-beta-1",
   "files": [
     "lib",
     "LICENSE.md"
@@ -8,10 +8,9 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "ray build --type=component",
-    "compile": "ray build --type=component",
+    "build": "tsc",
+    "compile": "tsc",
     "lint": "eslint . --max-warnings 0",
-    "generate:component": "turbo gen react-component",
     "check-types": "tsc --noEmit"
   },
   "maintainers": [