@ray-js/robot-data-stream 0.0.15-beta.16 → 0.0.15-beta.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/mqtt/type/fun.d.ts +2 -0
- package/lib/mqtt/type/index.d.ts +4 -1
- package/lib/mqtt/type/protocols/base.d.ts +1 -0
- package/lib/mqtt/type/protocols/base.js +3 -1
- package/lib/mqtt/type/protocols/scheduleProtocol.d.ts +3 -0
- package/lib/mqtt/type/protocols/spotCleanProtocol.d.ts +1 -0
- package/lib/mqtt/useRoomProperty.js +7 -4
- package/lib/mqtt/useSchedule.js +10 -3
- package/package.json +7 -4
package/lib/mqtt/type/fun.d.ts
CHANGED
|
@@ -55,6 +55,7 @@ export declare const ProtocolSchemas: {
|
|
|
55
55
|
sweepMopModes: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
56
56
|
ids: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
57
57
|
routePreferences: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
58
|
+
nameLabels: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
58
59
|
active: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat;
|
|
59
60
|
cycle: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
60
61
|
time: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
@@ -134,6 +135,7 @@ export declare const ProtocolSchemas: {
|
|
|
134
135
|
sweepMopModes: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
135
136
|
ids: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
136
137
|
routePreferences: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
138
|
+
nameLabels: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
137
139
|
spots: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../myLib/zod/src/v4/mini/schemas").ZodMiniObject<{
|
|
138
140
|
x: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumber<number>;
|
|
139
141
|
y: import("../../myLib/zod/src/v4/mini/schemas").ZodMiniNumber<number>;
|
package/lib/mqtt/type/index.d.ts
CHANGED
|
@@ -22,12 +22,15 @@ export declare enum WifiMapEnum {
|
|
|
22
22
|
}
|
|
23
23
|
export type RoomPreference = {
|
|
24
24
|
suctions?: string[];
|
|
25
|
-
cisterns?: string
|
|
25
|
+
cisterns?: Array<string | number>;
|
|
26
|
+
waterValues?: Array<string | number>;
|
|
26
27
|
cleanCounts?: number[];
|
|
27
28
|
yMops?: number[];
|
|
28
29
|
sweepMopModes?: string[];
|
|
29
30
|
floorTypes?: number[];
|
|
30
31
|
names?: string[];
|
|
32
|
+
routePreferences?: string[];
|
|
33
|
+
nameLabels?: number[];
|
|
31
34
|
ids?: number[];
|
|
32
35
|
orders?: number[];
|
|
33
36
|
};
|
|
@@ -12,6 +12,7 @@ export declare const RoomPreferenceFieldsSchema: import("../../../myLib/zod/src/
|
|
|
12
12
|
sweepMopModes: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
13
13
|
ids: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
14
14
|
routePreferences: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
15
|
+
nameLabels: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
15
16
|
}, z.core.$strip>;
|
|
16
17
|
export declare const BaseResponseSchema: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniObject<{
|
|
17
18
|
success: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniBoolean<boolean>;
|
|
@@ -23,7 +23,9 @@ export const RoomPreferenceFieldsSchema = z.object({
|
|
|
23
23
|
// 房间id集合
|
|
24
24
|
ids: z.optional(z.array(z.int())),
|
|
25
25
|
// 路线偏好(四种清洁偏好): "standard"-标准, "fast"-快速, "deep"-深度, "custom"-自定义,默认值为'standard'
|
|
26
|
-
routePreferences: z.optional(z.array(z.string()))
|
|
26
|
+
routePreferences: z.optional(z.array(z.string())),
|
|
27
|
+
// 房间名称标签
|
|
28
|
+
nameLabels: z.optional(z.array(z.int()))
|
|
27
29
|
});
|
|
28
30
|
|
|
29
31
|
// BaseResponse Schema(用于响应类型)
|
|
@@ -8,6 +8,7 @@ export declare const ScheduleItemSchema: import("../../../myLib/zod/src/v4/mini/
|
|
|
8
8
|
sweepMopModes: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
9
9
|
ids: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
10
10
|
routePreferences: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
11
|
+
nameLabels: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
11
12
|
active: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat;
|
|
12
13
|
cycle: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
13
14
|
time: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
@@ -22,6 +23,7 @@ export declare const setScheduleSchema: import("../../../myLib/zod/src/v4/mini/s
|
|
|
22
23
|
sweepMopModes: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
23
24
|
ids: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
24
25
|
routePreferences: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
26
|
+
nameLabels: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
25
27
|
active: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat;
|
|
26
28
|
cycle: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
27
29
|
time: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
@@ -53,6 +55,7 @@ declare const ScheduleResponseSchema: import("../../../myLib/zod/src/v4/mini/sch
|
|
|
53
55
|
sweepMopModes: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
54
56
|
ids: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
55
57
|
routePreferences: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
58
|
+
nameLabels: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
56
59
|
active: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat;
|
|
57
60
|
cycle: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
58
61
|
time: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>;
|
|
@@ -8,6 +8,7 @@ export declare const setSpotCleanSchema: import("../../../myLib/zod/src/v4/mini/
|
|
|
8
8
|
sweepMopModes: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
9
9
|
ids: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
10
10
|
routePreferences: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniString<string>>>;
|
|
11
|
+
nameLabels: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniOptional<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumberFormat>>;
|
|
11
12
|
spots: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniArray<import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniObject<{
|
|
12
13
|
x: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumber<number>;
|
|
13
14
|
y: import("../../../myLib/zod/src/v4/mini/schemas").ZodMiniNumber<number>;
|
|
@@ -69,11 +69,14 @@ export const useRoomProperty = () => {
|
|
|
69
69
|
orders: data.orders,
|
|
70
70
|
routePreferences: (_data$routePreference = data.routePreferences) !== null && _data$routePreference !== void 0 ? _data$routePreference : new Array(len).fill('standard')
|
|
71
71
|
};
|
|
72
|
-
//
|
|
72
|
+
// 水量:传什么带什么,都没传时默认 cisterns
|
|
73
73
|
if (data.waterValues) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
var _data$waterValues;
|
|
75
|
+
sendData.waterValues = (_data$waterValues = data.waterValues) !== null && _data$waterValues !== void 0 ? _data$waterValues : new Array(len).fill(1);
|
|
76
|
+
}
|
|
77
|
+
if (data.cisterns || !data.waterValues) {
|
|
78
|
+
var _data$cisterns;
|
|
79
|
+
sendData.cisterns = (_data$cisterns = data.cisterns) !== null && _data$cisterns !== void 0 ? _data$cisterns : new Array(len).fill('closed');
|
|
77
80
|
}
|
|
78
81
|
|
|
79
82
|
// 使用 TypeBox Schema 进行参数验证(包含自定义验证逻辑)
|
package/lib/mqtt/useSchedule.js
CHANGED
|
@@ -64,6 +64,7 @@ export const useSchedule = () => {
|
|
|
64
64
|
version: commandVersion,
|
|
65
65
|
number: validatedData.num,
|
|
66
66
|
list: validatedData.list.map(_ref => {
|
|
67
|
+
var _ref2, _cisterns$;
|
|
67
68
|
let {
|
|
68
69
|
active,
|
|
69
70
|
suctions,
|
|
@@ -72,14 +73,19 @@ export const useSchedule = () => {
|
|
|
72
73
|
cleanCounts,
|
|
73
74
|
cycle,
|
|
74
75
|
cisterns,
|
|
76
|
+
waterValues,
|
|
75
77
|
time,
|
|
76
|
-
routePreferences
|
|
78
|
+
routePreferences,
|
|
79
|
+
nameLabels
|
|
77
80
|
} = _ref;
|
|
81
|
+
// 水量:优先 cisterns,其次 waterValues,都没有默认 closed
|
|
82
|
+
const raw = (_ref2 = (_cisterns$ = cisterns === null || cisterns === void 0 ? void 0 : cisterns[0]) !== null && _cisterns$ !== void 0 ? _cisterns$ : waterValues === null || waterValues === void 0 ? void 0 : waterValues[0]) !== null && _ref2 !== void 0 ? _ref2 : 'closed';
|
|
83
|
+
const waterLevel = typeof raw === 'number' ? raw : CISTERN_MAP[raw];
|
|
78
84
|
return {
|
|
79
85
|
effectiveness: active,
|
|
80
86
|
cleanMode: CLEAN_MODE_MAP[(sweepMopModes === null || sweepMopModes === void 0 ? void 0 : sweepMopModes[0]) || ''],
|
|
81
87
|
fanLevel: SUCTION_MAP[(suctions === null || suctions === void 0 ? void 0 : suctions[0]) || ''],
|
|
82
|
-
waterLevel
|
|
88
|
+
waterLevel,
|
|
83
89
|
time: {
|
|
84
90
|
hour: time[0],
|
|
85
91
|
minute: time[1]
|
|
@@ -88,7 +94,8 @@ export const useSchedule = () => {
|
|
|
88
94
|
sweepCount: (cleanCounts === null || cleanCounts === void 0 ? void 0 : cleanCounts[0]) || 1,
|
|
89
95
|
roomIds: ids || [],
|
|
90
96
|
roomNum: (ids === null || ids === void 0 ? void 0 : ids.length) || 0,
|
|
91
|
-
routePreference: ROUTE_PREFERENCE_MAP[(routePreferences === null || routePreferences === void 0 ? void 0 : routePreferences[0]) || 'standard']
|
|
97
|
+
routePreference: ROUTE_PREFERENCE_MAP[(routePreferences === null || routePreferences === void 0 ? void 0 : routePreferences[0]) || 'standard'],
|
|
98
|
+
nameLabel: nameLabels === null || nameLabels === void 0 ? void 0 : nameLabels[0]
|
|
92
99
|
};
|
|
93
100
|
})
|
|
94
101
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ray-js/robot-data-stream",
|
|
3
|
-
"version": "0.0.15-beta.
|
|
3
|
+
"version": "0.0.15-beta.17",
|
|
4
4
|
"description": "扫地机P2P数据流标准化组件",
|
|
5
5
|
"main": "lib/index",
|
|
6
6
|
"files": [
|
|
@@ -28,7 +28,9 @@
|
|
|
28
28
|
"start:wechat": "ray start ./example -t wechat --verbose",
|
|
29
29
|
"start:web": "ray start ./example -t web",
|
|
30
30
|
"prepublishOnly": "yarn build",
|
|
31
|
-
"release-it": "standard-version"
|
|
31
|
+
"release-it": "standard-version",
|
|
32
|
+
"docs:dev": "vitepress dev docs",
|
|
33
|
+
"docs:build": "vitepress build docs"
|
|
32
34
|
},
|
|
33
35
|
"peerDependencies": {
|
|
34
36
|
"@ray-js/log4js": "^0.0.4",
|
|
@@ -53,14 +55,15 @@
|
|
|
53
55
|
"@ray-js/log4js": "^0.0.4",
|
|
54
56
|
"@ray-js/ray": "1.8.0-beta.14",
|
|
55
57
|
"@ray-js/robot-protocol": "^1.0.1",
|
|
58
|
+
"@types/lodash-es": "^4.17.12",
|
|
56
59
|
"core-js": "^3.19.1",
|
|
57
60
|
"eslint-config-tuya-panel": "^0.4.2",
|
|
58
61
|
"husky": "^1.2.0",
|
|
59
62
|
"lint-staged": "^10.2.11",
|
|
60
63
|
"patch-package": "^8.0.0",
|
|
61
|
-
"@types/lodash-es": "^4.17.12",
|
|
62
64
|
"prettier": "^3.8.0",
|
|
63
|
-
"standard-version": "9.3.2"
|
|
65
|
+
"standard-version": "9.3.2",
|
|
66
|
+
"vitepress": "^1.6.4"
|
|
64
67
|
},
|
|
65
68
|
"husky": {
|
|
66
69
|
"hooks": {
|