@matter/node 0.16.0-alpha.0-20250902-38a7cc156 → 0.16.0-alpha.0-20250909-aecad94f3
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/Behavior.d.ts +0 -18
- package/dist/cjs/behavior/Behavior.d.ts.map +1 -1
- package/dist/cjs/behavior/Behavior.js +0 -34
- package/dist/cjs/behavior/Behavior.js.map +1 -1
- package/dist/cjs/behavior/Transitions.js +2 -2
- package/dist/cjs/behavior/Transitions.js.map +1 -1
- package/dist/cjs/behavior/context/ActionContext.d.ts +4 -29
- package/dist/cjs/behavior/context/ActionContext.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/{OfflineContext.d.ts → LocalActorContext.d.ts} +16 -12
- package/dist/cjs/behavior/context/server/LocalActorContext.d.ts.map +1 -0
- package/dist/cjs/behavior/context/server/{OfflineContext.js → LocalActorContext.js} +10 -9
- package/dist/cjs/behavior/context/server/LocalActorContext.js.map +6 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts +80 -0
- package/dist/cjs/behavior/context/server/RemoteActorContext.d.ts.map +1 -0
- package/dist/cjs/behavior/context/server/{OnlineContext.js → RemoteActorContext.js} +15 -27
- package/dist/cjs/behavior/context/server/RemoteActorContext.js.map +6 -0
- package/dist/cjs/behavior/context/server/index.d.ts +2 -2
- package/dist/cjs/behavior/context/server/index.d.ts.map +1 -1
- package/dist/cjs/behavior/context/server/index.js +2 -2
- package/dist/cjs/behavior/context/server/index.js.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/cjs/behavior/internal/Reactors.js +4 -3
- package/dist/cjs/behavior/internal/Reactors.js.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/Datasource.js +1 -6
- package/dist/cjs/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ListManager.d.ts.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ListManager.js +4 -4
- package/dist/cjs/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts +16 -9
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/access-control/AccessControlServer.js +19 -15
- package/dist/cjs/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +5 -5
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js +6 -6
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +2 -4
- 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 +9 -6
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/groups/GroupsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/groups/GroupsServer.js +12 -9
- package/dist/cjs/behaviors/groups/GroupsServer.js.map +2 -2
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js +16 -9
- package/dist/cjs/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js +1 -1
- package/dist/cjs/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/cjs/endpoint/Agent.d.ts +14 -0
- package/dist/cjs/endpoint/Agent.d.ts.map +1 -1
- package/dist/cjs/endpoint/Agent.js +32 -0
- package/dist/cjs/endpoint/Agent.js.map +1 -1
- package/dist/cjs/endpoint/Endpoint.js +2 -2
- package/dist/cjs/endpoint/Endpoint.js.map +1 -1
- package/dist/cjs/endpoint/properties/Behaviors.js +4 -4
- package/dist/cjs/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/cjs/endpoint/properties/Commands.js +2 -2
- package/dist/cjs/endpoint/properties/Commands.js.map +1 -1
- package/dist/cjs/node/server/IdentityService.js +2 -2
- package/dist/cjs/node/server/IdentityService.js.map +1 -1
- package/dist/cjs/node/server/InteractionServer.js.map +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts +6 -6
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.js +4 -4
- package/dist/cjs/node/server/OnlineServerInteraction.js.map +1 -1
- package/dist/cjs/node/server/ProtocolService.js +1 -1
- package/dist/cjs/node/server/ProtocolService.js.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.d.ts +2 -2
- package/dist/cjs/node/server/ServerSubscription.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerSubscription.js +3 -3
- package/dist/cjs/node/server/ServerSubscription.js.map +1 -1
- package/dist/esm/behavior/Behavior.d.ts +0 -18
- package/dist/esm/behavior/Behavior.d.ts.map +1 -1
- package/dist/esm/behavior/Behavior.js +0 -35
- package/dist/esm/behavior/Behavior.js.map +1 -1
- package/dist/esm/behavior/Transitions.js +2 -2
- package/dist/esm/behavior/Transitions.js.map +1 -1
- package/dist/esm/behavior/context/ActionContext.d.ts +4 -29
- package/dist/esm/behavior/context/ActionContext.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/{OfflineContext.d.ts → LocalActorContext.d.ts} +16 -12
- package/dist/esm/behavior/context/server/LocalActorContext.d.ts.map +1 -0
- package/dist/esm/behavior/context/server/{OfflineContext.js → LocalActorContext.js} +7 -6
- package/dist/esm/behavior/context/server/LocalActorContext.js.map +6 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts +80 -0
- package/dist/esm/behavior/context/server/RemoteActorContext.d.ts.map +1 -0
- package/dist/esm/behavior/context/server/{OnlineContext.js → RemoteActorContext.js} +14 -31
- package/dist/esm/behavior/context/server/RemoteActorContext.js.map +6 -0
- package/dist/esm/behavior/context/server/index.d.ts +2 -2
- package/dist/esm/behavior/context/server/index.d.ts.map +1 -1
- package/dist/esm/behavior/context/server/index.js +2 -2
- package/dist/esm/behavior/internal/Reactors.d.ts.map +1 -1
- package/dist/esm/behavior/internal/Reactors.js +4 -3
- package/dist/esm/behavior/internal/Reactors.js.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.js +2 -7
- package/dist/esm/behavior/state/managed/Datasource.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ListManager.d.ts.map +1 -1
- package/dist/esm/behavior/state/managed/values/ListManager.js +13 -5
- package/dist/esm/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts +16 -9
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.d.ts.map +1 -1
- package/dist/esm/behaviors/access-control/AccessControlServer.js +21 -15
- package/dist/esm/behaviors/access-control/AccessControlServer.js.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +13 -6
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js +15 -7
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +3 -5
- 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 +10 -7
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/esm/behaviors/groups/GroupsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/groups/GroupsServer.js +12 -9
- package/dist/esm/behaviors/groups/GroupsServer.js.map +2 -2
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js +17 -9
- package/dist/esm/behaviors/operational-credentials/OperationalCredentialsServer.js.map +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js +1 -1
- package/dist/esm/behaviors/window-covering/WindowCoveringServer.js.map +1 -1
- package/dist/esm/endpoint/Agent.d.ts +14 -0
- package/dist/esm/endpoint/Agent.d.ts.map +1 -1
- package/dist/esm/endpoint/Agent.js +32 -0
- package/dist/esm/endpoint/Agent.js.map +1 -1
- package/dist/esm/endpoint/Endpoint.js +2 -2
- package/dist/esm/endpoint/Endpoint.js.map +1 -1
- package/dist/esm/endpoint/properties/Behaviors.js +4 -4
- package/dist/esm/endpoint/properties/Behaviors.js.map +1 -1
- package/dist/esm/endpoint/properties/Commands.js +2 -2
- package/dist/esm/endpoint/properties/Commands.js.map +1 -1
- package/dist/esm/node/server/IdentityService.js +2 -2
- package/dist/esm/node/server/IdentityService.js.map +1 -1
- package/dist/esm/node/server/InteractionServer.js.map +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.d.ts +6 -6
- package/dist/esm/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.js +4 -4
- package/dist/esm/node/server/OnlineServerInteraction.js.map +1 -1
- package/dist/esm/node/server/ProtocolService.js +2 -2
- package/dist/esm/node/server/ProtocolService.js.map +1 -1
- package/dist/esm/node/server/ServerSubscription.d.ts +2 -2
- package/dist/esm/node/server/ServerSubscription.d.ts.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 +7 -7
- package/src/behavior/Behavior.ts +0 -41
- package/src/behavior/Transitions.ts +2 -2
- package/src/behavior/context/ActionContext.ts +4 -35
- package/src/behavior/context/server/{OfflineContext.ts → LocalActorContext.ts} +17 -14
- package/src/behavior/context/server/{OnlineContext.ts → RemoteActorContext.ts} +65 -52
- package/src/behavior/context/server/index.ts +2 -2
- package/src/behavior/internal/Reactors.ts +5 -4
- package/src/behavior/state/managed/Datasource.ts +3 -9
- package/src/behavior/state/managed/values/ListManager.ts +14 -11
- package/src/behavior/supervision/ValueSupervisor.ts +18 -10
- package/src/behaviors/access-control/AccessControlServer.ts +25 -20
- package/src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts +14 -6
- package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts +15 -8
- package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts +3 -5
- package/src/behaviors/group-key-management/GroupKeyManagementServer.ts +13 -7
- package/src/behaviors/groups/GroupsServer.ts +16 -11
- package/src/behaviors/operational-credentials/OperationalCredentialsServer.ts +21 -9
- package/src/behaviors/window-covering/WindowCoveringServer.ts +1 -1
- package/src/endpoint/Agent.ts +34 -0
- package/src/endpoint/Endpoint.ts +2 -2
- package/src/endpoint/properties/Behaviors.ts +4 -4
- package/src/endpoint/properties/Commands.ts +2 -2
- package/src/node/server/IdentityService.ts +2 -2
- package/src/node/server/InteractionServer.ts +2 -2
- package/src/node/server/OnlineServerInteraction.ts +9 -9
- package/src/node/server/ProtocolService.ts +2 -2
- package/src/node/server/ServerSubscription.ts +5 -5
- package/dist/cjs/behavior/context/server/OfflineContext.d.ts.map +0 -1
- package/dist/cjs/behavior/context/server/OfflineContext.js.map +0 -6
- package/dist/cjs/behavior/context/server/OnlineContext.d.ts +0 -61
- package/dist/cjs/behavior/context/server/OnlineContext.d.ts.map +0 -1
- package/dist/cjs/behavior/context/server/OnlineContext.js.map +0 -6
- package/dist/esm/behavior/context/server/OfflineContext.d.ts.map +0 -1
- package/dist/esm/behavior/context/server/OfflineContext.js.map +0 -6
- package/dist/esm/behavior/context/server/OnlineContext.d.ts +0 -61
- package/dist/esm/behavior/context/server/OnlineContext.d.ts.map +0 -1
- package/dist/esm/behavior/context/server/OnlineContext.js.map +0 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA8C,YAAY,EAAW,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA8C,YAAY,EAAW,MAAM,UAAU,CAAC;AAW7F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAMjF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,4BAA4B;;IAChE,KAAK,EAAE,0BAA0B,CAAC,KAAK,CAAC;IAEhD,OAAgB,YAAY,UAAS;IAE5B,UAAU,IAAI,YAAY;IA+F1B,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,kBAAkB;;;;IAKtD,mBAAmB,CAAC,EAC/B,UAAU,EACV,mBAAmB,EACnB,WAAW,GACd,EAAE,oBAAoB,CAAC,0BAA0B;;;;IAsEnC,qBAAqB;;;;CAmDvC;AAED,yBAAiB,0BAA0B,CAAC;IAGxC,MAAa,KAAM,SAAQ,4BAA4B,CAAC,KAAK;QACzD;;WAEG;QACH,sBAAsB,UAAQ;QAE9B;;WAEG;QACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAa;KAC/C;CACJ"}
|
|
@@ -8,7 +8,15 @@ import { BasicInformationServer } from "#behaviors/basic-information";
|
|
|
8
8
|
import { AdministratorCommissioning } from "#clusters/administrator-commissioning";
|
|
9
9
|
import { GeneralCommissioning } from "#clusters/general-commissioning";
|
|
10
10
|
import { Bytes, Diagnostic, Logger, MatterFlowError, Seconds } from "#general";
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
assertRemoteActor,
|
|
13
|
+
DeviceCommissioner,
|
|
14
|
+
FabricManager,
|
|
15
|
+
GroupSession,
|
|
16
|
+
NodeSession,
|
|
17
|
+
SecureSession,
|
|
18
|
+
SessionManager
|
|
19
|
+
} from "#protocol";
|
|
12
20
|
import { GeneralCommissioningBehavior } from "./GeneralCommissioningBehavior.js";
|
|
13
21
|
import { ServerNodeFailsafeContext } from "./ServerNodeFailsafeContext.js";
|
|
14
22
|
const SuccessResponse = { errorCode: GeneralCommissioning.CommissioningError.Ok, debugText: "" };
|
|
@@ -71,7 +79,8 @@ class GeneralCommissioningServer extends GeneralCommissioningBehavior {
|
|
|
71
79
|
return SuccessResponse;
|
|
72
80
|
}
|
|
73
81
|
armFailSafe(request) {
|
|
74
|
-
|
|
82
|
+
assertRemoteActor(this.context);
|
|
83
|
+
return this.#armFailSafe(request, this.context.session);
|
|
75
84
|
}
|
|
76
85
|
async setRegulatoryConfig({
|
|
77
86
|
breadcrumb,
|
|
@@ -125,21 +134,20 @@ class GeneralCommissioningServer extends GeneralCommissioningBehavior {
|
|
|
125
134
|
debugText: `Invalid regulatory location: ${newRegulatoryConfig === GeneralCommissioning.RegulatoryLocationType.Indoor ? "Indoor" : "Outdoor"}`
|
|
126
135
|
};
|
|
127
136
|
}
|
|
128
|
-
this.
|
|
129
|
-
this.state.regulatoryConfig = newRegulatoryConfig;
|
|
130
|
-
});
|
|
137
|
+
this.state.regulatoryConfig = newRegulatoryConfig;
|
|
131
138
|
this.state.breadcrumb = breadcrumb;
|
|
132
139
|
return SuccessResponse;
|
|
133
140
|
}
|
|
134
141
|
async commissioningComplete() {
|
|
135
|
-
|
|
142
|
+
assertRemoteActor(this.context);
|
|
143
|
+
const { session } = this.context;
|
|
136
144
|
if (NodeSession.is(session) && session.isPase || GroupSession.is(session)) {
|
|
137
145
|
return {
|
|
138
146
|
errorCode: GeneralCommissioning.CommissioningError.InvalidAuthentication,
|
|
139
147
|
debugText: "Command must be executed over CASE session."
|
|
140
148
|
};
|
|
141
149
|
}
|
|
142
|
-
const fabric =
|
|
150
|
+
const fabric = session.associatedFabric;
|
|
143
151
|
const commissioner = this.env.get(DeviceCommissioner);
|
|
144
152
|
if (!commissioner.isFailsafeArmed) {
|
|
145
153
|
return { errorCode: GeneralCommissioning.CommissioningError.NoFailSafe, debugText: "FailSafe not armed." };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wCAAwC;AACjD,SAAS,8BAA8B;AACvC,SAAS,kCAAkC;AAC3C,SAAS,4BAA4B;AACrC,SAAS,OAAO,YAAY,QAAQ,iBAA+B,eAAe;AAElF,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["GeneralCommissioningServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneralDiagnosticsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAKhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EACH,KAAK,EACL,QAAQ,EAKR,YAAY,EAKZ,KAAK,EAER,MAAM,UAAU,CAAC;AAGlB,OAAO,
|
|
1
|
+
{"version":3,"file":"GeneralDiagnosticsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
Timespan
|
|
21
21
|
} from "#general";
|
|
22
22
|
import { FieldElement, Specification } from "#model";
|
|
23
|
-
import { MdnsService, Val } from "#protocol";
|
|
23
|
+
import { assertRemoteActor, MdnsService, Val } from "#protocol";
|
|
24
24
|
import { CommandId, StatusCode, StatusResponseError, TlvInvokeResponse } from "#types";
|
|
25
25
|
import { GeneralDiagnosticsBehavior } from "./GeneralDiagnosticsBehavior.js";
|
|
26
26
|
const logger = Logger.get("GeneralDiagnosticsServer");
|
|
@@ -116,10 +116,8 @@ class GeneralDiagnosticsServer extends Base {
|
|
|
116
116
|
}
|
|
117
117
|
]
|
|
118
118
|
}).byteLength;
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
throw new ImplementationError(`Illegal operation outside exchange context`);
|
|
122
|
-
}
|
|
119
|
+
assertRemoteActor(this.context);
|
|
120
|
+
const { exchange } = this.context;
|
|
123
121
|
if (responseSize > exchange.maxPayloadSize) {
|
|
124
122
|
throw new StatusResponseError("Response too large", StatusCode.ResourceExhausted);
|
|
125
123
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,sBAAsB;AAE/B,SAAS,kCAAkC;AAC3C,SAAS,mCAAmC;AAC5C,SAAS,0BAA0B;AAEnC;AAAA,EACI;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACG;AACP,SAAS,cAAc,qBAAqB;AAE5C,SAAS,aAAa,WAAW;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["GeneralDiagnosticsServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,
|
|
1
|
+
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAqB,MAAM,EAAiC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAmC,MAAM,QAAQ,CAAC;AAC/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAmB7E;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,0BAA0B;;IAC5D,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC;IAC9C,MAAM,0BAAU;IAEP,UAAU,IAAI,YAAY;IAsNpB,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,kBAAkB,CAAC,kBAAkB;IAsGxE,UAAU,CAAC,EAChB,aAAa,GAChB,EAAE,kBAAkB,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,kBAAkB;IAqBhE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,kBAAkB,CAAC,mBAAmB;IA6B5E,oBAAoB,IAAI,kBAAkB,CAAC,4BAA4B;IAgBhF,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAsC1G;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;CA4BzF;AAED,yBAAiB,wBAAwB,CAAC;IACtC,MAAa,KAAM,SAAQ,0BAA0B,CAAC,KAAK;QACvD;;;WAGG;QACH,YAAY,EAAE,CAAC,kBAAkB,CAAC,WAAW,GAAG;YAAE,WAAW,EAAE,WAAW,CAAA;SAAE,CAAC,EAAE,CAAM;QAG5E,qBAAqB,SAAM;QAC3B,kBAAkB,SAAM;KACpC;CACJ"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { GroupKeyManagement } from "#clusters/group-key-management";
|
|
7
7
|
import { deepCopy, ImplementationError, Logger } from "#general";
|
|
8
8
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
|
-
import { FabricManager,
|
|
9
|
+
import { assertRemoteActor, FabricManager, hasRemoteActor } from "#protocol";
|
|
10
10
|
import { GroupId, StatusCode, StatusResponseError } from "#types";
|
|
11
11
|
import { GroupKeyManagementBehavior } from "./GroupKeyManagementBehavior.js";
|
|
12
12
|
const logger = Logger.get("GroupKeyManagementServer");
|
|
@@ -161,7 +161,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
#updateGroupKeyMap(groupKeyMap, _oldMap, context) {
|
|
164
|
-
if (context !== void 0 &&
|
|
164
|
+
if (context !== void 0 && hasRemoteActor(context)) {
|
|
165
165
|
const fabric = context.session?.associatedFabric;
|
|
166
166
|
const fabricIndex = fabric?.fabricIndex;
|
|
167
167
|
if (fabric !== void 0 && fabricIndex !== void 0) {
|
|
@@ -189,7 +189,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
async keySetWrite({ groupKeySet }) {
|
|
192
|
-
|
|
192
|
+
assertRemoteActor(this.context);
|
|
193
193
|
const {
|
|
194
194
|
groupKeySetId,
|
|
195
195
|
epochKey0,
|
|
@@ -246,7 +246,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
246
246
|
if (groupKeyMulticastPolicy !== GroupKeyManagement.GroupKeyMulticastPolicy.PerGroupId) {
|
|
247
247
|
throw new StatusResponseError("GroupKeyMulticastPolicy must be PerGroupId", StatusCode.InvalidCommand);
|
|
248
248
|
}
|
|
249
|
-
const fabric = this.session.associatedFabric;
|
|
249
|
+
const fabric = this.context.session.associatedFabric;
|
|
250
250
|
const fabricIndex = fabric.fabricIndex;
|
|
251
251
|
const existingIndex = this.state.groupKeySets.findIndex(
|
|
252
252
|
({ groupKeySetId: entryId, fabricIndex: entryIndex }) => entryIndex === fabricIndex && entryId === groupKeySetId
|
|
@@ -270,7 +270,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
270
270
|
keySetRead({
|
|
271
271
|
groupKeySetId
|
|
272
272
|
}) {
|
|
273
|
-
|
|
273
|
+
assertRemoteActor(this.context);
|
|
274
|
+
const fabric = this.context.session.associatedFabric;
|
|
274
275
|
const groupKeySet = fabric.groups.keySets.asGroupKeySet(groupKeySetId);
|
|
275
276
|
if (groupKeySet === void 0) {
|
|
276
277
|
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} not found`, StatusCode.NotFound);
|
|
@@ -288,7 +289,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
288
289
|
if (groupKeySetId === 0) {
|
|
289
290
|
throw new StatusResponseError(`GroupKeySet ${groupKeySetId} cannot be removed`, StatusCode.InvalidCommand);
|
|
290
291
|
}
|
|
291
|
-
|
|
292
|
+
assertRemoteActor(this.context);
|
|
293
|
+
const fabric = this.context.session.associatedFabric;
|
|
292
294
|
const fabricIndex = fabric.fabricIndex;
|
|
293
295
|
const existingIndex = this.state.groupKeySets.findIndex(
|
|
294
296
|
({ groupKeySetId: entryId, fabricIndex: entryIndex }) => entryIndex === fabricIndex && entryId === groupKeySetId
|
|
@@ -302,7 +304,8 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
302
304
|
await fabric.groups.removeGroupKeySet(groupKeySetId);
|
|
303
305
|
}
|
|
304
306
|
keySetReadAllIndices() {
|
|
305
|
-
|
|
307
|
+
assertRemoteActor(this.context);
|
|
308
|
+
const fabric = this.context.session.associatedFabric;
|
|
306
309
|
const fabricIndex = fabric.fabricIndex;
|
|
307
310
|
const groupKeySetIDs = this.state.groupKeySets.filter(({ fabricIndex: entryIndex }) => entryIndex === fabricIndex).map(({ groupKeySetId }) => groupKeySetId);
|
|
308
311
|
groupKeySetIDs.unshift(0);
|
|
@@ -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;AAOA,SAAS,0BAA0B;AACnC,SAAS,UAAU,qBAAqB,cAA4B;AACpE,SAAS,eAAe,oBAAoB;AAE5C,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["groupId", "GroupKeyManagementServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/groups/GroupsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/groups/GroupsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkD1C,QAAA,MAAM,UAAU,kPAAiD,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;;IAC/B,UAAU;IAyBJ,QAAQ,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;IA8BhG,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,iBAAiB;IAmBnE,kBAAkB,CAAC,EAC9B,SAAS,GACZ,EAAE,MAAM,CAAC,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAoBjE,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAqBxF,eAAe;IASf,qBAAqB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,4BAA4B;CASnG"}
|
|
@@ -9,6 +9,7 @@ import { Groups } from "#clusters/groups";
|
|
|
9
9
|
import { RootEndpoint } from "#endpoints/root";
|
|
10
10
|
import { InternalError, Logger } from "#general";
|
|
11
11
|
import { AccessLevel } from "#model";
|
|
12
|
+
import { assertRemoteActor } from "#protocol";
|
|
12
13
|
import {
|
|
13
14
|
Command,
|
|
14
15
|
StatusCode,
|
|
@@ -59,14 +60,16 @@ class GroupsServer extends GroupsBase {
|
|
|
59
60
|
return rootEndpoint;
|
|
60
61
|
}
|
|
61
62
|
async #actOnGroupKeyManagement(act) {
|
|
63
|
+
assertRemoteActor(this.context);
|
|
62
64
|
const agent = this.#rootEndpoint.agentFor(this.context);
|
|
63
65
|
const gkm = agent.get(GroupKeyManagementServer);
|
|
64
66
|
await agent.context.transaction.addResources(gkm);
|
|
65
67
|
await agent.context.transaction.begin();
|
|
66
|
-
return act(gkm);
|
|
68
|
+
return act(this.context.session.associatedFabric, gkm);
|
|
67
69
|
}
|
|
68
70
|
async addGroup({ groupId, groupName }) {
|
|
69
|
-
|
|
71
|
+
assertRemoteActor(this.context);
|
|
72
|
+
const fabric = this.context.session.associatedFabric;
|
|
70
73
|
if (groupId < 1) {
|
|
71
74
|
return { status: StatusCode.ConstraintError, groupId };
|
|
72
75
|
}
|
|
@@ -79,7 +82,7 @@ class GroupsServer extends GroupsBase {
|
|
|
79
82
|
const endpointNumber = this.endpoint.number;
|
|
80
83
|
try {
|
|
81
84
|
await this.#actOnGroupKeyManagement(
|
|
82
|
-
(gkm) => gkm.addEndpointForGroup(
|
|
85
|
+
(fabric2, gkm) => gkm.addEndpointForGroup(fabric2, groupId, endpointNumber, groupName)
|
|
83
86
|
);
|
|
84
87
|
} catch (error) {
|
|
85
88
|
logger.error(error);
|
|
@@ -89,7 +92,8 @@ class GroupsServer extends GroupsBase {
|
|
|
89
92
|
return { status: StatusCode.Success, groupId };
|
|
90
93
|
}
|
|
91
94
|
viewGroup({ groupId }) {
|
|
92
|
-
|
|
95
|
+
assertRemoteActor(this.context);
|
|
96
|
+
const fabric = this.context.session.associatedFabric;
|
|
93
97
|
if (groupId < 1) {
|
|
94
98
|
return { status: StatusCode.ConstraintError, groupId, groupName: "" };
|
|
95
99
|
}
|
|
@@ -105,7 +109,8 @@ class GroupsServer extends GroupsBase {
|
|
|
105
109
|
async getGroupMembership({
|
|
106
110
|
groupList
|
|
107
111
|
}) {
|
|
108
|
-
|
|
112
|
+
assertRemoteActor(this.context);
|
|
113
|
+
const fabric = this.context.session.associatedFabric;
|
|
109
114
|
const fabricIndex = fabric.fabricIndex;
|
|
110
115
|
const endpointNumber = this.endpoint.number;
|
|
111
116
|
const { groupTable } = this.#rootEndpoint.stateOf(GroupKeyManagementServer);
|
|
@@ -125,7 +130,7 @@ class GroupsServer extends GroupsBase {
|
|
|
125
130
|
}
|
|
126
131
|
try {
|
|
127
132
|
if (await this.#actOnGroupKeyManagement(
|
|
128
|
-
(gkm) => gkm.removeEndpoint(
|
|
133
|
+
(fabric, gkm) => gkm.removeEndpoint(fabric, this.endpoint.number, groupId)
|
|
129
134
|
)) {
|
|
130
135
|
return { status: StatusCode.Success, groupId };
|
|
131
136
|
}
|
|
@@ -138,9 +143,7 @@ class GroupsServer extends GroupsBase {
|
|
|
138
143
|
// TODO ScenesManagement cluster is also affected by this command
|
|
139
144
|
async removeAllGroups() {
|
|
140
145
|
try {
|
|
141
|
-
await this.#actOnGroupKeyManagement(
|
|
142
|
-
(gkm) => gkm.removeEndpoint(this.session.associatedFabric, this.endpoint.number)
|
|
143
|
-
);
|
|
146
|
+
await this.#actOnGroupKeyManagement((fabric, gkm) => gkm.removeEndpoint(fabric, this.endpoint.number));
|
|
144
147
|
} catch (error) {
|
|
145
148
|
StatusResponseError.accept(error);
|
|
146
149
|
throw error;
|
|
@@ -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,cAAc;AAEvB,SAAS,oBAAoB;AAC7B,SAAS,eAAe,cAAc;AACtC,SAAS,mBAAmB;AAC5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sBAAsB;AAE/B,MAAM,SAAS,OAAO,IAAI,cAAc;AAOxC,OAAO,QAAQ,WAAW;AAAA,EACtB,GAAG,OAAO,QAAQ;AAAA,EAClB,UAAU;AAAA,IACN;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA,OAAO;AAAA,IACP,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AAAA,EACA,uBAAuB;AAAA,IACnB;AAAA,IACA,UAAU;AAAA,MACN,SAAS,SAAS,GAAG,UAAU;AAAA,MAC/B,WAAW,SAAS,GAAG,SAAS;AAAA,IACpC,CAAC;AAAA,IACD;AAAA,IACA;AAAA,IACA,EAAE,WAAW,YAAY,OAAO;AAAA,EACpC;AACJ;AAGA,MAAM,aAAa,eAAe,KAAK,OAAO,QAAQ,UAAU;AAKzD,MAAM,qBAAqB,WAAW;AAAA,EAChC,aAAa;AAClB,SAAK,MAAM,YAAY,aAAa,KAAK,SAAS;AAAA,EACtD;AAAA;AAAA;AAAA,EAIA,IAAI,gBAAwC;AACxC,UAAM,eAAe,KAAK,SAAS,YAAY,YAAY;AAC3D,QAAI,iBAAiB,QAAW;AAC5B,YAAM,IAAI,cAAc,wBAAwB;AAAA,IACpD;AACA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["fabric"]
|
|
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,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAsD,YAAY,EAAuB,MAAM,UAAU,CAAC;AAGjH,OAAO,
|
|
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,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAsD,YAAY,EAAuB,MAAM,UAAU,CAAC;AAGjH,OAAO,EAGH,mBAAmB,EAYnB,GAAG,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EAEH,WAAW,EASd,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AA8BrF;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,8BAA8B;;IACpE,QAAQ,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAChD,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC;IAEzC,UAAU,IAAI,YAAY;IAUpB,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,EAAE,sBAAsB,CAAC,kBAAkB;;;;IAuBlF,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,sBAAsB,CAAC,UAAU;;;;IAoC1E,uBAAuB,CAAC,EAAE,eAAe,EAAE,EAAE,sBAAsB,CAAC,uBAAuB;;;IAmD3F,MAAM,CAAC,EAClB,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,aAAa,GAChB,EAAE,sBAAsB,CAAC,aAAa;IAmGxB,SAAS,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,sBAAsB,CAAC,gBAAgB;IA8D1E,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,sBAAsB,CAAC,wBAAwB;;;;;;;;;IAmB5E,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE,sBAAsB,CAAC,mBAAmB;;;;;;;;;IAqBxE,yBAAyB,CAAC,EACrC,iBAAiB,GACpB,EAAE,sBAAsB,CAAC,gCAAgC;IAiEpD,gBAAgB;CA6CzB;AAED,yBAAiB,4BAA4B,CAAC;IAC1C,MAAa,QAAQ;QACjB,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,kBAAkB,CAAC,EAAE,WAAW,CAAC;KACpC;IAED,MAAa,KAAM,SAAQ,8BAA8B,CAAC,KAAK;QAC3D;;;;;;;;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;;;KAOzE;CACJ"}
|
|
@@ -10,6 +10,7 @@ import { OperationalCredentials } from "#clusters/operational-credentials";
|
|
|
10
10
|
import { Crypto, CryptoVerifyError, Logger, MatterFlowError, UnexpectedDataError } from "#general";
|
|
11
11
|
import { AccessLevel } from "#model";
|
|
12
12
|
import {
|
|
13
|
+
assertRemoteActor,
|
|
13
14
|
CertificateError,
|
|
14
15
|
DeviceCertification,
|
|
15
16
|
DeviceCommissioner,
|
|
@@ -67,11 +68,12 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
67
68
|
this.reactTo(this.endpoint.lifecycle.online, this.#nodeOnline);
|
|
68
69
|
}
|
|
69
70
|
async attestationRequest({ attestationNonce }) {
|
|
71
|
+
assertRemoteActor(this.context);
|
|
70
72
|
if (attestationNonce.byteLength !== 32) {
|
|
71
73
|
throw new StatusResponseError("Invalid attestation nonce length", StatusCode.InvalidCommand);
|
|
72
74
|
}
|
|
73
75
|
const certification = await this.getCertification();
|
|
74
|
-
const session = this.session;
|
|
76
|
+
const session = this.context.session;
|
|
75
77
|
NodeSession.assert(session);
|
|
76
78
|
const attestationElements = TlvAttestation.encode({
|
|
77
79
|
declaration: certification.declaration,
|
|
@@ -82,10 +84,11 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
82
84
|
return { attestationElements, attestationSignature };
|
|
83
85
|
}
|
|
84
86
|
async csrRequest({ csrNonce, isForUpdateNoc }) {
|
|
87
|
+
assertRemoteActor(this.context);
|
|
85
88
|
if (csrNonce.byteLength !== 32) {
|
|
86
89
|
throw new StatusResponseError("Invalid csr nonce length", StatusCode.InvalidCommand);
|
|
87
90
|
}
|
|
88
|
-
const session = this.session;
|
|
91
|
+
const session = this.context.session;
|
|
89
92
|
NodeSession.assert(session);
|
|
90
93
|
if (isForUpdateNoc && session.isPase) {
|
|
91
94
|
throw new StatusResponseError(
|
|
@@ -102,9 +105,10 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
102
105
|
);
|
|
103
106
|
}
|
|
104
107
|
const certification = await this.getCertification();
|
|
108
|
+
assertRemoteActor(this.context);
|
|
105
109
|
const certSigningRequest = await failsafeContext.createCertificateSigningRequest(
|
|
106
110
|
isForUpdateNoc ?? false,
|
|
107
|
-
this.session.id
|
|
111
|
+
this.context.session.id
|
|
108
112
|
);
|
|
109
113
|
const nocsrElements = TlvCertSigningRequest.encode({ certSigningRequest, csrNonce });
|
|
110
114
|
return { nocsrElements, attestationSignature: await certification.sign(session, nocsrElements) };
|
|
@@ -159,6 +163,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
159
163
|
caseAdminSubject,
|
|
160
164
|
adminVendorId
|
|
161
165
|
}) {
|
|
166
|
+
assertRemoteActor(this.context);
|
|
162
167
|
const failsafeContext = this.#failsafeContext;
|
|
163
168
|
if (failsafeContext.fabricIndex !== void 0) {
|
|
164
169
|
throw new StatusResponseError(
|
|
@@ -172,7 +177,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
172
177
|
debugText: "Root certificate not found"
|
|
173
178
|
};
|
|
174
179
|
}
|
|
175
|
-
if (failsafeContext.csrSessionId !== this.session.id) {
|
|
180
|
+
if (failsafeContext.csrSessionId !== this.context.session.id) {
|
|
176
181
|
return {
|
|
177
182
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.MissingCsr,
|
|
178
183
|
debugText: "CSR not found in failsafe context"
|
|
@@ -205,7 +210,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
205
210
|
return this.#mapNocErrors(error);
|
|
206
211
|
}
|
|
207
212
|
await this.endpoint.act((agent) => agent.get(AccessControlServer).addDefaultCaseAcl(fabric, [caseAdminSubject]));
|
|
208
|
-
const session = this.session;
|
|
213
|
+
const session = this.context.session;
|
|
209
214
|
NodeSession.assert(session);
|
|
210
215
|
await failsafeContext.addFabric(fabric);
|
|
211
216
|
try {
|
|
@@ -231,7 +236,8 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
231
236
|
};
|
|
232
237
|
}
|
|
233
238
|
async updateNoc({ nocValue, icacValue }) {
|
|
234
|
-
|
|
239
|
+
assertRemoteActor(this.context);
|
|
240
|
+
NodeSession.assert(this.context.session);
|
|
235
241
|
const timedOp = this.#failsafeContext;
|
|
236
242
|
if (timedOp.fabricIndex !== void 0) {
|
|
237
243
|
throw new StatusResponseError(
|
|
@@ -255,7 +261,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
255
261
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.MissingCsr
|
|
256
262
|
};
|
|
257
263
|
}
|
|
258
|
-
if (this.session.associatedFabric.fabricIndex !== timedOp.associatedFabric?.fabricIndex) {
|
|
264
|
+
if (this.context.session.associatedFabric.fabricIndex !== timedOp.associatedFabric?.fabricIndex) {
|
|
259
265
|
throw new StatusResponseError(
|
|
260
266
|
"Fabric of this session and the failsafe context do not match",
|
|
261
267
|
StatusCode.ConstraintError
|
|
@@ -274,7 +280,8 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
274
280
|
}
|
|
275
281
|
}
|
|
276
282
|
async updateFabricLabel({ label }) {
|
|
277
|
-
|
|
283
|
+
assertRemoteActor(this.context);
|
|
284
|
+
const fabric = this.context.session.associatedFabric;
|
|
278
285
|
const currentFabricIndex = fabric.fabricIndex;
|
|
279
286
|
const fabrics = this.env.get(FabricManager);
|
|
280
287
|
const conflictingLabelFabric = fabrics.find((f) => f.label === label && f.fabricIndex !== currentFabricIndex);
|
|
@@ -288,6 +295,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
288
295
|
return { statusCode: OperationalCredentials.NodeOperationalCertStatus.Ok, fabricIndex: fabric.fabricIndex };
|
|
289
296
|
}
|
|
290
297
|
async removeFabric({ fabricIndex }) {
|
|
298
|
+
assertRemoteActor(this.context);
|
|
291
299
|
const fabric = this.env.get(FabricManager).findByIndex(fabricIndex);
|
|
292
300
|
if (fabric === void 0) {
|
|
293
301
|
return {
|
|
@@ -295,7 +303,7 @@ class OperationalCredentialsServer extends OperationalCredentialsBehavior {
|
|
|
295
303
|
debugText: `Fabric ${fabricIndex} not found`
|
|
296
304
|
};
|
|
297
305
|
}
|
|
298
|
-
await fabric.remove(this.session.id);
|
|
306
|
+
await fabric.remove(this.context.session.id);
|
|
299
307
|
return {
|
|
300
308
|
statusCode: OperationalCredentials.NodeOperationalCertStatus.Ok,
|
|
301
309
|
fabricIndex
|
|
@@ -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;AACpC,SAAS,8BAA8B;AAEvC,SAAS,QAAQ,mBAAmB,QAAQ,iBAA+B,2BAA2B;AACtG,SAAS,mBAAmB;AAE5B;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,EACA;AAAA,OACG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sCAAsC;AAE/C,MAAM,SAAS,OAAO,IAAI,wBAAwB;AAOlD,uBAAuB,QAAQ,WAAW;AAAA,EACtC,GAAG,uBAAuB,QAAQ;AAAA,EAClC,oBAAoB;AAAA,IAChB;AAAA,IACA,UAAU,EAAE,kBAAkB,SAAS,GAAG,aAAa,EAAE,CAAC;AAAA,IAC1D;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AAAA,EACA,YAAY;AAAA,IACR;AAAA,IACA,UAAU;AAAA,MACN,UAAU,SAAS,GAAG,aAAa;AAAA,MACnC,gBAAgB,iBAAiB,GAAG,UAAU;AAAA,IAClD,CAAC;AAAA,IACD;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AACJ;AAUO,MAAM,qCAAqC,+BAA+B;AAAA,EAIpE,aAA2B;AAEhC,QAAI,KAAK,MAAM,qBAAqB,QAAW;AAC3C,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,QAAI,iBAAiB,eAAe,IAAI;AACpC,YAAM,IAAI,oBAAoB,oCAAoC,WAAW,cAAc;AAAA,IAC/F;AAEA,UAAM,gBAAgB,MAAM,KAAK,iBAAiB;AAElD,UAAM,UAAU,KAAK;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,2BAA2B;AACpC,SAAS,8BAA8B;AAEvC,SAAS,QAAQ,mBAAmB,QAAQ,iBAA+B,2BAA2B;AACtG,SAAS,mBAAmB;AAE5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;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,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,sCAAsC;AAE/C,MAAM,SAAS,OAAO,IAAI,wBAAwB;AAOlD,uBAAuB,QAAQ,WAAW;AAAA,EACtC,GAAG,uBAAuB,QAAQ;AAAA,EAClC,oBAAoB;AAAA,IAChB;AAAA,IACA,UAAU,EAAE,kBAAkB,SAAS,GAAG,aAAa,EAAE,CAAC;AAAA,IAC1D;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AAAA,EACA,YAAY;AAAA,IACR;AAAA,IACA,UAAU;AAAA,MACN,UAAU,SAAS,GAAG,aAAa;AAAA,MACnC,gBAAgB,iBAAiB,GAAG,UAAU;AAAA,IAClD,CAAC;AAAA,IACD;AAAA,IACA,uBAAuB;AAAA,IACvB,EAAE,WAAW,YAAY,WAAW;AAAA,EACxC;AACJ;AAUO,MAAM,qCAAqC,+BAA+B;AAAA,EAIpE,aAA2B;AAEhC,QAAI,KAAK,MAAM,qBAAqB,QAAW;AAC3C,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,WAAW,cAAc;AAAA,IAC/F;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,uBAAuB,MAAM,cAAc,KAAK,SAAS,mBAAmB;AAElF,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,WAAW,cAAc;AAAA,IACvF;AAEA,UAAM,UAAU,KAAK,QAAQ;AAC7B,gBAAY,OAAO,OAAO;AAC1B,QAAI,kBAAkB,QAAQ,QAAQ;AAClC,YAAM,IAAI;AAAA,QACN;AAAA,QACA,WAAW;AAAA,MACf;AAAA,IACJ;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,WAAW;AAAA,MACf;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,WAAO,EAAE,eAAe,sBAAsB,MAAM,cAAc,KAAK,SAAS,aAAa,EAAE;AAAA,EACnG;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,WAAW;AAAA,QACf;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,WAAW;AAAA,MACf;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,WAAW;AAAA,MACf;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;AAIA,UAAM,KAAK,SAAS,IAAI,WAAS,MAAM,IAAI,mBAAmB,EAAE,kBAAkB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAE7G,UAAM,UAAU,KAAK,QAAQ;AAC7B,gBAAY,OAAO,OAAO;AAE1B,UAAM,gBAAgB,UAAU,MAAM;AAEtC,QAAI;AACA,UAAI,QAAQ,QAAQ;AAChB,eAAO,MAAM,cAAc,OAAO,WAAW,oBAAoB,QAAQ,IAAI,EAAE;AAC/E,gBAAQ,oBAAoB,MAAM;AAAA,MACtC;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,QAAQ,EAAE;AAC9B,YAAM;AAAA,IACV;AASA,WAAO,KAAK,iCAAiC,aAAa,sBAAsB,gBAAgB,EAAE;AAElG,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,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,QAAQ,iBAAiB,OAAO;AAChC,YAAM,IAAI;AAAA,QACN;AAAA,QACA,WAAW;AAAA,MACf;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,WAAW;AAAA,MACf;AAAA,IACJ;AAGA,QAAI;AACA,YAAM,gBAAgB,MAAM,QAAQ,mBAAmB,UAAU,SAAS;AAG1E,YAAM,QAAQ,aAAa,aAAa;AAExC,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,YAAY,WAAW;AAElE,QAAI,WAAW,QAAW;AACtB,aAAO;AAAA,QACH,YAAY,uBAAuB,0BAA0B;AAAA,QAC7D,WAAW,UAAU,WAAW;AAAA,MACpC;AAAA,IACJ;AAEA,UAAM,OAAO,OAAO,KAAK,QAAQ,QAAQ,EAAE;AAG3C,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,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,gBAAgB,gBAAgB,QAAW;AAC3C,YAAM,IAAI;AAAA,QACN,8CAA8C,gBAAgB,eAAe,cAAc,QAAQ;AAAA,QACnG,WAAW;AAAA,MACf;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,WAAW,cAAc;AAAA,MAC1E;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,MAAM,iBAAiB;AACnB,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,aAAa,OAAO;AAAA,IACxB,EAAE;AAEF,SAAK,MAAM,OAAO,QAAQ,IAAI,aAAW;AAAA,MACrC,KAAK,OAAO;AAAA,MACZ,MAAM,OAAO,sBAAsB;AAAA,MACnC,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,aAAa,KAAK;AAAA,EAC1F;AAAA,EAEA,MAAM,qBAAqB,EAAE,YAAY,GAAW;AAChD,UAAM,KAAK,eAAe;AAC1B,SAAK,MAAM,IAAI,mBAAmB,EAAE,mBAAmB,aAAa,aAAa,OAAO;AAAA,EAC5F;AAAA,EAEA,MAAM,qBAAqB,EAAE,YAAY,GAAW;AAChD,UAAM,KAAK,eAAe;AAC1B,SAAK,MAAM,IAAI,mBAAmB,EAAE,mBAAmB,aAAa,aAAa,OAAO;AAAA,EAC5F;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,SAAS,KAAK,sBAAsB,EAAE,MAAM,KAAK,CAAC;AACpF,SAAK,QAAQ,cAAc,OAAO,SAAS,KAAK,sBAAsB,EAAE,MAAM,KAAK,CAAC;AACpF,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,IACA;AAAA,EACJ;AAHO,EAAAA,8BAAM;AAAA,EAKN,MAAM,cAAc,+BAA+B,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAU5D,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,GANA;",
|
|
5
5
|
"names": ["OperationalCredentialsServer"]
|
|
6
6
|
}
|
|
@@ -94,7 +94,7 @@ class WindowCoveringBaseServer extends WindowCoveringBase {
|
|
|
94
94
|
configStatus.operational = !mode.maintenanceMode || mode.calibrationMode && !this.internal.supportsCalibration;
|
|
95
95
|
configStatus.liftMovementReversed = !!mode.motorDirectionReversed;
|
|
96
96
|
if (isDeepEqual(configStatus, this.state.configStatus)) {
|
|
97
|
-
this.
|
|
97
|
+
this.agent.asLocalActor(() => {
|
|
98
98
|
this.state.configStatus = configStatus;
|
|
99
99
|
});
|
|
100
100
|
}
|