zigbee-herdsman 0.40.3 → 0.41.0

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 (154) hide show
  1. package/.release-please-manifest.json +1 -1
  2. package/CHANGELOG.md +7 -0
  3. package/dist/adapter/adapter.d.ts +2 -4
  4. package/dist/adapter/adapter.d.ts.map +1 -1
  5. package/dist/adapter/adapter.js +15 -17
  6. package/dist/adapter/adapter.js.map +1 -1
  7. package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +1 -2
  8. package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
  9. package/dist/adapter/deconz/adapter/deconzAdapter.js +65 -65
  10. package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
  11. package/dist/adapter/deconz/driver/driver.d.ts.map +1 -1
  12. package/dist/adapter/deconz/driver/driver.js +44 -44
  13. package/dist/adapter/deconz/driver/driver.js.map +1 -1
  14. package/dist/adapter/deconz/driver/frameParser.d.ts.map +1 -1
  15. package/dist/adapter/deconz/driver/frameParser.js +43 -43
  16. package/dist/adapter/deconz/driver/frameParser.js.map +1 -1
  17. package/dist/adapter/deconz/driver/parser.js +6 -6
  18. package/dist/adapter/deconz/driver/parser.js.map +1 -1
  19. package/dist/adapter/deconz/driver/writer.js +3 -3
  20. package/dist/adapter/deconz/driver/writer.js.map +1 -1
  21. package/dist/adapter/ember/adapter/emberAdapter.d.ts +1 -2
  22. package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
  23. package/dist/adapter/ember/adapter/emberAdapter.js +142 -146
  24. package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
  25. package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
  26. package/dist/adapter/ember/adapter/oneWaitress.js +3 -1
  27. package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
  28. package/dist/adapter/ember/adapter/requestQueue.js +9 -12
  29. package/dist/adapter/ember/adapter/requestQueue.js.map +1 -1
  30. package/dist/adapter/ember/adapter/tokensManager.d.ts.map +1 -1
  31. package/dist/adapter/ember/adapter/tokensManager.js +23 -20
  32. package/dist/adapter/ember/adapter/tokensManager.js.map +1 -1
  33. package/dist/adapter/ember/ezsp/ezsp.d.ts.map +1 -1
  34. package/dist/adapter/ember/ezsp/ezsp.js +136 -137
  35. package/dist/adapter/ember/ezsp/ezsp.js.map +1 -1
  36. package/dist/adapter/ember/uart/ash.d.ts.map +1 -1
  37. package/dist/adapter/ember/uart/ash.js +71 -75
  38. package/dist/adapter/ember/uart/ash.js.map +1 -1
  39. package/dist/adapter/ember/uart/parser.d.ts.map +1 -1
  40. package/dist/adapter/ember/uart/parser.js +3 -6
  41. package/dist/adapter/ember/uart/parser.js.map +1 -1
  42. package/dist/adapter/ember/uart/queues.d.ts.map +1 -1
  43. package/dist/adapter/ember/uart/queues.js +3 -1
  44. package/dist/adapter/ember/uart/queues.js.map +1 -1
  45. package/dist/adapter/ember/uart/writer.d.ts.map +1 -1
  46. package/dist/adapter/ember/uart/writer.js +3 -6
  47. package/dist/adapter/ember/uart/writer.js.map +1 -1
  48. package/dist/adapter/ezsp/adapter/backup.d.ts +0 -1
  49. package/dist/adapter/ezsp/adapter/backup.d.ts.map +1 -1
  50. package/dist/adapter/ezsp/adapter/backup.js +3 -7
  51. package/dist/adapter/ezsp/adapter/backup.js.map +1 -1
  52. package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +1 -2
  53. package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
  54. package/dist/adapter/ezsp/adapter/ezspAdapter.js +23 -22
  55. package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
  56. package/dist/adapter/ezsp/driver/driver.d.ts +1 -3
  57. package/dist/adapter/ezsp/driver/driver.d.ts.map +1 -1
  58. package/dist/adapter/ezsp/driver/driver.js +67 -64
  59. package/dist/adapter/ezsp/driver/driver.js.map +1 -1
  60. package/dist/adapter/ezsp/driver/ezsp.d.ts.map +1 -1
  61. package/dist/adapter/ezsp/driver/ezsp.js +61 -50
  62. package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
  63. package/dist/adapter/ezsp/driver/multicast.d.ts.map +1 -1
  64. package/dist/adapter/ezsp/driver/multicast.js +8 -12
  65. package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
  66. package/dist/adapter/ezsp/driver/parser.js +5 -5
  67. package/dist/adapter/ezsp/driver/parser.js.map +1 -1
  68. package/dist/adapter/ezsp/driver/types/basic.js +1 -1
  69. package/dist/adapter/ezsp/driver/types/basic.js.map +1 -1
  70. package/dist/adapter/ezsp/driver/types/named.js +2 -2
  71. package/dist/adapter/ezsp/driver/types/named.js.map +1 -1
  72. package/dist/adapter/ezsp/driver/types/struct.js +2 -2
  73. package/dist/adapter/ezsp/driver/types/struct.js.map +1 -1
  74. package/dist/adapter/ezsp/driver/uart.d.ts.map +1 -1
  75. package/dist/adapter/ezsp/driver/uart.js +46 -46
  76. package/dist/adapter/ezsp/driver/uart.js.map +1 -1
  77. package/dist/adapter/ezsp/driver/writer.js +3 -6
  78. package/dist/adapter/ezsp/driver/writer.js.map +1 -1
  79. package/dist/adapter/z-stack/adapter/adapter-backup.d.ts +0 -1
  80. package/dist/adapter/z-stack/adapter/adapter-backup.d.ts.map +1 -1
  81. package/dist/adapter/z-stack/adapter/adapter-backup.js +25 -29
  82. package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
  83. package/dist/adapter/z-stack/adapter/manager.d.ts +1 -4
  84. package/dist/adapter/z-stack/adapter/manager.d.ts.map +1 -1
  85. package/dist/adapter/z-stack/adapter/manager.js +51 -60
  86. package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
  87. package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +1 -2
  88. package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
  89. package/dist/adapter/z-stack/adapter/zStackAdapter.js +23 -22
  90. package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
  91. package/dist/adapter/z-stack/unpi/parser.js +6 -6
  92. package/dist/adapter/z-stack/unpi/parser.js.map +1 -1
  93. package/dist/adapter/z-stack/unpi/writer.js +4 -7
  94. package/dist/adapter/z-stack/unpi/writer.js.map +1 -1
  95. package/dist/adapter/z-stack/znp/znp.d.ts.map +1 -1
  96. package/dist/adapter/z-stack/znp/znp.js +18 -25
  97. package/dist/adapter/z-stack/znp/znp.js.map +1 -1
  98. package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +1 -2
  99. package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
  100. package/dist/adapter/zigate/adapter/zigateAdapter.js +50 -50
  101. package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
  102. package/dist/adapter/zigate/driver/frame.d.ts.map +1 -1
  103. package/dist/adapter/zigate/driver/frame.js +8 -8
  104. package/dist/adapter/zigate/driver/frame.js.map +1 -1
  105. package/dist/adapter/zigate/driver/ziGateObject.d.ts.map +1 -1
  106. package/dist/adapter/zigate/driver/ziGateObject.js +5 -4
  107. package/dist/adapter/zigate/driver/ziGateObject.js.map +1 -1
  108. package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
  109. package/dist/adapter/zigate/driver/zigate.js +23 -23
  110. package/dist/adapter/zigate/driver/zigate.js.map +1 -1
  111. package/dist/controller/controller.d.ts +1 -3
  112. package/dist/controller/controller.d.ts.map +1 -1
  113. package/dist/controller/controller.js +47 -56
  114. package/dist/controller/controller.js.map +1 -1
  115. package/dist/controller/database.d.ts.map +1 -1
  116. package/dist/controller/database.js +3 -5
  117. package/dist/controller/database.js.map +1 -1
  118. package/dist/controller/greenPower.d.ts.map +1 -1
  119. package/dist/controller/greenPower.js +13 -20
  120. package/dist/controller/greenPower.js.map +1 -1
  121. package/dist/controller/helpers/requestQueue.d.ts.map +1 -1
  122. package/dist/controller/helpers/requestQueue.js +15 -25
  123. package/dist/controller/helpers/requestQueue.js.map +1 -1
  124. package/dist/controller/model/device.d.ts.map +1 -1
  125. package/dist/controller/model/device.js +44 -49
  126. package/dist/controller/model/device.js.map +1 -1
  127. package/dist/controller/model/endpoint.d.ts.map +1 -1
  128. package/dist/controller/model/endpoint.js +14 -18
  129. package/dist/controller/model/endpoint.js.map +1 -1
  130. package/dist/controller/model/group.d.ts.map +1 -1
  131. package/dist/controller/model/group.js +8 -11
  132. package/dist/controller/model/group.js.map +1 -1
  133. package/dist/controller/touchlink.js +21 -24
  134. package/dist/controller/touchlink.js.map +1 -1
  135. package/dist/index.d.ts +2 -0
  136. package/dist/index.d.ts.map +1 -1
  137. package/dist/index.js +4 -1
  138. package/dist/index.js.map +1 -1
  139. package/dist/utils/logger.d.ts +9 -0
  140. package/dist/utils/logger.d.ts.map +1 -0
  141. package/dist/utils/logger.js +14 -0
  142. package/dist/utils/logger.js.map +1 -0
  143. package/dist/zcl/buffaloZcl.d.ts.map +1 -1
  144. package/dist/zcl/buffaloZcl.js +3 -9
  145. package/dist/zcl/buffaloZcl.js.map +1 -1
  146. package/package.json +4 -4
  147. package/dist/adapter/zigate/debug.d.ts +0 -8
  148. package/dist/adapter/zigate/debug.d.ts.map +0 -1
  149. package/dist/adapter/zigate/debug.js +0 -20
  150. package/dist/adapter/zigate/debug.js.map +0 -1
  151. package/dist/controller/logger-stub.d.ts +0 -7
  152. package/dist/controller/logger-stub.d.ts.map +0 -1
  153. package/dist/controller/logger-stub.js +0 -3
  154. package/dist/controller/logger-stub.js.map +0 -1
