@pisell/pisellos 2.2.121 → 2.2.123

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

@@ -38,13 +38,16 @@ var import_BaseModule = require("../../../modules/BaseModule");
 var import_types = require("./types");
 var INDEXDB_STORE_NAME = "orders";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
+var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
+var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2e3;
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
     this.pendingSyncMessages = [];
-    this.ORDER_SYNC_DEBOUNCE_MS = 5e3;
+    this.isProcessingSyncBatch = false;
+    this.isIdlePhase = true;
     // Map<resource_id, OrderId[]> 资源到订单的倒排索引
     this.resourceIdIndex = /* @__PURE__ */ new Map();
   }
@@ -149,6 +152,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch {
     }
   }
+  getOrderSyncThrottleMs() {
+    const raw = localStorage.getItem(ORDER_SYNC_THROTTLE_MS_STORAGE_KEY);
+    if (raw !== null) {
+      const parsed = Number(raw);
+      if (Number.isFinite(parsed) && parsed >= 0)
+        return parsed;
+    }
+    return DEFAULT_ORDER_SYNC_THROTTLE_MS;
+  }
   async preload() {
     const getData = async () => {
       const orders = await this.loadOrdersByServer();
@@ -181,18 +193,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (this.orderDataSource) {
       try {
         const data = await this.orderDataSource.run({
-          http: {
+          sse: {
             query: this.store.createdAtQuery
           }
         });
         orderList = data || [];
-        this.logInfo("loadOrdersByServer-拉取成功", {
+        this.logInfo("loadOrdersByServer-SSE拉取成功", {
           count: orderList.length
         });
         this.markOrderPulledAtNow();
       } catch {
         orderList = [];
-        this.logInfo("loadOrdersByServer-拉取失败，回退为空数组");
+        this.logInfo("loadOrdersByServer-SSE拉取失败，回退为空数组");
       }
     }
     await this.saveOrdersToSQLite(orderList);
@@ -206,6 +218,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const ids = this.resourceIdIndex.get(String(resourceId)) || [];
     return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);
   }
+  /**
+   * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
+   */
+  async fetchOrdersBySSE(query = {}) {
+    if (!this.orderDataSource)
+      return [];
+    try {
+      const data = await this.orderDataSource.run({ sse: { query } });
+      return data || [];
+    } catch (error) {
+      this.logError("fetchOrdersBySSE-失败", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return [];
+    }
+  }
   getRoutes() {
     return [];
   }
@@ -215,6 +243,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       clearTimeout(this.syncTimer);
       this.syncTimer = void 0;
     }
+    this.isProcessingSyncBatch = false;
     this.pendingSyncMessages = [];
     if ((_a = this.orderDataSource) == null ? void 0 : _a.destroy)
       this.orderDataSource.destroy();
@@ -287,50 +316,92 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.orderDataSource = new OrderDataSourceClass();
   }
   /**
-   * 初始化 pubsub 订阅，监听订单变更
+   * 初始化 pubsub 订阅，监听订单变更（纯订阅，不拉数据；全量 SSE 由 loadOrdersByServer 负责）
    */
   setupOrderSync() {
     if (!this.orderDataSource)
       return;
-    const shouldSkipHttpPull = this.hasPulledOrdersToday();
-    const syncPayload = {
+    this.orderDataSource.run({
       pubsub: {
         callback: (res) => {
+          console.log("orderDataSource");
+          const pubsubReceivedAt = Date.now();
           const message = this.normalizeOrderSyncMessage(res);
           if (!message)
             return;
+          message._pubsubReceivedAt = pubsubReceivedAt;
           this.pendingSyncMessages.push(message);
+          const throttleMs = this.getOrderSyncThrottleMs();
           this.logInfo("orderSync-收到消息并入队", {
             id: message.id ?? null,
             order_id: message.order_id ?? null,
             type: message.type ?? null,
             pendingCount: this.pendingSyncMessages.length,
-            debounceMs: this.ORDER_SYNC_DEBOUNCE_MS
+            throttleMs,
+            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
           });
-          if (this.syncTimer)
-            clearTimeout(this.syncTimer);
-          this.syncTimer = setTimeout(() => {
-            this.processOrderSyncMessages();
-          }, this.ORDER_SYNC_DEBOUNCE_MS);
+          this.scheduleOrderSyncThrottle();
         }
       }
-    };
-    syncPayload.http = {
-      query: this.store.createdAtQuery,
-      skipHttp: shouldSkipHttpPull
-    };
-    this.orderDataSource.run(syncPayload).then(() => {
-      if (!shouldSkipHttpPull)
-        this.markOrderPulledAtNow();
     }).catch(() => {
     });
   }
   /**
-   * 处理防抖后的同步消息批次
+   * 调度订单同步节流窗口（leading-edge throttle）：
+   * - 空闲状态下收到的第一条消息立即触发批处理，无需等待；
+   * - 首条处理后进入冷却窗口，窗口期间的后续消息聚合，窗口结束后批量处理；
+   * - 若当前批处理执行中，则由批处理结束后决定是否开启下一轮窗口。
+   */
+  scheduleOrderSyncThrottle() {
+    if (this.isProcessingSyncBatch)
+      return;
+    if (this.isIdlePhase) {
+      this.isIdlePhase = false;
+      this.logInfo("orderSync-首条消息立即触发处理");
+      void this.flushOrderSyncMessagesByThrottle();
+      return;
+    }
+    if (this.syncTimer)
+      return;
+    const throttleMs = this.getOrderSyncThrottleMs();
+    this.syncTimer = setTimeout(() => {
+      this.syncTimer = void 0;
+      void this.flushOrderSyncMessagesByThrottle();
+    }, throttleMs);
+  }
+  /**
+   * 执行一次节流批处理并在需要时续约下一轮窗口。
+   * 批处理完成且无后续消息时恢复空闲状态，下一条消息将立即触发。
+   */
+  async flushOrderSyncMessagesByThrottle() {
+    if (this.isProcessingSyncBatch)
+      return;
+    if (this.pendingSyncMessages.length === 0) {
+      this.isIdlePhase = true;
+      return;
+    }
+    this.isProcessingSyncBatch = true;
+    try {
+      await this.processOrderSyncMessages();
+    } finally {
+      this.isProcessingSyncBatch = false;
+      if (this.pendingSyncMessages.length > 0) {
+        this.scheduleOrderSyncThrottle();
+      } else {
+        this.isIdlePhase = true;
+      }
+    }
+  }
+  /**
+   * 处理节流窗口内聚合后的同步消息批次
    *
    * 后端统一发送 change 消息，不再区分新增/编辑/删除。
    * - 单条（id/order_id）：若携带 body/data 则直接 upsert 到本地
    * - 批量（ids）：通过 HTTP 按 ids 增量拉取，再 merge 到本地
+   *
+   * @example
+   * // pending 队列中存在 8 条消息时，仅处理一次批次并统一 merge
+   * await this.processOrderSyncMessages()
    */
   async processOrderSyncMessages() {
     var _a;
@@ -338,8 +409,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.pendingSyncMessages = [];
     if (messages.length === 0)
       return;
+    const batchProcessStartAt = Date.now();
+    const earliestReceivedAt = Math.min(
+      ...messages.map((m) => m._pubsubReceivedAt ?? batchProcessStartAt)
+    );
     this.logInfo("processOrderSyncMessages-开始", {
-      messageCount: messages.length
+      messageCount: messages.length,
+      earliestReceivedAt: new Date(earliestReceivedAt).toISOString(),
+      batchProcessStartAt: new Date(batchProcessStartAt).toISOString(),
+      waitDurationMs: batchProcessStartAt - earliestReceivedAt
     });
     const upsertOrders = /* @__PURE__ */ new Map();
     const refreshIds = [];
@@ -375,9 +453,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (upsertList.length === 0 && uniqueRefreshIds.length === 0)
       return;
+    const batchProcessEndAt = Date.now();
     this.logInfo("processOrderSyncMessages-结束", {
       upsertCount: upsertList.length,
-      refreshIdCount: uniqueRefreshIds.length
+      refreshIdCount: uniqueRefreshIds.length,
+      batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
+      totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
     });
     await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
   }

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -88,7 +88,7 @@ var searchProduct = async (request, code) => {
     skip: 1,
     num: 20,
     status: "published",
-    with: ["variantGroup"],
+    with: ["variantGroup.variantItem", "optionGroup.optionItem"],
     with_count: ["bundleGroup", "optionGroup"],
     exclude_extension_type: [
       "product_party",

package/package.json

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