@pisell/pisellos 0.0.568 → 0.0.570

package/lib/server/modules/schedule/index.js

@@ -15,9 +15,9 @@ _dayjs.default.extend(_isSameOrBefore.default);
 _dayjs.default.extend(_isSameOrAfter.default);
 
 /**
- * IndexDB 存储名称
+ * SQLite 存储名称
  */
-const INDEXDB_STORE_NAME = 'schedule';
+const SCHEDULE_STORE_NAME = 'schedule';
 
 /**
  * Schedule 模块（扩展版本）
@@ -28,9 +28,9 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
   defaultVersion = '1.1.0';
   request;
   store = {};
-  dbManager; // IndexDBManager 实例
+  dbManager; // SQLiteAdapter 实例
   logger; // LoggerManager 实例
-
+  hasLoadedScheduleList = false;
   constructor(name, version) {
     super(name, version);
   }
@@ -104,19 +104,21 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
       this.store.scheduleList = options.initialState.scheduleList;
       // 同步更新 Map 缓存
       this.syncScheduleMap();
+      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
     } else {
       this.store.scheduleList = [];
       this.store.map = new Map();
+      this.hasLoadedScheduleList = false;
     }
 
-    // 获取并存储 dbManager 和 logger
+    // 获取并存储 SQLite 和 logger
     const appPlugin = core.getPlugin('app');
     if (appPlugin) {
       const app = appPlugin.getApp();
-      this.dbManager = app.dbManager;
+      this.dbManager = app.sqlite;
       this.logger = app.logger;
       if (this.dbManager) {} else {
-        console.warn('[Schedule] IndexDB Manager 未找到');
+        console.warn('[Schedule] SQLite 未找到');
       }
     }
     this.logInfo('模块初始化完成', {
@@ -145,8 +147,8 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
         duration: `${duration}ms`
       });
 
-      // 保存到 IndexDB
-      await this.saveScheduleToIndexDB(list);
+      // 保存到 SQLite
+      await this.saveScheduleToSQLite(list);
       this.setScheduleList(list);
       return list;
     } catch (error) {
@@ -161,6 +163,7 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
+    this.hasLoadedScheduleList = true;
     // 同步更新 Map 缓存
     this.syncScheduleMap();
   }
@@ -171,6 +174,9 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
   getScheduleList() {
     return this.store.scheduleList;
   }
+  isScheduleListLoaded() {
+    return this.hasLoadedScheduleList;
+  }
 
   /**
    * 根据 schedule IDs 获取日程数据
@@ -184,8 +190,9 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
       return [];
     }
     const result = [];
+    const scheduleList = this.store.scheduleList || [];
     for (const id of ids) {
-      const schedule = this.store.map.get(id);
+      const schedule = this.store.map.get(id) || scheduleList.find(item => String(item.id) === String(id));
       if (schedule) {
         result.push(schedule);
       }
@@ -219,15 +226,15 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
     });
     this.store.scheduleList = [];
     this.store.map.clear();
-    // 同时清空 IndexDB 中的数据
+    // 同时清空 SQLite 中的数据
     if (this.dbManager) {
       try {
-        await this.dbManager.clear(INDEXDB_STORE_NAME);
-        this.logInfo('IndexDB 缓存已清空');
+        await this.dbManager.clear(SCHEDULE_STORE_NAME);
+        this.logInfo('SQLite 缓存已清空');
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error('[Schedule] 清空 IndexDB 缓存失败:', error);
-        this.logError('清空 IndexDB 缓存失败', {
+        console.error('[Schedule] 清空 SQLite 缓存失败:', error);
+        this.logError('清空 SQLite 缓存失败', {
           error: errorMessage
         });
       }
@@ -260,25 +267,25 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
   }
 
   /**
-   * 从 IndexDB 加载日程数据
+   * 从 SQLite 加载日程数据
    * @private
    */
