@ovok/native 1.6.51 → 1.6.52

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 (37) hide show
  1. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-builders.js +4 -2
  2. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-builders.js.map +1 -1
  3. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js +30 -6
  4. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js.map +1 -1
  5. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-frame-parser.js +16 -27
  6. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01-frame-parser.js.map +1 -1
  7. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01.device.js +26 -33
  8. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01.device.js.map +1 -1
  9. package/lib/commonjs/modules/bt-management/services/devices/bc01/bc01.main-services.js +1 -1
  10. package/lib/module/modules/bt-management/services/devices/bc01/bc01-command-builders.js +3 -2
  11. package/lib/module/modules/bt-management/services/devices/bc01/bc01-command-builders.js.map +1 -1
  12. package/lib/module/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js +31 -7
  13. package/lib/module/modules/bt-management/services/devices/bc01/bc01-command-sequencer.js.map +1 -1
  14. package/lib/module/modules/bt-management/services/devices/bc01/bc01-frame-parser.js +16 -26
  15. package/lib/module/modules/bt-management/services/devices/bc01/bc01-frame-parser.js.map +1 -1
  16. package/lib/module/modules/bt-management/services/devices/bc01/bc01.device.js +27 -34
  17. package/lib/module/modules/bt-management/services/devices/bc01/bc01.device.js.map +1 -1
  18. package/lib/module/modules/bt-management/services/devices/bc01/bc01.main-services.js +1 -1
  19. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-command-builders.d.ts +2 -1
  20. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-command-builders.d.ts.map +1 -1
  21. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-command-sequencer.d.ts +3 -6
  22. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-command-sequencer.d.ts.map +1 -1
  23. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-frame-parser.d.ts +7 -17
  24. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01-frame-parser.d.ts.map +1 -1
  25. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01.device.d.ts +5 -2
  26. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01.device.d.ts.map +1 -1
  27. package/lib/typescript/commonjs/src/modules/bt-management/services/devices/bc01/bc01.main-services.d.ts +1 -1
  28. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-command-builders.d.ts +2 -1
  29. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-command-builders.d.ts.map +1 -1
  30. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-command-sequencer.d.ts +3 -6
  31. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-command-sequencer.d.ts.map +1 -1
  32. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-frame-parser.d.ts +7 -17
  33. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01-frame-parser.d.ts.map +1 -1
  34. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01.device.d.ts +5 -2
  35. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01.device.d.ts.map +1 -1
  36. package/lib/typescript/module/src/modules/bt-management/services/devices/bc01/bc01.main-services.d.ts +1 -1
  37. package/package.json +2 -2
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.buildSetTimeCommand = exports.buildResetCommand = exports.buildRequestVersionCommand = exports.buildDeleteCommand = exports.buildCommand = exports.bc401Checksum = exports.asHex = exports.RX = exports.RETRY_RECORD_GROUP = exports.RESET_DELAY_MS = exports.REQUEST_NEXT_RECORD_GROUP = exports.REQUEST_ALL = exports.RECORD_LAST_OF_SET_BIT = exports.RECORD_FLAGS_INDEX = exports.OP_REQUEST_RECORDS = exports.OP_REQUEST_QUANTITATIVE_RECORDS = exports.OP_REQUEST_COUNT = exports.FINAL_RECORD_DELAY_MS = exports.ACK_LAST_OF_SET = void 0;
6
+ exports.buildSetTimeCommand = exports.buildResetCommand = exports.buildRequestVersionCommand = exports.buildDeleteCommand = exports.buildCommand = exports.bc401ChecksumMatches = exports.bc401Checksum = exports.asHex = exports.RX = exports.RETRY_RECORD_GROUP = exports.RESET_DELAY_MS = exports.REQUEST_NEXT_RECORD_GROUP = exports.REQUEST_ALL = exports.RECORD_LAST_OF_SET_BIT = exports.RECORD_FLAGS_INDEX = exports.OP_REQUEST_RECORDS = exports.OP_REQUEST_QUANTITATIVE_RECORDS = exports.OP_REQUEST_COUNT = exports.FINAL_RECORD_DELAY_MS = exports.ACK_LAST_OF_SET = void 0;
7
7
  /** Wire constants and frame builders shared by the BC401 command sequencer. */
8
8
  const OP_RESET = 0x80;
9
9
  const OP_REQUEST_VERSION = 0x82;
@@ -34,6 +34,8 @@ const asHex = byte => (byte & 0xff).toString(16).padStart(2, "0");
34
34
  exports.asHex = asHex;
35
35
  const bc401Checksum = bytes => bytes.reduce((acc, byte) => acc + (byte & 0x7f), 0) & 0x7f;
36
36
  exports.bc401Checksum = bc401Checksum;
37
+ const bc401ChecksumMatches = bytes => bytes.length > 1 && bytes[bytes.length - 1] === bc401Checksum(bytes.slice(0, -1));
38
+ exports.bc401ChecksumMatches = bc401ChecksumMatches;
37
39
  const buildCommand = (opcode, arg) => [opcode, arg, bc401Checksum([opcode, arg])];
38
40
  exports.buildCommand = buildCommand;
39
41
  const buildResetCommand = () => [OP_RESET, 0x00];
@@ -58,7 +60,7 @@ const buildSetTimeCommand = (now, timezone = "local") => {
58
60
  seconds: now.getSeconds(),
59
61
  milliseconds: now.getMilliseconds()
60
62
  };
61
- const payload = [OP_SET_TIME, parts.year - 2000, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, parts.milliseconds & 0xff, parts.milliseconds >> 8 & 0xff];
63
+ const payload = [OP_SET_TIME, parts.year - 2000, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, parts.milliseconds & 0x7f, parts.milliseconds >> 8 & 0x7f];
62
64
  return [...payload, bc401Checksum(payload)];
63
65
  };
64
66
  exports.buildSetTimeCommand = buildSetTimeCommand;
