@project-chip/matter.js 0.4.0 → 0.5.0

package/dist/es/cluster/server/ClusterServerTypes.d.ts

@@ -0,0 +1,223 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Message } from "../../codec/MessageCodec.js";
+import { ClusterId } from "../../datatype/ClusterId.js";
+import { Endpoint } from "../../device/Endpoint.js";
+import { Fabric } from "../../fabric/Fabric.js";
+import { MatterDevice } from "../../MatterDevice.js";
+import { EventHandler } from "../../protocol/interaction/EventHandler.js";
+import { BitSchema } from "../../schema/BitmapSchema.js";
+import { Session } from "../../session/Session.js";
+import { StorageContext } from "../../storage/StorageContext.js";
+import { TypeFromSchema } from "../../tlv/TlvSchema.js";
+import { Merge } from "../../util/Type.js";
+import { ClusterClientObj } from "../client/ClusterClientTypes.js";
+import { Attribute, AttributeJsType, Attributes, Cluster, Command, Commands, Events, EventType, FabricScopedAttribute, FixedAttribute, GlobalAttributes, MandatoryAttributeNames, MandatoryEventNames, OptionalAttribute, OptionalAttributeNames, OptionalCommand, OptionalEventNames, OptionalFixedAttribute, OptionalWritableAttribute, OptionalWritableFabricScopedAttribute, RequestType, ResponseType, WritableAttribute, WritableFabricScopedAttribute } from "../Cluster.js";
+import { Scenes } from "../definitions/ScenesCluster.js";
+import { AttributeServer, FabricScopedAttributeServer, FixedAttributeServer } from "./AttributeServer.js";
+import { CommandServer } from "./CommandServer.js";
+import { EventServer } from "./EventServer.js";
+/** Cluster attributes accessible on the cluster server */
+type MandatoryAttributeServers<A extends Attributes> = Omit<{
+    [P in MandatoryAttributeNames<A>]: A[P] extends FabricScopedAttribute<any, any> ? FabricScopedAttributeServer<AttributeJsType<A[P]>> : A[P] extends WritableFabricScopedAttribute<any, any> ? FabricScopedAttributeServer<AttributeJsType<A[P]>> : A[P] extends FixedAttribute<any, any> ? FixedAttributeServer<AttributeJsType<A[P]>> : AttributeServer<AttributeJsType<A[P]>>;
+}, keyof GlobalAttributes<any>>;
+type OptionalAttributeServers<A extends Attributes> = {
+    [P in OptionalAttributeNames<A>]?: A[P] extends OptionalWritableFabricScopedAttribute<any, any> ? FabricScopedAttributeServer<AttributeJsType<A[P]>> : A[P] extends OptionalFixedAttribute<any, any> ? FixedAttributeServer<AttributeJsType<A[P]>> : AttributeServer<AttributeJsType<A[P]>>;
+};
+export type AttributeServers<A extends Attributes> = Merge<MandatoryAttributeServers<A>, OptionalAttributeServers<A>>;
+/** Initial values for the cluster attribute */
+export type AttributeInitialValues<A extends Attributes> = Merge<Omit<{
+    [P in MandatoryAttributeNames<A>]: AttributeJsType<A[P]>;
+}, keyof GlobalAttributes<any>>, {
+    [P in OptionalAttributeNames<A>]?: AttributeJsType<A[P]>;
+}>;
+export type AttributeServerValues<A extends Attributes> = Merge<{
+    [P in MandatoryAttributeNames<A>]: AttributeJsType<A[P]>;
+}, {
+    [P in OptionalAttributeNames<A>]?: AttributeJsType<A[P]>;
+}>;
+type MandatoryCommandNames<C extends Commands> = {
+    [K in keyof C]: C[K] extends OptionalCommand<any, any, any> ? never : K;
+}[keyof C];
+type OptionalCommandNames<C extends Commands> = {
+    [K in keyof C]: C[K] extends OptionalCommand<any, any, any> ? K : never;
+}[keyof C];
+type AttributeGetters<A extends Attributes> = {
+    [P in keyof A as `${string & P}AttributeGetter`]?: (args: {
+        attributes: AttributeServers<A>;
+        endpoint?: Endpoint;
+        session?: Session<MatterDevice>;
+        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?: Session<MatterDevice>;
+    }) => 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?: Session<MatterDevice>;
+    }) => void;
+};
+export type CommandHandler<C extends Command<any, any, any>, AS extends AttributeServers<any>, ES extends EventServers<any>> = C extends Command<infer RequestT, infer ResponseT, any> ? (args: {
+    request: RequestT;
+    attributes: AS;
+    events: ES;
+    session: Session<MatterDevice>;
+    message: Message;
+    endpoint: Endpoint;
+}) => Promise<ResponseT> | ResponseT : never;
+type CommandHandlers<T extends Commands, AS extends AttributeServers<any>, ES extends EventServers<any>> = Merge<{
+    [P in MandatoryCommandNames<T>]: CommandHandler<T[P], AS, ES>;
+}, {
+    [P in OptionalCommandNames<T>]?: CommandHandler<T[P], AS, ES>;
+}>;
+/** Handlers to process cluster commands */
+type AttributeHandlers<A extends Attributes> = Merge<AttributeGetters<A>, Merge<AttributeSetters<A>, AttributeValidators<A>>>;
+export type ClusterServerHandlers<C extends Cluster<any, any, any, any, any>> = Merge<CommandHandlers<C["commands"], AttributeServers<C["attributes"]>, EventServers<C["events"]>>, AttributeHandlers<C["attributes"]>>;
+export type CommandServers<C extends Commands> = Merge<{
+    [P in MandatoryCommandNames<C>]: CommandServer<RequestType<C[P]>, ResponseType<C[P]>>;
+}, {
+    [P in OptionalCommandNames<C>]?: CommandServer<RequestType<C[P]>, ResponseType<C[P]>>;
+}>;
+type OptionalAttributeConf<T extends Attributes> = {
+    [K in OptionalAttributeNames<T>]?: true;
+};
+type MakeAttributeMandatory<A extends Attribute<any, any>> = A extends OptionalWritableFabricScopedAttribute<infer T, any> ? WritableFabricScopedAttribute<T, any> : A extends OptionalWritableAttribute<infer T, any> ? WritableAttribute<T, any> : A extends OptionalAttribute<infer T, any> ? Attribute<T, any> : A;
+type MakeAttributesMandatory<T extends Attributes, C extends OptionalAttributeConf<T>> = {
+    [K in keyof T]: K extends keyof C ? MakeAttributeMandatory<T[K]> : T[K];
+};
+declare const MakeAttributesMandatory: <T extends Attributes, C extends OptionalAttributeConf<T>>(attributes: T, conf: C) => MakeAttributesMandatory<T, C>;
+type UseOptionalAttributes<C extends Cluster<any, any, any, any, any>, A extends OptionalAttributeConf<C["attributes"]>> = Cluster<C["features"], C["supportedFeatures"], MakeAttributesMandatory<C["attributes"], A>, C["commands"], C["events"]>; /** Forces the presence of the specified optional attributes, so they can be used in the command handlers */
+/** Forces the presence of the specified optional attributes, so they can be used in the command handlers */
+export declare const UseOptionalAttributes: <C extends Cluster<any, any, any, any, any>, A extends OptionalAttributeConf<C["attributes"]>>(cluster: C, conf: A) => UseOptionalAttributes<C, A>;
+export type FabricScopedAttributeNames<A extends Attributes> = {
+    [K in keyof A]: A[K] extends FabricScopedAttribute<any, any> ? K : A[K] extends WritableFabricScopedAttribute<any, any> ? K : A[K] extends OptionalWritableFabricScopedAttribute<any, any> ? K : never;
+}[keyof A];
+export type NonFixedAttributeNames<A extends Attributes> = {
+    [K in keyof A]: A[K] extends FixedAttribute<any, any> ? never : A[K] extends OptionalFixedAttribute<any, any> ? never : K;
+}[keyof A];
+type GetterTypeFromSpec<A extends Attribute<any, any>> = A extends OptionalAttribute<infer T, any> ? T | undefined : AttributeJsType<A>;
+type ServerAttributeGetters<A extends Attributes> = {
+    [P in MandatoryAttributeNames<A> as `get${Capitalize<string & P>}Attribute`]: () => GetterTypeFromSpec<A[P]>;
+} & {
+    [P in OptionalAttributeNames<A> as `get${Capitalize<string & P>}Attribute`]?: () => GetterTypeFromSpec<A[P]>;
+} & {
+    [P in FabricScopedAttributeNames<A> as `get${Capitalize<string & P>}Attribute`]: (fabric: Fabric) => GetterTypeFromSpec<A[P]>;
+};
+type ServerAttributeSetters<A extends Attributes> = {
+    [P in NonFixedAttributeNames<A> as `set${Capitalize<string & P>}Attribute`]: (value: AttributeJsType<A[P]>) => void;
+} & {
+    [P in FabricScopedAttributeNames<A> as `set${Capitalize<string & P>}Attribute`]: (value: AttributeJsType<A[P]>, fabric: Fabric) => void;
+};
+type ServerAttributeSubscribers<A extends Attributes> = {
+    [P in NonFixedAttributeNames<A> as `subscribe${Capitalize<string & P>}Attribute`]: (listener: (newValue: AttributeJsType<A[P]>, oldValue: AttributeJsType<A[P]>) => void) => void;
+} & {
+    [P in FabricScopedAttributeNames<A> as `subscribe${Capitalize<string & P>}Attribute`]: (listener: (newValue: AttributeJsType<A[P]>, oldValue: AttributeJsType<A[P]>) => void, fabric: Fabric) => void;
+};
+export type EventServers<E extends Events> = Merge<{
+    [P in MandatoryEventNames<E>]: EventServer<EventType<E[P]>>;
+}, {
+    [P in OptionalEventNames<E>]?: EventServer<EventType<E[P]>>;
+}>;
+type ServerEventTriggers<E extends Events> = {
+    [P in MandatoryEventNames<E> as `trigger${Capitalize<string & P>}Event`]: (event: EventType<E[P]>) => void;
+} & {
+    [P in OptionalEventNames<E> as `trigger${Capitalize<string & P>}Event`]?: (event: EventType<E[P]>) => void;
+};
+export type SupportedEventsList<E extends Events> = Merge<{
+    [P in MandatoryEventNames<E>]: true;
+}, {
+    [P in OptionalEventNames<E>]?: boolean;
+}>;
+export type ClusterServerObjForCluster<C extends Cluster<any, any, any, any, any>> = ClusterServerObj<C["attributes"], C["events"]>;
+export type ClusterServerObj<A extends Attributes, E extends Events> = {
+    /**
+     * Cluster ID
+     * @readonly
+     */
+    id: ClusterId;
+    /**
+     * Cluster name
+     * @readonly
+     */
+    readonly name: string;
+    /**
+     * Cluster type
+     * @private
+     * @readonly
+     */
+    _type: "ClusterServer";
+    /**
+     * Cluster data version
+     * @readonly
+     */
+    readonly clusterDataVersion: number;
+    /**
+     * Cluster attributes as named object that can be used to programmatically work with available attributes
+     * @readonly
+     */
+    readonly attributes: AttributeServers<A>;
+} & ServerAttributeGetters<A> & ServerAttributeSetters<A> & ServerAttributeSubscribers<A> & ServerEventTriggers<E>;
+/** Strongly typed interface of a cluster server */
+export type ClusterServerObjInternal<A extends Attributes, C extends Commands, E extends Events> = ClusterServerObj<A, E> & {
+    /**
+     * Cluster commands as array
+     * @private
+     * @readonly
+     */
+    readonly _commands: CommandServers<C>;
+    /**
+     * Cluster events as named object
+     * @private
+     * @readonly
+     */
+    readonly _events: EventServers<E>;
+    /**
+     * Assign this cluster to a specific endpoint
+     * @private
+     *
+     * @param endpoint Endpoint to assign to
+     */
+    readonly _assignToEndpoint: (endpoint: Endpoint) => void;
+    /**
+     * Register an event handler for this cluster
+     * @private
+     *
+     * @param eventHandler
+     */
+    readonly _registerEventHandler: (eventHandler: EventHandler) => void;
+    /**
+     * Set Storage context used by this cluster
+     * @private
+     */
+    readonly _setStorage: (storageContext: StorageContext) => void;
+    /**
+     * Get the Scene Extension Fields for this cluster. Used by the Scenes cluster.
+     * @private
+     */
+    readonly _getSceneExtensionFieldSets: () => TypeFromSchema<typeof Scenes.TlvAttributeValuePair>[];
+    /**
+     * Set the Scene Extension Fields for this cluster. Used by the Scenes cluster.
+     * @private
+     */
+    readonly _setSceneExtensionFieldSets: (values: TypeFromSchema<typeof Scenes.TlvAttributeValuePair>[], transitionTime: number) => void;
+    /**
+     * Verify if a set of Scene Extension Fields match to the current attribute state for this cluster. Used by the Scenes cluster.
+     * @private
+     */
+    readonly _verifySceneExtensionFieldSets: (values: TypeFromSchema<typeof Scenes.TlvAttributeValuePair>[]) => boolean;
+};
+export declare function isClusterServer<F extends BitSchema, A extends Attributes, C extends Commands, E extends Events>(obj: ClusterClientObj<F, A, C, E> | ClusterServerObj<A, E>): obj is ClusterServerObj<A, E>;
+export declare function isClusterServerInternal<F extends BitSchema, A extends Attributes, C extends Commands, E extends Events>(obj: ClusterClientObj<F, A, C, E> | ClusterServerObj<A, E>): obj is ClusterServerObjInternal<A, C, E>;
+export declare function asClusterServerInternal<A extends Attributes, E extends Events>(obj: ClusterServerObj<A, E>): ClusterServerObjInternal<A, Commands, E>;
+export {};
+//# sourceMappingURL=ClusterServerTypes.d.ts.map

package/dist/es/cluster/server/ClusterServerTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClusterServerTypes.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/ClusterServerTypes.ts"],"names":[],"mappings":"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"}

package/dist/es/cluster/server/ClusterServerTypes.js

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const MakeAttributesMandatory = (attributes, conf) => {
+    const result = Object.assign({}, attributes);
+    for (const key in conf) {
+        result[key] = Object.assign(Object.assign({}, result[key]), { optional: false });
+    }
+    return result;
+};
+/** Forces the presence of the specified optional attributes, so they can be used in the command handlers */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+export const UseOptionalAttributes = (cluster, conf) => (Object.assign(Object.assign({}, cluster), { attributes: MakeAttributesMandatory(cluster.attributes, conf) }));
+export function isClusterServer(obj) {
+    return obj._type === "ClusterServer";
+}
+export function isClusterServerInternal(obj) {
+    return obj._type === "ClusterServer";
+}
+export function asClusterServerInternal(obj) {
+    if (!isClusterServerInternal(obj)) {
+        throw new Error("Object is not a ClusterServerObj instance.");
+    }
+    return obj;
+}
+//# sourceMappingURL=ClusterServerTypes.js.map

package/dist/es/cluster/server/ClusterServerTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClusterServerTypes.js","sourceRoot":"","sources":["../../../../src/cluster/server/ClusterServerTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwJH,MAAM,uBAAuB,GAAG,CAC5B,UAAa,EACb,IAAO,EACsB,EAAE;IAC/B,MAAM,MAAM,GAAG,kBAAiB,UAAU,CAAE,CAAC;IAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACnB,MAAc,CAAC,GAAG,CAAC,mCAAQ,MAAM,CAAC,GAAG,CAAC,KAAE,QAAQ,EAAE,KAAK,GAAE,CAAC;KAC9D;IACD,OAAO,MAAuC,CAAC;AACnD,CAAC,CAAC;AAWF,4GAA4G;AAC5G,sDAAsD;AACtD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAIjC,OAAU,EACV,IAAO,EACoB,EAAE,CAAC,iCAAM,OAAO,KAAE,UAAU,EAAE,uBAAuB,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,IAAG,CAAC;AAoKlH,MAAM,UAAU,eAAe,CAC3B,GAA0D;IAE1D,OAAO,GAAG,CAAC,KAAK,KAAK,eAAe,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,uBAAuB,CAKrC,GAA0D;IACxD,OAAO,GAAG,CAAC,KAAK,KAAK,eAAe,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,GAA2B;IAE3B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KACjE;IACD,OAAO,GAAG,CAAC;AACf,CAAC"}

package/dist/es/cluster/server/CommandServer.d.ts

@@ -3,23 +3,24 @@
  * Copyright 2022-2023 Project CHIP Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { Message } from "../../codec/MessageCodec.js";
+import { CommandId } from "../../datatype/CommandId.js";
+import { Endpoint } from "../../device/Endpoint.js";
 import { MatterDevice } from "../../MatterDevice.js";
+import { StatusCode } from "../../protocol/interaction/InteractionProtocol.js";
 import { Session } from "../../session/Session.js";
 import { TlvSchema, TlvStream } from "../../tlv/TlvSchema.js";
-import { Message } from "../../codec/MessageCodec.js";
-import { StatusCode } from "../../protocol/interaction/InteractionProtocol.js";
-import { Endpoint } from "../../device/Endpoint.js";
 export declare class CommandServer<RequestT, ResponseT> {
-    readonly invokeId: number;
-    readonly responseId: number;
+    readonly invokeId: CommandId;
+    readonly responseId: CommandId;
     readonly name: string;
     readonly requestSchema: TlvSchema<RequestT>;
     readonly responseSchema: TlvSchema<ResponseT>;
     protected readonly handler: (request: RequestT, session: Session<MatterDevice>, message: Message, endpoint: Endpoint) => Promise<ResponseT> | ResponseT;
-    constructor(invokeId: number, responseId: number, name: string, requestSchema: TlvSchema<RequestT>, responseSchema: TlvSchema<ResponseT>, handler: (request: RequestT, session: Session<MatterDevice>, message: Message, endpoint: Endpoint) => Promise<ResponseT> | ResponseT);
+    constructor(invokeId: CommandId, responseId: CommandId, name: string, requestSchema: TlvSchema<RequestT>, responseSchema: TlvSchema<ResponseT>, handler: (request: RequestT, session: Session<MatterDevice>, message: Message, endpoint: Endpoint) => Promise<ResponseT> | ResponseT);
     invoke(session: Session<MatterDevice>, args: TlvStream, message: Message, endpoint: Endpoint): Promise<{
         code: StatusCode;
-        responseId: number;
+        responseId: CommandId;
         response: TlvStream;
     }>;
 }

package/dist/es/cluster/server/CommandServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandServer.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/CommandServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIpD,qBAAa,aAAa,CAAC,QAAQ,EAAE,SAAS;IAEtC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,QAAQ,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;gBAL9I,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,SAAS,CAAC,QAAQ,CAAC,EAClC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC,EAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;IAGrJ,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC;CAO9K"}
+{"version":3,"file":"CommandServer.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/CommandServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAI9D,qBAAa,aAAa,CAAC,QAAQ,EAAE,SAAS;IAEtC,QAAQ,CAAC,QAAQ,EAAE,SAAS;IAC5B,QAAQ,CAAC,UAAU,EAAE,SAAS;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,QAAQ,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,KACjB,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;gBAV1B,QAAQ,EAAE,SAAS,EACnB,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,SAAS,CAAC,QAAQ,CAAC,EAClC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC,EAC1B,OAAO,EAAE,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,KACjB,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;IAGjC,MAAM,CACR,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAC9B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,GACnB,OAAO,CAAC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,UAAU,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC;CAW/E"}

package/dist/es/cluster/server/CommandServer.js

@@ -29,7 +29,11 @@ export class CommandServer {
             logger.debug(`Invoke ${this.name} with data ${Logger.toJSON(request)}`);
             const response = yield this.handler(request, session, message, endpoint);
             logger.debug(`Invoke ${this.name} response : ${Logger.toJSON(response)}`);
-            return { code: 0 /* StatusCode.Success */, responseId: this.responseId, response: this.responseSchema.encodeTlv(response) };
+            return {
+                code: 0 /* StatusCode.Success */,
+                responseId: this.responseId,
+                response: this.responseSchema.encodeTlv(response),
+            };
         });
     }
 }

