@ovok/native 1.17.0-dev.2280 → 1.17.0-dev.2287

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 (99) hide show
  1. package/lib/commonjs/modules/data-sync/components/android/android-health-connect-authorization-provider.js +7 -4
  2. package/lib/commonjs/modules/data-sync/components/android/android-health-connect-authorization-provider.js.map +1 -1
  3. package/lib/commonjs/modules/data-sync/components/android/android-health-sync.js +7 -1
  4. package/lib/commonjs/modules/data-sync/components/android/android-health-sync.js.map +1 -1
  5. package/lib/commonjs/modules/data-sync/components/apple/apple-health-sync.js +5 -29
  6. package/lib/commonjs/modules/data-sync/components/apple/apple-health-sync.js.map +1 -1
  7. package/lib/commonjs/modules/data-sync/hooks/use-health-sync-runner.js +21 -3
  8. package/lib/commonjs/modules/data-sync/hooks/use-health-sync-runner.js.map +1 -1
  9. package/lib/commonjs/modules/data-sync/hooks/use-listen-changes.js +18 -7
  10. package/lib/commonjs/modules/data-sync/hooks/use-listen-changes.js.map +1 -1
  11. package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js +83 -44
  12. package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js.map +1 -1
  13. package/lib/commonjs/modules/data-sync/services/managers/data-processor.js +31 -11
  14. package/lib/commonjs/modules/data-sync/services/managers/data-processor.js.map +1 -1
  15. package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js +14 -0
  16. package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js.map +1 -1
  17. package/lib/commonjs/modules/data-sync/services/managers/sync-state-manager.js +8 -0
  18. package/lib/commonjs/modules/data-sync/services/managers/sync-state-manager.js.map +1 -1
  19. package/lib/commonjs/modules/data-sync/utils/get-health-record-sync-id.js +10 -3
  20. package/lib/commonjs/modules/data-sync/utils/get-health-record-sync-id.js.map +1 -1
  21. package/lib/commonjs/modules/data-sync/utils/get-total-records-count.js +4 -2
  22. package/lib/commonjs/modules/data-sync/utils/get-total-records-count.js.map +1 -1
  23. package/lib/commonjs/modules/data-sync/utils/reading-groups.js +38 -0
  24. package/lib/commonjs/modules/data-sync/utils/reading-groups.js.map +1 -0
  25. package/lib/commonjs/modules/data-sync/utils/without-type-identifiers.js +24 -0
  26. package/lib/commonjs/modules/data-sync/utils/without-type-identifiers.js.map +1 -0
  27. package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js +7 -4
  28. package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js.map +1 -1
  29. package/lib/module/modules/data-sync/components/android/android-health-sync.js +7 -1
  30. package/lib/module/modules/data-sync/components/android/android-health-sync.js.map +1 -1
  31. package/lib/module/modules/data-sync/components/apple/apple-health-sync.js +5 -28
  32. package/lib/module/modules/data-sync/components/apple/apple-health-sync.js.map +1 -1
  33. package/lib/module/modules/data-sync/hooks/use-health-sync-runner.js +21 -3
  34. package/lib/module/modules/data-sync/hooks/use-health-sync-runner.js.map +1 -1
  35. package/lib/module/modules/data-sync/hooks/use-listen-changes.js +18 -7
  36. package/lib/module/modules/data-sync/hooks/use-listen-changes.js.map +1 -1
  37. package/lib/module/modules/data-sync/services/base-health-sync-service.js +83 -44
  38. package/lib/module/modules/data-sync/services/base-health-sync-service.js.map +1 -1
  39. package/lib/module/modules/data-sync/services/managers/data-processor.js +33 -13
  40. package/lib/module/modules/data-sync/services/managers/data-processor.js.map +1 -1
  41. package/lib/module/modules/data-sync/services/managers/storage-manager.js +14 -0
  42. package/lib/module/modules/data-sync/services/managers/storage-manager.js.map +1 -1
  43. package/lib/module/modules/data-sync/services/managers/sync-state-manager.js +8 -0
  44. package/lib/module/modules/data-sync/services/managers/sync-state-manager.js.map +1 -1
  45. package/lib/module/modules/data-sync/utils/get-health-record-sync-id.js +8 -2
  46. package/lib/module/modules/data-sync/utils/get-health-record-sync-id.js.map +1 -1
  47. package/lib/module/modules/data-sync/utils/get-total-records-count.js +4 -1
  48. package/lib/module/modules/data-sync/utils/get-total-records-count.js.map +1 -1
  49. package/lib/module/modules/data-sync/utils/reading-groups.js +35 -0
  50. package/lib/module/modules/data-sync/utils/reading-groups.js.map +1 -0
  51. package/lib/module/modules/data-sync/utils/without-type-identifiers.js +20 -0
  52. package/lib/module/modules/data-sync/utils/without-type-identifiers.js.map +1 -0
  53. package/lib/typescript/commonjs/src/modules/data-sync/components/android/android-health-connect-authorization-provider.d.ts.map +1 -1
  54. package/lib/typescript/commonjs/src/modules/data-sync/components/android/android-health-sync.d.ts.map +1 -1
  55. package/lib/typescript/commonjs/src/modules/data-sync/components/apple/apple-health-sync.d.ts +1 -2
  56. package/lib/typescript/commonjs/src/modules/data-sync/components/apple/apple-health-sync.d.ts.map +1 -1
  57. package/lib/typescript/commonjs/src/modules/data-sync/hooks/use-health-sync-runner.d.ts +2 -2
  58. package/lib/typescript/commonjs/src/modules/data-sync/hooks/use-health-sync-runner.d.ts.map +1 -1
  59. package/lib/typescript/commonjs/src/modules/data-sync/hooks/use-listen-changes.d.ts.map +1 -1
  60. package/lib/typescript/commonjs/src/modules/data-sync/services/base-health-sync-service.d.ts +10 -0
  61. package/lib/typescript/commonjs/src/modules/data-sync/services/base-health-sync-service.d.ts.map +1 -1
  62. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/data-processor.d.ts +2 -0
  63. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/data-processor.d.ts.map +1 -1
  64. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts +4 -0
  65. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts.map +1 -1
  66. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/sync-state-manager.d.ts +2 -0
  67. package/lib/typescript/commonjs/src/modules/data-sync/services/managers/sync-state-manager.d.ts.map +1 -1
  68. package/lib/typescript/commonjs/src/modules/data-sync/utils/get-health-record-sync-id.d.ts +3 -1
  69. package/lib/typescript/commonjs/src/modules/data-sync/utils/get-health-record-sync-id.d.ts.map +1 -1
  70. package/lib/typescript/commonjs/src/modules/data-sync/utils/get-total-records-count.d.ts +2 -1
  71. package/lib/typescript/commonjs/src/modules/data-sync/utils/get-total-records-count.d.ts.map +1 -1
  72. package/lib/typescript/commonjs/src/modules/data-sync/utils/reading-groups.d.ts +17 -0
  73. package/lib/typescript/commonjs/src/modules/data-sync/utils/reading-groups.d.ts.map +1 -0
  74. package/lib/typescript/commonjs/src/modules/data-sync/utils/without-type-identifiers.d.ts +9 -0
  75. package/lib/typescript/commonjs/src/modules/data-sync/utils/without-type-identifiers.d.ts.map +1 -0
  76. package/lib/typescript/module/src/modules/data-sync/components/android/android-health-connect-authorization-provider.d.ts.map +1 -1
  77. package/lib/typescript/module/src/modules/data-sync/components/android/android-health-sync.d.ts.map +1 -1
  78. package/lib/typescript/module/src/modules/data-sync/components/apple/apple-health-sync.d.ts +1 -2
  79. package/lib/typescript/module/src/modules/data-sync/components/apple/apple-health-sync.d.ts.map +1 -1
  80. package/lib/typescript/module/src/modules/data-sync/hooks/use-health-sync-runner.d.ts +2 -2
  81. package/lib/typescript/module/src/modules/data-sync/hooks/use-health-sync-runner.d.ts.map +1 -1
  82. package/lib/typescript/module/src/modules/data-sync/hooks/use-listen-changes.d.ts.map +1 -1
  83. package/lib/typescript/module/src/modules/data-sync/services/base-health-sync-service.d.ts +10 -0
  84. package/lib/typescript/module/src/modules/data-sync/services/base-health-sync-service.d.ts.map +1 -1
  85. package/lib/typescript/module/src/modules/data-sync/services/managers/data-processor.d.ts +2 -0
  86. package/lib/typescript/module/src/modules/data-sync/services/managers/data-processor.d.ts.map +1 -1
  87. package/lib/typescript/module/src/modules/data-sync/services/managers/storage-manager.d.ts +4 -0
  88. package/lib/typescript/module/src/modules/data-sync/services/managers/storage-manager.d.ts.map +1 -1
  89. package/lib/typescript/module/src/modules/data-sync/services/managers/sync-state-manager.d.ts +2 -0
  90. package/lib/typescript/module/src/modules/data-sync/services/managers/sync-state-manager.d.ts.map +1 -1
  91. package/lib/typescript/module/src/modules/data-sync/utils/get-health-record-sync-id.d.ts +3 -1
  92. package/lib/typescript/module/src/modules/data-sync/utils/get-health-record-sync-id.d.ts.map +1 -1
  93. package/lib/typescript/module/src/modules/data-sync/utils/get-total-records-count.d.ts +2 -1
  94. package/lib/typescript/module/src/modules/data-sync/utils/get-total-records-count.d.ts.map +1 -1
  95. package/lib/typescript/module/src/modules/data-sync/utils/reading-groups.d.ts +17 -0
  96. package/lib/typescript/module/src/modules/data-sync/utils/reading-groups.d.ts.map +1 -0
  97. package/lib/typescript/module/src/modules/data-sync/utils/without-type-identifiers.d.ts +9 -0
  98. package/lib/typescript/module/src/modules/data-sync/utils/without-type-identifiers.d.ts.map +1 -0
  99. package/package.json +1 -1