@@ -1 +1 @@
1
- {"version":3,"names":["OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","exports","OP_REQUEST_RECORDS","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RETRY_RECORD_GROUP","FINAL_RECORD_DELAY_MS","RESET_DELAY_MS","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","buildCommand","opcode","arg","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","timezone","parts","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","payload","buildDeleteCommand"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-builders.ts"],"mappings":";;;;;;AAAA;AACA,MAAMA,QAAQ,GAAG,IAAI;AACrB,MAAMC,kBAAkB,GAAG,IAAI;AAC/B,MAAMC,WAAW,GAAG,IAAI;AACxB,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAG,IAAI;AAC7B,MAAME,kBAAkB,GAAAD,OAAA,CAAAC,kBAAA,GAAG,IAAI;AAC/B,MAAMC,+BAA+B,GAAAF,OAAA,CAAAE,+BAAA,GAAG,IAAI;AAE5C,MAAMC,eAAe,GAAAH,OAAA,CAAAG,eAAA,GAAG,IAAI;AAC5B,MAAMC,WAAW,GAAAJ,OAAA,CAAAI,WAAA,GAAG,IAAI;AACxB,MAAMC,yBAAyB,GAAAL,OAAA,CAAAK,yBAAA,GAAG,IAAI;AACtC,MAAMC,kBAAkB,GAAAN,OAAA,CAAAM,kBAAA,GAAG,IAAI;AAC/B,MAAMC,qBAAqB,GAAAP,OAAA,CAAAO,qBAAA,GAAG,GAAG;AACjC,MAAMC,cAAc,GAAAR,OAAA,CAAAQ,cAAA,GAAG,GAAG;AAE1B,MAAMC,EAAE,GAAAT,OAAA,CAAAS,EAAA,GAAG;EACTC,GAAG,EAAE,IAAI;EACTC,aAAa,EAAE,IAAI;EACnBC,aAAa,EAAE,IAAI;EACnBC,WAAW,EAAE,IAAI;EACjBC,iBAAiB,EAAE,IAAI;EACvBC,mBAAmB,EAAE,IAAI;EACzBC,MAAM,EAAE,IAAI;EACZC,mBAAmB,EAAE,IAAI;EACzBC,yBAAyB,EAAE;AAC7B,CAAU;AAEV,MAAMC,kBAAkB,GAAAnB,OAAA,CAAAmB,kBAAA,GAAG,CAAC;AAC5B,MAAMC,sBAAsB,GAAApB,OAAA,CAAAoB,sBAAA,GAAG,IAAI;AAEnC,MAAMC,KAAK,GAAIC,IAAY,IACzB,CAACA,IAAI,GAAG,IAAI,EAAEC,QAAQ,CAAC,EAAE,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;AAACxB,OAAA,CAAAqB,KAAA,GAAAA,KAAA;AAE9C,MAAMI,aAAa,GAAIC,KAAwB,IAC7CA,KAAK,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEN,IAAI,KAAKM,GAAG,IAAIN,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI;AAACtB,OAAA,CAAAyB,aAAA,GAAAA,aAAA;AAE7D,MAAMI,YAAY,GAAGA,CAACC,MAAc,EAAEC,GAAW,KAAe,CAC9DD,MAAM,EACNC,GAAG,EACHN,aAAa,CAAC,CAACK,MAAM,EAAEC,GAAG,CAAC,CAAC,CAC7B;AAAC/B,OAAA,CAAA6B,YAAA,GAAAA,YAAA;AAEF,MAAMG,iBAAiB,GAAGA,CAAA,KAAgB,CAACpC,QAAQ,EAAE,IAAI,CAAC;AAACI,OAAA,CAAAgC,iBAAA,GAAAA,iBAAA;AAE3D,MAAMC,0BAA0B,GAAGA,CAAA,KAAgB,CACjDpC,kBAAkB,EAClB4B,aAAa,CAAC,CAAC5B,kBAAkB,CAAC,CAAC,CACpC;AAACG,OAAA,CAAAiC,0BAAA,GAAAA,0BAAA;AAEF,MAAMC,mBAAmB,GAAGA,CAC1BC,GAAS,EACTC,QAAyB,GAAG,OAAO,KACtB;EACb,MAAMC,KAAK,GACTD,QAAQ,KAAK,KAAK,GACd;IACEE,IAAI,EAAEH,GAAG,CAACI,cAAc,CAAC,CAAC;IAC1BC,KAAK,EAAEL,GAAG,CAACM,WAAW,CAAC,CAAC,GAAG,CAAC;IAC5BC,GAAG,EAAEP,GAAG,CAACQ,UAAU,CAAC,CAAC;IACrBC,KAAK,EAAET,GAAG,CAACU,WAAW,CAAC,CAAC;IACxBC,OAAO,EAAEX,GAAG,CAACY,aAAa,CAAC,CAAC;IAC5BC,OAAO,EAAEb,GAAG,CAACc,aAAa,CAAC,CAAC;IAC5BC,YAAY,EAAEf,GAAG,CAACgB,kBAAkB,CAAC;EACvC,CAAC,GACD;IACEb,IAAI,EAAEH,GAAG,CAACiB,WAAW,CAAC,CAAC;IACvBZ,KAAK,EAAEL,GAAG,CAACkB,QAAQ,CAAC,CAAC,GAAG,CAAC;IACzBX,GAAG,EAAEP,GAAG,CAACmB,OAAO,CAAC,CAAC;IAClBV,KAAK,EAAET,GAAG,CAACoB,QAAQ,CAAC,CAAC;IACrBT,OAAO,EAAEX,GAAG,CAACqB,UAAU,CAAC,CAAC;IACzBR,OAAO,EAAEb,GAAG,CAACsB,UAAU,CAAC,CAAC;IAC3BP,YAAY,EAAEf,GAAG,CAACuB,eAAe,CAAC;EACpC,CAAC;EAEL,MAAMC,OAAO,GAAG,CACd7D,WAAW,EACXuC,KAAK,CAACC,IAAI,GAAG,IAAI,EACjBD,KAAK,CAACG,KAAK,EACXH,KAAK,CAACK,GAAG,EACTL,KAAK,CAACO,KAAK,EACXP,KAAK,CAACS,OAAO,EACbT,KAAK,CAACW,OAAO,EACbX,KAAK,CAACa,YAAY,GAAG,IAAI,EACxBb,KAAK,CAACa,YAAY,IAAI,CAAC,GAAI,IAAI,CACjC;EAED,OAAO,CAAC,GAAGS,OAAO,EAAElC,aAAa,CAACkC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAAC3D,OAAA,CAAAkC,mBAAA,GAAAA,mBAAA;AAEF,MAAM0B,kBAAkB,GAAGA,CAAA,KAAgB,CAAC,IAAI,EAAE,IAAI,CAAC;AAAC5D,OAAA,CAAA4D,kBAAA,GAAAA,kBAAA","ignoreList":[]}
1
+ {"version":3,"names":["OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","exports","OP_REQUEST_RECORDS","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RETRY_RECORD_GROUP","FINAL_RECORD_DELAY_MS","RESET_DELAY_MS","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","bc401ChecksumMatches","length","slice","buildCommand","opcode","arg","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","timezone","parts","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","payload","buildDeleteCommand"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-builders.ts"],"mappings":"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","ignoreList":[]}
@@ -34,6 +34,7 @@ class Bc01CommandSequencer {
34
34
 
35
35
  /** Five quantitative pages per request group; 5 means a new group. */
36
36
  quantitativePage = 5;
37
+ sawQuantitativeRecord = false;
37
38
 
38
39
  /** Injectable for tests; production reads `Date.now()`. */
39
40
 
@@ -47,14 +48,36 @@ class Bc01CommandSequencer {
47
48
  return undefined;
48
49
  }
49
50
  const opcode = (0, _hexToByte.hexToByte)(frame[0] ?? "0");
51
+ if (!(0, _bc01CommandBuilders.bc401ChecksumMatches)(frame.map(_hexToByte.hexToByte))) {
52
+ this.params.onError?.(`BC401 checksum failed for frame ${(0, _bc01CommandBuilders.asHex)(opcode)}`);
53
+ if (opcode === _bc01CommandBuilders.RX.STORED_RECORD_PAGED) {
54
+ this.standardPage = 10;
55
+ return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.RETRY_RECORD_GROUP))];
56
+ }
57
+ if (opcode === _bc01CommandBuilders.RX.STORED_QUANTITATIVE_PAGED) {
58
+ this.quantitativePage = 5;
59
+ return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS, _bc01CommandBuilders.RETRY_RECORD_GROUP))];
60
+ }
61
+ this.isDone = true;
62
+ return undefined;
63
+ }
50
64
  switch (opcode) {
51
65
  case _bc01CommandBuilders.RX.ACK:
52
66
  return [this.commandFor((0, _bc01CommandBuilders.buildRequestVersionCommand)())];
53
67
  case _bc01CommandBuilders.RX.VERSION_REPLY:
54
68
  return [this.commandFor((0, _clockSync.isClockSyncEnabled)(this.params.clockSync) ? (0, _bc01CommandBuilders.buildSetTimeCommand)(this.clock(), this.params.clockSync?.timezone) : (0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_COUNT, _bc01CommandBuilders.REQUEST_ALL))];
55
69
  case _bc01CommandBuilders.RX.TIME_SYNC_ACK:
70
+ if ((0, _hexToByte.hexToByte)(frame[1] ?? "0") !== 0) {
71
+ this.params.onError?.("BC401 rejected the time synchronization");
72
+ this.isDone = true;
73
+ return undefined;
74
+ }
56
75
  return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_COUNT, _bc01CommandBuilders.REQUEST_ALL))];
