@pisell/pisellos 0.0.222 → 0.0.224

package/dist/solution/BookingTicket/index.js

@@ -651,6 +651,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
       (_this$store$order = this.store.order) === null || _this$store$order === void 0 || _this$store$order.destroy();
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
+      // 清除所有的监听
+      this.scan.removeAllListeners();
       // 清除scan数据内存缓存
       scanCache.clear();
     }

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

@@ -18,6 +18,20 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
+    /**
+     * 处理扫码事件
+     * @param eventKey 事件key
+     * @param value 扫码结果
+     */
+    handleScan(result: {
+        type: string;
+        value: string;
+    }): void;
+    /**
+     * 生成uuid
+     * @returns uuid
+     */
+    generateUuid(): string;
     /**
      * 添加扫码信息监听
      * @param watchKey 监听的key
@@ -32,6 +46,10 @@ export default class Scan {
      * @param event 事件
      */
     removeListener(event: WatchEventItem): void;
+    /**
+     * 移除所有监听
+     */
+    removeAllListeners(): void;
     /**
      * 启用所有监听
      */
@@ -45,15 +63,6 @@ export default class Scan {
      * @param eventKey 事件key
      */
     clearTaskQueue(eventKey?: string): void;
-    /**
-     * 处理扫码事件
-     * @param eventKey 事件key
-     * @param value 扫码结果
-     */
-    handleScan(value: {
-        type: string;
-        value: string;
-    }): void;
     /**
      * 获取监听配置
      * @param eventKey 事件key
@@ -64,9 +73,9 @@ export default class Scan {
         task: Tasks;
     } | undefined;
     /**
-     * 处理扫码结果
+     * 扫码任务执行函数
      * @param args 参数
      */
-    handleScanResultFn(...args: any[]): Promise<void>;
+    scanTaskAction(...args: any[]): Promise<void>;
 }
 export {};

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

@@ -41,11 +41,45 @@ var Scan = /*#__PURE__*/function () {
   }
 
   /**
-   * 添加扫码信息监听
-   * @param watchKey 监听的key
-   * @param event 事件
+   * 处理扫码事件
+   * @param eventKey 事件key
+   * @param value 扫码结果
    */
   _createClass(Scan, [{
+    key: "handleScan",
+    value: function handleScan(result) {
+      var lastEnableEventKey = watch.getLastEnableEventKey(this.watchKey);
+      if (lastEnableEventKey) {
+        var listenerConfig = this.listenerConfig.get(lastEnableEventKey);
+        if (listenerConfig) {
+          listenerConfig.task.addTask({
+            uuid: this.generateUuid(),
+            type: lastEnableEventKey,
+            actionParams: {
+              scanResult: result
+            }
+          });
+        }
+      }
+    }
+
+    /**
+     * 生成uuid
+     * @returns uuid
+     */
+  }, {
+    key: "generateUuid",
+    value: function 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 事件
+     */
+  }, {
     key: "addListener",
     value: function addListener(event, scanCallback) {
       var _this2 = this;
@@ -57,7 +91,7 @@ var Scan = /*#__PURE__*/function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        return _this2.handleScanResultFn.apply(_this2, [event.key].concat(args));
+        return _this2.scanTaskAction.apply(_this2, [event.key].concat(args));
       });
 
       // 创建监听配置
@@ -82,10 +116,25 @@ var Scan = /*#__PURE__*/function () {
     value: function removeListener(event) {
       var _this$listenerConfig$;
       watch.unsubscribe(this.watchKey, event);
-      (_this$listenerConfig$ = this.listenerConfig.get(event.key)) === null || _this$listenerConfig$ === void 0 || _this$listenerConfig$.task.clear();
+      (_this$listenerConfig$ = this.listenerConfig.get(event.key)) === null || _this$listenerConfig$ === void 0 || (_this$listenerConfig$ = _this$listenerConfig$.task) === null || _this$listenerConfig$ === void 0 || _this$listenerConfig$.clear();
       this.listenerConfig.delete(event.key);
     }
 
+    /**
+     * 移除所有监听
+     */
+  }, {
+    key: "removeAllListeners",
+    value: function removeAllListeners() {
+      var _this$listenerConfig, _this$listenerConfig$2, _this$listenerConfig2, _this$listenerConfig3;
+      watch.clearEvent(this.watchKey);
+      (_this$listenerConfig = this.listenerConfig) === null || _this$listenerConfig === void 0 || (_this$listenerConfig$2 = _this$listenerConfig.forEach) === null || _this$listenerConfig$2 === void 0 || _this$listenerConfig$2.call(_this$listenerConfig, function (item) {
+        var _item$task;
+        item === null || item === void 0 || (_item$task = item.task) === null || _item$task === void 0 || _item$task.clear();
+      });
+      (_this$listenerConfig2 = this.listenerConfig) === null || _this$listenerConfig2 === void 0 || (_this$listenerConfig3 = _this$listenerConfig2.clear) === null || _this$listenerConfig3 === void 0 || _this$listenerConfig3.call(_this$listenerConfig2);
+    }
+
     /**
      * 启用所有监听
      */
@@ -101,12 +150,12 @@ var Scan = /*#__PURE__*/function () {
   }, {
     key: "disableAllListeners",
     value: function disableAllListeners() {
-      var _this$listenerConfig, _this$listenerConfig$2;
+      var _this$listenerConfig4, _this$listenerConfig5;
       watch.disabledAllEventByWatchKey(this.watchKey);
       // 清空任务
-      (_this$listenerConfig = this.listenerConfig) === null || _this$listenerConfig === void 0 || (_this$listenerConfig$2 = _this$listenerConfig.forEach) === null || _this$listenerConfig$2 === void 0 || _this$listenerConfig$2.call(_this$listenerConfig, function (item) {
-        var _item$task;
-        item === null || item === void 0 || (_item$task = item.task) === null || _item$task === void 0 || _item$task.clearTaskQueue();
+      (_this$listenerConfig4 = this.listenerConfig) === null || _this$listenerConfig4 === void 0 || (_this$listenerConfig5 = _this$listenerConfig4.forEach) === null || _this$listenerConfig5 === void 0 || _this$listenerConfig5.call(_this$listenerConfig4, function (item) {
+        var _item$task2;
+        item === null || item === void 0 || (_item$task2 = item.task) === null || _item$task2 === void 0 || _item$task2.clearTaskQueue();
       });
     }
 
@@ -117,40 +166,19 @@ var Scan = /*#__PURE__*/function () {
   }, {
     key: "clearTaskQueue",
     value: function clearTaskQueue(eventKey) {
+      console.log('clearTaskQueue>>>>>>>', eventKey);
       if (eventKey) {
         var _this$listenerConfig$3;
         (_this$listenerConfig$3 = this.listenerConfig.get(eventKey)) === null || _this$listenerConfig$3 === void 0 || _this$listenerConfig$3.task.clearTaskQueue();
       } else {
-        var _this$listenerConfig2, _this$listenerConfig3;
-        (_this$listenerConfig2 = this.listenerConfig) === null || _this$listenerConfig2 === void 0 || (_this$listenerConfig3 = _this$listenerConfig2.forEach) === null || _this$listenerConfig3 === void 0 || _this$listenerConfig3.call(_this$listenerConfig2, function (item) {
-          var _item$task2;
-          item === null || item === void 0 || (_item$task2 = item.task) === null || _item$task2 === void 0 || _item$task2.clearTaskQueue();
+        var _this$listenerConfig6, _this$listenerConfig7;
+        (_this$listenerConfig6 = this.listenerConfig) === null || _this$listenerConfig6 === void 0 || (_this$listenerConfig7 = _this$listenerConfig6.forEach) === null || _this$listenerConfig7 === void 0 || _this$listenerConfig7.call(_this$listenerConfig6, function (item) {
+          var _item$task3;
+          item === null || item === void 0 || (_item$task3 = item.task) === null || _item$task3 === void 0 || _item$task3.clearTaskQueue();
         });
       }
     }
 
-    /**
-     * 处理扫码事件
-     * @param eventKey 事件key
-     * @param value 扫码结果
-     */
-  }, {
-    key: "handleScan",
-    value: function handleScan(value) {
-      var lastEnableEventKey = watch.getLastEnableEventKey(this.watchKey);
-      if (lastEnableEventKey) {
-        var listenerConfig = this.listenerConfig.get(lastEnableEventKey);
-        if (listenerConfig) {
-          listenerConfig.task.addTask({
-            type: lastEnableEventKey,
-            actionParams: {
-              scanResult: value
-            }
-          });
-        }
-      }
-    }
-
     /**
      * 获取监听配置
      * @param eventKey 事件key
@@ -159,19 +187,18 @@ var Scan = /*#__PURE__*/function () {
   }, {
     key: "getListenerConfig",
     value: function getListenerConfig(eventKey) {
-      var _this$listenerConfig4;
-      return (_this$listenerConfig4 = this.listenerConfig) === null || _this$listenerConfig4 === void 0 ? void 0 : _this$listenerConfig4.get(eventKey);
+      var _this$listenerConfig8;
+      return (_this$listenerConfig8 = this.listenerConfig) === null || _this$listenerConfig8 === void 0 ? void 0 : _this$listenerConfig8.get(eventKey);
     }
 
     /**
-     * 处理扫码结果
+     * 扫码任务执行函数
      * @param args 参数
      */
   }, {
-    key: "handleScanResultFn",
+    key: "scanTaskAction",
     value: (function () {
-      var _handleScanResultFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this$getListenerConf;
+      var _scanTaskAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _len2,
           args,
           _key2,
@@ -181,7 +208,10 @@ var Scan = /*#__PURE__*/function () {
           type,
           value,
           data,
+          taskItemUuid,
+          _ref2,
           scanCallback,
+          task,
           _result2,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -192,51 +222,62 @@ var Scan = /*#__PURE__*/function () {
               }
               eventKey = args[0], other = args[1];
               _ref = (other === null || other === void 0 ? void 0 : other.scanResult) || {}, type = _ref.type, value = _ref.value, data = _ref.data;
-              scanCallback = (_this$getListenerConf = this.getListenerConfig(eventKey)) === null || _this$getListenerConf === void 0 ? void 0 : _this$getListenerConf.scanCallback;
+              taskItemUuid = other === null || other === void 0 ? void 0 : other.uuid;
+              _ref2 = this.getListenerConfig(eventKey) || {}, scanCallback = _ref2.scanCallback, task = _ref2.task;
               if (!scanCallback) {
-                _context.next = 17;
+                _context.next = 18;
                 break;
               }
-              _context.prev = 5;
-              _context.next = 8;
+              _context.prev = 6;
+              _context.next = 9;
               return scanCallback({
                 type: type,
                 value: value
               });
-            case 8:
+            case 9:
               _result2 = _context.sent;
               console.log("".concat(eventKey, "_result>>>>>>>"), _result2);
-              watch.publishByEventKey(this.watchKey, eventKey, {
-                type: eventKey,
-                status: 'success',
-                scanType: type,
-                scanCode: value,
-                scanData: data,
-                result: _result2
-              });
-              _context.next = 17;
+              // 如果任务存在，则发布结果
+              if (taskItemUuid && task !== null && task !== void 0 && task.isTaskExist(taskItemUuid)) {
+                watch.publishByEventKey(this.watchKey, eventKey, {
+                  type: eventKey,
+                  status: 'success',
+                  scanType: type,
+                  scanCode: value,
+                  scanData: data,
+                  result: _result2
+                });
+              } else {
+                console.warn("".concat(eventKey, "_result_task_not_exist>>>>>>>"), task);
+              }
+              _context.next = 18;
               break;
-            case 13:
-              _context.prev = 13;
-              _context.t0 = _context["catch"](5);
+            case 14:
+              _context.prev = 14;
+              _context.t0 = _context["catch"](6);
               console.log("".concat(eventKey, "_result_error>>>>>>>"), _context.t0);
-              watch.publishByEventKey(this.watchKey, eventKey, {
-                type: eventKey,
-                status: 'failed',
-                scanType: type,
-                scanCode: value,
-                scanData: data
-              });
-            case 17:
+              // 如果任务存在，则发布结果
+              if (taskItemUuid && task !== null && task !== void 0 && task.isTaskExist(taskItemUuid)) {
+                watch.publishByEventKey(this.watchKey, eventKey, {
+                  type: eventKey,
+                  status: 'failed',
+                  scanType: type,
+                  scanCode: value,
+                  scanData: data
+                });
+              } else {
+                console.warn("".concat(eventKey, "_result_error_task_not_exist>>>>>>>"), task);
+              }
+            case 18:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[5, 13]]);
+        }, _callee, this, [[6, 14]]);
       }));
-      function handleScanResultFn() {
-        return _handleScanResultFn.apply(this, arguments);
+      function scanTaskAction() {
+        return _scanTaskAction.apply(this, arguments);
       }
-      return handleScanResultFn;
+      return scanTaskAction;
     }())
   }]);
   return Scan;

package/dist/utils/task.d.ts

@@ -1,5 +1,6 @@
 type Action = (...args: any[]) => Promise<any>;
 type Task = {
+    uuid: string;
     type: string;
     actionParams?: Record<string, any>;
 };
@@ -31,5 +32,9 @@ declare class Tasks {
      * 执行任务
      */
     run(): Promise<void>;
+    /**
+     * 判定当前的任务是否依然存在
+     */
+    isTaskExist(uuid: string): boolean;
 }
 export default Tasks;

package/dist/utils/task.js

@@ -1,5 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -70,7 +72,7 @@ var Tasks = /*#__PURE__*/function () {
     key: "run",
     value: (function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var task, action;
+        var _this$taskQueue, task, action, _task, _task2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -92,11 +94,11 @@ var Tasks = /*#__PURE__*/function () {
               // 遍历任务队列
             case 6:
               if (!(this.taskQueue.length > 0)) {
-                _context.next = 17;
+                _context.next = 32;
                 break;
               }
-              // 获取任务
-              task = this.taskQueue.shift(); // 如果没有任务则直接结束
+              // 获取任务，但是不删除
+              task = (_this$taskQueue = this.taskQueue) === null || _this$taskQueue === void 0 ? void 0 : _this$taskQueue[0]; // 如果没有任务则直接结束
               if (task) {
                 _context.next = 11;
                 break;
@@ -107,27 +109,62 @@ var Tasks = /*#__PURE__*/function () {
               // 获取任务对应的action
               action = this.actions.get(task.type); // 如果找到对应的action，则执行
               if (!action) {
-                _context.next = 15;
+                _context.next = 28;
                 break;
               }
-              _context.next = 15;
-              return action((task === null || task === void 0 ? void 0 : task.actionParams) || {});
-            case 15:
+              _context.prev = 13;
+              _context.next = 16;
+              return action(_objectSpread(_objectSpread({}, (task === null || task === void 0 ? void 0 : task.actionParams) || {}), {}, {
+                uuid: task === null || task === void 0 ? void 0 : task.uuid
+              }));
+            case 16:
+              console.log('task_success>>>>>>>', task);
+              _context.next = 22;
+              break;
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](13);
+              console.error('task_error>>>>>>>', _context.t0);
+            case 22:
+              _context.prev = 22;
+              // 将任务删除
+              _task = this.taskQueue.shift();
+              console.log('task_shift>>>>>>>', _task);
+              return _context.finish(22);
+            case 26:
+              _context.next = 30;
+              break;
+            case 28:
+              // 如果找不到对应的action，则删除任务
+              _task2 = this.taskQueue.shift();
+              console.log('task_action_not_found>>>>>>>', _task2);
+            case 30:
               _context.next = 6;
               break;
-            case 17:
+            case 32:
               this.isRunning = false;
-            case 18:
+            case 33:
             case "end":
               return _context.stop();
           }
-        }, _callee, this);
+        }, _callee, this, [[13, 19, 22, 26]]);
       }));
       function run() {
         return _run.apply(this, arguments);
       }
       return run;
