@pisell/pisellos 2.2.244 → 2.2.246

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

@@ -28,6 +28,7 @@ var import_types = require("./types");
 var import_product = require("../../utils/product");
 var INDEXDB_STORE_NAME = "products";
 var PRODUCT_SYNC_DEBOUNCE_MS = 1e4;
+var PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ProductsModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -44,7 +45,14 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.formatters = [];
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
+    this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
+    /** 最近一次 SSE 全量拉取完成时间 */
+    this.lastServerFullFetchAtMs = 0;
+    /** 最近一次 preload 完成时间（含 IndexDB 命中） */
+    this.lastPreloadCompletedAtMs = 0;
+    /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
+    this.productIndexDBSaveQueue = Promise.resolve();
   }
   async initialize(core, options) {
     var _a;
@@ -177,7 +185,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a, _b, _c;
+    var _a;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -190,15 +198,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleList = ((_c = (_b = params.scheduleModule).getScheduleList) == null ? void 0 : _c.call(_b)) || [];
-      const scheduleMap = new Map(
-        scheduleList.map((schedule) => [schedule.id, schedule])
-      );
+      const scheduleCache = /* @__PURE__ */ new Map();
+      let hasLoadedScheduleList = false;
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b2;
-        if (scheduleMap.has(id))
-          return scheduleMap.get(id);
-        const schedules = ((_b2 = (_a2 = params.scheduleModule).getScheduleByIds) == null ? void 0 : _b2.call(_a2, [id])) || [];
+        var _a2, _b, _c, _d, _e, _f;
+        const scheduleId = String(id);
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        if (!hasLoadedScheduleList) {
+          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          for (const schedule of scheduleList) {
+            scheduleCache.set(String(schedule.id), schedule);
+          }
+          hasLoadedScheduleList = true;
+        }
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        if (schedules[0])
+          scheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
@@ -210,8 +228,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshQuotationPriceBridge(params) {
     if (!this.quotationPriceBridge)
       return;
-    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
-    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
+    const refreshKey = this.getQuotationBridgeScopeKey();
     if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
       await this.quotationBridgeRefreshPromise;
       return;
@@ -221,10 +238,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.quotationBridgeRefreshKey = refreshKey;
     this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-      channel: this.quotationBridgeChannel,
-      customer_id: customerId
+      channel: this.quotationBridgeChannel
     }).then(() => {
-      this.quotationBridgeCustomerId = customerId;
+      this.quotationBridgeLoadedKey = refreshKey;
     }).finally(() => {
       this.quotationBridgeRefreshPromise = void 0;
       this.quotationBridgeRefreshKey = void 0;
@@ -243,12 +259,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (this.quotationBridgeRefreshPromise) {
       await this.quotationBridgeRefreshPromise;
     }
-    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
+    if (this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey) {
       await this.refreshQuotationPriceBridge({ customer_id: customerId });
     }
   }
-  getQuotationBridgeScopeKey(customerId) {
-    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
+  getQuotationBridgeScopeKey() {
+    return this.quotationBridgeChannel || "";
   }
   buildPriceDataFromQuotation(product, datetime, customerId) {
     var _a;
@@ -258,10 +274,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       customer_id: customerId
     });
     const productPrice = quotedPrice ?? product.price;
+    const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
     return {
       id: product.id,
       price: String(productPrice ?? 0),
-      base_price: String(product.base_price ?? product.price ?? 0),
+      base_price: String(productBasePrice),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -278,7 +295,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -303,7 +320,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = item.base_price ?? item.price ?? 0;
+        const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 0;
         return {
           id: Number(item.id),
           product_id: Number(item.product_id ?? product.id),
@@ -704,7 +721,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         productCount: list.length,
         duration: `${Math.round(performance.now() - t0)}ms`
       });
-      await this.saveProductsToIndexDB(list);
+      await this.replaceProductsSnapshotInIndexDB(list, "loadProductsByServer");
+      this.lastServerFullFetchAtMs = Date.now();
       await this.core.effects.emit(import_types.ProductsHooks.onProductsLoaded, list);
       (0, import_product.perfMark)("loadProductsByServer", performance.now() - t0, { count: list.length });
       return list;
@@ -803,7 +821,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async loadProductsByServerHttp(params) {
     const productList = await this.fetchProductsByHttp(params);
     if (productList.length > 0) {
-      await this.saveProductsToIndexDB(productList);
+      await this.replaceProductsSnapshotInIndexDB(productList, "loadProductsByServerHttp");
+      this.lastServerFullFetchAtMs = Date.now();
       await this.core.effects.emit(import_types.ProductsHooks.onProductsLoaded, productList);
     }
     return productList;
@@ -942,33 +961,86 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
   }
   /**
-   * 保存商品数据到 IndexDB（平铺存储）
-   * @private
+   * 串行执行商品 IndexDB 写入，避免快照替换与增量 patch 并发交错。
+   *
+   * @example
+   * await this.runInProductIndexDBSaveQueue(async () => {
+   *   await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products)
+   * })
    */
-  async saveProductsToIndexDB(products) {
+  async runInProductIndexDBSaveQueue(task) {
+    const queuedTask = this.productIndexDBSaveQueue.then(task, task);
+    this.productIndexDBSaveQueue = queuedTask.then(() => void 0, () => void 0);
+    return queuedTask;
+  }
+  /**
+   * 全量快照写入 IndexDB：clear + bulkUpdate，仅用于 SSE/HTTP 全量拉取。
+   *
+   * @example
+   * await this.replaceProductsSnapshotInIndexDB(list, 'loadProductsByServer')
+   */
+  async replaceProductsSnapshotInIndexDB(products, source) {
     if (!this.dbManager) {
-      this.logWarning("saveProductsToIndexDB: dbManager 不可用");
+      this.logWarning("replaceProductsSnapshotInIndexDB: dbManager 不可用");
       return;
     }
-    this.logInfo("开始保存商品数据到 IndexDB", { productCount: products.length });
     try {
-      const t0 = performance.now();
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-      await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
-      (0, import_product.perfMark)("saveProductsToIndexDB", performance.now() - t0, { count: products.length });
-      console.log(
-        `[Products] 已将 ${products.length} 个商品平铺保存到 IndexDB`
-      );
-      this.logInfo("商品数据已保存到 IndexDB", { productCount: products.length });
+      await this.runInProductIndexDBSaveQueue(async () => {
+        this.logInfo("replaceProductsSnapshotInIndexDB 开始", { source, productCount: products.length });
+        const t0 = performance.now();
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        if (products.length > 0) {
+          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+        }
+        (0, import_product.perfMark)("replaceProductsSnapshotInIndexDB", performance.now() - t0, { count: products.length });
+        this.logInfo("replaceProductsSnapshotInIndexDB 完成", { source, productCount: products.length });
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error("[Products] 保存数据到 IndexDB 失败:", error);
-      this.logError("保存数据到 IndexDB 失败", {
+      this.logError("全量保存商品到 IndexDB 失败", {
+        source,
         productCount: products.length,
         error: errorMessage
       });
     }
   }
+  /**
+   * 增量 upsert 商品到 IndexDB，不清空表；用于 pubsub 批次合并后的变更商品。
+   *
+   * @example
+   * await this.patchProductsInIndexDB(changedProducts, 'pubsub.processProductSyncMessages', mergeActions)
+   */
+  async patchProductsInIndexDB(products, source, mergeActions = {}) {
+    if (!this.dbManager || products.length === 0) {
+      return;
+    }
+    const validProducts = products.filter((p) => (p == null ? void 0 : p.id) !== void 0 && (p == null ? void 0 : p.id) !== null);
+    if (validProducts.length === 0) {
+      return;
+    }
+    try {
+      await this.runInProductIndexDBSaveQueue(async () => {
+        this.logInfo("patchProductsInIndexDB 开始", { source, count: validProducts.length });
+        const t0 = performance.now();
+        if (typeof this.dbManager.bulkUpdate === "function") {
+          await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, validProducts);
+        } else if (typeof this.dbManager.update === "function") {
+          for (const product of validProducts) {
+            await this.dbManager.update(INDEXDB_STORE_NAME, product);
+          }
+        }
+        (0, import_product.perfMark)("patchProductsInIndexDB", performance.now() - t0, { count: validProducts.length });
+        this.logInfo("patchProductsInIndexDB 完成", { source, count: validProducts.length });
+      });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError("增量保存商品到 IndexDB 失败", {
+        source,
+        error: errorMessage,
+        productCount: validProducts.length
+      });
+    }
+  }
   /**
    * 同步更新商品 Map 缓存
    * 将 list 中的商品同步到 map，以 id 为 key
@@ -1013,6 +1085,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           duration: `${Math.round(performance.now() - tTotal)}ms`,
           source: "IndexDB"
         });
+        this.lastPreloadCompletedAtMs = Date.now();
         return;
       }
       console.log("[Products] IndexDB 中没有缓存数据，从服务器加载...");
@@ -1040,6 +1113,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         duration: `${Math.round(performance.now() - tTotal)}ms`,
         source: "Server"
       });
+      this.lastPreloadCompletedAtMs = Date.now();
     } else {
       (0, import_product.perfMark)("preload(empty)", performance.now() - tTotal, { source: "empty" });
       this.logWarning("预加载完成但未获取到数据", {
@@ -1096,10 +1170,6 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.productDataSource.run({
       pubsub: {
         callback: (res) => {
-          console.log("sse_products_callback", res);
-          this.logInfo("sse_products_callback: 收到同步消息", {
-            data: res == null ? void 0 : res.data
-          });
           if (!(res == null ? void 0 : res.data))
             return;
           const data = res.data;
@@ -1195,19 +1265,50 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (uniqueDeleteIds.length > 0) {
       await this.removeProductsByIds(uniqueDeleteIds);
     }
+    const patchProductMap = /* @__PURE__ */ new Map();
+    const patchMergeActions = {};
+    let storeMutated = uniqueDeleteIds.length > 0;
     if (bodyUpdates.size > 0) {
-      await this.applyBodyUpdatesToStore(bodyUpdates);
+      const bodyResult = await this.applyBodyUpdatesToStore(bodyUpdates, {
+        skipIndexDB: true,
+        skipEmit: true
+      });
+      for (const product of bodyResult.changedProducts) {
+        patchProductMap.set(product.id, product);
+        patchMergeActions[product.id] = bodyResult.mergeActions[product.id];
+      }
+      storeMutated = true;
     }
+    let freshProducts = [];
     if (uniqueSSEIds.length > 0) {
-      const freshProducts = await this.fetchProductsBySSE(uniqueSSEIds);
+      freshProducts = await this.fetchProductsBySSE(uniqueSSEIds);
       if (freshProducts.length > 0) {
-        await this.mergeProductsToStore(freshProducts);
+        const mergeResult = await this.mergeProductsToStore(freshProducts, {
+          skipIndexDB: true,
+          skipEmit: true
+        });
+        for (const product of mergeResult.changedProducts) {
+          patchProductMap.set(product.id, product);
+          patchMergeActions[product.id] = mergeResult.mergeActions[product.id];
+        }
+        storeMutated = true;
       }
       this.logInfo("processProductSyncMessages: SSE 增量更新完成123", {
         requestedCount: uniqueSSEIds.length,
         receivedCount: freshProducts.length
       });
     }
+    const patchProducts = [...patchProductMap.values()];
+    if (patchProducts.length > 0) {
+      await this.patchProductsInIndexDB(
+        patchProducts,
+        "pubsub.processProductSyncMessages",
+        patchMergeActions
+      );
+    }
+    if (storeMutated) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     const allChangedIds = [.../* @__PURE__ */ new Set([
       ...Array.from(bodyUpdates.keys()),
       ...uniqueSSEIds,
@@ -1271,19 +1372,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   /**
    * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
    * 已存在的 → 直接替换；不存在的 → 追加
-   * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
-   * 价格缓存由 processProductSyncMessages 末尾统一清除
+   *
+   * @example
+   * await this.applyBodyUpdatesToStore(bodyUpdates, { skipIndexDB: true })
    */
-  async applyBodyUpdatesToStore(bodyUpdates) {
+  async applyBodyUpdatesToStore(bodyUpdates, options) {
+    const changedProductIds = [...bodyUpdates.keys()];
     this.logInfo("applyBodyUpdatesToStore: 开始", { count: bodyUpdates.size });
     let updatedCount = 0;
     let newCount = 0;
     const appliedIds = /* @__PURE__ */ new Set();
+    const mergeActions = {};
+    const changedProducts = [];
     this.store.list = this.store.list.map((p) => {
       if (bodyUpdates.has(p.id)) {
         updatedCount++;
         appliedIds.add(p.id);
-        return bodyUpdates.get(p.id);
+        mergeActions[p.id] = "update";
+        const next = bodyUpdates.get(p.id);
+        changedProducts.push(next);
+        return next;
       }
       return p;
     });
@@ -1291,31 +1399,44 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       if (!appliedIds.has(id)) {
         this.store.list.push(body);
         newCount++;
+        mergeActions[id] = "insert";
+        changedProducts.push(body);
       }
     }
     this.syncProductsMap();
-    await this.saveProductsToIndexDB(this.store.list);
-    this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    if (!(options == null ? void 0 : options.skipIndexDB)) {
+      await this.patchProductsInIndexDB(changedProducts, "pubsub.bodyUpdate", mergeActions);
+    }
+    if (!(options == null ? void 0 : options.skipEmit)) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     this.logInfo("applyBodyUpdatesToStore: 完成", {
       updatedCount,
       newCount,
       totalCount: this.store.list.length
     });
+    return { changedProducts, mergeActions, updatedCount, newCount };
   }
   /**
    * 将增量拉取的商品合并到 store
    * 已存在的 → 替换；新的 → 追加
-   * 同时更新 store.map、IndexDB，触发 onProductsChanged
+   *
+   * @example
+   * await this.mergeProductsToStore(freshProducts, { skipIndexDB: true })
    */
-  async mergeProductsToStore(freshProducts) {
+  async mergeProductsToStore(freshProducts, options) {
     const freshMap = /* @__PURE__ */ new Map();
     for (const p of freshProducts) {
       freshMap.set(p.id, p);
     }
+    const mergeActions = {};
+    const changedProducts = [];
     const updatedList = this.store.list.map((p) => {
       if (freshMap.has(p.id)) {
         const fresh = freshMap.get(p.id);
         freshMap.delete(p.id);
+        mergeActions[p.id] = "update";
+        changedProducts.push(fresh);
         return fresh;
       }
       return p;
@@ -1323,17 +1444,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const newCount = freshMap.size;
     for (const p of freshMap.values()) {
       updatedList.push(p);
+      mergeActions[p.id] = "insert";
+      changedProducts.push(p);
     }
     const updatedCount = freshProducts.length - newCount;
+    const changedProductIds = freshProducts.map((p) => p.id);
     this.store.list = updatedList;
     this.syncProductsMap();
-    await this.saveProductsToIndexDB(this.store.list);
+    if (!(options == null ? void 0 : options.skipIndexDB)) {
+      await this.patchProductsInIndexDB(changedProducts, "pubsub.mergeProductsToStore", mergeActions);
+    }
+    if (!(options == null ? void 0 : options.skipEmit)) {
+      this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    }
     this.logInfo("mergeProductsToStore: 合并完成", {
       updatedCount,
       newCount,
       totalCount: this.store.list.length
     });
-    this.core.effects.emit(import_types.ProductsHooks.onProductsChanged, this.store.list);
+    return { changedProducts, mergeActions, updatedCount, newCount };
   }
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 数据并更新本地
@@ -1342,6 +1471,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   async silentRefresh() {
     const t0 = performance.now();
+    const now = Date.now();
+    const elapsedSincePreload = now - this.lastPreloadCompletedAtMs;
+    const elapsedSinceFullFetch = now - this.lastServerFullFetchAtMs;
+    if (this.lastPreloadCompletedAtMs > 0 && elapsedSincePreload < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS || this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS) {
+      return this.store.list;
+    }
     this.logInfo("silentRefresh 开始");
     try {
       const products = await this.loadProductsByServer();

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

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

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

@@ -268,11 +268,35 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       bookings: this.getBookingsByResourceId(resource.id)
     };
   }
+  normalizeIntegerIdValue(value) {
+    if (typeof value !== "string")
+      return value;
+    const matched = value.match(/^(-?\d+)\.0+$/);
+    if (!matched)
+      return value;
+    return matched[1];
+  }
+  normalizeResourceIdFields(resource) {
+    resource.id = this.normalizeIntegerIdValue(resource.id);
+    if (resource.form_record_id !== void 0) {
+      resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+    }
+    if (resource.form_id !== void 0) {
+      resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+    }
+    if (resource.resource_form_id !== void 0) {
+      resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+    }
+    if (resource.resource_id !== void 0) {
+      resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+    }
+    return resource;
+  }
   normalizeResource(resource) {
-    const normalized = {
+    const normalized = this.normalizeResourceIdFields({
       ...resource,
-      id: (resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? ""
-    };
+      id: this.normalizeIntegerIdValue((resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? "")
+    });
     if (normalized.form_record_id === void 0 && normalized.id !== "") {
       normalized.form_record_id = normalized.id;
     }

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

@@ -64,15 +64,15 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      */
     getDateIsInSchedule(date: string, scheduleList: (ScheduleItem | number)[]): boolean;
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
-    private loadScheduleFromIndexDB;
+    private loadScheduleFromSQLite;
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
-    private saveScheduleToIndexDB;
+    private saveScheduleToSQLite;
     /**
      * 预加载模块数据（统一接口）
      * 在模块注册后自动调用