@ray-js/lamp-schedule-core 1.0.4-beta-15 → 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__/rhythms.test.js

@@ -71,7 +71,9 @@ describe('RhythmParser', () => {
       expect(result).toBe('');
     });
     it('should return empty string when support instance is missing', () => {
-      getSupportIns.mockReturnValueOnce(null);
+      // getSupportIns is called in both the dispatcher and the common formatter,
+      // so we need to mock it for all calls within this test
+      getSupportIns.mockReturnValue(null);
       const result = rhythmParser.formatter({
         version: 1,
         power: true,
@@ -91,9 +93,12 @@ describe('RhythmParser', () => {
       });
       expect(result).toBe('');
       expect(scheduleLogger.error).toHaveBeenCalledWith('协议解析 rhythms formatter =====', '数据为空');
+      // Restore default mock
+      getSupportIns.mockReturnValue(createSupport(true));
     });
     it('should force temperature to 100 when device does not support temperature DP', () => {
-      getSupportIns.mockReturnValueOnce(createSupport(false));
+      // getSupportIns is called in both the dispatcher and the common formatter
+      getSupportIns.mockReturnValue(createSupport(false));
       const result = rhythmParser.formatter({
         version: 0,
         power: true,

package/lib/dpParser/__test__/rhythmsSigmesh.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,263 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+jest.mock('@ray-js/panel-sdk/lib/utils', () => ({
+  generateDpStrStep: jest.fn(str => {
+    let index = 0;
+    return len => {
+      const segment = str.slice(index, index + len);
+      index += len;
+      return {
+        value: parseInt(segment, 16)
+      };
+    };
+  }),
+  numToHexString: jest.fn(num => num.toString(16).padStart(2, '0'))
+}));
+jest.mock('../../utils/ScheduleLogger', () => {
+  const logger = {
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    info: jest.fn()
+  };
+  return {
+    scheduleLogger: logger
+  };
+});
+jest.mock('../../hooks/useCommonSupport', () => ({
+  getSupportIns: jest.fn()
+}));
+jest.mock('../../utils/getDPByProtocol', () => ({
+  getDPByProtocol: jest.fn().mockReturnValue({
+    TEMPERATURE: 'temp_value'
+  })
+}));
+import { rhythmParserSigmesh, RhythmSigmesh } from '../rhythms/rhythmsSigmesh';
+const {
+  getSupportIns
+} = require('../../hooks/useCommonSupport');
+const createSupport = function () {
+  let isSupportTemp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  return {
+    isSigMeshDevice: jest.fn().mockReturnValue(true),
+    isSupportDp: jest.fn().mockImplementation(dp => {
+      if (dp === 'temp_value') {
+        return isSupportTemp;
+      }
+      return true;
+    })
+  };
+};
+
+/**
+ * 构建 sigmesh rhythms DP 字符串
+ * 格式: version(2) + power(2) + mode(2) + weeks(2) + paramMode(2) + number(2)
+ *       + nodes[valid(2) + hour(2) + minute(2) + brightness(2) + temperature(2)]
+ */
+const buildDpStr = function (nodes) {
+  let version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  let power = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  let mode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  let weeks = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0x7f;
+  let paramMode = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  const header = [version, power, mode, weeks, paramMode, nodes.length].map(v => v.toString(16).padStart(2, '0')).join('');
+  const body = nodes.map(node => [node.valid, node.hour, node.minute, node.brightness, node.temperature].map(v => v.toString(16).padStart(2, '0')).join('')).join('');
+  return `${header}${body}`;
+};
+describe('RhythmSigmesh parser & formatter', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    getSupportIns.mockReturnValue(createSupport(true));
+  });
+  describe('parser', () => {
+    it('returns default value when dp string is empty', () => {
+      const result = rhythmParserSigmesh.parser('');
+      expect(result).toEqual(new RhythmSigmesh().defaultValue);
+    });
+    it('returns default value when dp string length is invalid', () => {
+      // Too short
+      const result = rhythmParserSigmesh.parser('010100');
+      expect(result).toEqual(new RhythmSigmesh().defaultValue);
+    });
+    it('returns default value when node data is not aligned', () => {
+      // Header (12 chars) + partial node data (not multiple of 10)
+      // 14 chars header + 2 chars body (not 10)
+      const result = rhythmParserSigmesh.parser('01010000007f0104' + '01');
+      expect(result).toEqual(new RhythmSigmesh().defaultValue);
+    });
+    it('parses valid dp string with 4 nodes', () => {
+      const dpStr = buildDpStr([{
+        valid: 1,
+        hour: 6,
+        minute: 30,
+        brightness: 100,
+        temperature: 50
+      }, {
+        valid: 1,
+        hour: 11,
+        minute: 30,
+        brightness: 100,
+        temperature: 100
+      }, {
+        valid: 1,
+        hour: 17,
+        minute: 0,
+        brightness: 70,
+        temperature: 50
+      }, {
+        valid: 1,
+        hour: 20,
+        minute: 30,
+        brightness: 70,
+        temperature: 50
+      }]);
+      const result = rhythmParserSigmesh.parser(dpStr);
+      expect(result.version).toBe(1);
+      expect(result.power).toBe(true);
+      expect(result.mode).toBe(0);
+      expect(result.paramMode).toBe(1);
+      expect(result.number).toBe(4);
+      expect(result.rhythms).toHaveLength(4);
+      expect(result.rhythms[0]).toMatchObject({
+        power: true,
+        hour: 6,
+        minute: 30,
+        brightness: 100,
+        temperature: 50
+      });
+      expect(result.rhythms[3]).toMatchObject({
+        power: true,
+        hour: 20,
+        minute: 30,
+        brightness: 70,
+        temperature: 50
+      });
+    });
+    it('parses power=false correctly', () => {
+      const dpStr = buildDpStr([{
+        valid: 0,
+        hour: 8,
+        minute: 0,
+        brightness: 50,
+        temperature: 30
+      }], 1, 0);
+      const result = rhythmParserSigmesh.parser(dpStr);
+      expect(result.power).toBe(false);
+      expect(result.rhythms[0].power).toBe(false);
+    });
+  });
+  describe('formatter', () => {
+    it('returns empty string when data is null', () => {
+      const result = rhythmParserSigmesh.formatter(null);
+      expect(result).toBe('');
+    });
+    it('returns empty string when support is null', () => {
+      getSupportIns.mockReturnValueOnce(null);
+      const result = rhythmParserSigmesh.formatter({
+        version: 1,
+        power: true,
+        mode: 0,
+        weeks: [1, 1, 1, 1, 1, 1, 1, 0],
+        paramMode: 1,
+        number: 1,
+        rhythms: [{
+          power: true,
+          hour: 6,
+          minute: 30,
+          brightness: 100,
+          temperature: 50
+        }]
+      });
+      expect(result).toBe('');
+    });
+    it('formats valid data to dp string', () => {
+      const result = rhythmParserSigmesh.formatter({
+        version: 1,
+        power: true,
+        mode: 0,
+        weeks: [1, 1, 1, 1, 1, 1, 1, 0],
+        paramMode: 1,
+        number: 2,
+        rhythms: [{
+          power: true,
+          hour: 6,
+          minute: 30,
+          brightness: 100,
+          temperature: 50
+        }, {
+          power: false,
+          hour: 20,
+          minute: 0,
+          brightness: 70,
+          temperature: 30
+        }]
+      });
+      const expected = buildDpStr([{
+        valid: 1,
+        hour: 6,
+        minute: 30,
+        brightness: 100,
+        temperature: 50
+      }, {
+        valid: 0,
+        hour: 20,
+        minute: 0,
+        brightness: 70,
+        temperature: 30
+      }], 1, 1, 0, 0x7f, 1);
+      expect(result).toBe(expected);
+    });
+    it('forces temperature to 100 when device does not support temperature DP', () => {
+      getSupportIns.mockReturnValueOnce(createSupport(false));
+      const result = rhythmParserSigmesh.formatter({
+        version: 1,
+        power: true,
+        mode: 0,
+        weeks: [1, 1, 1, 1, 1, 1, 1, 0],
+        paramMode: 1,
+        number: 1,
+        rhythms: [{
+          power: true,
+          hour: 6,
+          minute: 0,
+          brightness: 50,
+          temperature: 30
+        }]
+      });
+      // temperature should be 100 (0x64), not 30 (0x1e)
+      expect(result.slice(-2)).toBe('64');
+    });
+  });
+  describe('round-trip', () => {
+    it('round-trips dp string through parser and formatter', () => {
+      const dpStr = buildDpStr([{
+        valid: 1,
+        hour: 6,
+        minute: 30,
+        brightness: 100,
+        temperature: 50
+      }, {
+        valid: 1,
+        hour: 11,
+        minute: 30,
+        brightness: 100,
+        temperature: 100
+      }, {
+        valid: 1,
+        hour: 17,
+        minute: 0,
+        brightness: 70,
+        temperature: 50
+      }, {
+        valid: 1,
+        hour: 20,
+        minute: 30,
+        brightness: 70,
+        temperature: 50
+      }]);
+      const parsed = rhythmParserSigmesh.parser(dpStr);
+      const formatted = rhythmParserSigmesh.formatter(parsed);
+      expect(formatted).toBe(dpStr);
+    });
+  });
+});

package/lib/dpParser/__test__/sleepSigmesh.test.d.ts

@@ -0,0 +1 @@
+export {};