@pisell/pisellos 0.10.51 → 0.10.53

package/lib/solution/UnifiedBookingSales/index.js

@@ -55,7 +55,6 @@ var _platform = require("../../utils/platform");
 var _itemRule = require("../../model/strategy/adapter/itemRule");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'basic', 'checkout', 'availability', 'documents'];
-const OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 function normalizePositiveInteger(value) {
   const normalized = Number(value);
   if (!Number.isInteger(normalized) || normalized <= 0) return undefined;
@@ -1200,6 +1199,12 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   defaultVersion = '1.0.0';
   store = {};
   pickupTimingEnabled = true;
+  runtimeOpenDataScope = null;
+  runtimeOpenDataSnapshot = null;
+  runtimeOpenDataModule = null;
+  runtimeOpenDataCore;
+  runtimeOpenDataGeneration = 0;
+  runtimeOpenDataDestroyed = false;
   unifiedProductCatalog = [];
   availabilityRuntimeOffsetMinutes = null;
   availabilityScheduleCatalog = null;
@@ -1219,16 +1224,16 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   allergyItemRuleConfigs = [];
   allergyItemRuleConfigsPromise = null;
   async initialize(core, options = {}) {
+    this.resetRuntimeOpenData();
+    this.runtimeOpenDataDestroyed = false;
+    const openDataGeneration = this.runtimeOpenDataGeneration;
     this.availabilityScheduleCatalog = null;
-    this.openDataTarget = null;
     this.availabilityRuntimeOffsetMinutes = (0, _localClock.captureRuntimeOffsetMinutes)();
     this.clearAvailabilityRemoteResourceState();
     this.resetAllergyItemRuleState();
     await super.initialize(core, options);
-    const openDataBusinessCode = String(this.otherParams?.businessCode ?? this.otherParams?.business_code ?? '').trim();
-    const openDataChannel = String(this.otherParams?.channel ?? '').trim();
-    if (this.otherParams?.openData && openDataBusinessCode && openDataChannel) {
-      this.openDataTarget = `${openDataBusinessCode}+${openDataChannel}`;
+    if (this.runtimeOpenDataDestroyed || openDataGeneration !== this.runtimeOpenDataGeneration) {
+      throw new Error('Store settings changed. Please try again.');
     }
     this.captureAvailabilityScheduleCatalog();
   }
@@ -1306,7 +1311,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const businessCode = String(this.otherParams?.businessCode ?? this.otherParams?.business_code ?? '').trim();
     const channel = String(this.otherParams?.channel ?? '').trim();
     const currentTarget = businessCode && channel ? `${businessCode}+${channel}` : null;
-    let openData = !currentTarget || this.openDataTarget === currentTarget ? this.otherParams?.openData : null;
+    let openData = (!currentTarget || this.openDataTarget === currentTarget) && (this.runtimeOpenDataScope === null || this.runtimeOpenDataScope === this.getRuntimeOpenDataScope()) ? this.otherParams?.openData : null;
     if (!openData && this.store.openData) {
       try {
         openData = await this.getOpenData();
@@ -1370,6 +1375,13 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const previousScope = this.getAvailabilityScopeDescriptor(this.otherParams || {});
     const previousItemRuleConfig = this.otherParams?.itemRule;
     const explicitlySetsOpenData = Object.prototype.hasOwnProperty.call(params, 'openData');
+    const nextParams = cover ? params : {
+      ...this.otherParams,
+      ...params
+    };
+    if (explicitlySetsOpenData || this.getRuntimeOpenDataScope() !== this.getRuntimeOpenDataScope(nextParams)) {
+      this.clearOpenDataCache();
+    }
     await super.setOtherParams(params, {
       cover
     });
@@ -1386,6 +1398,8 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     }
   }
   async destroy() {
+    this.runtimeOpenDataDestroyed = true;
+    this.clearOpenDataCache();
     this.availabilityScheduleCatalog = null;
     this.availabilityRuntimeOffsetMinutes = null;
     await this.resetAvailabilityProjectionState('destroy');
@@ -1686,52 +1700,117 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       action: this.resolveDiscountAction(this.resolveDiscountOrderIdentity(tempOrder))
     });
   }
