@ray-js/lamp-schedule-core 1.0.0-beta-1 → 1.0.0-beta-3

package/lib/dpParser/timerReport.js

@@ -2,6 +2,8 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import _padStart from 'lodash/padStart';
+import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+
 // 补充工具函数
 const numToHexString = function () {
   let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
@@ -15,7 +17,10 @@ export class TimerReportFormatter {
   }
   parser() {
     let val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    if (val) {
+    if (!val) {
+      return this.defaultValue;
+    }
+    try {
       const arr = [];
       const strArr = val.match(/[a-z0-9]{2}/g);
       strArr.forEach(item => {
@@ -26,18 +31,25 @@ export class TimerReportFormatter {
         });
       });
       return arr;
+    } catch (error) {
+      ScheduleLogger.error('TimerReportFormatter parser error', error);
+      return this.defaultValue;
     }
-    return this.defaultValue;
   }
   formatter(tasks) {
-    return tasks.map(task => {
-      // 组装ABBBBBBB
-      const binStr = (task.status ? '1' : '0') +
-      // A位
-      (+task.id).toString(2).padStart(7, '0'); // BBBBBBB
-      const hexStr = numToHexString(parseInt(binStr, 2));
-      return hexStr;
-    }).join('');
+    try {
+      return tasks.map(task => {
+        // 组装ABBBBBBB
+        const binStr = (task.status ? '1' : '0') +
+        // A位
+        (+task.id).toString(2).padStart(7, '0'); // BBBBBBB
+        const hexStr = numToHexString(parseInt(binStr, 2));
+        return hexStr;
+      }).join('');
+    } catch (error) {
+      ScheduleLogger.error('TimerReportFormatter formatter error', error);
+      return '';
+    }
   }
 }
 export const timerReportParser = new TimerReportFormatter();

package/lib/dpParser/wakeup/wakeupCommon.js

