@ray-js/lock-sdk 1.1.3-beta.5 → 1.1.3-beta.6

package/lib/unlock-method.js

@@ -228,7 +228,9 @@ const addUnlockMethodData = {
     canEmitEvents: true,
     pendingEvents: [],
     releaseEmitTimer: 0,
+    eventSessionId: 0,
 };
+const ADD_UNLOCK_METHOD_EVENT_RELEASE_DELAY = 16;
 const dispatchAddUnlockMethodEvent = (eventData) => {
     if (emitter.hasListener(UNLOCK_METHOD_EVENT)) {
         emitter.emit(UNLOCK_METHOD_EVENT, eventData);
@@ -244,14 +246,22 @@ const emitAddUnlockMethodEvent = (eventData) => {
     }
     dispatchAddUnlockMethodEvent(eventData);
 };
-const releaseAddUnlockMethodEventsAfterStart = () => {
+const releaseAddUnlockMethodEventsAfterStart = (eventSessionId) => {
     clearTimeout(addUnlockMethodData.releaseEmitTimer);
     addUnlockMethodData.releaseEmitTimer = setTimeout(() => {
-        addUnlockMethodData.canEmitEvents = true;
-        const pendingEvents = addUnlockMethodData.pendingEvents.splice(0);
-        pendingEvents.forEach((eventData) => {
-            dispatchAddUnlockMethodEvent(eventData);
-        });
+        if (addUnlockMethodData.eventSessionId !== eventSessionId) {
+            return;
+        }
+        addUnlockMethodData.releaseEmitTimer = setTimeout(() => {
+            if (addUnlockMethodData.eventSessionId !== eventSessionId) {
+                return;
+            }
+            addUnlockMethodData.canEmitEvents = true;
+            const pendingEvents = addUnlockMethodData.pendingEvents.splice(0);
+            pendingEvents.forEach((eventData) => {
+                dispatchAddUnlockMethodEvent(eventData);
+            });
+        }, ADD_UNLOCK_METHOD_EVENT_RELEASE_DELAY);
     }, 0);
 };
 const handleAddTimeout = (timeout = 15000) => {
@@ -398,21 +408,24 @@ const monitoringAddReport = (option) => {
     clearTimeout(addUnlockMethodData.releaseEmitTimer);
     addUnlockMethodData.canEmitEvents = false;
     addUnlockMethodData.pendingEvents = [];
+    addUnlockMethodData.eventSessionId += 1;
     emitter.clearCache(UNLOCK_METHOD_EVENT);
     emitter.off(DPCHANGE, handleAddReport);
     emitter.on(DPCHANGE, handleAddReport);
     handleAddTimeout(option.timeout);
+    return addUnlockMethodData.eventSessionId;
 };
 export const startAddUnlockMethod = async (params) => {
     const { unlockMethodConfig, lockUserId, dpData, sn, addDpCode, addDpMap, addDpReportMap, dpId, } = await getUnlockMethodBase(params.type, params.userId);
     isCancelAddUnlockMethod = false;
     let addReportMonitoringStarted = false;
+    let addReportMonitoringSessionId = 0;
     const startAddReportMonitoring = (total) => {
         if (addReportMonitoringStarted) {
-            return;
+            return addReportMonitoringSessionId;
         }
         addReportMonitoringStarted = true;
-        monitoringAddReport({
+        addReportMonitoringSessionId = monitoringAddReport({
             timeout: params.timeout,
             unlockMethodConfig,
             total,
@@ -423,6 +436,7 @@ export const startAddUnlockMethod = async (params) => {
             userId: params.userId,
             unlockDpId: dpId,
         });
+        return addReportMonitoringSessionId;
     };
     const res = await publishDps({
         [addDpCode]: dpUtils.format(dpData, addDpMap),
@@ -455,8 +469,8 @@ export const startAddUnlockMethod = async (params) => {
         },
     });
     if (res.stage === 0) {
-        startAddReportMonitoring(res.total);
-        releaseAddUnlockMethodEventsAfterStart();
+        const eventSessionId = startAddReportMonitoring(res.total);
+        releaseAddUnlockMethodEventsAfterStart(eventSessionId);
         return { total: res.total };
     }
     if (res.stage === 0xfd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.1.3-beta.5",
+  "version": "1.1.3-beta.6",
   "files": [
     "lib",
     "LICENSE.md"