@pisell/pisellos 2.3.73 → 2.3.75

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

@@ -10,6 +10,7 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private store;
     private request;
     private logger;
+    private dbManager;
     private floorPlanDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -28,6 +29,9 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private mergeItems;
     private removeByIds;
     private loadListFromServer;
+    private loadListFromSQLite;
+    private saveListToSQLite;
+    private refreshListFromServer;
     fetchByIdFromServer(id: number | string): Promise<FloorPlanItem | null>;
     fetchByCodeFromServer(code: string): Promise<FloorPlanItem | null>;
     preload(): Promise<void>;

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

@@ -1,101 +1,93 @@
-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/floor-plan/index.ts
-var floor_plan_exports = {};
-__export(floor_plan_exports, {
-  FloorPlanModule: () => FloorPlanModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(floor_plan_exports);
-var import_BaseModule = require("../../../modules/BaseModule");
-var import_types = require("./types");
-var FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3e3;
-var FloorPlanModule = class extends import_BaseModule.BaseModule {
+exports.FloorPlanModule = void 0;
+var _BaseModule = require("../../../modules/BaseModule");
+var _types = require("./types");
+const FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
+const FLOOR_PLAN_STORE_NAME = 'floor_plans';
+
+/**
+ * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
+ */
+class FloorPlanModule extends _BaseModule.BaseModule {
+  defaultName = 'floor_plan';
+  defaultVersion = '1.0.0';
+  store;
+  request;
+  logger;
+  dbManager;
+  floorPlanDataSource;
+  pendingSyncMessages = [];
+  syncTimer;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "floor_plan";
-    this.defaultVersion = "1.0.0";
-    this.pendingSyncMessages = [];
   }
   async initialize(core, options) {
-    var _a;
     this.core = core;
     this.store = options.store;
-    if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.list) && options.initialState.list.length > 0) {
+    if (Array.isArray(options?.initialState?.list) && options.initialState.list.length > 0) {
       this.store.list = options.initialState.list;
       this.syncMaps();
-      this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlansChanged, this.store.list);
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.store.list);
     } else {
       this.store.list = [];
-      this.store.map = /* @__PURE__ */ new Map();
-      this.store.codeMap = /* @__PURE__ */ new Map();
+      this.store.map = new Map();
+      this.store.codeMap = new Map();
     }
-    this.request = core.getPlugin("request");
-    const appPlugin = core.getPlugin("app");
+    this.request = core.getPlugin('request');
+    const appPlugin = core.getPlugin('app');
     if (appPlugin) {
       const app = appPlugin.getApp();
       this.logger = app.logger;
+      this.dbManager = app.sqlite || app.dbManager;
     }
     this.initFloorPlanDataSource();
     this.setupFloorPlanSync();
   }
   logInfo(title, metadata) {
-    var _a, _b;
     try {
-      (_b = (_a = this.logger) == null ? void 0 : _a.addLog) == null ? void 0 : _b.call(_a, {
-        type: "info",
+      this.logger?.addLog?.({
+        type: 'info',
         title: `[FloorPlanModule] ${title}`,
         metadata: metadata || {}
       });
     } catch {
+      // ignore
     }
   }
   logWarning(title, metadata) {
-    var _a, _b;
     try {
-      (_b = (_a = this.logger) == null ? void 0 : _a.addLog) == null ? void 0 : _b.call(_a, {
-        type: "warning",
+      this.logger?.addLog?.({
+        type: 'warning',
         title: `[FloorPlanModule] ${title}`,
         metadata: metadata || {}
       });
     } catch {
+      // ignore
     }
   }
   logError(title, metadata) {
-    var _a, _b;
     try {
-      (_b = (_a = this.logger) == null ? void 0 : _a.addLog) == null ? void 0 : _b.call(_a, {
-        type: "error",
+      this.logger?.addLog?.({
+        type: 'error',
         title: `[FloorPlanModule] ${title}`,
         metadata: metadata || {}
       });
     } catch {
+      // ignore
     }
   }
   idKey(id) {
     return String(id);
   }
   syncMaps() {
-    this.store.map = /* @__PURE__ */ new Map();
-    this.store.codeMap = /* @__PURE__ */ new Map();
+    this.store.map = new Map();
+    this.store.codeMap = new Map();
     for (const item of this.store.list) {
-      if ((item == null ? void 0 : item.id) == null)
-        continue;
+      if (item?.id == null) continue;
       const key = this.idKey(item.id);
       this.store.map.set(key, item);
       if (item.code) {
@@ -103,12 +95,12 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
       }
     }
   }
+
   /** 与接口约定一致：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;
+      if (sortDiff !== 0) return sortDiff;
       return Number(b.id) - Number(a.id);
     });
   }
@@ -119,56 +111,92 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
     return this.store.codeMap.get(String(code));
   }
   replaceStore(list) {
-    this.store.list = list.map((i) => ({ ...i }));
+    this.store.list = list.map(i => ({
+      ...i
+    }));
     this.syncMaps();
   }
   mergeItems(items) {
-    if (items.length === 0)
-      return;
+    if (items.length === 0) return;
     const byId = new Map(this.store.map);
     for (const item of items) {
-      if ((item == null ? void 0 : item.id) == null)
-        continue;
-      byId.set(this.idKey(item.id), { ...item });
+      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)));
+    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 res = await this.request.get(`/schedule/floor-plan`, {}, {
+        isShopApi: true
+      });
       const body = res;
-      const raw = (body == null ? void 0 : body.data) !== void 0 ? body.data : body;
+      const raw = body?.data !== undefined ? body.data : body;
       const list = Array.isArray(raw) ? raw : [];
       return list;
     } catch (e) {
-      this.logWarning("loadListFromServer 失败", {
+      this.logWarning('loadListFromServer 失败', {
         error: e instanceof Error ? e.message : String(e)
       });
       return [];
     }
   }
+  async loadListFromSQLite() {
+    if (!this.dbManager) return [];
+    try {
+      const list = await this.dbManager.getAll(FLOOR_PLAN_STORE_NAME);
+      return Array.isArray(list) ? list : [];
+    } catch (error) {
+      this.logWarning('从 SQLite 读取平面图失败', {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return [];
+    }
+  }
+  async saveListToSQLite(list) {
+    if (!this.dbManager) return;
+    try {
+      await this.dbManager.clear(FLOOR_PLAN_STORE_NAME);
+      if (list.length > 0) {
+        await this.dbManager.bulkAdd(FLOOR_PLAN_STORE_NAME, list);
+      }
+    } catch (error) {
+      this.logWarning('保存平面图到 SQLite 失败', {
+        count: list.length,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  async refreshListFromServer() {
+    const list = await this.loadListFromServer();
+    if (list.length === 0) {
+      this.logWarning('远端平面图刷新完成但列表为空');
+      return;
+    }
+    this.replaceStore(list);
+    await this.saveListToSQLite(list);
+    this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+    this.logInfo('远端平面图刷新完成', {
+      count: list.length
+    });
+  }
   async fetchByIdFromServer(id) {
     try {
-      const res = await this.request.get(
-        `/schedule/floor-plan/${id}`,
-        {},
-        { isShopApi: true }
-      );
+      const res = await this.request.get(`/schedule/floor-plan/${id}`, {}, {
+        isShopApi: true
+      });
       const body = res;
-      const data = (body == null ? void 0 : body.data) !== void 0 ? body.data : body;
-      return data && typeof data === "object" ? data : null;
+      const data = body?.data !== undefined ? body.data : body;
+      return data && typeof data === 'object' ? data : null;
     } catch {
       return null;
     }
@@ -176,81 +204,88 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
   async fetchByCodeFromServer(code) {
     try {
       const enc = encodeURIComponent(code);
-      const res = await this.request.get(
-        `/schedule/floor-plan/code/${enc}`,
-        {},
-        { isShopApi: true }
-      );
+      const res = await this.request.get(`/schedule/floor-plan/code/${enc}`, {}, {
+        isShopApi: true
+      });
       const body = res;
-      const data = (body == null ? void 0 : body.data) !== void 0 ? body.data : body;
-      return data && typeof data === "object" ? data : null;
+      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(import_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
-      this.logInfo("预加载完成", { count: list.length });
-    } else {
-      this.logWarning("预加载完成但列表为空");
+    this.logInfo('开始预加载平面图列表');
+    const cachedList = await this.loadListFromSQLite();
+    if (cachedList.length > 0) {
+      this.replaceStore(cachedList);
+      this.core.effects.emit(_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+      this.logInfo('预加载完成（SQLite）', {
+        count: cachedList.length
+      });
+
+      // 二次启动立即使用本地平面图，远端刷新完成后自动更新 store 与订阅者。
+      void this.refreshListFromServer().catch(error => {
+        this.logWarning('后台刷新平面图失败，继续使用本地数据', {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+      return;
     }
+
+    // 首次启动没有缓存时仍等待一次远端请求，并为后续启动建立缓存。
+    await this.refreshListFromServer();
   }
   initFloorPlanDataSource() {
-    var _a, _b;
-    const Ctor = (_b = (_a = this.core.serverOptions) == null ? void 0 : _a.All_DATA_SOURCES) == null ? void 0 : _b.FloorPlanDataSource;
+    const Ctor = this.core.serverOptions?.All_DATA_SOURCES?.FloorPlanDataSource;
     if (!Ctor) {
-      this.logWarning("FloorPlanDataSource 不可用，跳过 pubsub 同步");
+      this.logWarning('FloorPlanDataSource 不可用，跳过 pubsub 同步');
       return;
     }
     this.floorPlanDataSource = new Ctor();
-    this.logInfo("FloorPlanDataSource 实例已创建");
+    this.logInfo('FloorPlanDataSource 实例已创建');
   }
   setupFloorPlanSync() {
-    if (!this.floorPlanDataSource)
-      return;
+    if (!this.floorPlanDataSource) return;
     const flush = () => {
-      if (this.syncTimer)
-        clearTimeout(this.syncTimer);
+      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 == null ? void 0 : res.data) || res;
-          if (!data || data.module !== "floor_plan")
-            return;
-          this.pendingSyncMessages.push({ ...data });
+        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 出错", {
+    }).catch(err => {
+      this.logError('setupFloorPlanSync: DataSource run 出错', {
         error: err instanceof Error ? err.message : String(err)
       });
     });
-    this.logInfo("floor_plan pubsub 订阅已建立");
+    this.logInfo('floor_plan pubsub 订阅已建立');
   }
   async processFloorPlanSyncMessages() {
-    var _a, _b;
     const messages = [...this.pendingSyncMessages];
     this.pendingSyncMessages = [];
-    if (messages.length === 0)
-      return;
-    this.logInfo("processFloorPlanSyncMessages 开始", { count: messages.length });
+    if (messages.length === 0) return;
+    this.logInfo('processFloorPlanSyncMessages 开始', {
+      count: messages.length
+    });
     let changed = false;
     const deleteIds = [];
     const bodyItems = [];
     let needFullList = false;
-    const partialIds = /* @__PURE__ */ new Set();
+    const partialIds = new Set();
     for (const msg of messages) {
-      if (msg.operation === "delete" || msg.action === "delete") {
-        if ((_a = msg.ids) == null ? void 0 : _a.length) {
+      if (msg.operation === 'delete' || msg.action === 'delete') {
+        if (msg.ids?.length) {
           deleteIds.push(...msg.ids);
         } else if (msg.id != null) {
           deleteIds.push(msg.id);
@@ -258,7 +293,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
         continue;
       }
       const body = msg.body;
-      const hasBody = body && typeof body === "object" && Object.keys(body).length > 0 && body.id != null;
+      const hasBody = body && typeof body === 'object' && Object.keys(body).length > 0 && body.id != null;
       if (hasBody) {
         bodyItems.push(body);
         continue;
@@ -267,7 +302,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
         needFullList = true;
         continue;
       }
-      if (((_b = msg.ids) == null ? void 0 : _b.length) === 1) {
+      if (msg.ids?.length === 1) {
         partialIds.add(msg.ids[0]);
       } else if (msg.id != null) {
         partialIds.add(msg.id);
@@ -290,8 +325,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
       const fetched = [];
       for (const id of partialIds) {
         const one = await this.fetchByIdFromServer(id);
-        if (one)
-          fetched.push(one);
+        if (one) fetched.push(one);
       }
       if (fetched.length > 0) {
         this.mergeItems(fetched);
@@ -299,29 +333,27 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
       }
     }
     if (changed) {
-      this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
-      this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlanSyncCompleted, null);
+      await this.saveListToSQLite(this.store.list);
+      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();
+    await this.saveListToSQLite([]);
   }
   destroy() {
-    var _a;
     if (this.syncTimer) {
       clearTimeout(this.syncTimer);
-      this.syncTimer = void 0;
+      this.syncTimer = undefined;
     }
     this.pendingSyncMessages = [];
-    if ((_a = this.floorPlanDataSource) == null ? void 0 : _a.destroy) {
+    if (this.floorPlanDataSource?.destroy) {
       this.floorPlanDataSource.destroy();
     }
     super.destroy();
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  FloorPlanModule
-});
+}
+exports.FloorPlanModule = FloorPlanModule;

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

@@ -1,34 +1,19 @@
-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/floor-plan/types.ts
-var types_exports = {};
-__export(types_exports, {
-  FloorPlanHooks: () => FloorPlanHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(types_exports);
-var FloorPlanHooks = {
+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",
+  onFloorPlansChanged: 'server_floor_plan:onFloorPlansChanged',
   /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
-  onFloorPlanSyncCompleted: "server_floor_plan:onFloorPlanSyncCompleted"
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  FloorPlanHooks
-});
+  onFloorPlanSyncCompleted: 'server_floor_plan:onFloorPlanSyncCompleted'
+};