@ovok/native 1.17.0-dev.2252 → 1.17.0-dev.2254

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 (73) hide show
  1. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js +19 -2
  2. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  3. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js +15 -2
  4. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  5. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js +15 -11
  6. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  7. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js +26 -1
  8. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  9. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js +22 -3
  10. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  11. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js +102 -0
  12. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  13. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js +32 -19
  14. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  15. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  16. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  17. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js +2 -2
  18. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  19. package/lib/module/modules/next/bluetooth/families/trasense/history.js +19 -3
  20. package/lib/module/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  21. package/lib/module/modules/next/bluetooth/families/trasense/models.js +15 -2
  22. package/lib/module/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  23. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js +15 -12
  24. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  25. package/lib/module/modules/next/bluetooth/families/trasense/replies.js +25 -2
  26. package/lib/module/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  27. package/lib/module/modules/next/bluetooth/families/trasense/requests.js +17 -1
  28. package/lib/module/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  29. package/lib/module/modules/next/bluetooth/families/trasense/s9.js +100 -0
  30. package/lib/module/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  31. package/lib/module/modules/next/bluetooth/families/trasense/session.js +30 -19
  32. package/lib/module/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  33. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  34. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  35. package/lib/module/modules/next/bluetooth/families/trasense/variants.js +1 -1
  36. package/lib/module/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  37. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  38. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  39. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  40. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  41. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  42. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  43. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  44. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  45. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  46. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  47. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  48. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  49. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  50. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  51. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  52. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  53. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  54. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  55. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  56. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  57. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  58. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  59. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  60. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  61. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  62. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  63. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  64. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  65. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  66. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  67. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  68. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  69. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  70. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  71. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  72. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  73. package/package.json +2 -2
@@ -35,8 +35,19 @@ const finishedHours = (block, now) => block.steps.flatMap((steps, index) => {
35
35
  const endsAt = new Date(block.year, block.month - 1, block.day, hour).getTime() + HOUR_MS;
36
36
  return steps === null || steps === 0 || endsAt > now.getTime() ? [] : [recordOf(block, hour, steps)];
37
37
  });
38
+ const DATE_DIGITS = 100;
39
+ const dateNumberOf = ({
40
+ year,
41
+ month,
42
+ day
43
+ }) => (year * DATE_DIGITS + month) * DATE_DIGITS + day;
38
44
 