-    }())
+    }()
+    /**
+     * 判定当前的任务是否依然存在
+     */
+    )
+  }, {
+    key: "isTaskExist",
+    value: function isTaskExist(uuid) {
+      return this.taskQueue.some(function (task) {
+        return (task === null || task === void 0 ? void 0 : task.uuid) === uuid;
+      });
+    }
   }]);
   return Tasks;
 }();

package/lib/solution/BookingTicket/index.js

@@ -387,6 +387,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
     (_e = this.store.order) == null ? void 0 : _e.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
+    this.scan.removeAllListeners();
     import_scanCache.default.clear();
   }
 };

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

@@ -18,6 +18,20 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
+    /**
+     * 处理扫码事件
+     * @param eventKey 事件key
+     * @param value 扫码结果
+     */
+    handleScan(result: {
+        type: string;
+        value: string;
+    }): void;
+    /**
+     * 生成uuid
+     * @returns uuid
+     */
+    generateUuid(): string;
     /**
      * 添加扫码信息监听
      * @param watchKey 监听的key
@@ -32,6 +46,10 @@ export default class Scan {
      * @param event 事件
      */
     removeListener(event: WatchEventItem): void;
+    /**
+     * 移除所有监听
+     */
+    removeAllListeners(): void;
     /**
      * 启用所有监听
      */
