@matter/node 0.16.8-alpha.0-20260125-38e62bc3e → 0.16.8-alpha.0-20260127-de48449ad
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/system/commissioning/CommissioningClient.d.ts +1 -0
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js +29 -0
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js +3 -3
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.d.ts.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js +1 -6
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/cjs/node/client/NodePeerAddressStore.d.ts +0 -1
- package/dist/cjs/node/client/NodePeerAddressStore.d.ts.map +1 -1
- package/dist/cjs/node/client/NodePeerAddressStore.js +0 -2
- package/dist/cjs/node/client/NodePeerAddressStore.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts +1 -0
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js +29 -0
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js +3 -3
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.d.ts.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js +2 -15
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/esm/node/client/NodePeerAddressStore.d.ts +0 -1
- package/dist/esm/node/client/NodePeerAddressStore.d.ts.map +1 -1
- package/dist/esm/node/client/NodePeerAddressStore.js +0 -2
- package/dist/esm/node/client/NodePeerAddressStore.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/system/commissioning/CommissioningClient.ts +35 -0
- package/src/behavior/system/network/ClientNetworkRuntime.ts +3 -3
- package/src/behavior/system/subscriptions/SubscriptionsServer.ts +4 -17
- package/src/node/client/NodePeerAddressStore.ts +0 -2
|
@@ -160,6 +160,7 @@ export declare namespace CommissioningClient {
|
|
|
160
160
|
}
|
|
161
161
|
class Events extends BaseEvents {
|
|
162
162
|
peerAddress$Changed: Observable<[value: ProtocolPeerAddress | undefined, oldValue: ProtocolPeerAddress | undefined], void>;
|
|
163
|
+
addresses$Changed: Observable<[value: ServerAddress[] | undefined, oldValue: ServerAddress[] | undefined], void>;
|
|
163
164
|
}
|
|
164
165
|
/**
|
|
165
166
|
* Options that control commissioning.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAK3D,OAAO,EACH,YAAY,EAEZ,QAAQ,EAKR,UAAU,EACV,aAAa,EAEb,SAAS,EACZ,MAAM,UAAU,CAAC;AAiBlB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EACH,iBAAiB,EAEjB,2BAA2B,EAC3B,aAAa,EACb,MAAM,EACN,eAAe,EAKf,WAAW,IAAI,mBAAmB,EAClC,gBAAgB,IAAI,wBAAwB,EAC5C,SAAS,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,oBAAoB,EACpB,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EAEX,MAAM,EACN,wBAAwB,EACxB,QAAQ,EACX,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IACrC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IAE3C,gBAAyB,KAAK,QAAQ;IAEtC,gBAAyB,EAAE,mBAAmB;IAErC,UAAU,CAAC,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,gBAAgB,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,6 +105,7 @@ class CommissioningClient extends import_Behavior.Behavior {
|
|
|
105
105
|
this.reactTo(node.lifecycle.partsReady, this.#initializeNode);
|
|
106
106
|
this.reactTo(node.lifecycle.online, this.#nodeOnline);
|
|
107
107
|
this.reactTo(this.events.peerAddress$Changed, this.#peerAddressChanged);
|
|
108
|
+
this.reactTo(this.events.addresses$Changed, this.#operationalAddressesChanged);
|
|
108
109
|
}
|
|
109
110
|
#nodeOnline() {
|
|
110
111
|
if (this.state.peerAddress !== void 0) {
|
|
@@ -262,6 +263,33 @@ class CommissioningClient extends import_Behavior.Behavior {
|
|
|
262
263
|
const endpoint = this.endpoint;
|
|
263
264
|
endpoint.lifecycle.initialized.emit(this.state.peerAddress !== void 0);
|
|
264
265
|
}
|
|
266
|
+
#operationalAddressesChanged(newAddresses, oldAddresses) {
|
|
267
|
+
if (newAddresses === void 0) {
|
|
268
|
+
logger.info("Operational address for", import_general.Diagnostic.strong((0, import_protocol.PeerAddress)(this.state.peerAddress)), "cleared");
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
const newAddressesStr = newAddresses?.map((a) => import_general.ServerAddress.urlFor(a)).join(", ");
|
|
272
|
+
if (oldAddresses === void 0) {
|
|
273
|
+
logger.info(
|
|
274
|
+
"Operational address for",
|
|
275
|
+
import_general.Diagnostic.strong((0, import_protocol.PeerAddress)(this.state.peerAddress)),
|
|
276
|
+
"set to",
|
|
277
|
+
import_general.Diagnostic.weak(newAddressesStr)
|
|
278
|
+
);
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
const oldAddressesStr = oldAddresses.map((a) => import_general.ServerAddress.urlFor(a)).join(", ");
|
|
282
|
+
if (oldAddressesStr !== newAddressesStr) {
|
|
283
|
+
logger.info(
|
|
284
|
+
"Operational address changed for",
|
|
285
|
+
import_general.Diagnostic.strong((0, import_protocol.PeerAddress)(this.state.peerAddress)),
|
|
286
|
+
"from",
|
|
287
|
+
import_general.Diagnostic.weak(oldAddressesStr),
|
|
288
|
+
"to",
|
|
289
|
+
import_general.Diagnostic.weak(newAddressesStr)
|
|
290
|
+
);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
265
293
|
#updateAddresses(addr) {
|
|
266
294
|
const node = this.endpoint;
|
|
267
295
|
if (!node.env.has(import_protocol.PeerSet)) {
|
|
@@ -394,6 +422,7 @@ class CommissioningClient extends import_Behavior.Behavior {
|
|
|
394
422
|
CommissioningClient2.State = State;
|
|
395
423
|
class Events extends import_Events.Events {
|
|
396
424
|
peerAddress$Changed = new import_general.Observable();
|
|
425
|
+
addresses$Changed = new import_general.Observable();
|
|
397
426
|
}
|
|
398
427
|
CommissioningClient2.Events = Events;
|
|
399
428
|
function PasscodeOptions(options) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAAyB;AACzB,oBAAqC;AACrC,mCAAsC;AACtC,qCAA6C;AAC7C,0CAAgD;AAChD,IAAAA,kCAAuC;AACvC,qBAYO;AACP,mBAeO;AAGP,6BAAgC;AAChC,sBAcO;AACP,mBASO;AACP,gCAAmC;AACnC,2BAA8B;AAC9B,8BAAiC;AAvEjC;AAAA;AAAA;AAAA;AAAA;AAyEA,MAAM,SAAS,sBAAO,IAAI,qBAAqB;AAOxC,MAAM,4BAA4B,yBAAS;AAAA,EAI9C,OAAyB,QAAQ;AAAA,EAEjC,OAAyB,KAAK;AAAA,EAErB,WAAW,SAA4C;AAC5D,UAAM,aAAa,SAAS;AAC5B,QAAI,YAAY;AACZ,WAAK,aAAa;AAAA,IACtB;AAEA,QAAI,KAAK,MAAM,iBAAiB,QAAW;AACvC,WAAK,MAAM,eAAe,oBAAK;AAAA,IACnC;AAEA,QAAI,KAAK,MAAM,gBAAgB,QAAW;AAEtC,WAAK,MAAM,kBAAc,6BAAY,KAAK,MAAM,WAAW;AAAA,IAC/D;AAEA,UAAM,OAAO,KAAK;AAClB,SAAK,QAAQ,KAAK,UAAU,YAAY,KAAK,eAAe;AAC5D,SAAK,QAAQ,KAAK,UAAU,QAAQ,KAAK,WAAW;AACpD,SAAK,QAAQ,KAAK,OAAO,qBAAqB,KAAK,mBAAmB;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["import_operational_credentials", "ProtocolPeerAddress", "CommissioningClient", "_init", "_ttl_dec", "_discoveredAt_dec", "PeerAddress", "nodeId", "BaseEvents"]
|
|
6
6
|
}
|
|
@@ -88,7 +88,7 @@ class ClientNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
90
|
const address2 = (0, import_protocol.PeerAddress)(commissioningState.peerAddress);
|
|
91
|
-
if (!address2 || session.peerAddress
|
|
91
|
+
if (!address2 || !import_protocol.PeerAddress.is(session.peerAddress, address2)) {
|
|
92
92
|
return;
|
|
93
93
|
}
|
|
94
94
|
this.owner.act(({ context }) => lifecycle.online.emit(context));
|
|
@@ -98,10 +98,10 @@ class ClientNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
98
98
|
return;
|
|
99
99
|
}
|
|
100
100
|
const address2 = (0, import_protocol.PeerAddress)(commissioningState.peerAddress);
|
|
101
|
-
if (session.peerAddress
|
|
101
|
+
if (!import_protocol.PeerAddress.is(session.peerAddress, address2)) {
|
|
102
102
|
return;
|
|
103
103
|
}
|
|
104
|
-
if (address2 && sessions.find(({ peerAddress }) => peerAddress
|
|
104
|
+
if (address2 && sessions.find(({ peerAddress }) => import_protocol.PeerAddress.is(peerAddress, address2))) {
|
|
105
105
|
return;
|
|
106
106
|
}
|
|
107
107
|
this.owner.act(({ context }) => lifecycle.offline.emit(context));
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAkE;AAElE,sBAQO;AACP,iCAAoC;AACpC,8BAAiC;AACjC,4BAA+B;AAnB/B;AAAA;AAAA;AAAA;AAAA;AAqBO,MAAM,4BAA4B,2BAAY;AAAC;AAC/C,MAAM,qBAAqB,2BAAY;AAAC;AAE/C,MAAM,SAAS,sBAAO,IAAI,sBAAsB;AAKzC,MAAM,6BAA6B,qCAAe;AAAA,EACrD;AAAA,EACA;AAAA,EACA,aAAa,IAAI,6BAAc;AAAA,EAE/B,YAAY,OAAmB;AAC3B,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,IAAa,QAAQ;AACjB,WAAO,MAAM;AAAA,EACjB;AAAA,EAEA,MAAgB,QAAQ;AAEpB,QAAI,CAAC,KAAK,MAAM,UAAU,gBAAgB;AACtC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,+BAA+B;AAAA,IACnG;AAEA,QAAI,KAAK,MAAM,MAAM,QAAQ,YAAY;AACrC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,yBAAyB;AAAA,IAC7F;AAEA,UAAM,UAAU,KAAK,MAAM,QAAQ,8CAAmB,EAAE;AAExD,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,6BAAc,qBAAqB,KAAK,KAAK,sBAAsB;AAAA,IACjF;AAGA,UAAM,EAAE,KAAK,UAAU,IAAI,KAAK;AAChC,UAAM,QAAQ,IAAI,IAAI,uBAAO;AAC7B,UAAM,qBAAqB,KAAK,MAAM,QAAQ,8CAAmB;AACjE,UAAM,eAAe,KAAK,MAAM,MAAM;AAEtC,UAAM,mBAAmB,MAAM,MAAM,oBAAoB,SAAS;AAAA,MAC9D,kBAAkB;AAAA,QACd,eAAe,yCAAiB,aAAa,kBAAkB;AAAA,MACnE;AAAA,MACA,uBAAuB,aAAa,wBAC9B,CAAC,GAAG,aAAa,qBAAqB,IACtC;AAAA,IACV,CAAC;AACD,QAAI,IAAI,kCAAkB,gBAAgB;AAE1C,SAAK,UAAU,IAAI,kCAAkB,EAAE,aAAa,KAAK,OAAO,KAAK,YAAY,CAAC;AAClF,QAAI,IAAI,mCAAmB,KAAK,OAAO;AACvC,SAAK,gBAAgB,IAAI,wCAAwB;AAAA,MAC7C,aAAa;AAAA,MACb,OAAO,KAAK;AAAA,MACZ,OAAO,IAAI,IAAI,gCAAgB;AAAA;AAAA,IACnC,CAAC;AACD,QAAI,IAAI,yCAAyB,KAAK,aAAa;AAKnD,UAAM,EAAE,SAAS,IAAI,IAAI,IAAI,8BAAc;AAE3C,QAAI,SAAS,KAAK,aAAW,QAAQ,OAAO,OAAO,CAAC,GAAG;AACnD,WAAK,MAAM,IAAI,CAAC,EAAE,QAAQ,MAAM,UAAU,OAAO,KAAK,OAAO,CAAC;AAAA,IAClE;AAEA,SAAK,WAAW,GAAG,SAAS,OAAO,aAAW;AAC1C,UAAI,UAAU,UAAU;AACpB;AAAA,MACJ;AAEA,YAAMA,eAAU,6BAAY,mBAAmB,WAAW;AAC1D,UAAI,CAACA,YAAW,QAAQ,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["address"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAIxF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,QAAQ;;IAC/C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC;IACnC,QAAQ,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAExC,UAAU;IAUnB,gBAAyB,MAAM,gBAoF7B;IA4DI,8BAA8B;CAwFvC;AAED,yBAAiB,qBAAqB,CAAC;IACnC,MAAa,KAAK;QACd,sEAAsE;QACtE,kBAAkB,UAAQ;QAE1B;;;WAGG;QACH,aAAa,EAAE,gBAAgB,EAAE,CAAM;KAC1C;IAED,MAAa,QAAQ;QACjB;;;WAGG;QACH,mBAAmB,qBAA6B;KACnD;CACJ"}
|
|
@@ -144,12 +144,7 @@ class SubscriptionsBehavior extends import_Behavior.Behavior {
|
|
|
144
144
|
} = subscription;
|
|
145
145
|
const { peerAddress } = session;
|
|
146
146
|
const { fabricIndex, nodeId } = peerAddress;
|
|
147
|
-
|
|
148
|
-
try {
|
|
149
|
-
operationalAddress = (0, import_general.isIpNetworkChannel)(session.channel) ? session.channel.networkAddress : void 0;
|
|
150
|
-
} catch (error) {
|
|
151
|
-
import_protocol.SessionClosedError.accept(error);
|
|
152
|
-
}
|
|
147
|
+
const operationalAddress = !session.isClosed && (0, import_general.isIpNetworkChannel)(session.channel) ? session.channel.networkAddress : void 0;
|
|
153
148
|
const peerSubscription = {
|
|
154
149
|
subscriptionId: id,
|
|
155
150
|
peerAddress: { fabricIndex, nodeId },
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SubscriptionsBehavior"]
|
|
6
6
|
}
|
|
@@ -20,6 +20,5 @@ export declare class NodePeerAddressStore extends PeerAddressStore {
|
|
|
20
20
|
loadPeers(): PeerDescriptor[];
|
|
21
21
|
updatePeer(peer: PeerDescriptor): Promise<void>;
|
|
22
22
|
deletePeer(address: PeerAddress): void;
|
|
23
|
-
createNodeStore(): undefined;
|
|
24
23
|
}
|
|
25
24
|
//# sourceMappingURL=NodePeerAddressStore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodePeerAddressStore.d.ts","sourceRoot":"","sources":["../../../../src/node/client/NodePeerAddressStore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE7C;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;;gBAS1C,KAAK,EAAE,UAAU;IAW7B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;;;;IAe5E,SAAS,IAAI,cAAc,EAAE;IAsBvB,UAAU,CAAC,IAAI,EAAE,cAAc;IAmBrC,UAAU,CAAC,OAAO,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"NodePeerAddressStore.d.ts","sourceRoot":"","sources":["../../../../src/node/client/NodePeerAddressStore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE7C;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;;gBAS1C,KAAK,EAAE,UAAU;IAW7B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;;;;IAe5E,SAAS,IAAI,cAAc,EAAE;IAsBvB,UAAU,CAAC,IAAI,EAAE,cAAc;IAmBrC,UAAU,CAAC,OAAO,EAAE,WAAW;CAGlC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/client/NodePeerAddressStore.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,8BAAiC;AACjC,qBAAwD;AAExD,6BAAgC;AAEhC,sBAA8E;AAC9E,mBAAoC;AAZpC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,6BAA6B,iCAAiB;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,qBAAqB,IAAI,+BAA2B;AAAA,EAEpD,YAAY,OAAmB;AAC3B,UAAM;AACN,SAAK,SAAS;AAId,UAAM,kBAAkB,MAAM,IAAI,IAAI,sCAAe;AACrD,oBAAgB,oBAAoB,KAAK,iBAAiB,KAAK,IAAI;AACnE,oBAAgB,qBAAqB,KAAK,WAAW,KAAK,IAAI;AAAA,EAClE;AAAA,EAEA,iBAAiB,MAAkB,aAA0B,QAAiB;AAC1E,WAAO,WAAW,QAAW;AACzB,eAAS,oBAAO,wBAAwB,KAAK,OAAO,IAAI,IAAI,qBAAM,CAAC;AACnE,UAAI,KAAK,mBAAmB,IAAI,EAAE,aAAa,OAAO,CAAC,GAAG;AACtD,iBAAS;AAAA,MACb;AAAA,IACJ;AAEA,UAAM,cAAU,6BAAY,EAAE,aAAa,OAAO,CAAC;AAEnD,SAAK,mBAAmB,IAAI,SAAS,IAAI;AAEzC,WAAO;AAAA,EACX;AAAA,EAEA,YAA8B;AAC1B,SAAK,qBAAqB,IAAI,+BAAe;AAC7C,WAAO,CAAC,GAAG,KAAK,OAAO,KAAK,EACvB,IAAI,UAAQ;AACT,YAAM,gBAAgB,KAAK,MAAM;AACjC,UAAI,CAAC,cAAc,aAAa;AAC5B;AAAA,MACJ;AAEA,WAAK,mBAAmB,IAAI,cAAc,aAAa,IAAI;AAE3D,YAAM,OAAO,cAAc,WAAW,KAAK,CAAAA,UAAQA,MAAK,SAAS,KAAK;AAEtE,aAAO;AAAA,QACH,SAAS,cAAc;AAAA,QACvB,oBAAoB,YAAS,8BAAc,IAAI;AAAA,QAC/C,eAAe,yCAAiB,aAAa,aAAa;AAAA,MAC9D;AAAA,IACJ,CAAC,EACA,OAAO,UAAQ,SAAS,MAAS;AAAA,EAC1C;AAAA,EAEA,MAAM,WAAW,MAAsB;AACnC,UAAM,OAAO,KAAK,OAAO,MAAM,IAAI,KAAK,OAAO;AAC/C,QAAI,CAAC,QAAQ,CAAC,KAAK,UAAU,aAAa;AACtC;AAAA,IACJ;AAEA,UAAM,KAAK,IAAI,OAAM,UAAS;AAC1B,YAAM,MAAM,QAAQ,YAAY,aAAa,MAAM,aAAa;AAChE,YAAM,MAAM,QAAQ,YAAY,MAAM;AACtC,YAAM,QAAQ,MAAM,cAAc;AAClC,+CAAiB,WAAW,KAAK,eAAe,KAAK;AACrD,UAAI,KAAK,oBAAoB;AAEzB,cAAM,YAAY,CAAC,KAAK,kBAAkB;AAAA,MAC9C;AACA,YAAM,MAAM,QAAQ,YAAY,OAAO;AAAA,IAC3C,CAAC;AAAA,EACL;AAAA,EAEA,WAAW,SAAsB;AAC7B,SAAK,mBAAmB,OAAO,OAAO;AAAA,EAC1C;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,8BAAiC;AACjC,qBAAwD;AAExD,6BAAgC;AAEhC,sBAA8E;AAC9E,mBAAoC;AAZpC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,6BAA6B,iCAAiB;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,qBAAqB,IAAI,+BAA2B;AAAA,EAEpD,YAAY,OAAmB;AAC3B,UAAM;AACN,SAAK,SAAS;AAId,UAAM,kBAAkB,MAAM,IAAI,IAAI,sCAAe;AACrD,oBAAgB,oBAAoB,KAAK,iBAAiB,KAAK,IAAI;AACnE,oBAAgB,qBAAqB,KAAK,WAAW,KAAK,IAAI;AAAA,EAClE;AAAA,EAEA,iBAAiB,MAAkB,aAA0B,QAAiB;AAC1E,WAAO,WAAW,QAAW;AACzB,eAAS,oBAAO,wBAAwB,KAAK,OAAO,IAAI,IAAI,qBAAM,CAAC;AACnE,UAAI,KAAK,mBAAmB,IAAI,EAAE,aAAa,OAAO,CAAC,GAAG;AACtD,iBAAS;AAAA,MACb;AAAA,IACJ;AAEA,UAAM,cAAU,6BAAY,EAAE,aAAa,OAAO,CAAC;AAEnD,SAAK,mBAAmB,IAAI,SAAS,IAAI;AAEzC,WAAO;AAAA,EACX;AAAA,EAEA,YAA8B;AAC1B,SAAK,qBAAqB,IAAI,+BAAe;AAC7C,WAAO,CAAC,GAAG,KAAK,OAAO,KAAK,EACvB,IAAI,UAAQ;AACT,YAAM,gBAAgB,KAAK,MAAM;AACjC,UAAI,CAAC,cAAc,aAAa;AAC5B;AAAA,MACJ;AAEA,WAAK,mBAAmB,IAAI,cAAc,aAAa,IAAI;AAE3D,YAAM,OAAO,cAAc,WAAW,KAAK,CAAAA,UAAQA,MAAK,SAAS,KAAK;AAEtE,aAAO;AAAA,QACH,SAAS,cAAc;AAAA,QACvB,oBAAoB,YAAS,8BAAc,IAAI;AAAA,QAC/C,eAAe,yCAAiB,aAAa,aAAa;AAAA,MAC9D;AAAA,IACJ,CAAC,EACA,OAAO,UAAQ,SAAS,MAAS;AAAA,EAC1C;AAAA,EAEA,MAAM,WAAW,MAAsB;AACnC,UAAM,OAAO,KAAK,OAAO,MAAM,IAAI,KAAK,OAAO;AAC/C,QAAI,CAAC,QAAQ,CAAC,KAAK,UAAU,aAAa;AACtC;AAAA,IACJ;AAEA,UAAM,KAAK,IAAI,OAAM,UAAS;AAC1B,YAAM,MAAM,QAAQ,YAAY,aAAa,MAAM,aAAa;AAChE,YAAM,MAAM,QAAQ,YAAY,MAAM;AACtC,YAAM,QAAQ,MAAM,cAAc;AAClC,+CAAiB,WAAW,KAAK,eAAe,KAAK;AACrD,UAAI,KAAK,oBAAoB;AAEzB,cAAM,YAAY,CAAC,KAAK,kBAAkB;AAAA,MAC9C;AACA,YAAM,MAAM,QAAQ,YAAY,OAAO;AAAA,IAC3C,CAAC;AAAA,EACL;AAAA,EAEA,WAAW,SAAsB;AAC7B,SAAK,mBAAmB,OAAO,OAAO;AAAA,EAC1C;AACJ;",
|
|
5
5
|
"names": ["addr"]
|
|
6
6
|
}
|
|
@@ -160,6 +160,7 @@ export declare namespace CommissioningClient {
|
|
|
160
160
|
}
|
|
161
161
|
class Events extends BaseEvents {
|
|
162
162
|
peerAddress$Changed: Observable<[value: ProtocolPeerAddress | undefined, oldValue: ProtocolPeerAddress | undefined], void>;
|
|
163
|
+
addresses$Changed: Observable<[value: ServerAddress[] | undefined, oldValue: ServerAddress[] | undefined], void>;
|
|
163
164
|
}
|
|
164
165
|
/**
|
|
165
166
|
* Options that control commissioning.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAK3D,OAAO,EACH,YAAY,EAEZ,QAAQ,EAKR,UAAU,EACV,aAAa,EAEb,SAAS,EACZ,MAAM,UAAU,CAAC;AAiBlB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EACH,iBAAiB,EAEjB,2BAA2B,EAC3B,aAAa,EACb,MAAM,EACN,eAAe,EAKf,WAAW,IAAI,mBAAmB,EAClC,gBAAgB,IAAI,wBAAwB,EAC5C,SAAS,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,oBAAoB,EACpB,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EAEX,MAAM,EACN,wBAAwB,EACxB,QAAQ,EACX,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IACrC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IAE3C,gBAAyB,KAAK,QAAQ;IAEtC,gBAAyB,EAAE,mBAAmB;IAErC,UAAU,CAAC,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,gBAAgB,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,6 +117,7 @@ class CommissioningClient extends Behavior {
|
|
|
117
117
|
this.reactTo(node.lifecycle.partsReady, this.#initializeNode);
|
|
118
118
|
this.reactTo(node.lifecycle.online, this.#nodeOnline);
|
|
119
119
|
this.reactTo(this.events.peerAddress$Changed, this.#peerAddressChanged);
|
|
120
|
+
this.reactTo(this.events.addresses$Changed, this.#operationalAddressesChanged);
|
|
120
121
|
}
|
|
121
122
|
#nodeOnline() {
|
|
122
123
|
if (this.state.peerAddress !== void 0) {
|
|
@@ -274,6 +275,33 @@ class CommissioningClient extends Behavior {
|
|
|
274
275
|
const endpoint = this.endpoint;
|
|
275
276
|
endpoint.lifecycle.initialized.emit(this.state.peerAddress !== void 0);
|
|
276
277
|
}
|
|
278
|
+
#operationalAddressesChanged(newAddresses, oldAddresses) {
|
|
279
|
+
if (newAddresses === void 0) {
|
|
280
|
+
logger.info("Operational address for", Diagnostic.strong(PeerAddress(this.state.peerAddress)), "cleared");
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
const newAddressesStr = newAddresses?.map((a) => ServerAddress.urlFor(a)).join(", ");
|
|
284
|
+
if (oldAddresses === void 0) {
|
|
285
|
+
logger.info(
|
|
286
|
+
"Operational address for",
|
|
287
|
+
Diagnostic.strong(PeerAddress(this.state.peerAddress)),
|
|
288
|
+
"set to",
|
|
289
|
+
Diagnostic.weak(newAddressesStr)
|
|
290
|
+
);
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
const oldAddressesStr = oldAddresses.map((a) => ServerAddress.urlFor(a)).join(", ");
|
|
294
|
+
if (oldAddressesStr !== newAddressesStr) {
|
|
295
|
+
logger.info(
|
|
296
|
+
"Operational address changed for",
|
|
297
|
+
Diagnostic.strong(PeerAddress(this.state.peerAddress)),
|
|
298
|
+
"from",
|
|
299
|
+
Diagnostic.weak(oldAddressesStr),
|
|
300
|
+
"to",
|
|
301
|
+
Diagnostic.weak(newAddressesStr)
|
|
302
|
+
);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
277
305
|
#updateAddresses(addr) {
|
|
278
306
|
const node = this.endpoint;
|
|
279
307
|
if (!node.env.has(PeerSet)) {
|
|
@@ -406,6 +434,7 @@ class CommissioningClient extends Behavior {
|
|
|
406
434
|
CommissioningClient2.State = State;
|
|
407
435
|
class Events extends BaseEvents {
|
|
408
436
|
peerAddress$Changed = new Observable();
|
|
437
|
+
addresses$Changed = new Observable();
|
|
409
438
|
}
|
|
410
439
|
CommissioningClient2.Events = Events;
|
|
411
440
|
function PasscodeOptions(options) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gBAAgB;AACzB,SAAS,UAAU,kBAAkB;AACrC,SAAS,6BAA6B;AACtC,SAAS,oCAAoC;AAC7C,SAAS,uCAAuC;AAChD,SAAS,8BAA8B;AACvC;AAAA,EAEI;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEG;AACP;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAGP,SAAS,uBAAuB;AAChC;AAAA,EAEI;AAAA,EAIA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA,eAAe;AAAA,OAGZ;AACP;AAAA,EAKI;AAAA,OAIG;AACP,SAAS,0BAA0B;AACnC,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AAEjC,MAAM,SAAS,OAAO,IAAI,qBAAqB;AAOxC,MAAM,4BAA4B,SAAS;AAAA,EAI9C,OAAyB,QAAQ;AAAA,EAEjC,OAAyB,KAAK;AAAA,EAErB,WAAW,SAA4C;AAC5D,UAAM,aAAa,SAAS;AAC5B,QAAI,YAAY;AACZ,WAAK,aAAa;AAAA,IACtB;AAEA,QAAI,KAAK,MAAM,iBAAiB,QAAW;AACvC,WAAK,MAAM,eAAe,KAAK;AAAA,IACnC;AAEA,QAAI,KAAK,MAAM,gBAAgB,QAAW;AAEtC,WAAK,MAAM,cAAc,YAAY,KAAK,MAAM,WAAW;AAAA,IAC/D;AAEA,UAAM,OAAO,KAAK;AAClB,SAAK,QAAQ,KAAK,UAAU,YAAY,KAAK,eAAe;AAC5D,SAAK,QAAQ,KAAK,UAAU,QAAQ,KAAK,WAAW;AACpD,SAAK,QAAQ,KAAK,OAAO,qBAAqB,KAAK,mBAAmB;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["CommissioningClient", "_init", "_ttl_dec", "_discoveredAt_dec", "PeerAddress", "nodeId"]
|
|
6
6
|
}
|
|
@@ -71,7 +71,7 @@ class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
73
|
const address2 = PeerAddress(commissioningState.peerAddress);
|
|
74
|
-
if (!address2 || session.peerAddress
|
|
74
|
+
if (!address2 || !PeerAddress.is(session.peerAddress, address2)) {
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
77
|
this.owner.act(({ context }) => lifecycle.online.emit(context));
|
|
@@ -81,10 +81,10 @@ class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
83
83
|
const address2 = PeerAddress(commissioningState.peerAddress);
|
|
84
|
-
if (session.peerAddress
|
|
84
|
+
if (!PeerAddress.is(session.peerAddress, address2)) {
|
|
85
85
|
return;
|
|
86
86
|
}
|
|
87
|
-
if (address2 && sessions.find(({ peerAddress }) => peerAddress
|
|
87
|
+
if (address2 && sessions.find(({ peerAddress }) => PeerAddress.is(peerAddress, address2))) {
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
90
|
this.owner.act(({ context }) => lifecycle.offline.emit(context));
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,eAAe,QAAQ,aAAa,qBAAqB;AAElE;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;AAExB,MAAM,4BAA4B,YAAY;AAAC;AAC/C,MAAM,qBAAqB,YAAY;AAAC;AAE/C,MAAM,SAAS,OAAO,IAAI,sBAAsB;AAKzC,MAAM,6BAA6B,eAAe;AAAA,EACrD;AAAA,EACA;AAAA,EACA,aAAa,IAAI,cAAc;AAAA,EAE/B,YAAY,OAAmB;AAC3B,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,IAAa,QAAQ;AACjB,WAAO,MAAM;AAAA,EACjB;AAAA,EAEA,MAAgB,QAAQ;AAEpB,QAAI,CAAC,KAAK,MAAM,UAAU,gBAAgB;AACtC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,+BAA+B;AAAA,IACnG;AAEA,QAAI,KAAK,MAAM,MAAM,QAAQ,YAAY;AACrC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,yBAAyB;AAAA,IAC7F;AAEA,UAAM,UAAU,KAAK,MAAM,QAAQ,mBAAmB,EAAE;AAExD,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,cAAc,qBAAqB,KAAK,KAAK,sBAAsB;AAAA,IACjF;AAGA,UAAM,EAAE,KAAK,UAAU,IAAI,KAAK;AAChC,UAAM,QAAQ,IAAI,IAAI,OAAO;AAC7B,UAAM,qBAAqB,KAAK,MAAM,QAAQ,mBAAmB;AACjE,UAAM,eAAe,KAAK,MAAM,MAAM;AAEtC,UAAM,mBAAmB,MAAM,MAAM,oBAAoB,SAAS;AAAA,MAC9D,kBAAkB;AAAA,QACd,eAAe,iBAAiB,aAAa,kBAAkB;AAAA,MACnE;AAAA,MACA,uBAAuB,aAAa,wBAC9B,CAAC,GAAG,aAAa,qBAAqB,IACtC;AAAA,IACV,CAAC;AACD,QAAI,IAAI,kBAAkB,gBAAgB;AAE1C,SAAK,UAAU,IAAI,kBAAkB,EAAE,aAAa,KAAK,OAAO,KAAK,YAAY,CAAC;AAClF,QAAI,IAAI,mBAAmB,KAAK,OAAO;AACvC,SAAK,gBAAgB,IAAI,wBAAwB;AAAA,MAC7C,aAAa;AAAA,MACb,OAAO,KAAK;AAAA,MACZ,OAAO,IAAI,IAAI,gBAAgB;AAAA;AAAA,IACnC,CAAC;AACD,QAAI,IAAI,yBAAyB,KAAK,aAAa;AAKnD,UAAM,EAAE,SAAS,IAAI,IAAI,IAAI,cAAc;AAE3C,QAAI,SAAS,KAAK,aAAW,QAAQ,OAAO,OAAO,CAAC,GAAG;AACnD,WAAK,MAAM,IAAI,CAAC,EAAE,QAAQ,MAAM,UAAU,OAAO,KAAK,OAAO,CAAC;AAAA,IAClE;AAEA,SAAK,WAAW,GAAG,SAAS,OAAO,aAAW;AAC1C,UAAI,UAAU,UAAU;AACpB;AAAA,MACJ;AAEA,YAAMA,WAAU,YAAY,mBAAmB,WAAW;AAC1D,UAAI,CAACA,YAAW,QAAQ,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["address"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"SubscriptionsServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAIxF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,QAAQ;;IAC/C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC;IACnC,QAAQ,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAExC,UAAU;IAUnB,gBAAyB,MAAM,gBAoF7B;IA4DI,8BAA8B;CAwFvC;AAED,yBAAiB,qBAAqB,CAAC;IACnC,MAAa,KAAK;QACd,sEAAsE;QACtE,kBAAkB,UAAQ;QAE1B;;;WAGG;QACH,aAAa,EAAE,gBAAgB,EAAE,CAAM;KAC1C;IAED,MAAa,QAAQ;QACjB;;;WAGG;QACH,mBAAmB,qBAA6B;KACnD;CACJ"}
|
|
@@ -7,15 +7,7 @@ import { deepCopy, isIpNetworkChannel, Logger, MatterError, Seconds } from "#gen
|
|
|
7
7
|
import { DatatypeModel, FieldElement } from "#model";
|
|
8
8
|
import { InteractionServer } from "#node/server/InteractionServer.js";
|
|
9
9
|
import { ServerSubscription } from "#node/server/ServerSubscription.js";
|
|
10
|
-
import {
|
|
11
|
-
NodeDiscoveryType,
|
|
12
|
-
PeerAddress,
|
|
13
|
-
PeerAddressSet,
|
|
14
|
-
PeerSet,
|
|
15
|
-
SessionClosedError,
|
|
16
|
-
SessionManager,
|
|
17
|
-
Subscription
|
|
18
|
-
} from "#protocol";
|
|
10
|
+
import { NodeDiscoveryType, PeerAddress, PeerAddressSet, PeerSet, SessionManager, Subscription } from "#protocol";
|
|
19
11
|
import { StatusCode, StatusResponseError } from "#types";
|
|
20
12
|
import { Behavior } from "../../Behavior.js";
|
|
21
13
|
import { SessionsBehavior } from "../sessions/SessionsBehavior.js";
|
|
@@ -129,12 +121,7 @@ class SubscriptionsBehavior extends Behavior {
|
|
|
129
121
|
} = subscription;
|
|
130
122
|
const { peerAddress } = session;
|
|
131
123
|
const { fabricIndex, nodeId } = peerAddress;
|
|
132
|
-
|
|
133
|
-
try {
|
|
134
|
-
operationalAddress = isIpNetworkChannel(session.channel) ? session.channel.networkAddress : void 0;
|
|
135
|
-
} catch (error) {
|
|
136
|
-
SessionClosedError.accept(error);
|
|
137
|
-
}
|
|
124
|
+
const operationalAddress = !session.isClosed && isIpNetworkChannel(session.channel) ? session.channel.networkAddress : void 0;
|
|
138
125
|
const peerSubscription = {
|
|
139
126
|
subscriptionId: id,
|
|
140
127
|
peerAddress: { fabricIndex, nodeId },
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/subscriptions/SubscriptionsServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,UAAU,oBAAoB,QAAQ,aAA2B,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SubscriptionsBehavior"]
|
|
6
6
|
}
|
|
@@ -20,6 +20,5 @@ export declare class NodePeerAddressStore extends PeerAddressStore {
|
|
|
20
20
|
loadPeers(): PeerDescriptor[];
|
|
21
21
|
updatePeer(peer: PeerDescriptor): Promise<void>;
|
|
22
22
|
deletePeer(address: PeerAddress): void;
|
|
23
|
-
createNodeStore(): undefined;
|
|
24
23
|
}
|
|
25
24
|
//# sourceMappingURL=NodePeerAddressStore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodePeerAddressStore.d.ts","sourceRoot":"","sources":["../../../../src/node/client/NodePeerAddressStore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE7C;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;;gBAS1C,KAAK,EAAE,UAAU;IAW7B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;;;;IAe5E,SAAS,IAAI,cAAc,EAAE;IAsBvB,UAAU,CAAC,IAAI,EAAE,cAAc;IAmBrC,UAAU,CAAC,OAAO,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"NodePeerAddressStore.d.ts","sourceRoot":"","sources":["../../../../src/node/client/NodePeerAddressStore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE7C;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;;gBAS1C,KAAK,EAAE,UAAU;IAW7B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;;;;IAe5E,SAAS,IAAI,cAAc,EAAE;IAsBvB,UAAU,CAAC,IAAI,EAAE,cAAc;IAmBrC,UAAU,CAAC,OAAO,EAAE,WAAW;CAGlC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/client/NodePeerAddressStore.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAAwB;AACjC,SAAS,QAAQ,qBAAuC;AAExD,SAAS,uBAAuB;AAEhC,SAAS,aAAa,gBAAgB,wBAAwC;AAC9E,SAAsB,cAAc;AAK7B,MAAM,6BAA6B,iBAAiB;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,qBAAqB,IAAI,eAA2B;AAAA,EAEpD,YAAY,OAAmB;AAC3B,UAAM;AACN,SAAK,SAAS;AAId,UAAM,kBAAkB,MAAM,IAAI,IAAI,eAAe;AACrD,oBAAgB,oBAAoB,KAAK,iBAAiB,KAAK,IAAI;AACnE,oBAAgB,qBAAqB,KAAK,WAAW,KAAK,IAAI;AAAA,EAClE;AAAA,EAEA,iBAAiB,MAAkB,aAA0B,QAAiB;AAC1E,WAAO,WAAW,QAAW;AACzB,eAAS,OAAO,wBAAwB,KAAK,OAAO,IAAI,IAAI,MAAM,CAAC;AACnE,UAAI,KAAK,mBAAmB,IAAI,EAAE,aAAa,OAAO,CAAC,GAAG;AACtD,iBAAS;AAAA,MACb;AAAA,IACJ;AAEA,UAAM,UAAU,YAAY,EAAE,aAAa,OAAO,CAAC;AAEnD,SAAK,mBAAmB,IAAI,SAAS,IAAI;AAEzC,WAAO;AAAA,EACX;AAAA,EAEA,YAA8B;AAC1B,SAAK,qBAAqB,IAAI,eAAe;AAC7C,WAAO,CAAC,GAAG,KAAK,OAAO,KAAK,EACvB,IAAI,UAAQ;AACT,YAAM,gBAAgB,KAAK,MAAM;AACjC,UAAI,CAAC,cAAc,aAAa;AAC5B;AAAA,MACJ;AAEA,WAAK,mBAAmB,IAAI,cAAc,aAAa,IAAI;AAE3D,YAAM,OAAO,cAAc,WAAW,KAAK,CAAAA,UAAQA,MAAK,SAAS,KAAK;AAEtE,aAAO;AAAA,QACH,SAAS,cAAc;AAAA,QACvB,oBAAoB,QAAS,cAAc,IAAI;AAAA,QAC/C,eAAe,iBAAiB,aAAa,aAAa;AAAA,MAC9D;AAAA,IACJ,CAAC,EACA,OAAO,UAAQ,SAAS,MAAS;AAAA,EAC1C;AAAA,EAEA,MAAM,WAAW,MAAsB;AACnC,UAAM,OAAO,KAAK,OAAO,MAAM,IAAI,KAAK,OAAO;AAC/C,QAAI,CAAC,QAAQ,CAAC,KAAK,UAAU,aAAa;AACtC;AAAA,IACJ;AAEA,UAAM,KAAK,IAAI,OAAM,UAAS;AAC1B,YAAM,MAAM,QAAQ,YAAY,aAAa,MAAM,aAAa;AAChE,YAAM,MAAM,QAAQ,YAAY,MAAM;AACtC,YAAM,QAAQ,MAAM,cAAc;AAClC,uBAAiB,WAAW,KAAK,eAAe,KAAK;AACrD,UAAI,KAAK,oBAAoB;AAEzB,cAAM,YAAY,CAAC,KAAK,kBAAkB;AAAA,MAC9C;AACA,YAAM,MAAM,QAAQ,YAAY,OAAO;AAAA,IAC3C,CAAC;AAAA,EACL;AAAA,EAEA,WAAW,SAAsB;AAC7B,SAAK,mBAAmB,OAAO,OAAO;AAAA,EAC1C;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAAwB;AACjC,SAAS,QAAQ,qBAAuC;AAExD,SAAS,uBAAuB;AAEhC,SAAS,aAAa,gBAAgB,wBAAwC;AAC9E,SAAsB,cAAc;AAK7B,MAAM,6BAA6B,iBAAiB;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,qBAAqB,IAAI,eAA2B;AAAA,EAEpD,YAAY,OAAmB;AAC3B,UAAM;AACN,SAAK,SAAS;AAId,UAAM,kBAAkB,MAAM,IAAI,IAAI,eAAe;AACrD,oBAAgB,oBAAoB,KAAK,iBAAiB,KAAK,IAAI;AACnE,oBAAgB,qBAAqB,KAAK,WAAW,KAAK,IAAI;AAAA,EAClE;AAAA,EAEA,iBAAiB,MAAkB,aAA0B,QAAiB;AAC1E,WAAO,WAAW,QAAW;AACzB,eAAS,OAAO,wBAAwB,KAAK,OAAO,IAAI,IAAI,MAAM,CAAC;AACnE,UAAI,KAAK,mBAAmB,IAAI,EAAE,aAAa,OAAO,CAAC,GAAG;AACtD,iBAAS;AAAA,MACb;AAAA,IACJ;AAEA,UAAM,UAAU,YAAY,EAAE,aAAa,OAAO,CAAC;AAEnD,SAAK,mBAAmB,IAAI,SAAS,IAAI;AAEzC,WAAO;AAAA,EACX;AAAA,EAEA,YAA8B;AAC1B,SAAK,qBAAqB,IAAI,eAAe;AAC7C,WAAO,CAAC,GAAG,KAAK,OAAO,KAAK,EACvB,IAAI,UAAQ;AACT,YAAM,gBAAgB,KAAK,MAAM;AACjC,UAAI,CAAC,cAAc,aAAa;AAC5B;AAAA,MACJ;AAEA,WAAK,mBAAmB,IAAI,cAAc,aAAa,IAAI;AAE3D,YAAM,OAAO,cAAc,WAAW,KAAK,CAAAA,UAAQA,MAAK,SAAS,KAAK;AAEtE,aAAO;AAAA,QACH,SAAS,cAAc;AAAA,QACvB,oBAAoB,QAAS,cAAc,IAAI;AAAA,QAC/C,eAAe,iBAAiB,aAAa,aAAa;AAAA,MAC9D;AAAA,IACJ,CAAC,EACA,OAAO,UAAQ,SAAS,MAAS;AAAA,EAC1C;AAAA,EAEA,MAAM,WAAW,MAAsB;AACnC,UAAM,OAAO,KAAK,OAAO,MAAM,IAAI,KAAK,OAAO;AAC/C,QAAI,CAAC,QAAQ,CAAC,KAAK,UAAU,aAAa;AACtC;AAAA,IACJ;AAEA,UAAM,KAAK,IAAI,OAAM,UAAS;AAC1B,YAAM,MAAM,QAAQ,YAAY,aAAa,MAAM,aAAa;AAChE,YAAM,MAAM,QAAQ,YAAY,MAAM;AACtC,YAAM,QAAQ,MAAM,cAAc;AAClC,uBAAiB,WAAW,KAAK,eAAe,KAAK;AACrD,UAAI,KAAK,oBAAoB;AAEzB,cAAM,YAAY,CAAC,KAAK,kBAAkB;AAAA,MAC9C;AACA,YAAM,MAAM,QAAQ,YAAY,OAAO;AAAA,IAC3C,CAAC;AAAA,EACL;AAAA,EAEA,WAAW,SAAsB;AAC7B,SAAK,mBAAmB,OAAO,OAAO;AAAA,EAC1C;AACJ;",
|
|
5
5
|
"names": ["addr"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/node",
|
|
3
|
-
"version": "0.16.8-alpha.0-
|
|
3
|
+
"version": "0.16.8-alpha.0-20260127-de48449ad",
|
|
4
4
|
"description": "API for building Matter nodes",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -42,14 +42,14 @@
|
|
|
42
42
|
"#*": "./src/*"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@matter/general": "0.16.8-alpha.0-
|
|
46
|
-
"@matter/model": "0.16.8-alpha.0-
|
|
47
|
-
"@matter/types": "0.16.8-alpha.0-
|
|
48
|
-
"@matter/protocol": "0.16.8-alpha.0-
|
|
45
|
+
"@matter/general": "0.16.8-alpha.0-20260127-de48449ad",
|
|
46
|
+
"@matter/model": "0.16.8-alpha.0-20260127-de48449ad",
|
|
47
|
+
"@matter/types": "0.16.8-alpha.0-20260127-de48449ad",
|
|
48
|
+
"@matter/protocol": "0.16.8-alpha.0-20260127-de48449ad"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@matter/tools": "0.16.8-alpha.0-
|
|
52
|
-
"@matter/testing": "0.16.8-alpha.0-
|
|
51
|
+
"@matter/tools": "0.16.8-alpha.0-20260127-de48449ad",
|
|
52
|
+
"@matter/testing": "0.16.8-alpha.0-20260127-de48449ad"
|
|
53
53
|
},
|
|
54
54
|
"files": [
|
|
55
55
|
"dist/**/*",
|
|
@@ -105,6 +105,7 @@ export class CommissioningClient extends Behavior {
|
|
|
105
105
|
this.reactTo(node.lifecycle.partsReady, this.#initializeNode);
|
|
106
106
|
this.reactTo(node.lifecycle.online, this.#nodeOnline);
|
|
107
107
|
this.reactTo(this.events.peerAddress$Changed, this.#peerAddressChanged);
|
|
108
|
+
this.reactTo(this.events.addresses$Changed, this.#operationalAddressesChanged);
|
|
108
109
|
}
|
|
109
110
|
|
|
110
111
|
#nodeOnline() {
|
|
@@ -309,6 +310,37 @@ export class CommissioningClient extends Behavior {
|
|
|
309
310
|
endpoint.lifecycle.initialized.emit(this.state.peerAddress !== undefined);
|
|
310
311
|
}
|
|
311
312
|
|
|
313
|
+
#operationalAddressesChanged(newAddresses: ServerAddress[] | undefined, oldAddresses: ServerAddress[] | undefined) {
|
|
314
|
+
// Log when addresses change
|
|
315
|
+
if (newAddresses === undefined) {
|
|
316
|
+
logger.info("Operational address for", Diagnostic.strong(PeerAddress(this.state.peerAddress)), "cleared");
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
const newAddressesStr = newAddresses?.map(a => ServerAddress.urlFor(a)).join(", ");
|
|
321
|
+
if (oldAddresses === undefined) {
|
|
322
|
+
logger.info(
|
|
323
|
+
"Operational address for",
|
|
324
|
+
Diagnostic.strong(PeerAddress(this.state.peerAddress)),
|
|
325
|
+
"set to",
|
|
326
|
+
Diagnostic.weak(newAddressesStr),
|
|
327
|
+
);
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
const oldAddressesStr = oldAddresses.map(a => ServerAddress.urlFor(a)).join(", ");
|
|
332
|
+
if (oldAddressesStr !== newAddressesStr) {
|
|
333
|
+
logger.info(
|
|
334
|
+
"Operational address changed for",
|
|
335
|
+
Diagnostic.strong(PeerAddress(this.state.peerAddress)),
|
|
336
|
+
"from",
|
|
337
|
+
Diagnostic.weak(oldAddressesStr),
|
|
338
|
+
"to",
|
|
339
|
+
Diagnostic.weak(newAddressesStr),
|
|
340
|
+
);
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
|
|
312
344
|
#updateAddresses(addr: ProtocolPeerAddress) {
|
|
313
345
|
const node = this.endpoint as ClientNode;
|
|
314
346
|
if (!node.env.has(PeerSet)) {
|
|
@@ -533,6 +565,9 @@ export namespace CommissioningClient {
|
|
|
533
565
|
peerAddress$Changed = new Observable<
|
|
534
566
|
[value: ProtocolPeerAddress | undefined, oldValue: ProtocolPeerAddress | undefined]
|
|
535
567
|
>();
|
|
568
|
+
addresses$Changed = new Observable<
|
|
569
|
+
[value: ServerAddress[] | undefined, oldValue: ServerAddress[] | undefined]
|
|
570
|
+
>();
|
|
536
571
|
}
|
|
537
572
|
|
|
538
573
|
/**
|
|
@@ -96,7 +96,7 @@ export class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
const address = PeerAddress(commissioningState.peerAddress);
|
|
99
|
-
if (!address || session.peerAddress
|
|
99
|
+
if (!address || !PeerAddress.is(session.peerAddress, address)) {
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
|
|
@@ -109,11 +109,11 @@ export class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
const address = PeerAddress(commissioningState.peerAddress);
|
|
112
|
-
if (session.peerAddress
|
|
112
|
+
if (!PeerAddress.is(session.peerAddress, address)) {
|
|
113
113
|
return;
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
-
if (address && sessions.find(({ peerAddress }) => peerAddress
|
|
116
|
+
if (address && sessions.find(({ peerAddress }) => PeerAddress.is(peerAddress, address))) {
|
|
117
117
|
return;
|
|
118
118
|
}
|
|
119
119
|
|
|
@@ -4,19 +4,11 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { deepCopy, isIpNetworkChannel, Logger, MatterError, MaybePromise, Seconds
|
|
7
|
+
import { deepCopy, isIpNetworkChannel, Logger, MatterError, MaybePromise, Seconds } from "#general";
|
|
8
8
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
9
|
import { InteractionServer, PeerSubscription } from "#node/server/InteractionServer.js";
|
|
10
10
|
import { ServerSubscription } from "#node/server/ServerSubscription.js";
|
|
11
|
-
import {
|
|
12
|
-
NodeDiscoveryType,
|
|
13
|
-
PeerAddress,
|
|
14
|
-
PeerAddressSet,
|
|
15
|
-
PeerSet,
|
|
16
|
-
SessionClosedError,
|
|
17
|
-
SessionManager,
|
|
18
|
-
Subscription,
|
|
19
|
-
} from "#protocol";
|
|
11
|
+
import { NodeDiscoveryType, PeerAddress, PeerAddressSet, PeerSet, SessionManager, Subscription } from "#protocol";
|
|
20
12
|
import { StatusCode, StatusResponseError } from "#types";
|
|
21
13
|
import { Behavior } from "../../Behavior.js";
|
|
22
14
|
import { SessionsBehavior } from "../sessions/SessionsBehavior.js";
|
|
@@ -150,13 +142,8 @@ export class SubscriptionsBehavior extends Behavior {
|
|
|
150
142
|
const { fabricIndex, nodeId } = peerAddress;
|
|
151
143
|
|
|
152
144
|
// TODO Remove when we store peer addresses also for operational nodes
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
operationalAddress = isIpNetworkChannel(session.channel) ? session.channel.networkAddress : undefined;
|
|
156
|
-
} catch (error) {
|
|
157
|
-
// Can happen in edge cases, so better catch it and proceed without operational address
|
|
158
|
-
SessionClosedError.accept(error);
|
|
159
|
-
}
|
|
145
|
+
const operationalAddress =
|
|
146
|
+
!session.isClosed && isIpNetworkChannel(session.channel) ? session.channel.networkAddress : undefined;
|
|
160
147
|
const peerSubscription: PeerSubscription = {
|
|
161
148
|
subscriptionId: id,
|
|
162
149
|
peerAddress: { fabricIndex, nodeId },
|