@matter/types 0.16.0-alpha.0-20251203-aaf94bca8 → 0.16.0-alpha.0-20251207-37e501b18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/datatype/GroupId.js +1 -1
- package/dist/cjs/datatype/GroupId.js.map +1 -1
- package/dist/cjs/datatype/NodeId.d.ts.map +1 -1
- package/dist/cjs/datatype/NodeId.js +4 -4
- package/dist/cjs/datatype/NodeId.js.map +1 -1
- package/dist/esm/datatype/GroupId.js +1 -1
- package/dist/esm/datatype/GroupId.js.map +1 -1
- package/dist/esm/datatype/NodeId.d.ts.map +1 -1
- package/dist/esm/datatype/NodeId.js +5 -5
- package/dist/esm/datatype/NodeId.js.map +1 -1
- package/package.json +5 -5
- package/src/datatype/GroupId.ts +1 -1
- package/src/datatype/NodeId.ts +5 -5
|
@@ -54,7 +54,7 @@ function GroupId(groupId, validate = true) {
|
|
|
54
54
|
GroupId2.assertGroupId = assertGroupId;
|
|
55
55
|
function fromNodeId(nodeId) {
|
|
56
56
|
if (!(0, GroupId2.isGroupNodeId)(nodeId)) {
|
|
57
|
-
throw new import_general.InternalError(`
|
|
57
|
+
throw new import_general.InternalError(`Node ID ${nodeId} is not a group node ID`);
|
|
58
58
|
}
|
|
59
59
|
const groupId = Number(nodeId & BigInt(65535));
|
|
60
60
|
return GroupId2(groupId);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/datatype/GroupId.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA4D;AAC5D,6BAAwD;AACxD,uBAA0B;AAC1B,wBAA2B;AAT3B;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,KAACA,SAAA,eAAc,MAAM,GAAG;AACxB,YAAM,IAAI,6BAAc,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA4D;AAC5D,6BAAwD;AACxD,uBAA0B;AAC1B,wBAA2B;AAT3B;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,KAACA,SAAA,eAAc,MAAM,GAAG;AACxB,YAAM,IAAI,6BAAc,WAAW,MAAM,yBAAyB;AAAA,IACtE;AAEA,UAAM,UAAU,OAAO,SAAS,OAAO,KAAM,CAAC;AAE9C,WAAOA,SAAQ,OAAO;AAAA,EAC1B;AARO,EAAAA,SAAS;AAWT,EAAMA,SAAA,gBAAgB,CAAC,WAA4B;AACtD,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,cAAc,KAAK,UAAU,WAAW;AAAA,EACxE;AAAA,GAxCa;AA4CV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
|
|
5
5
|
"names": ["GroupId"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAS,MAAM,EAAwC,MAAM,UAAU,CAAC;AAExF,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,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAE9D;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,GAAI,QAAQ,MAAM,KAAG,MAOxD,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,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"}
|
|
@@ -56,19 +56,19 @@ function NodeId(v) {
|
|
|
56
56
|
return nodeId >= OPERATIONAL_NODE_MIN && nodeId <= OPERATIONAL_NODE_MAX;
|
|
57
57
|
};
|
|
58
58
|
NodeId2.fromGroupId = (groupId) => {
|
|
59
|
-
return NodeId2(BigInt("0xFFFFFFFFFFFF" + (0, import_GroupId.GroupId)(groupId)
|
|
59
|
+
return NodeId2(BigInt("0xFFFFFFFFFFFF" + import_general.hex.byte((0, import_GroupId.GroupId)(groupId))));
|
|
60
60
|
};
|
|
61
61
|
NodeId2.fromTemporaryLocalNodeId = (id) => {
|
|
62
62
|
if (id < 0 || id > 4294967295) {
|
|
63
63
|
throw new import_general.UnexpectedDataError(`Invalid ID: ${id}`);
|
|
64
64
|
}
|
|
65
|
-
return NodeId2(BigInt("0xFFFFFFFE" +
|
|
65
|
+
return NodeId2(BigInt("0xFFFFFFFE" + import_general.hex.fixed(id, 8)));
|
|
66
66
|
};
|
|
67
67
|
NodeId2.fromCaseAuthenticatedTag = (id) => {
|
|
68
68
|
if (id < 0 || id > 4294967295) {
|
|
69
69
|
throw new import_general.UnexpectedDataError(`Invalid CASE Authenticated tag: ${id}`);
|
|
70
70
|
}
|
|
71
|
-
return NodeId2(BigInt("0xFFFFFFFD" +
|
|
71
|
+
return NodeId2(BigInt("0xFFFFFFFD" + import_general.hex.fixed(id, 8)));
|
|
72
72
|
};
|
|
73
73
|
NodeId2.isCaseAuthenticatedTag = (nodeId) => {
|
|
74
74
|
const nodeIdHex = nodeId.toString(16);
|
|
@@ -84,7 +84,7 @@ function NodeId(v) {
|
|
|
84
84
|
if (id < 0 || id > 4294967295) {
|
|
85
85
|
throw new import_general.UnexpectedDataError(`Invalid ID: ${id}`);
|
|
86
86
|
}
|
|
87
|
-
return NodeId2(BigInt("0xFFFFFFFB" +
|
|
87
|
+
return NodeId2(BigInt("0xFFFFFFFB" + import_general.hex.fixed(id, 8)));
|
|
88
88
|
};
|
|
89
89
|
})(NodeId || (NodeId = {}));
|
|
90
90
|
const TlvNodeId = new import_TlvWrapper.TlvWrapper(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/datatype/NodeId.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwB;AACxB,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwB;AACxB,qBAA6E;AAC7E,uBAA0B;AAC1B,wBAA2B;AAC3B,kCAAqC;AAVrC;AAAA;AAAA;AAAA;AAAA;AAoBO,SAAS,OAAO,GAAyC;AAC5D,SAAO,OAAO,CAAC;AACnB;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,CAAC,WAA2B;AAC/D,WAAO,MAAM;AACT,YAAM,eAAe,OAAO,aAAa,CAAC;AAC1C,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,cAAc,CAAC,YAA4B;AACpD,WAAOA,QAAO,OAAO,mBAAmB,mBAAI,SAAK,wBAAQ,OAAO,CAAC,CAAC,CAAC;AAAA,EACvE;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,mBAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;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,mBAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;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,mBAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;AAAA,GAvFa;AA2FV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
|
|
5
5
|
"names": ["NodeId"]
|
|
6
6
|
}
|
|
@@ -30,7 +30,7 @@ function GroupId(groupId, validate = true) {
|
|
|
30
30
|
GroupId2.assertGroupId = assertGroupId;
|
|
31
31
|
function fromNodeId(nodeId) {
|
|
32
32
|
if (!(0, GroupId2.isGroupNodeId)(nodeId)) {
|
|
33
|
-
throw new InternalError(`
|
|
33
|
+
throw new InternalError(`Node ID ${nodeId} is not a group node ID`);
|
|
34
34
|
}
|
|
35
35
|
const groupId = Number(nodeId & BigInt(65535));
|
|
36
36
|
return GroupId2(groupId);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/datatype/GroupId.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,eAAe,2BAA2B;AAC5D,SAAS,4BAA4B,mBAAmB;AACxD,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAiBpB,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,KAACA,SAAA,eAAc,MAAM,GAAG;AACxB,YAAM,IAAI,cAAc,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAkB,eAAe,2BAA2B;AAC5D,SAAS,4BAA4B,mBAAmB;AACxD,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAiBpB,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,KAACA,SAAA,eAAc,MAAM,GAAG;AACxB,YAAM,IAAI,cAAc,WAAW,MAAM,yBAAyB;AAAA,IACtE;AAEA,UAAM,UAAU,OAAO,SAAS,OAAO,KAAM,CAAC;AAE9C,WAAOA,SAAQ,OAAO;AAAA,EAC1B;AARO,EAAAA,SAAS;AAWT,EAAMA,SAAA,gBAAgB,CAAC,WAA4B;AACtD,UAAM,YAAY,OAAO,SAAS,EAAE;AACpC,WAAO,UAAU,WAAW,cAAc,KAAK,UAAU,WAAW;AAAA,EACxE;AAAA,GAxCa;AA4CV,MAAM,aAAa,IAAI;AAAA,EAC1B;AAAA,EACA,aAAW;AAAA,EACX,WAAS,QAAQ,OAAO,KAAK;AAAA;AACjC;",
|
|
5
5
|
"names": ["GroupId"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"NodeId.d.ts","sourceRoot":"","sources":["../../../src/datatype/NodeId.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAS,MAAM,EAAwC,MAAM,UAAU,CAAC;AAExF,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,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAE9D;AAED,yBAAiB,MAAM,CAAC;IAIpB;;;OAGG;IACI,MAAM,mBAAmB,QAAY,CAAC;IAEtC,MAAM,WAAW,GAAI,QAAQ,MAAM,WAIzC,CAAC;IAEF;;;;OAIG;IACI,MAAM,uBAAuB,GAAI,QAAQ,MAAM,KAAG,MAOxD,CAAC;IAEF;;OAEG;IACI,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAEpD,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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { GroupId } from "#datatype/GroupId.js";
|
|
7
|
-
import { Bytes, DataWriter, UnexpectedDataError } from "#general";
|
|
7
|
+
import { Bytes, DataWriter, hex, UnexpectedDataError } from "#general";
|
|
8
8
|
import { TlvUInt64 } from "../tlv/TlvNumber.js";
|
|
9
9
|
import { TlvWrapper } from "../tlv/TlvWrapper.js";
|
|
10
10
|
import { CaseAuthenticatedTag } from "./CaseAuthenticatedTag.js";
|
|
@@ -32,19 +32,19 @@ function NodeId(v) {
|
|
|
32
32
|
return nodeId >= OPERATIONAL_NODE_MIN && nodeId <= OPERATIONAL_NODE_MAX;
|
|
33
33
|
};
|
|
34
34
|
NodeId2.fromGroupId = (groupId) => {
|
|
35
|
-
return NodeId2(BigInt("0xFFFFFFFFFFFF" + GroupId(groupId)
|
|
35
|
+
return NodeId2(BigInt("0xFFFFFFFFFFFF" + hex.byte(GroupId(groupId))));
|
|
36
36
|
};
|
|
37
37
|
NodeId2.fromTemporaryLocalNodeId = (id) => {
|
|
38
38
|
if (id < 0 || id > 4294967295) {
|
|
39
39
|
throw new UnexpectedDataError(`Invalid ID: ${id}`);
|
|
40
40
|
}
|
|
41
|
-
return NodeId2(BigInt("0xFFFFFFFE" +
|
|
41
|
+
return NodeId2(BigInt("0xFFFFFFFE" + hex.fixed(id, 8)));
|
|
42
42
|
};
|
|
43
43
|
NodeId2.fromCaseAuthenticatedTag = (id) => {
|
|
44
44
|
if (id < 0 || id > 4294967295) {
|
|
45
45
|
throw new UnexpectedDataError(`Invalid CASE Authenticated tag: ${id}`);
|
|
46
46
|
}
|
|
47
|
-
return NodeId2(BigInt("0xFFFFFFFD" +
|
|
47
|
+
return NodeId2(BigInt("0xFFFFFFFD" + hex.fixed(id, 8)));
|
|
48
48
|
};
|
|
49
49
|
NodeId2.isCaseAuthenticatedTag = (nodeId) => {
|
|
50
50
|
const nodeIdHex = nodeId.toString(16);
|
|
@@ -60,7 +60,7 @@ function NodeId(v) {
|
|
|
60
60
|
if (id < 0 || id > 4294967295) {
|
|
61
61
|
throw new UnexpectedDataError(`Invalid ID: ${id}`);
|
|
62
62
|
}
|
|
63
|
-
return NodeId2(BigInt("0xFFFFFFFB" +
|
|
63
|
+
return NodeId2(BigInt("0xFFFFFFFB" + hex.fixed(id, 8)));
|
|
64
64
|
};
|
|
65
65
|
})(NodeId || (NodeId = {}));
|
|
66
66
|
const TlvNodeId = new TlvWrapper(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/datatype/NodeId.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,eAAe;AACxB,SAAkB,OAAe,YAAY,2BAA2B;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,eAAe;AACxB,SAAkB,OAAe,YAAY,KAAK,2BAA2B;AAC7E,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AAU9B,SAAS,OAAO,GAAyC;AAC5D,SAAO,OAAO,CAAC;AACnB;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,CAAC,WAA2B;AAC/D,WAAO,MAAM;AACT,YAAM,eAAe,OAAO,aAAa,CAAC;AAC1C,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,cAAc,CAAC,YAA4B;AACpD,WAAOA,QAAO,OAAO,mBAAmB,IAAI,KAAK,QAAQ,OAAO,CAAC,CAAC,CAAC;AAAA,EACvE;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,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;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,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;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,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AAAA,EACzD;AAAA,GAvFa;AA2FV,MAAM,YAAY,IAAI;AAAA,EACzB;AAAA,EACA,YAAU;AAAA,EACV,WAAS,OAAO,OAAO,KAAK,CAAC;AACjC;",
|
|
5
5
|
"names": ["NodeId"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/types",
|
|
3
|
-
"version": "0.16.0-alpha.0-
|
|
3
|
+
"version": "0.16.0-alpha.0-20251207-37e501b18",
|
|
4
4
|
"description": "Definitions for Matter application",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -33,12 +33,12 @@
|
|
|
33
33
|
"embed-examples": "embedme **/README.md"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@matter/general": "0.16.0-alpha.0-
|
|
37
|
-
"@matter/model": "0.16.0-alpha.0-
|
|
36
|
+
"@matter/general": "0.16.0-alpha.0-20251207-37e501b18",
|
|
37
|
+
"@matter/model": "0.16.0-alpha.0-20251207-37e501b18"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@matter/tools": "0.16.0-alpha.0-
|
|
41
|
-
"@matter/testing": "0.16.0-alpha.0-
|
|
40
|
+
"@matter/tools": "0.16.0-alpha.0-20251207-37e501b18",
|
|
41
|
+
"@matter/testing": "0.16.0-alpha.0-20251207-37e501b18"
|
|
42
42
|
},
|
|
43
43
|
"files": [
|
|
44
44
|
"dist/**/*",
|
package/src/datatype/GroupId.ts
CHANGED
|
@@ -59,7 +59,7 @@ export namespace GroupId {
|
|
|
59
59
|
|
|
60
60
|
export function fromNodeId(nodeId: NodeId): GroupId {
|
|
61
61
|
if (!isGroupNodeId(nodeId)) {
|
|
62
|
-
throw new InternalError(`
|
|
62
|
+
throw new InternalError(`Node ID ${nodeId} is not a group node ID`);
|
|
63
63
|
}
|
|
64
64
|
// NodeId is a 64-bit value, where the lower 16 bits represent the GroupId
|
|
65
65
|
const groupId = Number(nodeId & BigInt(0xffff));
|
package/src/datatype/NodeId.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { GroupId } from "#datatype/GroupId.js";
|
|
8
|
-
import { Branded, Bytes, Crypto, DataWriter, UnexpectedDataError } from "#general";
|
|
8
|
+
import { Branded, Bytes, Crypto, DataWriter, hex, UnexpectedDataError } from "#general";
|
|
9
9
|
import { TlvUInt64 } from "../tlv/TlvNumber.js";
|
|
10
10
|
import { TlvWrapper } from "../tlv/TlvWrapper.js";
|
|
11
11
|
import { CaseAuthenticatedTag } from "./CaseAuthenticatedTag.js";
|
|
@@ -61,7 +61,7 @@ export namespace NodeId {
|
|
|
61
61
|
|
|
62
62
|
/** A Group Node ID is a 64-bit Node ID that contains a particular Group ID in the lower half of the Node ID. */
|
|
63
63
|
export const fromGroupId = (groupId: number): NodeId => {
|
|
64
|
-
return NodeId(BigInt("0xFFFFFFFFFFFF" + GroupId(groupId)
|
|
64
|
+
return NodeId(BigInt("0xFFFFFFFFFFFF" + hex.byte(GroupId(groupId))));
|
|
65
65
|
};
|
|
66
66
|
|
|
67
67
|
/**
|
|
@@ -73,7 +73,7 @@ export namespace NodeId {
|
|
|
73
73
|
if (id < 0 || id > 0xffffffff) {
|
|
74
74
|
throw new UnexpectedDataError(`Invalid ID: ${id}`);
|
|
75
75
|
}
|
|
76
|
-
return NodeId(BigInt("0xFFFFFFFE" +
|
|
76
|
+
return NodeId(BigInt("0xFFFFFFFE" + hex.fixed(id, 8)));
|
|
77
77
|
};
|
|
78
78
|
|
|
79
79
|
/**
|
|
@@ -84,7 +84,7 @@ export namespace NodeId {
|
|
|
84
84
|
if (id < 0 || id > 0xffffffff) {
|
|
85
85
|
throw new UnexpectedDataError(`Invalid CASE Authenticated tag: ${id}`);
|
|
86
86
|
}
|
|
87
|
-
return NodeId(BigInt("0xFFFFFFFD" +
|
|
87
|
+
return NodeId(BigInt("0xFFFFFFFD" + hex.fixed(id, 8)));
|
|
88
88
|
};
|
|
89
89
|
|
|
90
90
|
export const isCaseAuthenticatedTag = (nodeId: NodeId): boolean => {
|
|
@@ -108,7 +108,7 @@ export namespace NodeId {
|
|
|
108
108
|
if (id < 0 || id > 0xffffffff) {
|
|
109
109
|
throw new UnexpectedDataError(`Invalid ID: ${id}`);
|
|
110
110
|
}
|
|
111
|
-
return NodeId(BigInt("0xFFFFFFFB" +
|
|
111
|
+
return NodeId(BigInt("0xFFFFFFFB" + hex.fixed(id, 8)));
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
|