@ovok/native 1.17.0-dev.2251 → 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 (97) hide show
  1. package/lib/commonjs/modules/next/bluetooth/core/auto-sync.js +22 -6
  2. package/lib/commonjs/modules/next/bluetooth/core/auto-sync.js.map +1 -1
  3. package/lib/commonjs/modules/next/bluetooth/core/bluetooth.js +3 -1
  4. package/lib/commonjs/modules/next/bluetooth/core/bluetooth.js.map +1 -1
  5. package/lib/commonjs/modules/next/bluetooth/create-bluetooth.js +21 -2
  6. package/lib/commonjs/modules/next/bluetooth/create-bluetooth.js.map +1 -1
  7. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js +19 -2
  8. package/lib/commonjs/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  9. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js +15 -2
  10. package/lib/commonjs/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  11. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js +15 -11
  12. package/lib/commonjs/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  13. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js +26 -1
  14. package/lib/commonjs/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  15. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js +22 -3
  16. package/lib/commonjs/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  17. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js +102 -0
  18. package/lib/commonjs/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  19. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js +32 -19
  20. package/lib/commonjs/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  21. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  22. package/lib/commonjs/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  23. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js +2 -2
  24. package/lib/commonjs/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  25. package/lib/module/modules/next/bluetooth/core/auto-sync.js +22 -6
  26. package/lib/module/modules/next/bluetooth/core/auto-sync.js.map +1 -1
  27. package/lib/module/modules/next/bluetooth/core/bluetooth.js +3 -1
  28. package/lib/module/modules/next/bluetooth/core/bluetooth.js.map +1 -1
  29. package/lib/module/modules/next/bluetooth/create-bluetooth.js +21 -2
  30. package/lib/module/modules/next/bluetooth/create-bluetooth.js.map +1 -1
  31. package/lib/module/modules/next/bluetooth/families/trasense/history.js +19 -3
  32. package/lib/module/modules/next/bluetooth/families/trasense/history.js.map +1 -1
  33. package/lib/module/modules/next/bluetooth/families/trasense/models.js +15 -2
  34. package/lib/module/modules/next/bluetooth/families/trasense/models.js.map +1 -1
  35. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js +15 -12
  36. package/lib/module/modules/next/bluetooth/families/trasense/protocol.js.map +1 -1
  37. package/lib/module/modules/next/bluetooth/families/trasense/replies.js +25 -2
  38. package/lib/module/modules/next/bluetooth/families/trasense/replies.js.map +1 -1
  39. package/lib/module/modules/next/bluetooth/families/trasense/requests.js +17 -1
  40. package/lib/module/modules/next/bluetooth/families/trasense/requests.js.map +1 -1
  41. package/lib/module/modules/next/bluetooth/families/trasense/s9.js +100 -0
  42. package/lib/module/modules/next/bluetooth/families/trasense/s9.js.map +1 -0
  43. package/lib/module/modules/next/bluetooth/families/trasense/session.js +30 -19
  44. package/lib/module/modules/next/bluetooth/families/trasense/session.js.map +1 -1
  45. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js +3 -2
  46. package/lib/module/modules/next/bluetooth/families/trasense/trasense.js.map +1 -1
  47. package/lib/module/modules/next/bluetooth/families/trasense/variants.js +1 -1
  48. package/lib/module/modules/next/bluetooth/families/trasense/variants.js.map +1 -1
  49. package/lib/typescript/commonjs/src/modules/next/bluetooth/core/auto-sync.d.ts +6 -1
  50. package/lib/typescript/commonjs/src/modules/next/bluetooth/core/auto-sync.d.ts.map +1 -1
  51. package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth.d.ts +1 -0
  52. package/lib/typescript/commonjs/src/modules/next/bluetooth/core/bluetooth.d.ts.map +1 -1
  53. package/lib/typescript/commonjs/src/modules/next/bluetooth/create-bluetooth.d.ts +4 -1
  54. package/lib/typescript/commonjs/src/modules/next/bluetooth/create-bluetooth.d.ts.map +1 -1
  55. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  56. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  57. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  58. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  59. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  60. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  61. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  62. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  63. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  64. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  65. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  66. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  67. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  68. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  69. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  70. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  71. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  72. package/lib/typescript/commonjs/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  73. package/lib/typescript/module/src/modules/next/bluetooth/core/auto-sync.d.ts +6 -1
  74. package/lib/typescript/module/src/modules/next/bluetooth/core/auto-sync.d.ts.map +1 -1
  75. package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth.d.ts +1 -0
  76. package/lib/typescript/module/src/modules/next/bluetooth/core/bluetooth.d.ts.map +1 -1
  77. package/lib/typescript/module/src/modules/next/bluetooth/create-bluetooth.d.ts +4 -1
  78. package/lib/typescript/module/src/modules/next/bluetooth/create-bluetooth.d.ts.map +1 -1
  79. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts +4 -2
  80. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/history.d.ts.map +1 -1
  81. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts +1 -1
  82. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/models.d.ts.map +1 -1
  83. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts +4 -1
  84. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/protocol.d.ts.map +1 -1
  85. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts +5 -1
  86. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/replies.d.ts.map +1 -1
  87. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts +9 -3
  88. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/requests.d.ts.map +1 -1
  89. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts +10 -0
  90. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/s9.d.ts.map +1 -0
  91. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts +12 -5
  92. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/session.d.ts.map +1 -1
  93. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts +1 -1
  94. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/trasense.d.ts.map +1 -1
  95. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts +2 -1
  96. package/lib/typescript/module/src/modules/next/bluetooth/families/trasense/variants.d.ts.map +1 -1
  97. 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":[]}