39
- /** The step counts of every day slot, an hour each, then the end-of-sync marker. */
45
+ /** A block dated before the firmware was built comes from a clock that reset after a power loss, so its hours have no real date. */
46
+ const datedBeforeFirmware = (block, {
47
+ date
48
+ }) => date !== null && dateNumberOf(block) < date;
49
+
50
+ /** The step counts of every day slot, an hour each. */
40
51
  async function* storedSteps(connection) {
41
52
  const {
42
53
  newestSlot,
@@ -45,12 +56,17 @@ async function* storedSteps(connection) {
45
56
  for (const slot of slotsOldestFirst(newestSlot, slotCount)) {
46
57
  for (const firstHour of BLOCK_FIRST_HOURS) {
47
58
  const block = stepBlockOf(await connection.request(activityRequest(slot, firstHour)));
48
- if (block !== null) {
59
+ if (block !== null && !datedBeforeFirmware(block, connection.firmware)) {
49
60
  yield* finishedHours(block, connection.now());
50
61
  }
51
62
  }
52
63
  }
64
+ }
65
+
66
+ /** The step counts of every day slot, then the end-of-sync marker the wristbands expect. */
67
+ async function* storedStepsThenFinish(connection) {
68
+ yield* storedSteps(connection);
53
69
  await connection.send(finishSyncRequest()).catch(() => connection.logger.warn("trasense.finish-sync.failed"));
54
70
  }
55
- export { storedSteps };
71
+ export { storedSteps, storedStepsThenFinish };
56
72
  //# sourceMappingURL=history.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["activityCountOf","stepBlockOf","activityCountRequest","activityRequest","finishSyncRequest","BLOCK_FIRST_HOURS","HOUR_MS","slotsOldestFirst","newestSlot","slotCount","Array","from","length","_","offset","recordOf","year","month","day","hour","steps","id","join","reading","type","takenAt","Date","values","value","unit","deviceFlags","finishedHours","block","now","flatMap","index","firstHour","endsAt","getTime","storedSteps","connection","request","slot","send","catch","logger","warn"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/history.ts"],"mappings":";;AAEA,SAAoBA,eAAe,EAAEC,WAAW,QAAQ,cAAW;AACnE,SAASC,oBAAoB,EAAEC,eAAe,EAAEC,iBAAiB,QAAQ,eAAY;AAGrF;AACA,MAAMC,iBAAiB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAU;AAEjD,MAAMC,OAAO,GAAG,SAAS;;AAEzB;AACA,MAAMC,gBAAgB,GAAGA,CAACC,UAAkB,EAAEC,SAAiB,KAC7DC,KAAK,CAACC,IAAI,CAAC;EAAEC,MAAM,EAAEH;AAAU,CAAC,EAAE,CAACI,CAAC,EAAEC,MAAM,KAAK,CAACN,UAAU,GAAG,CAAC,GAAGM,MAAM,IAAIL,SAAS,CAAC;AAEzF,MAAMM,QAAQ,GAAGA,CAAC;EAAEC,IAAI;EAAEC,KAAK;EAAEC;AAAe,CAAC,EAAEC,IAAY,EAAEC,KAAa,MAAqB;EACjGC,EAAE,EAAE,CAACL,IAAI,EAAEC,KAAK,EAAEC,GAAG,EAAEC,IAAI,EAAEC,KAAK,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;EAC7CC,OAAO,EAAE;IACPC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE,IAAIC,IAAI,CAACV,IAAI,EAAEC,KAAK,GAAG,CAAC,EAAEC,GAAG,EAAEC,IAAI,CAAC;IAC7CQ,MAAM,EAAE;MAAEP,KAAK,EAAE;QAAEQ,KAAK,EAAER,KAAK;QAAES,IAAI,EAAE;MAAU;IAAE,CAAC;IACpDC,WAAW,EAAE;EACf;AACF,CAAC,CAAC;;AAEF;AACA,MAAMC,aAAa,GAAGA,CAACC,KAAgB,EAAEC,GAAS,KAChDD,KAAK,CAACZ,KAAK,CAACc,OAAO,CAAC,CAACd,KAAK,EAAEe,KAAK,KAAK;EACpC,MAAMhB,IAAI,GAAGa,KAAK,CAACI,SAAS,GAAGD,KAAK;EACpC,MAAME,MAAM,GAAG,IAAIX,IAAI,CAACM,KAAK,CAAChB,IAAI,EAAEgB,KAAK,CAACf,KAAK,GAAG,CAAC,EAAEe,KAAK,CAACd,GAAG,EAAEC,IAAI,CAAC,CAACmB,OAAO,CAAC,CAAC,GAAGhC,OAAO;EAEzF,OAAOc,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,CAAC,IAAIiB,MAAM,GAAGJ,GAAG,CAACK,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAACvB,QAAQ,CAACiB,KAAK,EAAEb,IAAI,EAAEC,KAAK,CAAC,CAAC;AACtG,CAAC,CAAC;;AAEJ;AACA,gBAAgBmB,WAAWA,CAACC,UAA+B,EAAiC;EAC1F,MAAM;IAAEhC,UAAU;IAAEC;EAAU,CAAC,GAAGT,eAAe,CAAC,MAAMwC,UAAU,CAACC,OAAO,CAACvC,oBAAoB,CAAC,CAAC,CAAC,CAAC;EAEnG,KAAK,MAAMwC,IAAI,IAAInC,gBAAgB,CAACC,UAAU,EAAEC,SAAS,CAAC,EAAE;IAC1D,KAAK,MAAM2B,SAAS,IAAI/B,iBAAiB,EAAE;MACzC,MAAM2B,KAAK,GAAG/B,WAAW,CAAC,MAAMuC,UAAU,CAACC,OAAO,CAACtC,eAAe,CAACuC,IAAI,EAAEN,SAAS,CAAC,CAAC,CAAC;MAErF,IAAIJ,KAAK,KAAK,IAAI,EAAE;QAClB,OAAOD,aAAa,CAACC,KAAK,EAAEQ,UAAU,CAACP,GAAG,CAAC,CAAC,CAAC;MAC/C;IACF;EACF;EAEA,MAAMO,UAAU,CAACG,IAAI,CAACvC,iBAAiB,CAAC,CAAC,CAAC,CAACwC,KAAK,CAAC,MAAMJ,UAAU,CAACK,MAAM,CAACC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AAC/G;AAEA,SAASP,WAAW","ignoreList":[]}
1
+ {"version":3,"names":["activityCountOf","stepBlockOf","activityCountRequest","activityRequest","finishSyncRequest","BLOCK_FIRST_HOURS","HOUR_MS","slotsOldestFirst","newestSlot","slotCount","Array","from","length","_","offset","recordOf","year","month","day","hour","steps","id","join","reading","type","takenAt","Date","values","value","unit","deviceFlags","finishedHours","block","now","flatMap","index","firstHour","endsAt","getTime","DATE_DIGITS","dateNumberOf","datedBeforeFirmware","date","storedSteps","connection","request","slot","firmware","storedStepsThenFinish","send","catch","logger","warn"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/history.ts"],"mappings":"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","ignoreList":[]}
@@ -2,16 +2,29 @@
2
2
 
3
3
  import { modelRows } from "../sig/model-row.js";
4
4
  import { wristbandProtocol } from "./protocol.js";
5
+ import { S9_PROTOCOL } from "./s9.js";
5
6
  import { H_SERIES, SH_SERIES, SH_SERIES_BY_FIRMWARE } from "./variants.js";
6
7
  const H_SERIES_PROTOCOL = wristbandProtocol(H_SERIES);
7
8
  const SH_SERIES_PROTOCOL = wristbandProtocol(SH_SERIES);
8
9
  const SH_SERIES_BY_FIRMWARE_PROTOCOL = wristbandProtocol(SH_SERIES_BY_FIRMWARE);
9
10
  const ACTIVITY = ["activity"];
11
+ const WATCH_MEASURES = ["activity", "heart_rate", "temperature"];
12
+
13
+ /** Other watches advertise `S9` too, so the S9's own manufacturer data must be there: company 0x0A0A, byte 5 always `01`. */
14
+ const S9_ADVERTISEMENT = {
15
+ kind: "manufacturer",
16
+ company: 0x0a0a,
17
+ at: 5,
18
+ equals: "01"
19
+ };
10
20
  const hSeries = modelRows(H_SERIES.id, ACTIVITY);
11
21
  const shSeries = modelRows(SH_SERIES.id, ACTIVITY);
12
22
  const shSeriesByFirmware = modelRows(SH_SERIES_BY_FIRMWARE.id, ACTIVITY);
23
+ const watch = modelRows(S9_PROTOCOL.id, WATCH_MEASURES);
13
24
 
14
- /** The wristbands in catalog order: four of them advertise the plain name "Wristband", so the first of those is the default. */
15
- const TRASENSE_MODELS = [hSeries("Trasense", "TS-H01", ["Wristband"]), hSeries("Trasense", "TS-H03", ["Wristband"]), hSeries("Trasense", "TS-H03 PRO", ["H03Pro", "WristbandH03*"]), shSeriesByFirmware("Trasense", "SH06", ["Wristband"]), shSeriesByFirmware("Movement", "SH08", ["Wristband"]), shSeries("Movement", "SH05 Waterfalls", ["SH05*"]), shSeries("Trasense", "SH09", ["SH09*"]), shSeries("Trasense", "SH09U", ["Wristband9U*"])];
25
+ /** The wristbands in catalog order, then the S9 watch: four wristbands advertise the plain name "Wristband", so the first of those is the default. */
26
+ const TRASENSE_MODELS = [hSeries("Trasense", "TS-H01", ["Wristband"]), hSeries("Trasense", "TS-H03", ["Wristband"]), hSeries("Trasense", "TS-H03 PRO", ["H03Pro", "WristbandH03*"]), shSeriesByFirmware("Trasense", "SH06", ["Wristband"]), shSeriesByFirmware("Movement", "SH08", ["Wristband"]), shSeries("Movement", "SH05 Waterfalls", ["SH05*"]), shSeries("Trasense", "SH09", ["SH09*"]), shSeries("Trasense", "SH09U", ["Wristband9U*"]), watch("Trasense", "S9", ["S9"], {
27
+ requires: [S9_ADVERTISEMENT]
28
+ })];
16
29
  export { H_SERIES_PROTOCOL, SH_SERIES_BY_FIRMWARE_PROTOCOL, SH_SERIES_PROTOCOL, TRASENSE_MODELS };
17
30
  //# sourceMappingURL=models.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["modelRows","wristbandProtocol","H_SERIES","SH_SERIES","SH_SERIES_BY_FIRMWARE","H_SERIES_PROTOCOL","SH_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL","ACTIVITY","hSeries","id","shSeries","shSeriesByFirmware","TRASENSE_MODELS"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/models.ts"],"mappings":";;AAEA,SAASA,SAAS,QAAQ,qBAAkB;AAE5C,SAASC,iBAAiB,QAAQ,eAAY;AAC9C,SAASC,QAAQ,EAAEC,SAAS,EAAEC,qBAAqB,QAAQ,eAAY;AAEvE,MAAMC,iBAAiB,GAAGJ,iBAAiB,CAACC,QAAQ,CAAC;AACrD,MAAMI,kBAAkB,GAAGL,iBAAiB,CAACE,SAAS,CAAC;AACvD,MAAMI,8BAA8B,GAAGN,iBAAiB,CAACG,qBAAqB,CAAC;AAE/E,MAAMI,QAAoC,GAAG,CAAC,UAAU,CAAC;AAEzD,MAAMC,OAAO,GAAGT,SAAS,CAACE,QAAQ,CAACQ,EAAE,EAAEF,QAAQ,CAAC;AAChD,MAAMG,QAAQ,GAAGX,SAAS,CAACG,SAAS,CAACO,EAAE,EAAEF,QAAQ,CAAC;AAClD,MAAMI,kBAAkB,GAAGZ,SAAS,CAACI,qBAAqB,CAACM,EAAE,EAAEF,QAAQ,CAAC;;AAExE;AACA,MAAMK,eAAuC,GAAG,CAC9CJ,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,EAC5CA,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,EAC5CA,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,EAC9DG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,EACrDA,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,EACrDD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC,EAClDA,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,EACvCA,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,CAChD;AAED,SAASN,iBAAiB,EAAEE,8BAA8B,EAAED,kBAAkB,EAAEO,eAAe","ignoreList":[]}
1
+ {"version":3,"names":["modelRows","wristbandProtocol","S9_PROTOCOL","H_SERIES","SH_SERIES","SH_SERIES_BY_FIRMWARE","H_SERIES_PROTOCOL","SH_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL","ACTIVITY","WATCH_MEASURES","S9_ADVERTISEMENT","kind","company","at","equals","hSeries","id","shSeries","shSeriesByFirmware","watch","TRASENSE_MODELS","requires"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/models.ts"],"mappings":";;AAEA,SAASA,SAAS,QAAQ,qBAAkB;AAE5C,SAASC,iBAAiB,QAAQ,eAAY;AAC9C,SAASC,WAAW,QAAQ,SAAM;AAClC,SAASC,QAAQ,EAAEC,SAAS,EAAEC,qBAAqB,QAAQ,eAAY;AAEvE,MAAMC,iBAAiB,GAAGL,iBAAiB,CAACE,QAAQ,CAAC;AACrD,MAAMI,kBAAkB,GAAGN,iBAAiB,CAACG,SAAS,CAAC;AACvD,MAAMI,8BAA8B,GAAGP,iBAAiB,CAACI,qBAAqB,CAAC;AAE/E,MAAMI,QAAoC,GAAG,CAAC,UAAU,CAAC;AACzD,MAAMC,cAA0C,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC;;AAE5F;AACA,MAAMC,gBAAmC,GAAG;EAAEC,IAAI,EAAE,cAAc;EAAEC,OAAO,EAAE,MAAM;EAAEC,EAAE,EAAE,CAAC;EAAEC,MAAM,EAAE;AAAK,CAAC;AAE1G,MAAMC,OAAO,GAAGhB,SAAS,CAACG,QAAQ,CAACc,EAAE,EAAER,QAAQ,CAAC;AAChD,MAAMS,QAAQ,GAAGlB,SAAS,CAACI,SAAS,CAACa,EAAE,EAAER,QAAQ,CAAC;AAClD,MAAMU,kBAAkB,GAAGnB,SAAS,CAACK,qBAAqB,CAACY,EAAE,EAAER,QAAQ,CAAC;AACxE,MAAMW,KAAK,GAAGpB,SAAS,CAACE,WAAW,CAACe,EAAE,EAAEP,cAAc,CAAC;;AAEvD;AACA,MAAMW,eAAuC,GAAG,CAC9CL,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,EAC5CA,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,EAC5CA,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,EAC9DG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,EACrDA,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,EACrDD,QAAQ,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC,EAClDA,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,EACvCA,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,EAC/CE,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;EAAEE,QAAQ,EAAE,CAACX,gBAAgB;AAAE,CAAC,CAAC,CAClE;AAED,SAASL,iBAAiB,EAAEE,8BAA8B,EAAED,kBAAkB,EAAEc,eAAe","ignoreList":[]}
@@ -2,23 +2,26 @@
2
2
 
3
3
  import { BATTERY_SERVICE } from "../sig/device-information.js";
4
4
  import { readBattery } from "./battery.js";
5
- import { storedSteps } from "./history.js";
5
+ import { storedStepsThenFinish } from "./history.js";
6
6
  import { clockRequest } from "./requests.js";
7
7
  import { openConnection, WRISTBAND_SERVICE } from "./session.js";
8
+ /** What a band says about itself: only its firmware version. */
9
+ const identityOf = async ({
10
+ firmware
11
+ }) => ({
12
+ manufacturer: null,
13
+ model: null,
14
+ serial: null,
15
+ firmware: firmware.version || null,
16
+ hardware: null
17
+ });
18
+
8
19
  /** A wristband of one variant: its firmware, a clock, its battery, and the steps it stores an hour at a time as history. */
9
20
  const wristbandProtocol = variant => ({
10
21
  id: variant.id,
11
22
  services: variant.serviceBatteryOnOldFirmware ? [WRISTBAND_SERVICE, BATTERY_SERVICE] : [WRISTBAND_SERVICE],
12
23
  open: openConnection,
13
- identify: async ({
14
- firmware
15
- }) => ({
16
- manufacturer: null,
17
- model: null,
18
- serial: null,
19
- firmware: firmware.version || null,
20
- hardware: null
21
- }),
24
+ identify: identityOf,
22
25
  setClock: async ({
23
26
  request,
24
27
  firmware
@@ -26,10 +29,10 @@ const wristbandProtocol = variant => ({
26
29
  await request(clockRequest(now, variant.dayWindow(firmware)));
27
30
  },
28
31
  battery: connection => readBattery(variant, connection),
29
- history: storedSteps,
32
+ history: storedStepsThenFinish,
30
33
  close: async ({
31
34
  stop
32
35
  }) => stop()
33
36
  });
34
- export { wristbandProtocol };
37
+ export { identityOf, wristbandProtocol };
35
38
  //# sourceMappingURL=protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["BATTERY_SERVICE","readBattery","storedSteps","clockRequest","openConnection","WRISTBAND_SERVICE","wristbandProtocol","variant","id","services","serviceBatteryOnOldFirmware","open","identify","firmware","manufacturer","model","serial","version","hardware","setClock","request","now","dayWindow","battery","connection","history","close","stop"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/protocol.ts"],"mappings":";;AACA,SAASA,eAAe,QAAQ,8BAA2B;AAE3D,SAASC,WAAW,QAAQ,cAAW;AACvC,SAASC,WAAW,QAAQ,cAAW;AACvC,SAASC,YAAY,QAAQ,eAAY;AACzC,SAASC,cAAc,EAAEC,iBAAiB,QAA6B,cAAW;AAGlF;AACA,MAAMC,iBAAiB,GAAIC,OAAyB,KAA2C;EAC7FC,EAAE,EAAED,OAAO,CAACC,EAAE;EACdC,QAAQ,EAAEF,OAAO,CAACG,2BAA2B,GAAG,CAACL,iBAAiB,EAAEL,eAAe,CAAC,GAAG,CAACK,iBAAiB,CAAC;EAC1GM,IAAI,EAAEP,cAAc;EACpBQ,QAAQ,EAAE,MAAAA,CAAO;IAAEC;EAAS,CAAC,MAAM;IACjCC,YAAY,EAAE,IAAI;IAClBC,KAAK,EAAE,IAAI;IACXC,MAAM,EAAE,IAAI;IACZH,QAAQ,EAAEA,QAAQ,CAACI,OAAO,IAAI,IAAI;IAClCC,QAAQ,EAAE;EACZ,CAAC,CAAC;EACFC,QAAQ,EAAE,MAAAA,CAAO;IAAEC,OAAO;IAAEP;EAAS,CAAC,EAAEQ,GAAG,KAAK;IAC9C,MAAMD,OAAO,CAACjB,YAAY,CAACkB,GAAG,EAAEd,OAAO,CAACe,SAAS,CAACT,QAAQ,CAAC,CAAC,CAAC;EAC/D,CAAC;EACDU,OAAO,EAAGC,UAAU,IAAKvB,WAAW,CAACM,OAAO,EAAEiB,UAAU,CAAC;EACzDC,OAAO,EAAEvB,WAAW;EACpBwB,KAAK,EAAE,MAAAA,CAAO;IAAEC;EAAK,CAAC,KAAKA,IAAI,CAAC;AAClC,CAAC,CAAC;AAEF,SAASrB,iBAAiB","ignoreList":[]}
1
+ {"version":3,"names":["BATTERY_SERVICE","readBattery","storedStepsThenFinish","clockRequest","openConnection","WRISTBAND_SERVICE","identityOf","firmware","manufacturer","model","serial","version","hardware","wristbandProtocol","variant","id","services","serviceBatteryOnOldFirmware","open","identify","setClock","request","now","dayWindow","battery","connection","history","close","stop"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/protocol.ts"],"mappings":";;AAEA,SAASA,eAAe,QAAQ,8BAA2B;AAE3D,SAASC,WAAW,QAAQ,cAAW;AACvC,SAASC,qBAAqB,QAAQ,cAAW;AACjD,SAASC,YAAY,QAAQ,eAAY;AACzC,SAASC,cAAc,EAAEC,iBAAiB,QAA6B,cAAW;AAGlF;AACA,MAAMC,UAAU,GAAG,MAAAA,CAAO;EAAEC;AAA8B,CAAC,MAA2C;EACpGC,YAAY,EAAE,IAAI;EAClBC,KAAK,EAAE,IAAI;EACXC,MAAM,EAAE,IAAI;EACZH,QAAQ,EAAEA,QAAQ,CAACI,OAAO,IAAI,IAAI;EAClCC,QAAQ,EAAE;AACZ,CAAC,CAAC;;AAEF;AACA,MAAMC,iBAAiB,GAAIC,OAAyB,KAA2C;EAC7FC,EAAE,EAAED,OAAO,CAACC,EAAE;EACdC,QAAQ,EAAEF,OAAO,CAACG,2BAA2B,GAAG,CAACZ,iBAAiB,EAAEL,eAAe,CAAC,GAAG,CAACK,iBAAiB,CAAC;EAC1Ga,IAAI,EAAEd,cAAc;EACpBe,QAAQ,EAAEb,UAAU;EACpBc,QAAQ,EAAE,MAAAA,CAAO;IAAEC,OAAO;IAAEd;EAAS,CAAC,EAAEe,GAAG,KAAK;IAC9C,MAAMD,OAAO,CAAClB,YAAY,CAACmB,GAAG,EAAER,OAAO,CAACS,SAAS,CAAChB,QAAQ,CAAC,CAAC,CAAC;EAC/D,CAAC;EACDiB,OAAO,EAAGC,UAAU,IAAKxB,WAAW,CAACa,OAAO,EAAEW,UAAU,CAAC;EACzDC,OAAO,EAAExB,qBAAqB;EAC9ByB,KAAK,EAAE,MAAAA,CAAO;IAAEC;EAAK,CAAC,KAAKA,IAAI,CAAC;AAClC,CAAC,CAAC;AAEF,SAAStB,UAAU,EAAEO,iBAAiB","ignoreList":[]}
@@ -1,11 +1,24 @@
1
1
  "use strict";
2
2
 
3
- import { ascii, u16be } from "../../codec/bytes.js";
3
+ import { ascii, u16be, u16le } from "../../codec/bytes.js";
4
4
  import { firmwareOf } from "./firmware.js";
5
5
  const VERSION_AT = 1;
6
6
  const NEWEST_SLOT_AT = 1;
7
7
  const SLOT_COUNT_AT = 2;
8
8
  const BATTERY_LEVEL_AT = 1;
9
+ const HEART_RATE_AT = 2;
10
+ const TEMPERATURE_AT = 3;
11
+ const HUNDREDTHS = 100;
12
+
13
+ /** The watch's documented valid ranges; anything outside, 0 included, is no reading yet. */
14
+ const HEART_RATE_RANGE = {
15
+ low: 40,
16
+ high: 200
17
+ };
18
+ const TEMPERATURE_RANGE = {
19
+ low: 35,
20
+ high: 42
21
+ };
9
22
  const YEAR_HIGH_AT = 1;
10
23
  const YEAR_LOW_AT = 2;
11
24
  const MONTH_AT = 3;
@@ -38,6 +51,16 @@ const activityCountOf = frame => ({
38
51
 
39
52
  /** The battery level a reply carries, in the band's own unit. */
40
53
  const batteryLevelOf = frame => frame[BATTERY_LEVEL_AT] ?? 0;
54
+ const within = (value, {
55
+ low,
56
+ high
57
+ }) => value >= low && value <= high ? value : null;
58
+
59
+ /** The heart rate in bpm a heart-rate read reply carries; `null` while the watch has none. */
60
+ const heartRateOf = frame => within(frame[HEART_RATE_AT] ?? 0, HEART_RATE_RANGE);
61
+
62
+ /** The temperature in °C a temperature read reply carries; `null` while the watch has none. */
63
+ const temperatureOf = frame => within(u16le(frame, TEMPERATURE_AT) / HUNDREDTHS, TEMPERATURE_RANGE);
41
64
  const stepsOf = (frame, hour) => {
42
65
  const count = u16be(frame, STEPS_AT + hour * STEPS_BYTES);
43
66
  return count > LAST_STEP_COUNT ? null : count;
@@ -62,5 +85,5 @@ const stepBlockOf = frame => {
62
85
  }, (_, hour) => stepsOf(frame, hour))
63
86
  };
64
87
  };
65
- export { activityCountOf, batteryLevelOf, firmwareOfReply, stepBlockOf };
88
+ export { activityCountOf, batteryLevelOf, firmwareOfReply, heartRateOf, stepBlockOf, temperatureOf };
66
89
  //# sourceMappingURL=replies.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["ascii","u16be","firmwareOf","VERSION_AT","NEWEST_SLOT_AT","SLOT_COUNT_AT","BATTERY_LEVEL_AT","YEAR_HIGH_AT","YEAR_LOW_AT","MONTH_AT","DAY_AT","FIRST_HOUR_AT","STEPS_AT","STEPS_BYTES","HOURS_PER_BLOCK","CENTURY_YEARS","EMPTY_SLOT","LAST_STEP_COUNT","LAST_MONTH","LAST_DAY","LAST_FIRST_HOUR","firmwareOfReply","frame","subarray","filter","byte","activityCountOf","newestSlot","slotCount","batteryLevelOf","stepsOf","hour","count","isPlausible","month","day","firstHour","stepBlockOf","year","steps","Array","from","length","_"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/replies.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["ascii","u16be","u16le","firmwareOf","VERSION_AT","NEWEST_SLOT_AT","SLOT_COUNT_AT","BATTERY_LEVEL_AT","HEART_RATE_AT","TEMPERATURE_AT","HUNDREDTHS","HEART_RATE_RANGE","low","high","TEMPERATURE_RANGE","YEAR_HIGH_AT","YEAR_LOW_AT","MONTH_AT","DAY_AT","FIRST_HOUR_AT","STEPS_AT","STEPS_BYTES","HOURS_PER_BLOCK","CENTURY_YEARS","EMPTY_SLOT","LAST_STEP_COUNT","LAST_MONTH","LAST_DAY","LAST_FIRST_HOUR","firmwareOfReply","frame","subarray","filter","byte","activityCountOf","newestSlot","slotCount","batteryLevelOf","within","value","heartRateOf","temperatureOf","stepsOf","hour","count","isPlausible","month","day","firstHour","stepBlockOf","year","steps","Array","from","length","_"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/replies.ts"],"mappings":"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","ignoreList":[]}
@@ -11,10 +11,14 @@ const OPCODE = {
11
11
  activityCount: 0x10,
12
12
  activity: 0x13,
13
13
  battery: 0x30,
14
+ temperature: 0x3f,
15
+ heartRate: 0x56,
14
16
  version: 0x70,
15
17
  finishSync: 0x71
16
18
  };
17
19
  const BIND_SUBCOMMAND = 0x02;
20
+ const HEART_RATE_READ = 0x02;
21
+ const TEMPERATURE_READ = [0x01, 0x01];
18
22
  const BOUND = 0x01;
19
23
  const CENTURY_YEARS = 100;
20
24
  const frameOf = (opcode, payload = []) => {
@@ -26,6 +30,12 @@ const frameOf = (opcode, payload = []) => {
26
30
  /** The opcode a reply to this request carries. */
27
31
  const replyOpcodeOf = request => (request[0] ?? 0) | REPLY_BIT;
28
32
 
33
+ /** Whether a reply answers this request: its opcode with the reply bit set. */
34
+ const answers = request => reply => reply[0] === replyOpcodeOf(request);
35
+
36
+ /** Whether a reply answers this request and repeats its sub-command, as heart-rate and temperature replies do. */
37
+ const answersSubcommand = request => reply => answers(request)(reply) && reply[1] === request[1];
38
+
29
39
  /** Asks for the firmware version string. */
30
40
  const versionRequest = () => frameOf(OPCODE.version);
31
41
 
@@ -38,6 +48,12 @@ const activityCountRequest = () => frameOf(OPCODE.activityCount);
38
48
  /** Asks for six hours of step counts of one day slot, from `firstHour`. */
39
49
  const activityRequest = (slot, firstHour) => frameOf(OPCODE.activity, [slot, firstHour]);
40
50
 
51
+ /** Asks for the heart rate the watch measures right now. */
52
+ const heartRateRequest = () => frameOf(OPCODE.heartRate, [HEART_RATE_READ]);
53
+
54
+ /** Asks for the temperature the watch measures right now. */
55
+ const temperatureRequest = () => frameOf(OPCODE.temperature, [...TEMPERATURE_READ]);
56
+
41
57
  /** Marks the end of a sync. */
42
58
  const finishSyncRequest = () => frameOf(OPCODE.finishSync);
43
59
 
@@ -49,5 +65,5 @@ const clockRequest = (now, {
49
65
  start,
50
66
  end
51
67
  }) => frameOf(OPCODE.setClock, [Math.floor(now.getFullYear() / CENTURY_YEARS), now.getFullYear() % CENTURY_YEARS, now.getMonth() + 1, now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds(), start, end]);
52
- export { activityCountRequest, activityRequest, batteryRequest, bindRequest, clockRequest, finishSyncRequest, FRAME_BYTES, replyOpcodeOf, versionRequest };
68
+ export { activityCountRequest, activityRequest, answers, answersSubcommand, batteryRequest, bindRequest, clockRequest, finishSyncRequest, FRAME_BYTES, heartRateRequest, temperatureRequest, versionRequest };
53
69
  //# sourceMappingURL=requests.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["FRAME_BYTES","REPLY_BIT","OPCODE","setClock","bind","activityCount","activity","battery","version","finishSync","BIND_SUBCOMMAND","BOUND","CENTURY_YEARS","frameOf","opcode","payload","frame","Uint8Array","set","replyOpcodeOf","request","versionRequest","batteryRequest","activityCountRequest","activityRequest","slot","firstHour","finishSyncRequest","bindRequest","clockRequest","now","start","end","Math","floor","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/requests.ts"],"mappings":";;AAEA;AACA,MAAMA,WAAW,GAAG,EAAE;;AAEtB;AACA,MAAMC,SAAS,GAAG,IAAI;AAEtB,MAAMC,MAAM,GAAG;EACbC,QAAQ,EAAE,IAAI;EACdC,IAAI,EAAE,IAAI;EACVC,aAAa,EAAE,IAAI;EACnBC,QAAQ,EAAE,IAAI;EACdC,OAAO,EAAE,IAAI;EACbC,OAAO,EAAE,IAAI;EACbC,UAAU,EAAE;AACd,CAAU;AAEV,MAAMC,eAAe,GAAG,IAAI;AAC5B,MAAMC,KAAK,GAAG,IAAI;AAClB,MAAMC,aAAa,GAAG,GAAG;AAEzB,MAAMC,OAAO,GAAGA,CAACC,MAAc,EAAEC,OAA0B,GAAG,EAAE,KAAiB;EAC/E,MAAMC,KAAK,GAAG,IAAIC,UAAU,CAACjB,WAAW,CAAC;EAEzCgB,KAAK,CAACE,GAAG,CAAC,CAACJ,MAAM,EAAE,GAAGC,OAAO,CAAC,CAAC;EAE/B,OAAOC,KAAK;AACd,CAAC;;AAED;AACA,MAAMG,aAAa,GAAIC,OAAmB,IAAa,CAACA,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAInB,SAAS;;AAEpF;AACA,MAAMoB,cAAc,GAAGA,CAAA,KAAkBR,OAAO,CAACX,MAAM,CAACM,OAAO,CAAC;;AAEhE;AACA,MAAMc,cAAc,GAAGA,CAAA,KAAkBT,OAAO,CAACX,MAAM,CAACK,OAAO,CAAC;;AAEhE;AACA,MAAMgB,oBAAoB,GAAGA,CAAA,KAAkBV,OAAO,CAACX,MAAM,CAACG,aAAa,CAAC;;AAE5E;AACA,MAAMmB,eAAe,GAAGA,CAACC,IAAY,EAAEC,SAAiB,KAAiBb,OAAO,CAACX,MAAM,CAACI,QAAQ,EAAE,CAACmB,IAAI,EAAEC,SAAS,CAAC,CAAC;;AAEpH;AACA,MAAMC,iBAAiB,GAAGA,CAAA,KAAkBd,OAAO,CAACX,MAAM,CAACO,UAAU,CAAC;;AAEtE;AACA,MAAMmB,WAAW,GAAGA,CAAA,KAAkBf,OAAO,CAACX,MAAM,CAACE,IAAI,EAAE,CAACM,eAAe,EAAEC,KAAK,CAAC,CAAC;;AAEpF;AACA,MAAMkB,YAAY,GAAGA,CAACC,GAAS,EAAE;EAAEC,KAAK;EAAEC;AAAe,CAAC,KACxDnB,OAAO,CAACX,MAAM,CAACC,QAAQ,EAAE,CACvB8B,IAAI,CAACC,KAAK,CAACJ,GAAG,CAACK,WAAW,CAAC,CAAC,GAAGvB,aAAa,CAAC,EAC7CkB,GAAG,CAACK,WAAW,CAAC,CAAC,GAAGvB,aAAa,EACjCkB,GAAG,CAACM,QAAQ,CAAC,CAAC,GAAG,CAAC,EAClBN,GAAG,CAACO,OAAO,CAAC,CAAC,EACbP,GAAG,CAACQ,QAAQ,CAAC,CAAC,EACdR,GAAG,CAACS,UAAU,CAAC,CAAC,EAChBT,GAAG,CAACU,UAAU,CAAC,CAAC,EAChBT,KAAK,EACLC,GAAG,CACJ,CAAC;AAEJ,SACET,oBAAoB,EACpBC,eAAe,EACfF,cAAc,EACdM,WAAW,EACXC,YAAY,EACZF,iBAAiB,EACjB3B,WAAW,EACXmB,aAAa,EACbE,cAAc","ignoreList":[]}
1
+ {"version":3,"names":["FRAME_BYTES","REPLY_BIT","OPCODE","setClock","bind","activityCount","activity","battery","temperature","heartRate","version","finishSync","BIND_SUBCOMMAND","HEART_RATE_READ","TEMPERATURE_READ","BOUND","CENTURY_YEARS","frameOf","opcode","payload","frame","Uint8Array","set","replyOpcodeOf","request","answers","reply","answersSubcommand","versionRequest","batteryRequest","activityCountRequest","activityRequest","slot","firstHour","heartRateRequest","temperatureRequest","finishSyncRequest","bindRequest","clockRequest","now","start","end","Math","floor","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/requests.ts"],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+
3
+ import { DeviceError } from "../../core/errors.js";
4
+ import { pause, untilAborted } from "../sig/waiting.js";
5
+ import { storedSteps } from "./history.js";
6
+ import { identityOf } from "./protocol.js";
7
+ import { batteryLevelOf, heartRateOf, temperatureOf } from "./replies.js";
8
+ import { answersSubcommand, batteryRequest, clockRequest, heartRateRequest, temperatureRequest } from "./requests.js";
9
+ import { openConnectionWith, readFirmware, WRISTBAND_SERVICE, WRITE_CHARACTERISTIC } from "./session.js";
10
+ import { WHOLE_DAY } from "./variants.js";
11
+
12
+ /** The firmware type the S9 reports, as in `20250805.SH09.1.N0`; the name `S9` alone is shared by other watches. */
13
+ const S9_FIRMWARE_TYPE = "SH09";
14
+
15
+ /** How often a live view asks for the newest heart rate and temperature; the watch measures continuously. */
16
+ const LIVE_POLL_MS = 1_000;
17
+
18
+ /** The watch reports its battery in five steps, and step 0 still holds some charge. */
19
+ const PERCENT_PER_STEP = 20;
20
+ const LOWEST_STEP_PERCENT = 5;
21
+ const FULL_PERCENT = 100;
22
+
23
+ /** Reads the firmware and refuses a watch that is not an SH09 before anything else is sent to it. */
24
+ const requireS9Firmware = async session => {
25
+ const firmware = await readFirmware(session);
26
+ if (firmware.type !== S9_FIRMWARE_TYPE) {
27
+ throw new DeviceError("unsupported", `The watch reported firmware type ${firmware.type ?? "none"}, not ${S9_FIRMWARE_TYPE}`);
28
+ }
29
+ return firmware;
30
+ };
31
+
32
+ /** The S9 takes commands only as Write Request and is never sent the wristbands' lock request. */
33
+ const openS9 = context => openConnectionWith(context, frame => context.link.write(WRISTBAND_SERVICE, WRITE_CHARACTERISTIC, frame), requireS9Firmware);
34
+ const percentOfStep = step => step === 0 ? LOWEST_STEP_PERCENT : Math.min(FULL_PERCENT, step * PERCENT_PER_STEP);
35
+
36
+ /** The heart rate and temperature the watch measures now; a value it does not have yet is left out. */
37
+ const liveValuesOf = async ({
38
+ request
39
+ }) => {
40
+ const heartRate = heartRateOf(await request(heartRateRequest(), answersSubcommand(heartRateRequest())));
41
+ const temperature = temperatureOf(await request(temperatureRequest(), answersSubcommand(temperatureRequest())));
42
+ return {
43
+ ...(heartRate === null ? {} : {
44
+ heart_rate: {
45
+ value: heartRate,
46
+ unit: "/min"
47
+ }
48
+ }),
49
+ ...(temperature === null ? {} : {
50
+ body_temperature: {
51
+ value: temperature,
52
+ unit: "Cel"
53
+ }
54
+ })
55
+ };
56
+ };
57
+
58
+ /**
59
+ * The Trasense S9 watch (firmware type SH09): the wristbands' frames and step history, a live heart rate and body
60
+ * temperature read about once a second, and a battery in five steps. It never ends a link and does not advertise while
61
+ * one is open, so the link is closed as soon as the work is done.
62
+ */
63
+ const S9_PROTOCOL = {
64
+ id: "trasense/s9",
65
+ services: [WRISTBAND_SERVICE],
66
+ open: openS9,
67
+ identify: identityOf,
68
+ setClock: async ({
69
+ request
70
+ }, now) => {
71
+ await request(clockRequest(now, WHOLE_DAY));
72
+ },
73
+ battery: async ({
74
+ request
75
+ }) => ({
76
+ percent: percentOfStep(batteryLevelOf(await request(batteryRequest()))),
77
+ charging: null
78
+ }),
79
+ history: storedSteps,
80
+ live: async (connection, onFrame, signal) => {
81
+ while (!signal.aborted) {
82
+ const values = await liveValuesOf(connection);
83
+ if (Object.keys(values).length > 0) {
84
+ onFrame({
85
+ values: {
86
+ at: connection.now(),
87
+ values,
88
+ deviceFlags: []
89
+ }
90
+ });
91
+ }
92
+ await Promise.race([pause(LIVE_POLL_MS), untilAborted(signal)]);
93
+ }
94
+ },
95
+ close: async ({
96
+ stop
97
+ }) => stop()
98
+ };
99
+ export { S9_PROTOCOL };
100
+ //# sourceMappingURL=s9.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["DeviceError","pause","untilAborted","storedSteps","identityOf","batteryLevelOf","heartRateOf","temperatureOf","answersSubcommand","batteryRequest","clockRequest","heartRateRequest","temperatureRequest","openConnectionWith","readFirmware","WRISTBAND_SERVICE","WRITE_CHARACTERISTIC","WHOLE_DAY","S9_FIRMWARE_TYPE","LIVE_POLL_MS","PERCENT_PER_STEP","LOWEST_STEP_PERCENT","FULL_PERCENT","requireS9Firmware","session","firmware","type","openS9","context","frame","link","write","percentOfStep","step","Math","min","liveValuesOf","request","heartRate","temperature","heart_rate","value","unit","body_temperature","S9_PROTOCOL","id","services","open","identify","setClock","now","battery","percent","charging","history","live","connection","onFrame","signal","aborted","values","Object","keys","length","at","deviceFlags","Promise","race","close","stop"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/s9.ts"],"mappings":"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","ignoreList":[]}
@@ -4,7 +4,7 @@ import { fullUuid } from "../../core/advertisement.js";
4
4
  import { DeviceError } from "../../core/errors.js";
5
5
  import { Exchange } from "../../core/exchange.js";
6
6
  import { firmwareOfReply } from "./replies.js";
7
- import { bindRequest, FRAME_BYTES, replyOpcodeOf, versionRequest } from "./requests.js";
7
+ import { answers, bindRequest, FRAME_BYTES, versionRequest } from "./requests.js";
8
8
  const WRISTBAND_SERVICE = fullUuid("FFF0");
9
9
  const WRITE_CHARACTERISTIC = fullUuid("FFF1");
10
10
  const NOTIFY_CHARACTERISTIC = fullUuid("FFF2");
@@ -16,6 +16,8 @@ const REPLY_TIMING = {
16
16
  };
17
17
  const BOUND = "bound";
18
18
 
19
+ /** Writes one frame to the command characteristic. */
20
+
19
21
  /** One open link: a request that waits for the band's reply, and a write that does not. */
20
22
 
21
23
  /** What a protocol keeps of an open link to a band. */
@@ -23,9 +25,8 @@ const BOUND = "bound";
23
25
  /** Subscribes to the band's replies; a notification that is not one whole frame is dropped. */
24
26
  const openSession = async ({
25
27
  link
26
- }) => {
28
+ }, send) => {
27
29
  const exchange = new Exchange(REPLY_TIMING);
28
- const send = frame => link.writeWithoutResponse(WRISTBAND_SERVICE, WRITE_CHARACTERISTIC, frame);
29
30
  const stopWatching = link.onDisconnect(() => exchange.fail(new DeviceError("disconnected", "The wristband dropped the link")));
30
31
  const unsubscribe = await link.subscribe(WRISTBAND_SERVICE, NOTIFY_CHARACTERISTIC, frame => {
31
32
  if (frame.length === FRAME_BYTES) {
@@ -37,7 +38,7 @@ const openSession = async ({
37
38
  });
38
39
  return {
39
40
  send,
40
- request: frame => exchange.request(() => send(frame), reply => reply[0] === replyOpcodeOf(frame)),
41
+ request: (frame, accepts = answers(frame)) => exchange.request(() => send(frame), accepts),
41
42
  stop: () => {
42
43
  unsubscribe();
43
44
  stopWatching();
@@ -45,22 +46,16 @@ const openSession = async ({
45
46
  };
46
47
  };
47
48
 
48
- /** The first link to a band locks it to this phone, and the lock is remembered so no later link asks again. */
49
- const bindOnFirstLink = async ({
50
- send
51
- }, secret) => {
52
- if ((await secret.read()) === null) {
53
- await send(bindRequest());
54
- await secret.write(BOUND);
55
- }
56
- };
49
+ /** The firmware version the band reports. */
50
+ const readFirmware = async ({
51
+ request
52
+ }) => firmwareOfReply(await request(versionRequest()));
57
53
 
58
- /** Opens the session, locks a band met for the first time to the phone, and reads the firmware version. */
59
- const openConnection = async context => {
60
- const session = await openSession(context);
54
+ /** Opens a session over `send`, then runs `firstSteps`, which end with the firmware; a failure stops listening. */
55
+ const openConnectionWith = async (context, send, firstSteps) => {
56
+ const session = await openSession(context, send);
61
57
  try {
62
- await bindOnFirstLink(session, context.secret);
63
- const firmware = firmwareOfReply(await session.request(versionRequest()));
58
+ const firmware = await firstSteps(session);
64
59
  return {
65
60
  ...session,
66
61
  link: context.link,
@@ -73,5 +68,21 @@ const openConnection = async context => {
73
68
  throw error;
74
69
  }
75
70
  };
76
- export { openConnection, WRISTBAND_SERVICE };
71
+
72
+ /** The first link to a band locks it to this phone, and the lock is remembered so no later link asks again. */
73
+ const bindOnFirstLink = async ({
74
+ send
75
+ }, secret) => {
76
+ if ((await secret.read()) === null) {
77
+ await send(bindRequest());
78
+ await secret.write(BOUND);
79
+ }
80
+ };
81
+
82
+ /** Opens the session, locks a band met for the first time to the phone, and reads the firmware version. */
83
+ const openConnection = context => openConnectionWith(context, frame => context.link.writeWithoutResponse(WRISTBAND_SERVICE, WRITE_CHARACTERISTIC, frame), async session => {
84
+ await bindOnFirstLink(session, context.secret);
85
+ return readFirmware(session);
86
+ });
87
+ export { openConnection, openConnectionWith, readFirmware, WRISTBAND_SERVICE, WRITE_CHARACTERISTIC };
77
88
  //# sourceMappingURL=session.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["fullUuid","DeviceError","Exchange","firmwareOfReply","bindRequest","FRAME_BYTES","replyOpcodeOf","versionRequest","WRISTBAND_SERVICE","WRITE_CHARACTERISTIC","NOTIFY_CHARACTERISTIC","REPLY_TIMING","replyTimeoutMs","attempts","BOUND","openSession","link","exchange","send","frame","writeWithoutResponse","stopWatching","onDisconnect","fail","unsubscribe","subscribe","length","receive","catch","error","request","reply","stop","bindOnFirstLink","secret","read","write","openConnection","context","session","firmware","logger","now"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/session.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["fullUuid","DeviceError","Exchange","firmwareOfReply","answers","bindRequest","FRAME_BYTES","versionRequest","WRISTBAND_SERVICE","WRITE_CHARACTERISTIC","NOTIFY_CHARACTERISTIC","REPLY_TIMING","replyTimeoutMs","attempts","BOUND","openSession","link","send","exchange","stopWatching","onDisconnect","fail","unsubscribe","subscribe","frame","length","receive","catch","error","request","accepts","stop","readFirmware","openConnectionWith","context","firstSteps","session","firmware","logger","now","bindOnFirstLink","secret","read","write","openConnection","writeWithoutResponse"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/session.ts"],"mappings":"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","ignoreList":[]}
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
 
3
3
  import { H_SERIES_PROTOCOL, SH_SERIES_BY_FIRMWARE_PROTOCOL, SH_SERIES_PROTOCOL, TRASENSE_MODELS } from "./models.js";
4
+ import { S9_PROTOCOL } from "./s9.js";
4
5
 
5
- /** The protocols of the Trasense and Movement wristbands. */
6
- const TRASENSE_PROTOCOLS = [H_SERIES_PROTOCOL, SH_SERIES_PROTOCOL, SH_SERIES_BY_FIRMWARE_PROTOCOL];
6
+ /** The protocols of the Trasense and Movement wristbands and the Trasense S9 watch. */
7
+ const TRASENSE_PROTOCOLS = [H_SERIES_PROTOCOL, SH_SERIES_PROTOCOL, SH_SERIES_BY_FIRMWARE_PROTOCOL, S9_PROTOCOL];
7
8
  export { TRASENSE_MODELS, TRASENSE_PROTOCOLS };
8
9
  //# sourceMappingURL=trasense.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["H_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL","SH_SERIES_PROTOCOL","TRASENSE_MODELS","TRASENSE_PROTOCOLS"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/trasense.ts"],"mappings":";;AAEA,SAASA,iBAAiB,EAAEC,8BAA8B,EAAEC,kBAAkB,EAAEC,eAAe,QAAQ,aAAU;;AAEjH;AACA,MAAMC,kBAA6C,GAAG,CAACJ,iBAAiB,EAAEE,kBAAkB,EAAED,8BAA8B,CAAC;AAE7H,SAASE,eAAe,EAAEC,kBAAkB","ignoreList":[]}
1
+ {"version":3,"names":["H_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL","SH_SERIES_PROTOCOL","TRASENSE_MODELS","S9_PROTOCOL","TRASENSE_PROTOCOLS"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/trasense.ts"],"mappings":";;AAEA,SAASA,iBAAiB,EAAEC,8BAA8B,EAAEC,kBAAkB,EAAEC,eAAe,QAAQ,aAAU;AACjH,SAASC,WAAW,QAAQ,SAAM;;AAElC;AACA,MAAMC,kBAA6C,GAAG,CAACL,iBAAiB,EAAEE,kBAAkB,EAAED,8BAA8B,EAAEG,WAAW,CAAC;AAE1I,SAASD,eAAe,EAAEE,kBAAkB","ignoreList":[]}
@@ -43,5 +43,5 @@ const SH_SERIES_BY_FIRMWARE = {
43
43
  dayWindow: firmware => takesDayWindow(firmware) ? STORED_DAY : NO_DAY,
44
44
  serviceBatteryOnOldFirmware: false
45
45
  };
46
- export { H_SERIES, SH_SERIES, SH_SERIES_BY_FIRMWARE };
46
+ export { H_SERIES, SH_SERIES, SH_SERIES_BY_FIRMWARE, WHOLE_DAY };
47
47
  //# sourceMappingURL=variants.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["WHOLE_DAY","start","end","STORED_DAY","NO_DAY","DAY_WINDOW_AFTER","takesDayWindow","date","H_SERIES","id","dayWindow","serviceBatteryOnOldFirmware","SH_SERIES","SH_SERIES_BY_FIRMWARE","firmware"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/variants.ts"],"mappings":";;AAEA;;AAMA;;AAaA,MAAMA,SAAoB,GAAG;EAAEC,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAG,CAAC;AAClD,MAAMC,UAAqB,GAAG;EAAEF,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAG,CAAC;AACnD,MAAME,MAAiB,GAAG;EAAEH,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAE,CAAC;;AAE9C;AACA,MAAMG,gBAAgB,GAAG,QAAQ;AAEjC,MAAMC,cAAc,GAAGA,CAAC;EAAEC;AAAe,CAAC,KAAcA,IAAI,KAAK,IAAI,IAAIA,IAAI,GAAGF,gBAAgB;;AAEhG;AACA,MAAMG,QAA0B,GAAG;EACjCC,EAAE,EAAE,mBAAmB;EACvBC,SAAS,EAAEA,CAAA,KAAMV,SAAS;EAC1BW,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAMC,SAA2B,GAAG;EAClCH,EAAE,EAAE,oBAAoB;EACxBC,SAAS,EAAEA,CAAA,KAAMP,UAAU;EAC3BQ,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAME,qBAAuC,GAAG;EAC9CJ,EAAE,EAAE,gCAAgC;EACpCC,SAAS,EAAGI,QAAQ,IAAMR,cAAc,CAACQ,QAAQ,CAAC,GAAGX,UAAU,GAAGC,MAAO;EACzEO,2BAA2B,EAAE;AAC/B,CAAC;AAED,SAASH,QAAQ,EAAEI,SAAS,EAAEC,qBAAqB","ignoreList":[]}
1
+ {"version":3,"names":["WHOLE_DAY","start","end","STORED_DAY","NO_DAY","DAY_WINDOW_AFTER","takesDayWindow","date","H_SERIES","id","dayWindow","serviceBatteryOnOldFirmware","SH_SERIES","SH_SERIES_BY_FIRMWARE","firmware"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/variants.ts"],"mappings":";;AAEA;;AAMA;;AAaA,MAAMA,SAAoB,GAAG;EAAEC,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAG,CAAC;AAClD,MAAMC,UAAqB,GAAG;EAAEF,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAG,CAAC;AACnD,MAAME,MAAiB,GAAG;EAAEH,KAAK,EAAE,CAAC;EAAEC,GAAG,EAAE;AAAE,CAAC;;AAE9C;AACA,MAAMG,gBAAgB,GAAG,QAAQ;AAEjC,MAAMC,cAAc,GAAGA,CAAC;EAAEC;AAAe,CAAC,KAAcA,IAAI,KAAK,IAAI,IAAIA,IAAI,GAAGF,gBAAgB;;AAEhG;AACA,MAAMG,QAA0B,GAAG;EACjCC,EAAE,EAAE,mBAAmB;EACvBC,SAAS,EAAEA,CAAA,KAAMV,SAAS;EAC1BW,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAMC,SAA2B,GAAG;EAClCH,EAAE,EAAE,oBAAoB;EACxBC,SAAS,EAAEA,CAAA,KAAMP,UAAU;EAC3BQ,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAME,qBAAuC,GAAG;EAC9CJ,EAAE,EAAE,gCAAgC;EACpCC,SAAS,EAAGI,QAAQ,IAAMR,cAAc,CAACQ,QAAQ,CAAC,GAAGX,UAAU,GAAGC,MAAO;EACzEO,2BAA2B,EAAE;AAC/B,CAAC;AAED,SAASH,QAAQ,EAAEI,SAAS,EAAEC,qBAAqB,EAAEb,SAAS","ignoreList":[]}
@@ -1,6 +1,8 @@
1
1
  import { HistoryRecord } from "../../core/protocol";
2
2
  import { WristbandConnection } from "./session";
3
- /** The step counts of every day slot, an hour each, then the end-of-sync marker. */
3
+ /** The step counts of every day slot, an hour each. */
4
4
  declare function storedSteps(connection: WristbandConnection): AsyncGenerator<HistoryRecord>;
5
- export { storedSteps };
5
+ /** The step counts of every day slot, then the end-of-sync marker the wristbands expect. */
6
+ declare function storedStepsThenFinish(connection: WristbandConnection): AsyncGenerator<HistoryRecord>;
7
+ export { storedSteps, storedStepsThenFinish };
6
8
  //# sourceMappingURL=history.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/next/bluetooth/families/trasense/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AA8BhD,oFAAoF;AACpF,iBAAgB,WAAW,CAAC,UAAU,EAAE,mBAAmB,GAAG,cAAc,CAAC,aAAa,CAAC,CAc1F;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/next/bluetooth/families/trasense/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAqChD,uDAAuD;AACvD,iBAAgB,WAAW,CAAC,UAAU,EAAE,mBAAmB,GAAG,cAAc,CAAC,aAAa,CAAC,CAY1F;AAED,4FAA4F;AAC5F,iBAAgB,qBAAqB,CAAC,UAAU,EAAE,mBAAmB,GAAG,cAAc,CAAC,aAAa,CAAC,CAGpG;AAED,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,CAAC"}
@@ -2,7 +2,7 @@ import { DeviceModel } from "../../core/catalog";
2
2
  declare const H_SERIES_PROTOCOL: import("../..").DeviceProtocol<import("./session").WristbandConnection>;
3
3
  declare const SH_SERIES_PROTOCOL: import("../..").DeviceProtocol<import("./session").WristbandConnection>;
4
4
  declare const SH_SERIES_BY_FIRMWARE_PROTOCOL: import("../..").DeviceProtocol<import("./session").WristbandConnection>;
5
- /** The wristbands in catalog order: four of them advertise the plain name "Wristband", so the first of those is the default. */
5
+ /** The wristbands in catalog order, then the S9 watch: four wristbands advertise the plain name "Wristband", so the first of those is the default. */
6
6
  declare const TRASENSE_MODELS: readonly DeviceModel[];
7
7
  export { H_SERIES_PROTOCOL, SH_SERIES_BY_FIRMWARE_PROTOCOL, SH_SERIES_PROTOCOL, TRASENSE_MODELS };
8
8
  //# sourceMappingURL=models.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/next/bluetooth/families/trasense/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOjD,QAAA,MAAM,iBAAiB,yEAA8B,CAAC;AACtD,QAAA,MAAM,kBAAkB,yEAA+B,CAAC;AACxD,QAAA,MAAM,8BAA8B,yEAA2C,CAAC;AAQhF,gIAAgI;AAChI,QAAA,MAAM,eAAe,EAAE,SAAS,WAAW,EAS1C,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/next/bluetooth/families/trasense/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQpE,QAAA,MAAM,iBAAiB,yEAA8B,CAAC;AACtD,QAAA,MAAM,kBAAkB,yEAA+B,CAAC;AACxD,QAAA,MAAM,8BAA8B,yEAA2C,CAAC;AAahF,sJAAsJ;AACtJ,QAAA,MAAM,eAAe,EAAE,SAAS,WAAW,EAU1C,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC"}
@@ -1,7 +1,10 @@
1
+ import { DeviceIdentity } from "../../core/paired-device";
1
2
  import { DeviceProtocol } from "../../core/protocol";
2
3
  import { WristbandConnection } from "./session";
3
4
  import { WristbandVariant } from "./variants";
5
+ /** What a band says about itself: only its firmware version. */
6
+ declare const identityOf: ({ firmware }: WristbandConnection) => Promise<Omit<DeviceIdentity, "at">>;
4
7
  /** A wristband of one variant: its firmware, a clock, its battery, and the steps it stores an hour at a time as history. */
5
8
  declare const wristbandProtocol: (variant: WristbandVariant) => DeviceProtocol<WristbandConnection>;
6
- export { wristbandProtocol };
9
+ export { identityOf, wristbandProtocol };
7
10
  //# sourceMappingURL=protocol.d.ts.map