zigbee-herdsman 0.32.4 → 0.32.6

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.
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
4
  };
@@ -32,11 +9,10 @@ const events_1 = require("events");
32
9
  const net_1 = __importDefault(require("net"));
33
10
  const serialPort_1 = require("../../serialPort");
34
11
  const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
35
- const utils_1 = require("./utils");
36
- const utils_2 = require("../../../utils");
37
- const consts = __importStar(require("./consts"));
12
+ const utils_1 = require("../../../utils");
38
13
  const writer_1 = require("./writer");
39
14
  const parser_1 = require("./parser");
15
+ const frame_1 = require("./frame");
40
16
  const debug_1 = __importDefault(require("debug"));
41
17
  const debug = (0, debug_1.default)('zigbee-herdsman:adapter:ezsp:uart');
42
18
  var NcpResetCode;
@@ -66,30 +42,34 @@ class SerialDriver extends events_1.EventEmitter {
66
42
  constructor() {
67
43
  super();
68
44
  this.initialized = false;
69
- this.queue = new utils_2.Queue(1);
70
- this.waitress = new utils_2.Waitress(this.waitressValidator, this.waitressTimeoutFormatter);
45
+ this.queue = new utils_1.Queue(1);
46
+ this.waitress = new utils_1.Waitress(this.waitressValidator, this.waitressTimeoutFormatter);
71
47
  }
72
- async connect(path, options) {
73
- this.portType = socketPortUtils_1.default.isTcpPath(path) ? 'socket' : 'serial';
48
+ async connect(options) {
49
+ this.portType = socketPortUtils_1.default.isTcpPath(options.path) ? 'socket' : 'serial';
74
50
  if (this.portType === 'serial') {
75
- await this.openSerialPort(path, options);
51
+ await this.openSerialPort(options.path, options.baudRate, options.rtscts);
76
52
  }
77
53
  else {
78
- await this.openSocketPort(path);
54
+ await this.openSocketPort(options.path);
79
55
  }
80
56
  }
81
- async openSerialPort(path, opt) {
57
+ async openSerialPort(path, baudRate, rtscts) {
82
58
  const options = {
83
59
  path,
84
- baudRate: typeof opt.baudRate === 'number' ? opt.baudRate : 115200,
85
- rtscts: typeof opt.rtscts === 'boolean' ? opt.rtscts : false,
86
- autoOpen: false
60
+ baudRate: typeof baudRate === 'number' ? baudRate : 115200,
61
+ rtscts: typeof rtscts === 'boolean' ? rtscts : false,
62
+ autoOpen: false,
63
+ parity: 'none',
64
+ stopBits: 1,
65
+ xon: true,
66
+ xoff: true,
87
67
  };
88
68
  debug(`Opening SerialPort with ${JSON.stringify(options)}`);
89
- this.serialPort = new serialPort_1.SerialPort(options);
90
- this.writer = new writer_1.Writer();
91
69
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
92
70
  // @ts-ignore
71
+ this.serialPort = new serialPort_1.SerialPort(options);
72
+ this.writer = new writer_1.Writer();
93
73
  this.writer.pipe(this.serialPort);
94
74
  this.parser = new parser_1.Parser();
95
75
  this.serialPort.pipe(this.parser);
@@ -123,36 +103,31 @@ class SerialDriver extends events_1.EventEmitter {
123
103
  this.socketPort.pipe(this.parser);
124
104
  this.parser.on('parsed', this.onParsed.bind(this));
125
105
  return new Promise((resolve, reject) => {
126
- this.socketPort.on('connect', function () {
106
+ this.socketPort.on('connect', () => {
127
107
  debug('Socket connected');
128
108
  });
129
- // eslint-disable-next-line
130
- const self = this;
131
109
  this.socketPort.on('ready', async () => {
132
110
  debug('Socket ready');
133
111
  // reset
134
112
  await this.reset();
135
- self.initialized = true;
113
+ this.initialized = true;
136
114
  resolve();
137
115
  });
138
116
  this.socketPort.once('close', this.onPortClose.bind(this));
139
- this.socketPort.on('error', function () {
117
+ this.socketPort.on('error', () => {
140
118
  debug('Socket error');
141
- self.initialized = false;
119
+ this.initialized = false;
142
120
  reject(new Error(`Error while opening socket`));
143
121
  });
144
122
  this.socketPort.connect(info.port, info.host);
145
123
  });
146
124
  }
147
- onParsed(data) {
148
- // check CRC
149
- const crc = (0, utils_1.crc16ccitt)(data.subarray(0, -3), 65535);
150
- const crcArr = Buffer.from([(crc >> 8), (crc % 256)]);
151
- if (!data.subarray(-3, -1).equals(crcArr)) {
152
- // CRC error
153
- debug(`<-- CRC error: ${data.toString('hex')}|` +
154
- `${data.subarray(-3, -1).toString('hex')}|` +
155
- `${crcArr.toString('hex')}`);
125
+ onParsed(frame) {
126
+ try {
127
+ frame.checkCRC();
128
+ }
129
+ catch (error) {
130
+ debug(error);
156
131
  // send NAK
157
132
  this.writer.sendNAK(this.recvSeq);
158
133
  // skip handler
@@ -160,71 +135,66 @@ class SerialDriver extends events_1.EventEmitter {
160
135
  }
161
136
  try {
162
137
  /* Frame receive handler */
163
- switch (true) {
164
- case ((data[0] & 0x80) === 0):
165
- debug(`<-- DATA (${(data[0] & 0x70) >> 4},` +
166
- `${data[0] & 0x07},${(data[0] & 0x08) >> 3}): ${data.toString('hex')}`);
167
- this.handleDATA(data);
138
+ switch (frame.type) {
139
+ case frame_1.FrameType.DATA:
140
+ this.handleDATA(frame);
168
141
  break;
169
- case ((data[0] & 0xE0) === 0x80):
170
- debug(`<-- ACK (${data[0] & 0x07}): ${data.toString('hex')}`);
171
- this.handleACK(data[0]);
142
+ case frame_1.FrameType.ACK:
143
+ this.handleACK(frame);
172
144
  break;
173
- case ((data[0] & 0xE0) === 0xA0):
174
- debug(`<-- NAK (${data[0] & 0x07}): ${data.toString('hex')}`);
175
- this.handleNAK(data[0]);
145
+ case frame_1.FrameType.NAK:
146
+ this.handleNAK(frame);
176
147
  break;
177
- case (data[0] === 0xC0):
178
- debug(`<-- RST: ${data.toString('hex')}`);
148
+ case frame_1.FrameType.RST:
149
+ this.handleRST(frame);
179
150
  break;
180
- case (data[0] === 0xC1):
181
- debug(`<-- RSTACK: ${data.toString('hex')}`);
182
- this.rstack_frame_received(data);
151
+ case frame_1.FrameType.RSTACK:
152
+ this.handleRSTACK(frame);
183
153
  break;
184
- case (data[0] === 0xC2):
185
- debug(`<-- Error: ${data.toString('hex')}`);
186
- // send reset
187
- this.reset().catch((e) => debug(`Failed to reset: ${e}`));
154
+ case frame_1.FrameType.ERROR:
155
+ this.handleError(frame);
188
156
  break;
189
157
  default:
190
- debug("UNKNOWN FRAME RECEIVED: %r", data);
158
+ debug(`UNKNOWN FRAME RECEIVED: ${frame}`);
191
159
  }
192
160
  }
193
161
  catch (error) {
194
- debug(`Error while parsing to ZpiObject '${error.stack}'`);
162
+ debug(`Error while parsing to NpiFrame '${error.stack}'`);
195
163
  }
196
164
  }
197
- handleDATA(data) {
165
+ handleDATA(frame) {
198
166
  /* Data frame receive handler */
199
- const frmNum = (data[0] & 0x70) >> 4;
200
- const reTx = (data[0] & 0x08) >> 3;
167
+ const frmNum = (frame.control & 0x70) >> 4;
168
+ const reTx = (frame.control & 0x08) >> 3;
169
+ debug(`<-- DATA (${frmNum},${frame.control & 0x07},${reTx}): ${frame}`);
201
170
  this.recvSeq = (frmNum + 1) & 7; // next
202
171
  debug(`--> ACK (${this.recvSeq})`);
203
172
  this.writer.sendACK(this.recvSeq);
204
- const handled = this.handleACK(data[0]);
173
+ const handled = this.handleACK(frame);
205
174
  if (reTx && !handled) {
206
175
  // if the package is resent and did not expect it,
207
176
  // then will skip it - already processed it earlier
208
177
  debug(`Skipping the packet as repeated (${this.recvSeq})`);
209
178
  return;
210
179
  }
211
- data = data.subarray(1, -3);
212
- const frame = this.randomize(data);
213
- this.emit('received', frame);
180
+ const data = frame.buffer.subarray(1, -3);
181
+ this.emit('received', frame_1.Frame.makeRandomizedBuffer(data));
214
182
  }
215
- handleACK(control) {
183
+ handleACK(frame) {
216
184
  /* Handle an acknowledgement frame */
217
185
  // next number after the last accepted frame
218
- this.ackSeq = control & 0x07;
186
+ this.ackSeq = frame.control & 0x07;
187
+ debug(`<-- ACK (${this.ackSeq}): ${frame}`);
219
188
  const handled = this.waitress.resolve({ sequence: this.ackSeq });
220
189
  if (!handled && this.sendSeq !== this.ackSeq) {
221
190
  debug(`Unexpected packet sequence ${this.ackSeq} | ${this.sendSeq}`);
222
191
  }
223
192
  return handled;
224
193
  }
225
- handleNAK(control) {
194
+ handleNAK(frame) {
226
195
  /* Handle negative acknowledgment frame */
227
- const nakNum = control & 0x07;
196
+ const nakNum = frame.control & 0x07;
197
+ debug(`<-- NAK (${nakNum}): ${frame}`);
228
198
  const handled = this.waitress.reject({ sequence: nakNum }, 'Recv NAK frame');
229
199
  if (!handled) {
230
200
  // send NAK
@@ -234,40 +204,36 @@ class SerialDriver extends events_1.EventEmitter {
234
204
  debug(`NAK Expected packet sequence ${nakNum}`);
235
205
  }
236
206
  }
237
- rstack_frame_received(data) {
207
+ handleRST(frame) {
208
+ debug(`<-- RST: ${frame}`);
209
+ }
210
+ handleRSTACK(frame) {
238
211
  /* Reset acknowledgement frame receive handler */
239
212
  let code;
240
213
  this.sendSeq = 0;
241
214
  this.recvSeq = 0;
215
+ debug(`<-- RSTACK ${frame}`);
242
216
  try {
243
- code = NcpResetCode[data[2]];
217
+ code = NcpResetCode[frame.buffer[2]];
244
218
  }
245
219
  catch (e) {
246
220
  code = NcpResetCode.ERROR_UNKNOWN_EM3XX_ERROR;
247
221
  }
248
- debug("RSTACK Version: %d Reason: %s frame: %s", data[1], code.toString(), data.toString('hex'));
222
+ debug(`RSTACK Version: ${frame.buffer[1]} Reason: ${code.toString()} frame: ${frame}`);
249
223
  if (NcpResetCode[code].toString() !== NcpResetCode.RESET_SOFTWARE.toString()) {
250
224
  return;
251
225
  }
252
226
  this.waitress.resolve({ sequence: -1 });
253
227
  }
254
- randomize(s) {
255
- /*XOR s with a pseudo-random sequence for transmission
256
- Used only in data frames
257
- */
258
- let rand = consts.RANDOMIZE_START;
259
- const out = Buffer.alloc(s.length);
260
- let outIdx = 0;
261
- for (const c of s) {
262
- out.writeUInt8(c ^ rand, outIdx++);
263
- if ((rand % 2)) {
264
- rand = ((rand >> 1) ^ consts.RANDOMIZE_SEQ);
265
- }
266
- else {
267
- rand = (rand >> 1);
268
- }
228
+ async handleError(frame) {
229
+ debug(`<-- Error ${frame}`);
230
+ try {
231
+ // send reset
232
+ await this.reset();
233
+ }
234
+ catch (error) {
235
+ debug(`Failed to reset on Error Frame: ${error}`);
269
236
  }
270
- return out;
271
237
  }
272
238
  async reset() {
273
239
  debug('Uart reseting');
@@ -326,7 +292,7 @@ class SerialDriver extends events_1.EventEmitter {
326
292
  const nextSeq = this.sendSeq;
327
293
  const ackSeq = this.recvSeq;
328
294
  return this.queue.execute(async () => {
329
- const randData = this.randomize(data);
295
+ const randData = frame_1.Frame.makeRandomizedBuffer(data);
330
296
  try {
331
297
  const waiter = this.waitFor(nextSeq);
332
298
  debug(`--> DATA (${seq},${ackSeq},0): ${data.toString('hex')}`);
@@ -340,7 +306,7 @@ class SerialDriver extends events_1.EventEmitter {
340
306
  debug(`-!- break waiting (${nextSeq})`);
341
307
  debug(`Can't send DATA frame (${seq},${ackSeq},0): ${data.toString('hex')}`);
342
308
  try {
343
- await (0, utils_2.Wait)(500);
309
+ await (0, utils_1.Wait)(500);
344
310
  const waiter = this.waitFor(nextSeq);
345
311
  debug(`->> DATA (${seq},${ackSeq},1): ${data.toString('hex')}`);
346
312
  this.writer.sendData(randData, seq, 1, ackSeq);
@@ -1 +1 @@
1
- {"version":3,"file":"uart.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/driver/uart.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uart.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/driver/uart.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -84,7 +84,7 @@
84
84
  "clean": "rimraf temp coverage dist",
85
85
  "prepack": "npm run clean && npm run build"
86
86
  },
87
- "version": "0.32.4",
87
+ "version": "0.32.6",
88
88
  "jest": {
89
89
  "coverageThreshold": {
90
90
  "global": {