@@ -45,15 +63,6 @@ export default class Scan {
      * @param eventKey 事件key
      */
     clearTaskQueue(eventKey?: string): void;
-    /**
-     * 处理扫码事件
-     * @param eventKey 事件key
-     * @param value 扫码结果
-     */
-    handleScan(value: {
-        type: string;
-        value: string;
-    }): void;
     /**
      * 获取监听配置
      * @param eventKey 事件key
@@ -64,9 +73,9 @@ export default class Scan {
         task: Tasks;
     } | undefined;
     /**
-     * 处理扫码结果
+     * 扫码任务执行函数
      * @param args 参数
      */
-    handleScanResultFn(...args: any[]): Promise<void>;
+    scanTaskAction(...args: any[]): Promise<void>;
 }
 export {};

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

@@ -55,6 +55,33 @@ var Scan = class {
       }
     );
   }
+  /**
+   * 处理扫码事件
+   * @param eventKey 事件key
+   * @param value 扫码结果
+   */
+  handleScan(result) {
+    const lastEnableEventKey = import_watch.default.getLastEnableEventKey(this.watchKey);
+    if (lastEnableEventKey) {
+      const listenerConfig = this.listenerConfig.get(lastEnableEventKey);
+      if (listenerConfig) {
+        listenerConfig.task.addTask({
+          uuid: this.generateUuid(),
+          type: lastEnableEventKey,
+          actionParams: {
+            scanResult: result
+          }
+        });
+      }
+    }
+  }
+  /**
+   * 生成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
@@ -65,7 +92,7 @@ var Scan = class {
     const task = new import_task.default();
     task.addAction(
       event.key,
-      (...args) => this.handleScanResultFn(event.key, ...args)
+      (...args) => this.scanTaskAction(event.key, ...args)
     );
     this.listenerConfig.set(event.key, { scanCallback, task });
     return {
@@ -80,11 +107,23 @@ var Scan = class {
    * @param event 事件
    */
   removeListener(event) {
-    var _a;
+    var _a, _b;
     import_watch.default.unsubscribe(this.watchKey, event);
-    (_a = this.listenerConfig.get(event.key)) == null ? void 0 : _a.task.clear();
+    (_b = (_a = this.listenerConfig.get(event.key)) == null ? void 0 : _a.task) == null ? void 0 : _b.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();
+    });
+    (_d = (_c = this.listenerConfig) == null ? void 0 : _c.clear) == null ? void 0 : _d.call(_c);
+  }
   /**
    * 启用所有监听
    */
