@pisell/pisellos 2.2.88 → 2.2.90

package/lib/server/index.d.ts

@@ -154,11 +154,16 @@ declare class Server {
     /**
      * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
      * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+     * @param context 查询上下文
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private recomputeAndNotifyProductQuery;
     /**

package/lib/server/index.js

@@ -415,8 +415,10 @@ var Server = class {
     } else {
       this.logInfo("跳过自动预加载", { autoPreload });
     }
-    this.core.effects.on(import_types.ProductsHooks.onProductsSyncCompleted, () => {
-      this.recomputeAndNotifyProductQuery();
+    this.core.effects.on(import_types.ProductsHooks.onProductsSyncCompleted, (payload) => {
+      this.recomputeAndNotifyProductQuery({
+        changedIds: payload == null ? void 0 : payload.changedIds
+      });
     });
     const duration = Date.now() - startTime;
     this.logInfo("Server 初始化完成", {
@@ -654,14 +656,18 @@ var Server = class {
   /**
    * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
    * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+   * @param context 查询上下文
+   * @param options 可选参数
+   * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
    */
-  async computeProductQueryResult(context) {
+  async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
     const { menu_list_ids, schedule_date, schedule_datetime } = context;
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       schedule_datetime,
-      schedule_date
+      schedule_date,
+      changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
@@ -691,6 +697,8 @@ var Server = class {
     const tPrice = performance.now();
     const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
       scheduleModule: this.getSchedule()
+    }, {
+      changedIds: options == null ? void 0 : options.changedIds
     });
     (0, import_product.perfMark)("computeQuery.getProductsWithPrice", performance.now() - tPrice, {
       count: allProductsWithPrice.length
@@ -736,16 +744,21 @@ var Server = class {
   /**
    * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
    * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+   * @param options 可选参数
+   * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
    */
-  async recomputeAndNotifyProductQuery() {
+  async recomputeAndNotifyProductQuery(options) {
     if (this.productQuerySubscribers.size === 0)
       return;
     this.logInfo("recomputeAndNotifyProductQuery: 开始推送", {
-      subscriberCount: this.productQuerySubscribers.size
+      subscriberCount: this.productQuerySubscribers.size,
+      changedIds: options == null ? void 0 : options.changedIds
     });
     for (const [subscriberId, subscriber] of this.productQuerySubscribers.entries()) {
       try {
-        const result = await this.computeProductQueryResult(subscriber.context);
+        const result = await this.computeProductQueryResult(subscriber.context, {
+          changedIds: options == null ? void 0 : options.changedIds
+        });
         subscriber.callback(result);
         this.logInfo("recomputeAndNotifyProductQuery: 已推送", { subscriberId });
       } catch (error) {

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

@@ -53,14 +53,20 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 缓存的是已经应用了价格的完整商品列表，避免重复转换
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，非空时仅对这些商品增量执行 prepare 并更新缓存
      * @returns 应用了价格的商品列表
      */
-    getProductsWithPrice(schedule_date: string, extraContext?: Partial<ProductFormatterContext>): Promise<ProductData[]>;
+    getProductsWithPrice(schedule_date: string, extraContext?: Partial<ProductFormatterContext>, options?: {
+        changedIds?: number[];
+    }): Promise<ProductData[]>;
     /**
      * 准备带价格的商品数据（通过格式化器流程处理）
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选）
-     * @returns 完整处理后的商品列表
+     * @param options 可选参数
+     * @param options.productIds 指定商品 IDs，仅处理这些商品；不传则处理全量
+     * @returns 处理后的商品列表
      * @private
      */
     private prepareProductsWithPrice;
@@ -156,11 +162,6 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 用于 pubsub 同步 create / update / batch_update 场景
      */
     refreshProducts(): Promise<ProductData[]>;
-    /**
-     * 指定商品的报价单价格变更时，清除价格缓存
-     * 后续查询会走完整的 formatter 管道重建缓存
-     */
-    updateProductPriceByIds(ids: number[]): Promise<void>;
     /**
      * 清空缓存
      */
@@ -202,14 +203,18 @@ export declare class ProductsModule extends BaseModule implements Module {
      *
      * product 模块：
      *   - operation === 'delete' → 本地删除
-     *   - change_types 包含 price → SSE 增量拉取
+     *   - change_types 包含 price → 仅收集变更 IDs（不拉商品数据）
      *   - 有 body → body 完整数据直接覆盖本地
+     *   - 其他 → SSE 增量拉取
      *
-     * product_collection / product_category / product_quotation：
+     * product_collection / product_category：
      *   - 按 relation_product_ids SSE 拉取受影响商品
      *
-     * 处理完成后清除价格缓存并 emit onProductsSyncCompleted，
-     * Server 层监听该事件后重新查询，走完整的 formatter 管道重建缓存
+     * product_quotation：
+     *   - 报价单变更影响范围大，直接清除价格缓存走全量重建
+     *
+     * 处理完成后 emit onProductsSyncCompleted（携带 changedIds），
+     * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
      */
     private processProductSyncMessages;
     /**

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

@@ -177,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         duration: `${duration}ms`,
         error: errorMessage
       });
-      throw error;
+      return [];
     }
   }
   /**
@@ -186,13 +186,70 @@ 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) {
+  async getProductsWithPrice(schedule_date, extraContext, options) {
     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
@@ -221,21 +278,37 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * 准备带价格的商品数据（通过格式化器流程处理）
    * @param schedule_date 日期
    * @param extraContext 额外的上下文数据（可选）
-   * @returns 完整处理后的商品列表
+   * @param options 可选参数
+   * @param options.productIds 指定商品 IDs，仅处理这些商品；不传则处理全量
+   * @returns 处理后的商品列表
    * @private
    */
-  async prepareProductsWithPrice(schedule_date, extraContext) {
+  async prepareProductsWithPrice(schedule_date, extraContext, options) {
     const tTotal = performance.now();
-    this.logInfo("prepareProductsWithPrice 开始处理", { schedule_date });
+    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
+    });
     try {
-      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;
+      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 });
       }
-      (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
+      this.logInfo("获取到商品列表", { productCount: products.length });
       const tPrice = performance.now();
       const priceData = await this.loadProductsPrice({
         ids,
@@ -249,23 +322,27 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         ...extraContext
       };
       const tFormat = performance.now();
-      const processedProducts = await this.applyFormatters(allProducts, context);
+      const processedProducts = await this.applyFormatters(products, context);
       (0, import_product.perfMark)("prepareProducts.applyFormatters", performance.now() - tFormat, {
-        count: allProducts.length,
+        count: products.length,
         formatterCount: this.formatters.length
       });
       this.logInfo("prepareProductsWithPrice 处理完成", {
-        originalProductCount: allProducts.length,
+        mode: isIncremental ? "incremental" : "full",
+        originalProductCount: products.length,
         processedProductCount: processedProducts.length,
         formatterCount: this.formatters.length
       });
-      await this.core.effects.emit(
-        import_types.ProductsHooks.onProductsPriceApplied,
-        processedProducts
-      );
+      if (!isIncremental) {
+        await this.core.effects.emit(
+          import_types.ProductsHooks.onProductsPriceApplied,
+          processedProducts
+        );
+      }
       (0, import_product.perfMark)("prepareProductsWithPrice", performance.now() - tTotal, {
-        productCount: allProducts.length,
-        formatterCount: this.formatters.length
+        productCount: products.length,
+        formatterCount: this.formatters.length,
+        mode: isIncremental ? "incremental" : "full"
       });
       return processedProducts;
     } catch (err) {
@@ -604,14 +681,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     (0, import_product.perfMark)("refreshProducts", performance.now() - tTotal, { count: this.store.list.length });
     return this.store.list;
   }
-  /**
-   * 指定商品的报价单价格变更时，清除价格缓存
-   * 后续查询会走完整的 formatter 管道重建缓存
-   */
-  async updateProductPriceByIds(ids) {
-    this.logInfo("updateProductPriceByIds: 清除价格缓存", { ids });
-    this.clearPriceCache();
-  }
   /**
    * 清空缓存
    */
@@ -838,17 +907,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    *
    * product 模块：
    *   - operation === 'delete' → 本地删除
-   *   - change_types 包含 price → SSE 增量拉取
+   *   - change_types 包含 price → 仅收集变更 IDs（不拉商品数据）
    *   - 有 body → body 完整数据直接覆盖本地
+   *   - 其他 → SSE 增量拉取
    *
-   * product_collection / product_category / product_quotation：
+   * product_collection / product_category：
    *   - 按 relation_product_ids SSE 拉取受影响商品
    *
-   * 处理完成后清除价格缓存并 emit onProductsSyncCompleted，
-   * Server 层监听该事件后重新查询，走完整的 formatter 管道重建缓存
+   * product_quotation：
+   *   - 报价单变更影响范围大，直接清除价格缓存走全量重建
+   *
+   * 处理完成后 emit onProductsSyncCompleted（携带 changedIds），
+   * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
    */
   async processProductSyncMessages() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const messages = [...this.pendingSyncMessages];
     this.pendingSyncMessages = [];
     if (messages.length === 0)
@@ -857,28 +930,30 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const deleteIds = [];
     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 ((_a = msg.ids) == null ? void 0 : _a.length)
+          if ((_b = msg.ids) == null ? void 0 : _b.length)
             deleteIds.push(...msg.ids);
           else if (msg.id)
             deleteIds.push(msg.id);
           continue;
         }
-        if ((_b = msg.change_types) == null ? void 0 : _b.includes("price")) {
+        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);
           continue;
         }
         if (msg.body) {
           const bodyId = msg.body.id || msg.id;
           if (bodyId)
             bodyUpdates.set(bodyId, msg.body);
-          if ((_c = msg.relation_product_ids) == null ? void 0 : _c.length) {
-            sseRefreshIds.push(...msg.relation_product_ids);
-          }
           continue;
         }
         if ((_d = msg.ids) == null ? void 0 : _d.length) {
@@ -886,14 +961,20 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         } else if (msg.id) {
           sseRefreshIds.push(msg.id);
         }
-      } else if (["product_collection", "product_category", "product_quotation"].includes(channelKey)) {
+      } else if (channelKey === "product_quotation") {
+        shouldClearPriceCache = true;
         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);
+        }
       }
     }
     const uniqueDeleteIds = [...new Set(deleteIds)];
     const uniqueSSEIds = [...new Set(sseRefreshIds)];
+    const uniquePriceIds = [...new Set(priceRefreshIds)];
     if (uniqueDeleteIds.length > 0) {
       await this.removeProductsByIds(uniqueDeleteIds);
     }
@@ -910,17 +991,30 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         receivedCount: freshProducts.length
       });
     }
+    const allChangedIds = [.../* @__PURE__ */ new Set([
+      ...Array.from(bodyUpdates.keys()),
+      ...uniqueSSEIds,
+      ...uniquePriceIds
+    ])];
     this.logInfo("processProductSyncMessages: 处理完成", {
       deleteCount: uniqueDeleteIds.length,
       bodyUpdateCount: bodyUpdates.size,
-      sseRefreshCount: uniqueSSEIds.length
+      sseRefreshCount: uniqueSSEIds.length,
+      priceRefreshCount: uniquePriceIds.length,
+      allChangedIdsCount: allChangedIds.length,
+      shouldClearPriceCache
     });
-    if (uniqueDeleteIds.length === 0 && bodyUpdates.size === 0 && uniqueSSEIds.length === 0) {
+    const hasChanges = uniqueDeleteIds.length > 0 || allChangedIds.length > 0 || shouldClearPriceCache;
+    if (!hasChanges) {
       this.logInfo("processProductSyncMessages: 没有变更，不触发 onProductsSyncCompleted");
       return;
     }
-    this.clearPriceCache();
-    await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, null);
+    if (shouldClearPriceCache) {
+      this.clearPriceCache();
+    }
+    await this.core.effects.emit(import_types.ProductsHooks.onProductsSyncCompleted, {
+      changedIds: allChangedIds
+    });
   }
   /**
    * 通过 SSE 按 ids 增量拉取商品数据

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.88",
+  "version": "2.2.90",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",