-  async loadScheduleFromIndexDB() {
+  async loadScheduleFromSQLite() {
     if (!this.dbManager) {
-      this.logWarning('loadScheduleFromIndexDB: dbManager 不可用');
+      this.logWarning('loadScheduleFromSQLite: SQLite 不可用');
       return [];
     }
     try {
       // 直接获取所有日程记录
-      const scheduleList = await this.dbManager.getAll(INDEXDB_STORE_NAME);
-      this.logInfo('从 IndexDB 加载日程数据', {
+      const scheduleList = await this.dbManager.getAll(SCHEDULE_STORE_NAME);
+      this.logInfo('从 SQLite 加载日程数据', {
         scheduleCount: scheduleList?.length ?? 0
       });
       return scheduleList || [];
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error('[Schedule] 从 IndexDB 读取数据失败:', error);
-      this.logError('从 IndexDB 读取数据失败', {
+      console.error('[Schedule] 从 SQLite 读取数据失败:', error);
+      this.logError('从 SQLite 读取数据失败', {
         error: errorMessage
       });
       return [];
@@ -286,31 +293,36 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
   }
 
   /**
-   * 保存日程数据到 IndexDB
+   * 保存日程数据到 SQLite
    * @private
    */
-  async saveScheduleToIndexDB(scheduleList) {
+  async saveScheduleToSQLite(scheduleList) {
     if (!this.dbManager) {
-      this.logWarning('saveScheduleToIndexDB: dbManager 不可用');
+      this.logWarning('saveScheduleToSQLite: SQLite 不可用');
       return;
     }
-    this.logInfo('开始保存日程数据到 IndexDB', {
+    this.logInfo('开始保存日程数据到 SQLite', {
       scheduleCount: scheduleList.length
     });
     try {
       // 先清空现有的日程数据
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-
-      // 逐个保存日程（每个日程是独立的记录）
-      const savePromises = scheduleList.map(schedule => this.dbManager.add(INDEXDB_STORE_NAME, schedule));
-      await Promise.all(savePromises);
-      this.logInfo('日程数据已保存到 IndexDB', {
+      await this.dbManager.clear(SCHEDULE_STORE_NAME);
+      if (scheduleList.length > 0) {
+        if (typeof this.dbManager.bulkAdd === 'function') {
+          await this.dbManager.bulkAdd(SCHEDULE_STORE_NAME, scheduleList);
+        } else if (typeof this.dbManager.bulkUpdate === 'function') {
+          await this.dbManager.bulkUpdate(SCHEDULE_STORE_NAME, scheduleList);
+        } else {
+          await Promise.all(scheduleList.map(schedule => this.dbManager.add(SCHEDULE_STORE_NAME, schedule)));
+        }
+      }
+      this.logInfo('日程数据已保存到 SQLite', {
         scheduleCount: scheduleList.length
       });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error('[Schedule] 保存数据到 IndexDB 失败:', error);
-      this.logError('保存数据到 IndexDB 失败', {
+      console.error('[Schedule] 保存数据到 SQLite 失败:', error);
+      this.logError('保存数据到 SQLite 失败', {
         scheduleCount: scheduleList.length,
         error: errorMessage
       });
@@ -325,36 +337,35 @@ class ScheduleModuleEx extends _BaseModule.BaseModule {
     const startTime = Date.now();
     this.logInfo('开始预加载数据');
     try {
-      // 1. 尝试从 IndexDB 加载数据
-      const cachedData = await this.loadScheduleFromIndexDB();
+      // 1. 尝试从 SQLite 加载数据
+      const cachedData = await this.loadScheduleFromSQLite();
       if (cachedData && cachedData.length > 0) {
         // 将缓存数据放入 store
         this.store.scheduleList = (0, _lodashEs.cloneDeep)(cachedData);
         // 同步更新 Map 缓存
         this.syncScheduleMap();
         const duration = Date.now() - startTime;
-        this.logInfo('预加载完成（从 IndexDB）', {
+        this.logInfo('预加载完成（从 SQLite）', {
           scheduleCount: cachedData.length,
           duration: `${duration}ms`,
-          source: 'IndexDB'
+          source: 'SQLite'
         });
         return;
       }
-      this.logInfo('IndexDB 中没有缓存数据，准备从服务器加载');
+      this.logInfo('SQLite 中没有缓存数据，准备从服务器加载');
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.warn('[Schedule] 从 IndexDB 加载数据失败:', error);
-      this.logWarning('从 IndexDB 加载数据失败，准备从服务器加载', {
+      console.warn('[Schedule] 从 SQLite 加载数据失败:', error);
+      this.logWarning('从 SQLite 加载数据失败，准备从服务器加载', {
         error: errorMessage
       });
     }
 
-    // 2. 如果 IndexDB 中没有数据，从服务器加载
+    // 2. 如果 SQLite 中没有数据，从服务器加载
     const scheduleList = await this.loadAllSchedule();
 
-    // 3. 将服务器数据保存到 IndexDB 和 store
+    // 3. 将服务器数据放入 store
     if (scheduleList && scheduleList.length > 0) {
-      await this.saveScheduleToIndexDB(scheduleList);
       this.store.scheduleList = (0, _lodashEs.cloneDeep)(scheduleList);
       // 同步更新 Map 缓存
       this.syncScheduleMap();

package/lib/server/modules/schedule/utils.d.ts

@@ -1,7 +1,7 @@
 import dayjs from "dayjs";
 import { ScheduleItem } from "../../../modules/Schedule/types";
 export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
-export type ScheduleTimeSlot = {
+export declare type ScheduleTimeSlot = {
     /** 开始时间 HH:mm */
     start_time: string;
     /** 结束时间 HH:mm */