@ray-js/robot-data-stream 0.0.14 → 0.0.15-beta.10

package/lib/mqtt/useWifiMap.js

@@ -1,53 +1,54 @@
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
 import { WifiMapEnum } from './type';
-import { useContext } from 'react';
-import { SingletonContext } from './mqttProvider';
-export const useWifiMap = devId => {
+import { useStructuredMessage, handleMqttError } from './hooks/useStructuredMessage';
+import { validator } from './type/fun';
+/**
+ * 自定义 Hook，用于 WiFi 地图管理
+ * @returns 包含 requestWifiMap 和 setWifiMap 函数的对象
+ */
+export const useWifiMap = () => {
   const {
-    useMqtt
-  } = useContext(SingletonContext);
+    sendStructuredMessage
+  } = useStructuredMessage();
 
-  // 请求 WiFi 地图状态
+  /**
+   * 请求 WiFi 地图状态
+   * @param data 可选参数（目前为空对象）
+   * @returns Promise<WifiMapResponse> 响应结果
+   */
 
-  // 设置 WiFi 地图
+  /**
+   * 设置 WiFi 地图
+   * @param data 包含 taskId 的参数对象（taskId 可选，不提供时自动生成）
+   * @returns Promise<WifiMapResponse> 响应结果
+   */
 
   return {
     requestWifiMap: () => {
-      if (!useMqtt) {
-        return Promise.reject(new Error('useMqtt is not used'));
-      }
-      try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: WifiMapEnum.query
-        });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(WifiMapEnum.query, taskId);
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request WiFi map'));
-      }
+      return new Promise((resolve, reject) => {
+        try {
+          sendStructuredMessage(WifiMapEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request WiFi map')));
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request WiFi map'));
+        }
+      });
     },
-    setWifiMap: () => {
-      try {
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: WifiMapEnum.set,
-          message: {
-            taskId: String(Date.now())
-          }
-        });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return normalResolve(WifiMapEnum.rst, taskId);
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set WiFi map');
-      }
+    setWifiMap: function () {
+      let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return new Promise((resolve, reject) => {
+        try {
+          // 如果没有提供 taskId，自动生成
+          const wifiMapData = {
+            taskId: data.taskId || String(Date.now())
+          };
+
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_wifi_map', wifiMapData);
+          sendStructuredMessage(WifiMapEnum.set, validatedData, resolve, error => reject(handleMqttError(error, 'Failed to set WiFi map')), WifiMapEnum.rst // 响应类型是 rst，不是 set
+          );
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set WiFi map'));
+        }
+      });
     }
   };
 };

package/lib/mqtt/useZoneClean.d.ts

@@ -1,28 +1,9 @@
-import { BaseResponse, ZoneCleanEnum, RoomPreference } from './type';
-import { Point, Zone } from '@ray-js/robot-protocol';
-interface ZoneCleanResponse extends BaseResponse {
-    reqType: ZoneCleanEnum.query;
-    polygons: string[];
-    names?: string[];
-    suctions?: string[];
-    cisterns?: string[];
-    cleanCounts?: number[];
-    yMops?: number[];
-    sweepMopModes?: string[];
-}
-interface SetZoneCleanParams extends Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> {
-    zones: Zone[];
-    origin: Point;
-}
-type TRequestZoneClean = () => Promise<ZoneCleanResponse>;
-type TSetZoneClean = (params: SetZoneCleanParams) => Promise<ZoneCleanResponse>;
+import { type TRequestZoneClean, type TSetZoneClean } from './type/protocols';
 /**
  * 自定义 Hook，用于划区清扫
- * @param devId 设备ID
  * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
  */
-export declare const useZoneClean: (devId: string) => {
+export declare const useZoneClean: () => {
     requestZoneClean: TRequestZoneClean;
     setZoneClean: TSetZoneClean;
 };
-export {};

package/lib/mqtt/useZoneClean.js

@@ -1,35 +1,25 @@
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 // 划区清扫
-import { isArray } from 'lodash-es';
-import { createSetCommonParams } from './createCommonOptions';
-import { normalResolve } from './promise';
-import { ZoneCleanEnum } from './type';
-import { useContext } from 'react';
-import { SingletonContext } from './mqttProvider';
 import { encodeZoneClean0x3a, requestZoneClean0x3b } from '@ray-js/robot-protocol';
+import { useContext } from 'react';
 import { pointsToString } from '../utils';
-
-// 划区清扫响应类型
-
-// 设置划区清扫参数类型
-
-// 请求划区清扫函数类型定义
-
-// 设置划区清扫函数类型定义
-
+import { handleMqttError, useStructuredMessage } from './hooks/useStructuredMessage';
+import { SingletonContext } from './mqttProvider';
+import { ZoneCleanEnum } from './type';
+import { validator } from './type/fun';
 /**
  * 自定义 Hook，用于划区清扫
- * @param devId 设备ID
  * @returns 包含 requestZoneClean 和 setZoneClean 函数的对象
  */
-export const useZoneClean = devId => {
+export const useZoneClean = () => {
   const {
     useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
+  const {
+    sendStructuredMessage
+  } = useStructuredMessage();
 
   /**
    * 请求划区清扫信息
@@ -46,53 +36,42 @@ export const useZoneClean = devId => {
 
   return {
     requestZoneClean: () => {
-      try {
-        if (useMqtt) {
-          const params = createSetCommonParams({
-            deviceId: devId,
-            reqType: ZoneCleanEnum.query
-          });
-          ty.device.sendMqttMessage(params);
-          const {
-            taskId
-          } = params.message;
-          return normalResolve(ZoneCleanEnum.query, taskId);
-        }
+      return new Promise((resolve, reject) => {
+        try {
+          if (useMqtt) {
+            sendStructuredMessage(ZoneCleanEnum.query, {}, resolve, error => reject(handleMqttError(error, 'Failed to request zone clean')));
+            return;
+          }
 
-        // 非 MQTT 模式：使用命令传输
-        devices.common.model.actions.command_trans.set(requestZoneClean0x3b({
-          version: commandVersion
-        }));
+          // 非 MQTT 模式：使用命令传输
+          devices.common.model.actions.command_trans.set(requestZoneClean0x3b({
+            version: commandVersion
+          }));
 
-        // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ZoneCleanEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          polygons: [],
-          names: []
-        });
-      } catch (error) {
-        return Promise.reject(error instanceof Error ? error : new Error('Failed to request zone clean'));
-      }
+          // 非 MQTT 模式下无法立即获取响应数据，返回默认响应
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: ZoneCleanEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            polygons: [],
+            names: []
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to request zone clean'));
+        }
+      });
     },
     setZoneClean: params => {
-      const {
-        zones,
-        origin
-      } = params;
+      return new Promise((resolve, reject) => {
+        try {
+          const {
+            zones,
+            origin
+          } = params;
 
-      // 参数验证
-      if (!isArray(zones) || zones.length === 0) {
-        throw new Error('zones is required and must be a non-empty array');
-      }
-      if (!origin || typeof origin.x !== 'number' || typeof origin.y !== 'number') {
-        throw new Error('origin is required and must be a valid Point object with x and y properties');
-      }
-      try {
-        if (useMqtt) {
+          // 将业务参数转换为协议数据格式
           const num = zones.length;
           const {
             suctions = new Array(num).fill(''),
@@ -101,88 +80,97 @@ export const useZoneClean = devId => {
             yMops = new Array(num).fill(-1),
             sweepMopModes = new Array(num).fill('only_sweep')
           } = params;
-          if (suctions && !isArray(suctions)) {
-            throw new Error('suctions is illegal');
-          }
-          if (cisterns && !isArray(cisterns)) {
-            throw new Error('cisterns is illegal');
-          }
-          if (cleanCounts && !isArray(cleanCounts)) {
-            throw new Error('cleanCounts is illegal');
-          }
-          if (yMops && !isArray(yMops)) {
-            throw new Error('yMops is illegal');
-          }
-          if (sweepMopModes && !isArray(sweepMopModes)) {
-            throw new Error('sweepMopModes is illegal');
-          }
-          if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
-            throw new Error('The length of the parameters is inconsistent');
-          }
-          const polygons = [];
-          const names = [];
-          zones.forEach(_ref => {
-            let {
-              points,
-              name
-            } = _ref;
-            polygons.push(pointsToString(points, origin));
-            names.push(name || '');
-          });
-          const mqttParams = createSetCommonParams({
-            deviceId: devId,
-            reqType: ZoneCleanEnum.set,
-            message: {
+
+          // 构建符合 SetZoneCleanData 格式的数据
+          const zoneCleanData = {
+            zones: zones.map(_ref => {
+              let {
+                points,
+                name,
+                advanced
+              } = _ref;
+              return {
+                points,
+                name,
+                advanced
+              };
+            }),
+            origin,
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes
+          };
+
+          // 使用 TypeBox Schema 进行参数验证
+          const validatedData = validator.validate('set_zone_clean', zoneCleanData);
+          if (useMqtt) {
+            // 将 zones 转换为 polygons 字符串格式（用于 MQTT 消息）
+            const polygons = zones.map(_ref2 => {
+              let {
+                points
+              } = _ref2;
+              return pointsToString(points, origin);
+            });
+            const names = zones.map(_ref3 => {
+              let {
+                name
+              } = _ref3;
+              return name || '';
+            });
+            sendStructuredMessage(ZoneCleanEnum.set, {
               num: zones.length,
               switchGo: true,
               polygons,
-              suctions,
-              cisterns,
-              cleanCounts,
-              yMops,
-              sweepMopModes,
+              suctions: validatedData.suctions,
+              cisterns: validatedData.cisterns,
+              cleanCounts: validatedData.cleanCounts,
+              yMops: validatedData.yMops,
+              sweepMopModes: validatedData.sweepMopModes,
               names
-            }
+            }, resolve, error => reject(handleMqttError(error, 'Failed to set zone clean')), ZoneCleanEnum.query // 响应类型是 query，不是 set
+            );
+            return;
+          }
+
+          // 非 MQTT 模式：使用命令传输
+          const command = encodeZoneClean0x3a({
+            protocolVersion: 1,
+            version: commandVersion,
+            origin: validatedData.origin,
+            zones: validatedData.zones.map(zone => ({
+              points: zone.points,
+              name: zone.name,
+              advanced: zone.advanced
+            }))
           });
-          ty.device.sendMqttMessage(mqttParams);
-          const {
-            taskId
-          } = mqttParams.message;
-          return normalResolve(ZoneCleanEnum.query, taskId);
+          devices.common.model.actions.command_trans.set(command);
+          const polygons = zones.map(_ref4 => {
+            let {
+              points
+            } = _ref4;
+            return pointsToString(points, origin);
+          });
+          const names = zones.map(_ref5 => {
+            let {
+              name
+            } = _ref5;
+            return name || '';
+          });
+          resolve({
+            success: true,
+            errCode: 0,
+            reqType: ZoneCleanEnum.query,
+            version: commandVersion,
+            taskId: `${Date.now()}`,
+            polygons,
+            names
+          });
+        } catch (error) {
+          reject(handleMqttError(error, 'Failed to set zone clean'));
         }
-
-        // 非 MQTT 模式：使用命令传输
-        const command = encodeZoneClean0x3a({
-          protocolVersion: 1,
-          version: commandVersion,
-          origin,
-          zones
-        });
-        devices.common.model.actions.command_trans.set(command);
-        const polygons = zones.map(_ref2 => {
-          let {
-            points
-          } = _ref2;
-          return pointsToString(points, origin);
-        });
-        const names = zones.map(_ref3 => {
-          let {
-            name
-          } = _ref3;
-          return name || '';
-        });
-        return Promise.resolve({
-          success: true,
-          errCode: 0,
-          reqType: ZoneCleanEnum.query,
-          version: commandVersion,
-          taskId: `${Date.now()}`,
-          polygons,
-          names
-        });
-      } catch (error) {
-        throw error instanceof Error ? error : new Error('Failed to set zone clean');
-      }
+      });
     }
   };
 };

package/lib/myLib/zod/mini/index.d.cts

@@ -0,0 +1 @@
+export * from "../src/v4/mini/index.js";

package/lib/myLib/zod/mini/index.d.ts

@@ -0,0 +1 @@
+export * from "../src/v4/mini/index.js";

package/lib/myLib/zod/mini/index.js

@@ -0,0 +1 @@
+export * from "../src/v4/mini/index.js";

package/lib/myLib/zod/mini/package.json

@@ -0,0 +1,6 @@
+{ 
+  "type": "module",
+  "main": "./index.cjs",
+  "module": "./index.js",
+  "types": "./index.d.cts" 
+}

package/lib/myLib/zod/src/mini/index.d.ts

@@ -0,0 +1 @@
+export * from "../v4/mini/index.js";

package/lib/myLib/zod/src/mini/index.js

@@ -0,0 +1 @@
+export * from "../v4/mini/index.js";