@pisell/pisellos 0.0.567 → 0.0.569

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

@@ -1,56 +1,35 @@
-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)
-    __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 __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);
+"use strict";
 
-// src/solution/BookingTicket/utils/scan/handleScan.ts
-var handleScan_exports = {};
-__export(handleScan_exports, {
-  handleCustomerScan: () => handleCustomerScan,
-  handleGlobalScan: () => handleGlobalScan,
-  handleUniversalScan: () => handleUniversalScan
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(handleScan_exports);
-var import_cloudSearch = require("./cloudSearch");
-var import_scanCache = __toESM(require("./scanCache"));
-var promiseAny = async (promises) => {
+exports.handleUniversalScan = exports.handleGlobalScan = exports.handleCustomerScan = void 0;
+var _cloudSearch = require("./cloudSearch");
+var _scanCache = _interopRequireDefault(require("./scanCache"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Promise.any 的替代实现
+ * 返回第一个成功解析的 Promise，如果所有 Promise 都失败则抛出错误
+ * @param promises Promise 数组
+ * @returns 第一个成功的结果
+ */
+const promiseAny = async promises => {
   if (promises.length === 0) {
-    throw new Error("No promises provided");
+    throw new Error('No promises provided');
   }
   const errors = [];
   let completedCount = 0;
   return new Promise((resolve, reject) => {
     promises.forEach((promise, index) => {
-      promise.then((result) => {
+      promise.then(result => {
         resolve(result);
-      }).catch((error) => {
+      }).catch(error => {
         errors[index] = error;
         completedCount++;
+
+        // 如果所有 Promise 都失败了，抛出包含所有错误的错误
         if (completedCount === promises.length) {
-          const errorMessage = `All promises were rejected. Errors: ${errors.map((e) => e.message).join(", ")}`;
+          const errorMessage = `All promises were rejected. Errors: ${errors.map(e => e.message).join(', ')}`;
           const combinedError = new Error(errorMessage);
           combinedError.errors = errors;
           reject(combinedError);
@@ -59,74 +38,99 @@ var promiseAny = async (promises) => {
     });
   });
 };
-var handleScanFn = (getRequestList, localSearch) => {
-  return async (scanResult) => {
-    const { value } = scanResult || {};
+
+/**
+ * 处理扫码
+ * @param getRequestList 获取请求列表
+ * @returns 处理结果
+ */
+const handleScanFn = (getRequestList, localSearch) => {
+  return async scanResult => {
+    const {
+      value
+    } = scanResult || {};
+
+    // 本地解析识别码
     if (localSearch) {
       try {
-        const localResult = localSearch == null ? void 0 : localSearch(value);
-        if ((localResult == null ? void 0 : localResult.length) > 0) {
-          console.log("本地搜索到数据>>>>>>>", localResult);
+        const localResult = localSearch?.(value);
+        if (localResult?.length > 0) {
           return {
-            searchType: "local_product",
-            response: { data: { list: localResult } }
+            searchType: 'local_product',
+            response: {
+              data: {
+                list: localResult
+              }
+            }
           };
-        } else {
-          console.log("本地搜索无数据>>>>>>>");
-        }
+        } else {}
       } catch (error) {
-        console.error("本地搜索到数据失败>>>>>>>", error);
+        console.error('本地搜索到数据失败>>>>>>>', error);
       }
     }
+
+    // 检查缓存中是否已有数据
     try {
-      if (import_scanCache.default.has(value)) {
-        const result = import_scanCache.default.get(value);
-        console.log("缓存中搜索到数据>>>>>>>", result);
+      if (_scanCache.default.has(value)) {
+        const result = _scanCache.default.get(value);
         return result;
-      } else {
-        console.log("缓存中无数据>>>>>>>");
-      }
+      } else {}
     } catch (error) {
-      console.error("缓存中搜索数据失败>>>>>>>", error);
+      console.error('缓存中搜索数据失败>>>>>>>', error);
     }
-    const requestList = (getRequestList == null ? void 0 : getRequestList(value)) || [];
+    const requestList = getRequestList?.(value) || [];
     if (requestList.length === 0) {
-      throw new Error("requestList is empty");
+      throw new Error('requestList is empty');
     }
     try {
       const result = await promiseAny(requestList);
-      import_scanCache.default.set(value, result);
+      // 将结果缓存
+      _scanCache.default.set(value, result);
       return result;
     } catch (error) {
       throw error;
     }
   };
 };
-var handleGlobalScan = (request, localSearch) => {
-  const getRequestList = (value) => {
+
+/**
+ * 处理全局扫码
+ * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
+ * @returns 处理结果
+ */
+const handleGlobalScan = (request, localSearch, channel) => {
+  const getRequestList = value => {
     let requestList = [];
-    if (value.startsWith("WL")) {
-      requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
+    // 如果value是已WL开头的，则认为是钱包识别码
+    if (value.startsWith('WL')) {
+      requestList = [(0, _cloudSearch.searchWallet)(request, value)];
     } else {
-      requestList = [
-        (0, import_cloudSearch.searchWalletPass)(request, value),
-        (0, import_cloudSearch.searchWallet)(request, value),
-        (0, import_cloudSearch.searchProduct)(request, value)
-      ];
+      requestList = [...(channel === 'kiosk' ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
     }
     return requestList;
   };
   return handleScanFn(getRequestList, localSearch);
 };
-var handleCustomerScan = () => {
+
+/**
+ * 处理客户扫码
+ * @param request 请求插件
+ * @returns 处理结果
+ */
+exports.handleGlobalScan = handleGlobalScan;
+const handleCustomerScan = () => {
   return () => Promise.resolve({});
 };
-var handleUniversalScan = () => {
+
+/**
+ * 处理钱包扫码
+ * @param request 请求插件
+ * @returns 处理结果
+ */
+exports.handleCustomerScan = handleCustomerScan;
+const handleUniversalScan = () => {
   return () => Promise.resolve({});
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  handleCustomerScan,
-  handleGlobalScan,
-  handleUniversalScan
-});
+exports.handleUniversalScan = handleUniversalScan;

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

@@ -14,12 +14,17 @@ declare enum ScanResultType {
     NativeScanner = "nativeScanner"
 }
 export default class Scan {
+    private static scanInstances;
+    private static peripheralsListenerMounted;
     private solution;
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
     /**
      * 初始化外设扫码结果监听
+     *
+     * @example
+     * scan.initPeripheralsListener();
      */
     initPeripheralsListener(): void;
     /**

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

@@ -1,77 +1,67 @@
-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)
-    __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 __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);
+"use strict";
 
-// src/solution/BookingTicket/utils/scan/index.ts
-var scan_exports = {};
-__export(scan_exports, {
-  default: () => Scan
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(scan_exports);
-var import_watch = __toESM(require("../../../../utils/watch"));
-var import_task = __toESM(require("../../../../utils/task"));
-var Scan = class {
+exports.default = void 0;
+var _watch = _interopRequireDefault(require("../../../../utils/watch"));
+var _task = _interopRequireDefault(require("../../../../utils/task"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var ScanResultType = /*#__PURE__*/function (ScanResultType) {
+  ScanResultType["Scanner"] = "scanner";
+  ScanResultType["NFC"] = "nfc";
+  ScanResultType["NativeScanner"] = "nativeScanner";
+  return ScanResultType;
+}(ScanResultType || {});
+class Scan {
+  static scanInstances = new Set();
+  static peripheralsListenerMounted = false;
+  solution;
+  watchKey;
+  listenerConfig = new Map();
   constructor(solution, watchKey) {
-    this.listenerConfig = /* @__PURE__ */ new Map();
     this.solution = solution;
     this.watchKey = watchKey;
+    Scan.scanInstances.add(this);
+
+    // 初始化扫码监听
+    // this.initPeripheralsListener();
   }
+
   /**
    * 初始化外设扫码结果监听
+   *
+   * @example
+   * scan.initPeripheralsListener();
    */
   initPeripheralsListener() {
-    var _a, _b, _c, _d, _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",
-      "peripheralsResult",
-      (strVal) => {
-        try {
-          const result = JSON.parse(strVal);
-          console.log("nativeScannerResult>>>>>>>", result);
-          this.handleScan(result);
-        } catch (err) {
-          console.error(err);
-        }
+    if (Scan.peripheralsListenerMounted) return;
+    Scan.peripheralsListenerMounted = true;
+    this.solution?.window?.interaction?.utils?.mountFunction?.('global', 'peripheralsResult', strVal => {
+      try {
+        const result = JSON.parse(strVal);
+        Scan.scanInstances.forEach(instance => {
+          instance.handleScan(result);
+        });
+      } catch (err) {
+        console.error(err);
       }
-    );
+    });
   }
+
   /**
    * 处理扫码事件
    * @param eventKey 事件key
    * @param value 扫码结果
    */
   handleScan(result) {
-    const lastEnableEventKey = import_watch.default.getLastEnableEventKey(this.watchKey);
+    const lastEnableEventKey = _watch.default.getLastEnableEventKey(this.watchKey);
     if (lastEnableEventKey) {
       const listenerConfig = this.listenerConfig.get(lastEnableEventKey);
       if (listenerConfig) {
+        const taskUuid = this.generateUuid();
         listenerConfig.task.addTask({
-          uuid: this.generateUuid(),
+          uuid: taskUuid,
           type: lastEnableEventKey,
           actionParams: {
             scanResult: result
@@ -80,114 +70,131 @@ var Scan = class {
       }
     }
   }
+
   /**
    * 生成uuid
    * @returns uuid
    */
   generateUuid() {
+    // 需要加入时间戳，避免重复
     return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15) + Date.now().toString(36);
   }
+
   /**
    * 添加扫码信息监听
    * @param watchKey 监听的key
    * @param event 事件
    */
   addListener(event, scanCallback) {
-    import_watch.default.subscribe(this.watchKey, event);
-    const task = new import_task.default();
-    task.addAction(
-      event.key,
-      (...args) => this.scanTaskAction(event.key, ...args)
-    );
-    this.listenerConfig.set(event.key, { scanCallback, task });
+    // 订阅事件
+    _watch.default.subscribe(this.watchKey, event);
+    // 创建任务
+    const task = new _task.default();
+    task.addAction(event.key, (...args) => this.scanTaskAction(event.key, ...args));
+
+    // 创建监听配置
+    this.listenerConfig.set(event.key, {
+      scanCallback,
+      task
+    });
     return {
       remove: () => {
         this.removeListener(event);
       }
     };
   }
+
   /**
    * 移除扫码信息监听
    * @param watchKey 监听的key
    * @param event 事件
    */
   removeListener(event) {
-    var _a, _b;
-    import_watch.default.unsubscribe(this.watchKey, event);
-    (_b = (_a = this.listenerConfig.get(event.key)) == null ? void 0 : _a.task) == null ? void 0 : _b.clear();
+    _watch.default.unsubscribe(this.watchKey, event);
+    this.listenerConfig.get(event.key)?.task?.clear();
     this.listenerConfig.delete(event.key);
   }
+
   /**
    * 移除所有监听
    */
   removeAllListeners() {
-    var _a, _b, _c, _d;
-    import_watch.default.clearEvent(this.watchKey);
-    (_b = (_a = this.listenerConfig) == null ? void 0 : _a.forEach) == null ? void 0 : _b.call(_a, (item) => {
-      var _a2;
-      (_a2 = item == null ? void 0 : item.task) == null ? void 0 : _a2.clear();
+    Scan.scanInstances.delete(this);
+    _watch.default.clearEvent(this.watchKey);
+    this.listenerConfig?.forEach?.(item => {
+      item?.task?.clear();
     });
-    (_d = (_c = this.listenerConfig) == null ? void 0 : _c.clear) == null ? void 0 : _d.call(_c);
+    this.listenerConfig?.clear?.();
   }
+
   /**
    * 启用所有监听
    */
   enableAllListeners() {
-    import_watch.default.enableAllEventByWatchKey(this.watchKey);
+    _watch.default.enableAllEventByWatchKey(this.watchKey);
   }
+
   /**
    * 禁用所有监听，并清空任务执行队列
    */
   disableAllListeners() {
-    var _a, _b;
-    import_watch.default.disabledAllEventByWatchKey(this.watchKey);
-    (_b = (_a = this.listenerConfig) == null ? void 0 : _a.forEach) == null ? void 0 : _b.call(_a, (item) => {
-      var _a2;
-      (_a2 = item == null ? void 0 : item.task) == null ? void 0 : _a2.clearTaskQueue();
+    _watch.default.disabledAllEventByWatchKey(this.watchKey);
+    // 清空任务
+    this.listenerConfig?.forEach?.(item => {
+      item?.task?.clearTaskQueue();
     });
   }
+
   /**
    * 清空监听对应的任务执行队列，不传入eventKey则清空所有监听对应的任务执行队列
    * @param eventKey 事件key
    */
   clearTaskQueue(eventKey) {
-    var _a, _b, _c;
-    console.log("clearTaskQueue>>>>>>>", eventKey);
     if (eventKey) {
-      (_a = this.listenerConfig.get(eventKey)) == null ? void 0 : _a.task.clearTaskQueue();
+      this.listenerConfig.get(eventKey)?.task.clearTaskQueue();
     } else {
-      (_c = (_b = this.listenerConfig) == null ? void 0 : _b.forEach) == null ? void 0 : _c.call(_b, (item) => {
-        var _a2;
-        (_a2 = item == null ? void 0 : item.task) == null ? void 0 : _a2.clearTaskQueue();
+      this.listenerConfig?.forEach?.(item => {
+        item?.task?.clearTaskQueue();
       });
     }
   }
+
   /**
    * 获取监听配置
    * @param eventKey 事件key
    * @returns 监听配置
    */
   getListenerConfig(eventKey) {
-    var _a;
-    return (_a = this.listenerConfig) == null ? void 0 : _a.get(eventKey);
+    return this.listenerConfig?.get(eventKey);
   }
+
   /**
    * 扫码任务执行函数
    * @param args 参数
    */
   async scanTaskAction(...args) {
     const [eventKey, other] = args;
-    const { type, value, data } = (other == null ? void 0 : other.scanResult) || {};
-    const taskItemUuid = other == null ? void 0 : other.uuid;
-    const { scanCallback, task } = this.getListenerConfig(eventKey) || {};
+    const {
+      type,
+      value,
+      data
+    } = other?.scanResult || {};
+    const taskItemUuid = other?.uuid;
+    const {
+      scanCallback,
+      task
+    } = this.getListenerConfig(eventKey) || {};
     if (scanCallback) {
       try {
-        const result = await scanCallback({ type, value });
-        console.log(`${eventKey}_result>>>>>>>`, result);
-        if (taskItemUuid && (task == null ? void 0 : task.isTaskExist(taskItemUuid))) {
-          import_watch.default.publishByEventKey(this.watchKey, eventKey, {
+        const result = await scanCallback({
+          type,
+          value
+        });
+        // 如果任务存在，则发布结果
+        if (taskItemUuid && task?.isTaskExist(taskItemUuid)) {
+          _watch.default.publishByEventKey(this.watchKey, eventKey, {
             type: eventKey,
-            status: "success",
+            status: 'success',
             scanType: type,
             scanCode: value,
             scanData: data,
@@ -197,11 +204,11 @@ var Scan = class {
           console.warn(`${eventKey}_result_task_not_exist>>>>>>>`, task);
         }
       } catch (error) {
-        console.log(`${eventKey}_result_error>>>>>>>`, error);
-        if (taskItemUuid && (task == null ? void 0 : task.isTaskExist(taskItemUuid))) {
-          import_watch.default.publishByEventKey(this.watchKey, eventKey, {
+        // 如果任务存在，则发布结果
+        if (taskItemUuid && task?.isTaskExist(taskItemUuid)) {
+          _watch.default.publishByEventKey(this.watchKey, eventKey, {
             type: eventKey,
-            status: "failed",
+            status: 'failed',
             scanType: type,
             scanCode: value,
             scanData: data
@@ -212,4 +219,5 @@ var Scan = class {
       }
     }
   }
-};
+}
+exports.default = Scan;