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

package/lib/unlock-method.js

@@ -225,12 +225,40 @@ const addUnlockMethodData = {
     userId: "",
     unlockDpId: 0,
     timeout: 15000,
+    canEmitEvents: true,
+    pendingEvents: [],
+    releaseEmitTimer: 0,
+};
+const dispatchAddUnlockMethodEvent = (eventData) => {
+    if (emitter.hasListener(UNLOCK_METHOD_EVENT)) {
+        emitter.emit(UNLOCK_METHOD_EVENT, eventData);
+    }
+    else {
+        emitter.cache(UNLOCK_METHOD_EVENT, eventData);
+    }
+};
+const emitAddUnlockMethodEvent = (eventData) => {
+    if (!addUnlockMethodData.canEmitEvents) {
+        addUnlockMethodData.pendingEvents.push(eventData);
+        return;
+    }
+    dispatchAddUnlockMethodEvent(eventData);
+};
+const releaseAddUnlockMethodEventsAfterStart = () => {
+    clearTimeout(addUnlockMethodData.releaseEmitTimer);
+    addUnlockMethodData.releaseEmitTimer = setTimeout(() => {
+        addUnlockMethodData.canEmitEvents = true;
+        const pendingEvents = addUnlockMethodData.pendingEvents.splice(0);
+        pendingEvents.forEach((eventData) => {
+            dispatchAddUnlockMethodEvent(eventData);
+        });
+    }, 0);
 };
 const handleAddTimeout = (timeout = 15000) => {
     clearTimeout(addUnlockMethodData.timeoutId);
     addUnlockMethodData.timeoutId = setTimeout(() => {
         emitter.off(DPCHANGE, handleAddReport);
-        emitter.emit(UNLOCK_METHOD_EVENT, {
+        emitAddUnlockMethodEvent({
             type: addUnlockMethodData.unlockMethodConfig.type,
             stage: "fail",
             lockUserId: addUnlockMethodData.lockUserId,
@@ -357,12 +385,7 @@ const handleAddReport = async (dps) => {
             default:
         }
         if (eventData) {
-            if (emitter.hasListener(UNLOCK_METHOD_EVENT)) {
-                emitter.emit(UNLOCK_METHOD_EVENT, eventData);
-            }
-            else {
-                emitter.cache(UNLOCK_METHOD_EVENT, eventData);
-            }
+            emitAddUnlockMethodEvent(eventData);
         }
     }
 };
@@ -372,6 +395,9 @@ const clearMonitoringAddReport = () => {
 };
 const monitoringAddReport = (option) => {
     Object.assign(addUnlockMethodData, option);
+    clearTimeout(addUnlockMethodData.releaseEmitTimer);
+    addUnlockMethodData.canEmitEvents = false;
+    addUnlockMethodData.pendingEvents = [];
     emitter.clearCache(UNLOCK_METHOD_EVENT);
     emitter.off(DPCHANGE, handleAddReport);
     emitter.on(DPCHANGE, handleAddReport);
@@ -380,6 +406,24 @@ const monitoringAddReport = (option) => {
 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;
+    const startAddReportMonitoring = (total) => {
+        if (addReportMonitoringStarted) {
+            return;
+        }
+        addReportMonitoringStarted = true;
+        monitoringAddReport({
+            timeout: params.timeout,
+            unlockMethodConfig,
+            total,
+            dpCode: addDpCode,
+            dpMap: addDpReportMap,
+            sn,
+            lockUserId,
+            userId: params.userId,
+            unlockDpId: dpId,
+        });
+    };
     const res = await publishDps({
         [addDpCode]: dpUtils.format(dpData, addDpMap),
     }, {
@@ -400,17 +444,7 @@ export const startAddUnlockMethod = async (params) => {
                         console.warn("AddPassword: An invalid sn may have been reported");
                     }
                     if (result.stage === 0) {
-                        monitoringAddReport({
-                            timeout: params.timeout,
-                            unlockMethodConfig,
-                            total: res.total,
-                            dpCode: addDpCode,
-                            dpMap: addDpReportMap,
-                            sn,
-                            lockUserId,
-                            userId: params.userId,
-                            unlockDpId: dpId,
-                        });
+                        startAddReportMonitoring(result.total);
                     }
                     return result;
                 }
@@ -421,6 +455,8 @@ export const startAddUnlockMethod = async (params) => {
         },
     });
     if (res.stage === 0) {
+        startAddReportMonitoring(res.total);
+        releaseAddUnlockMethodEventsAfterStart();
         return { total: res.total };
     }
     if (res.stage === 0xfd) {

package/lib/utils/publishDps.js

@@ -34,17 +34,20 @@ export const publishDpsOnly = async (dpData) => {
     }
 };
 export const publishDps = async (dpData, option) => {
-    await publishDpsOnly(dpData);
     const { timeout = 15000, checkReport } = option || {};
     return new Promise((resolve, reject) => {
         const codes = Object.keys(dpData);
         const result = {};
+        let timer;
+        const cleanup = () => {
+            emitter.off(DPCHANGE, handleChangeDp);
+            clearTimeout(timer);
+        };
         const handleChangeDp = (dpCodes) => {
             if (checkReport) {
                 const pass = checkReport(dpCodes);
                 if (pass) {
-                    emitter.off(DPCHANGE, handleChangeDp);
-                    clearTimeout(timer);
+                    cleanup();
                     resolve(typeof pass !== "boolean" ? pass : dpCodes);
                 }
             }
@@ -57,16 +60,19 @@ export const publishDps = async (dpData, option) => {
                     }
                 });
                 if (codes.length === 0) {
-                    emitter.off(DPCHANGE, handleChangeDp);
-                    clearTimeout(timer);
+                    cleanup();
                     resolve(result);
                 }
             }
         };
-        const timer = setTimeout(() => {
-            emitter.off(DPCHANGE, handleChangeDp);
+        timer = setTimeout(() => {
+            cleanup();
             reject(getError(1002));
         }, timeout);
         emitter.on(DPCHANGE, handleChangeDp);
+        publishDpsOnly(dpData).catch((error) => {
+            cleanup();
+            reject(error);
+        });
     });
 };

package/package.json

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