57
76
  case _bc01CommandBuilders.RX.COUNT_REPLY:
77
+ if (((0, _hexToByte.hexToByte)(frame[4] ?? "0") & 0x7f | ((0, _hexToByte.hexToByte)(frame[5] ?? "0") & 0x7f) << 7) === 0) {
78
+ this.isDone = true;
79
+ return undefined;
80
+ }
58
81
  return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.REQUEST_ALL))];
59
82
  case _bc01CommandBuilders.RX.STORED_RECORD_URS:
60
83
  case _bc01CommandBuilders.RX.STORED_RECORD_PAGED:
@@ -72,7 +95,7 @@ class Bc01CommandSequencer {
72
95
  answerStoredRecord = (opcode, frame) => {
73
96
  const flags = (0, _hexToByte.hexToByte)(frame[_bc01CommandBuilders.RECORD_FLAGS_INDEX] ?? "0");
74
97
  if (opcode === _bc01CommandBuilders.RX.STORED_RECORD_URS) {
75
- return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_RECORDS);
98
+ return this.finishStoredRecords();
76
99
  }
77
100
  const page = flags & 0x0f;
78
101
  if (this.standardPage === 10) {
@@ -90,12 +113,13 @@ class Bc01CommandSequencer {
90
113
  return undefined;
91
114
  }
92
115
  this.standardPage = 10;
93
- return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_RECORDS);
116
+ return this.finishStoredRecords();
94
117
  };
95
118
  answerQuantitativeRecord = (opcode, frame) => {
119
+ this.sawQuantitativeRecord = true;
96
120
  const flags = (0, _hexToByte.hexToByte)(frame[_bc01CommandBuilders.RECORD_FLAGS_INDEX] ?? "0");
97
121
  if (opcode === _bc01CommandBuilders.RX.STORED_QUANTITATIVE) {
98
- return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS);
122
+ return this.finishStoredRecords();
99
123
  }
100
124
  const page = flags & 0x0f;
101
125
  if (this.quantitativePage === 5) {
@@ -113,11 +137,11 @@ class Bc01CommandSequencer {
113
137
  return undefined;
114
138
  }
115
139
  this.quantitativePage = 5;
116
- return this.finishStoredRecords(_bc01CommandBuilders.OP_REQUEST_QUANTITATIVE_RECORDS);
140
+ return this.finishStoredRecords();
117
141
  };
118
- finishStoredRecords = opcode => {
142
+ finishStoredRecords = () => {
119
143
  this.isDone = true;
120
- return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(opcode, _bc01CommandBuilders.ACK_LAST_OF_SET)), this.commandFor((0, _bc01CommandBuilders.buildDeleteCommand)(), _bc01CommandBuilders.FINAL_RECORD_DELAY_MS)];
144
+ return [this.commandFor((0, _bc01CommandBuilders.buildCommand)(_bc01CommandBuilders.OP_REQUEST_RECORDS, _bc01CommandBuilders.ACK_LAST_OF_SET)), ...(this.params.clearDeviceHistory && !this.sawQuantitativeRecord ? [this.commandFor((0, _bc01CommandBuilders.buildDeleteCommand)(), _bc01CommandBuilders.FINAL_RECORD_DELAY_MS)] : [])];
121
145
  };
