zigbee-herdsman 3.2.7 → 3.3.1
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/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +23 -0
- package/dist/adapter/adapterDiscovery.d.ts +16 -5
- package/dist/adapter/adapterDiscovery.d.ts.map +1 -1
- package/dist/adapter/adapterDiscovery.js +112 -43
- package/dist/adapter/adapterDiscovery.js.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +8 -5
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/utils/math.d.ts.map +1 -1
- package/dist/adapter/tstype.d.ts +2 -2
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/channel-list.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/has-configured.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nib.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/utils/channel-list.d.ts.map +1 -1
- package/dist/adapter/z-stack/utils/network-options.d.ts.map +1 -1
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +11 -3
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/group.d.ts +2 -1
- package/dist/controller/model/group.d.ts.map +1 -1
- package/dist/controller/model/group.js +23 -13
- package/dist/controller/model/group.js.map +1 -1
- package/dist/utils/backup.d.ts.map +1 -1
- package/dist/zspec/utils.d.ts.map +1 -1
- package/dist/zspec/zdo/utils.d.ts.map +1 -1
- package/package.json +12 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [3.3.1](https://github.com/Koenkk/zigbee-herdsman/compare/v3.3.0...v3.3.1) (2025-03-09)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* Ember: Lumi manuf code workaround for permit join ([#1334](https://github.com/Koenkk/zigbee-herdsman/issues/1334)) ([b87246b](https://github.com/Koenkk/zigbee-herdsman/commit/b87246b9b2221a1366f7f40839bd2cbcebae9989))
|
|
9
|
+
* **ignore:** update dependencies ([#1335](https://github.com/Koenkk/zigbee-herdsman/issues/1335)) ([84f16d7](https://github.com/Koenkk/zigbee-herdsman/commit/84f16d7e46038a8b0513addae156dcbb5bb1f0d6))
|
|
10
|
+
|
|
11
|
+
## [3.3.0](https://github.com/Koenkk/zigbee-herdsman/compare/v3.2.7...v3.3.0) (2025-03-06)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* Add util to discover all serial/mDNS devices ([#1333](https://github.com/Koenkk/zigbee-herdsman/issues/1333)) ([fb27845](https://github.com/Koenkk/zigbee-herdsman/commit/fb27845215fc1d3b867e944823b588ced9bc0978))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### Bug Fixes
|
|
20
|
+
|
|
21
|
+
* Endpoint device & group members typing ([#1330](https://github.com/Koenkk/zigbee-herdsman/issues/1330)) ([d668227](https://github.com/Koenkk/zigbee-herdsman/commit/d668227236feeb43e7995b45ea4bef25389b7a50))
|
|
22
|
+
* **ignore:** remove obsolete @types/eslint__js ([bb51058](https://github.com/Koenkk/zigbee-herdsman/commit/bb510581e2cd57a5a2d0177396c3026c9fc5635a))
|
|
23
|
+
* **ignore:** update dependencies ([#1324](https://github.com/Koenkk/zigbee-herdsman/issues/1324)) ([572c4b8](https://github.com/Koenkk/zigbee-herdsman/commit/572c4b8f4580da9c0a353b50f9a155c4a360d19e))
|
|
24
|
+
* **ignore:** update dependencies ([#1329](https://github.com/Koenkk/zigbee-herdsman/issues/1329)) ([80009db](https://github.com/Koenkk/zigbee-herdsman/commit/80009db8b62b8c957c8a156a793a55d2eef7e9bc))
|
|
25
|
+
|
|
3
26
|
## [3.2.7](https://github.com/Koenkk/zigbee-herdsman/compare/v3.2.6...v3.2.7) (2025-02-24)
|
|
4
27
|
|
|
5
28
|
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import type { Adapter, DiscoverableUsbAdapter, UsbAdapterFingerprint } from './tstype';
|
|
1
2
|
import { PortInfo } from '@serialport/bindings-cpp';
|
|
2
|
-
|
|
3
|
-
export declare function
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function
|
|
6
|
-
export declare function
|
|
3
|
+
declare function matchUsbFingerprint(portInfo: PortInfo, entries: UsbAdapterFingerprint[], isWindows: boolean, conflictProne: boolean): [path: PortInfo['path'], score: number] | undefined;
|
|
4
|
+
export declare function matchUsbAdapter(adapter: Adapter, path: string): Promise<boolean>;
|
|
5
|
+
export declare function findUsbAdapterBestMatch(adapter: Adapter | undefined, portInfo: PortInfo, isWindows: boolean, conflictProne: boolean): Promise<[DiscoverableUsbAdapter, NonNullable<ReturnType<typeof matchUsbFingerprint>>] | undefined>;
|
|
6
|
+
export declare function findUsbAdapter(adapter?: Adapter, path?: string): Promise<[adapter: DiscoverableUsbAdapter, path: PortInfo['path']] | undefined>;
|
|
7
|
+
export declare function findMdnsAdapter(path: string): Promise<[adapter: Adapter, path: string]>;
|
|
8
|
+
export declare function findTcpAdapter(path: string, adapter?: Adapter): Promise<[adapter: Adapter, path: string]>;
|
|
7
9
|
/**
|
|
8
10
|
* Discover adapter using mDNS, TCP or USB.
|
|
9
11
|
*
|
|
@@ -19,4 +21,13 @@ export declare function findTCPAdapter(path: string, adapter?: Adapter): Promise
|
|
|
19
21
|
* @returns path Path to adapter.
|
|
20
22
|
*/
|
|
21
23
|
export declare function discoverAdapter(adapter?: Adapter, path?: string): Promise<[adapter: Adapter, path: string]>;
|
|
24
|
+
/**
|
|
25
|
+
* @returns List of all serial and mDNS devices found, with matching `adapter` if available
|
|
26
|
+
*/
|
|
27
|
+
export declare function findAllDevices(): Promise<{
|
|
28
|
+
name: string;
|
|
29
|
+
path: string;
|
|
30
|
+
adapter?: Adapter;
|
|
31
|
+
}[]>;
|
|
32
|
+
export {};
|
|
22
33
|
//# sourceMappingURL=adapterDiscovery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapterDiscovery.d.ts","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapterDiscovery.d.ts","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAKrF,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AA8RlD,iBAAS,mBAAmB,CACxB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,qBAAqB,EAAE,EAChC,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACvB,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,SAAS,CAqDrD;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBtF;AAED,wBAAsB,uBAAuB,CACzC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACvB,OAAO,CAAC,CAAC,sBAAsB,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAsBpG;AAED,wBAAsB,cAAc,CAChC,OAAO,CAAC,EAAE,OAAO,EACjB,IAAI,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,OAAO,EAAE,sBAAsB,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAwBhF;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAyC7F;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAc/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAkCjH;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAC,EAAE,CAAC,CAyDjG"}
|
|
@@ -3,14 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
6
|
+
exports.matchUsbAdapter = matchUsbAdapter;
|
|
7
|
+
exports.findUsbAdapterBestMatch = findUsbAdapterBestMatch;
|
|
8
|
+
exports.findUsbAdapter = findUsbAdapter;
|
|
9
|
+
exports.findMdnsAdapter = findMdnsAdapter;
|
|
10
|
+
exports.findTcpAdapter = findTcpAdapter;
|
|
10
11
|
exports.discoverAdapter = discoverAdapter;
|
|
12
|
+
exports.findAllDevices = findAllDevices;
|
|
11
13
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
14
|
const node_os_1 = require("node:os");
|
|
13
15
|
const bonjour_service_1 = require("bonjour-service");
|
|
16
|
+
const utils_1 = require("../utils");
|
|
14
17
|
const logger_1 = require("../utils/logger");
|
|
15
18
|
const serialPort_1 = require("./serialPort");
|
|
16
19
|
const NS = 'zh:adapter:discovery';
|
|
@@ -244,6 +247,8 @@ const USB_FINGERPRINTS = {
|
|
|
244
247
|
* Vendor and Product IDs that are prone to conflict if only matching on vendorId+productId.
|
|
245
248
|
*/
|
|
246
249
|
const USB_FINGERPRINTS_CONFLICT_IDS = ['10c4:ea60'];
|
|
250
|
+
/** Time allotted for mDNS scanning */
|
|
251
|
+
const MDNS_SCAN_TIME = 2000;
|
|
247
252
|
async function getSerialPortList() {
|
|
248
253
|
const portInfos = await serialPort_1.SerialPort.list();
|
|
249
254
|
// TODO: can sorting be removed in favor of `path` regex matching?
|
|
@@ -272,51 +277,51 @@ function matchString(str1, str2) {
|
|
|
272
277
|
function matchRegex(regexStr, str) {
|
|
273
278
|
return str !== undefined && new RegExp(regexStr, 'i').test(str);
|
|
274
279
|
}
|
|
275
|
-
function
|
|
280
|
+
function matchUsbFingerprint(portInfo, entries, isWindows, conflictProne) {
|
|
276
281
|
if (!portInfo.vendorId || !portInfo.productId) {
|
|
277
282
|
// port info is missing essential information for proper matching, ignore it
|
|
278
283
|
return;
|
|
279
284
|
}
|
|
280
285
|
let match;
|
|
281
|
-
let score = 0 /*
|
|
286
|
+
let score = 0 /* UsbFingerprintMatchScore.NONE */;
|
|
282
287
|
for (const entry of entries) {
|
|
283
288
|
if (!matchString(portInfo.vendorId, entry.vendorId) || !matchString(portInfo.productId, entry.productId)) {
|
|
284
289
|
continue;
|
|
285
290
|
}
|
|
286
291
|
// allow matching on vendorId+productId only on Windows
|
|
287
|
-
if (score < 1 /*
|
|
292
|
+
if (score < 1 /* UsbFingerprintMatchScore.VID_PID */ && isWindows) {
|
|
288
293
|
match = entry;
|
|
289
|
-
score = 1 /*
|
|
294
|
+
score = 1 /* UsbFingerprintMatchScore.VID_PID */;
|
|
290
295
|
}
|
|
291
|
-
if (score < 2 /*
|
|
296
|
+
if (score < 2 /* UsbFingerprintMatchScore.VID_PID_MANUF */ &&
|
|
292
297
|
entry.manufacturer &&
|
|
293
298
|
portInfo.manufacturer &&
|
|
294
299
|
matchString(portInfo.manufacturer, entry.manufacturer)) {
|
|
295
300
|
match = entry;
|
|
296
|
-
score = 2 /*
|
|
301
|
+
score = 2 /* UsbFingerprintMatchScore.VID_PID_MANUF */;
|
|
297
302
|
if (isWindows && !conflictProne) {
|
|
298
303
|
// path will never match on Windows (COMx), assume vendor+product+manufacturer is "exact match"
|
|
299
304
|
// except for conflict-prone, since it could easily return a mismatch (better to return no match and force manual config)
|
|
300
305
|
return [portInfo.path, score];
|
|
301
306
|
}
|
|
302
307
|
}
|
|
303
|
-
if (score < 3 /*
|
|
308
|
+
if (score < 3 /* UsbFingerprintMatchScore.VID_PID_PATH */ &&
|
|
304
309
|
entry.pathRegex &&
|
|
305
310
|
(matchRegex(entry.pathRegex, portInfo.path) || matchRegex(entry.pathRegex, portInfo.pnpId))) {
|
|
306
|
-
if (score === 2 /*
|
|
311
|
+
if (score === 2 /* UsbFingerprintMatchScore.VID_PID_MANUF */) {
|
|
307
312
|
// best possible match, return early
|
|
308
|
-
return [portInfo.path, 4 /*
|
|
313
|
+
return [portInfo.path, 4 /* UsbFingerprintMatchScore.VID_PID_MANUF_PATH */];
|
|
309
314
|
}
|
|
310
315
|
else {
|
|
311
316
|
match = entry;
|
|
312
|
-
score = 3 /*
|
|
317
|
+
score = 3 /* UsbFingerprintMatchScore.VID_PID_PATH */;
|
|
313
318
|
}
|
|
314
319
|
}
|
|
315
320
|
}
|
|
316
321
|
// poor match only returned if port info not conflict-prone
|
|
317
|
-
return match && (score > 1 /*
|
|
322
|
+
return match && (score > 1 /* UsbFingerprintMatchScore.VID_PID */ || !conflictProne) ? [portInfo.path, score] : undefined;
|
|
318
323
|
}
|
|
319
|
-
async function
|
|
324
|
+
async function matchUsbAdapter(adapter, path) {
|
|
320
325
|
const isWindows = (0, node_os_1.platform)() === 'win32';
|
|
321
326
|
const portList = await getSerialPortList();
|
|
322
327
|
logger_1.logger.debug(() => `Connected devices: ${JSON.stringify(portList)}`, NS);
|
|
@@ -325,7 +330,7 @@ async function matchUSBAdapter(adapter, path) {
|
|
|
325
330
|
continue;
|
|
326
331
|
}
|
|
327
332
|
const conflictProne = USB_FINGERPRINTS_CONFLICT_IDS.includes(`${portInfo.vendorId}:${portInfo.productId}`);
|
|
328
|
-
const match =
|
|
333
|
+
const match = matchUsbFingerprint(portInfo, USB_FINGERPRINTS[adapter === 'ezsp' ? 'ember' : adapter], isWindows, conflictProne);
|
|
329
334
|
if (match) {
|
|
330
335
|
logger_1.logger.info(() => `Matched adapter: ${JSON.stringify(portInfo)} => ${adapter}: ${JSON.stringify(match[1])}`, NS);
|
|
331
336
|
return true;
|
|
@@ -333,7 +338,25 @@ async function matchUSBAdapter(adapter, path) {
|
|
|
333
338
|
}
|
|
334
339
|
return false;
|
|
335
340
|
}
|
|
336
|
-
async function
|
|
341
|
+
async function findUsbAdapterBestMatch(adapter, portInfo, isWindows, conflictProne) {
|
|
342
|
+
let bestMatch;
|
|
343
|
+
for (const key in USB_FINGERPRINTS) {
|
|
344
|
+
if (adapter && adapter !== key) {
|
|
345
|
+
continue;
|
|
346
|
+
}
|
|
347
|
+
const match = matchUsbFingerprint(portInfo, USB_FINGERPRINTS[key], isWindows, conflictProne);
|
|
348
|
+
// register the match if no previous or better score
|
|
349
|
+
if (match && (!bestMatch || bestMatch[1][1] < match[1])) {
|
|
350
|
+
bestMatch = [key, match];
|
|
351
|
+
if (match[1] === 4 /* UsbFingerprintMatchScore.VID_PID_MANUF_PATH */) {
|
|
352
|
+
// got best possible match, exit loop
|
|
353
|
+
break;
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
return bestMatch;
|
|
358
|
+
}
|
|
359
|
+
async function findUsbAdapter(adapter, path) {
|
|
337
360
|
const isWindows = (0, node_os_1.platform)() === 'win32';
|
|
338
361
|
// refine to DiscoverableUSBAdapter
|
|
339
362
|
adapter = adapter && adapter === 'ezsp' ? 'ember' : adapter;
|
|
@@ -344,42 +367,37 @@ async function findUSBAdapter(adapter, path) {
|
|
|
344
367
|
continue;
|
|
345
368
|
}
|
|
346
369
|
const conflictProne = USB_FINGERPRINTS_CONFLICT_IDS.includes(`${portInfo.vendorId}:${portInfo.productId}`);
|
|
347
|
-
|
|
348
|
-
for (const key in USB_FINGERPRINTS) {
|
|
349
|
-
if (adapter && adapter !== key) {
|
|
350
|
-
continue;
|
|
351
|
-
}
|
|
352
|
-
const match = matchUSBFingerprint(portInfo, USB_FINGERPRINTS[key], isWindows, conflictProne);
|
|
353
|
-
// register the match if no previous or better score
|
|
354
|
-
if (match && (!bestMatch || bestMatch[1][1] < match[1])) {
|
|
355
|
-
bestMatch = [key, match];
|
|
356
|
-
if (match[1] === 4 /* USBFingerprintMatchScore.VID_PID_MANUF_PATH */) {
|
|
357
|
-
// got best possible match, exit loop
|
|
358
|
-
break;
|
|
359
|
-
}
|
|
360
|
-
}
|
|
361
|
-
}
|
|
370
|
+
const bestMatch = await findUsbAdapterBestMatch(adapter, portInfo, isWindows, conflictProne);
|
|
362
371
|
if (bestMatch) {
|
|
363
372
|
logger_1.logger.info(() => `Matched adapter: ${JSON.stringify(portInfo)} => ${bestMatch[0]}: path=${bestMatch[1][0]}, score=${bestMatch[1][1]}`, NS);
|
|
364
373
|
return [bestMatch[0], bestMatch[1][0]];
|
|
365
374
|
}
|
|
366
375
|
}
|
|
367
376
|
}
|
|
368
|
-
|
|
377
|
+
function getMdnsRadioAdapter(radio) {
|
|
378
|
+
switch (radio) {
|
|
379
|
+
case 'znp':
|
|
380
|
+
return 'zstack';
|
|
381
|
+
case 'ezsp':
|
|
382
|
+
return 'ember';
|
|
383
|
+
default:
|
|
384
|
+
return radio;
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
async function findMdnsAdapter(path) {
|
|
369
388
|
const mdnsDevice = path.substring(7);
|
|
370
389
|
if (mdnsDevice.length == 0) {
|
|
371
390
|
throw new Error(`No mdns device specified. You must specify the coordinator mdns service type after mdns://, e.g. mdns://my-adapter`);
|
|
372
391
|
}
|
|
373
392
|
const bj = new bonjour_service_1.Bonjour();
|
|
374
|
-
const mdnsTimeout = 2000; // timeout for mdns scan
|
|
375
393
|
logger_1.logger.info(`Starting mdns discovery for coordinator: ${mdnsDevice}`, NS);
|
|
376
394
|
return await new Promise((resolve, reject) => {
|
|
377
|
-
bj.findOne({ type: mdnsDevice },
|
|
395
|
+
bj.findOne({ type: mdnsDevice }, MDNS_SCAN_TIME, (service) => {
|
|
378
396
|
if (service) {
|
|
379
397
|
if (service.txt?.radio_type && service.port) {
|
|
380
398
|
const mdnsAddress = service.addresses?.[0] ?? service.host;
|
|
381
399
|
const mdnsPort = service.port;
|
|
382
|
-
const mdnsAdapter = (service.txt.radio_type
|
|
400
|
+
const mdnsAdapter = getMdnsRadioAdapter(service.txt.radio_type);
|
|
383
401
|
logger_1.logger.info(`Coordinator Address: ${mdnsAddress}`, NS);
|
|
384
402
|
logger_1.logger.info(`Coordinator Port: ${mdnsPort}`, NS);
|
|
385
403
|
logger_1.logger.info(`Coordinator Radio: ${mdnsAdapter}`, NS);
|
|
@@ -395,12 +413,12 @@ async function findmDNSAdapter(path) {
|
|
|
395
413
|
}
|
|
396
414
|
else {
|
|
397
415
|
bj.destroy();
|
|
398
|
-
reject(new Error(`Coordinator [${mdnsDevice}] not found after timeout of ${
|
|
416
|
+
reject(new Error(`Coordinator [${mdnsDevice}] not found after timeout of ${MDNS_SCAN_TIME}ms!`));
|
|
399
417
|
}
|
|
400
418
|
});
|
|
401
419
|
});
|
|
402
420
|
}
|
|
403
|
-
async function
|
|
421
|
+
async function findTcpAdapter(path, adapter) {
|
|
404
422
|
try {
|
|
405
423
|
const url = new URL(path);
|
|
406
424
|
(0, node_assert_1.default)(url.port !== '');
|
|
@@ -431,14 +449,14 @@ async function findTCPAdapter(path, adapter) {
|
|
|
431
449
|
async function discoverAdapter(adapter, path) {
|
|
432
450
|
if (path) {
|
|
433
451
|
if (path.startsWith('mdns://')) {
|
|
434
|
-
return await
|
|
452
|
+
return await findMdnsAdapter(path);
|
|
435
453
|
}
|
|
436
454
|
else if (path.startsWith('tcp://') || path.startsWith('socket://')) {
|
|
437
|
-
return await
|
|
455
|
+
return await findTcpAdapter(path, adapter);
|
|
438
456
|
}
|
|
439
457
|
else if (adapter) {
|
|
440
458
|
try {
|
|
441
|
-
const matched = await
|
|
459
|
+
const matched = await matchUsbAdapter(adapter, path);
|
|
442
460
|
if (!matched) {
|
|
443
461
|
logger_1.logger.debug(`Unable to match USB adapter: ${adapter} | ${path}`, NS);
|
|
444
462
|
}
|
|
@@ -451,7 +469,7 @@ async function discoverAdapter(adapter, path) {
|
|
|
451
469
|
}
|
|
452
470
|
try {
|
|
453
471
|
// default to matching USB
|
|
454
|
-
const match = await
|
|
472
|
+
const match = await findUsbAdapter(adapter, path);
|
|
455
473
|
if (!match) {
|
|
456
474
|
throw new Error(`No valid USB adapter found`);
|
|
457
475
|
}
|
|
@@ -462,4 +480,55 @@ async function discoverAdapter(adapter, path) {
|
|
|
462
480
|
throw new Error(`USB adapter discovery error (${error.message}). Specify valid 'adapter' and 'port' in your configuration.`);
|
|
463
481
|
}
|
|
464
482
|
}
|
|
483
|
+
/**
|
|
484
|
+
* @returns List of all serial and mDNS devices found, with matching `adapter` if available
|
|
485
|
+
*/
|
|
486
|
+
async function findAllDevices() {
|
|
487
|
+
const devices = [];
|
|
488
|
+
const isWindows = (0, node_os_1.platform)() === 'win32';
|
|
489
|
+
try {
|
|
490
|
+
const portList = await getSerialPortList();
|
|
491
|
+
for (const portInfo of portList) {
|
|
492
|
+
// override matching on Windows, too many chances of mismatch due to lacking data
|
|
493
|
+
const bestMatch = isWindows
|
|
494
|
+
? undefined
|
|
495
|
+
: await findUsbAdapterBestMatch(undefined, portInfo, isWindows, USB_FINGERPRINTS_CONFLICT_IDS.includes(`${portInfo.vendorId}:${portInfo.productId}`));
|
|
496
|
+
// @ts-expect-error friendlyName Windows only
|
|
497
|
+
const friendlyName = portInfo.friendlyName ?? portInfo.pnpId;
|
|
498
|
+
devices.push({
|
|
499
|
+
name: `${friendlyName} (${portInfo.manufacturer})`,
|
|
500
|
+
path: portInfo.path,
|
|
501
|
+
adapter: bestMatch ? bestMatch[0] : undefined,
|
|
502
|
+
});
|
|
503
|
+
}
|
|
504
|
+
/* v8 ignore start */
|
|
505
|
+
}
|
|
506
|
+
catch (error) {
|
|
507
|
+
logger_1.logger.debug(`Failed to retrieve serial list ${error.message}.`, NS);
|
|
508
|
+
}
|
|
509
|
+
/* v8 ignore stop */
|
|
510
|
+
try {
|
|
511
|
+
const bonjour = new bonjour_service_1.Bonjour();
|
|
512
|
+
const browser = bonjour.find(null, (service) => {
|
|
513
|
+
if (service.txt?.radio_type) {
|
|
514
|
+
const path = `tcp://${service.addresses?.[0] ?? service.host}:${service.port}`;
|
|
515
|
+
devices.push({
|
|
516
|
+
name: `${service.name ?? service.txt.name ?? 'Unknown'} (${path})`,
|
|
517
|
+
path,
|
|
518
|
+
adapter: getMdnsRadioAdapter(service.txt.radio_type),
|
|
519
|
+
});
|
|
520
|
+
}
|
|
521
|
+
});
|
|
522
|
+
browser.start();
|
|
523
|
+
await (0, utils_1.wait)(MDNS_SCAN_TIME);
|
|
524
|
+
browser.stop();
|
|
525
|
+
bonjour.destroy();
|
|
526
|
+
/* v8 ignore start */
|
|
527
|
+
}
|
|
528
|
+
catch (error) {
|
|
529
|
+
logger_1.logger.debug(`Failed to retrieve mDNS list ${error.message}.`, NS);
|
|
530
|
+
}
|
|
531
|
+
/* v8 ignore stop */
|
|
532
|
+
return devices;
|
|
533
|
+
}
|
|
465
534
|
//# sourceMappingURL=adapterDiscovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapterDiscovery.js","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapterDiscovery.js","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emberAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/emberAdapter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,MAAM,EAAuB,MAAM,iBAAiB,CAAC;AAG7D,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,KAAK,EAAE,aAAa,EAAU,KAAK,EAAC,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,QAAQ,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAA0C,UAAU,EAAC,MAAM,cAAc,CAAC;AAgBjF,OAAO,EAiBH,iBAAiB,EAGpB,MAAM,UAAU,CAAC;AAMlB,OAAO,EAGH,YAAY,EAIZ,sBAAsB,EAKzB,MAAM,UAAU,CAAC;AAQlB,MAAM,MAAM,YAAY,GAAG;IAEvB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,sBAAsB,CAAC;CACtC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC5B,WAAW,EAAE,KAAK,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;CAChC,CAAC;AAoCF,KAAK,WAAW,GAAG;IACf,qBAAqB,EAAE,MAAM,GAAG,KAAK,CAAC;IACtC;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,kCAAkC,EAAE,MAAM,CAAC;IAC3C;;;;OAIG;IACH,uCAAuC,EAAE,MAAM,CAAC;IAChD;;;;;OAKG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oEAAoE;IACpE,uBAAuB,EAAE,MAAM,CAAC;IAChC,qEAAqE;IACrE,wBAAwB,EAAE,MAAM,CAAC;IACjC,oEAAoE;IACpE,uBAAuB,EAAE,MAAM,CAAC;IAChC,yEAAyE;IACzE,uBAAuB,EAAE,MAAM,CAAC;IAChC,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,OAAO,iBAAiB,CAAC;CAC7C,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAYtD,CAAC;AAMF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,QAAyG,CAAC;
|
|
1
|
+
{"version":3,"file":"emberAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/emberAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,6 +141,7 @@ const WORKAROUND_JOIN_MANUF_IEEE_PREFIX_TO_CODE = {
|
|
|
141
141
|
// NOTE: Lumi has a new prefix registered since 2021, in case they start using that one with new devices, it might need to be added here too...
|
|
142
142
|
// "0x18c23c" https://maclookup.app/vendors/lumi-united-technology-co-ltd
|
|
143
143
|
'0x54ef44': Zcl.ManufacturerCode.LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN,
|
|
144
|
+
'0x04cf8c': Zcl.ManufacturerCode.LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN,
|
|
144
145
|
};
|
|
145
146
|
/**
|
|
146
147
|
* Relay calls between Z2M and EZSP-layer and handle any error that might occur via queue & waitress.
|
|
@@ -285,6 +286,13 @@ class EmberAdapter extends __1.Adapter {
|
|
|
285
286
|
case enums_1.SLStatus.ZIGBEE_NETWORK_CLOSED: {
|
|
286
287
|
this.oneWaitress.resolveEvent(oneWaitress_1.OneWaitressEvents.STACK_STATUS_NETWORK_CLOSED);
|
|
287
288
|
logger_1.logger.info(`[STACK STATUS] Network closed.`, NS);
|
|
289
|
+
if (this.manufacturerCode !== DEFAULT_MANUFACTURER_CODE) {
|
|
290
|
+
await this.queue.execute(async () => {
|
|
291
|
+
logger_1.logger.debug(`[WORKAROUND] Reverting coordinator manufacturer code to default.`, NS);
|
|
292
|
+
await this.ezsp.ezspSetManufacturerCode(DEFAULT_MANUFACTURER_CODE);
|
|
293
|
+
this.manufacturerCode = DEFAULT_MANUFACTURER_CODE;
|
|
294
|
+
});
|
|
295
|
+
}
|
|
288
296
|
break;
|
|
289
297
|
}
|
|
290
298
|
case enums_1.SLStatus.ZIGBEE_CHANNEL_CHANGED: {
|
|
@@ -1369,11 +1377,6 @@ class EmberAdapter extends __1.Adapter {
|
|
|
1369
1377
|
}
|
|
1370
1378
|
}
|
|
1371
1379
|
else {
|
|
1372
|
-
if (this.manufacturerCode !== DEFAULT_MANUFACTURER_CODE) {
|
|
1373
|
-
logger_1.logger.debug(`[WORKAROUND] Reverting coordinator manufacturer code to default.`, NS);
|
|
1374
|
-
await this.ezsp.ezspSetManufacturerCode(DEFAULT_MANUFACTURER_CODE);
|
|
1375
|
-
this.manufacturerCode = DEFAULT_MANUFACTURER_CODE;
|
|
1376
|
-
}
|
|
1377
1380
|
await this.ezsp.ezspClearTransientLinkKeys();
|
|
1378
1381
|
const setJPstatus = await this.emberSetJoinPolicy(enums_1.EmberJoinDecision.ALLOW_REJOINS_ONLY);
|
|
1379
1382
|
if (setJPstatus !== enums_1.SLStatus.OK) {
|