@ray-js/robot-data-stream 0.0.10-beta-17 → 0.0.10-beta-19

package/lib/mqtt/promise.js

@@ -22,19 +22,16 @@ export function normalResolve(reqType, taskId) {
   return new Promise((resolve, reject) => {
     // 设置超时定时器
     const timer = setTimeout(() => {
-      reject(new MyError('Request timed out', {
+      reject(new MyError(`${taskId} Request timed out `, {
         errCode: -1,
         reqType
       }));
-    }, 5 * 1000);
-
-    // 监听指定类型的消息
-    emitter.on(reqType, message => {
+    }, 10 * 1000);
+    const handle = message => {
       if (`${message.taskId}` !== `${taskId}`) {
         return;
       }
       clearTimeout(timer);
-      emitter.off(reqType);
       if (message.errCode === 0) {
         resolve(message);
       } else {
@@ -43,6 +40,10 @@ export function normalResolve(reqType, taskId) {
           reqType
         }));
       }
-    });
+      emitter.off(reqType, handle);
+    };
+
+    // 监听指定类型的消息
+    emitter.on(reqType, handle);
   });
 }

package/lib/mqtt/useSpotClean.js

@@ -50,7 +50,6 @@ export const useSpotClean = devId => {
           yMops = new Array(num).fill(-1),
           sweepMopModes = new Array(num).fill('only_sweep')
         } = message;
-        const names = new Array(num).fill('');
         if (suctions && !isArray(suctions)) {
           return Promise.reject(new Error('suctions is illegal'));
         }
@@ -66,10 +65,7 @@ export const useSpotClean = devId => {
         if (sweepMopModes && !isArray(sweepMopModes)) {
           return Promise.reject(new Error('sweepMopModes is illegal'));
         }
-        if (names && !isArray(names)) {
-          return Promise.reject(new Error('names is illegal'));
-        }
-        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length || num !== names.length) {
+        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
           return Promise.reject(new Error('The length of the parameters is inconsistent'));
         }
         const params = createSetCommonParams({
@@ -82,8 +78,7 @@ export const useSpotClean = devId => {
             cisterns,
             cleanCounts,
             yMops,
-            sweepMopModes,
-            names
+            sweepMopModes
           }
         });
         ty.device.sendMqttMessage(params);

package/lib/mqtt/useZoneClean.js

@@ -82,7 +82,7 @@ export const useZoneClean = devId => {
             name
           } = _ref;
           polygons.push(pointsToString(points, origin));
-          names.push(name);
+          names.push(name || '');
         });
         const params = createSetCommonParams({
           deviceId: devId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.10-beta-17",
+  "version": "0.0.10-beta-19",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [