@matter/nodejs 0.12.1 → 0.12.2-alpha.0-20250130-d012e3082
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.
|
@@ -34,9 +34,9 @@ class NodeJsNetwork extends import_general.Network {
|
|
|
34
34
|
static getMulticastInterfaceIpv4(netInterface) {
|
|
35
35
|
const netInterfaceInfo = (0, import_os.networkInterfaces)()[netInterface];
|
|
36
36
|
if (netInterfaceInfo === void 0) throw new import_general.NetworkError(`Unknown interface: ${netInterface}`);
|
|
37
|
-
for (const
|
|
38
|
-
if (
|
|
39
|
-
return address;
|
|
37
|
+
for (const info of netInterfaceInfo) {
|
|
38
|
+
if (familyIs(4, info)) {
|
|
39
|
+
return info.address;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
return void 0;
|
|
@@ -104,7 +104,7 @@ class NodeJsNetwork extends import_general.Network {
|
|
|
104
104
|
return netInterface;
|
|
105
105
|
}
|
|
106
106
|
if (netInterfaceInfos === void 0) return void 0;
|
|
107
|
-
return netInterfaceInfos.find((
|
|
107
|
+
return netInterfaceInfos.find((info) => familyIs(6, info) && info.address.startsWith("fe80::"))?.scopeid?.toString();
|
|
108
108
|
}
|
|
109
109
|
/**
|
|
110
110
|
* Get all network interfaces.
|
|
@@ -134,12 +134,15 @@ class NodeJsNetwork extends import_general.Network {
|
|
|
134
134
|
getIpMac(netInterface) {
|
|
135
135
|
const netInterfaceInfo = (0, import_os.networkInterfaces)()[netInterface];
|
|
136
136
|
if (netInterfaceInfo === void 0) return void 0;
|
|
137
|
-
const ipV4 = netInterfaceInfo.filter((
|
|
138
|
-
const ipV6 = netInterfaceInfo.filter((
|
|
137
|
+
const ipV4 = netInterfaceInfo.filter((info) => familyIs(4, info)).map(({ address }) => address);
|
|
138
|
+
const ipV6 = netInterfaceInfo.filter((info) => familyIs(6, info)).map(({ address }) => address);
|
|
139
139
|
return { mac: netInterfaceInfo[0].mac, ipV4, ipV6 };
|
|
140
140
|
}
|
|
141
141
|
createUdpChannel(options) {
|
|
142
142
|
return import_NodeJsUdpChannel.NodeJsUdpChannel.create(options);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
+
function familyIs(version, { family }) {
|
|
146
|
+
return family === `IPv${version}` || `${family}` === `${version}`;
|
|
147
|
+
}
|
|
145
148
|
//# sourceMappingURL=NodeJsNetwork.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/net/NodeJsNetwork.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAYO;AACP,gBAAwD;AACxD,8BAAiC;AApBjC;AAAA;AAAA;AAAA;AAAA;AAsBA,MAAM,SAAS,sBAAO,IAAI,aAAa;AAEhC,MAAM,sBAAsB,uBAAQ;AAAA,EACvC,OAAO,0BAA0B,cAA0C;AACvE,UAAM,uBAAmB,6BAAkB,EAAE,YAAY;AACzD,QAAI,qBAAqB,OAAW,OAAM,IAAI,4BAAa,sBAAsB,YAAY,EAAE;AAC/F,eAAW,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["netInterface"]
|
|
6
6
|
}
|
|
@@ -19,9 +19,9 @@ class NodeJsNetwork extends Network {
|
|
|
19
19
|
static getMulticastInterfaceIpv4(netInterface) {
|
|
20
20
|
const netInterfaceInfo = networkInterfaces()[netInterface];
|
|
21
21
|
if (netInterfaceInfo === void 0) throw new NetworkError(`Unknown interface: ${netInterface}`);
|
|
22
|
-
for (const
|
|
23
|
-
if (
|
|
24
|
-
return address;
|
|
22
|
+
for (const info of netInterfaceInfo) {
|
|
23
|
+
if (familyIs(4, info)) {
|
|
24
|
+
return info.address;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
return void 0;
|
|
@@ -89,7 +89,7 @@ class NodeJsNetwork extends Network {
|
|
|
89
89
|
return netInterface;
|
|
90
90
|
}
|
|
91
91
|
if (netInterfaceInfos === void 0) return void 0;
|
|
92
|
-
return netInterfaceInfos.find((
|
|
92
|
+
return netInterfaceInfos.find((info) => familyIs(6, info) && info.address.startsWith("fe80::"))?.scopeid?.toString();
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
95
95
|
* Get all network interfaces.
|
|
@@ -119,14 +119,17 @@ class NodeJsNetwork extends Network {
|
|
|
119
119
|
getIpMac(netInterface) {
|
|
120
120
|
const netInterfaceInfo = networkInterfaces()[netInterface];
|
|
121
121
|
if (netInterfaceInfo === void 0) return void 0;
|
|
122
|
-
const ipV4 = netInterfaceInfo.filter((
|
|
123
|
-
const ipV6 = netInterfaceInfo.filter((
|
|
122
|
+
const ipV4 = netInterfaceInfo.filter((info) => familyIs(4, info)).map(({ address }) => address);
|
|
123
|
+
const ipV6 = netInterfaceInfo.filter((info) => familyIs(6, info)).map(({ address }) => address);
|
|
124
124
|
return { mac: netInterfaceInfo[0].mac, ipV4, ipV6 };
|
|
125
125
|
}
|
|
126
126
|
createUdpChannel(options) {
|
|
127
127
|
return NodeJsUdpChannel.create(options);
|
|
128
128
|
}
|
|
129
129
|
}
|
|
130
|
+
function familyIs(version, { family }) {
|
|
131
|
+
return family === `IPv${version}` || `${family}` === `${version}`;
|
|
132
|
+
}
|
|
130
133
|
export {
|
|
131
134
|
NodeJsNetwork
|
|
132
135
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/net/NodeJsNetwork.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,OAGG;AACP,SAA+B,yBAAyB;AACxD,SAAS,wBAAwB;AAEjC,MAAM,SAAS,OAAO,IAAI,aAAa;AAEhC,MAAM,sBAAsB,QAAQ;AAAA,EACvC,OAAO,0BAA0B,cAA0C;AACvE,UAAM,mBAAmB,kBAAkB,EAAE,YAAY;AACzD,QAAI,qBAAqB,OAAW,OAAM,IAAI,aAAa,sBAAsB,YAAY,EAAE;AAC/F,eAAW,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["netInterface"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/nodejs",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.2-alpha.0-20250130-d012e3082",
|
|
4
4
|
"description": "Node.js platform support for matter.js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -44,18 +44,18 @@
|
|
|
44
44
|
"#*": "./src/*"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@matter/general": "0.12.
|
|
48
|
-
"@matter/node": "0.12.
|
|
49
|
-
"@matter/protocol": "0.12.
|
|
50
|
-
"@matter/types": "0.12.
|
|
47
|
+
"@matter/general": "0.12.2-alpha.0-20250130-d012e3082",
|
|
48
|
+
"@matter/node": "0.12.2-alpha.0-20250130-d012e3082",
|
|
49
|
+
"@matter/protocol": "0.12.2-alpha.0-20250130-d012e3082",
|
|
50
|
+
"@matter/types": "0.12.2-alpha.0-20250130-d012e3082",
|
|
51
51
|
"node-localstorage": "^3.0.5"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@matter/model": "0.12.
|
|
55
|
-
"@matter/protocol": "0.12.
|
|
56
|
-
"@matter/tools": "0.12.
|
|
57
|
-
"@matter/testing": "0.12.
|
|
58
|
-
"@project-chip/matter.js": "0.12.
|
|
54
|
+
"@matter/model": "0.12.2-alpha.0-20250130-d012e3082",
|
|
55
|
+
"@matter/protocol": "0.12.2-alpha.0-20250130-d012e3082",
|
|
56
|
+
"@matter/tools": "0.12.2-alpha.0-20250130-d012e3082",
|
|
57
|
+
"@matter/testing": "0.12.2-alpha.0-20250130-d012e3082",
|
|
58
|
+
"@project-chip/matter.js": "0.12.2-alpha.0-20250130-d012e3082",
|
|
59
59
|
"@types/bytebuffer": "^5.0.49",
|
|
60
60
|
"@types/node-localstorage": "^1.3.3"
|
|
61
61
|
},
|
package/src/net/NodeJsNetwork.ts
CHANGED
|
@@ -26,9 +26,9 @@ export class NodeJsNetwork extends Network {
|
|
|
26
26
|
static getMulticastInterfaceIpv4(netInterface: string): string | undefined {
|
|
27
27
|
const netInterfaceInfo = networkInterfaces()[netInterface];
|
|
28
28
|
if (netInterfaceInfo === undefined) throw new NetworkError(`Unknown interface: ${netInterface}`);
|
|
29
|
-
for (const
|
|
30
|
-
if (
|
|
31
|
-
return address;
|
|
29
|
+
for (const info of netInterfaceInfo) {
|
|
30
|
+
if (familyIs(4, info)) {
|
|
31
|
+
return info.address;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
return undefined;
|
|
@@ -113,7 +113,7 @@ export class NodeJsNetwork extends Network {
|
|
|
113
113
|
}
|
|
114
114
|
if (netInterfaceInfos === undefined) return undefined;
|
|
115
115
|
return netInterfaceInfos
|
|
116
|
-
.find((
|
|
116
|
+
.find(info => familyIs(6, info) && info.address.startsWith("fe80::"))
|
|
117
117
|
?.scopeid?.toString();
|
|
118
118
|
}
|
|
119
119
|
|
|
@@ -146,8 +146,8 @@ export class NodeJsNetwork extends Network {
|
|
|
146
146
|
getIpMac(netInterface: string): NetworkInterfaceDetails | undefined {
|
|
147
147
|
const netInterfaceInfo = networkInterfaces()[netInterface];
|
|
148
148
|
if (netInterfaceInfo === undefined) return undefined;
|
|
149
|
-
const ipV4 = netInterfaceInfo.filter(
|
|
150
|
-
const ipV6 = netInterfaceInfo.filter(
|
|
149
|
+
const ipV4 = netInterfaceInfo.filter(info => familyIs(4, info)).map(({ address }) => address);
|
|
150
|
+
const ipV6 = netInterfaceInfo.filter(info => familyIs(6, info)).map(({ address }) => address);
|
|
151
151
|
return { mac: netInterfaceInfo[0].mac, ipV4, ipV6 };
|
|
152
152
|
}
|
|
153
153
|
|
|
@@ -155,3 +155,8 @@ export class NodeJsNetwork extends Network {
|
|
|
155
155
|
return NodeJsUdpChannel.create(options);
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
|
+
|
|
159
|
+
function familyIs(version: number, { family }: NetworkInterfaceInfo) {
|
|
160
|
+
// Node 18.0 - 18.3 reported family as a single digit number instead of the documented string
|
|
161
|
+
return family === `IPv${version}` || `${family}` === `${version}`;
|
|
162
|
+
}
|