@pisell/pisellos 2.3.24 → 2.3.26

package/lib/server/index.js

@@ -76,8 +76,6 @@ var Server = class {
     };
     // ---- 商品查询订阅者 ----
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -210,7 +208,7 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, strategy_context } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -218,32 +216,19 @@ var Server = class {
         schedule_datetime,
         schedule_date,
         customer_id,
-        extension_type,
-        strategyContextKeys: strategy_context ? Object.keys(strategy_context) : []
+        extension_type
       });
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, strategy_context }
+          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      const result = await this.computeProductQueryResult({
-        menu_list_ids,
-        ids,
-        schedule_date,
-        schedule_datetime,
-        customer_id,
-        extension_type,
-        strategy_context
-      });
-      if (subscriberId && typeof callback === "function") {
-        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
-      }
-      return result;
+      return this.computeProductQueryResult({ menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type });
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -1926,7 +1911,6 @@ var Server = class {
    */
   removeProductQuerySubscriber(subscriberId) {
     if (subscriberId) {
-      this.clearSubscriberScheduleTimers(subscriberId);
       this.productQuerySubscribers.delete(subscriberId);
       this.logInfo("removeProductQuerySubscriber: 已移除订阅者", {
         subscriberId,
@@ -1934,156 +1918,6 @@ var Server = class {
       });
     }
   }
-  /**
-   * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
-   */
-  buildProductQueryResultPayload(list, count) {
-    var _a, _b;
-    return {
-      list,
-      count: count ?? list.length,
-      schedule_time_points: ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? []
-    };
-  }
-  /**
-   * 是否启用商品 query 订阅的 schedule 时间点定时重算。
-   * strategy_context.enable_schedule_reload === false 时关闭。
-   */
-  shouldScheduleProductQueryReload(strategy_context) {
-    return (strategy_context == null ? void 0 : strategy_context.enable_schedule_reload) !== false;
-  }
-  /**
-   * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
-   */
-  clearSubscriberScheduleTimers(subscriberId) {
-    const timers = this.productQueryScheduleTimers.get(subscriberId);
-    if (timers == null ? void 0 : timers.length) {
-      timers.forEach((timerId) => clearTimeout(timerId));
-    }
-    this.productQueryScheduleTimers.delete(subscriberId);
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (subscriber) {
-      subscriber.scheduleTimerIds = [];
-    }
-  }
-  /**
-   * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
-   */
-  removeScheduleTimerRef(subscriberId, timerId) {
-    const timers = this.productQueryScheduleTimers.get(subscriberId);
-    if (!(timers == null ? void 0 : timers.length))
-      return;
-    const next = timers.filter((id) => id !== timerId);
-    if (next.length === 0) {
-      this.productQueryScheduleTimers.delete(subscriberId);
-    } else {
-      this.productQueryScheduleTimers.set(subscriberId, next);
-    }
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (subscriber) {
-      subscriber.scheduleTimerIds = next;
-    }
-  }
-  /**
-   * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
-   */
-  computeScheduleTimePointDelayMs(scheduleDate, timePoint) {
-    const parts = timePoint.split(":");
-    if (parts.length < 2)
-      return -1;
-    const hours = parseInt(parts[0], 10);
-    const minutes = parseInt(parts[1], 10);
-    if (!Number.isFinite(hours) || !Number.isFinite(minutes))
-      return -1;
-    const target = (0, import_dayjs.default)(scheduleDate).hour(hours).minute(minutes).second(4).millisecond(0);
-    const delayMs = target.diff((0, import_dayjs.default)());
-    return delayMs >= 0 ? delayMs : -1;
-  }
-  /**
-   * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
-   */
-  refreshSubscriberScheduleAtExecution(subscriber) {
-    const executedAt = (0, import_dayjs.default)();
-    const bookingDate = subscriber.context.schedule_date || executedAt.format("YYYY-MM-DD");
-    subscriber.context.schedule_date = bookingDate;
-    subscriber.context.schedule_datetime = `${bookingDate} ${executedAt.format("HH:mm:ss")}`;
-  }
-  /**
-   * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
-   * 必须先 clearSubscriberScheduleTimers，再调用本方法。
-   */
-  scheduleSubscriberTimePointReloads(subscriberId, timePoints) {
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (!subscriber || !timePoints.length)
-      return;
-    const scheduleDate = subscriber.context.schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD");
-    const timerIds = [];
-    for (const timePoint of timePoints) {
-      const delayMs = this.computeScheduleTimePointDelayMs(scheduleDate, timePoint);
-      if (delayMs < 0)
-        continue;
-      const timerId = setTimeout(() => {
-        void this.onScheduleTimePointTimerFire(subscriberId, timerId);
-      }, delayMs);
-      timerIds.push(timerId);
-    }
-    if (timerIds.length > 0) {
-      this.productQueryScheduleTimers.set(subscriberId, timerIds);
-      subscriber.scheduleTimerIds = timerIds;
-      this.logInfo("scheduleSubscriberTimePointReloads: 已注册定时器", {
-        subscriberId,
-        timerCount: timerIds.length,
-        timePoints
-      });
-    }
-  }
-  /**
-   * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
-   */
-  async onScheduleTimePointTimerFire(subscriberId, timerId) {
-    this.removeScheduleTimerRef(subscriberId, timerId);
-    if (!this.productQuerySubscribers.has(subscriberId))
-      return;
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    this.refreshSubscriberScheduleAtExecution(subscriber);
-    await this.recomputeAndNotifySubscriber(subscriberId);
-  }
-  /**
-   * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
-   */
-  async recomputeAndNotifySubscriber(subscriberId) {
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (!subscriber)
-      return;
-    try {
-      const result = await this.computeProductQueryResult(subscriber.context);
-      subscriber.callback(result);
-      this.logInfo("recomputeAndNotifySubscriber: 已推送", {
-        subscriberId,
-        schedule_datetime: subscriber.context.schedule_datetime
-      });
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logError("recomputeAndNotifySubscriber: 推送失败", {
-        subscriberId,
-        error: errorMessage
-      });
-    }
-  }
-  /**
-   * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
-   */
-  syncProductQueryScheduleTimers(subscriberId, strategy_context) {
-    var _a, _b;
-    this.clearSubscriberScheduleTimers(subscriberId);
-    if (!this.shouldScheduleProductQueryReload(strategy_context)) {
-      return;
-    }
-    const timePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
-    if (timePoints.length > 0) {
-      this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
-    }
-  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -4277,14 +4111,8 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id, strategy_context } = context;
+    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id } = context;
     const queryIds = Array.isArray(ids) ? ids.map((id) => Number(id)).filter((id) => Number.isFinite(id)) : [];
-    const formatterContext = this.buildProductFormatterContext({
-      schedule_date,
-      schedule_datetime,
-      customer_id,
-      strategy_context
-    });
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       ids: queryIds,
@@ -4293,17 +4121,20 @@ var Server = class {
       customer_id,
       extension_type,
       product_id,
-      strategyContextKeys: strategy_context ? Object.keys(strategy_context) : [],
       changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
-      return { message: "Products 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Products 模块未注册", data: { list: [], count: 0 } };
     }
     if (queryIds.length > 0) {
       const uniqueIds = Array.from(new Set(queryIds));
       const tPrice2 = performance.now();
-      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds,
         productIds: uniqueIds
       });