package/dist/es/cluster/server/CommandServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandServer.js","sourceRoot":"","sources":["../../../../src/cluster/server/CommandServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;AAMH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAE3C,MAAM,OAAO,aAAa;IACtB,YACa,QAAgB,EAChB,UAAkB,EAClB,IAAY,EACZ,aAAkC,EAClC,cAAoC,EAC1B,OAAoI;QAL9I,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,SAAI,GAAJ,IAAI,CAAQ;QACZ,kBAAa,GAAb,aAAa,CAAqB;QAClC,mBAAc,GAAd,cAAc,CAAsB;QAC1B,YAAO,GAAP,OAAO,CAA6H;IACvJ,CAAC;IAEC,MAAM,CAAC,OAA8B,EAAE,IAAe,EAAE,OAAgB,EAAE,QAAkB;;YAC9F,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,cAAc,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzE,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,eAAe,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC1E,OAAO,EAAE,IAAI,4BAAoB,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxH,CAAC;KAAA;CACJ"}
+{"version":3,"file":"CommandServer.js","sourceRoot":"","sources":["../../../../src/cluster/server/CommandServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAE3C,MAAM,OAAO,aAAa;IACtB,YACa,QAAmB,EACnB,UAAqB,EACrB,IAAY,EACZ,aAAkC,EAClC,cAAoC,EAC1B,OAKgB;QAV1B,aAAQ,GAAR,QAAQ,CAAW;QACnB,eAAU,GAAV,UAAU,CAAW;QACrB,SAAI,GAAJ,IAAI,CAAQ;QACZ,kBAAa,GAAb,aAAa,CAAqB;QAClC,mBAAc,GAAd,cAAc,CAAsB;QAC1B,YAAO,GAAP,OAAO,CAKS;IACpC,CAAC;IAEE,MAAM,CACR,OAA8B,EAC9B,IAAe,EACf,OAAgB,EAChB,QAAkB;;YAElB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,cAAc,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzE,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,IAAI,eAAe,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC1E,OAAO;gBACH,IAAI,4BAAoB;gBACxB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC;aACpD,CAAC;QACN,CAAC;KAAA;CACJ"}

package/dist/es/cluster/server/EventServer.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ClusterId } from "../../datatype/ClusterId.js";
+import { EventId } from "../../datatype/EventId.js";
+import { Endpoint } from "../../device/Endpoint.js";
+import { EventHandler, EventStorageData } from "../../protocol/interaction/EventHandler.js";
+import { TlvSchema } from "../../tlv/TlvSchema.js";
+import { EventPriority } from "../Cluster.js";
+export declare class EventServer<T> {
+    readonly id: EventId;
+    readonly clusterId: ClusterId;
+    readonly name: string;
+    readonly schema: TlvSchema<T>;
+    readonly priority: EventPriority;
+    private eventList;
+    private readonly listeners;
+    protected endpoint?: Endpoint;
+    protected eventHandler?: EventHandler;
+    constructor(id: EventId, clusterId: ClusterId, name: string, schema: TlvSchema<T>, priority: EventPriority);
+    assignToEndpoint(endpoint: Endpoint): void;
+    bindToEventHandler(eventHandler: EventHandler): void;
+    triggerEvent(data: T): void;
+    addListener(listener: (event: EventStorageData<T>) => void): void;
+    removeListener(listener: (event: EventStorageData<T>) => void): void;
+}
+//# sourceMappingURL=EventServer.d.ts.map

package/dist/es/cluster/server/EventServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventServer.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/EventServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAa,YAAY,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAI9C,qBAAa,WAAW,CAAC,CAAC;IAOlB,QAAQ,CAAC,EAAE,EAAE,OAAO;IACpB,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,aAAa;IAVpC,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqD;IAC/E,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC9B,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;gBAGzB,EAAE,EAAE,OAAO,EACX,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EACpB,QAAQ,EAAE,aAAa;IAGpC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ;IAMnC,kBAAkB,CAAC,YAAY,EAAE,YAAY;IAU7C,YAAY,CAAC,IAAI,EAAE,CAAC;IAqBpB,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,IAAI;IAI1D,cAAc,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,IAAI;CAMhE"}

package/dist/es/cluster/server/EventServer.js

@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { InternalError } from "../../common/MatterError.js";
+import { Time } from "../../time/Time.js";
+// TODO Add Fabric Scoped EventServer when needed
+export class EventServer {
+    constructor(id, clusterId, name, schema, priority) {
+        this.id = id;
+        this.clusterId = clusterId;
+        this.name = name;
+        this.schema = schema;
+        this.priority = priority;
+        this.eventList = new Array();
+        this.listeners = new Array();
+    }
+    assignToEndpoint(endpoint) {
+        this.endpoint = endpoint;
+    }
+    // TODO Try to get rid of that late binding and simply things again
+    //      potentially with refactoring out MatterDevice and MatterController
+    bindToEventHandler(eventHandler) {
+        this.eventHandler = eventHandler;
+        // Send all stored events to the new listener
+        for (const event of this.eventList) {
+            const finalEvent = this.eventHandler.pushEvent(event);
+            this.listeners.forEach(listener => listener(finalEvent));
+        }
+        this.eventList = [];
+    }
+    triggerEvent(data) {
+        if (this.endpoint === undefined || this.endpoint.id === undefined) {
+            throw new InternalError("Endpoint not assigned");
+        }
+        const event = {
+            eventId: this.id,
+            clusterId: this.clusterId,
+            endpointId: this.endpoint.id,
+            epochTimestamp: Time.nowMs(),
+            priority: this.priority,
+            data,
+        };
+        if (this.eventHandler === undefined) {
+            // As long as we have no eventManager, we store the events
+            this.eventList.push(event);
+        }
+        else {
+            const finalEvent = this.eventHandler.pushEvent(event);
+            this.listeners.forEach(listener => listener(finalEvent));
+        }
+    }
+    addListener(listener) {
+        this.listeners.push(listener);
+    }
+    removeListener(listener) {
+        const entryIndex = this.listeners.indexOf(listener);
+        if (entryIndex !== -1) {
+            this.listeners.splice(entryIndex, 1);
+        }
+    }
+}
+//# sourceMappingURL=EventServer.js.map

package/dist/es/cluster/server/EventServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventServer.js","sourceRoot":"","sources":["../../../../src/cluster/server/EventServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI1C,iDAAiD;AAEjD,MAAM,OAAO,WAAW;IAMpB,YACa,EAAW,EACX,SAAoB,EACpB,IAAY,EACZ,MAAoB,EACpB,QAAuB;QAJvB,OAAE,GAAF,EAAE,CAAS;QACX,cAAS,GAAT,SAAS,CAAW;QACpB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAc;QACpB,aAAQ,GAAR,QAAQ,CAAe;QAV5B,cAAS,GAAG,IAAI,KAAK,EAAgB,CAAC;QAC7B,cAAS,GAAG,IAAI,KAAK,EAAwC,CAAC;IAU5E,CAAC;IAEJ,gBAAgB,CAAC,QAAkB;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,mEAAmE;IACnE,0EAA0E;IAC1E,kBAAkB,CAAC,YAA0B;QACzC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,6CAA6C;QAC7C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;SAC5D;QACD,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,IAAO;QAChB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE;YAC/D,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAAC,CAAC;SACpD;QACD,MAAM,KAAK,GAAiB;YACxB,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC5B,cAAc,EAAE,IAAI,CAAC,KAAK,EAAE;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI;SACP,CAAC;QACF,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACjC,0DAA0D;YAC1D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC9B;aAAM;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,WAAW,CAAC,QAA8C;QACtD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,cAAc,CAAC,QAA8C;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;SACxC;IACL,CAAC;CACJ"}

package/dist/es/cluster/server/GeneralCommissioningServer.d.ts

@@ -3,7 +3,12 @@
  * Copyright 2022-2023 Project CHIP Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GeneralCommissioningCluster } from "../GeneralCommissioningCluster.js";
-import { ClusterServerHandlers } from "./ClusterServer.js";
-export declare const GeneralCommissioningClusterHandler: ClusterServerHandlers<typeof GeneralCommissioningCluster>;
+import { GeneralCommissioningCluster } from "../definitions/GeneralCommissioningCluster.js";
+import { ClusterServerHandlers } from "./ClusterServerTypes.js";
+export declare const GeneralCommissioningClusterHandler: (options?: {
+    /** Is the commissioner allowed to change the country code? */
+    allowCountryCodeChange?: boolean;
+    /** If set, only these country codes are allowed to be set when changing country is allowed. */
+    countryCodeWhitelist?: string[];
+}) => ClusterServerHandlers<typeof GeneralCommissioningCluster>;
 //# sourceMappingURL=GeneralCommissioningServer.d.ts.map

package/dist/es/cluster/server/GeneralCommissioningServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAsB,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,eAAO,MAAM,kCAAkC,EAAE,qBAAqB,CAAC,OAAO,2BAA2B,CAwDxG,CAAC"}
+{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/cluster/server/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAwB,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAClH,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,eAAO,MAAM,kCAAkC,EAAE,CAAC,OAAO,CAAC,EAAE;IACxD,8DAA8D;IAC9D,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,+FAA+F;IAC/F,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACnC,KAAK,qBAAqB,CAAC,OAAO,2BAA2B,CA+F5D,CAAC"}

package/dist/es/cluster/server/GeneralCommissioningServer.js

@@ -12,56 +12,88 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { ImplementationError, MatterFlowError } from "../../common/MatterError.js";
 import { Logger } from "../../log/Logger.js";
-const SuccessResponse = { errorCode: 0 /* CommissioningError.Ok */, debugText: "" };
+import { assertSecureSession } from "../../session/SecureSession.js";
+import { BasicInformationCluster } from "../definitions/BasicInformationCluster.js";
+const SuccessResponse = { errorCode: 0 /* GeneralCommissioning.CommissioningError.Ok */, debugText: "" };
 const logger = Logger.get("GeneralCommissioningClusterHandler");
-export const GeneralCommissioningClusterHandler = {
+export const GeneralCommissioningClusterHandler = options => ({
     armFailSafe: ({ request: { breadcrumb: breadcrumbStep }, attributes: { breadcrumb }, session }) => __awaiter(void 0, void 0, void 0, function* () {
         // TODO Add handling for ExpiryLengthSeconds field and Error handling, see 11.9.7.2
         session.getContext().armFailSafe();
-        breadcrumb.set(breadcrumbStep);
+        breadcrumb.setLocal(breadcrumbStep);
         return SuccessResponse;
     }),
-    setRegulatoryConfig: ({ request: { breadcrumb: breadcrumbStep, newRegulatoryConfig }, attributes: { breadcrumb, regulatoryConfig, /* locationCapability */ } }) => __awaiter(void 0, void 0, void 0, function* () {
-        /*
-        TODO: test this code before activating again
-        const locationCapabilityValue = locationCapability.get();
-
+    setRegulatoryConfig: ({ request: { breadcrumb: breadcrumbStep, newRegulatoryConfig, countryCode }, attributes: { breadcrumb, regulatoryConfig, locationCapability }, endpoint, }) => __awaiter(void 0, void 0, void 0, function* () {
+        const locationCapabilityValue = locationCapability.getLocal();
+        // Check and handle country code
+        const basicInformationCluster = endpoint.getClusterServer(BasicInformationCluster);
+        if (basicInformationCluster === undefined) {
+            throw new ImplementationError("BasicInformationCluster needs to be present on the root endpoint");
+        }
+        const currentLocationCountryCode = basicInformationCluster.getLocationAttribute();
+        if (currentLocationCountryCode !== countryCode) {
+            if ((options === null || options === void 0 ? void 0 : options.allowCountryCodeChange) === false && countryCode !== "XX") {
+                return {
+                    errorCode: 1 /* GeneralCommissioning.CommissioningError.ValueOutsideRange */,
+                    debugText: `Country code change not allowed: ${countryCode}`,
+                };
+            }
+            if ((options === null || options === void 0 ? void 0 : options.countryCodeWhitelist) !== undefined && !(options === null || options === void 0 ? void 0 : options.countryCodeWhitelist.includes(countryCode))) {
+                return {
+                    errorCode: 1 /* GeneralCommissioning.CommissioningError.ValueOutsideRange */,
+                    debugText: `Country code change not allowed: ${countryCode}`,
+                };
+            }
+            if (countryCode !== "XX") {
+                basicInformationCluster.setLocationAttribute(countryCode);
+            }
+        }
+        // Check and handle regulatory config for LocationCapability
         let validValues;
         switch (locationCapabilityValue) {
-            case (RegulatoryLocationType.Outdoor):
-                validValues = [RegulatoryLocationType.Outdoor];
+            case 1 /* GeneralCommissioning.RegulatoryLocationType.Outdoor */:
+                validValues = [1 /* GeneralCommissioning.RegulatoryLocationType.Outdoor */];
                 break;
-            case (RegulatoryLocationType.Indoor):
-                validValues = [RegulatoryLocationType.Indoor];
+            case 0 /* GeneralCommissioning.RegulatoryLocationType.Indoor */:
+                validValues = [0 /* GeneralCommissioning.RegulatoryLocationType.Indoor */];
                 break;
-            case (RegulatoryLocationType.IndoorOutdoor):
-                validValues = [RegulatoryLocationType.Indoor, RegulatoryLocationType.Outdoor, RegulatoryLocationType.IndoorOutdoor];
+            case 2 /* GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor */:
+                validValues = [
+                    0 /* GeneralCommissioning.RegulatoryLocationType.Indoor */,
+                    1 /* GeneralCommissioning.RegulatoryLocationType.Outdoor */,
+                    2 /* GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor */,
+                ];
                 break;
             default:
-                return { errorCode: CommissioningError.ValueOutsideRange, debugText: "Invalid regulatory location" };
+                return {
+                    errorCode: 1 /* GeneralCommissioning.CommissioningError.ValueOutsideRange */,
+                    debugText: `Invalid regulatory location: ${newRegulatoryConfig === 0 /* GeneralCommissioning.RegulatoryLocationType.Indoor */
+                        ? "Indoor"
+                        : "Outdoor"}`,
+                };
         }
-
         if (!validValues.includes(newRegulatoryConfig)) {
-            return { errorCode: CommissioningError.ValueOutsideRange, debugText: "Invalid regulatory location" };
+            return {
+                errorCode: 1 /* GeneralCommissioning.CommissioningError.ValueOutsideRange */,
+                debugText: `Invalid regulatory location: ${newRegulatoryConfig === 0 /* GeneralCommissioning.RegulatoryLocationType.Indoor */ ? "Indoor" : "Outdoor"}`,
+            };
         }
-        */
-        regulatoryConfig.set(newRegulatoryConfig);
-        // TODO countryCode should be set for the BasicInformationCluster.location!
-        breadcrumb.set(breadcrumbStep);
+        regulatoryConfig.setLocal(newRegulatoryConfig);
+        breadcrumb.setLocal(breadcrumbStep);
         return SuccessResponse;
     }),
     commissioningComplete: ({ session, attributes: { breadcrumb } }) => __awaiter(void 0, void 0, void 0, function* () {
         // TODO Add error handling as defined in 11.9.7.6
-        if (!session.isSecure())
-            throw new Error("commissioningComplete can only be called on a secure session");
+        assertSecureSession(session, "commissioningComplete can only be called on a secure session");
         const fabric = session.getFabric();
         if (fabric === undefined)
-            throw new Error("commissioningComplete is called but the fabric has not been defined yet");
-        breadcrumb.set(BigInt(0));
-        logger.info(`Commissioning completed on fabric #${fabric.fabricId.id} as node #${fabric.nodeId}.`);
+            throw new MatterFlowError("commissioningComplete is called but the fabric has not been defined yet");
+        breadcrumb.setLocal(BigInt(0));
+        logger.info(`Commissioning completed on fabric #${fabric.fabricId} as node #${fabric.nodeId}.`);
         session.getContext().completeCommission();
         return SuccessResponse;
     }),
-};
+});
 //# sourceMappingURL=GeneralCommissioningServer.js.map

package/dist/es/cluster/server/GeneralCommissioningServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneralCommissioningServer.js","sourceRoot":"","sources":["../../../../src/cluster/server/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,MAAM,eAAe,GAAG,EAAE,SAAS,+BAAuB,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,kCAAkC,GAA8D;IACzG,WAAW,EAAE,CAAO,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpG,mFAAmF;QAEnF,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC;QACnC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC/B,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAA;IAED,mBAAmB,EAAE,CAAO,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,mBAAmB,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,EAAE,EAAE,EAAE;QAEpK;;;;;;;;;;;;;;;;;;;;;;UAsBE;QAEF,gBAAgB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAE1C,2EAA2E;QAE3E,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC/B,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAA;IAED,qBAAqB,EAAE,CAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE;QACrE,iDAAiD;QAEjD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QACzG,MAAM,MAAM,GAAI,OAAuC,CAAC,SAAS,EAAE,CAAC;QACpE,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QACrH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,sCAAsC,MAAM,CAAC,QAAQ,CAAC,EAAE,aAAa,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAEnG,OAAO,CAAC,UAAU,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAE1C,OAAO,eAAe,CAAC;IAC3B,CAAC,CAAA;CACJ,CAAC"}
+{"version":3,"file":"GeneralCommissioningServer.js","sourceRoot":"","sources":["../../../../src/cluster/server/GeneralCommissioningServer.ts"],"names":[],"mappings":"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"}

package/dist/es/cluster/server/GroupKeyManagementServer.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2023 Project CHIP Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ClusterServerHandlers } from "./ClusterServer.js";
-import { GroupKeyManagementCluster } from "../GroupKeyManagementCluster.js";
+import { GroupKeyManagementCluster } from "../definitions/GroupKeyManagementCluster.js";
+import { ClusterServerHandlers } from "./ClusterServerTypes.js";
 export declare const GroupKeyManagementClusterHandler: () => ClusterServerHandlers<typeof GroupKeyManagementCluster>;
 //# sourceMappingURL=GroupKeyManagementServer.d.ts.map