@matter/node 0.17.0-alpha.0-20260518-7f13c7285 → 0.17.0
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/dist/cjs/behavior/state/managed/values/ListManager.js +2 -2
- package/dist/cjs/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.js +17 -20
- package/dist/cjs/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/cjs/behaviors/color-control/ColorControlServer.js +3 -3
- package/dist/cjs/behaviors/color-control/ColorControlServer.js.map +1 -1
- package/dist/cjs/behaviors/descriptor/DescriptorServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/descriptor/DescriptorServer.js +10 -0
- package/dist/cjs/behaviors/descriptor/DescriptorServer.js.map +1 -1
- package/dist/cjs/behaviors/door-lock/DoorLockServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/door-lock/DoorLockServer.js +55 -58
- package/dist/cjs/behaviors/door-lock/DoorLockServer.js.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +5 -5
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js +20 -20
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/groups/GroupsServer.js +11 -11
- package/dist/cjs/behaviors/groups/GroupsServer.js.map +1 -1
- package/dist/cjs/behaviors/level-control/LevelControlServer.js +2 -2
- package/dist/cjs/behaviors/level-control/LevelControlServer.js.map +1 -1
- package/dist/cjs/behaviors/mode-select/ModeSelectServer.js +1 -1
- package/dist/cjs/behaviors/mode-select/ModeSelectServer.js.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js +13 -16
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/cjs/behaviors/switch/SwitchServer.js +1 -1
- package/dist/cjs/behaviors/switch/SwitchServer.js.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js +5 -5
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/cjs/devices/closure-panel.d.ts +0 -18
- package/dist/cjs/devices/closure-panel.d.ts.map +1 -1
- package/dist/cjs/devices/closure-panel.js +1 -8
- package/dist/cjs/devices/closure-panel.js.map +2 -2
- package/dist/cjs/devices/closure.d.ts +0 -18
- package/dist/cjs/devices/closure.d.ts.map +1 -1
- package/dist/cjs/devices/closure.js +1 -8
- package/dist/cjs/devices/closure.js.map +2 -2
- package/dist/cjs/devices/door-lock.d.ts +0 -18
- package/dist/cjs/devices/door-lock.d.ts.map +1 -1
- package/dist/cjs/devices/door-lock.js +1 -8
- package/dist/cjs/devices/door-lock.js.map +2 -2
- package/dist/cjs/devices/window-covering.d.ts +0 -16
- package/dist/cjs/devices/window-covering.d.ts.map +1 -1
- package/dist/cjs/devices/window-covering.js +1 -9
- package/dist/cjs/devices/window-covering.js.map +2 -2
- package/dist/cjs/endpoint/type/MutableEndpoint.d.ts.map +1 -1
- package/dist/cjs/endpoint/type/MutableEndpoint.js +1 -7
- package/dist/cjs/endpoint/type/MutableEndpoint.js.map +1 -1
- package/dist/cjs/node/server/InteractionServer.d.ts.map +1 -1
- package/dist/cjs/node/server/InteractionServer.js +21 -24
- package/dist/cjs/node/server/InteractionServer.js.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.js +2 -2
- package/dist/cjs/node/server/ServerSubscription.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ListManager.js +3 -3
- package/dist/esm/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js +2 -2
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.js +18 -21
- package/dist/esm/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/esm/behaviors/color-control/ColorControlServer.js +4 -4
- package/dist/esm/behaviors/color-control/ColorControlServer.js.map +1 -1
- package/dist/esm/behaviors/descriptor/DescriptorServer.d.ts.map +1 -1
- package/dist/esm/behaviors/descriptor/DescriptorServer.js +11 -1
- package/dist/esm/behaviors/descriptor/DescriptorServer.js.map +1 -1
- package/dist/esm/behaviors/door-lock/DoorLockServer.d.ts.map +1 -1
- package/dist/esm/behaviors/door-lock/DoorLockServer.js +56 -59
- package/dist/esm/behaviors/door-lock/DoorLockServer.js.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +6 -6
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js +21 -21
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/esm/behaviors/groups/GroupsServer.js +12 -12
- package/dist/esm/behaviors/groups/GroupsServer.js.map +1 -1
- package/dist/esm/behaviors/level-control/LevelControlServer.js +3 -3
- package/dist/esm/behaviors/level-control/LevelControlServer.js.map +1 -1
- package/dist/esm/behaviors/mode-select/ModeSelectServer.js +2 -2
- package/dist/esm/behaviors/mode-select/ModeSelectServer.js.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js +14 -17
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/esm/behaviors/switch/SwitchServer.js +2 -2
- package/dist/esm/behaviors/switch/SwitchServer.js.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js +6 -6
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/esm/devices/closure-panel.d.ts +0 -18
- package/dist/esm/devices/closure-panel.d.ts.map +1 -1
- package/dist/esm/devices/closure-panel.js +1 -8
- package/dist/esm/devices/closure-panel.js.map +1 -1
- package/dist/esm/devices/closure.d.ts +0 -18
- package/dist/esm/devices/closure.d.ts.map +1 -1
- package/dist/esm/devices/closure.js +1 -10
- package/dist/esm/devices/closure.js.map +1 -1
- package/dist/esm/devices/door-lock.d.ts +0 -18
- package/dist/esm/devices/door-lock.d.ts.map +1 -1
- package/dist/esm/devices/door-lock.js +1 -10
- package/dist/esm/devices/door-lock.js.map +1 -1
- package/dist/esm/devices/window-covering.d.ts +0 -16
- package/dist/esm/devices/window-covering.d.ts.map +1 -1
- package/dist/esm/devices/window-covering.js +1 -11
- package/dist/esm/devices/window-covering.js.map +1 -1
- package/dist/esm/endpoint/type/MutableEndpoint.d.ts.map +1 -1
- package/dist/esm/endpoint/type/MutableEndpoint.js +1 -7
- package/dist/esm/endpoint/type/MutableEndpoint.js.map +1 -1
- package/dist/esm/node/server/InteractionServer.d.ts.map +1 -1
- package/dist/esm/node/server/InteractionServer.js +21 -25
- package/dist/esm/node/server/InteractionServer.js.map +1 -1
- package/dist/esm/node/server/ServerSubscription.js +3 -3
- package/dist/esm/node/server/ServerSubscription.js.map +1 -1
- package/package.json +6 -6
- package/src/behavior/state/managed/values/ListManager.ts +3 -3
- package/src/behavior/system/subscriptions/SubscriptionsServer.ts +2 -2
- package/src/behaviors/access-control/AccessControlServer.ts +18 -21
- package/src/behaviors/color-control/ColorControlServer.ts +4 -4
- package/src/behaviors/descriptor/DescriptorServer.ts +13 -1
- package/src/behaviors/door-lock/DoorLockServer.ts +56 -59
- package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts +6 -6
- package/src/behaviors/group-key-management/GroupKeyManagementServer.ts +22 -22
- package/src/behaviors/groups/GroupsServer.ts +12 -12
- package/src/behaviors/level-control/LevelControlServer.ts +3 -3
- package/src/behaviors/mode-select/ModeSelectServer.ts +2 -2
- package/src/behaviors/operational-credentials/OperationalCredentialsServer.ts +14 -17
- package/src/behaviors/switch/SwitchServer.ts +2 -2
- package/src/behaviors/window-covering/WindowCoveringServer.ts +6 -6
- package/src/devices/closure-panel.ts +1 -20
- package/src/devices/closure.ts +1 -22
- package/src/devices/door-lock.ts +1 -22
- package/src/devices/window-covering.ts +1 -23
- package/src/endpoint/type/MutableEndpoint.ts +1 -8
- package/src/node/server/InteractionServer.ts +21 -25
- package/src/node/server/ServerSubscription.ts +3 -3
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
hasRemoteActor,
|
|
12
12
|
IPK_DEFAULT_EPOCH_START_TIME
|
|
13
13
|
} from "@matter/protocol";
|
|
14
|
-
import { GroupId,
|
|
14
|
+
import { GroupId, Status, StatusResponseError } from "@matter/types";
|
|
15
15
|
import { GroupKeyManagement } from "@matter/types/clusters/group-key-management";
|
|
16
16
|
import { GroupKeyManagementBehavior } from "./GroupKeyManagementBehavior.js";
|
|
17
17
|
const logger = Logger.get("GroupKeyManagementServer");
|
|
@@ -138,7 +138,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
138
138
|
if (!GroupId.isApplicationGroupId(groupId)) {
|
|
139
139
|
throw new StatusResponseError(
|
|
140
140
|
"Only operational GroupIds are allowed in GroupKeyMap",
|
|
141
|
-
|
|
141
|
+
Status.InvalidAction
|
|
142
142
|
);
|
|
143
143
|
}
|
|
144
144
|
groupIdsPerFabric[fabricIndex] = (groupIdsPerFabric[fabricIndex] ?? 0) + 1;
|
|
@@ -146,7 +146,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
146
146
|
if (knownGroupIds.has(id)) {
|
|
147
147
|
throw new StatusResponseError(
|
|
148
148
|
`Duplicate GroupId ${groupId} for FabricIndex ${fabricIndex}`,
|
|
149
|
-
|
|
149
|
+
Status.ConstraintError
|
|
150
150
|
);
|
|
151
151
|
}
|
|
152
152
|
knownGroupIds.add(id);
|
|
@@ -154,7 +154,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
154
154
|
if (groupIdsPerFabric.some((count) => count > this.state.maxGroupsPerFabric)) {
|
|
155
155
|
throw new StatusResponseError(
|
|
156
156
|
`Too many groups per fabric, maximum is ${this.state.maxGroupsPerFabric}`,
|
|
157
|
-
|
|
157
|
+
Status.ResourceExhausted
|
|
158
158
|
);
|
|
159
159
|
}
|
|
160
160
|
}
|
|
@@ -165,14 +165,14 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
165
165
|
if (groupId === 0) {
|
|
166
166
|
throw new StatusResponseError(
|
|
167
167
|
"GroupId 0 can not be used as operational group id",
|
|
168
|
-
|
|
168
|
+
Status.ConstraintError
|
|
169
169
|
);
|
|
170
170
|
}
|
|
171
171
|
const id = `${fabricIndex}-${groupId}`;
|
|
172
172
|
if (knownGroupIds.has(id)) {
|
|
173
173
|
throw new StatusResponseError(
|
|
174
174
|
`Duplicate GroupId ${groupId} for FabricIndex ${fabricIndex}`,
|
|
175
|
-
|
|
175
|
+
Status.ConstraintError
|
|
176
176
|
);
|
|
177
177
|
}
|
|
178
178
|
knownGroupIds.add(id);
|
|
@@ -180,7 +180,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
180
180
|
if (endpointIds.size !== endpoints.length) {
|
|
181
181
|
throw new StatusResponseError(
|
|
182
182
|
`Duplicate endpoint IDs in GroupId ${groupId} for FabricIndex ${fabricIndex}`,
|
|
183
|
-
|
|
183
|
+
Status.ConstraintError
|
|
184
184
|
);
|
|
185
185
|
}
|
|
186
186
|
}
|
|
@@ -239,37 +239,37 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
239
239
|
groupKeySet.epochKey2 = null;
|
|
240
240
|
}
|
|
241
241
|
if (epochKey0 === null || epochStartTime0 === null) {
|
|
242
|
-
throw new StatusResponseError("EpochKey0 and EpochStartTime0 must be set",
|
|
242
|
+
throw new StatusResponseError("EpochKey0 and EpochStartTime0 must be set", Status.InvalidCommand);
|
|
243
243
|
}
|
|
244
244
|
if (epochStartTime0 <= IPK_DEFAULT_EPOCH_START_TIME) {
|
|
245
|
-
throw new StatusResponseError("EpochStartTime0 must not be 0",
|
|
245
|
+
throw new StatusResponseError("EpochStartTime0 must not be 0", Status.InvalidCommand);
|
|
246
246
|
}
|
|
247
247
|
if (epochKey1 !== null && (epochStartTime1 === null || epochStartTime1 <= epochStartTime0)) {
|
|
248
248
|
throw new StatusResponseError(
|
|
249
249
|
"EpochStartTime1 must be set and greater than EpochStartTime0",
|
|
250
|
-
|
|
250
|
+
Status.InvalidCommand
|
|
251
251
|
);
|
|
252
252
|
}
|
|
253
253
|
if (epochKey1 === null && epochStartTime1 !== null) {
|
|
254
|
-
throw new StatusResponseError("EpochKey1 must be set if EpochStartTime1 is set",
|
|
254
|
+
throw new StatusResponseError("EpochKey1 must be set if EpochStartTime1 is set", Status.InvalidCommand);
|
|
255
255
|
}
|
|
256
256
|
if (epochKey2 !== null && epochKey1 === null) {
|
|
257
|
-
throw new StatusResponseError("EpochKey1 must be set if EpochKey2 is set",
|
|
257
|
+
throw new StatusResponseError("EpochKey1 must be set if EpochKey2 is set", Status.InvalidCommand);
|
|
258
258
|
}
|
|
259
259
|
if (epochKey2 !== null && (epochStartTime2 === null || epochStartTime1 === null || epochStartTime2 <= epochStartTime1)) {
|
|
260
260
|
throw new StatusResponseError(
|
|
261
261
|
"EpochStartTime2 must be set and greater than EpochStartTime1",
|
|
262
|
-
|
|
262
|
+
Status.InvalidCommand
|
|
263
263
|
);
|
|
264
264
|
}
|
|
265
265
|
if (epochKey2 === null && epochStartTime2 !== null) {
|
|
266
|
-
throw new StatusResponseError("EpochKey2 must be set if EpochStartTime2 is set",
|
|
266
|
+
throw new StatusResponseError("EpochKey2 must be set if EpochStartTime2 is set", Status.InvalidCommand);
|
|
267
267
|
}
|
|
268
268
|
if (groupKeySecurityPolicy !== GroupKeyManagement.GroupKeySecurityPolicy.TrustFirst) {
|
|
269
|
-
throw new StatusResponseError("GroupKeySecurityPolicy must be TrustFirst",
|
|
269
|
+
throw new StatusResponseError("GroupKeySecurityPolicy must be TrustFirst", Status.InvalidCommand);
|
|
270
270
|
}
|
|
271
271
|
if (groupKeyMulticastPolicy !== GroupKeyManagement.GroupKeyMulticastPolicy.PerGroupId) {
|
|
272
|
-
throw new StatusResponseError("GroupKeyMulticastPolicy must be PerGroupId",
|
|
272
|
+
throw new StatusResponseError("GroupKeyMulticastPolicy must be PerGroupId", Status.InvalidCommand);
|
|
273
273
|
}
|
|
274
274
|
const fabric = this.context.session.associatedFabric;
|
|
275
275
|
const fabricIndex = fabric.fabricIndex;
|
|
@@ -283,7 +283,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
283
283
|
if (keySetsOfFabric >= this.state.maxGroupKeysPerFabric) {
|
|
284
284
|
throw new StatusResponseError(
|
|
285
285
|
`Too many group key sets for fabric ${fabricIndex}, maximum is ${this.state.maxGroupKeysPerFabric}`,
|
|
286
|
-
|
|
286
|
+
Status.ResourceExhausted
|
|
287
287
|
);
|
|
288
288
|
}
|
|
289
289
|
this.state.groupKeySets.push({ ...groupKeySet, fabricIndex });
|
|
@@ -297,7 +297,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
297
297
|
const fabric = this.context.session.associatedFabric;
|
|
298
298
|
const groupKeySet = fabric.groups.keySets.asGroupKeySet(groupKeySetId);
|
|
299
299
|
if (groupKeySet === void 0) {
|
|
300
|
-
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`,
|
|
300
|
+
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`, Status.NotFound);
|
|
301
301
|
}
|
|
302
302
|
return {
|
|
303
303
|
groupKeySet: {
|
|
@@ -310,7 +310,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
310
310
|
}
|
|
311
311
|
async keySetRemove({ groupKeySetId }) {
|
|
312
312
|
if (groupKeySetId === 0) {
|
|
313
|
-
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} cannot be removed`,
|
|
313
|
+
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} cannot be removed`, Status.InvalidCommand);
|
|
314
314
|
}
|
|
315
315
|
assertRemoteActor(this.context);
|
|
316
316
|
const fabric = this.context.session.associatedFabric;
|
|
@@ -319,7 +319,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
319
319
|
({ groupKeySetId: entryId, fabricIndex: entryIndex }) => entryIndex === fabricIndex && entryId === groupKeySetId
|
|
320
320
|
);
|
|
321
321
|
if (existingIndex === -1) {
|
|
322
|
-
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`,
|
|
322
|
+
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`, Status.NotFound);
|
|
323
323
|
}
|
|
324
324
|
this.state.groupKeySets.splice(existingIndex, 1);
|
|
325
325
|
this.state.groupKeyMap = this.state.groupKeyMap.filter(
|
|
@@ -352,7 +352,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
352
352
|
if (this.state.groupTable.filter(({ fabricIndex: entryFabricIndex }) => entryFabricIndex === fabricIndex).length >= this.state.maxGroupsPerFabric) {
|
|
353
353
|
throw new StatusResponseError(
|
|
354
354
|
`Too many groups for fabric ${fabricIndex}, maximum is ${this.state.maxGroupsPerFabric}`,
|
|
355
|
-
|
|
355
|
+
Status.ResourceExhausted
|
|
356
356
|
);
|
|
357
357
|
}
|
|
358
358
|
this.state.groupTable.push({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,UAAU,qBAAqB,cAAc;AACtD,SAAS,oBAAoB;AAC7B;AAAA,EACI;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAsC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["groupId", "GroupKeyManagementServer"]
|
|
6
6
|
}
|
|
@@ -9,7 +9,7 @@ import { ScenesManagementServer } from "#behaviors/scenes-management";
|
|
|
9
9
|
import { RootEndpoint } from "#endpoints/root";
|
|
10
10
|
import { InternalError, Logger } from "@matter/general";
|
|
11
11
|
import { assertRemoteActor } from "@matter/protocol";
|
|
12
|
-
import {
|
|
12
|
+
import { Status, StatusResponseError } from "@matter/types";
|
|
13
13
|
import { Groups } from "@matter/types/clusters/groups";
|
|
14
14
|
import { GroupsBehavior } from "./GroupsBehavior.js";
|
|
15
15
|
const logger = Logger.get("GroupsServer");
|
|
@@ -65,13 +65,13 @@ class GroupsServer extends GroupsBase {
|
|
|
65
65
|
assertRemoteActor(this.context);
|
|
66
66
|
const fabric = this.context.session.associatedFabric;
|
|
67
67
|
if (groupId < 1) {
|
|
68
|
-
return { status:
|
|
68
|
+
return { status: Status.ConstraintError, groupId };
|
|
69
69
|
}
|
|
70
70
|
if (groupName.length > 16) {
|
|
71
|
-
return { status:
|
|
71
|
+
return { status: Status.ConstraintError, groupId };
|
|
72
72
|
}
|
|
73
73
|
if (!fabric.groups.groupKeyIdMap.has(groupId)) {
|
|
74
|
-
return { status:
|
|
74
|
+
return { status: Status.UnsupportedAccess, groupId };
|
|
75
75
|
}
|
|
76
76
|
const endpointNumber = this.endpoint.number;
|
|
77
77
|
try {
|
|
@@ -83,22 +83,22 @@ class GroupsServer extends GroupsBase {
|
|
|
83
83
|
StatusResponseError.accept(error);
|
|
84
84
|
return { status: error.code, groupId };
|
|
85
85
|
}
|
|
86
|
-
return { status:
|
|
86
|
+
return { status: Status.Success, groupId };
|
|
87
87
|
}
|
|
88
88
|
viewGroup({ groupId }) {
|
|
89
89
|
assertRemoteActor(this.context);
|
|
90
90
|
const fabric = this.context.session.associatedFabric;
|
|
91
91
|
if (groupId < 1) {
|
|
92
|
-
return { status:
|
|
92
|
+
return { status: Status.ConstraintError, groupId, groupName: "" };
|
|
93
93
|
}
|
|
94
94
|
const fabricIndex = fabric.fabricIndex;
|
|
95
95
|
const endpointNumber = this.endpoint.number;
|
|
96
96
|
const { groupTable } = this.#rootEndpoint.stateOf(GroupKeyManagementServer);
|
|
97
97
|
const groupEntry = groupTable.find((entry) => entry.groupId === groupId && entry.fabricIndex === fabricIndex);
|
|
98
98
|
if (groupEntry === void 0 || !groupEntry.endpoints.includes(endpointNumber)) {
|
|
99
|
-
return { status:
|
|
99
|
+
return { status: Status.NotFound, groupId, groupName: "" };
|
|
100
100
|
}
|
|
101
|
-
return { status:
|
|
101
|
+
return { status: Status.Success, groupId, groupName: groupEntry.groupName ?? "" };
|
|
102
102
|
}
|
|
103
103
|
async getGroupMembership({
|
|
104
104
|
groupList
|
|
@@ -120,7 +120,7 @@ class GroupsServer extends GroupsBase {
|
|
|
120
120
|
}
|
|
121
121
|
async removeGroup({ groupId }) {
|
|
122
122
|
if (groupId < 1) {
|
|
123
|
-
return { status:
|
|
123
|
+
return { status: Status.ConstraintError, groupId };
|
|
124
124
|
}
|
|
125
125
|
try {
|
|
126
126
|
assertRemoteActor(this.context);
|
|
@@ -130,9 +130,9 @@ class GroupsServer extends GroupsBase {
|
|
|
130
130
|
if (this.agent.has(ScenesManagementServer)) {
|
|
131
131
|
this.agent.get(ScenesManagementServer).removeScenesForGroupOnFabric(this.context.session.associatedFabric.fabricIndex, groupId);
|
|
132
132
|
}
|
|
133
|
-
return { status:
|
|
133
|
+
return { status: Status.Success, groupId };
|
|
134
134
|
}
|
|
135
|
-
return { status:
|
|
135
|
+
return { status: Status.NotFound, groupId };
|
|
136
136
|
} catch (error) {
|
|
137
137
|
StatusResponseError.accept(error);
|
|
138
138
|
return { status: error.code, groupId };
|
|
@@ -153,7 +153,7 @@ class GroupsServer extends GroupsBase {
|
|
|
153
153
|
async addGroupIfIdentifying({ groupId, groupName }) {
|
|
154
154
|
if (this.endpoint.stateOf(IdentifyBehavior).identifyTime > 0) {
|
|
155
155
|
const { status } = await this.addGroup({ groupId, groupName });
|
|
156
|
-
if (status !==
|
|
156
|
+
if (status !== Status.Success) {
|
|
157
157
|
throw new StatusResponseError(`Failed to add group ${groupId}`, status);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/groups/GroupsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gCAAgC;AACzC,SAAS,wBAAwB;AACjC,SAAS,8BAA8B;AAEvC,SAAS,oBAAoB;AAC7B,SAAS,eAAe,cAAc;AACtC,SAAS,yBAAiC;AAC1C,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fabric"]
|
|
6
6
|
}
|
|
@@ -12,7 +12,7 @@ import { AggregatorEndpoint } from "#endpoints/aggregator";
|
|
|
12
12
|
import { ServerNode } from "#node/ServerNode.js";
|
|
13
13
|
import { AsyncObservable, cropValueRange, Logger, MaybePromise, Millis } from "@matter/general";
|
|
14
14
|
import { Val } from "@matter/protocol";
|
|
15
|
-
import {
|
|
15
|
+
import { Status, StatusResponseError } from "@matter/types";
|
|
16
16
|
import { GeneralDiagnostics } from "@matter/types/clusters/general-diagnostics";
|
|
17
17
|
import { LevelControl } from "@matter/types/clusters/level-control";
|
|
18
18
|
import { LevelControlBehavior } from "./LevelControlBehavior.js";
|
|
@@ -36,7 +36,7 @@ class LevelControlBaseServer extends LevelControlBase {
|
|
|
36
36
|
if (this.state.currentLevel === null) {
|
|
37
37
|
throw new StatusResponseError(
|
|
38
38
|
"The currentLevel value is null, so we cannot operate on it.",
|
|
39
|
-
|
|
39
|
+
Status.Failure
|
|
40
40
|
);
|
|
41
41
|
}
|
|
42
42
|
return this.state.currentLevel;
|
|
@@ -186,7 +186,7 @@ class LevelControlBaseServer extends LevelControlBase {
|
|
|
186
186
|
*/
|
|
187
187
|
#assertRateValue(rate) {
|
|
188
188
|
if (rate === 0) {
|
|
189
|
-
throw new StatusResponseError(`Illegal move rate of 0`,
|
|
189
|
+
throw new StatusResponseError(`Illegal move rate of 0`, Status.InvalidCommand);
|
|
190
190
|
}
|
|
191
191
|
if (rate === null) {
|
|
192
192
|
return this.state.defaultMoveRate ?? null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/level-control/LevelControlServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,mBAAmB;AAC5B,SAAS,0BAA0B;AACnC,SAAS,kCAAkC;AAC3C,SAAS,mBAAmB;AAC5B,SAAS,8BAA8B;AAEvC,SAAS,0BAA0B;AACnC,SAAS,kBAAkB;AAC3B,SAAS,iBAAiB,gBAA0B,QAAQ,cAAc,cAAc;AACxF,SAAS,WAAW;AACpB,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["LevelControlBaseServer"]
|
|
6
6
|
}
|
|
@@ -7,7 +7,7 @@ import { GeneralDiagnosticsBehavior } from "#behaviors/general-diagnostics";
|
|
|
7
7
|
import { OnOffServer } from "#behaviors/on-off";
|
|
8
8
|
import { ServerNode } from "#node/ServerNode.js";
|
|
9
9
|
import { Logger } from "@matter/general";
|
|
10
|
-
import {
|
|
10
|
+
import { Status, StatusResponseError } from "@matter/types";
|
|
11
11
|
import { GeneralDiagnostics } from "@matter/types/clusters/general-diagnostics";
|
|
12
12
|
import { ModeSelect } from "@matter/types/clusters/mode-select";
|
|
13
13
|
import { OnOff } from "@matter/types/clusters/on-off";
|
|
@@ -57,7 +57,7 @@ class ModeSelectBaseServer extends ModeSelectBase {
|
|
|
57
57
|
if (!this.state.supportedModes.some(({ mode: supportedMode }) => supportedMode === mode)) {
|
|
58
58
|
throw new StatusResponseError(
|
|
59
59
|
`Mode ${mode} provided in ${fieldName} is not supported`,
|
|
60
|
-
|
|
60
|
+
Status.InvalidCommand
|
|
61
61
|
);
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/mode-select/ModeSelectServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kCAAkC;AAC3C,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAC3B,SAAS,cAA4B;AACrC,SAAS,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kCAAkC;AAC3C,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAC3B,SAAS,cAA4B;AACrC,SAAS,QAAQ,2BAA2B;AAC5C,SAAS,0BAA0B;AACnC,SAAS,kBAAkB;AAC3B,SAAS,aAAa;AACtB,SAAS,0BAA0B;AAEnC,MAAM,SAAS,OAAO,IAAI,kBAAkB;AAE5C,MAAM,iBAAiB,mBAAmB,KAAK,WAAW,QAAQ,KAAK;AAWhE,MAAM,6BAA6B,eAAe;AAAA,EAC5C,aAA2B;AAChC,SAAK,mBAAmB;AACxB,SAAK,mBAAmB;AACxB,SAAK,cAAc;AAEnB,QAAI,wBAAwB;AAE5B,QAAI,KAAK,SAAS,SAAS,KAAK,MAAM,WAAW,UAAa,KAAK,MAAM,WAAW,MAAM;AACtF,YAAM,cAAc,KAAK,MAAM,IAAI,WAAW;AAC9C,UAAI,gBAAgB,QAAW;AAC3B,YACI,YAAY,SAAS,YACrB,kBAAkB,YAAY,SAC9B,YAAY,MAAM,iBAAiB,MAAM,aAAa,IACxD;AACE,eAAK,MAAM,cAAc,KAAK,MAAM;AACpC,kCAAwB;AAAA,QAC5B;AACA,aAAK,QAAQ,YAAY,OAAO,eAAe,KAAK,sBAAsB;AAAA,MAC9E,OAAO;AACH,eAAO,KAAK,uDAAuD;AAAA,MACvE;AAAA,IACJ;AAGA,QACI,CAAC,yBACD,KAAK,MAAM,gBAAgB,UAC3B,KAAK,MAAM,gBAAgB,QAC3B,KAAK,eAAe,MAAM,mBAAmB,WAAW,yBAC1D;AACE,WAAK,MAAM,cAAc,KAAK,MAAM;AAAA,IACxC;AAAA,EACJ;AAAA,EAES,aAAa,EAAE,QAAQ,GAAiD;AAC7E,SAAK,iBAAiB,WAAW,OAAO;AAExC,SAAK,MAAM,cAAc;AAAA,EAC7B;AAAA,EAEA,qBAA2B;AACvB,SAAK,iBAAiB,eAAe,KAAK,MAAM,WAAW;AAAA,EAC/D;AAAA,EAEA,qBAA2B;AACvB,QAAI,KAAK,MAAM,gBAAgB,UAAa,KAAK,MAAM,gBAAgB,MAAM;AACzE,WAAK,iBAAiB,eAAe,KAAK,MAAM,WAAW;AAAA,IAC/D;AAAA,EACJ;AAAA,EAEA,gBAAsB;AAClB,QAAI,KAAK,MAAM,WAAW,UAAa,KAAK,MAAM,WAAW,MAAM;AAC/D,WAAK,iBAAiB,UAAU,KAAK,MAAM,MAAM;AAAA,IACrD;AAAA,EACJ;AAAA,EAEA,iBAAiB,WAAmB,MAAoB;AACpD,QAAI,CAAC,KAAK,MAAM,eAAe,KAAK,CAAC,EAAE,MAAM,cAAc,MAAM,kBAAkB,IAAI,GAAG;AACtF,YAAM,IAAI;AAAA,QACN,QAAQ,IAAI,gBAAgB,SAAS;AAAA,QACrC,OAAO;AAAA,MACX;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,uBAAuB,UAAmB,UAAyB;AAC/D,QAAI,YAAY,CAAC,YAAY,KAAK,MAAM,WAAW,UAAa,KAAK,MAAM,WAAW,MAAM;AACxF,WAAK,MAAM,cAAc,KAAK,MAAM;AAAA,IACxC;AAAA,EACJ;AAAA,EAEA,iBAAiB;AACb,UAAM,eAAe,KAAK,IAAI,IAAI,UAAU;AAC5C,QAAI,aAAa,UAAU,IAAI,0BAA0B,GAAG;AACxD,aAAO,aAAa,QAAQ,0BAA0B,EAAE;AAAA,IAC5D;AAAA,EACJ;AACJ;AAEO,MAAM,yBAAyB,qBAAqB,IAAI,UAAU,EAAE;AAAC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperationalCredentialsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAI3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAMH,YAAY,EAEf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEH,mBAAmB,EAWnB,GAAG,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,WAAW,EAOd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAqBxF,QAAA,MAAM,0BAA0B;;CAG/B,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,0BAA0B;;IAChE,QAAQ,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IACxD,SAAiB,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC;IAElD,UAAU,IAAI,YAAY,CAQlC;IAEc,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,EAAE,sBAAsB,CAAC,kBAAkB;;;OAqBhG;IAEc,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,sBAAsB,CAAC,UAAU;;;
|
|
1
|
+
{"version":3,"file":"OperationalCredentialsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAI3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAMH,YAAY,EAEf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEH,mBAAmB,EAWnB,GAAG,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,WAAW,EAOd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAqBxF,QAAA,MAAM,0BAA0B;;CAG/B,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,0BAA0B;;IAChE,QAAQ,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IACxD,SAAiB,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC;IAElD,UAAU,IAAI,YAAY,CAQlC;IAEc,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,EAAE,sBAAsB,CAAC,kBAAkB;;;OAqBhG;IAEc,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,sBAAsB,CAAC,UAAU;;;OAgCxF;IAEc,uBAAuB,CAAC,EAAE,eAAe,EAAE,EAAE,sBAAsB,CAAC,uBAAuB;;OAczG;IAqCc,MAAM,CAAC,EAClB,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,aAAa,EAChB,EAAE,sBAAsB,CAAC,aAAa,+CAiGtC;IAEc,SAAS,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,sBAAsB,CAAC,gBAAgB,+CA+DxF;IAEc,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,sBAAsB,CAAC,wBAAwB;;;;;;;;OAiB1F;IAEc,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,mBAAmB;;;;;;;;OAuBtF;IAEc,yBAAyB,CAAC,EACrC,iBAAiB,EACpB,EAAE,sBAAsB,CAAC,gCAAgC,iBAuCzD;IAEc,0BAA0B,CAAC,EACtC,WAAW,EACX,eAAe,EAClB,EAAE,sBAAsB,CAAC,0BAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,CAsBjH;IAEc,2BAA2B,CAAC,EACvC,QAAQ,EACR,wBAAwB,EACxB,IAAI,EACP,EAAE,sBAAsB,CAAC,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC,CAe3E;IA+BK,gBAAgB,iCAYrB;CAiCJ;AAED,yBAAiB,4BAA4B,CAAC,CAAC;IAC3C,MAAa,QAAQ;QACjB,aAAa,CAAC,EAAE,mBAAmB,CAAC;KACvC;IAED,MAAa,KAAM,SAAQ,0BAA0B,CAAC,KAAK;QACvD;;;;;;;;WAQG;QACH,aAAa,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAa;QAE3D,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO;qBAE1D,kBAAkB;UAI7B;KACJ;CACJ"}
|
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
} from "@matter/protocol";
|
|
31
31
|
import {
|
|
32
32
|
FabricIndex,
|
|
33
|
-
|
|
33
|
+
Status,
|
|
34
34
|
StatusResponse,
|
|
35
35
|
StatusResponseError,
|
|
36
36
|
SubjectId,
|
|
@@ -64,7 +64,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
64
64
|
async attestationRequest({ attestationNonce }) {
|
|
65
65
|
assertRemoteActor(this.context);
|
|
66
66
|
if (attestationNonce.byteLength !== 32) {
|
|
67
|
-
throw new StatusResponseError("Invalid attestation nonce length",
|
|
67
|
+
throw new StatusResponseError("Invalid attestation nonce length", Status.InvalidCommand);
|
|
68
68
|
}
|
|
69
69
|
const certification = await this.getCertification();
|
|
70
70
|
const session = this.context.session;
|
|
@@ -80,22 +80,19 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
80
80
|
async csrRequest({ csrNonce, isForUpdateNoc }) {
|
|
81
81
|
assertRemoteActor(this.context);
|
|
82
82
|
if (csrNonce.byteLength !== 32) {
|
|
83
|
-
throw new StatusResponseError("Invalid csr nonce length",
|
|
83
|
+
throw new StatusResponseError("Invalid csr nonce length", Status.InvalidCommand);
|
|
84
84
|
}
|
|
85
85
|
const session = this.context.session;
|
|
86
86
|
NodeSession.assert(session);
|
|
87
87
|
if (isForUpdateNoc && session.isPase) {
|
|
88
|
-
throw new StatusResponseError(
|
|
89
|
-
"csrRequest for UpdateNoc received on a PASE session",
|
|
90
|
-
StatusCode.InvalidCommand
|
|
91
|
-
);
|
|
88
|
+
throw new StatusResponseError("csrRequest for UpdateNoc received on a PASE session", Status.InvalidCommand);
|
|
92
89
|
}
|
|
93
90
|
const commissioner = this.env.get(DeviceCommissioner);
|
|
94
91
|
const failsafeContext = commissioner.failsafeContext;
|
|
95
92
|
if (failsafeContext.fabricIndex !== void 0) {
|
|
96
93
|
throw new StatusResponseError(
|
|
97
94
|
`csrRequest received after ${failsafeContext.forUpdateNoc ? "UpdateNOC" : "AddNOC"} already invoked`,
|
|
98
|
-
|
|
95
|
+
Status.ConstraintError
|
|
99
96
|
);
|
|
100
97
|
}
|
|
101
98
|
const certification = await this.getCertification();
|
|
@@ -118,7 +115,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
118
115
|
default:
|
|
119
116
|
throw new StatusResponseError(
|
|
120
117
|
`Unsupported certificate type: ${certificateType}`,
|
|
121
|
-
|
|
118
|
+
Status.InvalidCommand
|
|
122
119
|
);
|
|
123
120
|
}
|
|
124
121
|
}
|
|
@@ -163,7 +160,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
163
160
|
if (failsafeContext.fabricIndex !== void 0) {
|
|
164
161
|
throw new StatusResponseError(
|
|
165
162
|
`AddNoc is illegal after ${failsafeContext.forUpdateNoc ? "UpdateNOC" : "AddNOC"} in the same failsafe context`,
|
|
166
|
-
|
|
163
|
+
Status.ConstraintError
|
|
167
164
|
);
|
|
168
165
|
}
|
|
169
166
|
if (!failsafeContext.hasRootCert) {
|
|
@@ -181,7 +178,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
181
178
|
if (failsafeContext.forUpdateNoc) {
|
|
182
179
|
throw new StatusResponseError(
|
|
183
180
|
`AddNoc is illegal after CsrRequest for UpdateNOC in same failsafe context`,
|
|
184
|
-
|
|
181
|
+
Status.ConstraintError
|
|
185
182
|
);
|
|
186
183
|
}
|
|
187
184
|
const state = this.state;
|
|
@@ -238,13 +235,13 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
238
235
|
if (timedOp.fabricIndex !== void 0) {
|
|
239
236
|
throw new StatusResponseError(
|
|
240
237
|
`UpdateNoc is illegal after ${timedOp.forUpdateNoc ? "UpdateNOC" : "AddNOC"} in same failsafe context`,
|
|
241
|
-
|
|
238
|
+
Status.ConstraintError
|
|
242
239
|
);
|
|
243
240
|
}
|
|
244
241
|
if (timedOp.forUpdateNoc === false) {
|
|
245
242
|
throw new StatusResponseError(
|
|
246
243
|
"UpdateNoc is illegal after CsrRequest for AddNOC in same failsafe context",
|
|
247
|
-
|
|
244
|
+
Status.ConstraintError
|
|
248
245
|
);
|
|
249
246
|
}
|
|
250
247
|
if (timedOp.rootCertSet) {
|
|
@@ -260,7 +257,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
260
257
|
if (this.context.session.associatedFabric.fabricIndex !== timedOp.associatedFabric?.fabricIndex) {
|
|
261
258
|
throw new StatusResponseError(
|
|
262
259
|
"Fabric of this session and the failsafe context do not match",
|
|
263
|
-
|
|
260
|
+
Status.ConstraintError
|
|
264
261
|
);
|
|
265
262
|
}
|
|
266
263
|
try {
|
|
@@ -314,13 +311,13 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
314
311
|
if (failsafeContext.rootCertSet) {
|
|
315
312
|
throw new StatusResponseError(
|
|
316
313
|
"Trusted root certificate already added in this FailSafe context",
|
|
317
|
-
|
|
314
|
+
Status.ConstraintError
|
|
318
315
|
);
|
|
319
316
|
}
|
|
320
317
|
if (failsafeContext.fabricIndex !== void 0) {
|
|
321
318
|
throw new StatusResponseError(
|
|
322
319
|
`Cannot add trusted root certificates after ${failsafeContext.forUpdateNoc ? "UpdateNOC" : "AddNOC"}`,
|
|
323
|
-
|
|
320
|
+
Status.ConstraintError
|
|
324
321
|
);
|
|
325
322
|
}
|
|
326
323
|
try {
|
|
@@ -328,7 +325,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBase {
|
|
|
328
325
|
} catch (error) {
|
|
329
326
|
logger.info("Error installing root certificate:", error);
|
|
330
327
|
if (error instanceof CryptoVerifyError || error instanceof CertificateError || error instanceof ValidationError || error instanceof UnexpectedDataError) {
|
|
331
|
-
throw new StatusResponseError(error.message,
|
|
328
|
+
throw new StatusResponseError(error.message, Status.InvalidCommand);
|
|
332
329
|
}
|
|
333
330
|
throw error;
|
|
334
331
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/operational-credentials/OperationalCredentialsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,2BAA2B;AAGpC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,8BAA8B;AACvC,SAAS,sCAAsC;AAC/C,SAAS,4BAA4B;AAErC,MAAM,SAAS,OAAO,IAAI,wBAAwB;AAMlD,MAAM,EAAE,SAAS,IAAI,uBAAuB;AAE5C,MAAM,qBAAqB,SAAS,QAAQ,oBAAoB;AAChE,MAAM,aAAa,SAAS,QAAQ,YAAY;AAEhD,MAAM,+BAA+B,uBAAuB,OAAO;AAAA,EAC/D;AAAA,EACA,mBAAmB,OAAO,QAAW,mBAAmB,OAAO,OAAO,oBAAoB,EAAE,YAAY,OAAO,CAAC,CAAC;AAAA,EACjH,WAAW,OAAO,QAAW,WAAW,OAAO,OAAO,YAAY,EAAE,YAAY,OAAO,CAAC,CAAC;AAC7F;AAEA,MAAM,6BAA6B,+BAA+B;AAAA,EAC9D;AAAA,EACA;AACJ;AAUO,MAAM,qCAAqC,2BAA2B;AAAA,EAIhE,aAA2B;AAEhC,QAAI,CAAC,KAAK,MAAM,kBAAkB;AAC9B,WAAK,MAAM,mBAAmB;AAAA,IAClC;AACA,SAAK,MAAM,sBAAsB,KAAK,MAAM,QAAQ;AAEpD,SAAK,QAAS,KAAK,SAAkB,UAAU,QAAQ,KAAK,WAAW;AAAA,EAC3E;AAAA,EAEA,MAAe,mBAAmB,EAAE,iBAAiB,GAA8C;AAC/F,sBAAkB,KAAK,OAAO;AAE9B,QAAI,iBAAiB,eAAe,IAAI;AACpC,YAAM,IAAI,oBAAoB,oCAAoC,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,2BAA2B;AAGpC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,8BAA8B;AACvC,SAAS,sCAAsC;AAC/C,SAAS,4BAA4B;AAErC,MAAM,SAAS,OAAO,IAAI,wBAAwB;AAMlD,MAAM,EAAE,SAAS,IAAI,uBAAuB;AAE5C,MAAM,qBAAqB,SAAS,QAAQ,oBAAoB;AAChE,MAAM,aAAa,SAAS,QAAQ,YAAY;AAEhD,MAAM,+BAA+B,uBAAuB,OAAO;AAAA,EAC/D;AAAA,EACA,mBAAmB,OAAO,QAAW,mBAAmB,OAAO,OAAO,oBAAoB,EAAE,YAAY,OAAO,CAAC,CAAC;AAAA,EACjH,WAAW,OAAO,QAAW,WAAW,OAAO,OAAO,YAAY,EAAE,YAAY,OAAO,CAAC,CAAC;AAC7F;AAEA,MAAM,6BAA6B,+BAA+B;AAAA,EAC9D;AAAA,EACA;AACJ;AAUO,MAAM,qCAAqC,2BAA2B;AAAA,EAIhE,aAA2B;AAEhC,QAAI,CAAC,KAAK,MAAM,kBAAkB;AAC9B,WAAK,MAAM,mBAAmB;AAAA,IAClC;AACA,SAAK,MAAM,sBAAsB,KAAK,MAAM,QAAQ;AAEpD,SAAK,QAAS,KAAK,SAAkB,UAAU,QAAQ,KAAK,WAAW;AAAA,EAC3E;AAAA,EAEA,MAAe,mBAAmB,EAAE,iBAAiB,GAA8C;AAC/F,sBAAkB,KAAK,OAAO;AAE9B,QAAI,iBAAiB,eAAe,IAAI;AACpC,YAAM,IAAI,oBAAoB,oCAAoC,OAAO,cAAc;AAAA,IAC3F;AAEA,UAAM,gBAAgB,MAAM,KAAK,iBAAiB;AAElD,UAAM,UAAU,KAAK,QAAQ;AAC7B,gBAAY,OAAO,OAAO;AAE1B,UAAM,sBAAsB,eAAe,OAAO;AAAA,MAC9C,aAAa,cAAc;AAAA,MAC3B;AAAA,MACA,WAAW;AAAA,IACf,CAAC;AAED,UAAM,wBAAwB,MAAM,cAAc,KAAK,SAAS,mBAAmB,GAAG;AAEtF,WAAO,EAAE,qBAAqB,qBAAqB;AAAA,EACvD;AAAA,EAEA,MAAe,WAAW,EAAE,UAAU,eAAe,GAAsC;AACvF,sBAAkB,KAAK,OAAO;AAE9B,QAAI,SAAS,eAAe,IAAI;AAC5B,YAAM,IAAI,oBAAoB,4BAA4B,OAAO,cAAc;AAAA,IACnF;AAEA,UAAM,UAAU,KAAK,QAAQ;AAC7B,gBAAY,OAAO,OAAO;AAC1B,QAAI,kBAAkB,QAAQ,QAAQ;AAClC,YAAM,IAAI,oBAAoB,uDAAuD,OAAO,cAAc;AAAA,IAC9G;AAEA,UAAM,eAAe,KAAK,IAAI,IAAI,kBAAkB;AACpD,UAAM,kBAAkB,aAAa;AACrC,QAAI,gBAAgB,gBAAgB,QAAW;AAC3C,YAAM,IAAI;AAAA,QACN,6BAA6B,gBAAgB,eAAe,cAAc,QAAQ;AAAA,QAClF,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,UAAM,gBAAgB,MAAM,KAAK,iBAAiB;AAElD,sBAAkB,KAAK,OAAO;AAC9B,UAAM,qBAAqB,MAAM,gBAAgB;AAAA,MAC7C,kBAAkB;AAAA,MAClB,KAAK,QAAQ,QAAQ;AAAA,IACzB;AACA,UAAM,gBAAgB,sBAAsB,OAAO,EAAE,oBAAoB,SAAS,CAAC;AACnF,UAAM,wBAAwB,MAAM,cAAc,KAAK,SAAS,aAAa,GAAG;AAChF,WAAO,EAAE,eAAe,qBAAqB;AAAA,EACjD;AAAA,EAEA,MAAe,wBAAwB,EAAE,gBAAgB,GAAmD;AACxG,UAAM,gBAAgB,MAAM,KAAK,iBAAiB;AAElD,YAAQ,iBAAiB;AAAA,MACrB,KAAK,uBAAuB,qBAAqB;AAC7C,eAAO,EAAE,aAAa,cAAc,YAAY;AAAA,MACpD,KAAK,uBAAuB,qBAAqB;AAC7C,eAAO,EAAE,aAAa,cAAc,wBAAwB;AAAA,MAChE;AACI,cAAM,IAAI;AAAA,UACN,iCAAiC,eAAe;AAAA,UAChD,OAAO;AAAA,QACX;AAAA,IACR;AAAA,EACJ;AAAA,EAEA,cAAc,OAAoD;AAC9D,QAAI,iBAAiB,2BAA2B;AAC5C,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,MAAM;AAAA,MACrB;AAAA,IACJ,WAAW,iBAAiB,sBAAsB;AAC9C,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,MAAM;AAAA,MACrB;AAAA,IACJ,WACI,iBAAiB,qBACjB,iBAAiB,oBACjB,iBAAiB,mBACjB,iBAAiB,qBACnB;AACE,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,MAAM;AAAA,MACrB;AAAA,IACJ,WAAW,iBAAiB,gBAAgB;AACxC,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,MAAM;AAAA,MACrB;AAAA,IACJ,WAAW,iBAAiB,sCAAsC;AAC9D,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,MAAM;AAAA,MACrB;AAAA,IACJ;AACA,UAAM;AAAA,EACV;AAAA,EAEA,MAAe,OAAO;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ,GAAyC;AACrC,sBAAkB,KAAK,OAAO;AAE9B,UAAM,kBAAkB,KAAK;AAE7B,QAAI,gBAAgB,gBAAgB,QAAW;AAC3C,YAAM,IAAI;AAAA,QACN,2BAA2B,gBAAgB,eAAe,cAAc,QAAQ;AAAA,QAChF,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,CAAC,gBAAgB,aAAa;AAC9B,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,gBAAgB,iBAAiB,KAAK,QAAQ,QAAQ,IAAI;AAC1D,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,gBAAgB,cAAc;AAC9B,YAAM,IAAI;AAAA,QACN;AAAA,QACA,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,UAAM,QAAQ,KAAK;AACnB,QAAI,MAAM,uBAAuB,MAAM,kBAAkB;AACrD,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,8CAA8C,MAAM,gBAAgB;AAAA,MACnF;AAAA,IACJ;AAEA,QAAI;AACJ,QAAI;AACA,eAAS,MAAM,gBAAgB,YAAY;AAAA,QACvC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACJ,CAAC;AAAA,IACL,SAAS,OAAO;AACZ,aAAO,KAAK,qCAAqC,KAAK;AACtD,aAAO,KAAK,cAAc,KAAK;AAAA,IACnC;AAEA,UAAM,UAAU,KAAK,QAAQ;AAC7B,gBAAY,OAAO,OAAO;AAE1B,QAAI;AACA,UAAI,QAAQ,QAAQ;AAChB,eAAO,MAAM,cAAc,OAAO,WAAW,oBAAoB,QAAQ,GAAG,EAAE;AAC9E,gBAAQ,SAAS;AAAA,MACrB;AAGA,YAAM,sBAAsB,KAAK,MAAM,QAAQ,UAAU,OAAK,EAAE,gBAAgB,OAAO,WAAW;AAClG,YAAM,mBAAmB,KAAK,MAAM,KAAK,UAAU,OAAK,EAAE,gBAAgB,OAAO,WAAW;AAC5F,UAAI,wBAAwB,MAAM,qBAAqB,IAAI;AACvD,cAAM,IAAI;AAAA,UACN,eAAe,OAAO,WAAW;AAAA,QACrC;AAAA,MACJ;AAAA,IACJ,SAAS,GAAG;AAER,YAAM,OAAO,OAAO,KAAK,QAAQ,QAAQ;AACzC,YAAM;AAAA,IACV;AAIA,UAAM,KAAK,SAAS,IAAI,WAAS,MAAM,IAAI,mBAAmB,EAAE,kBAAkB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAS7G,WAAO;AAAA,MACH,iCAAiC,aAAa,sBAAsB,UAAU,MAAM,gBAAgB,CAAC;AAAA,IACzG;AAEA,WAAO;AAAA,MACH,YAAY,uBAAuB,0BAA0B;AAAA,MAC7D,aAAa,OAAO;AAAA,IACxB;AAAA,EACJ;AAAA,EAEA,MAAe,UAAU,EAAE,UAAU,UAAU,GAA4C;AACvF,sBAAkB,KAAK,OAAO;AAC9B,gBAAY,OAAO,KAAK,QAAQ,OAAO;AAEvC,UAAM,UAAU,KAAK;AAErB,QAAI,QAAQ,gBAAgB,QAAW;AACnC,YAAM,IAAI;AAAA,QACN,8BAA8B,QAAQ,eAAe,cAAc,QAAQ;AAAA,QAC3E,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,QAAQ,iBAAiB,OAAO;AAChC,YAAM,IAAI;AAAA,QACN;AAAA,QACA,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,QAAQ,aAAa;AAIrB,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,MACjE;AAAA,IACJ;AAEA,QAAI,QAAQ,iBAAiB,QAAW;AAIpC,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,MACjE;AAAA,IACJ;AAEA,QAAI,KAAK,QAAQ,QAAQ,iBAAiB,gBAAgB,QAAQ,kBAAkB,aAAa;AAC7F,YAAM,IAAI;AAAA,QACN;AAAA,QACA,OAAO;AAAA,MACX;AAAA,IACJ;AAGA,QAAI;AACA,YAAM,gBAAgB,MAAM,QAAQ,mBAAmB,UAAU,SAAS;AAG1E,YAAM,QAAQ,cAAc,aAAa;AAGzC,YAAM,QAAQ,iBAAiB,SAAS,KAAK,QAAQ,QAAQ;AAE7D,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,aAAa,cAAc;AAAA,MAC/B;AAAA,IACJ,SAAS,OAAO;AACZ,aAAO,KAAK,wCAAwC,KAAK;AACzD,aAAO,KAAK,cAAc,KAAK;AAAA,IACnC;AAAA,EACJ;AAAA,EAEA,MAAe,kBAAkB,EAAE,MAAM,GAAoD;AACzF,sBAAkB,KAAK,OAAO;AAC9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AAEpC,UAAM,qBAAqB,OAAO;AAClC,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAC1C,UAAM,yBAAyB,QAAQ,KAAK,OAAK,EAAE,UAAU,SAAS,EAAE,gBAAgB,kBAAkB;AAC1G,QAAI,2BAA2B,QAAW;AACtC,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,SAAS,KAAK,2BAA2B,uBAAuB,WAAW;AAAA,MAC1F;AAAA,IACJ;AAEA,UAAM,OAAO,SAAS,KAAK;AAE3B,WAAO,EAAE,YAAY,uBAAuB,0BAA0B,IAAI,aAAa,OAAO,YAAY;AAAA,EAC9G;AAAA,EAEA,MAAe,aAAa,EAAE,YAAY,GAA+C;AACrF,sBAAkB,KAAK,OAAO;AAE9B,UAAM,SAAS,KAAK,IAAI,IAAI,aAAa,EAAE,SAAS,WAAW;AAE/D,QAAI,WAAW,QAAW;AACtB,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,UAAU,WAAW;AAAA,MACpC;AAAA,IACJ;AAIA,UAAM,KAAK,QAAQ,YAAY,SAAS;AAExC,UAAM,OAAO,MAAM,KAAK,QAAQ,QAAQ;AAGxC,WAAO;AAAA,MACH,YAAY,uBAAuB,0BAA0B;AAAA,MAC7D;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,MAAe,0BAA0B;AAAA,IACrC;AAAA,EACJ,GAA4D;AACxD,UAAM,kBAAkB,KAAK;AAK7B,QAAI,gBAAgB,aAAa;AAC7B,YAAM,IAAI;AAAA,QACN;AAAA,QACA,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,gBAAgB,gBAAgB,QAAW;AAC3C,YAAM,IAAI;AAAA,QACN,8CAA8C,gBAAgB,eAAe,cAAc,QAAQ;AAAA,QACnG,OAAO;AAAA,MACX;AAAA,IACJ;AAEA,QAAI;AACA,YAAM,gBAAgB,YAAY,iBAAiB;AAAA,IACvD,SAAS,OAAO;AACZ,aAAO,KAAK,sCAAsC,KAAK;AACvD,UACI,iBAAiB,qBACjB,iBAAiB,oBACjB,iBAAiB,mBACjB,iBAAiB,qBACnB;AACE,cAAM,IAAI,oBAAoB,MAAM,SAAS,OAAO,cAAc;AAAA,MACtE;AACA,YAAM;AAAA,IACV;AAEA,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAC1C,UAAM,0BAA0B,QAAQ,IAAI,YAAU,OAAO,QAAQ;AACrE,4BAAwB,KAAK,iBAAiB;AAC9C,SAAK,MAAM,0BAA0B;AAAA,EACzC;AAAA,EAEA,MAAe,2BAA2B;AAAA,IACtC;AAAA,IACA;AAAA,EACJ,GAAmH;AAC/G,sBAAkB,KAAK,OAAO;AAC9B,gBAAY,OAAO,KAAK,QAAQ,OAAO;AAEvC,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAC1C,QAAI,CAAC,QAAQ,IAAI,WAAW,GAAG;AAC3B,YAAM,IAAI,eAAe,qBAAqB,qBAAqB,WAAW,iBAAiB;AAAA,IACnG;AACA,UAAM,SAAS,QAAQ,IAAI,WAAW;AAEtC,UAAM,EAAE,sBAAsB,cAAc,IAAI,qBAAqB,WAAW;AAAA,MAC5E,cAAc,KAAK,QAAQ,QAAQ;AAAA,MACnC;AAAA,MACA;AAAA,MACA;AAAA,IACJ,CAAC;AAED,WAAO;AAAA,MACH;AAAA,MACA;AAAA,MACA,YAAY,MAAM,OAAO,KAAK,aAAa,GAAG;AAAA,IAClD;AAAA,EACJ;AAAA,EAEA,MAAe,4BAA4B;AAAA,IACvC;AAAA,IACA;AAAA,IACA;AAAA,EACJ,GAA6E;AACzE,sBAAkB,KAAK,OAAO;AAC9B,UAAM,SAAS,KAAK,QAAQ,QAAQ;AAEpC,QAAI,aAAa,UAAa,6BAA6B,UAAa,SAAS,QAAW;AACxF,YAAM,IAAI,eAAe;AAAA,QACrB;AAAA,MACJ;AAAA,IACJ;AACA,QAAI,aAAa,UAAa,CAAC,SAAS,QAAQ,QAAQ,GAAG;AACvD,YAAM,IAAI,eAAe,qBAAqB,qBAAqB,QAAQ,EAAE;AAAA,IACjF;AAGA,UAAM,OAAO,6BAA6B,UAAU,0BAA0B,IAAI;AAAA,EACtF;AAAA,EAEA,MAAM,iBAAiB;AACnB,UAAM,KAAK,QAAQ,YAAY,aAAa,IAAI;AAChD,UAAM,KAAK,QAAQ,YAAY,MAAM;AAErC,UAAM,UAAU,KAAK,IAAI,IAAI,aAAa;AAC1C,SAAK,MAAM,UAAU,QAAQ,IAAI,aAAW;AAAA,MACxC,UAAU,OAAO;AAAA,MACjB,OAAO,OAAO;AAAA,MACd,QAAQ,OAAO;AAAA,MACf,eAAe,OAAO;AAAA,MACtB,UAAU,OAAO;AAAA,MACjB,0BAA0B,OAAO;AAAA,MACjC,aAAa,OAAO;AAAA,IACxB,EAAE;AAEF,SAAK,MAAM,OAAO,QAAQ,IAAI,aAAW;AAAA,MACrC,KAAK,OAAO;AAAA,MACZ,MAAM,OAAO,sBAAsB;AAAA,MACnC,MAAM,OAAO;AAAA,MACb,aAAa,OAAO;AAAA,IACxB,EAAE;AAEF,SAAK,MAAM,0BAA0B,QAAQ,IAAI,YAAU,OAAO,QAAQ;AAE1E,SAAK,MAAM,sBAAsB,QAAQ;AAEzC,UAAM,KAAK,QAAQ,YAAY,OAAO;AAAA,EAC1C;AAAA,EAEA,MAAM,mBAAmB;AACrB,UAAM,gBACF,KAAK,SAAS,kBACb,KAAK,SAAS,gBAAgB,IAAI;AAAA,MAC/B,KAAK,IAAI,IAAI,MAAM;AAAA,MACnB,KAAK,MAAM;AAAA,MACX,KAAK,MAAM,IAAI,wBAAwB,EAAE;AAAA,IAC7C;AAEJ,UAAM,cAAc;AAEpB,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,mBAAmB,EAAE,YAAY,GAAW;AAC9C,UAAM,KAAK,eAAe;AAC1B,SAAK,MAAM,IAAI,mBAAmB,EAAE,mBAAmB,aAAa,OAAO;AAAA,EAC/E;AAAA,EAEA,MAAM,qBAAqB,EAAE,YAAY,GAAW;AAChD,UAAM,KAAK,eAAe;AAC1B,SAAK,MAAM,IAAI,mBAAmB,EAAE,mBAAmB,aAAa,SAAS;AAAA,EACjF;AAAA,EAEA,MAAM,qBAAqB,EAAE,YAAY,GAAW;AAChD,UAAM,KAAK,eAAe;AAC1B,SAAK,MAAM,IAAI,mBAAmB,EAAE,mBAAmB,aAAa,SAAS;AAAA,EACjF;AAAA,EAEA,MAAM,wBAAwB;AAC1B,UAAM,KAAK,eAAe;AAAA,EAC9B;AAAA,EAEA,MAAM,cAAc;AAChB,UAAM,gBAAgB,KAAK,IAAI,IAAI,aAAa;AAChD,SAAK,QAAQ,cAAc,OAAO,OAAO,KAAK,oBAAoB,EAAE,MAAM,KAAK,CAAC;AAChF,SAAK,QAAQ,cAAc,OAAO,UAAU,KAAK,sBAAsB,EAAE,MAAM,KAAK,CAAC;AACrF,SAAK,QAAQ,cAAc,OAAO,UAAU,KAAK,sBAAsB,EAAE,MAAM,KAAK,CAAC;AACrF,SAAK,QAAQ,cAAc,OAAO,gBAAgB,KAAK,uBAAuB,EAAE,MAAM,KAAK,CAAC;AAC5F,UAAM,KAAK,eAAe;AAAA,EAC9B;AAAA,EAEA,IAAI,mBAAmB;AACnB,WAAO,KAAK,IAAI,IAAI,kBAAkB,EAAE;AAAA,EAC5C;AACJ;AAAA,CAEO,CAAUA,kCAAV;AAAA,EACI,MAAM,SAAS;AAAA,IAClB;AAAA,EACJ;AAFO,EAAAA,8BAAM;AAAA,EAIN,MAAM,cAAc,2BAA2B,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAUxD,gBAAiD;AAAA,IAEjD,CAAC,IAAI,UAAU,EAAE,WAAqB,SAAkC;AACpE,aAAO;AAAA,QACH,IAAI,qBAAqB;AACrB,iBAAO,QAAQ,UAAU,YAAY;AAAA,QACzC;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AAnBO,EAAAA,8BAAM;AAAA,GALA;",
|
|
5
5
|
"names": ["OperationalCredentialsServer"]
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Logger, Millis, Observable, Seconds, Time } from "@matter/general";
|
|
7
7
|
import { FieldElement } from "@matter/model";
|
|
8
|
-
import {
|
|
8
|
+
import { Status, StatusResponseError } from "@matter/types";
|
|
9
9
|
import { Switch } from "@matter/types/clusters/switch";
|
|
10
10
|
import { SwitchBehavior } from "./SwitchBehavior.js";
|
|
11
11
|
const DEFAULT_MULTIPRESS_DELAY = Millis(300);
|
|
@@ -68,7 +68,7 @@ class SwitchBaseServer extends SwitchServerBase {
|
|
|
68
68
|
// TODO remove when Validator logic can assess that with 1.3 introduction
|
|
69
69
|
#assertPositionInRange(position) {
|
|
70
70
|
if (position < 0 || position >= this.state.numberOfPositions) {
|
|
71
|
-
throw new StatusResponseError(`Position ${position} invalid`,
|
|
71
|
+
throw new StatusResponseError(`Position ${position} invalid`, Status.ConstraintError);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
#debounceRawPosition(newPosition) {
|