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

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 (88) hide show
  1. package/README.md +5 -4
  2. package/lib/commonjs/index.js +1 -199
  3. package/lib/commonjs/index.js.map +1 -1
  4. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js +19 -2
  5. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  6. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js +15 -2
  7. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  8. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js +15 -11
  9. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  10. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js +26 -1
  11. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  12. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js +22 -3
  13. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  14. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js +102 -0
  15. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  16. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js +32 -19
  17. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  18. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  19. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  20. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js +2 -2
  21. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  22. package/lib/commonjs/modules/questionnaire-response-form/README.md +2 -2
  23. package/lib/module/index.js +2 -22
  24. package/lib/module/index.js.map +1 -1
  25. package/lib/module/modules/next/bluetooth/families/trasense/history.js +19 -3
  26. package/lib/module/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  27. package/lib/module/modules/next/bluetooth/families/trasense/models.js +15 -2
  28. package/lib/module/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  29. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js +15 -12
  30. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  31. package/lib/module/modules/next/bluetooth/families/trasense/replies.js +25 -2
  32. package/lib/module/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  33. package/lib/module/modules/next/bluetooth/families/trasense/requests.js +17 -1
  34. package/lib/module/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  35. package/lib/module/modules/next/bluetooth/families/trasense/s9.js +100 -0
  36. package/lib/module/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  37. package/lib/module/modules/next/bluetooth/families/trasense/session.js +30 -19
  38. package/lib/module/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  39. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  40. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  41. package/lib/module/modules/next/bluetooth/families/trasense/variants.js +1 -1
  42. package/lib/module/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  43. package/lib/module/modules/questionnaire-response-form/README.md +2 -2
  44. package/lib/typescript/commonjs/src/index.d.ts +1 -19
  45. package/lib/typescript/commonjs/src/index.d.ts.map +1 -1
  46. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  47. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  48. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  49. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  50. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  51. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  52. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  53. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  54. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  55. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  56. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  57. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  58. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  59. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  60. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  61. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  62. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  63. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  64. package/lib/typescript/commonjs/type-tests/result-callback.d.ts +1 -1
  65. package/lib/typescript/commonjs/type-tests/result-callback.d.ts.map +1 -1
  66. package/lib/typescript/module/src/index.d.ts +1 -19
  67. package/lib/typescript/module/src/index.d.ts.map +1 -1
  68. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  69. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  70. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  71. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  72. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  73. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  74. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  75. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  76. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  77. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  78. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  79. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  80. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  81. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  82. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  83. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  84. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  85. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  86. package/lib/typescript/module/type-tests/result-callback.d.ts +1 -1
  87. package/lib/typescript/module/type-tests/result-callback.d.ts.map +1 -1
  88. package/package.json +2 -2