@@ -1,3 +1,3 @@
1
1
  {
2
- ".": "0.40.3"
2
+ ".": "0.41.0"
3
3
  }
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ## [0.41.0](https://github.com/Koenkk/zigbee-herdsman/compare/v0.40.3...v0.41.0) (2024-04-02)
4
+
5
+
6
+ ### Features
7
+
8
+ * Improve logging ([#989](https://github.com/Koenkk/zigbee-herdsman/issues/989)) ([0cf7b45](https://github.com/Koenkk/zigbee-herdsman/commit/0cf7b45981cfe4840986121574c88f6437be8b15))
9
+
3
10
  ## [0.40.3](https://github.com/Koenkk/zigbee-herdsman/compare/v0.40.2...v0.40.3) (2024-03-31)
4
11
 
5
12
 
@@ -4,7 +4,6 @@ import * as TsType from './tstype';
4
4
  import { ZclDataPayload } from './events';
5
5
  import events from 'events';
6
6
  import { ZclFrame, FrameType, Direction } from '../zcl';
7
- import { LoggerStub } from "../controller/logger-stub";
8
7
  import * as Models from "../models";
9
8
  declare abstract class Adapter extends events.EventEmitter {
10
9
  readonly greenPowerGroup = 2948;
@@ -12,12 +11,11 @@ declare abstract class Adapter extends events.EventEmitter {
12
11
  protected adapterOptions: TsType.AdapterOptions;
13
12
  protected serialPortOptions: TsType.SerialPortOptions;
14
13
  protected backupPath: string;
15
- protected logger?: LoggerStub;
16
- protected constructor(networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string, adapterOptions: TsType.AdapterOptions, logger?: LoggerStub);
14
+ protected constructor(networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string, adapterOptions: TsType.AdapterOptions);
17
15
  /**
18
16
  * Utility
19
17
  */
20
- static create(networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string, adapterOptions: TsType.AdapterOptions, logger?: LoggerStub): Promise<Adapter>;
18
+ static create(networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string, adapterOptions: TsType.AdapterOptions): Promise<Adapter>;
21
19
  abstract start(): Promise<TsType.StartResult>;
22
20
  abstract stop(): Promise<void>;
23
21
  abstract getCoordinator(): Promise<TsType.Coordinator>;
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
@@ -27,28 +27,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  const events_1 = __importDefault(require("events"));
30
- const debug_1 = __importDefault(require("debug"));
31
30
  const bonjour_service_1 = __importDefault(require("bonjour-service"));
32
- const debug = (0, debug_1.default)("zigbee-herdsman:adapter");
31
+ const logger_1 = require("../utils/logger");
32
+ const NS = 'zh:adapter';
33
33
  class Adapter extends events_1.default.EventEmitter {
34
34
  greenPowerGroup = 0x0b84;
35
35
  networkOptions;
36
36
  adapterOptions;
37
37
  serialPortOptions;
38
38
  backupPath;
39
- logger;
40
- constructor(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
39
+ constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
41
40
  super();
42
41
  this.networkOptions = networkOptions;
43
42
  this.adapterOptions = adapterOptions;
44
43
  this.serialPortOptions = serialPortOptions;
45
44
  this.backupPath = backupPath;
46
- this.logger = logger;
47
45
  }
48
46
  /**
49
47
  * Utility
50
48
  */
51
- static async create(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
49
+ static async create(networkOptions, serialPortOptions, backupPath, adapterOptions) {
52
50
  const { ZStackAdapter } = await Promise.resolve().then(() => __importStar(require('./z-stack/adapter')));
53
51
  const { DeconzAdapter } = await Promise.resolve().then(() => __importStar(require('./deconz/adapter')));
54
52
  const { ZiGateAdapter } = await Promise.resolve().then(() => __importStar(require('./zigate/adapter')));
@@ -72,11 +70,11 @@ class Adapter extends events_1.default.EventEmitter {
72
70
  // Use ZStackAdapter by default
73
71
  let adapter = adapters[0];
74
72
  if (!serialPortOptions.path) {
75
- debug('No path provided, auto detecting path');
73
+ logger_1.logger.debug('No path provided, auto detecting path', NS);
76
74
  for (const candidate of adapters) {
77
75
  const path = await candidate.autoDetectPath();
78
76
  if (path) {
79
- debug(`Auto detected path '${path}' from adapter '${candidate.name}'`);
77
+ logger_1.logger.debug(`Auto detected path '${path}' from adapter '${candidate.name}'`, NS);
80
78
  serialPortOptions.path = path;
81
79
  adapter = candidate;
82
80
  break;
@@ -94,7 +92,7 @@ class Adapter extends events_1.default.EventEmitter {
94
92
  }
95
93
  const bj = new bonjour_service_1.default();
96
94
  const mdnsTimeout = 2000; // timeout for mdns scan
97
- logger.info(`Starting mdns discovery for coordinator: ${mdnsDevice}`);
95
+ logger_1.logger.info(`Starting mdns discovery for coordinator: ${mdnsDevice}`, NS);
98
96
  await new Promise((resolve, reject) => {
99
97
  bj.findOne({ type: mdnsDevice }, mdnsTimeout, function (service) {
100
98
  if (service) {
@@ -104,10 +102,10 @@ class Adapter extends events_1.default.EventEmitter {
104
102
  const mdnsAdapter = (service.txt.radio_type == 'znp' ?
105
103
  'zstack' : service.txt.radio_type);
106
104
  const mdnsBaud = parseInt(service.txt.baud_rate);
107
- logger.info(`Coordinator Ip: ${mdnsIp}`);
108
- logger.info(`Coordinator Port: ${mdnsPort}`);
109
- logger.info(`Coordinator Radio: ${mdnsAdapter}`);
110
- logger.info(`Coordinator Baud: ${mdnsBaud}\n`);
105
+ logger_1.logger.info(`Coordinator Ip: ${mdnsIp}`, NS);
106
+ logger_1.logger.info(`Coordinator Port: ${mdnsPort}`, NS);
107
+ logger_1.logger.info(`Coordinator Radio: ${mdnsAdapter}`, NS);
108
+ logger_1.logger.info(`Coordinator Baud: ${mdnsBaud}\n`, NS);
111
109
  bj.destroy();
112
110
  serialPortOptions.path = `tcp://${mdnsIp}:${mdnsPort}`;
113
111
  serialPortOptions.adapter = mdnsAdapter;
@@ -115,7 +113,7 @@ class Adapter extends events_1.default.EventEmitter {
115
113
  if (adapterLookup.hasOwnProperty(serialPortOptions.adapter)
116
114
  && serialPortOptions.adapter !== 'auto') {
117
115
  adapter = adapterLookup[serialPortOptions.adapter];
118
- resolve(new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions, logger));
116
+ resolve(new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions));
119
117
  }
120
118
  else {
121
119
  reject(new Error(`Adapter ${serialPortOptions.adapter} is not supported.`));
@@ -142,17 +140,17 @@ class Adapter extends events_1.default.EventEmitter {
142
140
  // Determine adapter to use
143
141
  for (const candidate of adapters) {
144
142
  if (await candidate.isValidPath(serialPortOptions.path)) {
145
- debug(`Path '${serialPortOptions.path}' is valid for '${candidate.name}'`);
143
+ logger_1.logger.debug(`Path '${serialPortOptions.path}' is valid for '${candidate.name}'`, NS);
146
144
  adapter = candidate;
147
145
  break;
148
146
  }
149
147
  }
150
148
  }
151
149
  catch (error) {
152
- debug(`Failed to validate path: '${error}'`);
150
+ logger_1.logger.debug(`Failed to validate path: '${error}'`, NS);
153
151
  }
154
152
  }
155
- return new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
153
+ return new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions);
156
154
  }
157
155
  }
158
156
  exports.default = Adapter;
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ import { NetworkOptions, SerialPortOptions, Coordinator, CoordinatorVersion, Nod
3
3
  import Adapter from '../../adapter';
4
4
  import { ZclFrame, FrameType, Direction } from '../../../zcl';
5
5
  import * as Events from '../../events';
6
- import { LoggerStub } from "../../../controller/logger-stub";
7
6
  import * as Models from "../../../models";
8
7
  declare class DeconzAdapter extends Adapter {
9
8
  private driver;
@@ -15,7 +14,7 @@ declare class DeconzAdapter extends Adapter {
15
14
  private fwVersion;
16
15
  private waitress;
17
16
  private TX_OPTIONS;
18
- constructor(networkOptions: NetworkOptions, serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions, logger?: LoggerStub);
17
+ constructor(networkOptions: NetworkOptions, serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions);
19
18
  static isValidPath(path: string): Promise<boolean>;
20
19
  static autoDetectPath(): Promise<string>;
21
20
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"deconzAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/deconz/adapter/deconzAdapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deconzAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/deconz/adapter/deconzAdapter.ts"],"names":[],"mappings":"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"}