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

package/lib/dpParser/cycle/index.d.ts

@@ -1,9 +1,15 @@
 import { TCycleData, TCycleNode } from '../../types';
 declare class CycleTimerParser {
+    defaultValue: {
+        version: number;
+        length: number;
+        nodes: never[];
+    };
     parser(dpValue: string): TCycleData;
     formatter(data: TCycleData): string;
 }
 export declare const cycleParser: {
+    defaultValue: TCycleData;
     parser: (dpValue: string) => {
         version: number;
         length: number;

package/lib/dpParser/cycle/index.js

@@ -10,79 +10,85 @@ const {
 } = scheduleDpCodes;
 const LENGTH = 16;
 class CycleTimerParser {
+  defaultValue = (() => ({
+    version: 0,
+    length: LENGTH,
+    nodes: []
+  }))();
   parser(dpValue) {
-    ScheduleLogger.debug(`CycleTimerParser dpValue: ${dpValue}`);
-    if (!dpValue) {
-      ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${CYCLE_TIMING}】: ${dpValue}`);
-      return {
-        version: 0,
-        length: LENGTH,
-        nodes: []
-      };
-    }
-    if (dpValue.length <= 4 || (dpValue.length - 4) % 32 !== 0) {
-      ScheduleLogger.warn(`节点数量不匹配, 请检查数据是否合规【${CYCLE_TIMING}】: ${dpValue}`);
-      return {
-        version: 0,
-        length: LENGTH,
-        nodes: []
-      };
-    }
-    const step = generateDpStrStep(dpValue);
-    const version = step().value;
-    const length = step().value;
-    // 节点数
-    const count = (dpValue.length - 4) / length / 2;
-    const nodes = [];
-    for (let i = 0; i < count; i++) {
-      const powerNum = step().value;
-      const powerInfo = numToBinStrPad8(powerNum);
-      const powerBits = powerInfo.split('');
-      const onOff = !!Number(powerBits[powerBits.length - 1]);
-      // 通道号
-      const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
-      const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
-      const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
-      const startTime = step(4).value;
-      const endTime = step(4).value;
-      const startTimeDuration = step(4).value; // 开始时间持续时间，单位：s
-      const endTimeDuration = step(4).value; // 结束时间持续时间，单位：s
+    try {
+      ScheduleLogger.debug(`CycleTimerParser dpValue: ${dpValue}`);
+      if (!dpValue) {
+        ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${CYCLE_TIMING}】: ${dpValue}`);
+        return this.defaultValue;
+      }
+      if (dpValue.length <= 4 || (dpValue.length - 4) % 32 !== 0) {
+        ScheduleLogger.warn(`节点数量不匹配, 请检查数据是否合规【${CYCLE_TIMING}】: ${dpValue}`);
+        return {
+          version: 0,
+          length: LENGTH,
+          nodes: []
+        };
+      }
+      const step = generateDpStrStep(dpValue);
+      const version = step().value;
+      const length = step().value;
+      // 节点数
+      const count = (dpValue.length - 4) / length / 2;
+      const nodes = [];
+      for (let i = 0; i < count; i++) {
+        const powerNum = step().value;
+        const powerInfo = numToBinStrPad8(powerNum);
+        const powerBits = powerInfo.split('');
+        const onOff = !!Number(powerBits[powerBits.length - 1]);
+        // 通道号
+        const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
+        const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
+        const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
+        const startTime = step(4).value;
+        const endTime = step(4).value;
+        const startTimeDuration = step(4).value; // 开始时间持续时间，单位：s
+        const endTimeDuration = step(4).value; // 结束时间持续时间，单位：s
 
-      const hue = step(4).value;
-      const saturation = step().value;
-      const {
-        value
-      } = step();
-      const brightness = step().value;
-      const temperatureStep = step();
-      const temperature = temperatureStep.value;
-      const node = {
-        onOff,
-        channel,
-        loops,
-        startTime,
-        endTime,
-        startTimeDuration,
-        endTimeDuration,
-        index: i,
-        color: {
-          hue,
-          saturation,
-          value,
-          brightness,
-          temperature
+        const hue = step(4).value;
+        const saturation = step().value;
+        const {
+          value
+        } = step();
+        const brightness = step().value;
+        const temperatureStep = step();
+        const temperature = temperatureStep.value;
+        const node = {
+          onOff,
+          channel,
+          loops,
+          startTime,
+          endTime,
+          startTimeDuration,
+          endTimeDuration,
+          index: i,
+          color: {
+            hue,
+            saturation,
+            value,
+            brightness,
+            temperature
+          }
+        };
+        nodes.push(node);
+        if (temperatureStep.done) {
+          break;
         }
-      };
-      nodes.push(node);
-      if (temperatureStep.done) {
-        break;
       }
+      return {
+        version,
+        length,
+        nodes
+      };
+    } catch (error) {
+      ScheduleLogger.error('CycleTimerParser parser error', error);
+      return this.defaultValue;
     }
-    return {
-      version,
-      length,
-      nodes
-    };
   }
   formatter(data) {
     const {

package/lib/dpParser/random/index.d.ts

@@ -1,9 +1,15 @@
 import { TRandomData, TRandomNode } from '../../types';
 declare class RandomTimerParser {
+    defaultValue: {
+        version: number;
+        length: number;
+        nodes: never[];
+    };
     parser(dpValue: string): TRandomData;
     formatter(data: TRandomData): string;
 }
 export declare const randomParser: {
+    defaultValue: TRandomData;
     parser: (dpValue: string) => {
         version: number;
         length: number;

package/lib/dpParser/random/index.js

@@ -11,114 +11,125 @@ const {
 } = scheduleDpCodes;
 const LENGTH = 12;
 class RandomTimerParser {
+  defaultValue = {
+    version: 0,
+    length: 12,
+    nodes: []
+  };
   parser(dpValue) {
-    ScheduleLogger.debug(`RandomTimerParser dpValue: ${dpValue}`);
-    if (!dpValue) {
-      ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${RANDOM_TIMING}】: ${dpValue}`);
-      return {
-        version: 0,
-        length: LENGTH,
-        nodes: []
-      };
-    }
-    const step = generateDpStrStep(dpValue);
-    const version = step().value;
-    const length = step().value;
-    if (!dpValue || (dpValue.length - 4) % 24 !== 0) {
-      console.log('decodeRandomTask 数据有问题，无法解析');
-      // 返回默认值
+    try {
+      ScheduleLogger.debug(`RandomTimerParser dpValue: ${dpValue}`);
+      if (!dpValue) {
+        ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${RANDOM_TIMING}】: ${dpValue}`);
+        return {
+          version: 0,
+          length: LENGTH,
+          nodes: []
+        };
+      }
+      const step = generateDpStrStep(dpValue);
+      const version = step().value;
+      const length = step().value;
+      if (!dpValue || (dpValue.length - 4) % 24 !== 0) {
+        console.log('decodeRandomTask 数据有问题，无法解析');
+        // 返回默认值
+        return this.defaultValue;
+      }
+      const nodes = [];
+      // 节点数
+      const count = (dpValue.length - 4) / LENGTH / 2;
+      for (let i = 0; i < count; i++) {
+        const powerNum = step().value;
+        const powerInfo = numToBinStrPad8(powerNum);
+        const powerBits = powerInfo.split('');
+        const onOff = !!Number(powerBits[powerBits.length - 1]);
+        // 通道号
+        const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
+        const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
+        const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
+        const startTime = step(4).value;
+        const endTime = step(4).value;
+        const hue = step(4).value;
+        const saturation = step().value;
+        const {
+          value
+        } = step();
+        const brightness = step().value;
+        const temperatureStep = step();
+        const temperature = temperatureStep.value;
+        const node = {
+          onOff,
+          channel,
+          loops,
+          startTime,
+          endTime,
+          index: i,
+          color: {
+            hue,
+            saturation,
+            value,
+            brightness,
+            temperature
+          }
+        };
+        nodes.push(node);
+        if (temperatureStep.done) {
+          break;
+        }
+      }
       return {
-        version: 0,
-        length: 12,
-        nodes: []
+        version,
+        length,
+        nodes
       };
+    } catch (error) {
+      ScheduleLogger.error('RandomTimerParser parser error', error);
+      return this.defaultValue;
     }
-    const nodes = [];
-    // 节点数
-    const count = (dpValue.length - 4) / LENGTH / 2;
-    for (let i = 0; i < count; i++) {
-      const powerNum = step().value;
-      const powerInfo = numToBinStrPad8(powerNum);
-      const powerBits = powerInfo.split('');
-      const onOff = !!Number(powerBits[powerBits.length - 1]);
-      // 通道号
-      const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
-      const repeatInt = step(2).value; // 单次定时任务bit0-bit6全为0，bit0-bit6某位为1时，表示对应周几周期定时 bit0 => 周日
-      const loops = padEnd(repeatInt.toString(2).split('').reverse().join(''), 7, '0');
-      const startTime = step(4).value;
-      const endTime = step(4).value;
-      const hue = step(4).value;
-      const saturation = step().value;
+  }
+  formatter(data) {
+    try {
       const {
-        value
-      } = step();
-      const brightness = step().value;
-      const temperatureStep = step();
-      const temperature = temperatureStep.value;
-      const node = {
-        onOff,
-        channel,
-        loops,
-        startTime,
-        endTime,
-        index: i,
-        color: {
+        version,
+        nodes
+      } = data;
+      const versionStr = numToHexPad2(version);
+      const lengthStr = numToHexPad2(LENGTH);
+      const nodesStr = nodes.map(_ref => {
+        let {
+          onOff,
+          channel,
+          loops,
+          startTime,
+          endTime,
+          color
+        } = _ref;
+        const channelStr = numToBinStrPad(channel || 1, 7);
+        const powerChannel = parseInt(`${channelStr}${onOff ? 1 : 0}`, 2);
+        const powerChannelStr = numToHexPad2(powerChannel);
+        const weeksValue = padStart([...loops.split('')].reverse().join(''), 8, '0');
+        const weeksStr = numToHexPad2(parseInt(weeksValue, 2));
+        const startTimeStr = numToHexPad4(startTime);
+        const endTimeStr = numToHexPad4(endTime);
+        const {
           hue,
           saturation,
           value,
           brightness,
           temperature
-        }
-      };
-      nodes.push(node);
-      if (temperatureStep.done) {
-        break;
-      }
+        } = color;
+        const hueStr = numToHexPad4(hue);
+        const saturationStr = numToHexPad2(saturation);
+        const valueStr = numToHexPad2(value);
+        const brightnessStr = numToHexPad2(brightness);
+        const temperatureStr = numToHexPad2(temperature);
+        return `${powerChannelStr}${weeksStr}${startTimeStr}${endTimeStr}${hueStr}${saturationStr}${valueStr}${brightnessStr}${temperatureStr}`;
+      }).join('');
+      return `${versionStr}${lengthStr}${nodesStr}`;
+    } catch (error) {
+      ScheduleLogger.error('RandomTimerParser formatter error', error);
+      return '';
     }
-    return {
-      version,
-      length,
-      nodes
-    };
-  }
-  formatter(data) {
-    const {
-      version,
-      nodes
-    } = data;
-    const versionStr = numToHexPad2(version);
-    const lengthStr = numToHexPad2(LENGTH);
-    const nodesStr = nodes.map(_ref => {
-      let {
-        onOff,
-        channel,
-        loops,
-        startTime,
-        endTime,
-        color
-      } = _ref;
-      const channelStr = numToBinStrPad(channel || 1, 7);
-      const powerChannel = parseInt(`${channelStr}${onOff ? 1 : 0}`, 2);
-      const powerChannelStr = numToHexPad2(powerChannel);
-      const weeksValue = padStart([...loops.split('')].reverse().join(''), 8, '0');
-      const weeksStr = numToHexPad2(parseInt(weeksValue, 2));
-      const startTimeStr = numToHexPad4(startTime);
-      const endTimeStr = numToHexPad4(endTime);
-      const {
-        hue,
-        saturation,
-        value,
-        brightness,
-        temperature
-      } = color;
-      const hueStr = numToHexPad4(hue);
-      const saturationStr = numToHexPad2(saturation);
-      const valueStr = numToHexPad2(value);
-      const brightnessStr = numToHexPad2(brightness);
-      const temperatureStr = numToHexPad2(temperature);
-      return `${powerChannelStr}${weeksStr}${startTimeStr}${endTimeStr}${hueStr}${saturationStr}${valueStr}${brightnessStr}${temperatureStr}`;
-    }).join('');
-    return `${versionStr}${lengthStr}${nodesStr}`;
   }
 }
 export const randomParser = new RandomTimerParser();

package/lib/dpParser/rhythms.d.ts

@@ -3,38 +3,7 @@ export default class RhythmFormatter {
     uuid: string;
     defaultValue: any;
     constructor(uuid?: "rhythm_mode", defaultValue?: null);
-    parser(dpValue?: string): {
-        version: number;
-        power: boolean;
-        mode: number;
-        weeks: number[];
-        number: number;
-        rhythms: {
-            key: number;
-            version: number;
-            power: boolean;
-            mode: number;
-            weeks: number[];
-            number: number;
-            rhythms: {
-                power: boolean;
-                hour: number;
-                minute: number;
-                hue: number;
-                saturation: number;
-                value: number;
-                brightness: number;
-                temperature: number;
-            }[];
-        }[];
-    } | {
-        version: any;
-        power: boolean;
-        mode: any;
-        weeks: number[];
-        number: any;
-        rhythms: never[];
-    };
+    parser(dpValue?: string): any;
     formatter(data: TRhythmData): string;
 }
 export declare const rhythmParser: RhythmFormatter;

package/lib/dpParser/rhythms.js

@@ -35,43 +35,48 @@ export default class RhythmFormatter {
         rhythms: defaultValue
       };
     }
-    const step = generateDpStrStep(dpValue);
-    const version = step().value;
-    const power = !!step().value;
-    const mode = step().value;
-    const weekNum = step().value;
-    const weeks = padStart(Number(weekNum).toString(2), 8, '0').split('').reverse().map(v => parseInt(v, 10));
-    const number = step().value;
-    const rhythms = [];
-    for (let i = 0; i < number; i++) {
-      const valid = !!step().value;
-      const hour = step().value;
-      const minute = step().value;
-      const hue1 = step().value;
-      const hue2 = step().value;
-      const saturation = step().value;
-      const v = step().value;
-      const brightness = step().value;
-      const temperature = step().value;
-      rhythms.push({
-        power: valid,
-        hour,
-        minute,
-        hue: hue1 * 100 + hue2,
-        saturation,
-        value: v,
-        brightness,
-        temperature
-      });
+    try {
+      const step = generateDpStrStep(dpValue);
+      const version = step().value;
+      const power = !!step().value;
+      const mode = step().value;
+      const weekNum = step().value;
+      const weeks = padStart(Number(weekNum).toString(2), 8, '0').split('').reverse().map(v => parseInt(v, 10));
+      const number = step().value;
+      const rhythms = [];
+      for (let i = 0; i < number; i++) {
+        const valid = !!step().value;
+        const hour = step().value;
+        const minute = step().value;
+        const hue1 = step().value;
+        const hue2 = step().value;
+        const saturation = step().value;
+        const v = step().value;
+        const brightness = step().value;
+        const temperature = step().value;
+        rhythms.push({
+          power: valid,
+          hour,
+          minute,
+          hue: hue1 * 100 + hue2,
+          saturation,
+          value: v,
+          brightness,
+          temperature
+        });
+      }
+      return {
+        version,
+        power,
+        mode,
+        weeks,
+        number,
+        rhythms
+      };
+    } catch (err) {
+      ScheduleLogger.error('rhythmParser parser error', err);
+      return this.defaultValue;
     }
-    return {
-      version,
-      power,
-      mode,
-      weeks,
-      number,
-      rhythms
-    };
   }
   formatter(data) {
     const support = getSupportIns();