@@ -4324,7 +4155,7 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(extensionFilteredProducts),
+        data: { list: extensionFilteredProducts, count: extensionFilteredProducts.length },
         message: "",
         status: true
       };
@@ -4332,7 +4163,9 @@ var Server = class {
     if (product_id != null && Number.isFinite(Number(product_id))) {
       const pid = Number(product_id);
       const tPrice2 = performance.now();
-      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule()
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
@@ -4362,7 +4195,11 @@ var Server = class {
     }
     if (this.shouldQueryProductsByExtensionTypes(extension_type)) {
       const tPrice2 = performance.now();
-      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(extensionType)", performance.now() - tPrice2, {
@@ -4402,18 +4239,18 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(filteredProducts2),
+        data: { list: filteredProducts2, count: filteredProducts2.length },
         message: "",
         status: true
       };
     }
     if (!this.menu) {
       this.logError("computeProductQueryResult: Menu 模块未注册");
-      return { message: "Menu 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Menu 模块未注册", data: { list: [], count: 0 } };
     }
     if (!this.schedule) {
       this.logError("computeProductQueryResult: Schedule 模块未注册");
-      return { message: "Schedule 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Schedule 模块未注册", data: { list: [], count: 0 } };
     }
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
@@ -4437,7 +4274,11 @@ var Server = class {
       isAllProducts: !!productScope.isAllProducts
     });
     const tPrice = performance.now();
