@pisell/pisellos 2.2.93 → 2.2.94

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

@@ -177,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         duration: `${duration}ms`,
         error: errorMessage
       });
-      return [];
+      throw error;
     }
   }
   /**
@@ -186,70 +186,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * 缓存的是已经应用了价格的完整商品列表，避免重复转换
    * @param schedule_date 日期
    * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
-   * @param options 可选参数
-   * @param options.changedIds 变更的商品 IDs，非空时仅对这些商品增量执行 prepare 并更新缓存
    * @returns 应用了价格的商品列表
    */
-  async getProductsWithPrice(schedule_date, extraContext, options) {
+  async getProductsWithPrice(schedule_date, extraContext) {
     const t0 = performance.now();
     const cacheKey = schedule_date;
-    const changedIds = options == null ? void 0 : options.changedIds;
     if (this.productsPriceCache.has(cacheKey)) {
       const cachedProducts = this.productsPriceCache.get(cacheKey);
-      if (changedIds && changedIds.length > 0) {
-        this.logInfo("商品价格缓存命中，增量更新变更商品", {
-          cacheKey,
-          changedIds,
-          cachedProductCount: cachedProducts.length
-        });
-        try {
-          const updatedProducts = await this.prepareProductsWithPrice(
-            schedule_date,
-            extraContext,
-            { productIds: changedIds }
-          );
-          if (updatedProducts.length > 0) {
-            const updatedMap = new Map(updatedProducts.map((p) => [p.id, p]));
-            const mergedCache = [];
-            for (const p of cachedProducts) {
-              if (updatedMap.has(p.id)) {
-                mergedCache.push(updatedMap.get(p.id));
-                updatedMap.delete(p.id);
-              } else {
-                mergedCache.push(p);
-              }
-            }
-            for (const p of updatedMap.values()) {
-              mergedCache.push(p);
-            }
-            this.productsPriceCache.set(cacheKey, mergedCache);
-            this.logInfo("增量更新完成", {
-              cacheKey,
-              changedCount: updatedProducts.length,
-              totalCount: mergedCache.length
-            });
-            (0, import_product.perfMark)("getProductsWithPrice(incrementalUpdate)", performance.now() - t0, {
-              cacheKey,
-              changedCount: changedIds.length,
-              count: mergedCache.length
-            });
-            return mergedCache;
-          }
-        } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
-          this.logError("增量更新失败，返回现有缓存", {
-            cacheKey,
-            changedIds,
-            error: errorMessage
-          });
-        }
-        (0, import_product.perfMark)("getProductsWithPrice(incrementalUpdate)", performance.now() - t0, {
-          cacheKey,
-          changedCount: changedIds.length,
-          count: cachedProducts.length
-        });
-        return cachedProducts;
-      }
       (0, import_product.perfMark)("getProductsWithPrice(cacheHit)", performance.now() - t0, {
         cacheKey,
         count: cachedProducts.length
@@ -278,38 +221,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * 准备带价格的商品数据（通过格式化器流程处理）
    * @param schedule_date 日期
    * @param extraContext 额外的上下文数据（可选）
-   * @param options 可选参数
-   * @param options.productIds 指定商品 IDs，仅处理这些商品；不传则处理全量
-   * @returns 处理后的商品列表
+   * @returns 完整处理后的商品列表
    * @private
    */
-  async prepareProductsWithPrice(schedule_date, extraContext, options) {
-    var _a, _b;
+  async prepareProductsWithPrice(schedule_date, extraContext) {
     const tTotal = performance.now();
-    const targetIds = options == null ? void 0 : options.productIds;
-    const isIncremental = targetIds && targetIds.length > 0;
-    this.logInfo("prepareProductsWithPrice 开始处理", {
-      schedule_date,
-      mode: isIncremental ? "incremental" : "full",
-      targetIdsCount: targetIds == null ? void 0 : targetIds.length
-    });
+    this.logInfo("prepareProductsWithPrice 开始处理", { schedule_date });
     try {
-      let products;
-      let ids;
-      if (isIncremental) {
-        const idSet = new Set(targetIds);
-        products = this.getProductsRef().filter((p) => idSet.has(p.id));
-        ids = products.map((p) => p.id);
-      } else {
-        products = this.getProductsRef();
-        const tIds = performance.now();
-        ids = new Array(products.length);
-        for (let i = 0; i < products.length; i++) {
-          ids[i] = products[i].id;
-        }
-        (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
+      const allProducts = this.getProductsRef();
+      this.logInfo("获取到商品列表", { productCount: allProducts.length });
+      const tIds = performance.now();
+      const ids = new Array(allProducts.length);
+      for (let i = 0; i < allProducts.length; i++) {
+        ids[i] = allProducts[i].id;
       }
-      this.logInfo("获取到商品列表", { productCount: products.length });
+      (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
       const tPrice = performance.now();
       const priceData = await this.loadProductsPrice({
         ids,
@@ -320,31 +246,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       const context = {
         schedule_date,
         priceData,
-        locale: (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.locale,
         ...extraContext
       };
       const tFormat = performance.now();
-      const processedProducts = await this.applyFormatters(products, context);
+      const processedProducts = await this.applyFormatters(allProducts, context);
       (0, import_product.perfMark)("prepareProducts.applyFormatters", performance.now() - tFormat, {
-        count: products.length,
+        count: allProducts.length,
         formatterCount: this.formatters.length
       });
       this.logInfo("prepareProductsWithPrice 处理完成", {
-        mode: isIncremental ? "incremental" : "full",
-        originalProductCount: products.length,
+        originalProductCount: allProducts.length,
         processedProductCount: processedProducts.length,
         formatterCount: this.formatters.length
       });
-      if (!isIncremental) {
-        await this.core.effects.emit(
-          import_types.ProductsHooks.onProductsPriceApplied,
-          processedProducts
-        );
-      }
+      await this.core.effects.emit(
+        import_types.ProductsHooks.onProductsPriceApplied,
+        processedProducts
+      );
       (0, import_product.perfMark)("prepareProductsWithPrice", performance.now() - tTotal, {
-        productCount: products.length,
-        formatterCount: this.formatters.length,
-        mode: isIncremental ? "incremental" : "full"
+        productCount: allProducts.length,
+        formatterCount: this.formatters.length
       });
       return processedProducts;
     } catch (err) {
@@ -419,14 +340,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       console.log(`[ProductsModule] 💰 应用价格数据到 ${products.length} 个商品`);
       return (0, import_product.applyPriceDataToProducts)(products, context.priceData);
     };
-    const i18nFormatter = (products, context) => {
-      return (0, import_product.applyI18nToProducts)(products, context.locale);
-    };
     const detailValueFormatter = (products, context) => {
       return (0, import_product.applyDetailValueToProducts)(products, context);
     };
     this.formatters.unshift(priceFormatter);
-    this.formatters.push(i18nFormatter);
     this.formatters.push(detailValueFormatter);
     this.isPriceFormatterRegistered = true;
     console.log("[ProductsModule] ✅ 内置价格格式化器已注册（第 1 个）");
@@ -687,6 +604,29 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     (0, import_product.perfMark)("refreshProducts", performance.now() - tTotal, { count: this.store.list.length });
     return this.store.list;
   }
+  /**
+   * 局部更新指定商品的报价单价格
+   * 遍历所有已缓存的日期，为目标商品重新获取价格并覆盖到缓存中
+   */
+  async updateProductPriceByIds(ids) {
+    this.logInfo("updateProductPriceByIds", { ids });
+    for (const [dateKey, cachedProducts] of this.productsPriceCache.entries()) {
+      try {
+        const priceData = await this.loadProductsPrice({
+          ids,
+          schedule_date: dateKey
+        });
+        if (priceData && priceData.length > 0) {
+          const updatedProducts = (0, import_product.applyPriceDataToProducts)(cachedProducts, priceData);
+          this.productsPriceCache.set(dateKey, updatedProducts);
+          this.logInfo("updateProductPriceByIds: 缓存已更新", { dateKey, priceDataCount: priceData.length });
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("updateProductPriceByIds: 失败", { dateKey, ids, error: errorMessage });
+      }
+    }
+  }
   /**
    * 清空缓存
    */
@@ -748,7 +688,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     try {
       const t0 = performance.now();
       await this.dbManager.clear(INDEXDB_STORE_NAME);
-      await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+      await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, products);
       (0, import_product.perfMark)("saveProductsToIndexDB", performance.now() - t0, { count: products.length });
       console.log(
         `[Products] 已将 ${products.length} 个商品平铺保存到 IndexDB`
@@ -913,21 +853,18 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    *
    * product 模块：
    *   - operation === 'delete' → 本地删除
-   *   - change_types 包含 price → 仅收集变更 IDs（不拉商品数据）
-   *   - 有 body → body 完整数据直接覆盖本地
-   *   - 其他 → SSE 增量拉取
+   *   - 有 body（无 price change_types） → body 完整数据直接覆盖本地
+   *   - change_types 包含 price → SSE 增量拉取 + 刷新报价单价格缓存
+   *   - change_types 仅 stock → 跳过（暂不响应）
    *
-   * product_collection / product_category：
+   * product_collection / product_category / product_quotation：
    *   - 按 relation_product_ids SSE 拉取受影响商品
+   *   - product_quotation 额外刷新报价单价格缓存
    *
-   * product_quotation：
-   *   - 报价单变更影响范围大，直接清除价格缓存走全量重建
-   *
-   * 处理完成后 emit onProductsSyncCompleted（携带 changedIds），
-   * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
+   * 处理完成后 emit onProductsSyncCompleted 通知 Server 层
    */
   async processProductSyncMessages() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const messages = [...this.pendingSyncMessages];
     this.pendingSyncMessages = [];
     if (messages.length === 0)
@@ -937,28 +874,24 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const bodyUpdates = /* @__PURE__ */ new Map();
     const sseRefreshIds = [];
     const priceRefreshIds = [];
-    let shouldClearPriceCache = false;
     for (const msg of messages) {
       const channelKey = msg._channelKey || msg.module || "product";
       if (channelKey === "product") {
-        if ((_a = msg.relation_product_ids) == null ? void 0 : _a.length) {
-          sseRefreshIds.push(...msg.relation_product_ids);
-        }
         if (msg.operation === "delete" || msg.action === "delete") {
-          if ((_b = msg.ids) == null ? void 0 : _b.length)
+          if ((_a = msg.ids) == null ? void 0 : _a.length)
             deleteIds.push(...msg.ids);
           else if (msg.id)
             deleteIds.push(msg.id);
           continue;
         }
+        if (((_b = msg.change_types) == null ? void 0 : _b.length) && msg.change_types.every((t) => t === "stock")) {
+          this.logInfo("跳过仅库存变更", { ids: msg.ids });
+          continue;
+        }
         if ((_c = msg.change_types) == null ? void 0 : _c.includes("price")) {
           const ids = msg.ids || (msg.id ? [msg.id] : []);
+          sseRefreshIds.push(...ids);
           priceRefreshIds.push(...ids);
-          if (msg.body) {
-            const bodyId = msg.body.id;
-            if (bodyId)
-              bodyUpdates.set(bodyId, msg.body);
-          }
           continue;
         }
         if (msg.body) {
@@ -972,14 +905,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         } else if (msg.id) {
           sseRefreshIds.push(msg.id);
         }
-      } else if (channelKey === "product_quotation") {
-        shouldClearPriceCache = true;
+      } else if (["product_collection", "product_category", "product_quotation"].includes(channelKey)) {
         if ((_e = msg.relation_product_ids) == null ? void 0 : _e.length) {
           sseRefreshIds.push(...msg.relation_product_ids);
-        }
-      } else if (["product_collection", "product_category"].includes(channelKey)) {
-        if ((_f = msg.relation_product_ids) == null ? void 0 : _f.length) {
-          sseRefreshIds.push(...msg.relation_product_ids);
+          if (channelKey === "product_quotation") {
+            this.clearPriceCache();
+            priceRefreshIds.push(...msg.relation_product_ids);
+          }
         }
       }
     }
@@ -996,36 +928,29 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       const freshProducts = await this.fetchProductsBySSE(uniqueSSEIds);
       if (freshProducts.length > 0) {
         await this.mergeProductsToStore(freshProducts);
+        await this.updatePriceCacheForProducts(freshProducts);
       }
-      this.logInfo("processProductSyncMessages: SSE 增量更新完成123", {
+      this.logInfo("processProductSyncMessages: SSE 增量更新完成", {
         requestedCount: uniqueSSEIds.length,
         receivedCount: freshProducts.length
       });
     }
-    const allChangedIds = [.../* @__PURE__ */ new Set([
-      ...Array.from(bodyUpdates.keys()),
-      ...uniqueSSEIds,
-      ...uniquePriceIds
-    ])];
-    this.logInfo("processProductSyncMessages: 处理完成123", {
+    const sseHandledSet = new Set(uniqueSSEIds);
+    const remainingPriceIds = uniquePriceIds.filter((id) => !sseHandledSet.has(id));
+    if (remainingPriceIds.length > 0) {
+      await this.updateProductPriceByIds(remainingPriceIds);
+    }
+    this.logInfo("processProductSyncMessages: 处理完成", {
       deleteCount: uniqueDeleteIds.length,
       bodyUpdateCount: bodyUpdates.size,
       sseRefreshCount: uniqueSSEIds.length,
-      priceRefreshCount: uniquePriceIds.length,
-      allChangedIdsCount: allChangedIds.length,
-      shouldClearPriceCache
+      priceRefreshCount: uniquePriceIds.length
     });
-    const hasChanges = uniqueDeleteIds.length > 0 || allChangedIds.length > 0 || shouldClearPriceCache;
-    if (!hasChanges) {
+    if (uniqueDeleteIds.length === 0 && bodyUpdates.size === 0 && uniqueSSEIds.length === 0 && uniquePriceIds.length === 0) {
       this.logInfo("processProductSyncMessages: 没有变更，不触发 onProductsSyncCompleted");
       return;
     }
-    if (shouldClearPriceCache) {
-      this.clearPriceCache();
-    }
-    await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, {
-      changedIds: allChangedIds
-    });
+    await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, null);
   }
   /**
    * 通过 SSE 按 ids 增量拉取商品数据
@@ -1059,8 +984,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   /**
    * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
    * 已存在的 → 直接替换；不存在的 → 追加
-   * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
-   * 价格缓存由 processProductSyncMessages 末尾统一清除
+   * 同时更新 Map 缓存、IndexDB，清空价格缓存，触发 onProductsChanged
    */
   async applyBodyUpdatesToStore(bodyUpdates) {
     this.logInfo("applyBodyUpdatesToStore: 开始", { count: bodyUpdates.size });
@@ -1083,6 +1007,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.syncProductsMap();
     await this.saveProductsToIndexDB(this.store.list);
+    await this.updatePriceCacheForProducts([...bodyUpdates.values()]);
     this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
     this.logInfo("applyBodyUpdatesToStore: 完成", {
       updatedCount,
@@ -1123,6 +1048,80 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     });
     this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
   }
+  /**
+   * 增量更新价格缓存中变更的商品
+   * 对每个已缓存的日期 key：替换/追加最新商品数据，重新拉取这些 ID 的价格并应用
+   */
+  async updatePriceCacheForProducts(freshProducts) {
+    if (this.productsPriceCache.size === 0)
+      return;
+    const freshIds = freshProducts.map((p) => p.id);
+    const freshMap = /* @__PURE__ */ new Map();
+    for (const p of freshProducts) {
+      freshMap.set(p.id, p);
+    }
+    this.logInfo("updatePriceCacheForProducts: 开始", {
+      freshIds,
+      cachedDateCount: this.productsPriceCache.size
+    });
+    for (const [dateKey, cachedProducts] of this.productsPriceCache.entries()) {
+      try {
+        const updatedList = cachedProducts.map((p) => {
+          const fresh = freshMap.get(p.id);
+          return fresh ? { ...fresh } : p;
+        });
+        const existingIds = new Set(cachedProducts.map((p) => p.id));
+        for (const p of freshProducts) {
+          if (!existingIds.has(p.id)) {
+            updatedList.push({ ...p });
+          }
+        }
+        const priceData = await this.loadProductsPrice({
+          ids: freshIds,
+          schedule_date: dateKey
+        });
+        const result = priceData && priceData.length > 0 ? (0, import_product.applyPriceDataToProducts)(updatedList, priceData) : updatedList;
+        this.productsPriceCache.set(dateKey, result);
+        this.logInfo("updatePriceCacheForProducts: 日期缓存已更新", {
+          dateKey,
+          updatedIds: freshIds
+        });
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("updatePriceCacheForProducts: 失败", { dateKey, error: errorMessage });
+      }
+    }
+  }
+  /**
+   * 全量重新拉取报价单价格并重建价格缓存
+   * 遍历当前已缓存的所有日期 key，对每个日期重新调用 loadProductsPrice
+   */
+  async refreshAllPriceCache() {
+    const allProducts = this.getProductsRef();
+    if (allProducts.length === 0)
+      return;
+    const ids = allProducts.map((p) => p.id);
+    const dateKeys = Array.from(this.productsPriceCache.keys());
+    this.clearPriceCache();
+    if (dateKeys.length === 0) {
+      this.logInfo("refreshAllPriceCache: 无已缓存日期，跳过");
+      return;
+    }
+    this.logInfo("refreshAllPriceCache: 开始重新拉取", { dateKeys, productCount: ids.length });
+    for (const dateKey of dateKeys) {
+      try {
+        const priceData = await this.loadProductsPrice({ ids, schedule_date: dateKey });
+        if (priceData && priceData.length > 0) {
+          const updatedProducts = (0, import_product.applyPriceDataToProducts)(allProducts, priceData);
+          this.productsPriceCache.set(dateKey, updatedProducts);
+        }
+        this.logInfo("refreshAllPriceCache: 日期缓存已更新", { dateKey });
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("refreshAllPriceCache: 失败", { dateKey, error: errorMessage });
+      }
+    }
+  }
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 数据并更新本地
    * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted

package/lib/server/modules/products/types.d.ts

@@ -109,7 +109,6 @@ export interface ProductFormatterContext {
     schedule_date: string;
     priceData?: LoadProductsPriceData[];
     scheduleModule?: any;
-    locale?: string;
 }
 /**
  * 商品格式化器类型

package/lib/server/modules/resource/index.d.ts

@@ -0,0 +1,88 @@
+import { Module, ModuleOptions, PisellCore } from '../../../types';
+import { BaseModule } from '../../../modules/BaseModule';
+import { type ResourceBooking, type ResourceData, type ResourceId, type QueryOptions } from './types';
+/**
+ * Resource 模块
+ */
+export declare class ResourceModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private dbManager;
+    private logger;
+    private resourceDataSource;
+    /** 倒排索引: resourceId -> ResourceBooking[] */
+    private resourceIdIndex;
+    /** 待处理的同步消息队列 */
+    private pendingSyncMessages;
+    private syncTimer?;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private logInfo;
+    private logError;
+    preload(): Promise<void>;
+    getRoutes(): never[];
+    destroy(): void;
+    /**
+     * 获取所有资源（支持 includeBookings 附加预订信息）
+     */
+    getResources(queryOptions?: QueryOptions): ResourceData[];
+    /**
+     * 根据 ID 获取单个资源
+     */
+    getResourceById(id: ResourceId, queryOptions?: QueryOptions): ResourceData | undefined;
+    /**
+     * 创建资源
+     */
+    createResource(data: Partial<ResourceData>): ResourceData;
+    /**
+     * 更新资源
+     */
+    updateResource(id: ResourceId, data: Partial<ResourceData>): ResourceData | undefined;
+    /**
+     * 删除资源
+     */
+    deleteResource(id: ResourceId): boolean;
+    /**
+     * 根据资源 ID 获取预订列表
+     */
+    getBookingsByResourceId(resourceId: ResourceId): ResourceBooking[];
+    /**
+     * 创建预订
+     */
+    createBooking(booking: Partial<ResourceBooking>): ResourceBooking;
+    /**
+     * 更新预订
+     */
+    updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined;
+    /**
+     * 删除预订
+     */
+    deleteBooking(id: ResourceId): boolean;
+    /**
+     * 清空缓存
+     */
+    clear(): Promise<void>;
+    private attachBookingsToResource;
+    private normalizeResource;
+    private safeEmit;
+    private syncResourcesMap;
+    private syncBookingsIndex;
+    private rebuildBookingsIndex;
+    private getIdKey;
+    private loadResourcesByServer;
+    private loadResourcesFromSQLite;
+    private saveResourcesToSQLite;
+    private loadBookingsFromSQLite;
+    private saveBookingsToSQLite;
+    private initResourceDataSource;
+    private setupResourceSync;
+    private processSyncMessages;
+    private fetchResourcesBySSE;
+    private removeResourcesByIds;
+    private mergeResourcesToStore;
+    private uniqueResourceIds;
+}
+export declare const resourceModule: ResourceModule;
+export type { ResourceData, ResourceBooking, ResourceState, ResourceId, ResourcePageQuery, ResourcePageResult, QueryOptions, ScheduleEventResource, } from './types';
+export { ResourceHooks } from './types';