@ray-js/lamp-schedule-core 1.0.5-beta.1 → 1.0.5-beta.10

package/lib/config/dpCodes.d.ts

@@ -19,7 +19,7 @@ export declare const scheduleDpCodes: {
     readonly CYCLE_TIMING: "cycle_timing";
     /** 通用本地定时 */
     readonly LOCAL_TIMER: "local_timer";
-    /** 灯带本地定时 */
+    /** 灯带本地定时 Beacon */
     readonly STRIP_LOCAL_TIMER: "strip_local_timer";
     /** 定时同步 一般用于 Beacon */
     readonly TIMER_SYNC: "timer_sync";
@@ -33,6 +33,23 @@ export declare const scheduleDpCodes: {
     readonly BRIGHTNESS: "bright_value";
     /** 彩光 */
     readonly COLOUR_DATA: "colour_data";
+    /** 彩光原始数据 Beacon */
+    readonly COLOUR_DATA_RAW: "colour_data_raw";
+    /** 亮度调节 Beacon */
+    readonly BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    /** ------ 风扇灯 Beacon DP -------- */
+    /** 风扇模式 Beacon */
+    readonly FAN_MODE: "fan_mode";
+    /** 风向 Beacon */
+    readonly FAN_DIRECTION: "fan_direction";
+    /** 摇头 Beacon */
+    readonly SHAKE: "shake";
+    readonly WHITE_SWITCH: "white_switch";
+    readonly COLOUR_SWITCH: "colour_switch";
+    readonly FAN_SWITCH: "fan_switch";
+    readonly FAN_SPEED: "fan_speed";
+    readonly FAN_BEEP: "fan_beep";
+    readonly STRIP_SCENE: "strip_scene";
     /** 模式 */
     readonly WORK_MODE: "work_mode";
 };

package/lib/config/dpCodes.js

@@ -22,7 +22,7 @@ export const scheduleDpCodes = {
   [EScheduleType.CYCLE_TIMING]: 'cycle_timing',
   /** 通用本地定时 */
   [EScheduleType.LOCAL_TIMER]: 'local_timer',
-  /** 灯带本地定时 */
+  /** 灯带本地定时 Beacon */
   [EScheduleType.STRIP_LOCAL_TIMER]: 'strip_local_timer',
   /** 定时同步 一般用于 Beacon */
   [EScheduleType.TIMER_SYNC]: 'timer_sync',
@@ -36,6 +36,39 @@ export const scheduleDpCodes = {
   BRIGHTNESS: 'bright_value',
   /** 彩光 */
   COLOUR_DATA: 'colour_data',
+  /** 彩光原始数据 Beacon */
+  COLOUR_DATA_RAW: 'colour_data_raw',
+  /** 亮度调节 Beacon */
+  BRIGHT_ADJUST_DATA: 'bright_adjust_data',
+  /** ------ 风扇灯 Beacon DP -------- */
+  /** 风扇模式 Beacon */
+  FAN_MODE: 'fan_mode',
+  // 枚举值: fresh, nature
+  /** 风向 Beacon */
+  FAN_DIRECTION: 'fan_direction',
+  // 枚举值: forward, reverse
+  /** 摇头 Beacon */
+  SHAKE: 'shake',
+  // boolean
+  // 主灯开关
+  WHITE_SWITCH: 'white_switch',
+  // boolean
+  // 氛围灯开关
+  COLOUR_SWITCH: 'colour_switch',
+  // boolean
+  // 风扇开关
+  FAN_SWITCH: 'fan_switch',
+  // boolean
+  // 风扇速度
+  FAN_SPEED: 'fan_speed',
+  // number 1-100
+  // 声音
+  FAN_BEEP: 'fan_beep',
+  // boolean
+  // 情景
+  STRIP_SCENE: 'strip_scene',
+  // beacon mesh情景功能，支持速度，亮度编辑
+
   /** 模式 */
   WORK_MODE: 'work_mode'
 };

package/lib/conflict/index.d.ts

@@ -1,10 +1,15 @@
-import { TConflictRes, ConflictRule, TFoldScheduleList, TSchedule } from './type';
+import { TConflictRes, ConflictRule, TFoldScheduleList, TSchedule, PartialSchedule } from './type';
+import { EScheduleFunctionType } from '../types';
 /**
  * 冲突检测
  */
 export declare class Conflict {
     static rule: ConflictRule;
     static isInit: boolean;
+    /**
+     * 获取冲突检测数据
+     */
+    static getData(): Record<string, any>[];
     /**
      * 添加冲突规则
      */
@@ -18,13 +23,18 @@ export declare class Conflict {
      *          conflictList - 具体的冲突检测结果数组
      */
     static add(current: TSchedule): TConflictRes;
+    /**
+     * 删除指定类型的日程
+     * @param type - 日程类型
+     */
+    static removeByType(type: EScheduleFunctionType): void;
     /**
      * 删除日程
      *
-     * @param current - 待添加的日程对象，类型为 Schedule
+     * @param current - 待添加的日程对象，类型为 Schedule,  如果没有 detail 则认为是删除指定类型的日程
      * @returns void
      */
-    static remove(current: TSchedule): void;
+    static remove(current: TSchedule | PartialSchedule): void;
     /**
      * 更新新日程时检测冲突
      *

package/lib/conflict/index.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import { scheduleLogger } from '../utils/ScheduleLogger';
 import { checkConflicts } from './ConflictResolver';
@@ -12,6 +13,13 @@ import { EScheduleFunctionType } from '../types';
  * 冲突检测
  */
 export class Conflict {
+  /**
+   * 获取冲突检测数据
+   */
+  static getData() {
+    return ScheduleDataManager.getInstance().getData();
+  }
+
   /**
    * 添加冲突规则
    */
@@ -50,13 +58,31 @@ export class Conflict {
     };
   }
 
+  /**
+   * 删除指定类型的日程
+   * @param type - 日程类型
+   */
+  static removeByType(type) {
+    const instance = ScheduleDataManager.getInstance();
+    const list = instance.getData() || [];
+    const filteredList = list.filter(item => item.type !== type);
+    ScheduleDataManager.list = filteredList;
+  }
+
   /**
    * 删除日程
    *
-   * @param current - 待添加的日程对象，类型为 Schedule
+   * @param current - 待添加的日程对象，类型为 Schedule,  如果没有 detail 则认为是删除指定类型的日程
    * @returns void
    */
   static remove(current) {
+    if (!current) {
+      return;
+    }
+    if (current.type && !current.detail) {
+      this.removeByType(current.type);
+      return;
+    }
     const [cur] = transScheduleListToConflictList([current]);
     scheduleLogger.debug('Conflict.remove cur, current:', cur, current);
 

package/lib/conflict/scheduleDataManager.js

@@ -1,3 +1,4 @@
+import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
@@ -63,10 +64,11 @@ export class ScheduleDataManager {
     }
     const idsToAdd = new Set(itemsMap.keys());
     const filteredList = ScheduleDataManager.list.filter(item => !idsToAdd.has(item.id));
-    ScheduleDataManager.list = [...filteredList, ...itemsMap.values()].filter(item => {
+    const newList = [...filteredList, ...itemsMap.values()].filter(item => {
       var _item$data;
       return (item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.status) === true;
     });
+    ScheduleDataManager.list = newList;
   }
   clearData() {
     scheduleLogger.debug('ScheduleDataManager.clearData pre', ScheduleDataManager.list);
@@ -76,12 +78,14 @@ export class ScheduleDataManager {
     if (!current) {
       return;
     }
-    scheduleLogger.debug('ScheduleDataManager.deleteData pre', current);
+    scheduleLogger.debug('ScheduleDataManager.deleteData pre', current, JSON.stringify(ScheduleDataManager.list));
     const index = ScheduleDataManager.list.findIndex(item => item.id === current.id);
     if (index !== -1) {
       ScheduleDataManager.list.splice(index, 1);
+      scheduleLogger.debug('ScheduleDataManager.deleteData post', JSON.stringify(ScheduleDataManager.list));
+    } else {
+      scheduleLogger.debug('ScheduleDataManager.deleteData post not found', JSON.stringify(ScheduleDataManager.list));
     }
-    scheduleLogger.debug('ScheduleDataManager.deleteData post', ScheduleDataManager.list);
   }
 
   // 添加remove方法作为deleteData的别名，用于测试

package/lib/conflict/transform.js

@@ -18,6 +18,7 @@ import { scheduleLogger } from '../utils/ScheduleLogger';
 export const timerDataToSchedule = data => {
   var _data$status;
   scheduleLogger.debug('timerDataToSchedule:', data);
+  const stableTimerId = data.timerId || (data === null || data === void 0 ? void 0 : data.id);
   const _data = {
     status: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : false,
     weeks: data.loops.split('').map(item => Number(item)),
@@ -26,7 +27,7 @@ export const timerDataToSchedule = data => {
     dps: data.dps,
     aliasName: data.aliasName || '',
     isAppPush: data.isAppPush || false,
-    id: (data === null || data === void 0 ? void 0 : data.id) || data.timerId
+    id: stableTimerId
   };
   const timerId = `${EScheduleFunctionType.TIMER}_${_data.id}`;
   return {

package/lib/conflict/type.d.ts

@@ -52,5 +52,9 @@ export type TSchedule = {
     type: EScheduleFunctionType;
     detail: ScheduleNodeType[];
 };
+export type PartialSchedule = {
+    type: EScheduleFunctionType;
+    detail?: ScheduleNodeType[];
+};
 export type TFoldScheduleList = TSchedule[];
 export {};

package/lib/dpParser/__test__/sleepSigmesh.test.js

@@ -121,6 +121,7 @@ describe('SleepSigmesh parser & formatter', () => {
         index: 0
       }]
     });
+    // formatter 固定输出 version=1, dataMode=1
     expect(result).toBe(buildDpStr([{
       onOff: 1,
       loops: loopsToHex('1000000'),
@@ -129,7 +130,7 @@ describe('SleepSigmesh parser & formatter', () => {
       minute: 15,
       brightness: 90,
       temperature: 50
-    }], 1, 3));
+    }], 1, 1));
   });
   it('round-trips dp string through parser and formatter', () => {
     const nodes = [{
@@ -144,7 +145,8 @@ describe('SleepSigmesh parser & formatter', () => {
     const dpStr = buildDpStr(nodes, 2, 3);
     const parsed = sleepParserSigmesh.parser(dpStr);
     const formatted = sleepParserSigmesh.formatter(parsed);
-    expect(formatted).toBe(dpStr);
+    // formatter 固定输出 version=1, dataMode=1，故 round-trip 后与原始 dpStr 不同
+    expect(formatted).toBe(buildDpStr(nodes, 1, 1));
   });
   it('handles multiple nodes correctly', () => {
     const nodes = [{

package/lib/dpParser/__test__/wakeupSigmesh.test.js

@@ -97,6 +97,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
         index: 0
       }]
     });
+    // formatter 固定输出 version=1, dataMode=1（与 parser 可解析的格式一致）
     expect(result).toBe(buildDpStr([{
       onOff: 1,
       loops: loopsToHex('1000000'),
@@ -106,7 +107,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
       brightness: 90,
       temperature: 50,
       duration: 20
-    }], 1, 3));
+    }], 1, 1));
   });
   it('round-trips dp string through parser and formatter', () => {
     const nodes = [{
@@ -122,6 +123,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
     const dpStr = buildDpStr(nodes, 2, 3);
     const parsed = wakeupParserSigmesh.parser(dpStr);
     const formatted = wakeupParserSigmesh.formatter(parsed);
-    expect(formatted).toBe(dpStr);
+    // formatter 固定输出 version=1, dataMode=1，故 round-trip 后与原始 dpStr 不同
+    expect(formatted).toBe(buildDpStr(nodes, 1, 1));
   });
 });

package/lib/dpParser/brightAdjustData.d.ts

@@ -0,0 +1,10 @@
+import { TBrightAdjustData } from '../types';
+export declare class BrightAdjustDataFormatter {
+    parser(dpValue: string): TBrightAdjustData;
+    formatter(data: TBrightAdjustData): string;
+}
+export declare const brightAdjustDataParser: {
+    parser: (dpValue: string) => TBrightAdjustData;
+    formatter: (data: TBrightAdjustData) => string;
+};
+export declare const getBrightAdjustDataParser: () => BrightAdjustDataFormatter;

package/lib/dpParser/brightAdjustData.js

@@ -0,0 +1,43 @@
+/* eslint-disable no-console */
+
+import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+export class BrightAdjustDataFormatter {
+  parser(dpValue) {
+    try {
+      ScheduleLogger.debug('dpParser ===> BrightAdjustDataFormatter parser dpValue:', dpValue);
+      if (!dpValue || dpValue.length < 6) {
+        return {
+          mode: 0,
+          brightness: 0
+        };
+      }
+      const mode = parseInt(dpValue.substring(0, 2), 16);
+      const brightness = parseInt(dpValue.substring(2, 6), 16);
+      return {
+        mode,
+        brightness
+      };
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> BrightAdjustDataFormatter parser error:', error);
+      return {
+        mode: 0,
+        brightness: 0
+      };
+    }
+  }
+  formatter(data) {
+    try {
+      ScheduleLogger.debug('dpParser ===> BrightAdjustDataFormatter formatter data:', data);
+      const modeStr = data.mode.toString(16).padStart(2, '0');
+      const brightnessStr = data.brightness.toString(16).padStart(4, '0');
+      return `${modeStr}${brightnessStr}`;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> BrightAdjustDataFormatter formatter error:', error);
+      return '';
+    }
+  }
+}
+export const brightAdjustDataParser = new BrightAdjustDataFormatter();
+export const getBrightAdjustDataParser = () => {
+  return brightAdjustDataParser;
+};

package/lib/dpParser/colourDataRaw.d.ts

@@ -0,0 +1,14 @@
+import { TColourDataRaw } from '../types';
+export declare class ColourDataRawFormatter {
+    parser(dpValue: string): TColourDataRaw;
+    formatter(data: {
+        hue: number;
+        saturation: number;
+        value: number;
+    } | TColourDataRaw): string;
+}
+export declare const colourDataRawParser: {
+    parser: (dpValue: string) => TColourDataRaw;
+    formatter: (data: any) => string;
+};
+export declare const getColourDataRawParser: () => ColourDataRawFormatter;

package/lib/dpParser/colourDataRaw.js

@@ -0,0 +1,56 @@
+/* eslint-disable no-console */
+import { numToHexString } from '@ray-js/panel-sdk/lib/utils';
+import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+const toHex = function (value) {
+  let len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+  return numToHexString(value).padStart(len, '0');
+};
+export class ColourDataRawFormatter {
+  parser(dpValue) {
+    try {
+      ScheduleLogger.debug('dpParser ===> ColourDataRawFormatter parser dpValue:', dpValue);
+      if (!dpValue || dpValue.length < 8) {
+        return {
+          hue: 0,
+          saturation: 1000,
+          value: 1000
+        };
+      }
+      const hue = parseInt(dpValue.substring(0, 4), 16);
+      const saturation = parseInt(dpValue.substring(4, 6), 16) * 10;
+      const value = parseInt(dpValue.substring(6, 8), 16) * 10;
+      return {
+        hue,
+        saturation,
+        value
+      };
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> ColourDataRawFormatter parser error:', error);
+      return {
+        hue: 0,
+        saturation: 1000,
+        value: 1000
+      };
+    }
+  }
+  formatter(data) {
+    try {
+      ScheduleLogger.debug('dpParser ===> ColourDataRawFormatter formatter data:', data);
+      // 兼容两种数据格式: { hue, saturation, value } 或 { h, s, v }
+      const h = 'hue' in data ? data.hue : data.h;
+      const s = 'saturation' in data ? data.saturation : data.s;
+      const v = 'value' in data ? data.value : data.v;
+      const hStr = toHex(Math.floor(h), 4);
+      const sStr = toHex(Math.floor(s / 10), 2);
+      const vStr = toHex(Math.floor(v / 10), 2);
+      return `${hStr}${sStr}${vStr}`;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> ColourDataRawFormatter formatter error:', error);
+      return '';
+    }
+  }
+}
+export const colourDataRawParser = new ColourDataRawFormatter();
+export const getColourDataRawParser = () => {
+  return colourDataRawParser;
+};

package/lib/dpParser/index.d.ts

@@ -7,6 +7,9 @@ export { rtcTimerParser, getRtcParser } from './rtcTimer';
 export { cycleParser, getCycleParser } from './cycle';
 export { wakeupParserCommon as wakeupParser, getWakeUpParser, WakeUpParser } from './wakeup';
 export { timerReportParser } from './timerReport';
+export { stripLocalTimerParser, getStripLocalTimerParser } from './stripLocalTimer';
+export { brightAdjustDataParser, getBrightAdjustDataParser } from './brightAdjustData';
+export { colourDataRawParser, getColourDataRawParser } from './colourDataRaw';
 type DpCode = keyof typeof scheduleDpCodes;
 /**
  * 自动匹配 dp 解析函数

package/lib/dpParser/index.js

@@ -7,6 +7,9 @@ import { getSleepParser } from './sleep';
 import { rtcTimerParser } from './rtcTimer';
 import { timerReportParser } from './timerReport';
 import { getWakeUpParser } from './wakeup';
+import { stripLocalTimerParser } from './stripLocalTimer';
+import { brightAdjustDataParser } from './brightAdjustData';
+import { colourDataRawParser } from './colourDataRaw';
 export { randomParser, getRandomParser } from './random';
 export { rhythmParser, getRhythmParser } from './rhythms';
 export { sleepParserCommon as sleepParser, getSleepParser, SleepParser, sleepParserSigmesh } from './sleep';
@@ -14,6 +17,9 @@ export { rtcTimerParser, getRtcParser } from './rtcTimer';
 export { cycleParser, getCycleParser } from './cycle';
 export { wakeupParserCommon as wakeupParser, getWakeUpParser, WakeUpParser } from './wakeup';
 export { timerReportParser } from './timerReport';
+export { stripLocalTimerParser, getStripLocalTimerParser } from './stripLocalTimer';
+export { brightAdjustDataParser, getBrightAdjustDataParser } from './brightAdjustData';
+export { colourDataRawParser, getColourDataRawParser } from './colourDataRaw';
 /**
  * 自动匹配 dp 解析函数
  *
@@ -37,6 +43,13 @@ export const autoDispatchTransDpFun = dpCode => {
       return timerReportParser;
     case scheduleDpCodes.WAKE_UP_MODE:
       return getWakeUpParser();
+    // Beacon 设备专属 dp
+    case scheduleDpCodes.STRIP_LOCAL_TIMER:
+      return stripLocalTimerParser;
+    case scheduleDpCodes.BRIGHT_ADJUST_DATA:
+      return brightAdjustDataParser;
+    case scheduleDpCodes.COLOUR_DATA_RAW:
+      return colourDataRawParser;
     default:
       return null;
   }

package/lib/dpParser/sleep/sleepSigmesh.js

@@ -75,10 +75,13 @@ export class SleepSigmesh {
     var _data$nodes$length, _data$nodes;
     scheduleLogger.debug('Sigmesh dpParser ===> SleepSigmesh formatter: data', data);
     // dataMode 可能是字符串 ('01'/'02'/'03') 或数字 (1/2/3)
-    const dataModeNum = typeof data.dataMode === 'string' ? parseInt(data.dataMode, 10) : data.dataMode;
-    // 使用 nodes.length 而非 data.length，因为调用方可能未更新 length 字段
+    typeof data.dataMode === 'string' ? parseInt(data.dataMode, 10) : data.dataMode; // 使用 nodes.length 而非 data.length，因为调用方可能未更新 length 字段
     const nodeCount = (_data$nodes$length = (_data$nodes = data.nodes) === null || _data$nodes === void 0 ? void 0 : _data$nodes.length) !== null && _data$nodes$length !== void 0 ? _data$nodes$length : data.length;
-    const result = [numToHexString(data.version), numToHexString(dataModeNum), numToHexString(nodeCount)];
+    // 版本号固定为 1, 与文档不一致，文档有问题
+
+    const result = [numToHexString(1), numToHexString(1),
+    // 数据模式固定为 1 也就是只支持白光，0x01:仅含BT 0x02:仅含HSV 0x03:含HSVBT
+    numToHexString(nodeCount)];
     data.nodes.forEach(node => {
       var _node$loops;
       result.push(numToHexString(node.onOff ? 1 : 0), numToHexString(parseInt(node === null || node === void 0 || (_node$loops = node.loops) === null || _node$loops === void 0 || (_node$loops = _node$loops.split('')) === null || _node$loops === void 0 || (_node$loops = _node$loops.reverse()) === null || _node$loops === void 0 ? void 0 : _node$loops.join(''), 2)), numToHexString(node.step), numToHexString(node.hour), numToHexString(node.minute), numToHexString(node.brightness), numToHexString(node.temperature));

package/lib/dpParser/stripLocalTimer.d.ts

@@ -0,0 +1,41 @@
+/**
+ * 用法
+ * const stripLocalTimerTrans = new StripLocalTimerTransformer();
+ * // 解析dp
+ *  const result = stripLocalTimerTrans.parser(dpStr);
+ * // 格式化
+ * const dpStr = stripLocalTimerTrans.formatter({xxx: xxx})
+ * */
+import { Transformer } from '@ray-js/panel-sdk/lib/protocols/lamp/interface';
+export type TStripLocalTimerData = {
+    timerId: number;
+    time: number;
+    loops: string;
+    power?: boolean;
+    status: boolean;
+    brightness?: number;
+    temperature?: number;
+    hue?: number;
+    saturation?: number;
+    value?: number;
+    mode: number;
+    dps: Record<string, any>;
+    speed?: number;
+    fanMode?: number;
+    direction?: number;
+    shake?: number;
+    sceneId?: number;
+};
+export declare class StripLocalTimerTransformer implements Transformer<TStripLocalTimerData> {
+    defaultValue: TStripLocalTimerData;
+    uuid: string;
+    constructor(uuid?: string, defaultValue?: TStripLocalTimerData);
+    equal(source: string, target: string): boolean;
+    parser(value: string): TStripLocalTimerData;
+    isUndefined(value: any): boolean;
+    to16(value: number, length?: number): string;
+    binTo16(bin: string, len?: number): string;
+    formatter(data: TStripLocalTimerData): string;
+}
+export declare const stripLocalTimerParser: StripLocalTimerTransformer;
+export declare const getStripLocalTimerParser: () => StripLocalTimerTransformer;