@pisell/pisellos 0.0.215 → 0.0.217

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/BookingTicket/utils/scan/handleScan.ts
@@ -24,6 +34,7 @@ __export(handleScan_exports, {
 });
 module.exports = __toCommonJS(handleScan_exports);
 var import_cloudSearch = require("./cloudSearch");
+var import_scanCache = __toESM(require("./scanCache"));
 var promiseAny = async (promises) => {
   if (promises.length === 0) {
     throw new Error("No promises provided");
@@ -47,9 +58,49 @@ var promiseAny = async (promises) => {
     });
   });
 };
-var handleGlobalScan = (request) => {
+var handleScanFn = (getRequestList, localSearch) => {
   return async (scanResult) => {
     const { value } = scanResult || {};
+    try {
+      const localResult = localSearch == null ? void 0 : localSearch(value);
+      if ((localResult == null ? void 0 : localResult.length) > 0) {
+        console.log("本地搜索到数据>>>>>>>", localResult);
+        return {
+          searchType: "local_product",
+          response: { data: { list: localResult } }
+        };
+      } else {
+        console.log("本地搜索无数据>>>>>>>");
+      }
+    } catch (error) {
+      console.error("本地搜索到数据失败>>>>>>>", error);
+    }
+    try {
+      if (import_scanCache.default.has(value)) {
+        const result = import_scanCache.default.get(value);
+        console.log("缓存中搜索到数据>>>>>>>", result);
+        return result;
+      } else {
+        console.log("缓存中无数据>>>>>>>");
+      }
+    } catch (error) {
+      console.error("缓存中搜索数据失败>>>>>>>", error);
+    }
+    const requestList = (getRequestList == null ? void 0 : getRequestList(value)) || [];
+    if (requestList.length === 0) {
+      throw new Error("requestList is empty");
+    }
+    try {
+      const result = await promiseAny(requestList);
+      import_scanCache.default.set(value, result);
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+var handleGlobalScan = (request, localSearch) => {
+  const getRequestList = (value) => {
     let requestList = [];
     if (value.startsWith("WL")) {
       requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
@@ -60,17 +111,12 @@ var handleGlobalScan = (request) => {
         (0, import_cloudSearch.searchProduct)(request, value)
       ];
     }
-    try {
-      const result = await promiseAny(requestList);
-      return result;
-    } catch (error) {
-      throw error;
-    }
+    return requestList;
   };
+  return handleScanFn(getRequestList, localSearch);
 };
-var handleCustomerScan = (request) => {
-  return async (scanResult) => {
-    const { value } = scanResult || {};
+var handleCustomerScan = (request, localSearch) => {
+  const getRequestList = (value) => {
     let requestList = [];
     if (value.startsWith("WL")) {
       requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
@@ -80,13 +126,9 @@ var handleCustomerScan = (request) => {
         (0, import_cloudSearch.searchWallet)(request, value)
       ];
     }
-    try {
-      const result = await Promise.race(requestList);
-      return result;
-    } catch (error) {
-      throw error;
-    }
+    return requestList;
   };
+  return handleScanFn(getRequestList, localSearch);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingTicket/utils/scan/index.d.ts

@@ -2,10 +2,18 @@ import { WatchEventItem } from '../../../../utils/watch';
 import { BookingTicketImpl } from '../../index';
 import Tasks from '../../../../utils/task';
 interface ScanResult {
-    type: string;
+    type: ScanResultType;
     value: string;
+    data?: {
+        [key: string]: any;
+    };
+}
+declare enum ScanResultType {
+    Scanner = "scanner",
+    NFC = "nfc",
+    NativeScanner = "nativeScanner"
 }
-export declare class Scan {
+export default class Scan {
     private solution;
     private watchKey;
     private listenerConfig;
@@ -15,7 +23,7 @@ export declare class Scan {
      * @param watchKey 监听的key
      * @param event 事件
      */
-    addListener(event: WatchEventItem, callback?: (result: ScanResult) => Promise<any>): {
+    addListener(event: WatchEventItem, scanCallback?: (result: ScanResult) => Promise<any>): {
         remove: () => void;
     };
     /**
@@ -39,7 +47,7 @@ export declare class Scan {
      * @returns 监听配置
      */
     getListenerConfig(eventKey: string): {
-        callback?: ((result: ScanResult) => Promise<any>) | undefined;
+        scanCallback?: ((result: ScanResult) => Promise<any>) | undefined;
         task: Tasks;
     } | undefined;
     /**

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

@@ -29,7 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingTicket/utils/scan/index.ts
 var scan_exports = {};
 __export(scan_exports, {
-  Scan: () => Scan
+  default: () => Scan
 });
 module.exports = __toCommonJS(scan_exports);
 var import_watch = __toESM(require("../../../../utils/watch"));
@@ -37,17 +37,13 @@ var import_task = __toESM(require("../../../../utils/task"));
 var Scan = class {
   constructor(solution, watchKey) {
     this.listenerConfig = /* @__PURE__ */ new Map();
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     this.solution = solution;
     this.watchKey = watchKey;
-    console.log(
-      "this.solution?.window?.interaction",
-      (_a = solution == null ? void 0 : solution.window) == null ? void 0 : _a.interaction
-    );
-    (_f = (_e = (_d = (_c = (_b = this.solution) == null ? void 0 : _b.window) == null ? void 0 : _c.interaction) == null ? void 0 : _d.utils) == null ? void 0 : _e.mountFunction) == null ? void 0 : _f.call(
-      _e,
+    (_e = (_d = (_c = (_b = (_a = this.solution) == null ? void 0 : _a.window) == null ? void 0 : _b.interaction) == null ? void 0 : _c.utils) == null ? void 0 : _d.mountFunction) == null ? void 0 : _e.call(
+      _d,
       "global",
-      "nativeScannerResult",
+      "peripheralsResult",
       (strVal) => {
         try {
           const result = JSON.parse(strVal);
@@ -64,14 +60,14 @@ var Scan = class {
    * @param watchKey 监听的key
    * @param event 事件
    */
-  addListener(event, callback) {
+  addListener(event, scanCallback) {
     import_watch.default.subscribe(this.watchKey, event);
     const task = new import_task.default();
     task.addAction(
       event.key,
       (...args) => this.handleScanResultFn(event.key, ...args)
     );
-    this.listenerConfig.set(event.key, { callback, task });
+    this.listenerConfig.set(event.key, { scanCallback, task });
     return {
       remove: () => {
         this.removeListener(event);
@@ -124,30 +120,30 @@ var Scan = class {
   async handleScanResultFn(...args) {
     var _a;
     const [eventKey, other] = args;
-    const { type, value } = (other == null ? void 0 : other.scanResult) || {};
-    const listenerCallback = (_a = this.getListenerConfig(eventKey)) == null ? void 0 : _a.callback;
-    if (listenerCallback) {
+    const { type, value, data } = (other == null ? void 0 : other.scanResult) || {};
+    const scanCallback = (_a = this.getListenerConfig(eventKey)) == null ? void 0 : _a.scanCallback;
+    if (scanCallback) {
       try {
-        const result = await listenerCallback({ type, value });
+        const result = await scanCallback({ type, value });
+        console.log(`${eventKey}_result>>>>>>>`, result);
         import_watch.default.publishByEventKey(this.watchKey, eventKey, {
           type: eventKey,
           status: "success",
           scanType: type,
           scanCode: value,
+          scanData: data,
           result
         });
       } catch (error) {
+        console.log(`${eventKey}_result_error>>>>>>>`, error);
         import_watch.default.publishByEventKey(this.watchKey, eventKey, {
           type: eventKey,
           status: "failed",
           scanType: type,
-          scanCode: value
+          scanCode: value,
+          scanData: data
         });
       }
     }
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Scan
-});

package/lib/solution/BookingTicket/utils/scan/scanCache.d.ts

@@ -0,0 +1,78 @@
+/**
+ * LRU缓存类，用于缓存接口数据
+ * 限制最多存储100条数据，超过时移除最久未使用的数据
+ * 支持数据压缩以减小缓存压力
+ * 尾部优先策略：新节点插入尾部，最近使用的节点移动到尾部，删除头部节点
+ */
+declare class LRUCache<T> {
+    private head;
+    private tail;
+    private keyMap;
+    private readonly maxSize;
+    constructor(maxSize?: number);
+    /**
+     * 将节点移动到链表尾部（最近使用）
+     * @param node 要移动的节点
+     */
+    private moveToTail;
+    /**
+     * 添加新节点到链表尾部
+     * @param key 缓存键
+     * @param compressedData 压缩后的数据
+     * @param timestamp 时间戳
+     */
+    private addToTail;
+    /**
+     * 从链表中移除节点
+     * @param node 要移除的节点
+     */
+    private removeNode;
+    /**
+     * 移除最久未使用的节点（链表头部）
+     */
+    private removeOldest;
+    /**
+     * 设置缓存
+     * @param key 缓存键
+     * @param data 缓存数据
+     */
+    set(key: string, data: T): void;
+    /**
+     * 获取缓存
+     * @param key 缓存键
+     * @returns 缓存数据或undefined
+     */
+    get(key: string): T | undefined;
+    /**
+     * 检查是否存在缓存
+     * @param key 缓存键
+     * @returns 是否存在
+     */
+    has(key: string): boolean;
+    /**
+     * 清除所有缓存
+     */
+    clear(): void;
+    /**
+     * 获取缓存大小
+     * @returns 当前缓存数量
+     */
+    size(): number;
+    /**
+     * 获取缓存统计信息
+     * @returns 缓存统计信息
+     */
+    getStats(): {
+        size: number;
+        maxSize: number;
+        usage: number;
+    };
+    /**
+     * 删除指定的缓存项
+     * @param key 要删除的缓存键
+     * @returns 是否删除成功
+     */
+    delete(key: string): boolean;
+}
+declare const scanCache: LRUCache<any>;
+export default scanCache;

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

@@ -0,0 +1,231 @@
+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);
+
+// src/solution/BookingTicket/utils/scan/scanCache.ts
+var scanCache_exports = {};
+__export(scanCache_exports, {
+  default: () => scanCache_default
+});
+module.exports = __toCommonJS(scanCache_exports);
+var compressData = (data) => {
+  try {
+    if (data === void 0) {
+      return "undefined";
+    }
+    return JSON.stringify(data);
+  } catch (error) {
+    console.warn("数据压缩失败:", error);
+    return JSON.stringify(data);
+  }
+};
+var decompressData = (compressedData) => {
+  try {
+    if (compressedData === "undefined") {
+      return void 0;
+    }
+    return JSON.parse(compressedData);
+  } catch (error) {
+    console.warn("数据解压缩失败:", error);
+    return null;
+  }
+};
+var LRUCache = class {
+  constructor(maxSize = 100) {
+    this.head = null;
+    // 最久未使用的节点
+    this.tail = null;
+    // 最近使用的节点
+    this.keyMap = /* @__PURE__ */ new Map();
+    this.maxSize = maxSize;
+  }
+  /**
+   * 将节点移动到链表尾部（最近使用）
+   * @param node 要移动的节点
+   */
+  moveToTail(node) {
+    if (this.tail === node)
+      return;
+    if (node.prev) {
+      node.prev.next = node.next;
+    }
+    if (node.next) {
+      node.next.prev = node.prev;
+    }
+    if (this.head === node) {
+      this.head = node.next;
+    }
+    if (this.tail) {
+      this.tail.next = node;
+    }
+    node.prev = this.tail;
+    node.next = null;
+    this.tail = node;
+    if (!this.head) {
+      this.head = node;
+    }
+  }
+  /**
+   * 添加新节点到链表尾部
+   * @param key 缓存键
+   * @param compressedData 压缩后的数据
+   * @param timestamp 时间戳
+   */
+  addToTail(key, compressedData, timestamp) {
+    const oldTail = this.tail;
+    const node = {
+      key,
+      compressedData,
+      timestamp,
+      prev: oldTail,
+      // 使用保存的引用，避免循环引用
+      next: null
+    };
+    this.keyMap.set(key, node);
+    if (oldTail) {
+      oldTail.next = node;
+    }
+    this.tail = node;
+    if (!this.head) {
+      this.head = node;
+    }
+    return node;
+  }
+  /**
+   * 从链表中移除节点
+   * @param node 要移除的节点
+   */
+  removeNode(node) {
+    if (node.prev) {
+      node.prev.next = node.next;
+    }
+    if (node.next) {
+      node.next.prev = node.prev;
+    }
+    if (this.head === node) {
+      this.head = node.next;
+    }
+    if (this.tail === node) {
+      this.tail = node.prev;
+    }
+    this.keyMap.delete(node.key);
+  }
+  /**
+   * 移除最久未使用的节点（链表头部）
+   */
+  removeOldest() {
+    if (this.head) {
+      this.removeNode(this.head);
+    }
+  }
+  /**
+   * 设置缓存
+   * @param key 缓存键
+   * @param data 缓存数据
+   */
+  set(key, data) {
+    const compressedData = compressData(data);
+    const timestamp = Date.now();
+    const existingNode = this.keyMap.get(key);
+    if (existingNode) {
+      existingNode.compressedData = compressedData;
+      existingNode.timestamp = timestamp;
+      this.moveToTail(existingNode);
+    } else {
+      if (this.keyMap.size >= this.maxSize) {
+        this.removeOldest();
+      }
+      this.addToTail(key, compressedData, timestamp);
+    }
+  }
+  /**
+   * 获取缓存
+   * @param key 缓存键
+   * @returns 缓存数据或undefined
+   */
+  get(key) {
+    const node = this.keyMap.get(key);
+    if (node) {
+      const decompressedData = decompressData(node.compressedData);
+      if (decompressedData !== null) {
+        node.timestamp = Date.now();
+        this.moveToTail(node);
+        return decompressedData;
+      } else {
+        this.removeNode(node);
+        return void 0;
+      }
+    }
+    return void 0;
+  }
+  /**
+   * 检查是否存在缓存
+   * @param key 缓存键
+   * @returns 是否存在
+   */
+  has(key) {
+    return this.keyMap.has(key);
+  }
+  /**
+   * 清除所有缓存
+   */
+  clear() {
+    let current = this.head;
+    while (current) {
+      const next = current.next;
+      current.prev = null;
+      current.next = null;
+      current = next;
+    }
+    this.keyMap.clear();
+    this.head = null;
+    this.tail = null;
+  }
+  /**
+   * 获取缓存大小
+   * @returns 当前缓存数量
+   */
+  size() {
+    return this.keyMap.size;
+  }
+  /**
+   * 获取缓存统计信息
+   * @returns 缓存统计信息
+   */
+  getStats() {
+    return {
+      size: this.keyMap.size,
+      maxSize: this.maxSize,
+      usage: Math.round(this.keyMap.size / this.maxSize * 100)
+    };
+  }
+  /**
+   * 删除指定的缓存项
+   * @param key 要删除的缓存键
+   * @returns 是否删除成功
+   */
+  delete(key) {
+    const node = this.keyMap.get(key);
+    if (node) {
+      this.removeNode(node);
+      return true;
+    }
+    return false;
+  }
+};
+var scanCache = new LRUCache();
+var scanCache_default = scanCache;

package/package.json

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