122
146
  commandFor = (bytes, delayBeforeWriteMs = 0) => ({
123
147
  ...this.params.write,
@@ -1 +1 @@
1
- {"version":3,"names":["_clockSync","require","_hexToByte","_bc01CommandBuilders","Bc01CommandSequencer","isDone","standardPage","quantitativePage","constructor","params","clock","clockSync","now","Date","initialCommands","commandFor","buildResetCommand","RESET_DELAY_MS","nextCommand","frame","length","undefined","opcode","hexToByte","RX","ACK","buildRequestVersionCommand","VERSION_REPLY","isClockSyncEnabled","buildSetTimeCommand","timezone","buildCommand","OP_REQUEST_COUNT","REQUEST_ALL","TIME_SYNC_ACK","COUNT_REPLY","OP_REQUEST_RECORDS","STORED_RECORD_URS","STORED_RECORD_PAGED","answerStoredRecord","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","answerQuantitativeRecord","FINISH","flags","RECORD_FLAGS_INDEX","finishStoredRecords","page","RETRY_RECORD_GROUP","RECORD_LAST_OF_SET_BIT","REQUEST_NEXT_RECORD_GROUP","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","buildDeleteCommand","FINAL_RECORD_DELAY_MS","bytes","delayBeforeWriteMs","write","map","asHex","exports","bc01CommandSequencerInternals","bc401Checksum"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_clockSync","require","_hexToByte","_bc01CommandBuilders","Bc01CommandSequencer","isDone","standardPage","quantitativePage","sawQuantitativeRecord","constructor","params","clock","clockSync","now","Date","initialCommands","commandFor","buildResetCommand","RESET_DELAY_MS","nextCommand","frame","length","undefined","opcode","hexToByte","bc401ChecksumMatches","map","onError","asHex","RX","STORED_RECORD_PAGED","buildCommand","OP_REQUEST_RECORDS","RETRY_RECORD_GROUP","STORED_QUANTITATIVE_PAGED","OP_REQUEST_QUANTITATIVE_RECORDS","ACK","buildRequestVersionCommand","VERSION_REPLY","isClockSyncEnabled","buildSetTimeCommand","timezone","OP_REQUEST_COUNT","REQUEST_ALL","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","answerStoredRecord","STORED_QUANTITATIVE","answerQuantitativeRecord","FINISH","flags","RECORD_FLAGS_INDEX","finishStoredRecords","page","RECORD_LAST_OF_SET_BIT","REQUEST_NEXT_RECORD_GROUP","ACK_LAST_OF_SET","clearDeviceHistory","buildDeleteCommand","FINAL_RECORD_DELAY_MS","bytes","delayBeforeWriteMs","write","exports","bc01CommandSequencerInternals","bc401Checksum"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}
@@ -3,12 +3,13 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.parseBc01Record = exports.isBc01Record = exports.BC01_URS_OPCODE = exports.BC01_RECORD_LENGTH = exports.BC01_PAGED_URS_OPCODE = exports.BC01_LAST_OF_SET_BIT = exports.BC01_ANALYTE_VALUES = exports.BC01_ANALYTE_ORDER = void 0;
6
+ exports.parseBc01Record = exports.BC01_URS_OPCODE = exports.BC01_RECORD_LENGTH = exports.BC01_PAGED_URS_OPCODE = exports.BC01_LAST_OF_SET_BIT = exports.BC01_ANALYTE_VALUES = exports.BC01_ANALYTE_ORDER = void 0;
7
7
  var _hexToByte = require("../../../utils/hex-to-byte.js");
8
+ var _bc01CommandBuilders = require("./bc01-command-builders.js");
8
9
  /** BC401 stored-record frame is always sixteen bytes: header, timestamp, analytes, checksum. */
9
10
  const BC01_RECORD_LENGTH = exports.BC01_RECORD_LENGTH = 16;
10
11
 
11
- /** The two opcodes the firmware uses for a stored URS-7 record. */
12
+ /** The two opcodes the firmware uses for a stored BC401 strip record. */
12
13
  const BC01_URS_OPCODE = exports.BC01_URS_OPCODE = 0xe1;
13
14
  const BC01_PAGED_URS_OPCODE = exports.BC01_PAGED_URS_OPCODE = 0xe2;
14
15
 
@@ -31,16 +32,14 @@ const MINUTE_MASK = 0x3f;
31
32
  const SECOND_MASK = 0x3f;
32
33
 
33
34
  /**
34
- * URS-7 pad names, in the exact order they occupy the packed 3-bit slots
35
- * across bytes 8..14 (see M1/a.java). The eleventh slot is a Contec-firmware
36
- * field the vendor's own catalog calls "vc" and no other name is documented.
35
+ * Pad names, in the exact order they occupy the packed 3-bit slots across
36
+ * bytes 8..14 (see PHMS M1/a.java), covering both 11- and 14-pad strips.
37
37
  */
38
- const BC01_ANALYTE_ORDER = exports.BC01_ANALYTE_ORDER = ["uro", "bld", "bil", "ket", "glu", "pro", "ph", "nit", "leu", "sg", "vc"];
38
+ const BC01_ANALYTE_ORDER = exports.BC01_ANALYTE_ORDER = ["uro", "bld", "bil", "ket", "glu", "pro", "ph", "nit", "leu", "sg", "vc", "mal", "cr", "uca"];
39
39
  /**
40
40
  * BC401's packed values are colour-chart indexes, not measurements. These
41
41
  * values mirror the tables in Contec's BC401 integration (PHMS M1/a.java):
42
42
  * the index is zero-based and `7` remains the device's unmeasured sentinel.
43
- * The pH table is the URS-7 strip scale, which includes half-point readings.
44
43
  */
45
44
  const BC01_ANALYTE_VALUES = exports.BC01_ANALYTE_VALUES = {
46
45
  uro: [0.2, 2, 4, 8],
@@ -49,11 +48,14 @@ const BC01_ANALYTE_VALUES = exports.BC01_ANALYTE_VALUES = {
49
48
  ket: [0, 15, 40, 80],
50
49
  glu: [0, 50, 100, 250, 500, 1000],
51
50
  pro: [0, 15, 30, 100, 300],
52
- ph: [5, 6, 6.5, 7, 7.5, 8, 8.5],
51
+ ph: [5, 6, 7, 8, 9],
53
52
  nit: [0, 1],
54
53
  leu: [0, 15, 70, 125, 500],
55
54
  sg: [1.005, 1.01, 1.015, 1.02, 1.025, 1.03],
56
- vc: [0, 10, 25, 50, 100]
55
+ vc: [0, 10, 25, 50, 100],
56
+ mal: [1, 3, 8, 15],
57
+ cr: [10, 50, 100, 200, 300],
58
+ uca: [2, 5, 15, 50]
57
59
  };
58
60
 
59
61
  /** Where the packed analyte pairs start in a 16-byte E1/E2 frame. */
@@ -76,10 +78,8 @@ const readPad = (packed, slot) => slot === 0 ? packed & 0x07 : packed >> 3 & 0x0
76
78
  * frame is a record or a heartbeat, and a frame that fails these checks is
77
79
  * skipped rather than parsed into a plausible-looking wrong reading.
78
80
  *
79
- * The checksum byte is not verified here: the SDK's read path already ensures
80
- * frame integrity before the parser sees the bytes, and a URS-7 pad value can
81
- * only land in [0, 7] anyway — a corrupt payload would fail the pad-value
82
- * check before it made it into a measurement.
81
+ * The checksum byte is verified before any value is exposed; individual
82
+ * packed indexes could otherwise decode into plausible but incorrect results.
83
83
  */
84
84
  const parseBc01Record = frame => {
85
85
  if (frame.length < BC01_RECORD_LENGTH) {
@@ -89,6 +89,9 @@ const parseBc01Record = frame => {
89
89
  if (opcode !== BC01_URS_OPCODE && opcode !== BC01_PAGED_URS_OPCODE) {
90
90
  return undefined;
91
91
  }
92
+ if (!(0, _bc01CommandBuilders.bc401ChecksumMatches)(frame.map(_hexToByte.hexToByte))) {
93
+ return undefined;
94
+ }
92
95
  const flags = (0, _hexToByte.hexToByte)(frame[1] ?? "");
93
96
  const yy = (0, _hexToByte.hexToByte)(frame[2] ?? "") + YEAR_BASE;
94
97
  const mm = (0, _hexToByte.hexToByte)(frame[3] ?? "") & MONTH_MASK;
@@ -118,19 +121,5 @@ const parseBc01Record = frame => {
118
121
  values
119
122
  };
120
123
  };
121
-
122
- /**
123
- * True when the buffer holds a complete BC401 stored record. Used by the
124
- * driver's `validatePackage` hook so the SDK's read path only advances once
125
- * the notification carries a whole 16-byte frame.
126
- */
127
124
  exports.parseBc01Record = parseBc01Record;
128
- const isBc01Record = frame => {
129
- if (frame.length < BC01_RECORD_LENGTH) {
130
- return false;
131
- }
132
- const opcode = (0, _hexToByte.hexToByte)(frame[0] ?? "");
133
- return opcode === BC01_URS_OPCODE || opcode === BC01_PAGED_URS_OPCODE;
134
- };
135
- exports.isBc01Record = isBc01Record;
136
125
  //# sourceMappingURL=bc01-frame-parser.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["_hexToByte","require","BC01_RECORD_LENGTH","exports","BC01_URS_OPCODE","BC01_PAGED_URS_OPCODE","BC01_LAST_OF_SET_BIT","UNMEASURED","YEAR_BASE","MONTH_MASK","DAY_MASK","HOUR_MASK","MINUTE_MASK","SECOND_MASK","BC01_ANALYTE_ORDER","BC01_ANALYTE_VALUES","uro","bld","bil","ket","glu","pro","ph","nit","leu","sg","vc","ANALYTES_START","readPad","packed","slot","parseBc01Record","frame","length","undefined","opcode","hexToByte","flags","yy","mm","dd","hh","mi","ss","timestamp","Date","values","forEach","analyte","position","byteIndex","Math","floor","level","value","lastOfSet","pageIndex","isBc01Record"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-frame-parser.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_hexToByte","require","_bc01CommandBuilders","BC01_RECORD_LENGTH","exports","BC01_URS_OPCODE","BC01_PAGED_URS_OPCODE","BC01_LAST_OF_SET_BIT","UNMEASURED","YEAR_BASE","MONTH_MASK","DAY_MASK","HOUR_MASK","MINUTE_MASK","SECOND_MASK","BC01_ANALYTE_ORDER","BC01_ANALYTE_VALUES","uro","bld","bil","ket","glu","pro","ph","nit","leu","sg","vc","mal","cr","uca","ANALYTES_START","readPad","packed","slot","parseBc01Record","frame","length","undefined","opcode","hexToByte","bc401ChecksumMatches","map","flags","yy","mm","dd","hh","mi","ss","timestamp","Date","values","forEach","analyte","position","byteIndex","Math","floor","level","value","lastOfSet","pageIndex"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-frame-parser.ts"],"mappings":"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","ignoreList":[]}
@@ -12,27 +12,6 @@ var _bc01CommandSequencer = require("./bc01-command-sequencer.js");
12
12
  var _bc01FrameParser = require("./bc01-frame-parser.js");
13
13
  var _bc01FrameReader = require("./bc01.frame-reader.js");
14
14
  var _bc01MainServices = require("./bc01.main-services.js");
15
- /** Minimum bytes a complete frame carries, keyed by its opening opcode. */
16
- const BC01_FRAME_MIN_LENGTH = {
17
- 0xf0: 2,
18
- // ACK
19
- 0xf2: 8,
20
- // Version reply (variable — 8 is the minimum PHMS reads before answering)
21
- 0xf3: 3,
22
- // Time-sync ack
23
- 0xe0: 7,
24
- // Record-count reply
25
- 0xe1: 16,
26
- // Stored URS record
27
- 0xe2: 16,
28
- // Paginated URS record
29
- 0xe3: 3,
30
- // Finish
31
- 0xe4: 36,
32
- // Quantitative record (optional path)
33
- 0xe5: 36 // Quantitative record (optional path)
34
- };
35
-
36
15
  /**
37
16
  * Contec BC401 (BC01) urine analyzer driver.
38
17
  *
@@ -44,12 +23,15 @@ const BC01_FRAME_MIN_LENGTH = {
44
23
  * 16-byte E1/E2 frame on 0xFF02.
45
24
  */
46
25
  class BC01Device extends _btManagedDevice.BTManagedDevice {
47
- onStreamStart = () => {};
26
+ onStreamStart = () => {
27
+ this.reportedTimestamps.clear();
28
+ };
29
+ reportedTimestamps = new Set();
48
30
  mainServices = _bc01MainServices.bc01MainServices;
49
31
  frameReader = new _bc01FrameReader.Bc01FrameReader();
50
32
 
51
33
  /**
52
- * 90 s covers the maximum firmware-side reagent-pad settle time on a URS-7
34
+ * 90 s covers the maximum firmware-side reagent-pad settle time on a
53
35
  * strip and leaves headroom for a bulk memory dump of every stored record.
54
36
  * If the device does not push a frame within that window the data processor
55
37
  * times out and the driver surfaces "device unreachable".
@@ -65,14 +47,18 @@ class BC01Device extends _btManagedDevice.BTManagedDevice {
65
47
  * set. The parent's default `pollingSequencerFor` would only re-send the
66
48
  * declared reset forever, which the firmware ignores after the first one.
67
49
  */
68
- this.createCommandSequencer = () => new _bc01CommandSequencer.Bc01CommandSequencer({
69
- write: {
70
- serviceUuid: _bc01MainServices.bc01MainServices[0].uuid,
71
- characteristicUuid: _bc01MainServices.bc01MainServices[0].writeUuid.uuid
72
- },
73
- onRefused: reason => this.onError?.(new Error(`BC401 handshake: ${reason}`)),
74
- clockSync: params.clockSync
75
- }, params.clockSync?.now);
50
+ this.createCommandSequencer = () => {
51
+ this.reportedTimestamps.clear();
52
+ return new _bc01CommandSequencer.Bc01CommandSequencer({
53
+ write: {
54
+ serviceUuid: _bc01MainServices.bc01MainServices[0].uuid,
55
+ characteristicUuid: _bc01MainServices.bc01MainServices[0].writeUuid.uuid
56
+ },
57
+ onError: reason => this.onError?.(new Error(`BC401: ${reason}`)),
58
+ clockSync: params.clockSync,
59
+ clearDeviceHistory: params.clearDeviceHistory
60
+ }, params.clockSync?.now);
61
+ };
76
62
  }
77
63
 
78
64
  /**
@@ -86,7 +72,7 @@ class BC01Device extends _btManagedDevice.BTManagedDevice {
86
72
  return false;
87
73
  }
88
74
  const opcode = (0, _hexToByte.hexToByte)(pkg[0] ?? "");
89
- const minLength = BC01_FRAME_MIN_LENGTH[opcode];
75
+ const minLength = _bc01FrameReader.bc01FrameLengths[opcode.toString(16).padStart(2, "0")];
90
76
  if (minLength === undefined) {
91
77
  return false;
92
78
  }
@@ -117,7 +103,9 @@ class BC01Device extends _btManagedDevice.BTManagedDevice {
117
103
  /**
118
104
  * Nothing to do here for the BC401. Every reading arrives through the
119
105
  * dependent-result path, and the state machine sees only the `OTHER`-typed
120
- * echo we return from `handleDependentResult`.
106
+ * echo we return from `handleDependentResult`. Records are deduplicated by
107
+ * their second-resolution device timestamp for this transfer because a
108
+ * paged-group retry resends the earlier frames.
121
109
  */
122
110
  handleSuccessResult() {
123
111
  return;
@@ -138,6 +126,11 @@ class BC01Device extends _btManagedDevice.BTManagedDevice {
138
126
  this.onError?.("feedback-messages.measurement.disturb-detected-error");
139
127
  return;
140
128
  }
129
+ const timestamp = parsed.timestamp.getTime();
130
+ if (this.reportedTimestamps.has(timestamp)) {
131
+ return;
132
+ }
133
+ this.reportedTimestamps.add(timestamp);
141
134
  const reading = {
142
135
  caseType: _caseType.CaseType.RESULT,
143
136
  measurementTypeKey: _core.MeasurementTypeKey.uricAcid,
@@ -1 +1 @@
1
- {"version":3,"names":["_core","require","_caseType","_hexToByte","_btManagedDevice","_bc01CommandSequencer","_bc01FrameParser","_bc01FrameReader","_bc01MainServices","BC01_FRAME_MIN_LENGTH","BC01Device","BTManagedDevice","onStreamStart","mainServices","bc01MainServices","frameReader","Bc01FrameReader","stuckDataTimeout","constructor","device","params","createCommandSequencer","Bc01CommandSequencer","write","serviceUuid","uuid","characteristicUuid","writeUuid","onRefused","reason","onError","Error","clockSync","now","validatePackage","pkg","length","opcode","hexToByte","minLength","undefined","handleDependentResult","data","frame","reportUrsRecord","parsingCase","caseType","CaseType","OTHER","handleSuccessResult","parsed","parseBc01Record","measuredValues","BC01_ANALYTE_ORDER","reduce","acc","analyte","value","values","Object","keys","reading","RESULT","measurementTypeKey","MeasurementTypeKey","uricAcid","urineValues","recordedAt","timestamp","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.device.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_core","require","_caseType","_hexToByte","_btManagedDevice","_bc01CommandSequencer","_bc01FrameParser","_bc01FrameReader","_bc01MainServices","BC01Device","BTManagedDevice","onStreamStart","reportedTimestamps","clear","Set","mainServices","bc01MainServices","frameReader","Bc01FrameReader","stuckDataTimeout","constructor","device","params","createCommandSequencer","Bc01CommandSequencer","write","serviceUuid","uuid","characteristicUuid","writeUuid","onError","reason","Error","clockSync","clearDeviceHistory","now","validatePackage","pkg","length","opcode","hexToByte","minLength","bc01FrameLengths","toString","padStart","undefined","handleDependentResult","data","frame","reportUrsRecord","parsingCase","caseType","CaseType","OTHER","handleSuccessResult","parsed","parseBc01Record","measuredValues","BC01_ANALYTE_ORDER","reduce","acc","analyte","value","values","Object","keys","timestamp","getTime","has","add","reading","RESULT","measurementTypeKey","MeasurementTypeKey","uricAcid","urineValues","recordedAt","onResult","exports"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01.device.ts"],"mappings":"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","ignoreList":[]}
@@ -10,7 +10,7 @@ var _caseType = require("../../../types/case-type.js");
10
10
  * Contec BC401 (a.k.a. BC01) urine analyzer — GATT profile.
11
11
  *
12
12
  * The BC401 uses Contec's proprietary FF12 service, shared across their
13
- * consumer medical devices. Every stored URS-7 measurement is pushed as a
13
+ * consumer medical devices. Every stored urine-strip measurement is pushed as a
14
14
  * 16-byte record on 0xFF02 after the host has walked the handshake documented
15
15
  * in `bc01-command-sequencer.ts`.
16
16
  *
@@ -28,6 +28,7 @@ const RECORD_FLAGS_INDEX = 1;
28
28
  const RECORD_LAST_OF_SET_BIT = 0x40;
29
29
  const asHex = byte => (byte & 0xff).toString(16).padStart(2, "0");
30
30
  const bc401Checksum = bytes => bytes.reduce((acc, byte) => acc + (byte & 0x7f), 0) & 0x7f;
31
+ const bc401ChecksumMatches = bytes => bytes.length > 1 && bytes[bytes.length - 1] === bc401Checksum(bytes.slice(0, -1));
31
32
  const buildCommand = (opcode, arg) => [opcode, arg, bc401Checksum([opcode, arg])];
32
33
  const buildResetCommand = () => [OP_RESET, 0x00];
33
34
  const buildRequestVersionCommand = () => [OP_REQUEST_VERSION, bc401Checksum([OP_REQUEST_VERSION])];
@@ -49,9 +50,9 @@ const buildSetTimeCommand = (now, timezone = "local") => {
49
50
  seconds: now.getSeconds(),
50
51
  milliseconds: now.getMilliseconds()
51
52
  };
52
- const payload = [OP_SET_TIME, parts.year - 2000, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, parts.milliseconds & 0xff, parts.milliseconds >> 8 & 0xff];
53
+ const payload = [OP_SET_TIME, parts.year - 2000, parts.month, parts.day, parts.hours, parts.minutes, parts.seconds, parts.milliseconds & 0x7f, parts.milliseconds >> 8 & 0x7f];
53
54
  return [...payload, bc401Checksum(payload)];
54
55
  };
55
56
  const buildDeleteCommand = () => [0x93, 0x13];
56
- export { ACK_LAST_OF_SET, asHex, bc401Checksum, buildCommand, buildDeleteCommand, buildRequestVersionCommand, buildResetCommand, buildSetTimeCommand, FINAL_RECORD_DELAY_MS, OP_REQUEST_COUNT, OP_REQUEST_QUANTITATIVE_RECORDS, OP_REQUEST_RECORDS, RECORD_FLAGS_INDEX, RECORD_LAST_OF_SET_BIT, REQUEST_ALL, REQUEST_NEXT_RECORD_GROUP, RESET_DELAY_MS, RETRY_RECORD_GROUP, RX };
57
+ export { ACK_LAST_OF_SET, asHex, bc401Checksum, bc401ChecksumMatches, buildCommand, buildDeleteCommand, buildRequestVersionCommand, buildResetCommand, buildSetTimeCommand, FINAL_RECORD_DELAY_MS, OP_REQUEST_COUNT, OP_REQUEST_QUANTITATIVE_RECORDS, OP_REQUEST_RECORDS, RECORD_FLAGS_INDEX, RECORD_LAST_OF_SET_BIT, REQUEST_ALL, REQUEST_NEXT_RECORD_GROUP, RESET_DELAY_MS, RETRY_RECORD_GROUP, RX };
57
58
  //# sourceMappingURL=bc01-command-builders.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","OP_REQUEST_RECORDS","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RETRY_RECORD_GROUP","FINAL_RECORD_DELAY_MS","RESET_DELAY_MS","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","buildCommand","opcode","arg","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","timezone","parts","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","payload","buildDeleteCommand"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-builders.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["OP_RESET","OP_REQUEST_VERSION","OP_SET_TIME","OP_REQUEST_COUNT","OP_REQUEST_RECORDS","OP_REQUEST_QUANTITATIVE_RECORDS","ACK_LAST_OF_SET","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RETRY_RECORD_GROUP","FINAL_RECORD_DELAY_MS","RESET_DELAY_MS","RX","ACK","VERSION_REPLY","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","FINISH","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","asHex","byte","toString","padStart","bc401Checksum","bytes","reduce","acc","bc401ChecksumMatches","length","slice","buildCommand","opcode","arg","buildResetCommand","buildRequestVersionCommand","buildSetTimeCommand","now","timezone","parts","year","getUTCFullYear","month","getUTCMonth","day","getUTCDate","hours","getUTCHours","minutes","getUTCMinutes","seconds","getUTCSeconds","milliseconds","getUTCMilliseconds","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","payload","buildDeleteCommand"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-builders.ts"],"mappings":"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","ignoreList":[]}
@@ -4,7 +4,7 @@
4
4
 
5
5
  import { isClockSyncEnabled } from "../../../types/clock-sync.js";
6
6
  import { hexToByte } from "../../../utils/hex-to-byte.js";
7
- import { ACK_LAST_OF_SET, asHex, bc401Checksum, buildCommand, buildDeleteCommand, buildRequestVersionCommand, buildResetCommand, buildSetTimeCommand, FINAL_RECORD_DELAY_MS, OP_REQUEST_COUNT, OP_REQUEST_QUANTITATIVE_RECORDS, OP_REQUEST_RECORDS, RECORD_FLAGS_INDEX, RECORD_LAST_OF_SET_BIT, REQUEST_ALL, REQUEST_NEXT_RECORD_GROUP, RESET_DELAY_MS, RETRY_RECORD_GROUP, RX } from "./bc01-command-builders.js";
7
+ import { ACK_LAST_OF_SET, asHex, bc401Checksum, bc401ChecksumMatches, buildCommand, buildDeleteCommand, buildRequestVersionCommand, buildResetCommand, buildSetTimeCommand, FINAL_RECORD_DELAY_MS, OP_REQUEST_COUNT, OP_REQUEST_QUANTITATIVE_RECORDS, OP_REQUEST_RECORDS, RECORD_FLAGS_INDEX, RECORD_LAST_OF_SET_BIT, REQUEST_ALL, REQUEST_NEXT_RECORD_GROUP, RESET_DELAY_MS, RETRY_RECORD_GROUP, RX } from "./bc01-command-builders.js";
8
8
  /**
9
9
  * Walks the BC401 through its post-reset handshake and pulls every stored
10
10
  * record.
@@ -30,6 +30,7 @@ export class Bc01CommandSequencer {
30
30
 
31
31
  /** Five quantitative pages per request group; 5 means a new group. */
32
32
  quantitativePage = 5;
33
+ sawQuantitativeRecord = false;
33
34
 
34
35
  /** Injectable for tests; production reads `Date.now()`. */
35
36
 
@@ -43,14 +44,36 @@ export class Bc01CommandSequencer {
43
44
  return undefined;
44
45
  }
45
46
  const opcode = hexToByte(frame[0] ?? "0");
47
+ if (!bc401ChecksumMatches(frame.map(hexToByte))) {
48
+ this.params.onError?.(`BC401 checksum failed for frame ${asHex(opcode)}`);
49
+ if (opcode === RX.STORED_RECORD_PAGED) {
50
+ this.standardPage = 10;
51
+ return [this.commandFor(buildCommand(OP_REQUEST_RECORDS, RETRY_RECORD_GROUP))];
52
+ }
53
+ if (opcode === RX.STORED_QUANTITATIVE_PAGED) {
54
+ this.quantitativePage = 5;
55
+ return [this.commandFor(buildCommand(OP_REQUEST_QUANTITATIVE_RECORDS, RETRY_RECORD_GROUP))];
56
+ }
57
+ this.isDone = true;
58
+ return undefined;
59
+ }
46
60
  switch (opcode) {
47
61
  case RX.ACK:
48
62
  return [this.commandFor(buildRequestVersionCommand())];
49
63
  case RX.VERSION_REPLY:
50
64
  return [this.commandFor(isClockSyncEnabled(this.params.clockSync) ? buildSetTimeCommand(this.clock(), this.params.clockSync?.timezone) : buildCommand(OP_REQUEST_COUNT, REQUEST_ALL))];
51
65
  case RX.TIME_SYNC_ACK:
66
+ if (hexToByte(frame[1] ?? "0") !== 0) {
67
+ this.params.onError?.("BC401 rejected the time synchronization");
68
+ this.isDone = true;
69
+ return undefined;
70
+ }
52
71
  return [this.commandFor(buildCommand(OP_REQUEST_COUNT, REQUEST_ALL))];
53
72
  case RX.COUNT_REPLY:
73
+ if ((hexToByte(frame[4] ?? "0") & 0x7f | (hexToByte(frame[5] ?? "0") & 0x7f) << 7) === 0) {
74
+ this.isDone = true;
75
+ return undefined;
76
+ }
54
77
  return [this.commandFor(buildCommand(OP_REQUEST_RECORDS, REQUEST_ALL))];
55
78
  case RX.STORED_RECORD_URS:
56
79
  case RX.STORED_RECORD_PAGED:
@@ -68,7 +91,7 @@ export class Bc01CommandSequencer {
68
91
  answerStoredRecord = (opcode, frame) => {
69
92
  const flags = hexToByte(frame[RECORD_FLAGS_INDEX] ?? "0");
70
93
  if (opcode === RX.STORED_RECORD_URS) {
71
- return this.finishStoredRecords(OP_REQUEST_RECORDS);
94
+ return this.finishStoredRecords();
72
95
  }
73
96
  const page = flags & 0x0f;
74
97
  if (this.standardPage === 10) {
@@ -86,12 +109,13 @@ export class Bc01CommandSequencer {
86
109
  return undefined;
87
110
  }
88
111
  this.standardPage = 10;
89
- return this.finishStoredRecords(OP_REQUEST_RECORDS);
112
+ return this.finishStoredRecords();
90
113
  };
91
114
  answerQuantitativeRecord = (opcode, frame) => {
115
+ this.sawQuantitativeRecord = true;
92
116
  const flags = hexToByte(frame[RECORD_FLAGS_INDEX] ?? "0");
93
117
  if (opcode === RX.STORED_QUANTITATIVE) {
94
- return this.finishStoredRecords(OP_REQUEST_QUANTITATIVE_RECORDS);
118
+ return this.finishStoredRecords();
95
119
  }
96
120
  const page = flags & 0x0f;
97
121
  if (this.quantitativePage === 5) {
@@ -109,11 +133,11 @@ export class Bc01CommandSequencer {
109
133
  return undefined;
110
134
  }
111
135
  this.quantitativePage = 5;
112
- return this.finishStoredRecords(OP_REQUEST_QUANTITATIVE_RECORDS);
136
+ return this.finishStoredRecords();
113
137
  };
114
- finishStoredRecords = opcode => {
138
+ finishStoredRecords = () => {
115
139
  this.isDone = true;
116
- return [this.commandFor(buildCommand(opcode, ACK_LAST_OF_SET)), this.commandFor(buildDeleteCommand(), FINAL_RECORD_DELAY_MS)];
140
+ return [this.commandFor(buildCommand(OP_REQUEST_RECORDS, ACK_LAST_OF_SET)), ...(this.params.clearDeviceHistory && !this.sawQuantitativeRecord ? [this.commandFor(buildDeleteCommand(), FINAL_RECORD_DELAY_MS)] : [])];
117
141
  };
118
142
  commandFor = (bytes, delayBeforeWriteMs = 0) => ({
119
143
  ...this.params.write,
@@ -1 +1 @@
1
- {"version":3,"names":["isClockSyncEnabled","hexToByte","ACK_LAST_OF_SET","asHex","bc401Checksum","buildCommand","buildDeleteCommand","buildRequestVersionCommand","buildResetCommand","buildSetTimeCommand","FINAL_RECORD_DELAY_MS","OP_REQUEST_COUNT","OP_REQUEST_QUANTITATIVE_RECORDS","OP_REQUEST_RECORDS","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RESET_DELAY_MS","RETRY_RECORD_GROUP","RX","Bc01CommandSequencer","isDone","standardPage","quantitativePage","constructor","params","clock","clockSync","now","Date","initialCommands","commandFor","nextCommand","frame","length","undefined","opcode","ACK","VERSION_REPLY","timezone","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","STORED_RECORD_PAGED","answerStoredRecord","STORED_QUANTITATIVE","STORED_QUANTITATIVE_PAGED","answerQuantitativeRecord","FINISH","flags","finishStoredRecords","page","bytes","delayBeforeWriteMs","write","map","bc01CommandSequencerInternals"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["isClockSyncEnabled","hexToByte","ACK_LAST_OF_SET","asHex","bc401Checksum","bc401ChecksumMatches","buildCommand","buildDeleteCommand","buildRequestVersionCommand","buildResetCommand","buildSetTimeCommand","FINAL_RECORD_DELAY_MS","OP_REQUEST_COUNT","OP_REQUEST_QUANTITATIVE_RECORDS","OP_REQUEST_RECORDS","RECORD_FLAGS_INDEX","RECORD_LAST_OF_SET_BIT","REQUEST_ALL","REQUEST_NEXT_RECORD_GROUP","RESET_DELAY_MS","RETRY_RECORD_GROUP","RX","Bc01CommandSequencer","isDone","standardPage","quantitativePage","sawQuantitativeRecord","constructor","params","clock","clockSync","now","Date","initialCommands","commandFor","nextCommand","frame","length","undefined","opcode","map","onError","STORED_RECORD_PAGED","STORED_QUANTITATIVE_PAGED","ACK","VERSION_REPLY","timezone","TIME_SYNC_ACK","COUNT_REPLY","STORED_RECORD_URS","answerStoredRecord","STORED_QUANTITATIVE","answerQuantitativeRecord","FINISH","flags","finishStoredRecords","page","clearDeviceHistory","bytes","delayBeforeWriteMs","write","bc01CommandSequencerInternals"],"sourceRoot":"../../../../../../../src","sources":["modules/bt-management/services/devices/bc01/bc01-command-sequencer.ts"],"mappings":"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","ignoreList":[]}