@@ -0,0 +1,102 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.S9_PROTOCOL = void 0;
7
+ var _errors = require("../../core/errors.js");
8
+ var _waiting = require("../sig/waiting.js");
9
+ var _history = require("./history.js");
10
+ var _protocol = require("./protocol.js");
11
+ var _replies = require("./replies.js");
12
+ var _requests = require("./requests.js");
13
+ var _session = require("./session.js");
14
+ var _variants = require("./variants.js");
15
+ /** The firmware type the S9 reports, as in `20250805.SH09.1.N0`; the name `S9` alone is shared by other watches. */
16
+ const S9_FIRMWARE_TYPE = "SH09";
17
+
18
+ /** How often a live view asks for the newest heart rate and temperature; the watch measures continuously. */
19
+ const LIVE_POLL_MS = 1_000;
20
+
21
+ /** The watch reports its battery in five steps, and step 0 still holds some charge. */
22
+ const PERCENT_PER_STEP = 20;
23
+ const LOWEST_STEP_PERCENT = 5;
24
+ const FULL_PERCENT = 100;
25
+
26
+ /** Reads the firmware and refuses a watch that is not an SH09 before anything else is sent to it. */
27
+ const requireS9Firmware = async session => {
28
+ const firmware = await (0, _session.readFirmware)(session);
29
+ if (firmware.type !== S9_FIRMWARE_TYPE) {
30
+ throw new _errors.DeviceError("unsupported", `The watch reported firmware type ${firmware.type ?? "none"}, not ${S9_FIRMWARE_TYPE}`);
31
+ }
32
+ return firmware;
33
+ };
34
+
35
+ /** The S9 takes commands only as Write Request and is never sent the wristbands' lock request. */
36
+ const openS9 = context => (0, _session.openConnectionWith)(context, frame => context.link.write(_session.WRISTBAND_SERVICE, _session.WRITE_CHARACTERISTIC, frame), requireS9Firmware);
37
+ const percentOfStep = step => step === 0 ? LOWEST_STEP_PERCENT : Math.min(FULL_PERCENT, step * PERCENT_PER_STEP);
38
+
39
+ /** The heart rate and temperature the watch measures now; a value it does not have yet is left out. */
40
+ const liveValuesOf = async ({
41
+ request
42
+ }) => {
43
+ const heartRate = (0, _replies.heartRateOf)(await request((0, _requests.heartRateRequest)(), (0, _requests.answersSubcommand)((0, _requests.heartRateRequest)())));
44
+ const temperature = (0, _replies.temperatureOf)(await request((0, _requests.temperatureRequest)(), (0, _requests.answersSubcommand)((0, _requests.temperatureRequest)())));
45
+ return {
46
+ ...(heartRate === null ? {} : {
47
+ heart_rate: {
48
+ value: heartRate,
49
+ unit: "/min"
50
+ }
51
+ }),
52
+ ...(temperature === null ? {} : {
53
+ body_temperature: {
54
+ value: temperature,
55
+ unit: "Cel"
56
+ }
57
+ })
58
+ };
59
+ };
60
+
61
+ /**
62
+ * The Trasense S9 watch (firmware type SH09): the wristbands' frames and step history, a live heart rate and body
63
+ * temperature read about once a second, and a battery in five steps. It never ends a link and does not advertise while
64
+ * one is open, so the link is closed as soon as the work is done.
65
+ */
66
+ const S9_PROTOCOL = exports.S9_PROTOCOL = {
67
+ id: "trasense/s9",
68
+ services: [_session.WRISTBAND_SERVICE],
69
+ open: openS9,
70
+ identify: _protocol.identityOf,
71
+ setClock: async ({
72
+ request
73
+ }, now) => {
74
+ await request((0, _requests.clockRequest)(now, _variants.WHOLE_DAY));
75
+ },
76
+ battery: async ({
77
+ request
78
+ }) => ({
79
+ percent: percentOfStep((0, _replies.batteryLevelOf)(await request((0, _requests.batteryRequest)()))),
80
+ charging: null
81
+ }),
82
+ history: _history.storedSteps,
83
+ live: async (connection, onFrame, signal) => {
84
+ while (!signal.aborted) {
85
+ const values = await liveValuesOf(connection);
86
+ if (Object.keys(values).length > 0) {
87
+ onFrame({
88
+ values: {
89
+ at: connection.now(),
90
+ values,
91
+ deviceFlags: []
92
+ }
93
+ });
94
+ }
95
+ await Promise.race([(0, _waiting.pause)(LIVE_POLL_MS), (0, _waiting.untilAborted)(signal)]);
96
+ }
97
+ },
98
+ close: async ({
99
+ stop
100
+ }) => stop()
101
+ };
102
+ //# sourceMappingURL=s9.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_errors","require","_waiting","_history","_protocol","_replies","_requests","_session","_variants","S9_FIRMWARE_TYPE","LIVE_POLL_MS","PERCENT_PER_STEP","LOWEST_STEP_PERCENT","FULL_PERCENT","requireS9Firmware","session","firmware","readFirmware","type","DeviceError","openS9","context","openConnectionWith","frame","link","write","WRISTBAND_SERVICE","WRITE_CHARACTERISTIC","percentOfStep","step","Math","min","liveValuesOf","request","heartRate","heartRateOf","heartRateRequest","answersSubcommand","temperature","temperatureOf","temperatureRequest","heart_rate","value","unit","body_temperature","S9_PROTOCOL","exports","id","services","open","identify","identityOf","setClock","now","clockRequest","WHOLE_DAY","battery","percent","batteryLevelOf","batteryRequest","charging","history","storedSteps","live","connection","onFrame","signal","aborted","values","Object","keys","length","at","deviceFlags","Promise","race","pause","untilAborted","close","stop"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/s9.ts"],"mappings":"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","ignoreList":[]}
@@ -3,14 +3,14 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.openConnection = exports.WRISTBAND_SERVICE = void 0;
6
+ exports.readFirmware = exports.openConnectionWith = exports.openConnection = exports.WRITE_CHARACTERISTIC = exports.WRISTBAND_SERVICE = void 0;
7
7
  var _advertisement = require("../../core/advertisement.js");