@@ -108,6 +147,7 @@ var Scan = class {
    */
   clearTaskQueue(eventKey) {
     var _a, _b, _c;
+    console.log("clearTaskQueue>>>>>>>", eventKey);
     if (eventKey) {
       (_a = this.listenerConfig.get(eventKey)) == null ? void 0 : _a.task.clearTaskQueue();
     } else {
@@ -117,25 +157,6 @@ var Scan = class {
       });
     }
   }
-  /**
-   * 处理扫码事件
-   * @param eventKey 事件key
-   * @param value 扫码结果
-   */
-  handleScan(value) {
-    const lastEnableEventKey = import_watch.default.getLastEnableEventKey(this.watchKey);
-    if (lastEnableEventKey) {
-      const listenerConfig = this.listenerConfig.get(lastEnableEventKey);
-      if (listenerConfig) {
-        listenerConfig.task.addTask({
-          type: lastEnableEventKey,
-          actionParams: {
-            scanResult: value
-          }
-        });
-      }
-    }
-  }
   /**
    * 获取监听配置
    * @param eventKey 事件key
@@ -146,35 +167,43 @@ var Scan = class {
     return (_a = this.listenerConfig) == null ? void 0 : _a.get(eventKey);
   }
   /**
-   * 处理扫码结果
+   * 扫码任务执行函数
    * @param args 参数
    */