@@ -17,90 +17,100 @@ export class WakeUp {
     nodes: []
   };
   parser(dpStr) {
-    var _dpStr$slice;
     scheduleLogger.debug('WakeUp parser dpStr: ', dpStr);
     if (!dpStr) {
       return this.defaultValue;
     }
-    const step = generateDpStrStep(dpStr);
-    const version = step(2).value;
-    let number = step(2).value;
-    const nodeLen = (_dpStr$slice = dpStr.slice(4)) === null || _dpStr$slice === void 0 ? void 0 : _dpStr$slice.length;
-    if (nodeLen % 24 !== 0) {
-      scheduleLogger.error('wakeup dpStr error nodeLen:', nodeLen);
-    }
-    const nodes = [];
-    number = Math.min(number, 4);
-    // 解析循环节点
-    for (let i = 0; i < number; i++) {
-      const onOff = !!step(2).value;
-      const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
-      const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
-      const stepNum = step(2).value;
-      const hour = step(2).value;
-      const minute = step(2).value;
+    try {
+      var _dpStr$slice;
+      const step = generateDpStrStep(dpStr);
+      const version = step(2).value;
+      let number = step(2).value;
+      const nodeLen = (_dpStr$slice = dpStr.slice(4)) === null || _dpStr$slice === void 0 ? void 0 : _dpStr$slice.length;
+      if (nodeLen % 24 !== 0) {
+        scheduleLogger.error('wakeup dpStr error nodeLen:', nodeLen);
+      }
+      const nodes = [];
+      number = Math.min(number, 4);
+      // 解析循环节点
+      for (let i = 0; i < number; i++) {
+        const onOff = !!step(2).value;
+        const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
+        const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
+        const stepNum = step(2).value;
+        const hour = step(2).value;
+        const minute = step(2).value;
 
-      // 解析色相值(组合百位和十个位)
-      const hundreds = step(2).value;
-      const tensOnes = step(2).value;
-      const saturation = step(2).value;
-      const val = step(2).value;
-      const brightness = step(2).value;
-      const temperature = step(2).value;
-      const durationStep = step(2);
-      const duration = durationStep.value;
-      nodes.push({
-        onOff,
-        loops,
-        step: stepNum,
-        hour,
-        minute,
-        hue: Math.round(hundreds * 100 + tensOnes),
-        // 0-360
-        saturation,
-        value: val,
-        brightness,
-        temperature,
-        duration,
-        index: i
-      });
-      if (durationStep.done) {
-        break;
+        // 解析色相值(组合百位和十个位)
+        const hundreds = step(2).value;
+        const tensOnes = step(2).value;
+        const saturation = step(2).value;
+        const val = step(2).value;
+        const brightness = step(2).value;
+        const temperature = step(2).value;
+        const durationStep = step(2);
+        const duration = durationStep.value;
+        nodes.push({
+          onOff,
+          loops,
+          step: stepNum,
+          hour,
+          minute,
+          hue: Math.round(hundreds * 100 + tensOnes),
+          // 0-360
+          saturation,
+          value: val,
+          brightness,
+          temperature,
+          duration,
+          index: i
+        });
+        if (durationStep.done) {
+          break;
+        }
       }
+      return {
+        version,
+        number,
+        nodes
+      };
+    } catch (error) {
+      scheduleLogger.error('wakeup parser error', error);
+      return this.defaultValue;
     }
-    return {
-      version,
-      number,
-      nodes
-    };
   }
   formatter(data) {
-    var _data$nodes, _data$nodes2;
-    const result = [numToHexString(data.version), numToHexString((_data$nodes = data.nodes) === null || _data$nodes === void 0 ? void 0 : _data$nodes.length)];
-    scheduleLogger.debug('wakeup formatter data', data);
-    data === null || data === void 0 || (_data$nodes2 = data.nodes) === null || _data$nodes2 === void 0 || _data$nodes2.forEach(node => {
-      // 拆分色相值为百位和十个位
-      const hueHundreds = Math.floor(node.hue / 100);
-      const hueTensOnes = node.hue % 100;
-      const {
-        saturation,
-        value,
-        brightness,
-        temperature
-      } = node;
-      let saturation1 = node.saturation;
-      let value1 = node.value;
-      let brightness1 = node.brightness;
-      let temperature1 = node.temperature;
-      if (saturation === 0 && value === 0 && brightness === 0 && temperature === 0) {
-        saturation1 = defaultColor.saturation;
-        value1 = defaultColor.value;
-        brightness1 = defaultColor.brightness;
-        temperature1 = defaultColor.temperature;
-      }
-      result.push(numToHexString(node.onOff ? 1 : 0), numToHexString(parseInt(node.loops.split('').reverse().join(''), 2), 2), numToHexString(node.step), numToHexString(node.hour), numToHexString(node.minute), numToHexString(hueHundreds), numToHexString(hueTensOnes), numToHexString(saturation1), numToHexString(value1), numToHexString(brightness1), numToHexString(temperature1), numToHexString(node.duration));
-    });
-    return result.join('');
+    try {
+      var _data$nodes, _data$nodes2;
+      const result = [numToHexString(data.version), numToHexString((_data$nodes = data.nodes) === null || _data$nodes === void 0 ? void 0 : _data$nodes.length)];
+      scheduleLogger.debug('wakeup formatter data', data);
+      data === null || data === void 0 || (_data$nodes2 = data.nodes) === null || _data$nodes2 === void 0 || _data$nodes2.forEach(node => {
+        // 拆分色相值为百位和十个位
+        const hueHundreds = Math.floor(node.hue / 100);
+        const hueTensOnes = node.hue % 100;
+        const {
+          saturation,
+          value,
+          brightness,
+          temperature
+        } = node;
+        let saturation1 = node.saturation;
+        let value1 = node.value;
+        let brightness1 = node.brightness;
+        let temperature1 = node.temperature;
+        if (saturation === 0 && value === 0 && brightness === 0 && temperature === 0) {
+          saturation1 = defaultColor.saturation;
+          value1 = defaultColor.value;
+          brightness1 = defaultColor.brightness;
+          temperature1 = defaultColor.temperature;
+        }
+        result.push(numToHexString(node.onOff ? 1 : 0), numToHexString(parseInt(node.loops.split('').reverse().join(''), 2), 2), numToHexString(node.step), numToHexString(node.hour), numToHexString(node.minute), numToHexString(hueHundreds), numToHexString(hueTensOnes), numToHexString(saturation1), numToHexString(value1), numToHexString(brightness1), numToHexString(temperature1), numToHexString(node.duration));
+      });
+      return result.join('');
+    } catch (error) {
+      scheduleLogger.error('wakeup formatter error', error);
+      return '';
+    }
   }
 }
 export const wakeupParser = new WakeUp();

package/lib/hooks/useBaseLightDp.d.ts

@@ -10,12 +10,21 @@ type TDpRes<T> = {
 };
 export declare function useBaseLightDp<T>(dpCode: string, defaultDpValue?: T): TDpRes<T>;
 export declare const getDpDataByMesh: (dpCodes?: string[]) => void;
+export declare const fetchDpData: (dpCodes?: string[]) => void;
 /**
- * 主动拉取 dp 数据
+ * 主动拉取 dp 数据, 仅支持 sigmesh 设备
  * @param dpCodes dpCode 数组
  * @returns refresh 刷新 dp 数据
  */
 export declare const useFetchDpDataByMesh: (dpCodes: string[]) => {
     refresh: () => void;
 };
+/**
+ * 主动拉取 dp 数据, 不限制协议
+ * @param dpCodes dpCode 数组
+ * @returns refresh 刷新 dp 数据
+ */
+export declare const useFetchDpData: (dpCodes: string[]) => {
+    refresh: () => void;
+};
 export {};

package/lib/hooks/useBaseLightDp.js

@@ -134,8 +134,48 @@ export const getDpDataByMesh = function () {
     scheduleLogger.error('getDpDataByMesh 调用失败:', error);
   }
 };
