matterbridge 1.6.6-dev.13 → 1.6.6-dev.15

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.
Files changed (5) hide show
  1. package/CHANGELOG.md +1 -0
  2. package/dist/matterbridge.js +3 -3
  3. package/dist/matterbridgePlatform.js +22 -6
  4. package/npm-shrinkwrap.json +54 -54
  5. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -33,6 +33,7 @@ Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord
33
33
  - [package]: Update matter.js to 0.11.9-alpha.0-20241206-22f23333.
34
34
  - [package]: Update matter.js to 0.11.9-alpha.0-20241207-b604cfa44
35
35
  - [package]: Update matter.js to 0.11.9-alpha.0-20241209-06a8040e1
36
+ - [package]: Update matter.js to 0.11.9
36
37
  - [plugin]: Removed check on package types since we are moving to production plugins.
37
38
  - [package]: Set required node version to 18, 20 and 22.
38
39
  - [package]: Update dependencies.
package/dist/matterbridge.js CHANGED
@@ -2335,7 +2335,7 @@ export class Matterbridge extends EventEmitter {
2335
2335
  });
2336
2336
  this.expressApp.get('/api/devices', (req, res) => {
2337
2337
  this.log.debug('The frontend sent /api/devices');
2338
- const data = [];
2338
+ const devices = [];
2339
2339
  this.devices.forEach(async (device) => {
2340
2340
  const pluginName = device.plugin ?? 'Unknown';
2341
2341
  if (this.edge)
@@ -2353,7 +2353,7 @@ export class Matterbridge extends EventEmitter {
2353
2353
  if (!uniqueId)
2354
2354
  uniqueId = device.getClusterServer(BridgedDeviceBasicInformationCluster)?.attributes.uniqueId?.getLocal() ?? 'Unknown';
2355
2355
  const cluster = this.getClusterTextFromDevice(device);
2356
- data.push({
2356
+ devices.push({
2357
2357
  pluginName,
2358
2358
  type: device.name + ' (0x' + device.deviceType.toString(16).padStart(4, '0') + ')',
2359
2359
  endpoint: device.number,
@@ -2365,7 +2365,7 @@ export class Matterbridge extends EventEmitter {
2365
2365
  cluster: cluster,
2366
2366
  });
2367
2367
  });
2368
- res.json(data);
2368
+ res.json(devices);
2369
2369
  });
2370
2370
  this.expressApp.get('/api/devices_clusters/:selectedPluginName/:selectedDeviceEndpoint', (req, res) => {
2371
2371
  const selectedPluginName = req.params.selectedPluginName;
package/dist/matterbridgePlatform.js CHANGED
@@ -71,17 +71,33 @@ export class MatterbridgePlatform {
71
71
  return true;
72
72
  }
73
73
  validateDeviceWhiteBlackList(device, log = true) {
74
- if (isValidArray(this.config.whiteList, 1) && !this.config.whiteList.includes(device)) {
74
+ if (!Array.isArray(device))
75
+ device = [device];
76
+ let blackListBlocked = 0;
77
+ if (isValidArray(this.config.blackList, 1)) {
78
+ for (const d of device)
79
+ if (this.config.blackList.includes(d))
80
+ blackListBlocked++;
81
+ }
82
+ if (blackListBlocked > 0) {
75
83
  if (log)
76
- this.log.info(`Skipping device ${CYAN}${device}${nf} because not in whitelist`);
84
+ this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because in blacklist`);
77
85
  return false;
78
86
  }
79
- if (isValidArray(this.config.blackList, 1) && this.config.blackList.includes(device)) {
87
+ let whiteListPassed = 0;
88
+ if (isValidArray(this.config.whiteList, 1)) {
89
+ for (const d of device)
90
+ if (this.config.whiteList.includes(d))
91
+ whiteListPassed++;
92
+ }
93
+ else
94
+ whiteListPassed++;
95
+ if (whiteListPassed > 0) {
80
96
  if (log)
81
- this.log.info(`Skipping device ${CYAN}${device}${nf} because in blacklist`);
82
- return false;
97
+ this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because not in whitelist`);
98
+ return true;
83
99
  }
84
- return true;
100
+ return false;
85
101
  }
86
102
  validateEntityBlackList(device, entity, log = true) {
87
103
  if (isValidArray(this.config.entityBlackList, 1) && this.config.entityBlackList.find((e) => e === entity)) {
package/npm-shrinkwrap.json CHANGED
@@ -1,17 +1,17 @@
1
1
  {
2
2
  "name": "matterbridge",
3
- "version": "1.6.6-dev.13",
3
+ "version": "1.6.6-dev.15",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "matterbridge",
9
- "version": "1.6.6-dev.13",
9
+ "version": "1.6.6-dev.15",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
- "@matter/main": "^0.11.9-alpha.0-20241207-b604cfa44",
13
- "@matter/nodejs": "^0.11.9-alpha.0-20241207-b604cfa44",
14
- "@project-chip/matter.js": "^0.11.9-alpha.0-20241207-b604cfa44",
12
+ "@matter/main": "0.11.9",
13
+ "@matter/nodejs": "0.11.9",
14
+ "@project-chip/matter.js": "0.11.9",
15
15
  "archiver": "7.0.1",
16
16
  "express": "4.21.1",
17
17
  "glob": "11.0.0",
@@ -49,64 +49,64 @@
49
49
  }
50
50
  },
51
51
  "node_modules/@matter/general": {
52
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
53
- "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.11.9-alpha.0-20241209-06a8040e1.tgz",
54
- "integrity": "sha512-zVM9uSpDM8MTe2rMIqs03SHgP6bUQTxtcn+npq/MNYGtavPTKWiEHJouKwRlTeizpgch3Cz3KQeh3ox7Wrkf7w==",
52
+ "version": "0.11.9",
53
+ "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.11.9.tgz",
54
+ "integrity": "sha512-7TsG7/2xQMDq/qaHcx52H0KxQajV19CrhUGbf7NlxIzTYeUFBdr6ddxELuUVfGLIKS8NNwL8bs43kgOBV7VUsA==",
55
55
  "license": "Apache-2.0",
56
56
  "dependencies": {
57
57
  "@noble/curves": "^1.7.0"
58
58
  }
59
59
  },
60
60
  "node_modules/@matter/main": {
61
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
62
- "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.11.9-alpha.0-20241209-06a8040e1.tgz",
63
- "integrity": "sha512-GfY1RdwjVsX2/kLkSxmpov3aVCZHwZZDLLkVwGrhSC2YnAi9DT7eWnnztq7u5LAbd78VB8WgP4MCuggNEXUevQ==",
61
+ "version": "0.11.9",
62
+ "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.11.9.tgz",
63
+ "integrity": "sha512-CrGsvUq/aI4h2TsbupkUJGWnN92YfLIj++8eKXbF3X9PZqVLun6e5HAxUdgIJ33jdPFpSLXeCObuPhLCmxliLQ==",
64
64
  "license": "Apache-2.0",
65
65
  "dependencies": {
66
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
67
- "@matter/model": "0.11.9-alpha.0-20241209-06a8040e1",
68
- "@matter/node": "0.11.9-alpha.0-20241209-06a8040e1",
69
- "@matter/protocol": "0.11.9-alpha.0-20241209-06a8040e1",
70
- "@matter/types": "0.11.9-alpha.0-20241209-06a8040e1",
66
+ "@matter/general": "0.11.9",
67
+ "@matter/model": "0.11.9",
68
+ "@matter/node": "0.11.9",
69
+ "@matter/protocol": "0.11.9",
70
+ "@matter/types": "0.11.9",
71
71
  "@noble/curves": "^1.7.0"
72
72
  },
73
73
  "optionalDependencies": {
74
- "@matter/nodejs": "0.11.9-alpha.0-20241209-06a8040e1"
74
+ "@matter/nodejs": "0.11.9"
75
75
  }
76
76
  },
77
77
  "node_modules/@matter/model": {
78
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
79
- "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.11.9-alpha.0-20241209-06a8040e1.tgz",
80
- "integrity": "sha512-wijoOUoiokiBBAYpEncvFrq5eZL22HusE6KaW0ZPvDL8A5Y2aN6VRzXWPQV/E+wYplZzZkeRkeOlG86xLyclRA==",
78
+ "version": "0.11.9",
79
+ "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.11.9.tgz",
80
+ "integrity": "sha512-WU/SkLjeAScBiVwmkVAEWVSuGgYDMTQLmJH5nBrCsOPgcCzC4+fFt7aEfeobPl2+XrdkkKkhPuFkYXqNM73rQA==",
81
81
  "license": "Apache-2.0",
82
82
  "dependencies": {
83
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
83
+ "@matter/general": "0.11.9",
84
84
  "@noble/curves": "^1.7.0"
85
85
  }
86
86
  },
87
87
  "node_modules/@matter/node": {
88
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
89
- "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.11.9-alpha.0-20241209-06a8040e1.tgz",
90
- "integrity": "sha512-bc5Bsn2msZtu+2mjg/3QEJUSWCjOk4EQPUglCHx4ZWAVKaEop017Z5WOO9xIZfAK5Fhb3BbTML8Pagp4uX/rrg==",
88
+ "version": "0.11.9",
89
+ "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.11.9.tgz",
90
+ "integrity": "sha512-6Zbugz7JZnnFC45RdIwYacfLLLjpBM/PooVfR/LqcB7YdyIJRQN5o6Ws668bGTq6OEcjUAvA1tjbvA3bMMuiSw==",
91
91
  "license": "Apache-2.0",
92
92
  "dependencies": {
93
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
94
- "@matter/model": "0.11.9-alpha.0-20241209-06a8040e1",
95
- "@matter/protocol": "0.11.9-alpha.0-20241209-06a8040e1",
96
- "@matter/types": "0.11.9-alpha.0-20241209-06a8040e1",
93
+ "@matter/general": "0.11.9",
94
+ "@matter/model": "0.11.9",
95
+ "@matter/protocol": "0.11.9",
96
+ "@matter/types": "0.11.9",
97
97
  "@noble/curves": "^1.7.0"
98
98
  }
99
99
  },
100
100
  "node_modules/@matter/nodejs": {
101
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
102
- "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.11.9-alpha.0-20241209-06a8040e1.tgz",
103
- "integrity": "sha512-SuIC0qcUs0C+he5ZfSxZjp5VvCxFgjjPcKbJ7RHsd/ntbKCqYIWSpN8KuoZnCLLpm1gMIRfKrNe5f0N4A0jbow==",
101
+ "version": "0.11.9",
102
+ "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.11.9.tgz",
103
+ "integrity": "sha512-NJR2lKElalnjljl+KXgmXcLrdoaK4MH/BA57RYJ2KC3e5ZD+oxhFXfIxCUm37p7anlvv6GcK9ELkJyNaB0zg8A==",
104
104
  "license": "Apache-2.0",
105
105
  "dependencies": {
106
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
107
- "@matter/node": "0.11.9-alpha.0-20241209-06a8040e1",
108
- "@matter/protocol": "0.11.9-alpha.0-20241209-06a8040e1",
109
- "@matter/types": "0.11.9-alpha.0-20241209-06a8040e1",
106
+ "@matter/general": "0.11.9",
107
+ "@matter/node": "0.11.9",
108
+ "@matter/protocol": "0.11.9",
109
+ "@matter/types": "0.11.9",
110
110
  "node-localstorage": "^3.0.5"
111
111
  },
112
112
  "engines": {
@@ -114,25 +114,25 @@
114
114
  }
115
115
  },
116
116
  "node_modules/@matter/protocol": {
117
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
118
- "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.11.9-alpha.0-20241209-06a8040e1.tgz",
119
- "integrity": "sha512-b2Oq5hFLx5rohnmKuX0o55tVqfx7zaTYGwNoD82z0wQpd8wIw10sqbUnNyjDxB0DWPl1GAsw8ejebfNZ+eIiiA==",
117
+ "version": "0.11.9",
118
+ "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.11.9.tgz",
119
+ "integrity": "sha512-AJ+1IqG8ISiZIvt4ltvSOxP+2+5wojR/1ZKjD+Wt1DdzwJA6Byhg7BnstwveZM6vl6HnQ+ZJz71RKgzhBaZR1g==",
120
120
  "license": "Apache-2.0",
121
121
  "dependencies": {
122
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
123
- "@matter/model": "0.11.9-alpha.0-20241209-06a8040e1",
124
- "@matter/types": "0.11.9-alpha.0-20241209-06a8040e1",
122
+ "@matter/general": "0.11.9",
123
+ "@matter/model": "0.11.9",
124
+ "@matter/types": "0.11.9",
125
125
  "@noble/curves": "^1.7.0"
126
126
  }
127
127
  },
128
128
  "node_modules/@matter/types": {
129
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
130
- "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.11.9-alpha.0-20241209-06a8040e1.tgz",
131
- "integrity": "sha512-nDiNxMWKzcMyvbr0CiYy5YwhPvcVYUdnLMtWYyXUxLPirJgLcnXBtiyyWdjHYy46jBYf8FzQrbOgnutHqVYQ9A==",
129
+ "version": "0.11.9",
130
+ "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.11.9.tgz",
131
+ "integrity": "sha512-TcPVAXlfON84Uz6JeWYlc613GqXAHeh26mraLHq3dhbGyOOVJ25HpZTFN0q/IvDrRlyI8eOihAgk4iEMvihlnA==",
132
132
  "license": "Apache-2.0",
133
133
  "dependencies": {
134
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
135
- "@matter/model": "0.11.9-alpha.0-20241209-06a8040e1",
134
+ "@matter/general": "0.11.9",
135
+ "@matter/model": "0.11.9",
136
136
  "@noble/curves": "^1.7.0"
137
137
  }
138
138
  },
@@ -174,16 +174,16 @@
174
174
  }
175
175
  },
176
176
  "node_modules/@project-chip/matter.js": {
177
- "version": "0.11.9-alpha.0-20241209-06a8040e1",
178
- "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.11.9-alpha.0-20241209-06a8040e1.tgz",
179
- "integrity": "sha512-LMH9l03iBaFVWEexTIrggm+rvatgO2ohMfsYwlFxs+/J98kVsdzVU2x7bZ68A4L79p1yyrCmghN2IrD3jpX88A==",
177
+ "version": "0.11.9",
178
+ "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.11.9.tgz",
179
+ "integrity": "sha512-r0ZXAdq2lB5w7pxkVjr/huo9hLeahUJIIxuJraXa980v67U8JNAzOOtrGboxvfgceCvDdWD40AD/1SRNnBF3gw==",
180
180
  "license": "Apache-2.0",
181
181
  "dependencies": {
182
- "@matter/general": "0.11.9-alpha.0-20241209-06a8040e1",
183
- "@matter/model": "0.11.9-alpha.0-20241209-06a8040e1",
184
- "@matter/node": "0.11.9-alpha.0-20241209-06a8040e1",
185
- "@matter/protocol": "0.11.9-alpha.0-20241209-06a8040e1",
186
- "@matter/types": "0.11.9-alpha.0-20241209-06a8040e1",
182
+ "@matter/general": "0.11.9",
183
+ "@matter/model": "0.11.9",
184
+ "@matter/node": "0.11.9",
185
+ "@matter/protocol": "0.11.9",
186
+ "@matter/types": "0.11.9",
187
187
  "@noble/curves": "^1.7.0"
188
188
  }
189
189
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "matterbridge",
3
- "version": "1.6.6-dev.13",
3
+ "version": "1.6.6-dev.15",
4
4
  "description": "Matterbridge plugin manager for Matter",
5
5
  "author": "https://github.com/Luligu",
6
6
  "license": "Apache-2.0",
@@ -75,9 +75,9 @@
75
75
  }
76
76
  },
77
77
  "dependencies": {
78
- "@matter/main": "^0.11.9-alpha.0-20241207-b604cfa44",
79
- "@matter/nodejs": "^0.11.9-alpha.0-20241207-b604cfa44",
80
- "@project-chip/matter.js": "^0.11.9-alpha.0-20241207-b604cfa44",
78
+ "@matter/main": "0.11.9",
79
+ "@matter/nodejs": "0.11.9",
80
+ "@project-chip/matter.js": "0.11.9",
81
81
  "archiver": "7.0.1",
82
82
  "express": "4.21.1",
83
83
  "glob": "11.0.0",