+  getRuntimeOpenDataScope(otherParams = this.otherParams) {
+    return JSON.stringify({
+      shop: this.getPickupTimingContextData('shop_id'),
+      appShop: this.appPlugin ? this.getAppData('shop_id') : undefined,
+      tenant: this.appPlugin ? this.getAppData('tenant_id') : undefined,
+      businessCode: String(otherParams?.businessCode ?? otherParams?.business_code ?? '').trim(),
+      channel: String(otherParams?.channel || super.getSubmitOrderSalesChannel()).trim(),
+      platform: (0, _platform.normalizeRuntimePlatform)(otherParams?.platform),
+      timezone: this.getPickupTimingContextData('timezone'),
+      businessTimezone: otherParams?.businessTimezone,
+      cacheId: otherParams === this.otherParams ? this.cacheId : otherParams?.cacheId
+    });
+  }
+  resetRuntimeOpenData() {
+    this.runtimeOpenDataGeneration += 1;
+    this.runtimeOpenDataScope = null;
+    this.runtimeOpenDataSnapshot = null;
+    this.runtimeOpenDataModule = null;
+    this.runtimeOpenDataCore = undefined;
+    this.openDataTarget = null;
+    this.loadOpenDataInFlight = null;
+    this.loadOpenDataInFlightTarget = null;
+    this.otherParams = {
+      ...this.otherParams,
+      openData: null
+    };
+    this.store.openData?.clearCache?.();
+  }
+  async prepareInvoiceTemplateAtSolutionReady(injectedOpenData) {
+    const businessCode = this.getBookingTicketBusinessCode();
+    if (!businessCode || !this.store.openData) return;
+    if (injectedOpenData) {
+      this.otherParams.openData = injectedOpenData;
+      this.openDataTarget = `${businessCode}+${this.getSubmitOrderSalesChannel()}`;
+    }
+    try {
+      await this.loadOpenDataConfig();
+    } catch (error) {
+      console.warn('[UnifiedBookingSales] Invoice 模板预加载失败，使用默认配置', error);
+    }
+  }
+  async loadOpenDataConfig() {
+    const businessCode = this.getBookingTicketBusinessCode();
+    if (!businessCode) return null;
+    return this.loadOpenData({
+      businessCode,
+      channel: this.getSubmitOrderSalesChannel()
+    });
+  }
 
