@ray-js/lamp-schedule-core 1.0.5-beta.7 → 1.0.5-beta.9

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/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/hooks/__test__/useBaseLightDp.test.js

@@ -1,5 +1,5 @@
 import { act, renderHook } from '@testing-library/react-hooks';
-import { useBaseLightDp, getDpDataByMesh, fetchDpData, useFetchDpDataByMesh, useFetchDpData } from '../useBaseLightDp';
+import { useBaseLightDp, getDpDataByMesh, fetchDpData, useFetchDpDataByMesh, useFetchDpData, __clearFetchDpDataThrottleCacheForTest } from '../useBaseLightDp';
 import { DP_CHANGE_EVENT_KEY } from '../../constant';
 import { devIdOrGroupIdCache } from '../../utils/ScheduleCache';
 import { getDpIdByDpCode } from '../../utils/ScheduleUtils';
@@ -184,6 +184,7 @@ describe('getDpDataByMesh', () => {
 });
 describe('fetchDpData', () => {
   beforeEach(() => {
+    __clearFetchDpDataThrottleCacheForTest();
     jest.clearAllMocks();
     devIdOrGroupIdCache.get.mockReturnValue({
       devId: 'device-1',
@@ -210,9 +211,15 @@ describe('fetchDpData', () => {
       dpIds: ['2']
     }));
   });
+  it('skips duplicate fetch for same dpCodes within throttle window', () => {
+    fetchDpData(['bright_value']);
+    fetchDpData(['bright_value']);
+    expect(queryDps).toHaveBeenCalledTimes(1);
+  });
 });
 describe('useFetch hooks', () => {
   beforeEach(() => {
+    __clearFetchDpDataThrottleCacheForTest();
     jest.clearAllMocks();
     getDpIdByDpCode.mockReturnValue(3);
     devIdOrGroupIdCache.get.mockReturnValue({
@@ -232,7 +239,8 @@ describe('useFetch hooks', () => {
     act(() => {
       result.current.refresh();
     });
-    expect(queryDps).toHaveBeenCalledTimes(2);
+    // 同一组 dpCodes 在 3s 内被节流，refresh 不会触发第二次请求
+    expect(queryDps).toHaveBeenCalledTimes(1);
   });
   it('useFetchDpDataByMesh skips when not sigmesh', () => {
     useSupport.mockReturnValue({

package/lib/hooks/__test__/useTimerDp.test.js

@@ -2,10 +2,12 @@ import "core-js/modules/es.json.stringify.js";
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useTimerDp } from '../useTimerDp';
 import { useBaseLightDp } from '../useBaseLightDp';
+import { useSupport } from '../useCommonSupport';
 import { scheduleDpCodes } from '../../config/dpCodes';
 import { rtcTimerParser } from '../../dpParser/rtcTimer';
 // Mock dependencies
 jest.mock('../useBaseLightDp');
+jest.mock('../useCommonSupport');
 jest.mock('../../dpParser/rtcTimer');
 describe('useTimerDp', () => {
   const mockTimerData = {
@@ -27,6 +29,9 @@ describe('useTimerDp', () => {
   };
   beforeEach(() => {
     jest.clearAllMocks();
+    useSupport.mockReturnValue({
+      isSupportDp: jest.fn(code => code === scheduleDpCodes.RTC_TIMER)
+    });
     useBaseLightDp.mockReturnValue({
       dpValue: mockTimerData,
       updateDp: jest.fn()
@@ -72,9 +77,4 @@ describe('useTimerDp', () => {
     renderHook(() => useTimerDp());
     expect(useBaseLightDp).toHaveBeenCalledWith(scheduleDpCodes.RTC_TIMER);
   });
-  it('should handle custom dpCode', () => {
-    const customDpCode = scheduleDpCodes.RTC_TIMER;
-    renderHook(() => useTimerDp(customDpCode));
-    expect(useBaseLightDp).toHaveBeenCalledWith(customDpCode);
-  });
 });

package/lib/hooks/useBaseLightDp.d.ts

@@ -10,6 +10,8 @@ type TDpRes<T> = {
 };
 export declare function useBaseLightDp<T>(dpCode: string, defaultDpValue?: T): TDpRes<T>;
 export declare const getDpDataByMesh: (dpCodes?: string[]) => void;
+/** 仅用于测试：清空 fetchDpData 节流缓存，避免用例间相互影响 */
+export declare const __clearFetchDpDataThrottleCacheForTest: () => void;
 export declare const fetchDpData: (dpCodes?: string[]) => Promise<void>;
 /**
  * 主动拉取 dp 数据, 仅支持 sigmesh 设备
@@ -21,7 +23,10 @@ export declare const useFetchDpDataByMesh: (dpCodes: string[]) => {
 };
 /**
  * 主动拉取 dp 数据, 不限制协议
- * @param dpCodes dpCode 数组
+ * 同一组 dpCodes 在 3s 内只会实际拉取一次（模块级节流）。
+ * @param dpCodes dpCode 数组，建议使用 useMemo 稳定引用，避免因引用变化导致 effect 重复执行，例如：
+ *   const dpCodes = useMemo(() => [scheduleDpCodes.SLEEP_MODE, scheduleDpCodes.WAKE_UP_MODE], []);
+ *   useFetchDpData(dpCodes, { initFetch: true, offsetTime: 0 });
  * @param options 拉取配置
  * @param options.initFetch 是否初始化拉取
  * @param options.offsetTime 延迟时间 ms

package/lib/hooks/useBaseLightDp.js

@@ -1,5 +1,6 @@
 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";
 import "core-js/modules/esnext.iterator.map.js";
 /* eslint-disable no-console */
 import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
@@ -140,8 +141,20 @@ export const getDpDataByMesh = function () {
   }
 };
 
+/** 模块级缓存：同一组 dpCodes 最近一次拉取时间，用于 3s 内去重 */
+const lastFetchTimeByKey = {};
+
+/** 相同 dpCodesKey 节流时间（毫秒） */
+const FETCH_DP_THROTTLE_MS = 3000;
+
+/** 仅用于测试：清空 fetchDpData 节流缓存，避免用例间相互影响 */
+export const __clearFetchDpDataThrottleCacheForTest = () => {
+  Object.keys(lastFetchTimeByKey).forEach(k => delete lastFetchTimeByKey[k]);
+};
+
 // 查询设备的 DP
 export const fetchDpData = function () {
+  var _lastFetchTimeByKey$k;
   let dpCodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   if (!Array.isArray(dpCodes)) {
     scheduleLogger.error('fetchDpData: 参数dpCodes必须是数组');
@@ -162,6 +175,16 @@ export const fetchDpData = function () {
     scheduleLogger.warn('fetchDpData', dpCodes, '未匹配到 dp');
     return;
   }
+
+  // 模块级节流：同一组 dpCodes 在 3s 内只拉取一次
+  const key = dpCodes.slice().sort().join(',');
+  const now = Date.now();
+  const lastFetch = (_lastFetchTimeByKey$k = lastFetchTimeByKey[key]) !== null && _lastFetchTimeByKey$k !== void 0 ? _lastFetchTimeByKey$k : 0;
+  if (now - lastFetch < FETCH_DP_THROTTLE_MS) {
+    scheduleLogger.debug('fetchDpData: 相同 dpCodes 在 3s 内已拉取过，已跳过', dpCodes);
+    return;
+  }
+  lastFetchTimeByKey[key] = now;
   scheduleLogger.debug('fetchDpData 查询DP转换后参数 dpIds:', dpIds);
   try {
     queryDps({
@@ -210,7 +233,10 @@ export const useFetchDpDataByMesh = dpCodes => {
 
 /**
  * 主动拉取 dp 数据, 不限制协议
- * @param dpCodes dpCode 数组
+ * 同一组 dpCodes 在 3s 内只会实际拉取一次（模块级节流）。
+ * @param dpCodes dpCode 数组，建议使用 useMemo 稳定引用，避免因引用变化导致 effect 重复执行，例如：
+ *   const dpCodes = useMemo(() => [scheduleDpCodes.SLEEP_MODE, scheduleDpCodes.WAKE_UP_MODE], []);
+ *   useFetchDpData(dpCodes, { initFetch: true, offsetTime: 0 });
  * @param options 拉取配置
  * @param options.initFetch 是否初始化拉取
  * @param options.offsetTime 延迟时间 ms
@@ -221,34 +247,25 @@ export const useFetchDpData = function (dpCodes) {
     initFetch: true,
     offsetTime: 0
   };
-  // 使用 useMemo 稳定 dpCodes 的字符串表示，避免因数组引用变化导致重复执行
-  // 注意：这里依赖 dpCodes 数组本身，但由于调用方已使用 useMemo 稳定引用，所以是安全的
   const dpCodesKey = useMemo(() => dpCodes.join(','), [dpCodes]);
   const getDpDataFn = useCallback(() => {
-    scheduleLogger.debug('useFetchDpData getDpDataFn get1:', dpCodes);
+    scheduleLogger.debug('useFetchDpData getDpDataFn get:', dpCodes);
     fetchDpData(dpCodes);
   }, [dpCodes]);
-
-  // 使用 useRef 跟踪上一次的 dpCodesKey，避免重复执行
-  const prevDpCodesKeyRef = useRef(null);
+  const getDpDataFnRef = useRef(getDpDataFn);
+  getDpDataFnRef.current = getDpDataFn;
   useEffect(() => {
     if (!options.initFetch) {
       return () => null;
     }
-    // 只有当 dpCodesKey 真正变化时才执行
-    if (prevDpCodesKeyRef.current === dpCodesKey) {
-      scheduleLogger.debug('useFetchDpData useEffect: dpCodesKey unchanged', dpCodesKey);
-      return () => null;
-    }
-    prevDpCodesKeyRef.current = dpCodesKey;
     const timer = setTimeout(() => {
-      scheduleLogger.debug('useFetchDpData useEffect get:', dpCodes);
-      getDpDataFn();
+      scheduleLogger.debug('useFetchDpData useEffect get:', dpCodesKey);
+      getDpDataFnRef.current();
     }, options.offsetTime || 0);
     return () => {
       clearTimeout(timer);
     };
-  }, [dpCodesKey, getDpDataFn, dpCodes, options.initFetch, options.offsetTime]);
+  }, [dpCodesKey, options.initFetch, options.offsetTime]);
   return {
     refresh: getDpDataFn
   };

package/lib/utils/ScheduleSupport.js

@@ -129,11 +129,11 @@ export class Support {
               // 群组中为空
               groupId && (devIdOrGroupIdCache === null || devIdOrGroupIdCache === void 0 ? void 0 : devIdOrGroupIdCache.set('', groupId));
               const dpMap = {};
-              scheduleLogger.debug(firstDevDps, hasDps, 'group and devInfo merge: firstDevDps ==== ');
-              scheduleLogger.debug(res, 'group and devInfo merge: resresres ==== ');
-              scheduleLogger.debug(groupRes, 'resresres groupRes ==== ');
-              scheduleLogger.debug(deviceInfoRes, 'resresres deviceInfoRes ==== ');
-              scheduleLogger.debug(filteredDeviceInfo, 'resresres filteredDeviceInfo ==== ');
+              scheduleLogger.debug('group and devInfo merge: firstDevDps ==== ', firstDevDps, hasDps);
+              scheduleLogger.debug('group and devInfo merge: resresres ==== ', res);
+              scheduleLogger.debug('resresres groupRes ==== ', groupRes);
+              scheduleLogger.debug('resresres deviceInfoRes ==== ', deviceInfoRes);
+              scheduleLogger.debug('resresres filteredDeviceInfo ==== ', filteredDeviceInfo);
               Object.keys(res.dps).forEach(dpId => {
                 const dpCode = getDpCodeByDpId(dpId);
                 dpCode && setDpState(dpCode, res.dps[dpId]);

package/lib/utils/__test__/ScheduleDataSync.test.d.ts

@@ -3,6 +3,7 @@ declare const mockNavigateTo: jest.Mock<any, any, any>;
 declare const mockUsePageInstance: jest.Mock<any, any, any>;
 declare const mockLogger: {
     debug: jest.Mock<any, any, any>;
+    info: jest.Mock<any, any, any>;
     error: jest.Mock<any, any, any>;
 };
 declare let navigateToSchedule: typeof import('../ScheduleDataSync').navigateToSchedule;

package/lib/utils/__test__/ScheduleDataSync.test.js

@@ -2,6 +2,7 @@ const mockNavigateTo = jest.fn();
 const mockUsePageInstance = jest.fn();
 const mockLogger = {
   debug: jest.fn(),
+  info: jest.fn(),
   error: jest.fn()
 };
 let navigateToSchedule;
@@ -21,6 +22,7 @@ describe('ScheduleDataSync utilities', () => {
     mockNavigateTo.mockReset();
     mockUsePageInstance.mockReset();
     mockLogger.debug.mockReset();
+    mockLogger.info.mockReset();
     mockLogger.error.mockReset();
     global.ty = {
       presetFunctionalData: jest.fn()

package/lib/utils/__test__/objectToId.test.d.ts

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

package/lib/utils/__test__/objectToId.test.js

@@ -0,0 +1,98 @@
+import { objectToId } from '../objectToId';
+describe('objectToId', () => {
+  it('相同内容、不同 key 顺序的对象应得到相同 id', () => {
+    expect(objectToId({
+      z: [1, 2, 3],
+      a: 2,
+      m: 3
+    })).toBe(objectToId({
+      m: 3,
+      z: [1, 2, 3],
+      a: 2
+    }));
+  });
+  it('不同内容的对象应得到不同 id', () => {
+    expect(objectToId({
+      a: 1
+    })).not.toBe(objectToId({
+      a: 2
+    }));
+    expect(objectToId({
+      a: 1
+    })).not.toBe(objectToId({
+      b: 1
+    }));
+    expect(objectToId({})).not.toBe(objectToId({
+      a: 1
+    }));
+  });
+  it('空对象应返回稳定的 id', () => {
+    const id = objectToId({});
+    expect(typeof id).toBe('string');
+    expect(id).toMatch(/^[a-z0-9]+$/);
+    expect(objectToId({})).toBe(objectToId({}));
+  });
+  it('带 prefix 时应在 id 前拼接 prefix', () => {
+    const id = objectToId({
+      x: 1
+    });
+    const withPrefix = objectToId({
+      x: 1
+    }, 'prefix_');
+    expect(withPrefix).toBe('prefix_' + id);
+    expect(objectToId({}, 'id-')).toMatch(/^id-[a-z0-9]+$/);
+  });
+  it('嵌套对象按 key 排序后一致则 id 相同', () => {
+    expect(objectToId({
+      outer: {
+        z: 1,
+        a: 2
+      }
+    })).toBe(objectToId({
+      outer: {
+        a: 2,
+        z: 1
+      }
+    }));
+  });
+  it('数组内容与顺序会影响 id', () => {
+    expect(objectToId([1, 2])).not.toBe(objectToId([2, 1]));
+    expect(objectToId([1, 2])).toBe(objectToId([1, 2]));
+  });
+  it('返回值应为非空字符串且为 36 进制形式', () => {
+    const id = objectToId({
+      foo: 'bar'
+    });
+    expect(id.length).toBeGreaterThan(0);
+    expect(id).toMatch(/^[a-z0-9]+$/);
+  });
+  it('对 null 输入应返回稳定 id', () => {
+    const id = objectToId(null);
+    expect(typeof id).toBe('string');
+    expect(objectToId(null)).toBe(id);
+  });
+  it('对原始类型输入应返回稳定 id', () => {
+    const numId = objectToId(42);
+    const strId = objectToId('hello');
+    expect(typeof numId).toBe('string');
+    expect(typeof strId).toBe('string');
+    expect(numId).not.toBe(strId);
+  });
+  it('深层嵌套对象 key 顺序不影响 id', () => {
+    expect(objectToId({
+      a: {
+        b: {
+          c: 1,
+          d: 2
+        }
+      }
+    })).toBe(objectToId({
+      a: {
+        b: {
+          d: 2,
+          c: 1
+        }
+      }
+    }));
+  });
+});

package/package.json

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