8
8
  var _errors = require("../../core/errors.js");
9
9
  var _exchange = require("../../core/exchange.js");
10
10
  var _replies = require("./replies.js");
11
11
  var _requests = require("./requests.js");
12
12
  const WRISTBAND_SERVICE = exports.WRISTBAND_SERVICE = (0, _advertisement.fullUuid)("FFF0");
13
- const WRITE_CHARACTERISTIC = (0, _advertisement.fullUuid)("FFF1");
13
+ const WRITE_CHARACTERISTIC = exports.WRITE_CHARACTERISTIC = (0, _advertisement.fullUuid)("FFF1");
14
14
  const NOTIFY_CHARACTERISTIC = (0, _advertisement.fullUuid)("FFF2");
15
15
 
16
16
  /** A step that goes this long without a reply ends the sync, and a request is never repeated. */
@@ -20,6 +20,8 @@ const REPLY_TIMING = {
20
20
  };
21
21
  const BOUND = "bound";
22
22
 
23
+ /** Writes one frame to the command characteristic. */
24
+
23
25
  /** One open link: a request that waits for the band's reply, and a write that does not. */
24
26
 
25
27
  /** What a protocol keeps of an open link to a band. */
@@ -27,9 +29,8 @@ const BOUND = "bound";
27
29
  /** Subscribes to the band's replies; a notification that is not one whole frame is dropped. */