+
+// 查询设备的 DP
+export const fetchDpData = function () {
+  let dpCodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (!Array.isArray(dpCodes)) {
+    scheduleLogger.error('fetchDpData: 参数dpCodes必须是数组');
+    return;
+  }
+  if (dpCodes.length >= 5) {
+    scheduleLogger.warn('fetchDpData: 单次查询 dp 数过多，dp 可能响应不及时，请分次查询');
+  }
+  scheduleLogger.debug('fetchDpData 开始查询DP参数 dpCodes:', dpCodes);
+  const deviceData = devIdOrGroupIdCache.get();
+  const deviceId = deviceData === null || deviceData === void 0 ? void 0 : deviceData.devId;
+  if (!deviceId) {
+    scheduleLogger.error('fetchDpData: 未能获取到deviceId');
+    return;
+  }
+  const dpIds = dpCodes.map(item => getDpIdByDpCode(item)).filter(i => !!i).map(String); // 简化字符串转换
+
+  if (dpIds.length === 0) {
+    scheduleLogger.warn('fetchDpData', dpCodes, '未匹配到 dp');
+    return;
+  }
+  scheduleLogger.debug('fetchDpData 查询DP转换后参数 dpIds:', dpIds);
+  try {
+    queryDps({
+      deviceId,
+      dpIds,
+      success: e => {
+        scheduleLogger.debug('fetchDpData 查询DP参数 success:', e);
+      },
+      fail: err => {
+        scheduleLogger.warn('fetchDpData 查询DP参数 fail:', err);
+      }
+    });
+  } catch (error) {
+    scheduleLogger.error('fetchDpData 调用失败:', error);
+  }
+};
 /**
- * 主动拉取 dp 数据
+ * 主动拉取 dp 数据, 仅支持 sigmesh 设备
  * @param dpCodes dpCode 数组
  * @returns refresh 刷新 dp 数据
  */
@@ -148,7 +188,7 @@ export const useFetchDpDataByMesh = dpCodes => {
       return;
     }
     scheduleLogger.debug('getDpDataByMeshFn get:', dpCodes);
-    getDpDataByMesh(dpCodes);
+    fetchDpData(dpCodes);
   };
   useEffect(() => {
     const isSigMeshDevice = support === null || support === void 0 ? void 0 : support.isSigMeshDevice();
@@ -162,4 +202,23 @@ export const useFetchDpDataByMesh = dpCodes => {
   return {
     refresh: getDpDataByMeshFn
   };
+};
+
+/**
+ * 主动拉取 dp 数据, 不限制协议
+ * @param dpCodes dpCode 数组
+ * @returns refresh 刷新 dp 数据
+ */
+export const useFetchDpData = dpCodes => {
+  const getDpDataFn = () => {
+    scheduleLogger.debug('getDpDataFn get:', dpCodes);
+    fetchDpData(dpCodes);
+  };
+  useEffect(() => {
+    scheduleLogger.debug('useFetchDpData get:', dpCodes);
+    getDpDataFn();
+  }, [dpCodes.join(',')]);
+  return {
+    refresh: getDpDataFn
+  };
 };

package/lib/hooks/useCountdownDp.js

@@ -1,4 +1,4 @@
-import { useBaseLightDp, useFetchDpDataByMesh } from './useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 export function useCountdownDp() {
   let dpCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.COUNTDOWN;
@@ -21,7 +21,7 @@ export const useCountdownDpPull = function () {
   let countdownCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.COUNTDOWN;
   const {
     refresh
-  } = useFetchDpDataByMesh([countdownCode]);
+  } = useFetchDpData([countdownCode]);
   return {
     refresh
   };

package/lib/hooks/useTimerReportDp.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 import { useMemo } from 'react';
-import { useBaseLightDp, useFetchDpDataByMesh } from './useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
 import { timerReportParser } from '../dpParser';
@@ -41,7 +41,7 @@ export const useTimerReportDpPull = function () {
   ScheduleLogger.debug('useTimerReportDpPull 执行');
   const {
     refresh
-  } = useFetchDpDataByMesh([timerReport]);
+  } = useFetchDpData([timerReport]);
   return {
     refresh
   };

package/lib/index.d.ts

@@ -19,7 +19,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 /** Conflict 冲突判断 */
 export { transScheduleListToConflictList } from './conflict/transform';

package/lib/index.js

@@ -24,7 +24,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 
 /** Conflict 冲突判断 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-schedule-core",
-  "version": "1.0.0-beta-1",
+  "version": "1.0.0-beta-3",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [