@pisell/pisellos 0.0.567 → 0.0.569

package/lib/server/modules/floor-plan/index.d.ts

@@ -0,0 +1,39 @@
+import { Module, PisellCore } from '../../../types';
+import { BaseModule } from '../../../modules/BaseModule';
+import { type FloorPlanItem } from './types';
+/**
+ * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
+ */
+export declare class FloorPlanModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private request;
+    private logger;
+    private floorPlanDataSource;
+    private pendingSyncMessages;
+    private syncTimer?;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: any): Promise<void>;
+    private logInfo;
+    private logWarning;
+    private logError;
+    private idKey;
+    private syncMaps;
+    /** 与接口约定一致：sort 升序，id 降序 */
+    getSortedList(): FloorPlanItem[];
+    getById(id: number | string): FloorPlanItem | undefined;
+    getByCode(code: string): FloorPlanItem | undefined;
+    private replaceStore;
+    private mergeItems;
+    private removeByIds;
+    private loadListFromServer;
+    fetchByIdFromServer(id: number | string): Promise<FloorPlanItem | null>;
+    fetchByCodeFromServer(code: string): Promise<FloorPlanItem | null>;
+    preload(): Promise<void>;
+    private initFloorPlanDataSource;
+    private setupFloorPlanSync;
+    private processFloorPlanSyncMessages;
+    clear(): Promise<void>;
+    destroy(): void;
+}

package/lib/server/modules/floor-plan/index.js

@@ -0,0 +1,306 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FloorPlanModule = void 0;
+var _BaseModule = require("../../../modules/BaseModule");
+var _types = require("./types");
+const FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
+
+/**
+ * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
+ */
+class FloorPlanModule extends _BaseModule.BaseModule {
+  defaultName = 'floor_plan';
+  defaultVersion = '1.0.0';
+  store;
+  request;
+  logger;
+  floorPlanDataSource;
+  pendingSyncMessages = [];
+  syncTimer;
+  constructor(name, version) {
+    super(name, version);
+  }
+  async initialize(core, options) {
+    this.core = core;
+    this.store = options.store;
+    if (Array.isArray(options?.initialState?.list) && options.initialState.list.length > 0) {
+      this.store.list = options.initialState.list;
+      this.syncMaps();
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.store.list);
+    } else {
+      this.store.list = [];
+      this.store.map = new Map();
+      this.store.codeMap = new Map();
+    }
+    this.request = core.getPlugin('request');
+    const appPlugin = core.getPlugin('app');
+    if (appPlugin) {
+      const app = appPlugin.getApp();
+      this.logger = app.logger;
+    }
+    this.initFloorPlanDataSource();
+    this.setupFloorPlanSync();
+  }
+  logInfo(title, metadata) {
+    try {
+      this.logger?.addLog?.({
+        type: 'info',
+        title: `[FloorPlanModule] ${title}`,
+        metadata: metadata || {}
+      });
+    } catch {
+      // ignore
+    }
+  }
+  logWarning(title, metadata) {
+    try {
+      this.logger?.addLog?.({
+        type: 'warning',
+        title: `[FloorPlanModule] ${title}`,
+        metadata: metadata || {}
+      });
+    } catch {
+      // ignore
+    }
+  }
+  logError(title, metadata) {
+    try {
+      this.logger?.addLog?.({
+        type: 'error',
+        title: `[FloorPlanModule] ${title}`,
+        metadata: metadata || {}
+      });
+    } catch {
+      // ignore
+    }
+  }
+  idKey(id) {
+    return String(id);
+  }
+  syncMaps() {
+    this.store.map = new Map();
+    this.store.codeMap = new Map();
+    for (const item of this.store.list) {
+      if (item?.id == null) continue;
+      const key = this.idKey(item.id);
+      this.store.map.set(key, item);
+      if (item.code) {
+        this.store.codeMap.set(String(item.code), item);
+      }
+    }
+  }
+
+  /** 与接口约定一致：sort 升序，id 降序 */
+  getSortedList() {
+    return [...this.store.list].sort((a, b) => {
+      const sortDiff = Number(a.sort ?? 0) - Number(b.sort ?? 0);
+      if (sortDiff !== 0) return sortDiff;
+      return Number(b.id) - Number(a.id);
+    });
+  }
+  getById(id) {
+    return this.store.map.get(this.idKey(id));
+  }
+  getByCode(code) {
+    return this.store.codeMap.get(String(code));
+  }
+  replaceStore(list) {
+    this.store.list = list.map(i => ({
+      ...i
+    }));
+    this.syncMaps();
+  }
+  mergeItems(items) {
+    if (items.length === 0) return;
+    const byId = new Map(this.store.map);
+    for (const item of items) {
+      if (item?.id == null) continue;
+      byId.set(this.idKey(item.id), {
+        ...item
+      });
+    }
+    this.store.list = Array.from(byId.values());
+    this.syncMaps();
+  }
+  removeByIds(ids) {
+    if (ids.length === 0) return;
+    const set = new Set(ids.map(id => this.idKey(id)));
+    this.store.list = this.store.list.filter(p => !set.has(this.idKey(p.id)));
+    this.syncMaps();
+  }
+  async loadListFromServer() {
+    try {
+      const res = await this.request.get(`/schedule/floor-plan`, {}, {
+        isShopApi: true
+      });
+      const body = res;
+      const raw = body?.data !== undefined ? body.data : body;
+      const list = Array.isArray(raw) ? raw : [];
+      return list;
+    } catch (e) {
+      this.logWarning('loadListFromServer 失败', {
+        error: e instanceof Error ? e.message : String(e)
+      });
+      return [];
+    }
+  }
+  async fetchByIdFromServer(id) {
+    try {
+      const res = await this.request.get(`/schedule/floor-plan/${id}`, {}, {
+        isShopApi: true
+      });
+      const body = res;
+      const data = body?.data !== undefined ? body.data : body;
+      return data && typeof data === 'object' ? data : null;
+    } catch {
+      return null;
+    }
+  }
+  async fetchByCodeFromServer(code) {
+    try {
+      const enc = encodeURIComponent(code);
+      const res = await this.request.get(`/schedule/floor-plan/code/${enc}`, {}, {
+        isShopApi: true
+      });
+      const body = res;
+      const data = body?.data !== undefined ? body.data : body;
+      return data && typeof data === 'object' ? data : null;
+    } catch {
+      return null;
+    }
+  }
+  async preload() {
+    this.logInfo('开始预加载平面图列表');
+    const list = await this.loadListFromServer();
+    if (list.length > 0) {
+      this.replaceStore(list);
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+      this.logInfo('预加载完成', {
+        count: list.length
+      });
+    } else {
+      this.logWarning('预加载完成但列表为空');
+    }
+  }
+  initFloorPlanDataSource() {
+    const Ctor = this.core.serverOptions?.All_DATA_SOURCES?.FloorPlanDataSource;
+    if (!Ctor) {
+      this.logWarning('FloorPlanDataSource 不可用，跳过 pubsub 同步');
+      return;
+    }
+    this.floorPlanDataSource = new Ctor();
+    this.logInfo('FloorPlanDataSource 实例已创建');
+  }
+  setupFloorPlanSync() {
+    if (!this.floorPlanDataSource) return;
+    const flush = () => {
+      if (this.syncTimer) clearTimeout(this.syncTimer);
+      this.syncTimer = setTimeout(() => {
+        this.processFloorPlanSyncMessages();
+      }, FLOOR_PLAN_SYNC_DEBOUNCE_MS);
+    };
+    this.floorPlanDataSource.run({
+      pubsub: {
+        callback: res => {
+          const data = res?.data || res;
+          if (!data || data.module !== 'floor_plan') return;
+          this.pendingSyncMessages.push({
+            ...data
+          });
+          flush();
+        }
+      }
+    }).catch(err => {
+      this.logError('setupFloorPlanSync: DataSource run 出错', {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    });
+    this.logInfo('floor_plan pubsub 订阅已建立');
+  }
+  async processFloorPlanSyncMessages() {
+    const messages = [...this.pendingSyncMessages];
+    this.pendingSyncMessages = [];
+    if (messages.length === 0) return;
+    this.logInfo('processFloorPlanSyncMessages 开始', {
+      count: messages.length
+    });
+    let changed = false;
+    const deleteIds = [];
+    const bodyItems = [];
+    let needFullList = false;
+    const partialIds = new Set();
+    for (const msg of messages) {
+      if (msg.operation === 'delete' || msg.action === 'delete') {
+        if (msg.ids?.length) {
+          deleteIds.push(...msg.ids);
+        } else if (msg.id != null) {
+          deleteIds.push(msg.id);
+        }
+        continue;
+      }
+      const body = msg.body;
+      const hasBody = body && typeof body === 'object' && Object.keys(body).length > 0 && body.id != null;
+      if (hasBody) {
+        bodyItems.push(body);
+        continue;
+      }
+      if (msg.ids && msg.ids.length > 1) {
+        needFullList = true;
+        continue;
+      }
+      if (msg.ids?.length === 1) {
+        partialIds.add(msg.ids[0]);
+      } else if (msg.id != null) {
+        partialIds.add(msg.id);
+      }
+    }
+    const uniqueDeletes = [...new Set(deleteIds)];
+    if (uniqueDeletes.length > 0) {
+      this.removeByIds(uniqueDeletes);
+      changed = true;
+    }
+    if (bodyItems.length > 0) {
+      this.mergeItems(bodyItems);
+      changed = true;
+    }
+    if (needFullList) {
+      const list = await this.loadListFromServer();
+      this.replaceStore(list);
+      changed = true;
+    } else if (partialIds.size > 0) {
+      const fetched = [];
+      for (const id of partialIds) {
+        const one = await this.fetchByIdFromServer(id);
+        if (one) fetched.push(one);
+      }
+      if (fetched.length > 0) {
+        this.mergeItems(fetched);
+        changed = true;
+      }
+    }
+    if (changed) {
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlanSyncCompleted, null);
+    }
+  }
+  async clear() {
+    this.store.list = [];
+    this.store.map.clear();
+    this.store.codeMap.clear();
+  }
+  destroy() {
+    if (this.syncTimer) {
+      clearTimeout(this.syncTimer);
+      this.syncTimer = undefined;
+    }
+    this.pendingSyncMessages = [];
+    if (this.floorPlanDataSource?.destroy) {
+      this.floorPlanDataSource.destroy();
+    }
+    super.destroy();
+  }
+}
+exports.FloorPlanModule = FloorPlanModule;

package/lib/server/modules/floor-plan/types.d.ts

@@ -0,0 +1,43 @@
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+export interface FloorPlanItem {
+    id: number;
+    shop_id?: number;
+    code: string;
+    name: string | Record<string, string>;
+    layout: unknown[];
+    canvas_width: number;
+    canvas_height: number;
+    sort: number;
+    status: number;
+    created_at?: string;
+    updated_at?: string;
+}
+export interface FloorPlanState {
+    list: FloorPlanItem[];
+    map: Map<string, FloorPlanItem>;
+    codeMap: Map<string, FloorPlanItem>;
+}
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+export interface FloorPlanSyncMessage {
+    module?: string;
+    action?: string;
+    operation?: string;
+    id?: number;
+    ids?: number[];
+    body?: Partial<FloorPlanItem> & {
+        id?: number;
+    };
+    message_uuid?: string;
+    timestamp?: string;
+    _channelKey?: string;
+}
+export declare const FloorPlanHooks: {
+    /** 本地列表变更（预加载、合并、删除后） */
+    readonly onFloorPlansChanged: "server_floor_plan:onFloorPlansChanged";
+    /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+    readonly onFloorPlanSyncCompleted: "server_floor_plan:onFloorPlanSyncCompleted";
+};
+export type FloorPlanHooksType = (typeof FloorPlanHooks)[keyof typeof FloorPlanHooks];

package/lib/server/modules/floor-plan/types.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FloorPlanHooks = void 0;
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+
+const FloorPlanHooks = exports.FloorPlanHooks = {
+  /** 本地列表变更（预加载、合并、删除后） */
+  onFloorPlansChanged: 'server_floor_plan:onFloorPlansChanged',
+  /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+  onFloorPlanSyncCompleted: 'server_floor_plan:onFloorPlanSyncCompleted'
+};

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

@@ -3,7 +3,7 @@
  * 包含新增的 Products、Menu、Quotation 和扩展的 Schedule 模块
  */
 export { ProductsModule } from './products';
-export type { ProductsState } from './products/types';
+export type { ProductIdScope, ProductsState } from './products/types';
 export { ProductsHooks } from './products/types';
 export { MenuModule } from './menu';
 export type { MenuState, MenuData } from './menu/types';
@@ -14,8 +14,13 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
-export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
 export { OrderHooks } from './order/types';
+export { PaymentServerModule } from './payment';
+export type { PaymentMethod, PaymentMethodsChangedEventData, PaymentServerState } from './payment/types';
+export { FloorPlanModule } from './floor-plan';
+export type { FloorPlanItem, FloorPlanState, FloorPlanSyncMessage } from './floor-plan/types';
+export { FloorPlanHooks } from './floor-plan/types';
 export { ResourceModule, resourceModule } from './resource';
 export type { ResourceState, ResourceData, ResourceId, ResourceBooking, ResourcePageQuery, ResourcePageResult, QueryOptions, ScheduleEventResource, } from './resource';
 export { ResourceHooks } from './resource';

package/lib/server/modules/index.js

@@ -1,61 +1,108 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/server/modules/index.ts
-var modules_exports = {};
-__export(modules_exports, {
-  MenuHooks: () => import_types2.MenuHooks,
-  MenuModule: () => import_menu.MenuModule,
-  OrderHooks: () => import_types4.OrderHooks,
-  OrderModule: () => import_order.OrderModule,
-  ProductsHooks: () => import_types.ProductsHooks,
-  ProductsModule: () => import_products.ProductsModule,
-  QuotationHooks: () => import_types3.QuotationHooks,
-  QuotationModule: () => import_quotation.QuotationModule,
-  ResourceHooks: () => import_resource2.ResourceHooks,
-  ResourceModule: () => import_resource.ResourceModule,
-  ScheduleModuleEx: () => import_schedule.ScheduleModuleEx,
-  resourceModule: () => import_resource.resourceModule
-});
-module.exports = __toCommonJS(modules_exports);
-var import_products = require("./products");
-var import_types = require("./products/types");
-var import_menu = require("./menu");
-var import_types2 = require("./menu/types");
-var import_quotation = require("./quotation");
-var import_types3 = require("./quotation/types");
-var import_schedule = require("./schedule");
-var import_order = require("./order");
-var import_types4 = require("./order/types");
-var import_resource = require("./resource");
-var import_resource2 = require("./resource");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  MenuHooks,
-  MenuModule,
-  OrderHooks,
-  OrderModule,
-  ProductsHooks,
-  ProductsModule,
-  QuotationHooks,
-  QuotationModule,
-  ResourceHooks,
-  ResourceModule,
-  ScheduleModuleEx,
-  resourceModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+Object.defineProperty(exports, "FloorPlanHooks", {
+  enumerable: true,
+  get: function () {
+    return _types5.FloorPlanHooks;
+  }
+});
+Object.defineProperty(exports, "FloorPlanModule", {
+  enumerable: true,
+  get: function () {
+    return _floorPlan.FloorPlanModule;
+  }
+});
+Object.defineProperty(exports, "MenuHooks", {
+  enumerable: true,
+  get: function () {
+    return _types2.MenuHooks;
+  }
+});
+Object.defineProperty(exports, "MenuModule", {
+  enumerable: true,
+  get: function () {
+    return _menu.MenuModule;
+  }
+});
+Object.defineProperty(exports, "OrderHooks", {
+  enumerable: true,
+  get: function () {
+    return _types4.OrderHooks;
+  }
+});
+Object.defineProperty(exports, "OrderModule", {
+  enumerable: true,
+  get: function () {
+    return _order.OrderModule;
+  }
+});
+Object.defineProperty(exports, "PaymentServerModule", {
+  enumerable: true,
+  get: function () {
+    return _payment.PaymentServerModule;
+  }
+});
+Object.defineProperty(exports, "ProductsHooks", {
+  enumerable: true,
+  get: function () {
+    return _types.ProductsHooks;
+  }
+});
+Object.defineProperty(exports, "ProductsModule", {
+  enumerable: true,
+  get: function () {
+    return _products.ProductsModule;
+  }
+});
+Object.defineProperty(exports, "QuotationHooks", {
+  enumerable: true,
+  get: function () {
+    return _types3.QuotationHooks;
+  }
+});
+Object.defineProperty(exports, "QuotationModule", {
+  enumerable: true,
+  get: function () {
+    return _quotation.QuotationModule;
+  }
+});
+Object.defineProperty(exports, "ResourceHooks", {
+  enumerable: true,
+  get: function () {
+    return _resource.ResourceHooks;
+  }
+});
+Object.defineProperty(exports, "ResourceModule", {
+  enumerable: true,
+  get: function () {
+    return _resource.ResourceModule;
+  }
+});
+Object.defineProperty(exports, "ScheduleModuleEx", {
+  enumerable: true,
+  get: function () {
+    return _schedule.ScheduleModuleEx;
+  }
+});
+Object.defineProperty(exports, "resourceModule", {
+  enumerable: true,
+  get: function () {
+    return _resource.resourceModule;
+  }
+});
+var _products = require("./products");
+var _types = require("./products/types");
+var _menu = require("./menu");
+var _types2 = require("./menu/types");
+var _quotation = require("./quotation");
+var _types3 = require("./quotation/types");
+var _schedule = require("./schedule");
+var _order = require("./order");
+var _types4 = require("./order/types");
+var _payment = require("./payment");
+var _floorPlan = require("./floor-plan");
+var _types5 = require("./floor-plan/types");
+var _resource = require("./resource");