@matter/types 0.14.0 → 0.14.1-alpha.0-20250606-a9bcd03f9

package/dist/cjs/datatype/FabricId.d.ts

@@ -13,6 +13,9 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
  */
 export type FabricId = Branded<bigint, "FabricId">;
 export declare function FabricId(value: bigint | number): FabricId;
+export declare namespace FabricId {
+    const NO_FABRIC: FabricId;
+}
 /** Tlv schema for a Node Identifier. */
 export declare const TlvFabricId: TlvWrapper<FabricId, number | bigint>;
 //# sourceMappingURL=FabricId.d.ts.map

package/dist/cjs/datatype/FabricId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FabricId.d.ts","sourceRoot":"","sources":["../../../src/datatype/FabricId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAY,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAEzD;AAED,wCAAwC;AACxC,eAAO,MAAM,WAAW,uCAIvB,CAAC"}
+{"version":3,"file":"FabricId.d.ts","sourceRoot":"","sources":["../../../src/datatype/FabricId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAY,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAEzD;AAED,yBAAiB,QAAQ,CAAC;IACf,MAAM,SAAS,UAAc,CAAC;CACxC;AAED,wCAAwC;AACxC,eAAO,MAAM,WAAW,uCAIvB,CAAC"}

package/dist/cjs/datatype/FabricId.js

@@ -33,6 +33,9 @@ var import_TlvWrapper = require("../tlv/TlvWrapper.js");
 function FabricId(value) {
   return (0, import_general.toBigInt)(value);
 }
+((FabricId2) => {
+  FabricId2.NO_FABRIC = FabricId2(0);
+})(FabricId || (FabricId = {}));
 const TlvFabricId = new import_TlvWrapper.TlvWrapper(
   import_TlvNumber.TlvUInt64,
   (fabricId) => fabricId,

package/dist/cjs/datatype/FabricId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/FabricId.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAkC;AAClC,uBAA0B;AAC1B,wBAA2B;AAR3B;AAAA;AAAA;AAAA;AAAA;AAkBO,SAAS,SAAS,OAAkC;AACvD,aAAO,yBAAS,KAAK;AACzB;AAGO,MAAM,cAAc,IAAI;AAAA,EAC3B;AAAA,EACA,cAAY;AAAA,EACZ,WAAS,SAAS,KAAK;AAC3B;",
-  "names": []
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAkC;AAClC,uBAA0B;AAC1B,wBAA2B;AAR3B;AAAA;AAAA;AAAA;AAAA;AAkBO,SAAS,SAAS,OAAkC;AACvD,aAAO,yBAAS,KAAK;AACzB;AAAA,CAEO,CAAUA,cAAV;AACI,EAAMA,UAAA,YAAYA,UAAS,CAAC;AAAA,GADtB;AAKV,MAAM,cAAc,IAAI;AAAA,EAC3B;AAAA,EACA,cAAY;AAAA,EACZ,WAAS,SAAS,KAAK;AAC3B;",
+  "names": ["FabricId"]
 }

package/dist/cjs/datatype/GroupId.d.ts

@@ -5,6 +5,7 @@
  */
 import { Branded } from "#general";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
+import { NodeId } from "./NodeId.js";
 /**
  * A Group Identifier (Group ID or GID) is a 16-bit number that identifies a set of Nodes across a
  * Fabric at the message layer (see Section 4.15, “Group Key Management”). A Group ID can further
@@ -18,10 +19,20 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
  * @see {@link MatterSpecification.v10.Core} § 2.5.4
  */
 export type GroupId = Branded<number, "GroupId">;
-export declare function GroupId(groupId: number | bigint, validate?: boolean): GroupId;
+export declare function GroupId(groupId: number, validate?: boolean): GroupId;
 export declare namespace GroupId {
-    const UNSPECIFIED_GROUP_ID: GroupId;
-    const isValid: (groupId: number | bigint, validate?: boolean | undefined) => boolean;
+    const NO_GROUP_ID: GroupId;
+    /** This group is used to message all Nodes in a Fabric. */
+    const ALL_NODES: GroupId;
+    /**
+     * This group is used to message all power-capable Nodes in a Fabric. ICD Nodes SHALL NOT subscribe to this group.
+     */
+    const ALL_NON_ICD_NODES: GroupId;
+    const isValid: (groupId: number, validate?: boolean | undefined) => boolean;
+    /** Application Group ID, assigned by fabric Administrator */
+    function isApplicationGroupId(groupId: GroupId): boolean;
+    function assertGroupId(groupId: GroupId): void;
+    function fromNodeId(nodeId: NodeId): GroupId;
 }
 /** Tlv Schema for a Group Id. */
 export declare const TlvGroupId: TlvWrapper<GroupId, number>;

package/dist/cjs/datatype/GroupId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupId.d.ts","sourceRoot":"","sources":["../../../src/datatype/GroupId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEjD,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAK1E;AAED,yBAAiB,OAAO,CAAC;IACd,MAAM,oBAAoB,SAAa,CAAC;IAExC,MAAM,OAAO,uEAAuB,CAAC;CAC/C;AAED,iCAAiC;AACjC,eAAO,MAAM,UAAU,6BAItB,CAAC"}
+{"version":3,"file":"GroupId.d.ts","sourceRoot":"","sources":["../../../src/datatype/GroupId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAsC,MAAM,UAAU,CAAC;AAGvE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEjD,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAKjE;AAED,yBAAiB,OAAO,CAAC;IACd,MAAM,WAAW,SAAa,CAAC;IAEtC,2DAA2D;IACpD,MAAM,SAAS,EAAa,OAAO,CAAC;IAE3C;;OAEG;IACI,MAAM,iBAAiB,EAAa,OAAO,CAAC;IAI5C,MAAM,OAAO,8DAAuB,CAAC;IAE5C,6DAA6D;IAC7D,SAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE9D;IAED,SAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,QAI7C;IAED,SAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQlD;CACJ;AAED,iCAAiC;AACjC,eAAO,MAAM,UAAU,6BAItB,CAAC"}

package/dist/cjs/datatype/GroupId.js

@@ -22,9 +22,11 @@ __export(GroupId_exports, {
   TlvGroupId: () => TlvGroupId
 });
 module.exports = __toCommonJS(GroupId_exports);
+var import_general = require("#general");
 var import_ValidationError = require("../common/ValidationError.js");
 var import_TlvNumber = require("../tlv/TlvNumber.js");
 var import_TlvWrapper = require("../tlv/TlvWrapper.js");
+var import_NodeId = require("./NodeId.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
@@ -37,8 +39,28 @@ function GroupId(groupId, validate = true) {
   throw new import_ValidationError.ValidationOutOfBoundsError(`Invalid group ID: ${groupId}`);
 }
 ((GroupId2) => {
-  GroupId2.UNSPECIFIED_GROUP_ID = GroupId2(0);
+  GroupId2.NO_GROUP_ID = GroupId2(0);
+  GroupId2.ALL_NODES = 65535;
+  GroupId2.ALL_NON_ICD_NODES = 65534;
   GroupId2.isValid = (0, import_ValidationError.validatorOf)(GroupId2);
+  function isApplicationGroupId(groupId) {
+    return groupId >= 1 && groupId <= 65279;
+  }
+  GroupId2.isApplicationGroupId = isApplicationGroupId;
+  function assertGroupId(groupId) {
+    if (groupId === GroupId2.NO_GROUP_ID) {
+      throw new import_general.UnexpectedDataError(`A Group ID need to be specified and can not be 0`);
+    }
+  }
+  GroupId2.assertGroupId = assertGroupId;
+  function fromNodeId(nodeId) {
+    if (!import_NodeId.NodeId.isGroupNodeId(nodeId)) {
+      throw new import_general.InternalError(`NodeId ${nodeId} is not a Group NodeId`);
+    }
+    const groupId = Number(nodeId & BigInt(65535));
+    return GroupId2(groupId);
+  }
+  GroupId2.fromNodeId = fromNodeId;
 })(GroupId || (GroupId = {}));
 const TlvGroupId = new import_TlvWrapper.TlvWrapper(
   import_TlvNumber.TlvUInt16,

package/dist/cjs/datatype/GroupId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/GroupId.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,6BAAwD;AACxD,uBAA0B;AAC1B,wBAA2B;AAT3B;AAAA;AAAA;AAAA;AAAA;AAyBO,SAAS,QAAQ,SAA0B,WAAW,MAAe;AACxE,MAAI,CAAC,YAAa,WAAW,KAAU,WAAW,OAAS;AACvD,WAAO,OAAO,OAAO;AAAA,EACzB;AACA,QAAM,IAAI,kDAA2B,qBAAqB,OAAO,EAAE;AACvE;AAAA,CAEO,CAAUA,aAAV;AACI,EAAMA,SAAA,uBAAuBA,SAAQ,CAAC;AAEtC,EAAMA,SAAA,cAAU,oCAAYA,QAAO;AAAA,GAH7B;AAOV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA4D;AAC5D,6BAAwD;AACxD,uBAA0B;AAC1B,wBAA2B;AAC3B,oBAAuB;AAVvB;AAAA;AAAA;AAAA;AAAA;AA0BO,SAAS,QAAQ,SAAiB,WAAW,MAAe;AAC/D,MAAI,CAAC,YAAa,WAAW,KAAU,WAAW,OAAS;AACvD,WAAO,OAAO,OAAO;AAAA,EACzB;AACA,QAAM,IAAI,kDAA2B,qBAAqB,OAAO,EAAE;AACvE;AAAA,CAEO,CAAUA,aAAV;AACI,EAAMA,SAAA,cAAcA,SAAQ,CAAC;AAG7B,EAAMA,SAAA,YAAY;AAKlB,EAAMA,SAAA,oBAAoB;AAI1B,EAAMA,SAAA,cAAU,oCAAYA,QAAO;AAGnC,WAAS,qBAAqB,SAA2B;AAC5D,WAAO,WAAW,KAAU,WAAW;AAAA,EAC3C;AAFO,EAAAA,SAAS;AAIT,WAAS,cAAc,SAAkB;AAC5C,QAAI,YAAYA,SAAQ,aAAa;AACjC,YAAM,IAAI,mCAAoB,kDAAkD;AAAA,IACpF;AAAA,EACJ;AAJO,EAAAA,SAAS;AAMT,WAAS,WAAW,QAAyB;AAChD,QAAI,CAAC,qBAAO,cAAc,MAAM,GAAG;AAC/B,YAAM,IAAI,6BAAc,UAAU,MAAM,wBAAwB;AAAA,IACpE;AAEA,UAAM,UAAU,OAAO,SAAS,OAAO,KAAM,CAAC;AAE9C,WAAOA,SAAQ,OAAO;AAAA,EAC1B;AARO,EAAAA,SAAS;AAAA,GA1BH;AAsCV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
   "names": ["GroupId"]
 }

package/dist/cjs/datatype/NodeId.d.ts

@@ -32,7 +32,9 @@ export declare namespace NodeId {
      */
     const isOperationalNodeId: (nodeId: NodeId) => boolean;
     /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
-    const fromGroupNodeId: (groupId: number) => NodeId;
+    const isGroupNodeId: (nodeId: NodeId) => boolean;
+    /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
+    const fromGroupId: (groupId: number) => NodeId;
     /**
      * A Temporary Local Node ID is a 64-bit Node ID that contains an implementation-dependent value in its lower
      * 32 bits. This allows implementations to keep track of connections or transport-layer links and similar

package/dist/cjs/datatype/NodeId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAoE,MAAM,UAAU,CAAC;AAErG,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEjD;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,QAAO,MAO1C,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,CAAC;IAEF,gHAAgH;IACzG,MAAM,eAAe,GAAI,SAAS,MAAM,KAAG,MAKjD,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAI,IAAI,oBAAoB,KAAG,MAKnE,CAAC;IAEK,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,OAGvD,CAAC;IAEK,MAAM,6BAA6B,GAAI,QAAQ,MAAM,KAAG,oBAK9D,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;CACL;AAED,wCAAwC;AACxC,eAAO,MAAM,SAAS,qCAIrB,CAAC"}
+{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAA4D,MAAM,UAAU,CAAC;AAE7F,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEjD;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,QAAO,MAO1C,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,CAAC;IAEF,gHAAgH;IACzG,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,OAG9C,CAAC;IAEF,gHAAgH;IACzG,MAAM,WAAW,GAAI,SAAS,MAAM,KAAG,MAE7C,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAI,IAAI,oBAAoB,KAAG,MAKnE,CAAC;IAEK,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,OAGvD,CAAC;IAEK,MAAM,6BAA6B,GAAI,QAAQ,MAAM,KAAG,oBAK9D,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;CACL;AAED,wCAAwC;AACxC,eAAO,MAAM,SAAS,qCAIrB,CAAC"}

package/dist/cjs/datatype/NodeId.js

@@ -22,6 +22,7 @@ __export(NodeId_exports, {
   TlvNodeId: () => TlvNodeId
 });
 module.exports = __toCommonJS(NodeId_exports);
+var import_GroupId = require("#datatype/GroupId.js");
 var import_general = require("#general");
 var import_TlvNumber = require("../tlv/TlvNumber.js");
 var import_TlvWrapper = require("../tlv/TlvWrapper.js");
@@ -39,7 +40,7 @@ function NodeId(v) {
   const OPERATIONAL_NODE_MAX = BigInt("0xFFFFFFEFFFFFFFFF");
   NodeId2.UNSPECIFIED_NODE_ID = NodeId2(0);
   NodeId2.toHexString = (nodeId) => {
-    const writer = new import_general.DataWriter(import_general.Endian.Big);
+    const writer = new import_general.DataWriter();
     writer.writeUInt64(nodeId);
     return import_general.Bytes.toHex(writer.toByteArray()).toUpperCase();
   };
@@ -54,11 +55,12 @@ function NodeId(v) {
   NodeId2.isOperationalNodeId = (nodeId) => {
     return nodeId >= OPERATIONAL_NODE_MIN && nodeId <= OPERATIONAL_NODE_MAX;
   };
-  NodeId2.fromGroupNodeId = (groupId) => {
-    if (groupId < 0 || groupId > 65535) {
-      throw new import_general.UnexpectedDataError(`Invalid group ID: ${groupId}`);
-    }
-    return NodeId2(BigInt("0xFFFFFFFFFFFF" + groupId.toString(16).padStart(4, "0")));
+  NodeId2.isGroupNodeId = (nodeId) => {
+    const nodeIdHex = nodeId.toString(16);
+    return nodeIdHex.startsWith("ffffffffffff") && nodeIdHex.length === 16;
+  };
+  NodeId2.fromGroupId = (groupId) => {
+    return NodeId2(BigInt("0xFFFFFFFFFFFF" + (0, import_GroupId.GroupId)(groupId).toString(16).padStart(4, "0")));
   };
   NodeId2.fromTemporaryLocalNodeId = (id) => {
     if (id < 0 || id > 4294967295) {

package/dist/cjs/datatype/NodeId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/NodeId.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA0F;AAC1F,uBAA0B;AAC1B,wBAA2B;AAC3B,kCAAqC;AATrC;AAAA;AAAA;AAAA;AAAA;AAmBO,SAAS,OAAO,GAA4B;AAC/C,aAAO,yBAAS,CAAC;AACrB;AAAA,CAEO,CAAUA,YAAV;AACH,QAAM,uBAAuB,OAAO,oBAAoB;AACxD,QAAM,uBAAuB,OAAO,oBAAoB;AAMjD,EAAMA,QAAA,sBAAsBA,QAAO,CAAC;AAEpC,EAAMA,QAAA,cAAc,CAAC,WAAmB;AAC3C,UAAM,SAAS,IAAI,0BAAW,sBAAO,GAAG;AACxC,WAAO,YAAY,MAAM;AACzB,WAAO,qBAAM,MAAM,OAAO,YAAY,CAAC,EAAE,YAAY;AAAA,EACzD;AAOO,EAAMA,QAAA,0BAA0B,MAAc;AACjD,WAAO,MAAM;AACT,YAAM,eAAe,sBAAO,gBAAgB,CAAC;AAC7C,UAAI,gBAAgB,wBAAwB,gBAAgB,sBAAsB;AAC9E,eAAOA,QAAO,YAAY;AAAA,MAC9B;AAAA,IACJ;AAAA,EACJ;AAKO,EAAMA,QAAA,sBAAsB,CAAC,WAA4B;AAC5D,WAAO,UAAU,wBAAwB,UAAU;AAAA,EACvD;AAGO,EAAMA,QAAA,kBAAkB,CAAC,YAA4B;AACxD,QAAI,UAAU,KAAK,UAAU,OAAQ;AACjC,YAAM,IAAI,mCAAoB,qBAAqB,OAAO,EAAE;AAAA,IAChE;AACA,WAAOA,QAAO,OAAO,mBAAmB,QAAQ,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EAClF;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAMO,EAAMA,QAAA,2BAA2B,CAAC,OAAqC;AAC1E,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,mCAAmC,EAAE,EAAE;AAAA,IACzE;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAEO,EAAMA,QAAA,yBAAyB,CAAC,WAA4B;AAC/D,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,UAAU,KAAK,UAAU,WAAW;AAAA,EACpE;AAEO,EAAMA,QAAA,gCAAgC,CAAC,WAAyC;AACnF,QAAI,KAACA,QAAA,wBAAuB,MAAM,GAAG;AACjC,YAAM,IAAI,mCAAoB,mCAAmC,MAAM,EAAE;AAAA,IAC7E;AACA,eAAO,kDAAqB,SAAS,OAAO,SAAS,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;AAAA,EAC1E;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAAA,GA1Fa;AA8FV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwB;AACxB,qBAAkF;AAClF,uBAA0B;AAC1B,wBAA2B;AAC3B,kCAAqC;AAVrC;AAAA;AAAA;AAAA;AAAA;AAoBO,SAAS,OAAO,GAA4B;AAC/C,aAAO,yBAAS,CAAC;AACrB;AAAA,CAEO,CAAUA,YAAV;AACH,QAAM,uBAAuB,OAAO,oBAAoB;AACxD,QAAM,uBAAuB,OAAO,oBAAoB;AAMjD,EAAMA,QAAA,sBAAsBA,QAAO,CAAC;AAEpC,EAAMA,QAAA,cAAc,CAAC,WAAmB;AAC3C,UAAM,SAAS,IAAI,0BAAW;AAC9B,WAAO,YAAY,MAAM;AACzB,WAAO,qBAAM,MAAM,OAAO,YAAY,CAAC,EAAE,YAAY;AAAA,EACzD;AAOO,EAAMA,QAAA,0BAA0B,MAAc;AACjD,WAAO,MAAM;AACT,YAAM,eAAe,sBAAO,gBAAgB,CAAC;AAC7C,UAAI,gBAAgB,wBAAwB,gBAAgB,sBAAsB;AAC9E,eAAOA,QAAO,YAAY;AAAA,MAC9B;AAAA,IACJ;AAAA,EACJ;AAKO,EAAMA,QAAA,sBAAsB,CAAC,WAA4B;AAC5D,WAAO,UAAU,wBAAwB,UAAU;AAAA,EACvD;AAGO,EAAMA,QAAA,gBAAgB,CAAC,WAA4B;AACtD,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,cAAc,KAAK,UAAU,WAAW;AAAA,EACxE;AAGO,EAAMA,QAAA,cAAc,CAAC,YAA4B;AACpD,WAAOA,QAAO,OAAO,uBAAmB,wBAAQ,OAAO,EAAE,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EAC3F;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAMO,EAAMA,QAAA,2BAA2B,CAAC,OAAqC;AAC1E,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,mCAAmC,EAAE,EAAE;AAAA,IACzE;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAEO,EAAMA,QAAA,yBAAyB,CAAC,WAA4B;AAC/D,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,UAAU,KAAK,UAAU,WAAW;AAAA,EACpE;AAEO,EAAMA,QAAA,gCAAgC,CAAC,WAAyC;AACnF,QAAI,KAACA,QAAA,wBAAuB,MAAM,GAAG;AACjC,YAAM,IAAI,mCAAoB,mCAAmC,MAAM,EAAE;AAAA,IAC7E;AACA,eAAO,kDAAqB,SAAS,OAAO,SAAS,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;AAAA,EAC1E;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,mCAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAAA,GA7Fa;AAiGV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
   "names": ["NodeId"]
 }

package/dist/cjs/datatype/SubjectId.d.ts

@@ -3,6 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { GroupId } from "./GroupId.js";
 import { NodeId } from "./NodeId.js";
 /**
  * The meaning of a "Subject" is primarily that of describing the source for an action, using a given
@@ -10,7 +11,8 @@ import { NodeId } from "./NodeId.js";
  *
  * @see {@link MatterSpecification.v10.Core} § 6.6.2.1
  */
-export type SubjectId = NodeId;
+export type SubjectId = NodeId | GroupId;
+export declare function SubjectId(v: bigint | number): SubjectId;
 /** Tlv schema for a Subject Id */
 export declare const TlvSubjectId: import("../index.js").TlvWrapper<NodeId, number | bigint>;
 //# sourceMappingURL=SubjectId.d.ts.map

package/dist/cjs/datatype/SubjectId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubjectId.d.ts","sourceRoot":"","sources":["../../../src/datatype/SubjectId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAa,MAAM,aAAa,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,kCAAkC;AAClC,eAAO,MAAM,YAAY,2DAAY,CAAC"}
+{"version":3,"file":"SubjectId.d.ts","sourceRoot":"","sources":["../../../src/datatype/SubjectId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAa,MAAM,aAAa,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEzC,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvD;AAED,kCAAkC;AAClC,eAAO,MAAM,YAAY,2DAAY,CAAC"}

package/dist/cjs/datatype/SubjectId.js

@@ -18,14 +18,19 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var SubjectId_exports = {};
 __export(SubjectId_exports, {
+  SubjectId: () => SubjectId,
   TlvSubjectId: () => TlvSubjectId
 });
 module.exports = __toCommonJS(SubjectId_exports);
+var import_general = require("#general");
 var import_NodeId = require("./NodeId.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+function SubjectId(v) {
+  return (0, import_general.toBigInt)(v);
+}
 const TlvSubjectId = import_NodeId.TlvNodeId;
 //# sourceMappingURL=SubjectId.js.map

package/dist/cjs/datatype/SubjectId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/SubjectId.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,oBAAkC;AANlC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,eAAe;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAyB;AAEzB,oBAAkC;AARlC;AAAA;AAAA;AAAA;AAAA;AAkBO,SAAS,UAAU,GAA+B;AACrD,aAAO,yBAAS,CAAC;AACrB;AAGO,MAAM,eAAe;",
   "names": []
 }

package/dist/esm/datatype/FabricId.d.ts

@@ -13,6 +13,9 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
  */
 export type FabricId = Branded<bigint, "FabricId">;
 export declare function FabricId(value: bigint | number): FabricId;
+export declare namespace FabricId {
+    const NO_FABRIC: FabricId;
+}
 /** Tlv schema for a Node Identifier. */
 export declare const TlvFabricId: TlvWrapper<FabricId, number | bigint>;
 //# sourceMappingURL=FabricId.d.ts.map

package/dist/esm/datatype/FabricId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FabricId.d.ts","sourceRoot":"","sources":["../../../src/datatype/FabricId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAY,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAEzD;AAED,wCAAwC;AACxC,eAAO,MAAM,WAAW,uCAIvB,CAAC"}
+{"version":3,"file":"FabricId.d.ts","sourceRoot":"","sources":["../../../src/datatype/FabricId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAY,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEnD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAEzD;AAED,yBAAiB,QAAQ,CAAC;IACf,MAAM,SAAS,UAAc,CAAC;CACxC;AAED,wCAAwC;AACxC,eAAO,MAAM,WAAW,uCAIvB,CAAC"}

package/dist/esm/datatype/FabricId.js

@@ -9,6 +9,9 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
 function FabricId(value) {
   return toBigInt(value);
 }
+((FabricId2) => {
+  FabricId2.NO_FABRIC = FabricId2(0);
+})(FabricId || (FabricId = {}));
 const TlvFabricId = new TlvWrapper(
   TlvUInt64,
   (fabricId) => fabricId,

package/dist/esm/datatype/FabricId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/FabricId.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,gBAAgB;AAClC,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAUpB,SAAS,SAAS,OAAkC;AACvD,SAAO,SAAS,KAAK;AACzB;AAGO,MAAM,cAAc,IAAI;AAAA,EAC3B;AAAA,EACA,cAAY;AAAA,EACZ,WAAS,SAAS,KAAK;AAC3B;",
-  "names": []
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,gBAAgB;AAClC,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAUpB,SAAS,SAAS,OAAkC;AACvD,SAAO,SAAS,KAAK;AACzB;AAAA,CAEO,CAAUA,cAAV;AACI,EAAMA,UAAA,YAAYA,UAAS,CAAC;AAAA,GADtB;AAKV,MAAM,cAAc,IAAI;AAAA,EAC3B;AAAA,EACA,cAAY;AAAA,EACZ,WAAS,SAAS,KAAK;AAC3B;",
+  "names": ["FabricId"]
 }

package/dist/esm/datatype/GroupId.d.ts

@@ -5,6 +5,7 @@
  */
 import { Branded } from "#general";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
+import { NodeId } from "./NodeId.js";
 /**
  * A Group Identifier (Group ID or GID) is a 16-bit number that identifies a set of Nodes across a
  * Fabric at the message layer (see Section 4.15, “Group Key Management”). A Group ID can further
@@ -18,10 +19,20 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
  * @see {@link MatterSpecification.v10.Core} § 2.5.4
  */
 export type GroupId = Branded<number, "GroupId">;
-export declare function GroupId(groupId: number | bigint, validate?: boolean): GroupId;
+export declare function GroupId(groupId: number, validate?: boolean): GroupId;
 export declare namespace GroupId {
-    const UNSPECIFIED_GROUP_ID: GroupId;
-    const isValid: (groupId: number | bigint, validate?: boolean | undefined) => boolean;
+    const NO_GROUP_ID: GroupId;
+    /** This group is used to message all Nodes in a Fabric. */
+    const ALL_NODES: GroupId;
+    /**
+     * This group is used to message all power-capable Nodes in a Fabric. ICD Nodes SHALL NOT subscribe to this group.
+     */
+    const ALL_NON_ICD_NODES: GroupId;
+    const isValid: (groupId: number, validate?: boolean | undefined) => boolean;
+    /** Application Group ID, assigned by fabric Administrator */
+    function isApplicationGroupId(groupId: GroupId): boolean;
+    function assertGroupId(groupId: GroupId): void;
+    function fromNodeId(nodeId: NodeId): GroupId;
 }
 /** Tlv Schema for a Group Id. */
 export declare const TlvGroupId: TlvWrapper<GroupId, number>;

package/dist/esm/datatype/GroupId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupId.d.ts","sourceRoot":"","sources":["../../../src/datatype/GroupId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEjD,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAK1E;AAED,yBAAiB,OAAO,CAAC;IACd,MAAM,oBAAoB,SAAa,CAAC;IAExC,MAAM,OAAO,uEAAuB,CAAC;CAC/C;AAED,iCAAiC;AACjC,eAAO,MAAM,UAAU,6BAItB,CAAC"}
+{"version":3,"file":"GroupId.d.ts","sourceRoot":"","sources":["../../../src/datatype/GroupId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAsC,MAAM,UAAU,CAAC;AAGvE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEjD,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAKjE;AAED,yBAAiB,OAAO,CAAC;IACd,MAAM,WAAW,SAAa,CAAC;IAEtC,2DAA2D;IACpD,MAAM,SAAS,EAAa,OAAO,CAAC;IAE3C;;OAEG;IACI,MAAM,iBAAiB,EAAa,OAAO,CAAC;IAI5C,MAAM,OAAO,8DAAuB,CAAC;IAE5C,6DAA6D;IAC7D,SAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE9D;IAED,SAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,QAI7C;IAED,SAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQlD;CACJ;AAED,iCAAiC;AACjC,eAAO,MAAM,UAAU,6BAItB,CAAC"}

package/dist/esm/datatype/GroupId.js

@@ -3,9 +3,11 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { InternalError, UnexpectedDataError } from "#general";
 import { ValidationOutOfBoundsError, validatorOf } from "../common/ValidationError.js";
 import { TlvUInt16 } from "../tlv/TlvNumber.js";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
+import { NodeId } from "./NodeId.js";
 function GroupId(groupId, validate = true) {
   if (!validate || groupId >= 0 && groupId <= 65535) {
     return Number(groupId);
@@ -13,8 +15,28 @@ function GroupId(groupId, validate = true) {
   throw new ValidationOutOfBoundsError(`Invalid group ID: ${groupId}`);
 }
 ((GroupId2) => {
-  GroupId2.UNSPECIFIED_GROUP_ID = GroupId2(0);
+  GroupId2.NO_GROUP_ID = GroupId2(0);
+  GroupId2.ALL_NODES = 65535;
+  GroupId2.ALL_NON_ICD_NODES = 65534;
   GroupId2.isValid = validatorOf(GroupId2);
+  function isApplicationGroupId(groupId) {
+    return groupId >= 1 && groupId <= 65279;
+  }
+  GroupId2.isApplicationGroupId = isApplicationGroupId;
+  function assertGroupId(groupId) {
+    if (groupId === GroupId2.NO_GROUP_ID) {
+      throw new UnexpectedDataError(`A Group ID need to be specified and can not be 0`);
+    }
+  }
+  GroupId2.assertGroupId = assertGroupId;
+  function fromNodeId(nodeId) {
+    if (!NodeId.isGroupNodeId(nodeId)) {
+      throw new InternalError(`NodeId ${nodeId} is not a Group NodeId`);
+    }
+    const groupId = Number(nodeId & BigInt(65535));
+    return GroupId2(groupId);
+  }
+  GroupId2.fromNodeId = fromNodeId;
 })(GroupId || (GroupId = {}));
 const TlvGroupId = new TlvWrapper(
   TlvUInt16,

package/dist/esm/datatype/GroupId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/GroupId.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,4BAA4B,mBAAmB;AACxD,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAgBpB,SAAS,QAAQ,SAA0B,WAAW,MAAe;AACxE,MAAI,CAAC,YAAa,WAAW,KAAU,WAAW,OAAS;AACvD,WAAO,OAAO,OAAO;AAAA,EACzB;AACA,QAAM,IAAI,2BAA2B,qBAAqB,OAAO,EAAE;AACvE;AAAA,CAEO,CAAUA,aAAV;AACI,EAAMA,SAAA,uBAAuBA,SAAQ,CAAC;AAEtC,EAAMA,SAAA,UAAU,YAAYA,QAAO;AAAA,GAH7B;AAOV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,eAAe,2BAA2B;AAC5D,SAAS,4BAA4B,mBAAmB;AACxD,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,cAAc;AAgBhB,SAAS,QAAQ,SAAiB,WAAW,MAAe;AAC/D,MAAI,CAAC,YAAa,WAAW,KAAU,WAAW,OAAS;AACvD,WAAO,OAAO,OAAO;AAAA,EACzB;AACA,QAAM,IAAI,2BAA2B,qBAAqB,OAAO,EAAE;AACvE;AAAA,CAEO,CAAUA,aAAV;AACI,EAAMA,SAAA,cAAcA,SAAQ,CAAC;AAG7B,EAAMA,SAAA,YAAY;AAKlB,EAAMA,SAAA,oBAAoB;AAI1B,EAAMA,SAAA,UAAU,YAAYA,QAAO;AAGnC,WAAS,qBAAqB,SAA2B;AAC5D,WAAO,WAAW,KAAU,WAAW;AAAA,EAC3C;AAFO,EAAAA,SAAS;AAIT,WAAS,cAAc,SAAkB;AAC5C,QAAI,YAAYA,SAAQ,aAAa;AACjC,YAAM,IAAI,oBAAoB,kDAAkD;AAAA,IACpF;AAAA,EACJ;AAJO,EAAAA,SAAS;AAMT,WAAS,WAAW,QAAyB;AAChD,QAAI,CAAC,OAAO,cAAc,MAAM,GAAG;AAC/B,YAAM,IAAI,cAAc,UAAU,MAAM,wBAAwB;AAAA,IACpE;AAEA,UAAM,UAAU,OAAO,SAAS,OAAO,KAAM,CAAC;AAE9C,WAAOA,SAAQ,OAAO;AAAA,EAC1B;AARO,EAAAA,SAAS;AAAA,GA1BH;AAsCV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
   "names": ["GroupId"]
 }

package/dist/esm/datatype/NodeId.d.ts

@@ -32,7 +32,9 @@ export declare namespace NodeId {
      */
     const isOperationalNodeId: (nodeId: NodeId) => boolean;
     /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
-    const fromGroupNodeId: (groupId: number) => NodeId;
+    const isGroupNodeId: (nodeId: NodeId) => boolean;
+    /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
+    const fromGroupId: (groupId: number) => NodeId;
     /**
      * A Temporary Local Node ID is a 64-bit Node ID that contains an implementation-dependent value in its lower
      * 32 bits. This allows implementations to keep track of connections or transport-layer links and similar

package/dist/esm/datatype/NodeId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAoE,MAAM,UAAU,CAAC;AAErG,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEjD;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,QAAO,MAO1C,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,CAAC;IAEF,gHAAgH;IACzG,MAAM,eAAe,GAAI,SAAS,MAAM,KAAG,MAKjD,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAI,IAAI,oBAAoB,KAAG,MAKnE,CAAC;IAEK,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,OAGvD,CAAC;IAEK,MAAM,6BAA6B,GAAI,QAAQ,MAAM,KAAG,oBAK9D,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;CACL;AAED,wCAAwC;AACxC,eAAO,MAAM,SAAS,qCAIrB,CAAC"}
+{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAA4D,MAAM,UAAU,CAAC;AAE7F,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEjD;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,QAAO,MAO1C,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,CAAC;IAEF,gHAAgH;IACzG,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,OAG9C,CAAC;IAEF,gHAAgH;IACzG,MAAM,WAAW,GAAI,SAAS,MAAM,KAAG,MAE7C,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAI,IAAI,oBAAoB,KAAG,MAKnE,CAAC;IAEK,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,OAGvD,CAAC;IAEK,MAAM,6BAA6B,GAAI,QAAQ,MAAM,KAAG,oBAK9D,CAAC;IAEF;;;;OAIG;IACI,MAAM,wBAAwB,GAAI,IAAI,MAAM,KAAG,MAKrD,CAAC;CACL;AAED,wCAAwC;AACxC,eAAO,MAAM,SAAS,qCAIrB,CAAC"}

package/dist/esm/datatype/NodeId.js

@@ -3,7 +3,8 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Bytes, Crypto, DataWriter, Endian, toBigInt, UnexpectedDataError } from "#general";
+import { GroupId } from "#datatype/GroupId.js";
+import { Bytes, Crypto, DataWriter, toBigInt, UnexpectedDataError } from "#general";
 import { TlvUInt64 } from "../tlv/TlvNumber.js";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
 import { CaseAuthenticatedTag } from "./CaseAuthenticatedTag.js";
@@ -15,7 +16,7 @@ function NodeId(v) {
   const OPERATIONAL_NODE_MAX = BigInt("0xFFFFFFEFFFFFFFFF");
   NodeId2.UNSPECIFIED_NODE_ID = NodeId2(0);
   NodeId2.toHexString = (nodeId) => {
-    const writer = new DataWriter(Endian.Big);
+    const writer = new DataWriter();
     writer.writeUInt64(nodeId);
     return Bytes.toHex(writer.toByteArray()).toUpperCase();
   };
@@ -30,11 +31,12 @@ function NodeId(v) {
   NodeId2.isOperationalNodeId = (nodeId) => {
     return nodeId >= OPERATIONAL_NODE_MIN && nodeId <= OPERATIONAL_NODE_MAX;
   };
-  NodeId2.fromGroupNodeId = (groupId) => {
-    if (groupId < 0 || groupId > 65535) {
-      throw new UnexpectedDataError(`Invalid group ID: ${groupId}`);
-    }
-    return NodeId2(BigInt("0xFFFFFFFFFFFF" + groupId.toString(16).padStart(4, "0")));
+  NodeId2.isGroupNodeId = (nodeId) => {
+    const nodeIdHex = nodeId.toString(16);
+    return nodeIdHex.startsWith("ffffffffffff") && nodeIdHex.length === 16;
+  };
+  NodeId2.fromGroupId = (groupId) => {
+    return NodeId2(BigInt("0xFFFFFFFFFFFF" + GroupId(groupId).toString(16).padStart(4, "0")));
   };
   NodeId2.fromTemporaryLocalNodeId = (id) => {
     if (id < 0 || id > 4294967295) {

package/dist/esm/datatype/NodeId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/NodeId.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,OAAO,QAAQ,YAAY,QAAQ,UAAU,2BAA2B;AAC1F,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AAU9B,SAAS,OAAO,GAA4B;AAC/C,SAAO,SAAS,CAAC;AACrB;AAAA,CAEO,CAAUA,YAAV;AACH,QAAM,uBAAuB,OAAO,oBAAoB;AACxD,QAAM,uBAAuB,OAAO,oBAAoB;AAMjD,EAAMA,QAAA,sBAAsBA,QAAO,CAAC;AAEpC,EAAMA,QAAA,cAAc,CAAC,WAAmB;AAC3C,UAAM,SAAS,IAAI,WAAW,OAAO,GAAG;AACxC,WAAO,YAAY,MAAM;AACzB,WAAO,MAAM,MAAM,OAAO,YAAY,CAAC,EAAE,YAAY;AAAA,EACzD;AAOO,EAAMA,QAAA,0BAA0B,MAAc;AACjD,WAAO,MAAM;AACT,YAAM,eAAe,OAAO,gBAAgB,CAAC;AAC7C,UAAI,gBAAgB,wBAAwB,gBAAgB,sBAAsB;AAC9E,eAAOA,QAAO,YAAY;AAAA,MAC9B;AAAA,IACJ;AAAA,EACJ;AAKO,EAAMA,QAAA,sBAAsB,CAAC,WAA4B;AAC5D,WAAO,UAAU,wBAAwB,UAAU;AAAA,EACvD;AAGO,EAAMA,QAAA,kBAAkB,CAAC,YAA4B;AACxD,QAAI,UAAU,KAAK,UAAU,OAAQ;AACjC,YAAM,IAAI,oBAAoB,qBAAqB,OAAO,EAAE;AAAA,IAChE;AACA,WAAOA,QAAO,OAAO,mBAAmB,QAAQ,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EAClF;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAMO,EAAMA,QAAA,2BAA2B,CAAC,OAAqC;AAC1E,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,mCAAmC,EAAE,EAAE;AAAA,IACzE;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAEO,EAAMA,QAAA,yBAAyB,CAAC,WAA4B;AAC/D,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,UAAU,KAAK,UAAU,WAAW;AAAA,EACpE;AAEO,EAAMA,QAAA,gCAAgC,CAAC,WAAyC;AACnF,QAAI,KAACA,QAAA,wBAAuB,MAAM,GAAG;AACjC,YAAM,IAAI,oBAAoB,mCAAmC,MAAM,EAAE;AAAA,IAC7E;AACA,WAAO,qBAAqB,SAAS,OAAO,SAAS,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;AAAA,EAC1E;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAAA,GA1Fa;AA8FV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,eAAe;AACxB,SAAkB,OAAO,QAAQ,YAAY,UAAU,2BAA2B;AAClF,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AAU9B,SAAS,OAAO,GAA4B;AAC/C,SAAO,SAAS,CAAC;AACrB;AAAA,CAEO,CAAUA,YAAV;AACH,QAAM,uBAAuB,OAAO,oBAAoB;AACxD,QAAM,uBAAuB,OAAO,oBAAoB;AAMjD,EAAMA,QAAA,sBAAsBA,QAAO,CAAC;AAEpC,EAAMA,QAAA,cAAc,CAAC,WAAmB;AAC3C,UAAM,SAAS,IAAI,WAAW;AAC9B,WAAO,YAAY,MAAM;AACzB,WAAO,MAAM,MAAM,OAAO,YAAY,CAAC,EAAE,YAAY;AAAA,EACzD;AAOO,EAAMA,QAAA,0BAA0B,MAAc;AACjD,WAAO,MAAM;AACT,YAAM,eAAe,OAAO,gBAAgB,CAAC;AAC7C,UAAI,gBAAgB,wBAAwB,gBAAgB,sBAAsB;AAC9E,eAAOA,QAAO,YAAY;AAAA,MAC9B;AAAA,IACJ;AAAA,EACJ;AAKO,EAAMA,QAAA,sBAAsB,CAAC,WAA4B;AAC5D,WAAO,UAAU,wBAAwB,UAAU;AAAA,EACvD;AAGO,EAAMA,QAAA,gBAAgB,CAAC,WAA4B;AACtD,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,cAAc,KAAK,UAAU,WAAW;AAAA,EACxE;AAGO,EAAMA,QAAA,cAAc,CAAC,YAA4B;AACpD,WAAOA,QAAO,OAAO,mBAAmB,QAAQ,OAAO,EAAE,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EAC3F;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAMO,EAAMA,QAAA,2BAA2B,CAAC,OAAqC;AAC1E,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,mCAAmC,EAAE,EAAE;AAAA,IACzE;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAEO,EAAMA,QAAA,yBAAyB,CAAC,WAA4B;AAC/D,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,UAAU,KAAK,UAAU,WAAW;AAAA,EACpE;AAEO,EAAMA,QAAA,gCAAgC,CAAC,WAAyC;AACnF,QAAI,KAACA,QAAA,wBAAuB,MAAM,GAAG;AACjC,YAAM,IAAI,oBAAoB,mCAAmC,MAAM,EAAE;AAAA,IAC7E;AACA,WAAO,qBAAqB,SAAS,OAAO,SAAS,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;AAAA,EAC1E;AAOO,EAAMA,QAAA,2BAA2B,CAAC,OAAuB;AAC5D,QAAI,KAAK,KAAK,KAAK,YAAY;AAC3B,YAAM,IAAI,oBAAoB,eAAe,EAAE,EAAE;AAAA,IACrD;AACA,WAAOA,QAAO,OAAO,eAAe,GAAG,SAAS,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,CAAC;AAAA,EACzE;AAAA,GA7Fa;AAiGV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
   "names": ["NodeId"]
 }

package/dist/esm/datatype/SubjectId.d.ts

@@ -3,6 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { GroupId } from "./GroupId.js";
 import { NodeId } from "./NodeId.js";
 /**
  * The meaning of a "Subject" is primarily that of describing the source for an action, using a given
@@ -10,7 +11,8 @@ import { NodeId } from "./NodeId.js";
  *
  * @see {@link MatterSpecification.v10.Core} § 6.6.2.1
  */
-export type SubjectId = NodeId;
+export type SubjectId = NodeId | GroupId;
+export declare function SubjectId(v: bigint | number): SubjectId;
 /** Tlv schema for a Subject Id */
 export declare const TlvSubjectId: import("../index.js").TlvWrapper<NodeId, number | bigint>;
 //# sourceMappingURL=SubjectId.d.ts.map

package/dist/esm/datatype/SubjectId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubjectId.d.ts","sourceRoot":"","sources":["../../../src/datatype/SubjectId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAa,MAAM,aAAa,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,kCAAkC;AAClC,eAAO,MAAM,YAAY,2DAAY,CAAC"}
+{"version":3,"file":"SubjectId.d.ts","sourceRoot":"","sources":["../../../src/datatype/SubjectId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAa,MAAM,aAAa,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEzC,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvD;AAED,kCAAkC;AAClC,eAAO,MAAM,YAAY,2DAAY,CAAC"}

package/dist/esm/datatype/SubjectId.js

@@ -3,9 +3,14 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { toBigInt } from "#general";
 import { TlvNodeId } from "./NodeId.js";
+function SubjectId(v) {
+  return toBigInt(v);
+}
 const TlvSubjectId = TlvNodeId;
 export {
+  SubjectId,
   TlvSubjectId
 };
 //# sourceMappingURL=SubjectId.js.map

package/dist/esm/datatype/SubjectId.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/datatype/SubjectId.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAiB,iBAAiB;AAW3B,MAAM,eAAe;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gBAAgB;AAEzB,SAAiB,iBAAiB;AAU3B,SAAS,UAAU,GAA+B;AACrD,SAAO,SAAS,CAAC;AACrB;AAGO,MAAM,eAAe;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/types",
-    "version": "0.14.0",
+    "version": "0.14.1-alpha.0-20250606-a9bcd03f9",
     "description": "Definitions for Matter application",
     "keywords": [
         "iot",
@@ -33,12 +33,12 @@
         "embed-examples": "embedme **/README.md"
     },
     "dependencies": {
-        "@matter/general": "0.14.0",
-        "@matter/model": "0.14.0"
+        "@matter/general": "0.14.1-alpha.0-20250606-a9bcd03f9",
+        "@matter/model": "0.14.1-alpha.0-20250606-a9bcd03f9"
     },
     "devDependencies": {
-        "@matter/tools": "0.14.0",
-        "@matter/testing": "0.14.0"
+        "@matter/tools": "0.14.1-alpha.0-20250606-a9bcd03f9",
+        "@matter/testing": "0.14.1-alpha.0-20250606-a9bcd03f9"
     },
     "files": [
         "dist/**/*",

package/src/datatype/FabricId.ts

@@ -20,6 +20,10 @@ export function FabricId(value: bigint | number): FabricId {
     return toBigInt(value) as FabricId;
 }
 
+export namespace FabricId {
+    export const NO_FABRIC = FabricId(0);
+}
+
 /** Tlv schema for a Node Identifier. */
 export const TlvFabricId = new TlvWrapper<FabricId, number | bigint>(
     TlvUInt64,

package/src/datatype/GroupId.ts

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Branded } from "#general";
+import { Branded, InternalError, UnexpectedDataError } from "#general";
 import { ValidationOutOfBoundsError, validatorOf } from "../common/ValidationError.js";
 import { TlvUInt16 } from "../tlv/TlvNumber.js";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
+import { NodeId } from "./NodeId.js";
 
 /**
  * A Group Identifier (Group ID or GID) is a 16-bit number that identifies a set of Nodes across a
@@ -23,7 +24,7 @@ import { TlvWrapper } from "../tlv/TlvWrapper.js";
  */
 export type GroupId = Branded<number, "GroupId">;
 
-export function GroupId(groupId: number | bigint, validate = true): GroupId {
+export function GroupId(groupId: number, validate = true): GroupId {
     if (!validate || (groupId >= 0x0000 && groupId <= 0xffff)) {
         return Number(groupId) as GroupId;
     }
@@ -31,9 +32,40 @@ export function GroupId(groupId: number | bigint, validate = true): GroupId {
 }
 
 export namespace GroupId {
-    export const UNSPECIFIED_GROUP_ID = GroupId(0);
+    export const NO_GROUP_ID = GroupId(0);
+
+    /** This group is used to message all Nodes in a Fabric. */
+    export const ALL_NODES = 0xffff as GroupId;
+
+    /**
+     * This group is used to message all power-capable Nodes in a Fabric. ICD Nodes SHALL NOT subscribe to this group.
+     */
+    export const ALL_NON_ICD_NODES = 0xfffe as GroupId;
+
+    //export const ALL_PROXIES = 0xfffd as GroupId; // Provisional and will be removed in Matter 1.4.2
 
     export const isValid = validatorOf(GroupId);
+
+    /** Application Group ID, assigned by fabric Administrator */
+    export function isApplicationGroupId(groupId: GroupId): boolean {
+        return groupId >= 0x0001 && groupId <= 0xfeff;
+    }
+
+    export function assertGroupId(groupId: GroupId) {
+        if (groupId === GroupId.NO_GROUP_ID) {
+            throw new UnexpectedDataError(`A Group ID need to be specified and can not be 0`);
+        }
+    }
+
+    export function fromNodeId(nodeId: NodeId): GroupId {
+        if (!NodeId.isGroupNodeId(nodeId)) {
+            throw new InternalError(`NodeId ${nodeId} is not a Group NodeId`);
+        }
+        // NodeId is a 64-bit value, where the lower 16 bits represent the GroupId
+        const groupId = Number(nodeId & BigInt(0xffff));
+        // TODO Check if 0 is allowed??
+        return GroupId(groupId);
+    }
 }
 
 /** Tlv Schema for a Group Id. */

package/src/datatype/NodeId.ts

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Branded, Bytes, Crypto, DataWriter, Endian, toBigInt, UnexpectedDataError } from "#general";
+import { GroupId } from "#datatype/GroupId.js";
+import { Branded, Bytes, Crypto, DataWriter, toBigInt, UnexpectedDataError } from "#general";
 import { TlvUInt64 } from "../tlv/TlvNumber.js";
 import { TlvWrapper } from "../tlv/TlvWrapper.js";
 import { CaseAuthenticatedTag } from "./CaseAuthenticatedTag.js";
@@ -32,7 +33,7 @@ export namespace NodeId {
     export const UNSPECIFIED_NODE_ID = NodeId(0);
 
     export const toHexString = (nodeId: NodeId) => {
-        const writer = new DataWriter(Endian.Big);
+        const writer = new DataWriter();
         writer.writeUInt64(nodeId);
         return Bytes.toHex(writer.toByteArray()).toUpperCase();
     };
@@ -59,11 +60,14 @@ export namespace NodeId {
     };
 
     /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
-    export const fromGroupNodeId = (groupId: number): NodeId => {
-        if (groupId < 0 || groupId > 0xffff) {
-            throw new UnexpectedDataError(`Invalid group ID: ${groupId}`);
-        }
-        return NodeId(BigInt("0xFFFFFFFFFFFF" + groupId.toString(16).padStart(4, "0")));
+    export const isGroupNodeId = (nodeId: NodeId): boolean => {
+        const nodeIdHex = nodeId.toString(16);
+        return nodeIdHex.startsWith("ffffffffffff") && nodeIdHex.length === 16;
+    };
+
+    /** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
+    export const fromGroupId = (groupId: number): NodeId => {
+        return NodeId(BigInt("0xFFFFFFFFFFFF" + GroupId(groupId).toString(16).padStart(4, "0")));
     };
 
     /**

package/src/datatype/SubjectId.ts

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { toBigInt } from "#general";
+import { GroupId } from "./GroupId.js";
 import { NodeId, TlvNodeId } from "./NodeId.js";
 
 /**
@@ -12,7 +14,11 @@ import { NodeId, TlvNodeId } from "./NodeId.js";
  *
  * @see {@link MatterSpecification.v10.Core} § 6.6.2.1
  */
-export type SubjectId = NodeId; // Only NodeId is supported for now...
+export type SubjectId = NodeId | GroupId;
+
+export function SubjectId(v: bigint | number): SubjectId {
+    return toBigInt(v) as SubjectId;
+}
 
 /** Tlv schema for a Subject Id */
 export const TlvSubjectId = TlvNodeId;