-  /**
-   * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
-   * business/channel target so a reused solution instance cannot leak another entry's menus.
-   */
+  /** A successful configuration belongs to this business runtime until an explicit refresh. */
   async loadOpenData(params) {
-    if (!this.store.openData) {
+    const module = this.store.openData;
+    if (!module) {
       throw new Error('[UnifiedBookingSales] openData 模块未初始化');
     }
+    if (this.runtimeOpenDataDestroyed) {
+      throw new Error('Store settings changed. Please try again.');
+    }
     const businessCode = String(params.businessCode || '').trim();
     const channel = String(params.channel || '').trim();
     if (!businessCode || !channel) {
       throw new Error('[UnifiedBookingSales] OpenData 需要 businessCode 与 channel');
     }
     const target = `${businessCode}+${channel}`;
-    const cachedData = this.store.openData.getOpenData();
-    const lastFetchedAt = this.store.openData.getLastFetchedAt();
-    if (!params.force && this.openDataTarget === target && cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
-      if (typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
-        await this.store.openData.ensureInvoiceTemplateSettings(target);
+    this.otherParams.businessCode = businessCode;
+    this.otherParams.channel = channel;
+    const scope = this.getRuntimeOpenDataScope();
+    if (params.force) {
+      this.clearOpenDataCache();
+    }
+    if (this.runtimeOpenDataScope !== scope || this.runtimeOpenDataModule !== module || this.runtimeOpenDataCore !== this.core) {
+      // Only the first, explicitly injected target may seed a new runtime snapshot.
+      const injectedOpenData = this.runtimeOpenDataScope === null && (!this.openDataTarget || this.openDataTarget === target) && isRecord(this.otherParams.openData) ? this.otherParams.openData : null;
+      if (this.runtimeOpenDataScope !== null) {
+        // The caller's Pickup Timing scope already changes with this runtime scope.
+        this.resetRuntimeOpenData();
       }
-      return cachedData;
+      this.runtimeOpenDataScope = scope;
+      this.runtimeOpenDataModule = module;
+      this.runtimeOpenDataCore = this.core;
+      this.runtimeOpenDataSnapshot = injectedOpenData;
     }
     if (this.loadOpenDataInFlight) {
-      if (this.loadOpenDataInFlightTarget === target) {
-        return await this.loadOpenDataInFlight;
+      return this.loadOpenDataInFlight;
+    }
+    const generation = this.runtimeOpenDataGeneration;
+    const core = this.core;
+    const request = (async () => {
+      let openData = this.runtimeOpenDataSnapshot;
+      if (openData) {
+        await module.ensureInvoiceTemplateSettings?.(target, openData);
+      } else {
+        openData = await module.fetchOpenData({
+          scope: 'board',
+          target,
+          section_code: [...OPEN_DATA_SECTION_CODES]
+        });
       }
-      await this.loadOpenDataInFlight;
-      return this.loadOpenData(params);
-    }
+      if (this.runtimeOpenDataDestroyed || generation !== this.runtimeOpenDataGeneration || scope !== this.getRuntimeOpenDataScope() || module !== this.store.openData || core !== this.core) {
+        throw new Error('Store settings changed. Please try again.');
+      }
+      this.runtimeOpenDataSnapshot = openData;
+      this.openDataTarget = target;
+      this.otherParams.openData = openData;
+      return openData;
+    })();
     this.loadOpenDataInFlightTarget = target;
-    const request = this.store.openData.fetchOpenData({
-      scope: 'board',
-      target,
-      section_code: [...OPEN_DATA_SECTION_CODES]
-    });
     this.loadOpenDataInFlight = request;
     try {
-      const openData = await request;
-      if (this.loadOpenDataInFlight === request) {
-        this.openDataTarget = target;
-        this.otherParams.openData = openData;
-        this.otherParams.businessCode = businessCode;
-        this.otherParams.channel = channel;
-      }
-      return openData;
+      return await request;
     } finally {
       if (this.loadOpenDataInFlight === request) {
         this.loadOpenDataInFlight = null;
@@ -1740,27 +1819,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     }
   }
   async getOpenData() {
-    const businessCode = String(this.otherParams?.businessCode || '').trim();
-    const channel = String(this.otherParams?.channel || '').trim();
-    if (!businessCode || !channel) return null;
-    return this.loadOpenData({
-      businessCode,
-      channel
-    });
+    return this.loadOpenDataConfig();
   }
-  async loadPickupTimingOpenData(force) {
+  async loadPickupTimingOpenData(_force) {
     const scope = this.getPickupTimingScope();
-    // A fresh validation must not borrow a request started for a previous store/context.
-    if (force && this.loadOpenDataInFlight) await this.loadOpenDataInFlight;
-    if (scope !== this.getPickupTimingScope()) {
-      throw new Error('Store settings changed. Please try again.');
-    }
     const businessCode = String(this.otherParams?.businessCode ?? this.otherParams?.business_code ?? '').trim();
-    const channel = String(this.getSubmitOrderSalesChannel() ?? '').trim();
     const config = await this.loadOpenData({
       businessCode,
-      channel,
-      force
+      channel: this.getSubmitOrderSalesChannel()
     });
     if (scope !== this.getPickupTimingScope()) {
       throw new Error('Store settings changed. Please try again.');
@@ -1860,10 +1926,8 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     });
   }
   clearOpenDataCache() {
-    this.openDataTarget = null;
-    this.loadOpenDataInFlight = null;
-    this.loadOpenDataInFlightTarget = null;
-    super.clearOpenDataCache();
+    this.resetRuntimeOpenData();
+    this.resetPickupTimingCache();
   }
   async getInvoiceLayoutConfig() {
     const openData = await this.getOpenData();
@@ -1883,7 +1947,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const businessCode = String(this.otherParams?.businessCode || '').trim();
     const channel = String(this.otherParams?.channel || '').trim();
     if (!businessCode || !channel) return false;
-    return this.openDataTarget === `${businessCode}+${channel}`;
+    return this.openDataTarget === `${businessCode}+${channel}` && this.runtimeOpenDataScope === this.getRuntimeOpenDataScope();
   }
 
   /**

package/package.json

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