-  async handleScanResultFn(...args) {
-    var _a;
+  async scanTaskAction(...args) {
     const [eventKey, other] = args;
     const { type, value, data } = (other == null ? void 0 : other.scanResult) || {};
-    const scanCallback = (_a = this.getListenerConfig(eventKey)) == null ? void 0 : _a.scanCallback;
+    const taskItemUuid = other == null ? void 0 : other.uuid;
+    const { scanCallback, task } = this.getListenerConfig(eventKey) || {};
     if (scanCallback) {
       try {
         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
-        });
+        if (taskItemUuid && (task == null ? void 0 : task.isTaskExist(taskItemUuid))) {
+          import_watch.default.publishByEventKey(this.watchKey, eventKey, {
+            type: eventKey,
+            status: "success",
+            scanType: type,
+            scanCode: value,
+            scanData: data,
+            result
+          });
+        } else {
+          console.warn(`${eventKey}_result_task_not_exist>>>>>>>`, task);
+        }
       } catch (error) {
         console.log(`${eventKey}_result_error>>>>>>>`, error);
-        import_watch.default.publishByEventKey(this.watchKey, eventKey, {
-          type: eventKey,
-          status: "failed",
-          scanType: type,
-          scanCode: value,
-          scanData: data
-        });
+        if (taskItemUuid && (task == null ? void 0 : task.isTaskExist(taskItemUuid))) {
+          import_watch.default.publishByEventKey(this.watchKey, eventKey, {
+            type: eventKey,
+            status: "failed",
+            scanType: type,
+            scanCode: value,
+            scanData: data
+          });
+        } else {
+          console.warn(`${eventKey}_result_error_task_not_exist>>>>>>>`, task);
+        }
       }
     }
   }

package/lib/utils/task.d.ts

@@ -1,5 +1,6 @@
 type Action = (...args: any[]) => Promise<any>;
 type Task = {
+    uuid: string;
     type: string;
     actionParams?: Record<string, any>;
 };
@@ -31,5 +32,9 @@ declare class Tasks {
      * 执行任务
      */
     run(): Promise<void>;
+    /**
+     * 判定当前的任务是否依然存在
+     */
+    isTaskExist(uuid: string): boolean;
 }
 export default Tasks;

package/lib/utils/task.js

@@ -66,6 +66,7 @@ var Tasks = class {
    * 执行任务
    */
   async run() {
+    var _a;
     if (this.isRunning) {
       return;
     }
@@ -75,17 +76,34 @@ var Tasks = class {
     }
     this.isRunning = true;
     while (this.taskQueue.length > 0) {
-      const task = this.taskQueue.shift();
+      const task = (_a = this.taskQueue) == null ? void 0 : _a[0];
       if (!task) {
         this.isRunning = false;
         return;
       }
       const action = this.actions.get(task.type);
       if (action) {
-        await action((task == null ? void 0 : task.actionParams) || {});
+        try {
+          await action({ ...(task == null ? void 0 : task.actionParams) || {}, uuid: task == null ? void 0 : task.uuid });
+          console.log("task_success>>>>>>>", task);
+        } catch (error) {
+          console.error("task_error>>>>>>>", error);
+        } finally {
+          const _task = this.taskQueue.shift();
+          console.log("task_shift>>>>>>>", _task);
+        }
+      } else {
+        const _task = this.taskQueue.shift();
+        console.log("task_action_not_found>>>>>>>", _task);
       }
     }
     this.isRunning = false;
   }
+  /**
+   * 判定当前的任务是否依然存在
+   */
+  isTaskExist(uuid) {
+    return this.taskQueue.some((task) => (task == null ? void 0 : task.uuid) === uuid);
+  }
 };
 var task_default = Tasks;

package/package.json

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