@@ -10,14 +10,16 @@ const SYNC_PERIOD_MS = 15_000;
10
10
  /** A device just paired is left this long before it syncs by itself. */
11
11
  const AFTER_PAIRING_MS = 1_000;
12
12
 
13
- /** How often a device kept connected in the background is retried while it is away. */
13
+ /** How long a device kept connected in the background waits after a failed try before it is tried again. */
14
14
  const RECONNECT_EVERY_MS = 10_000;
15
15
  /**
16
16
  * Syncs paired devices by themselves. In the foreground a recurring scan looks for them and a sighting syncs one that
17
- * is due; in the background only devices kept connected sync, at once and again whenever they drop.
17
+ * is due; in the background only devices kept connected sync, at once and again whenever they drop. Their connect
18
+ * stays pending until the device is back, which is what wakes a suspended app, so nothing waits on a timer for it.
18
19
  */
19
20
  class AutoSync {
20
21
  foreground = true;
22
+ stopped = false;
21
23
  attempts = new Map();
22
24
  running = new Set();
23
25
  constructor(deps) {
@@ -33,6 +35,9 @@ class AutoSync {
33
35
 
34
36
  /** Re-checks what to do after a device, radio or discovery change. */
35
37
  update() {
38
+ if (this.stopped) {
39
+ return;
40
+ }
36
41
  if (this.foreground) {
37
42
  this.scanForWanted();
38
43
  } else {
@@ -58,6 +63,7 @@ class AutoSync {
58
63
 
59
64
  /** Stops scanning and retrying for good. */
60
65
  stop() {
66
+ this.stopped = true;
61
67
  clearInterval(this.reconnects);
62
68
  this.stopScanning();
63
69
  }
@@ -90,17 +96,27 @@ class AutoSync {
90
96
  const elapsed = this.deps.now().getTime() - sinceMs;
91
97
  return elapsed < 0 || elapsed > periodMs;
92
98
  }
99
+
100
+ /** Only a failed try holds the next one back; once it settles, a device that dropped meanwhile is reconnected. */
93
101
  sync(device) {
94
- this.running.add(device.address);
95
- this.attempts.set(device.address, this.deps.now().getTime());
102
+ const {
103
+ address
104
+ } = device;
105
+ this.running.add(address);
106
+ this.attempts.set(address, this.deps.now().getTime());
96
107
  this.deps.logger.info("bluetooth.auto-sync.started", {
97
108
  model: device.snapshot().model.id,
98
109
  foreground: this.foreground
99
110
  });
100
- void device.sync().catch(() => undefined).finally(() => this.running.delete(device.address));
111
+ void device.sync().then(() => this.attempts.delete(address)).catch(() => undefined).finally(() => {
112
+ this.running.delete(address);
113
+ this.update();
114
+ });
101
115
  }
102
116
  reconnectKept() {
103
- this.awayDevices().filter(device => this.syncs(device) && this.passed(this.attempts.get(device.address) ?? 0, RECONNECT_EVERY_MS)).forEach(device => this.sync(device));
117
+ if (this.deps.radioOn()) {
118
+ this.awayDevices().filter(device => this.syncs(device) && this.passed(this.attempts.get(device.address) ?? 0, RECONNECT_EVERY_MS)).forEach(device => this.sync(device));
119
+ }
104
120
  }
105
121
  awayDevices() {
106
122
  return this.deps.devices().filter(device => this.wants(device) && device.snapshot().connection === "disconnected");
@@ -1 +1 @@
1
- {"version":3,"names":["SCAN_WINDOW_MS","SCAN_REST_MS","SYNC_PERIOD_MS","AFTER_PAIRING_MS","RECONNECT_EVERY_MS","AutoSync","foreground","attempts","Map","running","Set","constructor","deps","seen","device","wants","syncs","dueForSync","sync","update","scanForWanted","stopScanning","reconnectKept","enterBackground","clearInterval","reconnects","setInterval","enterForeground","stop","autoSync","keepInBackground","activity","snapshot","allowedNow","idle","has","address","broadcasts","actions","includes","lastSyncedAt","pairedAt","lastTry","Math","max","getTime","get","passed","sinceMs","periodMs","elapsed","now","add","set","logger","info","model","id","catch","undefined","finally","delete","awayDevices","filter","forEach","devices","connection","away","mayScan","length","filterFor","startScan","cycle","window","setTimeout","rest","central","scan","onAdvertisement","sighted","onError","error","warn","code","onEnd","stopScan","clearTimeout"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/auto-sync.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["SCAN_WINDOW_MS","SCAN_REST_MS","SYNC_PERIOD_MS","AFTER_PAIRING_MS","RECONNECT_EVERY_MS","AutoSync","foreground","stopped","attempts","Map","running","Set","constructor","deps","seen","device","wants","syncs","dueForSync","sync","update","scanForWanted","stopScanning","reconnectKept","enterBackground","clearInterval","reconnects","setInterval","enterForeground","stop","autoSync","keepInBackground","activity","snapshot","allowedNow","idle","has","address","broadcasts","actions","includes","lastSyncedAt","pairedAt","lastTry","Math","max","getTime","get","passed","sinceMs","periodMs","elapsed","now","add","set","logger","info","model","id","then","delete","catch","undefined","finally","radioOn","awayDevices","filter","forEach","devices","connection","away","mayScan","length","filterFor","startScan","cycle","window","setTimeout","rest","central","scan","onAdvertisement","sighted","onError","error","warn","code","onEnd","stopScan","clearTimeout"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/auto-sync.ts"],"mappings":";;AAIA;AACA,MAAMA,cAAc,GAAG,MAAM;AAC7B,MAAMC,YAAY,GAAG,KAAK;;AAE1B;AACA,MAAMC,cAAc,GAAG,MAAM;;AAE7B;AACA,MAAMC,gBAAgB,GAAG,KAAK;;AAE9B;AACA,MAAMC,kBAAkB,GAAG,MAAM;AAwBjC;AACA;AACA;AACA;AACA;AACA,MAAMC,QAAQ,CAAC;EACLC,UAAU,GAAG,IAAI;EACjBC,OAAO,GAAG,KAAK;EAINC,QAAQ,GAAG,IAAIC,GAAG,CAAiB,CAAC;EACpCC,OAAO,GAAG,IAAIC,GAAG,CAAS,CAAC;EAErCC,WAAWA,CAAkBC,IAAkB,EAAE;IAAA,KAApBA,IAAkB,GAAlBA,IAAkB;EAAG;;EAEzD;EACOC,IAAIA,CAACC,MAAc,EAAQ;IAChC,IAAI,IAAI,CAACC,KAAK,CAACD,MAAM,CAAC,IAAI,IAAI,CAACE,KAAK,CAACF,MAAM,CAAC,IAAI,IAAI,CAACG,UAAU,CAACH,MAAM,CAAC,EAAE;MACvE,IAAI,CAACI,IAAI,CAACJ,MAAM,CAAC;IACnB;EACF;;EAEA;EACOK,MAAMA,CAAA,EAAS;IACpB,IAAI,IAAI,CAACb,OAAO,EAAE;MAChB;IACF;IACA,IAAI,IAAI,CAACD,UAAU,EAAE;MACnB,IAAI,CAACe,aAAa,CAAC,CAAC;IACtB,CAAC,MAAM;MACL,IAAI,CAACC,YAAY,CAAC,CAAC;MACnB,IAAI,CAACC,aAAa,CAAC,CAAC;IACtB;EACF;;EAEA;EACOC,eAAeA,CAAA,EAAS;IAC7B,IAAI,CAAClB,UAAU,GAAG,KAAK;IACvB,IAAI,CAACc,MAAM,CAAC,CAAC;IACbK,aAAa,CAAC,IAAI,CAACC,UAAU,CAAC;IAC9B,IAAI,CAACA,UAAU,GAAGC,WAAW,CAAC,MAAM,IAAI,CAACJ,aAAa,CAAC,CAAC,EAAEnB,kBAAkB,CAAC;EAC/E;;EAEA;EACOwB,eAAeA,CAAA,EAAS;IAC7B,IAAI,CAACtB,UAAU,GAAG,IAAI;IACtBmB,aAAa,CAAC,IAAI,CAACC,UAAU,CAAC;IAC9B,IAAI,CAACN,MAAM,CAAC,CAAC;EACf;;EAEA;EACOS,IAAIA,CAAA,EAAS;IAClB,IAAI,CAACtB,OAAO,GAAG,IAAI;IACnBkB,aAAa,CAAC,IAAI,CAACC,UAAU,CAAC;IAC9B,IAAI,CAACJ,YAAY,CAAC,CAAC;EACrB;;EAEA;EACQN,KAAKA,CAACD,MAAc,EAAW;IACrC,MAAM;MAAEe,QAAQ;MAAEC,gBAAgB;MAAEC;IAAS,CAAC,GAAGjB,MAAM,CAACkB,QAAQ,CAAC,CAAC;IAClE,MAAMC,UAAU,GAAG,IAAI,CAAC5B,UAAU,IAAIyB,gBAAgB;IACtD,MAAMI,IAAI,GAAGH,QAAQ,KAAK,IAAI,IAAI,CAAC,IAAI,CAACtB,OAAO,CAAC0B,GAAG,CAACrB,MAAM,CAACsB,OAAO,CAAC;IAEnE,OAAOP,QAAQ,IAAII,UAAU,IAAIC,IAAI,KAAK,IAAI,CAAClB,KAAK,CAACF,MAAM,CAAC,IAAI,IAAI,CAACF,IAAI,CAACyB,UAAU,CAACvB,MAAM,CAAC,CAAC;EAC/F;EAEQE,KAAKA,CAACF,MAAc,EAAW;IACrC,OAAOA,MAAM,CAACkB,QAAQ,CAAC,CAAC,CAACM,OAAO,CAACC,QAAQ,CAAC,MAAM,CAAC;EACnD;EAEQtB,UAAUA,CAACH,MAAc,EAAW;IAC1C,MAAM;MAAE0B,YAAY;MAAEC;IAAS,CAAC,GAAG3B,MAAM,CAACkB,QAAQ,CAAC,CAAC;IACpD,MAAMU,OAAO,GAAGC,IAAI,CAACC,GAAG,CAACJ,YAAY,EAAEK,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAACtC,QAAQ,CAACuC,GAAG,CAAChC,MAAM,CAACsB,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9F,OAAO,IAAI,CAACW,MAAM,CAACL,OAAO,EAAEzC,cAAc,CAAC,IAAI,IAAI,CAAC8C,MAAM,CAACN,QAAQ,CAACI,OAAO,CAAC,CAAC,EAAE3C,gBAAgB,CAAC;EAClG;;EAEA;EACQ6C,MAAMA,CAACC,OAAe,EAAEC,QAAgB,EAAW;IACzD,MAAMC,OAAO,GAAG,IAAI,CAACtC,IAAI,CAACuC,GAAG,CAAC,CAAC,CAACN,OAAO,CAAC,CAAC,GAAGG,OAAO;IAEnD,OAAOE,OAAO,GAAG,CAAC,IAAIA,OAAO,GAAGD,QAAQ;EAC1C;;EAEA;EACQ/B,IAAIA,CAACJ,MAAc,EAAQ;IACjC,MAAM;MAAEsB;IAAQ,CAAC,GAAGtB,MAAM;IAE1B,IAAI,CAACL,OAAO,CAAC2C,GAAG,CAAChB,OAAO,CAAC;IACzB,IAAI,CAAC7B,QAAQ,CAAC8C,GAAG,CAACjB,OAAO,EAAE,IAAI,CAACxB,IAAI,CAACuC,GAAG,CAAC,CAAC,CAACN,OAAO,CAAC,CAAC,CAAC;IACrD,IAAI,CAACjC,IAAI,CAAC0C,MAAM,CAACC,IAAI,CAAC,6BAA6B,EAAE;MAAEC,KAAK,EAAE1C,MAAM,CAACkB,QAAQ,CAAC,CAAC,CAACwB,KAAK,CAACC,EAAE;MAAEpD,UAAU,EAAE,IAAI,CAACA;IAAW,CAAC,CAAC;IACxH,KAAKS,MAAM,CACRI,IAAI,CAAC,CAAC,CACNwC,IAAI,CAAC,MAAM,IAAI,CAACnD,QAAQ,CAACoD,MAAM,CAACvB,OAAO,CAAC,CAAC,CACzCwB,KAAK,CAAC,MAAMC,SAAS,CAAC,CACtBC,OAAO,CAAC,MAAM;MACb,IAAI,CAACrD,OAAO,CAACkD,MAAM,CAACvB,OAAO,CAAC;MAC5B,IAAI,CAACjB,MAAM,CAAC,CAAC;IACf,CAAC,CAAC;EACN;EAEQG,aAAaA,CAAA,EAAS;IAC5B,IAAI,IAAI,CAACV,IAAI,CAACmD,OAAO,CAAC,CAAC,EAAE;MACvB,IAAI,CAACC,WAAW,CAAC,CAAC,CACfC,MAAM,CAAEnD,MAAM,IAAK,IAAI,CAACE,KAAK,CAACF,MAAM,CAAC,IAAI,IAAI,CAACiC,MAAM,CAAC,IAAI,CAACxC,QAAQ,CAACuC,GAAG,CAAChC,MAAM,CAACsB,OAAO,CAAC,IAAI,CAAC,EAAEjC,kBAAkB,CAAC,CAAC,CACjH+D,OAAO,CAAEpD,MAAM,IAAK,IAAI,CAACI,IAAI,CAACJ,MAAM,CAAC,CAAC;IAC3C;EACF;EAEQkD,WAAWA,CAAA,EAAa;IAC9B,OAAO,IAAI,CAACpD,IAAI,CAACuD,OAAO,CAAC,CAAC,CAACF,MAAM,CAAEnD,MAAM,IAAK,IAAI,CAACC,KAAK,CAACD,MAAM,CAAC,IAAIA,MAAM,CAACkB,QAAQ,CAAC,CAAC,CAACoC,UAAU,KAAK,cAAc,CAAC;EACtH;EAEQhD,aAAaA,CAAA,EAAS;IAC5B,MAAMiD,IAAI,GAAG,IAAI,CAACL,WAAW,CAAC,CAAC;IAC/B,MAAMC,MAAM,GAAG,IAAI,CAACrD,IAAI,CAAC0D,OAAO,CAAC,CAAC,IAAID,IAAI,CAACE,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC3D,IAAI,CAAC4D,SAAS,CAACH,IAAI,CAAC,GAAG,IAAI;IAExF,IAAIJ,MAAM,EAAE;MACV,IAAI,CAACQ,SAAS,CAACR,MAAM,CAAC;IACxB,CAAC,MAAM;MACL,IAAI,CAAC5C,YAAY,CAAC,CAAC;IACrB;EACF;;EAEA;EACQoD,SAASA,CAACR,MAAkB,EAAQ;IAC1C,IAAI,IAAI,CAACS,KAAK,EAAE;MACd;IACF;IAEA,MAAMC,MAAM,GAAGC,UAAU,CAAC,MAAM,IAAI,CAACC,IAAI,CAAC,CAAC,EAAE9E,cAAc,CAAC;IAE5D,IAAI,CAAC2E,KAAK,GAAGC,MAAM;IAEnB,MAAM/C,IAAI,GAAG,IAAI,CAAChB,IAAI,CAACkE,OAAO,CAACC,IAAI,CAACd,MAAM,EAAE;MAC1Ce,eAAe,EAAE,IAAI,CAACpE,IAAI,CAACqE,OAAO;MAClCC,OAAO,EAAGC,KAAK,IAAK;QAClB,IAAI,CAACvE,IAAI,CAAC0C,MAAM,CAAC8B,IAAI,CAAC,iCAAiC,EAAE;UAAEC,IAAI,EAAEF,KAAK,CAACE;QAAK,CAAC,CAAC;QAC9E,IAAI,CAACR,IAAI,CAAC,CAAC;MACb,CAAC;MACDS,KAAK,EAAEA,CAAA,KAAM,IAAI,CAACT,IAAI,CAAC;IACzB,CAAC,CAAC;IAEF,IAAI,IAAI,CAACH,KAAK,KAAKC,MAAM,EAAE;MACzB,IAAI,CAACY,QAAQ,GAAG3D,IAAI;IACtB,CAAC,MAAM;MACLA,IAAI,CAAC,CAAC;IACR;EACF;EAEQiD,IAAIA,CAAA,EAAS;IACnB,IAAI,CAACxD,YAAY,CAAC,CAAC;IACnB,IAAI,CAACqD,KAAK,GAAGE,UAAU,CAAC,MAAM;MAC5B,IAAI,CAACF,KAAK,GAAGb,SAAS;MACtB,IAAI,CAAC1C,MAAM,CAAC,CAAC;IACf,CAAC,EAAEnB,YAAY,CAAC;EAClB;EAEQqB,YAAYA,CAAA,EAAS;IAC3B,IAAI,CAACkE,QAAQ,GAAG,CAAC;IACjB,IAAI,CAACA,QAAQ,GAAG1B,SAAS;IACzB2B,YAAY,CAAC,IAAI,CAACd,KAAK,CAAC;IACxB,IAAI,CAACA,KAAK,GAAGb,SAAS;EACxB;AACF;AAEA,SAASzD,QAAQ","ignoreList":[]}
@@ -188,13 +188,15 @@ class Bluetooth {
188
188
  central: this.options.central,
189
189
  devices: () => this.registry.list(),
190
190
  filterFor: devices => this.scanFilter(devices.flatMap(device => this.catalog.model(device.stored().modelId) ?? [])),
191
- mayScan: () => this.adapterSnap.state === "on" && this.scans.size === 0,
191
+ radioOn: this.radioOn,
192
+ mayScan: () => this.radioOn() && this.scans.size === 0,
192
193
  sighted: this.sighted,
193
194
  broadcasts: this.broadcasts,
194
195
  now: this.now,
195
196
  logger: this.logger
196
197
  });
197
198
  }
199
+ radioOn = () => this.adapterSnap.state === "on";
198
200
  broadcasts = device => {
199
201
  const model = this.catalog.model(device.stored().modelId);
200
202
  return model !== undefined && this.protocols.get(model.protocol)?.broadcast !== undefined;
@@ -1 +1 @@
1
- {"version":3,"names":["addressKey","AutoSync","Catalog","Device","Discovery","DeviceError","identify","narrow","IdleLinks","KeepAliveHolder","Listeners","newPairedDevice","PairedRegistry","alwaysForeground","noKeepAlive","silentLogger","ReadingLog","RecentAdvertisements","scanFilterFor","withoutChooser","DEFAULT_LOST_AFTER_MS","Bluetooth","adapterSnap","state","permission","adapterChanges","idleLinks","scans","Set","advertisements","constructor","options","now","Date","logger","keepAlive","catalog","models","protocols","Map","map","protocol","id","log","sink","outbox","registry","record","createDevice","store","autoSync","undefined","createAutoSync","stopFollowing","subscribe","update","list","snapshots","ready","load","stopWatching","central","watchState","patchAdapter","stopLifecycle","lifecycle","watch","visibility","changeVisibility","permissions","check","then","adapter","subscribeAdapter","listener","add","requestPermission","request","openSettings","runnable","model","has","links","some","link","data","discover","selector","chooser","context","paired","address","get","stored","wanted","scanFilter","filter","discovery","ad","identification","onSeen","sighted","onEnd","scanEnded","lostAfterMs","start","snapshot","scanning","pair","found","choice","match","kind","device","Promise","reject","variants","find","name","of","info","devices","pairedSnapshots","subscribeDevices","forget","remove","readings","entries","subscribeReadings","destroy","stop","all","disconnect","release","advertisement","modelId","deps","filterFor","flatMap","mayScan","size","broadcasts","broadcast","services","remember","seen","delete","enterBackground","enterForeground","change","emit"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/bluetooth.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["addressKey","AutoSync","Catalog","Device","Discovery","DeviceError","identify","narrow","IdleLinks","KeepAliveHolder","Listeners","newPairedDevice","PairedRegistry","alwaysForeground","noKeepAlive","silentLogger","ReadingLog","RecentAdvertisements","scanFilterFor","withoutChooser","DEFAULT_LOST_AFTER_MS","Bluetooth","adapterSnap","state","permission","adapterChanges","idleLinks","scans","Set","advertisements","constructor","options","now","Date","logger","keepAlive","catalog","models","protocols","Map","map","protocol","id","log","sink","outbox","registry","record","createDevice","store","autoSync","undefined","createAutoSync","stopFollowing","subscribe","update","list","snapshots","ready","load","stopWatching","central","watchState","patchAdapter","stopLifecycle","lifecycle","watch","visibility","changeVisibility","permissions","check","then","adapter","subscribeAdapter","listener","add","requestPermission","request","openSettings","runnable","model","has","links","some","link","data","discover","selector","chooser","context","paired","address","get","stored","wanted","scanFilter","filter","discovery","ad","identification","onSeen","sighted","onEnd","scanEnded","lostAfterMs","start","snapshot","scanning","pair","found","choice","match","kind","device","Promise","reject","variants","find","name","of","info","devices","pairedSnapshots","subscribeDevices","forget","remove","readings","entries","subscribeReadings","destroy","stop","all","disconnect","release","advertisement","modelId","deps","filterFor","flatMap","radioOn","mayScan","size","broadcasts","broadcast","services","remember","seen","delete","enterBackground","enterForeground","change","emit"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/core/bluetooth.ts"],"mappings":"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","ignoreList":[]}
@@ -9,11 +9,30 @@ import { ovokReadingSink } from "./adapters/ovok-reading-sink.js";
9
9
  import { reactNativeLifecycle } from "./adapters/react-native-lifecycle.js";
10
10
  import { storagePairedDevices } from "./adapters/storage-paired-devices.js";
11
11
  import { Bluetooth } from "./core/bluetooth.js";
12
+ import { silentLogger } from "./core/ports.js";
12
13
  import { BUILT_IN_MODELS, BUILT_IN_PROTOCOLS } from "./families/built-in.js";
13
14
 
15
+ /** iOS keeps the app's pending connects under this name after it ends the app, and relaunches it when one completes. */
16
+ const RESTORE_STATE_IDENTIFIER = "com.ovok.native.next.bluetooth";
17
+
18
+ /** A manager with CoreBluetooth state restoration on, so a device kept connected wakes the app even after iOS ended it. */
19
+ const restoringBleManager = logger => new BleManager({
20
+ restoreStateIdentifier: RESTORE_STATE_IDENTIFIER,
21
+ restoreStateFunction: restored => {
22
+ if (restored) {
23
+ logger.info("bluetooth.state-restored", {
24
+ peripherals: restored.connectedPeripherals.length
25
+ });
26
+ }
27
+ }
28
+ });
29
+
14
30
  /** What `createBluetooth` needs; every port can be swapped, for tests or a custom store or sink. */
15
31
 
16
- /** Bluetooth for a React Native app, over `react-native-ble-plx`, saving readings to Ovok and syncing in the background. */
32
+ /**
33
+ * Bluetooth for a React Native app, over `react-native-ble-plx`, saving readings to Ovok and syncing in the background.
34
+ * Call it as soon as the app starts: iOS relaunches an app it ended when a kept device connects, and gives it about 10 seconds.
35
+ */
17
36
  const createBluetooth = ({
18
37
  ovok,
19
38
  storage,
@@ -22,7 +41,7 @@ const createBluetooth = ({
22
41
  }) => {
23
42
  const outbox = ovokOutboxWatch(ovok.outbox, overrides.logger);
24
43
  return new Bluetooth({
25
- central: blePlxCentral(new BleManager()),
44
+ central: blePlxCentral(restoringBleManager(overrides.logger ?? silentLogger)),
26
45
  store: storagePairedDevices(storage),
27
46
  sink: ovokReadingSink(ovok, savesFor),
28
47
  permissions: osBluetoothPermissions(),
@@ -1 +1 @@
1
- {"version":3,"names":["BleManager","androidForegroundService","blePlxCentral","osBluetoothPermissions","ovokOutboxWatch","ovokReadingSink","reactNativeLifecycle","storagePairedDevices","Bluetooth","BUILT_IN_MODELS","BUILT_IN_PROTOCOLS","createBluetooth","ovok","storage","savesFor","overrides","outbox","logger","central","store","sink","permissions","models","protocols","lifecycle","keepAlive"],"sourceRoot":"../../../../../src","sources":["modules/next/bluetooth/create-bluetooth.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,sBAAsB;AAEjD,SAASC,wBAAwB,QAAQ,0CAAuC;AAChF,SAASC,aAAa,QAAQ,+BAA4B;AAE1D,SAASC,sBAAsB,QAAQ,8BAA2B;AAClE,SAASC,eAAe,QAAQ,iCAA8B;AAC9D,SAAyBC,eAAe,QAAQ,iCAA8B;AAC9E,SAASC,oBAAoB,QAAQ,sCAAmC;AACxE,SAASC,oBAAoB,QAAQ,sCAAmC;AACxE,SAASC,SAAS,QAA0B,qBAAkB;AAC9D,SAASC,eAAe,EAAEC,kBAAkB,QAAQ,wBAAqB;;AAEzE;;AAaA;AACA,MAAMC,eAAe,GAAGA,CAAC;EAAEC,IAAI;EAAEC,OAAO;EAAEC,QAAQ;EAAE,GAAGC;AAAkC,CAAC,KAAgB;EACxG,MAAMC,MAAM,GAAGZ,eAAe,CAACQ,IAAI,CAACI,MAAM,EAAED,SAAS,CAACE,MAAM,CAAC;EAE7D,OAAO,IAAIT,SAAS,CAAC;IACnBU,OAAO,EAAEhB,aAAa,CAAC,IAAIF,UAAU,CAAC,CAAC,CAAC;IACxCmB,KAAK,EAAEZ,oBAAoB,CAACM,OAAO,CAAC;IACpCO,IAAI,EAAEf,eAAe,CAACO,IAAI,EAAEE,QAAQ,CAAC;IACrCO,WAAW,EAAElB,sBAAsB,CAAC,CAAC;IACrCmB,MAAM,EAAEb,eAAe;IACvBc,SAAS,EAAEb,kBAAkB;IAC7Bc,SAAS,EAAElB,oBAAoB,CAAC,CAAC;IACjCmB,SAAS,EAAExB,wBAAwB,CAAC,CAAC,CAAC,EAAE;MAAEe,MAAM;MAAEC,MAAM,EAAEF,SAAS,CAACE;IAAO,CAAC,CAAC;IAC7ED,MAAM;IACN,GAAGD;EACL,CAAC,CAAC;AACJ,CAAC;AAED,SAASJ,eAAe","ignoreList":[]}
1
+ {"version":3,"names":["BleManager","androidForegroundService","blePlxCentral","osBluetoothPermissions","ovokOutboxWatch","ovokReadingSink","reactNativeLifecycle","storagePairedDevices","Bluetooth","silentLogger","BUILT_IN_MODELS","BUILT_IN_PROTOCOLS","RESTORE_STATE_IDENTIFIER","restoringBleManager","logger","restoreStateIdentifier","restoreStateFunction","restored","info","peripherals","connectedPeripherals","length","createBluetooth","ovok","storage","savesFor","overrides","outbox","central","store","sink","permissions","models","protocols","lifecycle","keepAlive"],"sourceRoot":"../../../../../src","sources":["modules/next/bluetooth/create-bluetooth.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,sBAAsB;AAEjD,SAASC,wBAAwB,QAAQ,0CAAuC;AAChF,SAASC,aAAa,QAAQ,+BAA4B;AAE1D,SAASC,sBAAsB,QAAQ,8BAA2B;AAClE,SAASC,eAAe,QAAQ,iCAA8B;AAC9D,SAAyBC,eAAe,QAAQ,iCAA8B;AAC9E,SAASC,oBAAoB,QAAQ,sCAAmC;AACxE,SAASC,oBAAoB,QAAQ,sCAAmC;AACxE,SAASC,SAAS,QAA0B,qBAAkB;AAC9D,SAAiBC,YAAY,QAAQ,iBAAc;AACnD,SAASC,eAAe,EAAEC,kBAAkB,QAAQ,wBAAqB;;AAEzE;AACA,MAAMC,wBAAwB,GAAG,gCAAgC;;AAEjE;AACA,MAAMC,mBAAmB,GAAIC,MAAc,IACzC,IAAId,UAAU,CAAC;EACbe,sBAAsB,EAAEH,wBAAwB;EAChDI,oBAAoB,EAAGC,QAAQ,IAAK;IAClC,IAAIA,QAAQ,EAAE;MACZH,MAAM,CAACI,IAAI,CAAC,0BAA0B,EAAE;QAAEC,WAAW,EAAEF,QAAQ,CAACG,oBAAoB,CAACC;MAAO,CAAC,CAAC;IAChG;EACF;AACF,CAAC,CAAC;;AAEJ;;AAaA;AACA;AACA;AACA;AACA,MAAMC,eAAe,GAAGA,CAAC;EAAEC,IAAI;EAAEC,OAAO;EAAEC,QAAQ;EAAE,GAAGC;AAAkC,CAAC,KAAgB;EACxG,MAAMC,MAAM,GAAGvB,eAAe,CAACmB,IAAI,CAACI,MAAM,EAAED,SAAS,CAACZ,MAAM,CAAC;EAE7D,OAAO,IAAIN,SAAS,CAAC;IACnBoB,OAAO,EAAE1B,aAAa,CAACW,mBAAmB,CAACa,SAAS,CAACZ,MAAM,IAAIL,YAAY,CAAC,CAAC;IAC7EoB,KAAK,EAAEtB,oBAAoB,CAACiB,OAAO,CAAC;IACpCM,IAAI,EAAEzB,eAAe,CAACkB,IAAI,EAAEE,QAAQ,CAAC;IACrCM,WAAW,EAAE5B,sBAAsB,CAAC,CAAC;IACrC6B,MAAM,EAAEtB,eAAe;IACvBuB,SAAS,EAAEtB,kBAAkB;IAC7BuB,SAAS,EAAE5B,oBAAoB,CAAC,CAAC;IACjC6B,SAAS,EAAElC,wBAAwB,CAAC,CAAC,CAAC,EAAE;MAAE0B,MAAM;MAAEb,MAAM,EAAEY,SAAS,CAACZ;IAAO,CAAC,CAAC;IAC7Ea,MAAM;IACN,GAAGD;EACL,CAAC,CAAC;AACJ,CAAC;AAED,SAASJ,eAAe","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":"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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