@@ -3,6 +3,7 @@
3
3
  import { useSession } from "@ovok/core/next/react";
4
4
  import { useNetInfo } from "@react-native-community/netinfo";
5
5
  import * as React from "react";
6
+ import { AppState } from "react-native";
6
7
  import { useNativeOvok } from "../../next/use-native-ovok.js";
7
8
  import { createProgressCollector } from "../utils/create-progress-collector.js";
8
9
  import { healthSyncOwner } from "../utils/session-owner.js";
@@ -30,6 +31,9 @@ export const useHealthSyncRunner = ({
30
31
  isConnected,
31
32
  type
32
33
  } = useNetInfo();
34
+ const pauseReason = isConnected === false ? "offline" : wifiOnly && type !== "wifi" ? "wifi-only" : undefined;
35
+ const pauseReasonRef = React.useRef(pauseReason);
36
+ pauseReasonRef.current = pauseReason;
33
37
  const onErrorRef = React.useRef(onError);
34
38
  const onProgressRef = React.useRef(onProgress);
35
39
  const [updateProgress] = React.useState(() => createProgressCollector(progress => onProgressRef.current?.(progress)));
@@ -84,19 +88,33 @@ export const useHealthSyncRunner = ({
84
88
  if (!serviceRef.current) {
85
89
  return;
86
90
  }
87
- const pauseReason = isConnected === false ? "offline" : wifiOnly && type !== "wifi" ? "wifi-only" : undefined;
88
91
  if (pauseReason) {
89
92
  serviceRef.current.pauseSync(pauseReason);
90
93
  return;
91
94
  }
92
95
  serviceRef.current.startSync();
93
- }, [isConnected, type, wifiOnly]);
96
+ }, [pauseReason]);
97
+
98
+ // New readings, or a return to the foreground, which may have missed their notice while suspended.
99
+ const requestSync = React.useCallback(() => {
100
+ if (!pauseReasonRef.current) {
101
+ void serviceRef.current?.requestSync();
102
+ }
103
+ }, []);
104
+ React.useEffect(() => {
105
+ const subscription = AppState.addEventListener("change", state => {
106
+ if (state === "active") {
107
+ requestSync();
108
+ }
109
+ });
110
+ return () => subscription.remove();
111
+ }, [requestSync]);
94
112
  React.useEffect(() => {
95
113
  onErrorRef.current = onError;
96
114
  onProgressRef.current = onProgress;
97
115
  }, [onError, onProgress]);
98
116
  return {
99
- syncData,
117
+ requestSync,
100
118
  onErrorRef
101
119
  };
102
120
  };