28
30
  const openSession = async ({
29
31
  link
30
- }) => {
32
+ }, send) => {
31
33
  const exchange = new _exchange.Exchange(REPLY_TIMING);
32
- const send = frame => link.writeWithoutResponse(WRISTBAND_SERVICE, WRITE_CHARACTERISTIC, frame);
33
34
  const stopWatching = link.onDisconnect(() => exchange.fail(new _errors.DeviceError("disconnected", "The wristband dropped the link")));
34
35
  const unsubscribe = await link.subscribe(WRISTBAND_SERVICE, NOTIFY_CHARACTERISTIC, frame => {
35
36
  if (frame.length === _requests.FRAME_BYTES) {
@@ -41,7 +42,7 @@ const openSession = async ({
41
42
  });
42
43
  return {
43
44
  send,
44
- request: frame => exchange.request(() => send(frame), reply => reply[0] === (0, _requests.replyOpcodeOf)(frame)),
45
+ request: (frame, accepts = (0, _requests.answers)(frame)) => exchange.request(() => send(frame), accepts),
45
46
  stop: () => {
46
47
  unsubscribe();
47
48
  stopWatching();
@@ -49,22 +50,17 @@ const openSession = async ({
49
50
  };
50
51
  };
51
52
 
52
- /** The first link to a band locks it to this phone, and the lock is remembered so no later link asks again. */
53
- const bindOnFirstLink = async ({
54
- send
55
- }, secret) => {
56
- if ((await secret.read()) === null) {
57
- await send((0, _requests.bindRequest)());
58
- await secret.write(BOUND);
59
- }
60
- };
53
+ /** The firmware version the band reports. */
54
+ const readFirmware = async ({
55
+ request
56
+ }) => (0, _replies.firmwareOfReply)(await request((0, _requests.versionRequest)()));
61
57
 
62
- /** Opens the session, locks a band met for the first time to the phone, and reads the firmware version. */
63
- const openConnection = async context => {
64
- const session = await openSession(context);
58
+ /** Opens a session over `send`, then runs `firstSteps`, which end with the firmware; a failure stops listening. */
59
+ exports.readFirmware = readFirmware;
60
+ const openConnectionWith = async (context, send, firstSteps) => {
61
+ const session = await openSession(context, send);
65
62
  try {
66
- await bindOnFirstLink(session, context.secret);
67
- const firmware = (0, _replies.firmwareOfReply)(await session.request((0, _requests.versionRequest)()));
63
+ const firmware = await firstSteps(session);
68
64
  return {
69
65
  ...session,
70
66
  link: context.link,
@@ -77,5 +73,22 @@ const openConnection = async context => {
77
73
  throw error;
78
74
  }
79
75
  };
76
+
77
+ /** The first link to a band locks it to this phone, and the lock is remembered so no later link asks again. */
78
+ exports.openConnectionWith = openConnectionWith;
79
+ const bindOnFirstLink = async ({
80
+ send
81
+ }, secret) => {
82
+ if ((await secret.read()) === null) {
83
+ await send((0, _requests.bindRequest)());
84
+ await secret.write(BOUND);
85
+ }
86
+ };
87
+
88
+ /** Opens the session, locks a band met for the first time to the phone, and reads the firmware version. */
89
+ const openConnection = context => openConnectionWith(context, frame => context.link.writeWithoutResponse(WRISTBAND_SERVICE, WRITE_CHARACTERISTIC, frame), async session => {
90
+ await bindOnFirstLink(session, context.secret);
91
+ return readFirmware(session);
92
+ });
80
93
  exports.openConnection = openConnection;
81
94
  //# sourceMappingURL=session.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["_advertisement","require","_errors","_exchange","_replies","_requests","WRISTBAND_SERVICE","exports","fullUuid","WRITE_CHARACTERISTIC","NOTIFY_CHARACTERISTIC","REPLY_TIMING","replyTimeoutMs","attempts","BOUND","openSession","link","exchange","Exchange","send","frame","writeWithoutResponse","stopWatching","onDisconnect","fail","DeviceError","unsubscribe","subscribe","length","FRAME_BYTES","receive","catch","error","request","reply","replyOpcodeOf","stop","bindOnFirstLink","secret","read","bindRequest","write","openConnection","context","session","firmware","firmwareOfReply","versionRequest","logger","now"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/session.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_advertisement","require","_errors","_exchange","_replies","_requests","WRISTBAND_SERVICE","exports","fullUuid","WRITE_CHARACTERISTIC","NOTIFY_CHARACTERISTIC","REPLY_TIMING","replyTimeoutMs","attempts","BOUND","openSession","link","send","exchange","Exchange","stopWatching","onDisconnect","fail","DeviceError","unsubscribe","subscribe","frame","length","FRAME_BYTES","receive","catch","error","request","accepts","answers","stop","readFirmware","firmwareOfReply","versionRequest","openConnectionWith","context","firstSteps","session","firmware","logger","now","bindOnFirstLink","secret","read","bindRequest","write","openConnection","writeWithoutResponse"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/session.ts"],"mappings":"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","ignoreList":[]}
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "TRASENSE_MODELS", {
11
11
  });
12
12
  exports.TRASENSE_PROTOCOLS = void 0;
13
13
  var _models = require("./models.js");
14
- /** The protocols of the Trasense and Movement wristbands. */
15
- const TRASENSE_PROTOCOLS = exports.TRASENSE_PROTOCOLS = [_models.H_SERIES_PROTOCOL, _models.SH_SERIES_PROTOCOL, _models.SH_SERIES_BY_FIRMWARE_PROTOCOL];
14
+ var _s = require("./s9.js");
15
+ /** The protocols of the Trasense and Movement wristbands and the Trasense S9 watch. */
16
+ const TRASENSE_PROTOCOLS = exports.TRASENSE_PROTOCOLS = [_models.H_SERIES_PROTOCOL, _models.SH_SERIES_PROTOCOL, _models.SH_SERIES_BY_FIRMWARE_PROTOCOL, _s.S9_PROTOCOL];
16
17
  //# sourceMappingURL=trasense.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["_models","require","TRASENSE_PROTOCOLS","exports","H_SERIES_PROTOCOL","SH_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/trasense.ts"],"mappings":";;;;;;;;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AAEA;AACA,MAAMC,kBAA6C,GAAAC,OAAA,CAAAD,kBAAA,GAAG,CAACE,yBAAiB,EAAEC,0BAAkB,EAAEC,sCAA8B,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_models","require","_s","TRASENSE_PROTOCOLS","exports","H_SERIES_PROTOCOL","SH_SERIES_PROTOCOL","SH_SERIES_BY_FIRMWARE_PROTOCOL","S9_PROTOCOL"],"sourceRoot":"../../../../../../../src","sources":["modules/next/bluetooth/families/trasense/trasense.ts"],"mappings":";;;;;;;;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,EAAA,GAAAD,OAAA;AAEA;AACA,MAAME,kBAA6C,GAAAC,OAAA,CAAAD,kBAAA,GAAG,CAACE,yBAAiB,EAAEC,0BAAkB,EAAEC,sCAA8B,EAAEC,cAAW,CAAC","ignoreList":[]}
@@ -3,12 +3,12 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.SH_SERIES_BY_FIRMWARE = exports.SH_SERIES = exports.H_SERIES = void 0;
6
+ exports.WHOLE_DAY = exports.SH_SERIES_BY_FIRMWARE = exports.SH_SERIES = exports.H_SERIES = void 0;
7
7
  /** The hours the band counts as day; only its sleep scale reads them. */
8
8
 
9
9
  /** What differs between the bands: the day-time window their clock frame carries and where an old firmware's battery is read. */
10
10
 
11
- const WHOLE_DAY = {
11
+ const WHOLE_DAY = exports.WHOLE_DAY = {
12
12
  start: 0,
13
13
  end: 24
14
14
  };
@@ -1 +1 @@
1
- {"version":3,"names":["WHOLE_DAY","start","end","STORED_DAY","NO_DAY","DAY_WINDOW_AFTER","takesDayWindow","date","H_SERIES","exports","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,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACjCE,EAAE,EAAE,mBAAmB;EACvBC,SAAS,EAAEA,CAAA,KAAMX,SAAS;EAC1BY,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAMC,SAA2B,GAAAJ,OAAA,CAAAI,SAAA,GAAG;EAClCH,EAAE,EAAE,oBAAoB;EACxBC,SAAS,EAAEA,CAAA,KAAMR,UAAU;EAC3BS,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAME,qBAAuC,GAAAL,OAAA,CAAAK,qBAAA,GAAG;EAC9CJ,EAAE,EAAE,gCAAgC;EACpCC,SAAS,EAAGI,QAAQ,IAAMT,cAAc,CAACS,QAAQ,CAAC,GAAGZ,UAAU,GAAGC,MAAO;EACzEQ,2BAA2B,EAAE;AAC/B,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["WHOLE_DAY","exports","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,GAAAC,OAAA,CAAAD,SAAA,GAAG;EAAEE,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,GAAAR,OAAA,CAAAQ,QAAA,GAAG;EACjCC,EAAE,EAAE,mBAAmB;EACvBC,SAAS,EAAEA,CAAA,KAAMX,SAAS;EAC1BY,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAMC,SAA2B,GAAAZ,OAAA,CAAAY,SAAA,GAAG;EAClCH,EAAE,EAAE,oBAAoB;EACxBC,SAAS,EAAEA,CAAA,KAAMP,UAAU;EAC3BQ,2BAA2B,EAAE;AAC/B,CAAC;;AAED;AACA,MAAME,qBAAuC,GAAAb,OAAA,CAAAa,qBAAA,GAAG;EAC9CJ,EAAE,EAAE,gCAAgC;EACpCC,SAAS,EAAGI,QAAQ,IAAMR,cAAc,CAACQ,QAAQ,CAAC,GAAGX,UAAU,GAAGC,MAAO;EACzEO,2BAA2B,EAAE;AAC/B,CAAC","ignoreList":[]}
@@ -254,7 +254,7 @@ The QuestionnaireForm component has been refactored to use a compound component
254
254
  ### Basic Usage
255
255
 
256
256
  ```tsx
257
- import { QuestionnaireForm } from "@ovok/native";
257
+ import { QuestionnaireForm } from "@ovok/native/questionnaire-response-form";
258
258
 
259
259
  const MyComponent = () => {
260
260
  const handleSubmit = (response) => {
@@ -274,7 +274,7 @@ const MyComponent = () => {
274
274
  ### Advanced Customization
275
275
 
276
276
  ```tsx
277
- import { QuestionnaireForm } from "@ovok/native";
277
+ import { QuestionnaireForm } from "@ovok/native/questionnaire-response-form";
278
278
  import { View } from "react-native";
279
279
 
280
280
  const MyComponent = () => {
@@ -1,25 +1,5 @@
1
1
  "use strict";
2
2
 
3
- export * from "./modules/setting/index.js";
4
- export * from "./modules/theme/index.js";
5
- export * from "./modules/tile/index.js";
6
- export * from "./modules/auth/index.js";
7
- export * from "./modules/helpers/index.js";
8
- export * from "./modules/diary/index.js";
9
- export * from "./modules/measurement/index.js";
10
- export * from "./modules/tab/index.js";
11
- export * from "./modules/observation-detail/index.js";
12
- export * from "./modules/content/index.js";
13
- export * from "./modules/cms/index.js";
14
- export * from "./modules/bt-management/index.js";
15
- export * from "./polyfills/index.js";
16
- export * from "./modules/language-switcher/index.js";
17
- export * from "./modules/journal/index.js";
18
- export * from "./modules/progress-bar/index.js";
19
- export * from "./modules/progress-ring/index.js";
20
- export * from "./modules/patient/index.js";
21
- export * from "./modules/questionnaire-response-form/index.js";
22
-
23
- // Optional integrations stay on subpaths (/pdf, /data-sync, /ui, and similar)
24
- // so Metro does not resolve their peers for apps that do not use them.
3
+ // The root is the `next` client; legacy modules stay on their own subpaths (/theme, /auth, /bt-management, ...).
4
+ export * from "./modules/next/index.js";
25
5
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,cAAc,4BAAmB;AACjC,cAAc,0BAAiB;AAC/B,cAAc,yBAAgB;AAC9B,cAAc,yBAAgB;AAC9B,cAAc,4BAAmB;AACjC,cAAc,0BAAiB;AAC/B,cAAc,gCAAuB;AACrC,cAAc,wBAAe;AAC7B,cAAc,uCAA8B;AAC5C,cAAc,4BAAmB;AACjC,cAAc,wBAAe;AAC7B,cAAc,kCAAyB;AACvC,cAAc,sBAAa;AAC3B,cAAc,sCAA6B;AAC3C,cAAc,4BAAmB;AACjC,cAAc,iCAAwB;AACtC,cAAc,kCAAyB;AACvC,cAAc,4BAAmB;AACjC,cAAc,gDAAuC;;AAErD;AACA","ignoreList":[]}
1
+ {"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;AACA,cAAc,yBAAgB","ignoreList":[]}
@@ -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":";;AAGA,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,MAAMmB,WAAW,GAAG,GAAG;AAEvB,MAAMC,YAAY,GAAGA,CAAC;EAAExB,IAAI;EAAEC,KAAK;EAAEC;AAAe,CAAC,KAAa,CAACF,IAAI,GAAGuB,WAAW,GAAGtB,KAAK,IAAIsB,WAAW,GAAGrB,GAAG;;AAElH;AACA,MAAMuB,mBAAmB,GAAGA,CAACT,KAAgB,EAAE;EAAEU;AAAe,CAAC,KAAcA,IAAI,KAAK,IAAI,IAAIF,YAAY,CAACR,KAAK,CAAC,GAAGU,IAAI;;AAE1H;AACA,gBAAgBC,WAAWA,CAACC,UAA+B,EAAiC;EAC1F,MAAM;IAAEpC,UAAU;IAAEC;EAAU,CAAC,GAAGT,eAAe,CAAC,MAAM4C,UAAU,CAACC,OAAO,CAAC3C,oBAAoB,CAAC,CAAC,CAAC,CAAC;EAEnG,KAAK,MAAM4C,IAAI,IAAIvC,gBAAgB,CAACC,UAAU,EAAEC,SAAS,CAAC,EAAE;IAC1D,KAAK,MAAM2B,SAAS,IAAI/B,iBAAiB,EAAE;MACzC,MAAM2B,KAAK,GAAG/B,WAAW,CAAC,MAAM2C,UAAU,CAACC,OAAO,CAAC1C,eAAe,CAAC2C,IAAI,EAAEV,SAAS,CAAC,CAAC,CAAC;MAErF,IAAIJ,KAAK,KAAK,IAAI,IAAI,CAACS,mBAAmB,CAACT,KAAK,EAAEY,UAAU,CAACG,QAAQ,CAAC,EAAE;QACtE,OAAOhB,aAAa,CAACC,KAAK,EAAEY,UAAU,CAACX,GAAG,CAAC,CAAC,CAAC;MAC/C;IACF;EACF;AACF;;AAEA;AACA,gBAAgBe,qBAAqBA,CAACJ,UAA+B,EAAiC;EACpG,OAAOD,WAAW,CAACC,UAAU,CAAC;EAC9B,MAAMA,UAAU,CAACK,IAAI,CAAC7C,iBAAiB,CAAC,CAAC,CAAC,CAAC8C,KAAK,CAAC,MAAMN,UAAU,CAACO,MAAM,CAACC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AAC/G;AAEA,SAAST,WAAW,EAAEK,qBAAqB","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