-    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, {
+      scheduleModule: this.getSchedule(),
+      schedule_datetime,
+      customer_id
+    }, {
       changedIds: options == null ? void 0 : options.changedIds,
       productIds: productScope.isAllProducts ? void 0 : scopedProductIds
     }) : [];
@@ -4480,29 +4321,11 @@ var Server = class {
     });
     return {
       code: 200,
-      data: this.buildProductQueryResultPayload(filteredProducts),
+      data: { list: filteredProducts, count: filteredProducts.length },
       message: "",
       status: true
     };
   }
-  /**
-   * 构建商品格式化上下文。
-   *
-   * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-   */
-  buildProductFormatterContext(context) {
-    var _a, _b, _c, _d;
-    const scheduleModule = this.getSchedule();
-    return {
-      scheduleModule,
-      schedule_datetime: context.schedule_datetime,
-      customer_id: context.customer_id,
-      strategy_context: context.strategy_context,
-      menuList: ((_b = (_a = this.menu) == null ? void 0 : _a.getMenuList) == null ? void 0 : _b.call(_a)) || [],
-      scheduleList: ((_c = scheduleModule == null ? void 0 : scheduleModule.getScheduleList) == null ? void 0 : _c.call(scheduleModule)) || [],
-      dataVariantEvaluator: (_d = this.core.context) == null ? void 0 : _d.dataVariantEvaluator
-    };
-  }
   /**
    * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
    * 由 ProductsModule 的 onProductsSyncCompleted 事件触发

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

@@ -18,8 +18,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private productsPriceCache;
     private readonly CACHE_MAX_DAYS;
     private formatters;
-    private isBuiltinFormatterRegistered;
-    private isLegacyPriceFormatterEnabled;
+    private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
     private quotationBridgeLoadedKey?;
@@ -37,8 +36,6 @@ export declare class ProductsModule extends BaseModule implements Module {
     private lastPreloadCompletedAtMs;
     /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
     private productIndexDBSaveQueue;
-    /** 最近一次智能定价评估提取的 schedule 变价时间点（HH:mm），供 Server 订阅定时刷新使用 */
-    private lastScheduleTimePoints;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
@@ -111,10 +108,6 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private prepareProductsWithPrice;
     private getProductsPriceCacheKey;
-    /**
-     * 稳定序列化策略上下文，避免对象 key 顺序不同导致缓存 key 抖动。
-     */
-    private stringifyStable;
     private normalizeProductIds;
     /**
      * 按轻量范围返回商品 ID，不做 structuredClone。
@@ -129,26 +122,14 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private applyFormatters;
     /**
-     * 注册内置商品格式化器。
-     *
-     * 智能定价默认替代报价单逻辑；报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
+     * 注册内置的价格格式化器
+     * 这个格式化器负责将价格数据应用到商品上
      * @private
      */
-    private registerBuiltinProductFormatters;
-    /**
-     * 是否启用旧报价单价格 formatter。
-     *
-     * 默认关闭，避免报价单逻辑覆盖智能定价结果。
-     */
-    private shouldEnableLegacyPriceFormatter;
-    /**
-     * 返回最近一次 prepareProductsWithPrice / DataVariant 评估提取的变价时间点（HH:mm）。
-     * 供 OS Server 商品 query 订阅定时刷新使用。
-     */
-    getLastScheduleTimePoints(): string[];
+    private registerBuiltinPriceFormatter;
     /**
      * 注册商品格式化器
-     * 格式化器会按注册顺序依次执行；legacy 启用时先兜底报价，再由智能定价覆盖。
+     * 格式化器会按注册顺序依次执行（内置价格格式化器始终是第一个）
      * @param formatter 格式化函数
      * @param prepend 是否插入到队列开头（默认 false，追加到末尾）
      * @example
@@ -163,8 +144,8 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     registerFormatter(formatter: ProductFormatter, prepend?: boolean): void;
     /**
-     * 清空所有格式化器（包括内置智能定价格式化器）
-     * @param keepBuiltin 是否保留内置智能定价格式化器（默认 true）
+     * 清空所有格式化器（包括内置价格格式化器）
+     * @param keepBuiltin 是否保留内置价格格式化器（默认 true）
      */
     clearFormatters(keepBuiltin?: boolean): void;
     /**