@@ -1 +1 @@
1
- {"version":3,"names":["useSession","useNetInfo","React","useNativeOvok","createProgressCollector","healthSyncOwner","useHealthSyncRunner","getInstance","dataToSync","chunkSize","wifiOnly","skip","onError","onProgress","client","session","owner","data","patientId","ownerKey","serviceRef","useRef","generation","isConnected","type","onErrorRef","onProgressRef","updateProgress","useState","progress","current","syncData","useCallback","requestGeneration","stopSync","onSyncError","error","startSync","useEffect","currentGeneration","Promise","resolve","catch","pauseReason","undefined","pauseSync"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-health-sync-runner.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["useSession","useNetInfo","React","AppState","useNativeOvok","createProgressCollector","healthSyncOwner","useHealthSyncRunner","getInstance","dataToSync","chunkSize","wifiOnly","skip","onError","onProgress","client","session","owner","data","patientId","ownerKey","serviceRef","useRef","generation","isConnected","type","pauseReason","undefined","pauseReasonRef","current","onErrorRef","onProgressRef","updateProgress","useState","progress","syncData","useCallback","requestGeneration","stopSync","onSyncError","error","startSync","useEffect","currentGeneration","Promise","resolve","catch","pauseSync","requestSync","subscription","addEventListener","state","remove"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-health-sync-runner.ts"],"mappings":"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","ignoreList":[]}
@@ -6,9 +6,15 @@ export const useListenChanges = (dataToSync, onChange, backgroundDelivery, onErr
6
6
  const timeoutRef = React.useRef(undefined);
7
7
  const onChangeRef = React.useRef(onChange);
8
8
  const onErrorRef = React.useRef(onError);
9
- const identifiers = React.useMemo(() => {
10
- return Object.values(dataToSync).flatMap(data => data?.typeIdentifiers.map(identifier => identifier.typeIdentifier) ?? []);
11
- }, [dataToSync]);
9
+
10
+ // Keyed by content: a new `dataToSync` object with the same types must not switch background delivery off and on.
11
+ const identifiersKey = Object.values(dataToSync).flatMap(data => data?.typeIdentifiers.map(({
12
+ typeIdentifier
13
+ }) => typeIdentifier) ?? []).join(",");
14
+ const identifiers = React.useMemo(() => identifiersKey ? identifiersKey.split(",") : [], [identifiersKey]);
15
+
16
+ // A switch-off still under way when the types change, which the next switch-on waits for.
17
+ const pendingDisable = React.useRef(Promise.resolve());
12
18
  const backgroundDeliveryEnabled = backgroundDelivery !== undefined;
13
19
  const backgroundDeliveryFrequency = backgroundDelivery?.frequency ?? UpdateFrequency.hourly;
14
20
  const debouncedOnChange = React.useCallback(identifier => {
@@ -35,15 +41,19 @@ export const useListenChanges = (dataToSync, onChange, backgroundDelivery, onErr
35
41
  }, []);
36
42
  React.useEffect(() => {
37
43
  const subscriptions = [];
44
+ let unsubscribed = false;
38
45
  const initSubscriptions = async () => {
39
46
  try {
47
+ await pendingDisable.current;
40
48
  await Promise.all(identifiers.map(async identifier => {
41
49
  if (backgroundDeliveryEnabled) {
42
50
  await Healthkit.enableBackgroundDelivery(identifier, backgroundDeliveryFrequency);
43
51
  }
44
- subscriptions.push(Healthkit.subscribeToChanges(identifier, () => {
45
- debouncedOnChange(identifier);
46
- }));
52
+ if (!unsubscribed) {
53
+ subscriptions.push(Healthkit.subscribeToChanges(identifier, () => {
54
+ debouncedOnChange(identifier);
55
+ }));
56
+ }
47
57
  }));
48
58
  } catch (error) {
49
59
  onErrorRef.current?.(error);
@@ -51,11 +61,12 @@ export const useListenChanges = (dataToSync, onChange, backgroundDelivery, onErr
51
61
  };
52
62
  initSubscriptions();
53
63
  return () => {
64
+ unsubscribed = true;
54
65
  subscriptions.forEach(subscription => {
55
66
  subscription.remove();
56
67
  });
57
68
  if (backgroundDeliveryEnabled) {
58
- void Promise.all(identifiers.map(identifier => Healthkit.disableBackgroundDelivery(identifier))).catch(error => onErrorRef.current?.(error));
69
+ pendingDisable.current = Promise.all(identifiers.map(identifier => Healthkit.disableBackgroundDelivery(identifier))).catch(error => onErrorRef.current?.(error));
59
70
  }
60
71
  };
61
72
  }, [identifiers, debouncedOnChange, backgroundDeliveryEnabled, backgroundDeliveryFrequency]);
@@ -1 +1 @@
1
- {"version":3,"names":["Healthkit","UpdateFrequency","React","useListenChanges","dataToSync","onChange","backgroundDelivery","onError","timeoutRef","useRef","undefined","onChangeRef","onErrorRef","identifiers","useMemo","Object","values","flatMap","data","typeIdentifiers","map","identifier","typeIdentifier","backgroundDeliveryEnabled","backgroundDeliveryFrequency","frequency","hourly","debouncedOnChange","useCallback","current","clearTimeout","setTimeout","useEffect","subscriptions","initSubscriptions","Promise","all","enableBackgroundDelivery","push","subscribeToChanges","error","forEach","subscription","remove","disableBackgroundDelivery","catch"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-listen-changes.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["Healthkit","UpdateFrequency","React","useListenChanges","dataToSync","onChange","backgroundDelivery","onError","timeoutRef","useRef","undefined","onChangeRef","onErrorRef","identifiersKey","Object","values","flatMap","data","typeIdentifiers","map","typeIdentifier","join","identifiers","useMemo","split","pendingDisable","Promise","resolve","backgroundDeliveryEnabled","backgroundDeliveryFrequency","frequency","hourly","debouncedOnChange","useCallback","identifier","current","clearTimeout","setTimeout","useEffect","subscriptions","unsubscribed","initSubscriptions","all","enableBackgroundDelivery","push","subscribeToChanges","error","forEach","subscription","remove","disableBackgroundDelivery","catch"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/hooks/use-listen-changes.ts"],"mappings":"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","ignoreList":[]}
@@ -2,6 +2,7 @@
2
2
 
3
3
  /* eslint-disable max-lines */
4
4
 
5
+ import { OvokValidationError } from "@ovok/core/next";
5
6
  import { recordOvokDuration, recordOvokMetric, withOvokSpan } from "../../helpers/utils/telemetry.js";
6
7
  import { DEFAULT_HEALTH_SYNC_CHUNK_SIZE } from "../constants.js";
7
8
  import { toHealthSyncError } from "../types/health-sync-batch-error.js";
@@ -31,10 +32,16 @@ export class BaseHealthSyncService {
31
32
 
32
33
  /** One run at a time; see `SyncStateManager.once` for why that matters. */
33
34
  async startSync() {
34
- return this.stateManager.once(() => withOvokSpan("health.import", {
35
- provider: this.adapter.provider
36
- }, () => this.runSync()));
35
+ return this.stateManager.once(this.tracedSync);
36
+ }
37
+
38
+ /** Imports what changed: now, or right after the run under way, without stopping it. */
39
+ async requestSync() {
40
+ return this.stateManager.again(this.tracedSync);
37
41
  }
42
+ tracedSync = () => withOvokSpan("health.import", {
43
+ provider: this.adapter.provider
44
+ }, () => this.runSync());
38
45
  async runSync() {
39
46
  try {
40
47
  if (!this.patientId) {
@@ -92,7 +99,13 @@ export class BaseHealthSyncService {
92
99
  continue;
93
100
  }
94
101
  this.progressManager.setStatus(measurementTypeKey, "started");
95
- await this.syncDataByType(measurementTypeKey, data);
102
+ try {
103
+ await this.syncDataByType(measurementTypeKey, data);
104
+ } catch (error) {
105
+ // A type that fails leaves the others to import, unless the session changed, which ends the run.
106
+ await this.storageManager.requireOwner(this.patientId);
107
+ this.failType(measurementTypeKey, error);
108
+ }
96
109
  }
97
110
  }
98
111
  async syncDataByType(measurementTypeKey, data) {
@@ -109,7 +122,8 @@ export class BaseHealthSyncService {
109
122
  observationRecordIds,
110
123
  deletedRecordIds,
111
124
  hasMore: currentHasMore,
112
- anchors
125
+ anchors,
126
+ carriedRecords
113
127
  } = await this.dataProcessor.getObservationBodiesForType(measurementTypeKey, data, latestValidStartDate);
114
128
  hasMore = currentHasMore;
115
129
  if (this.stateManager.shouldStopSync) {
@@ -117,54 +131,79 @@ export class BaseHealthSyncService {
117
131
  }
118
132
  const readGroups = this.dataProcessor.identifyObservations(observationBodies, observationSyncIds, observationRecordIds, mode);
119
133
  const groups = sentReadings ? unsentReadings(readGroups, sentReadings) : readGroups;
120
- const observationCount = groups.flat().length;
121
- const unchangedCount = readGroups.flat().length - observationCount;
134
+ const unchangedCount = readGroups.flat().length - groups.flat().length;
122
135
  if (unchangedCount !== 0) {
123
136
  this.progressManager.incrementSyncedObservations(measurementTypeKey, unchangedCount);
124
137
  }
125
- if ((observationCount !== 0 || deletedRecordIds.length !== 0) && !this.stateManager.shouldStopSync) {
126
- try {
127
- if (observationCount !== 0) {
128
- const startedAt = Date.now();
129
- const result = await withSyncRetries(() => this.storageManager.saveObservations(groups, mode), () => this.stateManager.shouldStopSync);
130
- if (this.stateManager.shouldStopSync) {
131
- return;
132
- }
133
- const responseEntries = result.entry ?? [];
134
- const savedCount = responseEntries.length ? responseEntries.filter(entry => entry.response?.status.startsWith("2")).length : observationCount;
135
- const createdCount = responseEntries.filter(entry => entry.response?.status.startsWith("201")).length;
136
- recordOvokMetric("ovok.health.samples.imported", createdCount, {
137
- provider: this.adapter.provider,
138
- measurementTypeKey
139
- });
140
- recordOvokDuration("ovok.measurement.save.duration", Date.now() - startedAt, {
141
- provider: this.adapter.provider
142
- });
143
- this.stateManager.addResult(result);
144
- this.progressManager.incrementSyncedObservations(measurementTypeKey, savedCount, createdCount);
145
- if (sentReadings) {
146
- sentReadings = withSentReadings(sentReadings, groups, syncWindowStart(latestValidStartDate));
147
- await this.storageManager.saveSentReadings(measurementTypeKey, sentReadings);
148
- }
149
- }
150
- if (deletedRecordIds.length !== 0) {
151
- await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
152
- }
153
- await this.storageManager.saveAnchors(anchors);
154
- } catch (error) {
155
- if (isSyncRetryCancelled(error) || this.stateManager.shouldStopSync) {
156
- return;
157
- }
158
- this.progressManager.setStatus(measurementTypeKey, "failed");
159
- this.onSyncError(toHealthSyncError(error));
160
- return;
138
+ try {
139
+ const refusal = await this.saveReadings(measurementTypeKey, groups, mode);
140
+ if (sentReadings && !refusal) {
141
+ sentReadings = withSentReadings(sentReadings, groups, syncWindowStart(latestValidStartDate));
142
+ await this.storageManager.saveSentReadings(measurementTypeKey, sentReadings);
143
+ }
144
+ if (deletedRecordIds.length !== 0) {
145
+ await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
146
+ }
147
+
148
+ // Held records are kept before the anchor moves past them, or a stop in between would lose them.
149
+ if (carriedRecords) {
150
+ await this.storageManager.saveCarriedRecords(measurementTypeKey, carriedRecords);
161
151
  }
162
- } else {
163
152
  await this.storageManager.saveAnchors(anchors);
153
+ if (refusal) {
154
+ this.failType(measurementTypeKey, refusal);
155
+ return;
156
+ }
157
+ } catch (error) {
158
+ if (isSyncRetryCancelled(error) || this.stateManager.shouldStopSync) {
159
+ return;
160
+ }
161
+ this.failType(measurementTypeKey, error);
162
+ return;
164
163
  }
165
164
  }
166
165
  this.progressManager.setStatus(measurementTypeKey, this.stateManager.shouldStopSync ? "idle" : "completed");
167
166
  }
167
+
168
+ /**
169
+ * Saves a page's readings. A reading the server refuses as invalid stays in the outbox as rejected, so it is
170
+ * returned rather than thrown and the import moves past it instead of reading the same page forever.
171
+ */
172
+ async saveReadings(measurementTypeKey, groups, mode) {
173
+ const observationCount = groups.flat().length;
174
+ if (observationCount === 0) {
175
+ return undefined;
176
+ }
177
+ const startedAt = Date.now();
178
+ try {
179
+ const result = await withSyncRetries(() => this.storageManager.saveObservations(groups, mode), () => this.stateManager.shouldStopSync);
180
+ this.recordSaved(measurementTypeKey, result, observationCount, startedAt);
181
+ return undefined;
182
+ } catch (error) {
183
+ if (error instanceof OvokValidationError) {
184
+ return error;
185
+ }
186
+ throw error;
187
+ }
188
+ }
189
+ recordSaved(measurementTypeKey, result, observationCount, startedAt) {
190
+ const responseEntries = result.entry ?? [];
191
+ const savedCount = responseEntries.length ? responseEntries.filter(entry => entry.response?.status.startsWith("2")).length : observationCount;
192
+ const createdCount = responseEntries.filter(entry => entry.response?.status.startsWith("201")).length;
193
+ recordOvokMetric("ovok.health.samples.imported", createdCount, {
194
+ provider: this.adapter.provider,
195
+ measurementTypeKey
196
+ });
197
+ recordOvokDuration("ovok.measurement.save.duration", Date.now() - startedAt, {
198
+ provider: this.adapter.provider
199
+ });
200
+ this.stateManager.addResult(result);
201
+ this.progressManager.incrementSyncedObservations(measurementTypeKey, savedCount, createdCount);
202
+ }
203
+ failType(measurementTypeKey, error) {
204
+ this.progressManager.setStatus(measurementTypeKey, "failed");
205
+ this.onSyncError(toHealthSyncError(error));
206
+ }
168
207
  getDataForMeasurementType(measurementTypeKey) {
169
208
  return this.dataToSync[measurementTypeKey];
170
209
  }
@@ -1 +1 @@
1
- {"version":3,"names":["recordOvokDuration","recordOvokMetric","withOvokSpan","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","toHealthSyncError","getHealthDataMode","replacesSavedObservation","isSyncRetryCancelled","withSyncRetries","unsentReadings","withSentReadings","syncWindowStart","DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","adapter","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","client","provider","ownerKey","dataProcessor","chunkSize","getTotalCount","getData","convert","startSync","once","runSync","Error","requireOwner","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","sentReadings","getSentReadings","undefined","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","readGroups","identifyObservations","groups","observationCount","flat","length","unchangedCount","incrementSyncedObservations","startedAt","Date","now","result","saveObservations","responseEntries","entry","savedCount","filter","response","status","startsWith","createdCount","addResult","saveSentReadings","deleteObservations","saveAnchors"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["OvokValidationError","recordOvokDuration","recordOvokMetric","withOvokSpan","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","toHealthSyncError","getHealthDataMode","replacesSavedObservation","isSyncRetryCancelled","withSyncRetries","unsentReadings","withSentReadings","syncWindowStart","DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","adapter","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","client","provider","ownerKey","dataProcessor","chunkSize","getTotalCount","getData","convert","startSync","once","tracedSync","requestSync","again","runSync","Error","requireOwner","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","failType","sentReadings","getSentReadings","undefined","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","carriedRecords","getObservationBodiesForType","readGroups","identifyObservations","groups","unchangedCount","flat","length","incrementSyncedObservations","refusal","saveReadings","saveSentReadings","deleteObservations","saveCarriedRecords","saveAnchors","observationCount","startedAt","Date","now","result","saveObservations","recordSaved","responseEntries","entry","savedCount","filter","response","status","startsWith","createdCount","addResult"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}
@@ -2,19 +2,24 @@
2
2
 
3
3
  /* eslint-disable max-lines */
4
4
 
5
- import { MeasurementTypeKey } from "@ovok/core/next";
6
- import { getHealthDataMode, HealthDataType } from "../../types/health-sync-keys.js";
5
+ import { getHealthDataMode } from "../../types/health-sync-keys.js";
7
6
  import { getDefaultHealthCoding } from "../../utils/default-health-coding.js";
8
- import { getHealthRecordSourceId, getHealthRecordSyncId } from "../../utils/get-health-record-sync-id.js";
7
+ import { getHealthRecordSourceId, getHealthRecordSyncId, getHealthRecordType } from "../../utils/get-health-record-sync-id.js";
9
8
  import { getLatestObservationDatesByCode } from "../../utils/get-latest-observation-dates-by-code.js";
10
9
  import { getLatestValidStartDate } from "../../utils/get-latest-valid-start-date.js";
11
- import { groupSamplesByInterval } from "../../utils/group-samples-by-interval.js";
12
- import { groupSleepSamples } from "../../utils/group-sleep-samples.js";
13
10
  import { identifyImportedObservations } from "../../utils/identify-imported-observations.js";
11
+ import { readingGroupsFor } from "../../utils/reading-groups.js";
14
12
  import { replacesSavedObservation } from "../../utils/replaces-saved-observation.js";
15
13
  import { anchoredReadStart } from "../../utils/sync-window-start.js";
16
14
  /** Where a read starts: from the newest import, or for a type read by anchor, from its history window. */
17
15
  const readStart = (data, mode, anchor, latestValidStartDate) => anchor && !replacesSavedObservation(mode) ? anchoredReadStart(data.minDate, latestValidStartDate) : latestValidStartDate;
16
+
17
+ /** A record read twice, once held back and once again after a stop, counts once. */
18
+ const uniqueRecords = records => [...new Map(records.map(record => [getHealthRecordSourceId(record) ?? record, record])).values()];
19
+ const withoutDeletedRecords = (records, deletedRecordIds) => {
20
+ const deleted = new Set(deletedRecordIds);
21
+ return records.filter(record => !deleted.has(getHealthRecordSourceId(record) ?? ""));
22
+ };
18
23
  export class DataProcessor {
19
24
  constructor(client, patientId, provider, chunkSize, storageManager, getTotalCountsFunction, getDataFromProviderFunction, getConverterFunction) {
20
25
  this.client = client;
@@ -85,6 +90,8 @@ export class DataProcessor {
85
90
  typeIdentifier,
86
91
  display
87
92
  }) => display ? [[typeIdentifier, display]] : []));
93
+ const readingGroups = readingGroupsFor(this.provider, measurementTypeKey);
94
+ const carriedRecords = readingGroups ? await this.storageManager.getCarriedRecords(measurementTypeKey) : [];
88
95
  const results = await Promise.all(data.typeIdentifiers?.map(async ({
89
96
  typeIdentifier
90
97
  }) => {
@@ -104,13 +111,27 @@ export class DataProcessor {
104
111
  const newAnchors = results.map(({
105
112
  result
106
113
  }) => result.anchor).flat().filter(Boolean);
107
- const allData = results.flatMap(({
108
- result
109
- }) => result.data);
110
114
  const deletedRecordIds = results.flatMap(({
111
115
  result
112
116
  }) => result.deletedRecordIds ?? []);
113
- const dataGroups = this.provider === "apple-health" && measurementTypeKey === HealthDataType.sleep ? groupSleepSamples(allData) : this.provider === "apple-health" && measurementTypeKey === MeasurementTypeKey.bloodPressure ? groupSamplesByInterval(allData) : allData.map(data => [data]);
117
+ const hasMore = results.some(({
118
+ result
119
+ }) => result.hasMore ?? ((result.data.length >= this.chunkSize || (result.deletedRecordIds?.length ?? 0) >= this.chunkSize) && Boolean(result.anchor)));
120
+
121
+ // Records held back from the page before go first among their type's, so a reading keeps its first record.
122
+ const records = withoutDeletedRecords(uniqueRecords(results.flatMap(({
123
+ typeIdentifier,
124
+ result
125
+ }) => [...carriedRecords.filter(record => getHealthRecordType(record) === String(typeIdentifier)), ...result.data])), deletedRecordIds);
126
+ const readings = readingGroups?.group(records) ?? records.map(record => [record]);
127
+ const pageEnd = {
128
+ typeCount: data.typeIdentifiers.length,
129
+ lastRead: new Set(results.map(({
130
+ result
131
+ }) => result.data.at(-1)))
132
+ };
133
+ const heldReadings = hasMore ? readings.filter(reading => readingGroups?.mayContinue(reading, pageEnd)) : [];
134
+ const dataGroups = readings.filter(reading => !heldReadings.includes(reading));
114
135
  const observationBodies = await Promise.all(dataGroups.map(group => this.getConverterFunction({
115
136
  data: group,
116
137
  client: this.client,
@@ -131,10 +152,9 @@ export class DataProcessor {
131
152
  observationSyncIds,
132
153
  observationRecordIds,
133
154
  deletedRecordIds,
134
- hasMore: results.some(({
135
- result
136
- }) => result.hasMore ?? ((result.data.length >= this.chunkSize || (result.deletedRecordIds?.length ?? 0) >= this.chunkSize) && Boolean(result.anchor))),
137
- anchors: newAnchors
155
+ hasMore,
156
+ anchors: newAnchors,
157
+ carriedRecords: readingGroups ? heldReadings.flat() : undefined
138
158
  };
139
159
  }
140
160
  identifyObservations(observationBodies, observationSyncIds, observationRecordIds, mode) {
@@ -1 +1 @@
1
- {"version":3,"names":["MeasurementTypeKey","getHealthDataMode","HealthDataType","getDefaultHealthCoding","getHealthRecordSourceId","getHealthRecordSyncId","getLatestObservationDatesByCode","getLatestValidStartDate","groupSamplesByInterval","groupSleepSamples","identifyImportedObservations","replacesSavedObservation","anchoredReadStart","readStart","data","mode","anchor","latestValidStartDate","minDate","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","entries","Object","flatMap","key","typeIdentifiers","map","typeIdentifier","code","String","getLatestObservationDates","codes","getTotalRecordsCountForType","measurementTypeKey","totalCounts","Promise","all","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","configuredCodings","system","display","defaultCoding","undefined","typeIdentifierCodes","fromEntries","typeIdentifierCodeSystems","typeIdentifierCodeDisplays","results","result","newAnchors","flat","filter","Boolean","allData","deletedRecordIds","dataGroups","sleep","bloodPressure","observationBodies","group","length","observationSyncIds","observationRecordIds","hasMore","some","anchors","identifyObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","latestObservationDates","resolvedMode","resolvedData"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":";;AAAA;;AAGA,SAASA,kBAAkB,QAAQ,iBAAiB;AAWpD,SACEC,iBAAiB,EAEjBC,cAAc,QAET,iCAA8B;AACrC,SAASC,sBAAsB,QAAQ,sCAAmC;AAC1E,SACEC,uBAAuB,EACvBC,qBAAqB,QAChB,0CAAuC;AAC9C,SAASC,+BAA+B,QAAQ,qDAAkD;AAClG,SAASC,uBAAuB,QAAQ,4CAAyC;AACjF,SAASC,sBAAsB,QAAQ,0CAAuC;AAC9E,SAASC,iBAAiB,QAAQ,oCAAiC;AACnE,SAASC,4BAA4B,QAAQ,+CAA4C;AACzF,SAASC,wBAAwB,QAAQ,2CAAwC;AACjF,SAASC,iBAAiB,QAAQ,kCAA+B;AAIjE;AACA,MAAMC,SAAS,GAAGA,CAChBC,IAAwB,EACxBC,IAAoB,EACpBC,MAA0B,EAC1BC,oBAAsC,KAEtCD,MAAM,IAAI,CAACL,wBAAwB,CAACI,IAAI,CAAC,GACrCH,iBAAiB,CAACE,IAAI,CAACI,OAAO,EAAED,oBAAoB,CAAC,GACrDA,oBAAoB;AAE1B,OAAO,MAAME,aAAa,CAKxB;EACAC,WAAWA,CACDC,MAAY,EACZC,SAAiB,EACjBC,QAAwB,EACxBC,SAAiB,EACjBC,cAA8B,EAC9BC,sBAEY,EACZC,2BAEgE,EAChEC,oBAEmB,EAC3B;IAAA,KAdQP,MAAY,GAAZA,MAAY;IAAA,KACZC,SAAiB,GAAjBA,SAAiB;IAAA,KACjBC,QAAwB,GAAxBA,QAAwB;IAAA,KACxBC,SAAiB,GAAjBA,SAAiB;IAAA,KACjBC,cAA8B,GAA9BA,cAA8B;IAAA,KAC9BC,sBAEY,GAFZA,sBAEY;IAAA,KACZC,2BAEgE,GAFhEA,2BAEgE;IAAA,KAChEC,oBAEmB,GAFnBA,oBAEmB;EAC1B;EAEHC,YAAYA,CAACC,UAAuB,EAAY;IAC9C,MAAMC,OAAO,GAAGC,MAAM,CAACD,OAAO,CAACD,UAAU,CAExC;IAED,OAAOC,OAAO,CAACE,OAAO,CAAC,CAAC,CAACC,GAAG,EAAEpB,IAAI,CAAC,KACjCA,IAAI,EAAEqB,eAAe,CAACC,GAAG,CAAC,CAAC;MAAEC,cAAc;MAAEC;IAAK,CAAC,KACjDC,MAAM,CACJD,IAAI,IACFnC,sBAAsB,CACpB,IAAI,CAACoB,QAAQ,EACbW,GAAG,EACHK,MAAM,CAACF,cAAc,CAAC,EACtBpC,iBAAiB,CAACiC,GAAG,EAAEpB,IAAI,CAACC,IAAI,CAClC,CAAC,CAACuB,IACN,CACF,CAAC,IAAI,EACP,CAAC;EACH;EAEA,MAAME,yBAAyBA,CAACV,UAAuB,EAKrD;IACA,MAAMW,KAAK,GAAG,IAAI,CAACZ,YAAY,CAACC,UAAU,CAAC;IAE3C,OAAOxB,+BAA+B,CAAC;MACrCe,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBoB,KAAK;MACLnB,SAAS,EAAE,IAAI,CAACA,SAAS;MACzBC,QAAQ,EAAE,IAAI,CAACA;IACjB,CAAC,CAAC;EACJ;EAEA,MAAMmB,2BAA2BA,CAC/BC,kBAAiC,EACjC7B,IAA6C,EAC7CG,oBAAsC,EACrB;IACjB,MAAMF,IAAI,GAAGd,iBAAiB,CAAC0C,kBAAkB,EAAE7B,IAAI,CAACC,IAAI,CAAC;IAE7D,MAAM6B,WAAW,GAAG,MAAMC,OAAO,CAACC,GAAG,CACnChC,IAAI,CAACqB,eAAe,EAAEC,GAAG,CAAC,OAAO;MAAEC;IAAe,CAAC,KAAK;MACtD,MAAMrB,MAAM,GAAG,MAAM,IAAI,CAACS,cAAc,CAACsB,SAAS,CAACV,cAAc,CAAC;MAElE,OAAO,IAAI,CAACX,sBAAsB,CAAC;QACjCW,cAAc,EAAEA,cAAiC;QACjDW,SAAS,EAAE/B,oBAAoB,EAAEgC,WAAW,CAAC,CAAC;QAC9CjC,MAAM;QACND;MACF,CAAC,CAAC;IACJ,CAAC,CACH,CAAC;IAED,OAAO6B,WAAW,CAACM,MAAM,CAAC,CAACC,GAAG,EAAEC,KAAK,KAAKD,GAAG,GAAGC,KAAK,EAAE,CAAC,CAAC;EAC3D;EAEA,MAAMC,2BAA2BA,CAC/BV,kBAAiC,EACjC7B,IAA6C,EAC7CG,oBAAsC,EAQrC;IACD,MAAMF,IAAI,GAAGd,iBAAiB,CAAC0C,kBAAkB,EAAE7B,IAAI,CAACC,IAAI,CAAC;IAE7D,MAAMuC,iBAAiB,GAAGxC,IAAI,CAACqB,eAAe,CAACC,GAAG,CAChD,CAAC;MAAEC,cAAc;MAAEC,IAAI;MAAEiB,MAAM;MAAEC;IAAQ,CAAC,KAAK;MAC7C,MAAMC,aAAa,GAAGtD,sBAAsB,CAC1C,IAAI,CAACoB,QAAQ,EACboB,kBAAkB,EAClBJ,MAAM,CAACF,cAAc,CAAC,EACtBtB,IACF,CAAC;MAED,OAAO;QACLsB,cAAc,EAAEE,MAAM,CAACF,cAAc,CAAC;QACtCC,IAAI,EAAEC,MAAM,CAACD,IAAI,IAAImB,aAAa,CAACnB,IAAI,CAAC;QACxCiB,MAAM,EAAEA,MAAM,KAAKjB,IAAI,GAAGoB,SAAS,GAAGD,aAAa,CAACF,MAAM,CAAC;QAC3DC,OAAO,EAAEA,OAAO,KAAKlB,IAAI,GAAGoB,SAAS,GAAGD,aAAa,CAACD,OAAO;MAC/D,CAAC;IACH,CACF,CAAC;IAED,MAAMG,mBAAmB,GAAG3B,MAAM,CAAC4B,WAAW,CAC5CN,iBAAiB,CAAClB,GAAG,CAAC,CAAC;MAAEC,cAAc;MAAEC;IAAK,CAAC,KAAK,CAClDD,cAAc,EACdC,IAAI,CACL,CACH,CAAC;IAED,MAAMuB,yBAAyB,GAAG7B,MAAM,CAAC4B,WAAW,CAClDN,iBAAiB,CAACrB,OAAO,CAAC,CAAC;MAAEI,cAAc;MAAEkB;IAAO,CAAC,KACnDA,MAAM,GAAG,CAAC,CAAClB,cAAc,EAAEkB,MAAM,CAAC,CAAC,GAAG,EACxC,CACF,CAAC;IAED,MAAMO,0BAA0B,GAAG9B,MAAM,CAAC4B,WAAW,CACnDN,iBAAiB,CAACrB,OAAO,CAAC,CAAC;MAAEI,cAAc;MAAEmB;IAAQ,CAAC,KACpDA,OAAO,GAAG,CAAC,CAACnB,cAAc,EAAEmB,OAAO,CAAC,CAAC,GAAG,EAC1C,CACF,CAAC;IAED,MAAMO,OAAO,GAAG,MAAMlB,OAAO,CAACC,GAAG,CAC/BhC,IAAI,CAACqB,eAAe,EAAEC,GAAG,CAAC,OAAO;MAAEC;IAAe,CAAC,KAAK;MACtD,MAAMrB,MAAM,GAAG,MAAM,IAAI,CAACS,cAAc,CAACsB,SAAS,CAACV,cAAc,CAAC;MAElE,OAAO;QACLA,cAAc;QACd2B,MAAM,EAAE,MAAM,IAAI,CAACrC,2BAA2B,CAAC;UAC7CU,cAAc,EAAEA,cAAiC;UACjDH,GAAG,EAAES,kBAAkB;UACvBK,SAAS,EAAEnC,SAAS,CAACC,IAAI,EAAEC,IAAI,EAAEC,MAAM,EAAEC,oBAAoB,CAAC,EAAEgC,WAAW,CAAC,CAAC;UAC7EjC,MAAM;UACNQ,SAAS,EAAE,IAAI,CAACA,SAAS;UACzBT;QACF,CAAC;MACH,CAAC;IACH,CAAC,CACH,CAAC;IAED,MAAMkD,UAAU,GAAGF,OAAO,CACvB3B,GAAG,CAAC,CAAC;MAAE4B;IAAO,CAAC,KAAKA,MAAM,CAAChD,MAAM,CAAC,CAClCkD,IAAI,CAAC,CAAC,CACNC,MAAM,CAACC,OAAO,CAAsD;IAEvE,MAAMC,OAAO,GAAGN,OAAO,CAAC9B,OAAO,CAAC,CAAC;MAAE+B;IAAO,CAAC,KAAKA,MAAM,CAAClD,IAAI,CAAC;IAE5D,MAAMwD,gBAAgB,GAAGP,OAAO,CAAC9B,OAAO,CACtC,CAAC;MAAE+B;IAAO,CAAC,KAAKA,MAAM,CAACM,gBAAgB,IAAI,EAC7C,CAAC;IAED,MAAMC,UAAiC,GACrC,IAAI,CAAChD,QAAQ,KAAK,cAAc,IAChCoB,kBAAkB,KAAKzC,cAAc,CAACsE,KAAK,GACvC/D,iBAAiB,CAAC4D,OAAO,CAAC,GAC1B,IAAI,CAAC9C,QAAQ,KAAK,cAAc,IAC9BoB,kBAAkB,KAAK3C,kBAAkB,CAACyE,aAAa,GACvDjE,sBAAsB,CAAC6D,OAAO,CAAC,GAC/BA,OAAO,CAACjC,GAAG,CAAEtB,IAAI,IAAK,CAACA,IAAI,CAAC,CAAC;IAErC,MAAM4D,iBAAiB,GAAG,MAAM7B,OAAO,CAACC,GAAG,CACzCyB,UAAU,CAACnC,GAAG,CAAEuC,KAAK,IACnB,IAAI,CAAC/C,oBAAoB,CAAC;MACxBd,IAAI,EAAE6D,KAAK;MACXtD,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBC,SAAS,EAAE,IAAI,CAACA,SAAS;MACzBqB,kBAAkB;MAClBN,cAAc,EACZvB,IAAI,CAACqB,eAAe,EAAEyC,MAAM,KAAK,CAAC,GAC9BrC,MAAM,CAACzB,IAAI,CAACqB,eAAe,CAAC,CAAC,CAAC,EAAEE,cAAc,CAAC,GAC/CqB,SAAS;MACf3C,IAAI;MACJ4C,mBAAmB;MACnBE,yBAAyB;MACzBC;IACF,CAAC,CACH,CACF,CAAC;IAED,MAAMe,kBAAkB,GAAGN,UAAU,CAACnC,GAAG,CAAEuC,KAAK,IAC9CtE,qBAAqB,CAACsE,KAAK,CAAC,CAAC,CAAC,EAAEhC,kBAAkB,CACpD,CAAC;;IAED;IACA,MAAMmC,oBAAoB,GAAGP,UAAU,CAACnC,GAAG,CAAEuC,KAAK,IAChDvE,uBAAuB,CAACuE,KAAK,CAAC,CAAC,CAAC,CAClC,CAAC;IAED,OAAO;MACLD,iBAAiB;MACjBG,kBAAkB;MAClBC,oBAAoB;MACpBR,gBAAgB;MAChBS,OAAO,EAAEhB,OAAO,CAACiB,IAAI,CACnB,CAAC;QAAEhB;MAAO,CAAC,KACTA,MAAM,CAACe,OAAO,KACb,CAACf,MAAM,CAAClD,IAAI,CAAC8D,MAAM,IAAI,IAAI,CAACpD,SAAS,IACpC,CAACwC,MAAM,CAACM,gBAAgB,EAAEM,MAAM,IAAI,CAAC,KAAK,IAAI,CAACpD,SAAS,KACxD4C,OAAO,CAACJ,MAAM,CAAChD,MAAM,CAAC,CAC5B,CAAC;MACDiE,OAAO,EAAEhB;IACX,CAAC;EACH;EAEAiB,oBAAoBA,CAClBR,iBAAkC,EAClCG,kBAA8C,EAC9CC,oBAAgD,EAChD/D,IAAiE,EACjE;IACA,OAAOL,4BAA4B,CAAC;MAClCyE,wBAAwB,EAAET,iBAAiB;MAC3CnD,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvB6D,yBAAyB,EAAEP,kBAAkB;MAC7CQ,gBAAgB,EAAEP,oBAAoB;MACtC/D;IACF,CAAC,CAAC;EACJ;EAEAR,uBAAuBA,CACrB+E,sBAGE,EACFxE,IAA6C,EAC7C6B,kBAAiC,EACjC5B,IAA4D,EAC1C;IAClB,MAAMwE,YAAY,GAAGtF,iBAAiB,CAAC0C,kBAAkB,EAAE5B,IAAI,IAAID,IAAI,CAACC,IAAI,CAAC;IAE7E,MAAMyE,YAAY,GAAG;MACnB,GAAG1E,IAAI;MACPqB,eAAe,EAAErB,IAAI,CAACqB,eAAe,CAACC,GAAG,CAAC,CAAC;QAAEC,cAAc;QAAEC;MAAK,CAAC,MAAM;QACvED,cAAc;QACdC,IAAI,EACFA,IAAI,IACJnC,sBAAsB,CACpB,IAAI,CAACoB,QAAQ,EACboB,kBAAkB,EAClBJ,MAAM,CAACF,cAAc,CAAC,EACtBkD,YACF,CAAC,CAACjD;MACJ,CAAC,CACH;IACF,CAAC;IAED,OAAO/B,uBAAuB,CAAC;MAC7B+E,sBAAsB;MACtBxE,IAAI,EAAE0E,YAAqE;MAC3EzE,IAAI,EAAEwE;IACR,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
1
+ {"version":3,"names":["getHealthDataMode","getDefaultHealthCoding","getHealthRecordSourceId","getHealthRecordSyncId","getHealthRecordType","getLatestObservationDatesByCode","getLatestValidStartDate","identifyImportedObservations","readingGroupsFor","replacesSavedObservation","anchoredReadStart","readStart","data","mode","anchor","latestValidStartDate","minDate","uniqueRecords","records","Map","map","record","values","withoutDeletedRecords","deletedRecordIds","deleted","Set","filter","has","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","entries","Object","flatMap","key","typeIdentifiers","typeIdentifier","code","String","getLatestObservationDates","codes","getTotalRecordsCountForType","measurementTypeKey","totalCounts","Promise","all","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","configuredCodings","system","display","defaultCoding","undefined","typeIdentifierCodes","fromEntries","typeIdentifierCodeSystems","typeIdentifierCodeDisplays","readingGroups","carriedRecords","getCarriedRecords","results","result","newAnchors","flat","Boolean","hasMore","some","length","readings","group","pageEnd","typeCount","lastRead","at","heldReadings","reading","mayContinue","dataGroups","includes","observationBodies","observationSyncIds","observationRecordIds","anchors","identifyObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","latestObservationDates","resolvedMode","resolvedData"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":"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","ignoreList":[]}
@@ -72,6 +72,20 @@ export class StorageManager {
72
72
  const stored = await this.client.storage.getItem(this.sentReadingsKey(measurementTypeKey));
73
73
  return stored ? JSON.parse(stored) : {};
74
74
  }
75
+
76
+ /** Keeps the records of readings a page ended in the middle of, for the next page to finish. */
77
+ async saveCarriedRecords(measurementTypeKey, records) {
78
+ await this.requireOwner(this.patientId);
79
+ await this.client.storage.setItem(this.carriedRecordsKey(measurementTypeKey), JSON.stringify(records));
80
+ }
81
+ async getCarriedRecords(measurementTypeKey) {
82
+ await this.requireOwner(this.patientId);
83
+ const stored = await this.client.storage.getItem(this.carriedRecordsKey(measurementTypeKey));
84
+ return stored ? JSON.parse(stored) : [];
85
+ }
86
+ carriedRecordsKey(measurementTypeKey) {
87
+ return this.storageKey("carried-records", measurementTypeKey);
88
+ }
75
89
  sentReadingsKey(measurementTypeKey) {
76
90
  return this.storageKey("sent-readings", measurementTypeKey);
77
91
  }
@@ -1 +1 @@
1
- {"version":3,"names":["CryptoJS","OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","healthSyncOwner","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","recordId","Set","system","value","observations","observation","fhir","search","subject","identifier","push","id","delete","saveAnchor","typeIdentifier","anchor","storage","setItem","storageKey","getAnchor","getItem","undefined","saveSentReadings","measurementTypeKey","sent","sentReadingsKey","JSON","stringify","getSentReadings","stored","parse","parts","identity","SHA256","toString","saveAnchors","anchors"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["CryptoJS","OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","healthSyncOwner","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","recordId","Set","system","value","observations","observation","fhir","search","subject","identifier","push","id","delete","saveAnchor","typeIdentifier","anchor","storage","setItem","storageKey","getAnchor","getItem","undefined","saveSentReadings","measurementTypeKey","sent","sentReadingsKey","JSON","stringify","getSentReadings","stored","parse","saveCarriedRecords","records","carriedRecordsKey","getCarriedRecords","parts","identity","SHA256","toString","saveAnchors","anchors"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}
@@ -40,6 +40,14 @@ export class SyncStateManager {
40
40
  });
41
41
  return this.inFlight;
42
42
  }
43
+
44
+ /** Runs `sync`, or once more after the run under way, which may already have read past what changed. */
45
+ async again(sync) {
46
+ if (this.inFlight) {
47
+ this.rerunRequested = true;
48
+ }
49
+ return this.once(sync);
50
+ }
43
51
  reset() {
44
52
  this.shouldStopSync = false;
45
53
  this.pauseReason = undefined;
@@ -1 +1 @@
1
- {"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAAa,EAAE;EAE7BC,SAASA,CAACC,MAAc,EAAQ;IAC9B,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;EAEAG,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACZ,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAe,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAACf,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACa,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAAChB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;EAC9B;AACF","ignoreList":[]}
1
+ {"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","again","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAAa,EAAE;EAE7BC,SAASA,CAACC,MAAc,EAAQ;IAC9B,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;;EAEA;EACA,MAAMG,KAAKA,CAACJ,IAAyB,EAAiB;IACpD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,CAACV,cAAc,GAAG,IAAI;IAC5B;IAEA,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;EACxB;EAEAK,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACb,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACc,WAAW,GAAGH,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAgB,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAAChB,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACc,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAACjB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACc,WAAW,GAAGH,SAAS;EAC9B;AACF","ignoreList":[]}