@project-chip/matter.js 0.11.0-alpha.0-20240926-407400ecb → 0.11.0-alpha.0-20241002-e7b377c34

package/src/PaseCommissioner.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2024 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Environment, ImplementationError, Logger, Network, UdpInterface } from "#general";
+import { Environment, ImplementationError, Logger } from "#general";
 import {
     CommissionableDevice,
     CommissionableDeviceIdentifiers,
@@ -18,6 +18,7 @@ import {
 import { DiscoveryCapabilitiesBitmap, NodeId, TypeFromPartialBitSchema } from "#types";
 import {
     CommissioningControllerOptions,
+    configureNetwork as configureControllerNetwork,
     ControllerEnvironmentOptions,
     NodeCommissioningOptions,
 } from "./CommissioningController.js";
@@ -77,31 +78,30 @@ export class PaseCommissioner {
             return this.controllerInstance;
         }
 
-        const { localPort, listeningAddressIpv4, listeningAddressIpv6, rootCertificateData, fabricData } = this.options;
+        const { rootCertificateData, fabricData } = this.options;
 
         let mdnsScanner: MdnsScanner | undefined;
         let ipv4Disabled = false;
-        let netInterfaceIpv4: UdpInterface | undefined;
-        let netInterfaceIpv6: UdpInterface | undefined;
 
         try {
             const mdnsService = await this.environment.load(MdnsService);
             ipv4Disabled = !mdnsService.enableIpv4;
             mdnsScanner = mdnsService.scanner;
-            if (!ipv4Disabled) {
-                netInterfaceIpv4 = await UdpInterface.create(Network.get(), "udp4", localPort, listeningAddressIpv4);
-            }
-            netInterfaceIpv6 = await UdpInterface.create(Network.get(), "udp6", localPort, listeningAddressIpv6);
         } catch {
             logger.debug("No networking available, using only BLE");
         }
 
+        const { scanners, netInterfaces } = await configureControllerNetwork({
+            mdnsScanner,
+            ipv4Disabled,
+            ...this.options,
+        });
+
         return await MatterController.createAsPaseCommissioner({
             rootCertificateData,
             fabricData,
-            netInterfaceIpv4,
-            netInterfaceIpv6,
-            mdnsScanner,
+            scanners,
+            netInterfaces,
         });
     }
 

package/src/cluster/server/AccessControlServer.ts

@@ -58,6 +58,7 @@ export const AccessControlClusterHandler: () => ClusterServerHandlers<typeof Acc
                 AccessControlCluster,
                 "acl",
                 new Array<TypeFromBitmapSchema<typeof AccessControl.TlvAccessControlEntry>>(),
+                MatterDevice.of(session).getFabrics(),
             );
         },
 
@@ -248,6 +249,7 @@ export const AccessControlClusterHandler: () => ClusterServerHandlers<typeof Acc
                 AccessControlCluster,
                 "extension",
                 new Array<AclExtensionEntry>(),
+                MatterDevice.of(session).getFabrics(),
             );
         },
 

package/src/cluster/server/AdministratorCommissioningServer.ts

@@ -168,7 +168,7 @@ class AdministratorCommissioningManager {
 
         await device.allowEnhancedCommissioning(
             discriminator,
-            PaseServer.fromVerificationValue(pakeVerifier, { iterations, salt }),
+            PaseServer.fromVerificationValue(device.sessionManager, pakeVerifier, { iterations, salt }),
             () => {
                 session.associatedFabric.deleteRemoveCallback(this.fabricRemoveHandler);
                 this.endCommissioning();

package/src/cluster/server/ClusterServer.ts

@@ -121,6 +121,10 @@ export function ClusterServer<const T extends ClusterType, const H extends Clust
             return datasource?.eventHandler;
         },
 
+        get fabrics() {
+            return datasource?.fabrics ?? [];
+        },
+
         increaseVersion() {
             return datasource?.increaseVersion() ?? 0;
         },

package/src/cluster/server/ClusterServerTypes.ts

@@ -13,8 +13,8 @@ import {
     Fabric,
     FabricScopedAttributeServer,
     FixedAttributeServer,
-    MatterDeviceSession,
     Message,
+    Session,
 } from "#protocol";
 import {
     Attribute,
@@ -91,20 +91,20 @@ type AttributeGetters<A extends Attributes> = {
     [P in keyof A as `${string & P}AttributeGetter`]?: (args: {
         attributes: AttributeServers<A>;
         endpoint?: Endpoint;
-        session?: MatterDeviceSession;
+        session?: Session;
         isFabricFiltered?: boolean;
     }) => AttributeJsType<A[P]>;
 };
 type AttributeSetters<A extends Attributes> = {
     [P in keyof A as `${string & P}AttributeSetter`]?: (
         value: AttributeJsType<A[P]>,
-        args: { attributes: AttributeServers<A>; endpoint?: Endpoint; session?: MatterDeviceSession },
+        args: { attributes: AttributeServers<A>; endpoint?: Endpoint; session?: Session },
     ) => boolean;
 };
 type AttributeValidators<A extends Attributes> = {
     [P in keyof A as `${string & P}AttributeValidator`]?: (
         value: AttributeJsType<A[P]>,
-        args: { attributes: AttributeServers<A>; endpoint?: Endpoint; session?: MatterDeviceSession },
+        args: { attributes: AttributeServers<A>; endpoint?: Endpoint; session?: Session },
     ) => void;
 };
 export type CommandHandler<
@@ -117,7 +117,7 @@ export type CommandHandler<
               request: RequestT;
               attributes: AS;
               events: ES;
-              session: MatterDeviceSession;
+              session: Session;
               message: Message;
               endpoint: Endpoint;
           }) => Promise<ResponseT> | ResponseT

package/src/cluster/server/OperationalCredentialsServer.ts

@@ -14,7 +14,6 @@ import {
     CertificateError,
     DeviceCertification,
     FabricTableFullError,
-    FailsafeContext,
     MatterDevice,
     MatterFabricConflictError,
     MatterFabricInvalidAdminSubjectError,
@@ -65,10 +64,10 @@ OperationalCredentials.Cluster.commands = {
     ),
 };
 
-export const OperationalCredentialsClusterHandler: (
+export const OperationalCredentialsClusterHandler = (
     certificates: DeviceCertification.Definition,
     productDescription?: ProductDescription,
-) => ClusterServerHandlers<typeof OperationalCredentials.Cluster> = (certificates, productDescription) => {
+): ClusterServerHandlers<typeof OperationalCredentials.Cluster> => {
     let certification: DeviceCertification | undefined = undefined;
     const cert = () => {
         if (certification !== undefined) {
@@ -150,7 +149,7 @@ export const OperationalCredentialsClusterHandler: (
             if (!session.isSecure)
                 throw new MatterFlowError("addOperationalCert should be called on a secure session.");
 
-            const failsafeContext = FailsafeContext.of(session);
+            const failsafeContext = MatterDevice.of(session).failsafeContext;
 
             if (failsafeContext.fabricIndex !== undefined) {
                 throw new StatusResponseError(
@@ -180,7 +179,7 @@ export const OperationalCredentialsClusterHandler: (
                 );
             }
 
-            if (session.context.getFabrics().length === supportedFabrics.getLocal()) {
+            if (MatterDevice.of(session).getFabrics().length === supportedFabrics.getLocal()) {
                 return {
                     statusCode: OperationalCredentials.NodeOperationalCertStatus.TableFull,
                     debugText: `No more fabrics can be added because limit ${supportedFabrics.getLocal()} reached.`,
@@ -281,7 +280,7 @@ export const OperationalCredentialsClusterHandler: (
 
         fabricsAttributeGetter: ({ session, isFabricFiltered }) => {
             if (session === undefined || !session.isSecure) return []; // ???
-            const fabrics = isFabricFiltered ? [session.associatedFabric] : session.context.getFabrics();
+            const fabrics = isFabricFiltered ? [session.associatedFabric] : MatterDevice.of(session).getFabrics();
 
             return fabrics.map(fabric => ({
                 fabricId: fabric.fabricId,
@@ -300,7 +299,7 @@ export const OperationalCredentialsClusterHandler: (
 
         nocsAttributeGetter: ({ session, isFabricFiltered }) => {
             if (session === undefined || !session.isSecure) return []; // ???
-            const fabrics = isFabricFiltered ? [session.associatedFabric] : session.context.getFabrics();
+            const fabrics = isFabricFiltered ? [session.associatedFabric] : MatterDevice.of(session).getFabrics();
             return fabrics.map(fabric => ({
                 noc: fabric.operationalCert,
                 icac: fabric.intermediateCACert ?? null,
@@ -315,7 +314,7 @@ export const OperationalCredentialsClusterHandler: (
 
         commissionedFabricsAttributeGetter: ({ session }) => {
             if (session === undefined || !session.isSecure) return 0; // ???
-            return session.context.getFabrics().length;
+            return MatterDevice.of(session).getFabrics().length;
         },
 
         trustedRootCertificatesAttributeGetter: ({ session }) => {
@@ -326,7 +325,9 @@ export const OperationalCredentialsClusterHandler: (
             if (!session.isSecure)
                 throw new MatterFlowError("addOperationalCert should be called on a secure session.");
 
-            const rootCerts = session.context.getFabrics().map(fabric => fabric.rootCert);
+            const rootCerts = MatterDevice.of(session)
+                .getFabrics()
+                .map(fabric => fabric.rootCert);
 
             const device = MatterDevice.of(session);
             if (device.isFailsafeArmed()) {
@@ -354,7 +355,7 @@ export const OperationalCredentialsClusterHandler: (
             // Assert associated fabric is present
             session.associatedFabric;
 
-            const failsafeContext = FailsafeContext.of(session);
+            const failsafeContext = MatterDevice.of(session).failsafeContext;
 
             if (failsafeContext.fabricIndex !== undefined) {
                 throw new StatusResponseError(
@@ -430,8 +431,7 @@ export const OperationalCredentialsClusterHandler: (
 
             const fabric = session.associatedFabric;
             const currentFabricIndex = fabric.fabricIndex;
-            const device = session.context;
-            const conflictingLabelFabric = device
+            const conflictingLabelFabric = MatterDevice.of(session)
                 .getFabrics()
                 .find(f => f.label === label && f.fabricIndex !== currentFabricIndex);
             if (conflictingLabelFabric !== undefined) {
@@ -487,7 +487,7 @@ export const OperationalCredentialsClusterHandler: (
         }) => {
             assertSecureSession(session);
 
-            const failsafeContext = FailsafeContext.of(session);
+            const failsafeContext = MatterDevice.of(session).failsafeContext;
 
             if (failsafeContext.hasRootCert) {
                 throw new StatusResponseError(

package/src/compat/interaction.ts

@@ -4,19 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Specification } from "#model";
+
 export {
-    DEFAULT_MAX_PATHS_PER_INVOKE,
-    EventHandler,
-    INTERACTION_MODEL_REVISION,
-    INTERACTION_PROTOCOL_ID,
-    IncomingInteractionClientMessenger,
-    InteractionClient,
-    InteractionClientMessenger,
-    InteractionEndpointStructure,
-    InteractionServer,
-    MessageType,
-    SubscriptionHandler,
-    SubscriptionOptions,
     attributePathToId,
     canAttributePayloadBeChunked,
     chunkAttributePayload,
@@ -29,9 +19,16 @@ export {
     decodeUnknownEventValue,
     encodeAttributePayload,
     encodeEventPayload,
+    EventHandler,
     eventPathToId,
     expandPathsInAttributeData,
     genericElementPathToId,
+    IncomingInteractionClientMessenger,
+    InteractionClient,
+    InteractionClientMessenger,
+    InteractionEndpointStructure,
+    InteractionServer,
+    MessageType,
     normalizeAndDecodeAttributeData,
     normalizeAndDecodeEventData,
     normalizeAndDecodeReadAttributeReport,
@@ -40,6 +37,8 @@ export {
     normalizeEventData,
     sortAttributeDataByPath,
     structureReadAttributeDataToClusterObject,
+    ServerSubscription as SubscriptionHandler,
+    ServerSubscriptionConfig as SubscriptionOptions,
     validateReadAttributesPath,
     validateReadEventPath,
     type AttributePath,
@@ -67,5 +66,7 @@ export {
     type WriteRequest,
     type WriteResponse,
 } from "#protocol";
-export { StatusResponseError } from "@matter.js/types";
+export { DEFAULT_MAX_PATHS_PER_INVOKE, INTERACTION_PROTOCOL_ID, StatusResponseError } from "#types";
 export * from "@matter.js/types/protocol";
+
+export const INTERACTION_MODEL_REVISION = Specification.INTERACTION_MODEL_REVISION;

package/src/compat/protocol.ts

@@ -8,8 +8,7 @@ export {
     ChannelManager,
     ChannelNotConnectedError,
     CommissioningError,
-    CommissioningSuccessfullyFinished,
-    ControllerCommissioner,
+    ControllerCommissioningFlow as ControllerCommissioner,
     ControllerDiscovery,
     DiscoveryError,
     DuplicateMessageError,
@@ -28,7 +27,7 @@ export {
     NoChannelError,
     PairRetransmissionLimitReachedError,
     UnexpectedMessageError,
-    type ControllerCommissioningOptions as CommissioningOptions,
+    type ControllingCommissioningFlowOptions as CommissioningOptions,
     type ExchangeSendOptions,
     type ProtocolHandler,
 } from "#protocol";

package/src/compat/securechannel.ts

@@ -8,12 +8,11 @@ export {
     ChannelStatusResponseError,
     DEFAULT_NORMAL_PROCESSING_TIME_MS,
     EXPECTED_CRYPTO_PROCESSING_TIME_MS,
-    GeneralStatusCode,
-    ProtocolStatusCode,
     SecureChannelMessenger,
     SecureChannelProtocol,
     SecureChannelStatusMessageSchema,
-    SecureMessageType,
     StatusReportOnlySecureChannelProtocol,
     type StatusMessage,
 } from "#protocol";
+
+export { GeneralStatusCode, ProtocolStatusCode, SecureMessageType } from "#types";

package/src/compat/util.ts

@@ -11,7 +11,7 @@ export {
     EventEmitter,
     MaybePromise,
     Observable,
-    Queue,
+    DataReadQueue as Queue,
     camelize,
     createPromise,
     deepCopy,

package/src/device/LegacyInteractionServer.ts

@@ -20,6 +20,7 @@ import {
     EventPath,
     EventStorageData,
     FabricScopedAttributeServer,
+    InteractionContext,
     InteractionEndpointStructure,
     InteractionServer,
     Message,
@@ -40,10 +41,9 @@ export class LegacyInteractionServer extends InteractionServer {
     #endpointStructure: InteractionEndpointStructure;
     #aclManager?: AccessControlManager;
 
-    constructor(config: InteractionServer.Configuration) {
-        const { endpointStructure } = config;
-        super(config);
-        this.#endpointStructure = endpointStructure;
+    constructor(context: InteractionContext) {
+        super(context);
+        this.#endpointStructure = context.structure;
     }
 
     #getAclManager(session: Session) {

package/src/device/PairedNode.ts

@@ -14,7 +14,6 @@ import {
     MatterError,
     Time,
 } from "#general";
-import { NodeDiscoveryType } from "#MatterController.js";
 import {
     AttributeClientValues,
     ChannelStatusResponseError,
@@ -25,6 +24,7 @@ import {
     EndpointInterface,
     EndpointLoggingOptions,
     InteractionClient,
+    NodeDiscoveryType,
     PaseClient,
     logEndpoint,
     structureReadAttributeDataToClusterObject,