@ovok/native 1.17.0-dev.2235 → 1.17.0-dev.2237
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.
- package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js +18 -3
- package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js.map +1 -1
- package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js +16 -4
- package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/sent-readings.js +38 -0
- package/lib/commonjs/modules/data-sync/utils/sent-readings.js.map +1 -0
- package/lib/module/modules/data-sync/services/base-health-sync-service.js +18 -3
- package/lib/module/modules/data-sync/services/base-health-sync-service.js.map +1 -1
- package/lib/module/modules/data-sync/services/managers/storage-manager.js +16 -4
- package/lib/module/modules/data-sync/services/managers/storage-manager.js.map +1 -1
- package/lib/module/modules/data-sync/utils/sent-readings.js +33 -0
- package/lib/module/modules/data-sync/utils/sent-readings.js.map +1 -0
- package/lib/typescript/commonjs/src/modules/data-sync/services/base-health-sync-service.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts +5 -1
- package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/sent-readings.d.ts +11 -0
- package/lib/typescript/commonjs/src/modules/data-sync/utils/sent-readings.d.ts.map +1 -0
- package/lib/typescript/module/src/modules/data-sync/services/base-health-sync-service.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/services/managers/storage-manager.d.ts +5 -1
- package/lib/typescript/module/src/modules/data-sync/services/managers/storage-manager.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/sent-readings.d.ts +11 -0
- package/lib/typescript/module/src/modules/data-sync/utils/sent-readings.d.ts.map +1 -0
- package/package.json +1 -1
|
@@ -8,7 +8,10 @@ var _telemetry = require("../../helpers/utils/telemetry.js");
|
|
|
8
8
|
var _constants = require("../constants.js");
|
|
9
9
|
var _healthSyncBatchError = require("../types/health-sync-batch-error.js");
|
|
10
10
|
var _healthSyncKeys = require("../types/health-sync-keys.js");
|
|
11
|
+
var _replacesSavedObservation = require("../utils/replaces-saved-observation.js");
|
|
11
12
|
var _retrySave = require("../utils/retry-save.js");
|
|
13
|
+
var _sentReadings = require("../utils/sent-readings.js");
|
|
14
|
+
var _syncWindowStart = require("../utils/sync-window-start.js");
|
|
12
15
|
var _dataProcessor = require("./managers/data-processor.js");
|
|
13
16
|
var _storageManager = require("./managers/storage-manager.js");
|
|
14
17
|
var _syncProgressManager = require("./managers/sync-progress-manager.js");
|
|
@@ -96,7 +99,11 @@ class BaseHealthSyncService {
|
|
|
96
99
|
}
|
|
97
100
|
}
|
|
98
101
|
async syncDataByType(measurementTypeKey, data) {
|
|
99
|
-
const
|
|
102
|
+
const mode = (0, _healthSyncKeys.getHealthDataMode)(measurementTypeKey, data.mode);
|
|
103
|
+
const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, measurementTypeKey, mode);
|
|
104
|
+
|
|
105
|
+
// A type read again on every sync sends only the readings that changed since it last sent them.
|
|
106
|
+
let sentReadings = (0, _replacesSavedObservation.replacesSavedObservation)(mode) ? await this.storageManager.getSentReadings(measurementTypeKey) : undefined;
|
|
100
107
|
let hasMore = true;
|
|
101
108
|
while (hasMore && !this.stateManager.shouldStopSync) {
|
|
102
109
|
const {
|
|
@@ -111,9 +118,13 @@ class BaseHealthSyncService {
|
|
|
111
118
|
if (this.stateManager.shouldStopSync) {
|
|
112
119
|
break;
|
|
113
120
|
}
|
|
114
|
-
const
|
|
115
|
-
const groups =
|
|
121
|
+
const readGroups = this.dataProcessor.identifyObservations(observationBodies, observationSyncIds, observationRecordIds, mode);
|
|
122
|
+
const groups = sentReadings ? (0, _sentReadings.unsentReadings)(readGroups, sentReadings) : readGroups;
|
|
116
123
|
const observationCount = groups.flat().length;
|
|
124
|
+
const unchangedCount = readGroups.flat().length - observationCount;
|
|
125
|
+
if (unchangedCount !== 0) {
|
|
126
|
+
this.progressManager.incrementSyncedObservations(measurementTypeKey, unchangedCount);
|
|
127
|
+
}
|
|
117
128
|
if ((observationCount !== 0 || deletedRecordIds.length !== 0) && !this.stateManager.shouldStopSync) {
|
|
118
129
|
try {
|
|
119
130
|
if (observationCount !== 0) {
|
|
@@ -134,6 +145,10 @@ class BaseHealthSyncService {
|
|
|
134
145
|
});
|
|
135
146
|
this.stateManager.addResult(result);
|
|
136
147
|
this.progressManager.incrementSyncedObservations(measurementTypeKey, savedCount, createdCount);
|
|
148
|
+
if (sentReadings) {
|
|
149
|
+
sentReadings = (0, _sentReadings.withSentReadings)(sentReadings, groups, (0, _syncWindowStart.syncWindowStart)(latestValidStartDate));
|
|
150
|
+
await this.storageManager.saveSentReadings(measurementTypeKey, sentReadings);
|
|
151
|
+
}
|
|
137
152
|
}
|
|
138
153
|
if (deletedRecordIds.length !== 0) {
|
|
139
154
|
await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_telemetry","require","_constants","_healthSyncBatchError","_healthSyncKeys","_retrySave","_dataProcessor","_storageManager","_syncProgressManager","_syncStateManager","BaseHealthSyncService","constructor","props","adapter","patientId","dataToSync","onSyncError","progressManager","SyncProgressManager","updateProgress","stateManager","SyncStateManager","storageManager","StorageManager","client","provider","ownerKey","dataProcessor","DataProcessor","chunkSize","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","getTotalCount","getData","convert","startSync","once","withOvokSpan","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","getHealthDataMode","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","
|
|
1
|
+
{"version":3,"names":["_telemetry","require","_constants","_healthSyncBatchError","_healthSyncKeys","_replacesSavedObservation","_retrySave","_sentReadings","_syncWindowStart","_dataProcessor","_storageManager","_syncProgressManager","_syncStateManager","BaseHealthSyncService","constructor","props","adapter","patientId","dataToSync","onSyncError","progressManager","SyncProgressManager","updateProgress","stateManager","SyncStateManager","storageManager","StorageManager","client","provider","ownerKey","dataProcessor","DataProcessor","chunkSize","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","getTotalCount","getData","convert","startSync","once","withOvokSpan","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","getHealthDataMode","mode","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","sentReadings","replacesSavedObservation","getSentReadings","undefined","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","readGroups","identifyObservations","groups","unsentReadings","observationCount","flat","length","unchangedCount","incrementSyncedObservations","startedAt","Date","now","result","withSyncRetries","saveObservations","responseEntries","entry","savedCount","filter","response","status","startsWith","createdCount","recordOvokMetric","recordOvokDuration","addResult","withSentReadings","syncWindowStart","saveSentReadings","deleteObservations","saveAnchors","isSyncRetryCancelled","toHealthSyncError","exports"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -62,14 +62,26 @@ class StorageManager {
|
|
|
62
62
|
}
|
|
63
63
|
async saveAnchor(typeIdentifier, anchor) {
|
|
64
64
|
await this.requireOwner(this.patientId);
|
|
65
|
-
await this.client.storage.setItem(this.
|
|
65
|
+
await this.client.storage.setItem(this.storageKey(typeIdentifier), anchor);
|
|
66
66
|
}
|
|
67
67
|
async getAnchor(typeIdentifier) {
|
|
68
68
|
await this.requireOwner(this.patientId);
|
|
69
|
-
return (await this.client.storage.getItem(this.
|
|
69
|
+
return (await this.client.storage.getItem(this.storageKey(typeIdentifier))) ?? undefined;
|
|
70
70
|
}
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
async saveSentReadings(measurementTypeKey, sent) {
|
|
72
|
+
await this.requireOwner(this.patientId);
|
|
73
|
+
await this.client.storage.setItem(this.sentReadingsKey(measurementTypeKey), JSON.stringify(sent));
|
|
74
|
+
}
|
|
75
|
+
async getSentReadings(measurementTypeKey) {
|
|
76
|
+
await this.requireOwner(this.patientId);
|
|
77
|
+
const stored = await this.client.storage.getItem(this.sentReadingsKey(measurementTypeKey));
|
|
78
|
+
return stored ? JSON.parse(stored) : {};
|
|
79
|
+
}
|
|
80
|
+
sentReadingsKey(measurementTypeKey) {
|
|
81
|
+
return this.storageKey("sent-readings", measurementTypeKey);
|
|
82
|
+
}
|
|
83
|
+
storageKey(...parts) {
|
|
84
|
+
const identity = _cryptoJs.default.SHA256(JSON.stringify([this.ownerKey, this.provider, ...parts])).toString();
|
|
73
85
|
return `health-sync.${identity}`;
|
|
74
86
|
}
|
|
75
87
|
async saveAnchors(anchors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_cryptoJs","_interopRequireDefault","require","_fhirSystems","_getHealthRecordSyncId","_replacesSavedObservation","_sessionOwner","e","__esModule","default","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","healthSyncOwner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","OBSERVATION_SYNC_ID_SYSTEM","replace","replacesSavedObservation","deleteObservations","recordIds","recordId","Set","system","value","getHealthRecordIdentifier","observations","observation","fhir","search","subject","identifier","push","id","delete","saveAnchor","typeIdentifier","anchor","storage","setItem","
|
|
1
|
+
{"version":3,"names":["_cryptoJs","_interopRequireDefault","require","_fhirSystems","_getHealthRecordSyncId","_replacesSavedObservation","_sessionOwner","e","__esModule","default","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","healthSyncOwner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","OBSERVATION_SYNC_ID_SYSTEM","replace","replacesSavedObservation","deleteObservations","recordIds","recordId","Set","system","value","getHealthRecordIdentifier","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","CryptoJS","SHA256","toString","saveAnchors","anchors","exports"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.withSentReadings = exports.unsentReadings = void 0;
|
|
7
|
+
var _cryptoJs = _interopRequireDefault(require("crypto-js"));
|
|
8
|
+
var _fhirSystems = require("./fhir-systems.js");
|
|
9
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
10
|
+
/** A reading as it was last sent: a hash of what it says, and when it ends. */
|
|
11
|
+
|
|
12
|
+
/** The readings of a re-read data type that were sent, by sync id. */
|
|
13
|
+
|
|
14
|
+
const syncIdOf = group => group[0]?.identifier?.find(({
|
|
15
|
+
system
|
|
16
|
+
}) => system === _fhirSystems.OBSERVATION_SYNC_ID_SYSTEM)?.value;
|
|
17
|
+
const contentOf = observation => [observation.effectiveDateTime, observation.effectivePeriod, observation.effectiveInstant, observation.component, Object.entries(observation).filter(([key]) => key.startsWith("value"))];
|
|
18
|
+
const fingerprintOf = group => _cryptoJs.default.SHA256(JSON.stringify(group.map(contentOf))).toString();
|
|
19
|
+
const endOf = group => Math.max(...group.map(({
|
|
20
|
+
effectivePeriod,
|
|
21
|
+
effectiveDateTime,
|
|
22
|
+
effectiveInstant
|
|
23
|
+
}) => Date.parse(effectivePeriod?.end ?? effectiveDateTime ?? effectiveInstant ?? "")));
|
|
24
|
+
|
|
25
|
+
/** The readings never sent, or whose value, period or components changed since they were. */
|
|
26
|
+
const unsentReadings = (groups, sent) => groups.filter(group => sent[syncIdOf(group) ?? ""]?.[0] !== fingerprintOf(group));
|
|
27
|
+
|
|
28
|
+
/** `sent` with `groups` added, dropping readings that end before the window the sync reads again. */
|
|
29
|
+
exports.unsentReadings = unsentReadings;
|
|
30
|
+
const withSentReadings = (sent, groups, windowStart) => {
|
|
31
|
+
const added = groups.flatMap(group => {
|
|
32
|
+
const syncId = syncIdOf(group);
|
|
33
|
+
return syncId ? [[syncId, [fingerprintOf(group), endOf(group)]]] : [];
|
|
34
|
+
});
|
|
35
|
+
return Object.fromEntries([...Object.entries(sent), ...added].filter(([, [, endsAt]]) => endsAt >= windowStart.getTime()));
|
|
36
|
+
};
|
|
37
|
+
exports.withSentReadings = withSentReadings;
|
|
38
|
+
//# sourceMappingURL=sent-readings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_cryptoJs","_interopRequireDefault","require","_fhirSystems","e","__esModule","default","syncIdOf","group","identifier","find","system","OBSERVATION_SYNC_ID_SYSTEM","value","contentOf","observation","effectiveDateTime","effectivePeriod","effectiveInstant","component","Object","entries","filter","key","startsWith","fingerprintOf","CryptoJS","SHA256","JSON","stringify","map","toString","endOf","Math","max","Date","parse","end","unsentReadings","groups","sent","exports","withSentReadings","windowStart","added","flatMap","syncId","fromEntries","endsAt","getTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/sent-readings.ts"],"mappings":";;;;;;AACA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAA4D,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE5D;;AAGA;;AAGA,MAAMG,QAAQ,GAAIC,KAAoB,IACpCA,KAAK,CAAC,CAAC,CAAC,EAAEC,UAAU,EAAEC,IAAI,CAAC,CAAC;EAAEC;AAAO,CAAC,KAAKA,MAAM,KAAKC,uCAA0B,CAAC,EAAEC,KAAK;AAE1F,MAAMC,SAAS,GAAIC,WAAwB,IAAgB,CACzDA,WAAW,CAACC,iBAAiB,EAC7BD,WAAW,CAACE,eAAe,EAC3BF,WAAW,CAACG,gBAAgB,EAC5BH,WAAW,CAACI,SAAS,EACrBC,MAAM,CAACC,OAAO,CAACN,WAAW,CAAC,CAACO,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,KAAKA,GAAG,CAACC,UAAU,CAAC,OAAO,CAAC,CAAC,CACvE;AAED,MAAMC,aAAa,GAAIjB,KAAoB,IACzCkB,iBAAQ,CAACC,MAAM,CAACC,IAAI,CAACC,SAAS,CAACrB,KAAK,CAACsB,GAAG,CAAChB,SAAS,CAAC,CAAC,CAAC,CAACiB,QAAQ,CAAC,CAAC;AAElE,MAAMC,KAAK,GAAIxB,KAAoB,IACjCyB,IAAI,CAACC,GAAG,CACN,GAAG1B,KAAK,CAACsB,GAAG,CAAC,CAAC;EAAEb,eAAe;EAAED,iBAAiB;EAAEE;AAAiB,CAAC,KACpEiB,IAAI,CAACC,KAAK,CAACnB,eAAe,EAAEoB,GAAG,IAAIrB,iBAAiB,IAAIE,gBAAgB,IAAI,EAAE,CAChF,CACF,CAAC;;AAEH;AACA,MAAMoB,cAAc,GAAGA,CAACC,MAAuB,EAAEC,IAAkB,KACjED,MAAM,CAACjB,MAAM,CAAEd,KAAK,IAAKgC,IAAI,CAACjC,QAAQ,CAACC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAKiB,aAAa,CAACjB,KAAK,CAAC,CAAC;;AAErF;AAAAiC,OAAA,CAAAH,cAAA,GAAAA,cAAA;AACA,MAAMI,gBAAgB,GAAGA,CACvBF,IAAkB,EAClBD,MAAuB,EACvBI,WAAiB,KACA;EACjB,MAAMC,KAAK,GAAGL,MAAM,CAACM,OAAO,CAAErC,KAAK,IAAmC;IACpE,MAAMsC,MAAM,GAAGvC,QAAQ,CAACC,KAAK,CAAC;IAE9B,OAAOsC,MAAM,GAAG,CAAC,CAACA,MAAM,EAAE,CAACrB,aAAa,CAACjB,KAAK,CAAC,EAAEwB,KAAK,CAACxB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;EACvE,CAAC,CAAC;EAEF,OAAOY,MAAM,CAAC2B,WAAW,CACvB,CAAC,GAAG3B,MAAM,CAACC,OAAO,CAACmB,IAAI,CAAC,EAAE,GAAGI,KAAK,CAAC,CAACtB,MAAM,CAAC,CAAC,GAAG,GAAG0B,MAAM,CAAC,CAAC,KAAKA,MAAM,IAAIL,WAAW,CAACM,OAAO,CAAC,CAAC,CAChG,CAAC;AACH,CAAC;AAACR,OAAA,CAAAC,gBAAA,GAAAA,gBAAA","ignoreList":[]}
|
|
@@ -6,7 +6,10 @@ import { recordOvokDuration, recordOvokMetric, withOvokSpan } from "../../helper
|
|
|
6
6
|
import { DEFAULT_HEALTH_SYNC_CHUNK_SIZE } from "../constants.js";
|
|
7
7
|
import { toHealthSyncError } from "../types/health-sync-batch-error.js";
|
|
8
8
|
import { getHealthDataMode } from "../types/health-sync-keys.js";
|
|
9
|
+
import { replacesSavedObservation } from "../utils/replaces-saved-observation.js";
|
|
9
10
|
import { isSyncRetryCancelled, withSyncRetries } from "../utils/retry-save.js";
|
|
11
|
+
import { unsentReadings, withSentReadings } from "../utils/sent-readings.js";
|
|
12
|
+
import { syncWindowStart } from "../utils/sync-window-start.js";
|
|
10
13
|
import { DataProcessor } from "./managers/data-processor.js";
|
|
11
14
|
import { StorageManager } from "./managers/storage-manager.js";
|
|
12
15
|
import { SyncProgressManager } from "./managers/sync-progress-manager.js";
|
|
@@ -93,7 +96,11 @@ export class BaseHealthSyncService {
|
|
|
93
96
|
}
|
|
94
97
|
}
|
|
95
98
|
async syncDataByType(measurementTypeKey, data) {
|
|
96
|
-
const
|
|
99
|
+
const mode = getHealthDataMode(measurementTypeKey, data.mode);
|
|
100
|
+
const latestValidStartDate = this.dataProcessor.getLatestValidStartDate(this.stateManager.latestObservationDates, data, measurementTypeKey, mode);
|
|
101
|
+
|
|
102
|
+
// A type read again on every sync sends only the readings that changed since it last sent them.
|
|
103
|
+
let sentReadings = replacesSavedObservation(mode) ? await this.storageManager.getSentReadings(measurementTypeKey) : undefined;
|
|
97
104
|
let hasMore = true;
|
|
98
105
|
while (hasMore && !this.stateManager.shouldStopSync) {
|
|
99
106
|
const {
|
|
@@ -108,9 +115,13 @@ export class BaseHealthSyncService {
|
|
|
108
115
|
if (this.stateManager.shouldStopSync) {
|
|
109
116
|
break;
|
|
110
117
|
}
|
|
111
|
-
const
|
|
112
|
-
const groups =
|
|
118
|
+
const readGroups = this.dataProcessor.identifyObservations(observationBodies, observationSyncIds, observationRecordIds, mode);
|
|
119
|
+
const groups = sentReadings ? unsentReadings(readGroups, sentReadings) : readGroups;
|
|
113
120
|
const observationCount = groups.flat().length;
|
|
121
|
+
const unchangedCount = readGroups.flat().length - observationCount;
|
|
122
|
+
if (unchangedCount !== 0) {
|
|
123
|
+
this.progressManager.incrementSyncedObservations(measurementTypeKey, unchangedCount);
|
|
124
|
+
}
|
|
114
125
|
if ((observationCount !== 0 || deletedRecordIds.length !== 0) && !this.stateManager.shouldStopSync) {
|
|
115
126
|
try {
|
|
116
127
|
if (observationCount !== 0) {
|
|
@@ -131,6 +142,10 @@ export class BaseHealthSyncService {
|
|
|
131
142
|
});
|
|
132
143
|
this.stateManager.addResult(result);
|
|
133
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
|
+
}
|
|
134
149
|
}
|
|
135
150
|
if (deletedRecordIds.length !== 0) {
|
|
136
151
|
await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["recordOvokDuration","recordOvokMetric","withOvokSpan","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","toHealthSyncError","getHealthDataMode","isSyncRetryCancelled","withSyncRetries","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","hasMore","observationBodies","observationSyncIds","observationRecordIds","deletedRecordIds","currentHasMore","anchors","getObservationBodiesForType","
|
|
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":[]}
|
|
@@ -57,14 +57,26 @@ export class StorageManager {
|
|
|
57
57
|
}
|
|
58
58
|
async saveAnchor(typeIdentifier, anchor) {
|
|
59
59
|
await this.requireOwner(this.patientId);
|
|
60
|
-
await this.client.storage.setItem(this.
|
|
60
|
+
await this.client.storage.setItem(this.storageKey(typeIdentifier), anchor);
|
|
61
61
|
}
|
|
62
62
|
async getAnchor(typeIdentifier) {
|
|
63
63
|
await this.requireOwner(this.patientId);
|
|
64
|
-
return (await this.client.storage.getItem(this.
|
|
64
|
+
return (await this.client.storage.getItem(this.storageKey(typeIdentifier))) ?? undefined;
|
|
65
65
|
}
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
async saveSentReadings(measurementTypeKey, sent) {
|
|
67
|
+
await this.requireOwner(this.patientId);
|
|
68
|
+
await this.client.storage.setItem(this.sentReadingsKey(measurementTypeKey), JSON.stringify(sent));
|
|
69
|
+
}
|
|
70
|
+
async getSentReadings(measurementTypeKey) {
|
|
71
|
+
await this.requireOwner(this.patientId);
|
|
72
|
+
const stored = await this.client.storage.getItem(this.sentReadingsKey(measurementTypeKey));
|
|
73
|
+
return stored ? JSON.parse(stored) : {};
|
|
74
|
+
}
|
|
75
|
+
sentReadingsKey(measurementTypeKey) {
|
|
76
|
+
return this.storageKey("sent-readings", measurementTypeKey);
|
|
77
|
+
}
|
|
78
|
+
storageKey(...parts) {
|
|
79
|
+
const identity = CryptoJS.SHA256(JSON.stringify([this.ownerKey, this.provider, ...parts])).toString();
|
|
68
80
|
return `health-sync.${identity}`;
|
|
69
81
|
}
|
|
70
82
|
async saveAnchors(anchors) {
|
|
@@ -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","
|
|
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":[]}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import CryptoJS from "crypto-js";
|
|
4
|
+
import { OBSERVATION_SYNC_ID_SYSTEM } from "./fhir-systems.js";
|
|
5
|
+
|
|
6
|
+
/** A reading as it was last sent: a hash of what it says, and when it ends. */
|
|
7
|
+
|
|
8
|
+
/** The readings of a re-read data type that were sent, by sync id. */
|
|
9
|
+
|
|
10
|
+
const syncIdOf = group => group[0]?.identifier?.find(({
|
|
11
|
+
system
|
|
12
|
+
}) => system === OBSERVATION_SYNC_ID_SYSTEM)?.value;
|
|
13
|
+
const contentOf = observation => [observation.effectiveDateTime, observation.effectivePeriod, observation.effectiveInstant, observation.component, Object.entries(observation).filter(([key]) => key.startsWith("value"))];
|
|
14
|
+
const fingerprintOf = group => CryptoJS.SHA256(JSON.stringify(group.map(contentOf))).toString();
|
|
15
|
+
const endOf = group => Math.max(...group.map(({
|
|
16
|
+
effectivePeriod,
|
|
17
|
+
effectiveDateTime,
|
|
18
|
+
effectiveInstant
|
|
19
|
+
}) => Date.parse(effectivePeriod?.end ?? effectiveDateTime ?? effectiveInstant ?? "")));
|
|
20
|
+
|
|
21
|
+
/** The readings never sent, or whose value, period or components changed since they were. */
|
|
22
|
+
const unsentReadings = (groups, sent) => groups.filter(group => sent[syncIdOf(group) ?? ""]?.[0] !== fingerprintOf(group));
|
|
23
|
+
|
|
24
|
+
/** `sent` with `groups` added, dropping readings that end before the window the sync reads again. */
|
|
25
|
+
const withSentReadings = (sent, groups, windowStart) => {
|
|
26
|
+
const added = groups.flatMap(group => {
|
|
27
|
+
const syncId = syncIdOf(group);
|
|
28
|
+
return syncId ? [[syncId, [fingerprintOf(group), endOf(group)]]] : [];
|
|
29
|
+
});
|
|
30
|
+
return Object.fromEntries([...Object.entries(sent), ...added].filter(([, [, endsAt]]) => endsAt >= windowStart.getTime()));
|
|
31
|
+
};
|
|
32
|
+
export { unsentReadings, withSentReadings };
|
|
33
|
+
//# sourceMappingURL=sent-readings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["CryptoJS","OBSERVATION_SYNC_ID_SYSTEM","syncIdOf","group","identifier","find","system","value","contentOf","observation","effectiveDateTime","effectivePeriod","effectiveInstant","component","Object","entries","filter","key","startsWith","fingerprintOf","SHA256","JSON","stringify","map","toString","endOf","Math","max","Date","parse","end","unsentReadings","groups","sent","withSentReadings","windowStart","added","flatMap","syncId","fromEntries","endsAt","getTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/sent-readings.ts"],"mappings":";;AACA,OAAOA,QAAQ,MAAM,WAAW;AAEhC,SAASC,0BAA0B,QAAQ,mBAAgB;;AAE3D;;AAGA;;AAGA,MAAMC,QAAQ,GAAIC,KAAoB,IACpCA,KAAK,CAAC,CAAC,CAAC,EAAEC,UAAU,EAAEC,IAAI,CAAC,CAAC;EAAEC;AAAO,CAAC,KAAKA,MAAM,KAAKL,0BAA0B,CAAC,EAAEM,KAAK;AAE1F,MAAMC,SAAS,GAAIC,WAAwB,IAAgB,CACzDA,WAAW,CAACC,iBAAiB,EAC7BD,WAAW,CAACE,eAAe,EAC3BF,WAAW,CAACG,gBAAgB,EAC5BH,WAAW,CAACI,SAAS,EACrBC,MAAM,CAACC,OAAO,CAACN,WAAW,CAAC,CAACO,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,KAAKA,GAAG,CAACC,UAAU,CAAC,OAAO,CAAC,CAAC,CACvE;AAED,MAAMC,aAAa,GAAIhB,KAAoB,IACzCH,QAAQ,CAACoB,MAAM,CAACC,IAAI,CAACC,SAAS,CAACnB,KAAK,CAACoB,GAAG,CAACf,SAAS,CAAC,CAAC,CAAC,CAACgB,QAAQ,CAAC,CAAC;AAElE,MAAMC,KAAK,GAAItB,KAAoB,IACjCuB,IAAI,CAACC,GAAG,CACN,GAAGxB,KAAK,CAACoB,GAAG,CAAC,CAAC;EAAEZ,eAAe;EAAED,iBAAiB;EAAEE;AAAiB,CAAC,KACpEgB,IAAI,CAACC,KAAK,CAAClB,eAAe,EAAEmB,GAAG,IAAIpB,iBAAiB,IAAIE,gBAAgB,IAAI,EAAE,CAChF,CACF,CAAC;;AAEH;AACA,MAAMmB,cAAc,GAAGA,CAACC,MAAuB,EAAEC,IAAkB,KACjED,MAAM,CAAChB,MAAM,CAAEb,KAAK,IAAK8B,IAAI,CAAC/B,QAAQ,CAACC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAKgB,aAAa,CAAChB,KAAK,CAAC,CAAC;;AAErF;AACA,MAAM+B,gBAAgB,GAAGA,CACvBD,IAAkB,EAClBD,MAAuB,EACvBG,WAAiB,KACA;EACjB,MAAMC,KAAK,GAAGJ,MAAM,CAACK,OAAO,CAAElC,KAAK,IAAmC;IACpE,MAAMmC,MAAM,GAAGpC,QAAQ,CAACC,KAAK,CAAC;IAE9B,OAAOmC,MAAM,GAAG,CAAC,CAACA,MAAM,EAAE,CAACnB,aAAa,CAAChB,KAAK,CAAC,EAAEsB,KAAK,CAACtB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;EACvE,CAAC,CAAC;EAEF,OAAOW,MAAM,CAACyB,WAAW,CACvB,CAAC,GAAGzB,MAAM,CAACC,OAAO,CAACkB,IAAI,CAAC,EAAE,GAAGG,KAAK,CAAC,CAACpB,MAAM,CAAC,CAAC,GAAG,GAAGwB,MAAM,CAAC,CAAC,KAAKA,MAAM,IAAIL,WAAW,CAACM,OAAO,CAAC,CAAC,CAChG,CAAC;AACH,CAAC;AAED,SAA4BV,cAAc,EAAEG,gBAAgB","ignoreList":[]}
|
package/lib/typescript/commonjs/src/modules/data-sync/services/base-health-sync-service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-health-sync-service.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/services/base-health-sync-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-health-sync-service.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/services/base-health-sync-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAWzD,2DAA2D;AAC3D,MAAM,MAAM,iBAAiB,CAAC,eAAe,SAAS,MAAM,EAAE,iBAAiB,IAAI;IACjF,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,kBAAkB,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,EAAE,CACP,KAAK,EAAE,wBAAwB,CAAC,eAAe,CAAC,KAC7C,OAAO,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CACjF,CAAC;AAEF,8BAAsB,qBAAqB,CACzC,WAAW,SACT,sBAAsB,CAAC,YAAY,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,EAC3E,eAAe,SAAS,MAAM,EAC9B,iBAAiB,GAAG,OAAO;IAiBzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAf1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IAErD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmC;IACnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAI5B;gBAGA,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,EACnB,OAAO,EAAE,iBAAiB,CAAC,eAAe,EAAE,iBAAiB,CAAC;IA6BjF,2EAA2E;IAC9D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;YAQzB,OAAO;IAyBR,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAKjD,cAAc;YAUd,oBAAoB;YA0BpB,mBAAmB;YAqBnB,cAAc;IA8I5B,OAAO,CAAC,yBAAyB;CAGlC"}
|
package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Bundle, Observation } from "@medplum/fhirtypes";
|
|
|
2
2
|
import type { Ovok } from "../../../next/ovok";
|
|
3
3
|
import { HealthProvider } from "../../types/health-provider";
|
|
4
4
|
import { HealthDataMode } from "../../types/health-sync-keys";
|
|
5
|
+
import { SentReadings } from "../../utils/sent-readings";
|
|
5
6
|
export declare class StorageManager {
|
|
6
7
|
private readonly client;
|
|
7
8
|
private readonly provider;
|
|
@@ -19,7 +20,10 @@ export declare class StorageManager {
|
|
|
19
20
|
deleteObservations(recordIds: string[], patientId: string): Promise<void>;
|
|
20
21
|
saveAnchor(typeIdentifier: string, anchor: string): Promise<void>;
|
|
21
22
|
getAnchor(typeIdentifier: string): Promise<string | undefined>;
|
|
22
|
-
|
|
23
|
+
saveSentReadings(measurementTypeKey: string, sent: SentReadings): Promise<void>;
|
|
24
|
+
getSentReadings(measurementTypeKey: string): Promise<SentReadings>;
|
|
25
|
+
private sentReadingsKey;
|
|
26
|
+
private storageKey;
|
|
23
27
|
saveAnchors(anchors: Array<{
|
|
24
28
|
typeIdentifier: string;
|
|
25
29
|
anchor: string;
|
package/lib/typescript/commonjs/src/modules/data-sync/services/managers/storage-manager.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-manager.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/data-sync/services/managers/storage-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-manager.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/data-sync/services/managers/storage-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,MAAM,EAAE,IAAI,EACZ,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAG9B,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;;;OAIG;IACG,gBAAgB,CACpB,MAAM,EAAE,WAAW,EAAE,EAAE,EACvB,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC;IASlB,mFAAmF;IAC7E,kBAAkB,CACtB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IAuBV,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM9D,gBAAgB,CAAC,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/E,eAAe,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAQxE,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,UAAU;IAQZ,WAAW,CACf,OAAO,EAAE,KAAK,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC;CAKjB"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Observation } from "@medplum/fhirtypes";
|
|
2
|
+
/** A reading as it was last sent: a hash of what it says, and when it ends. */
|
|
3
|
+
type SentReading = [fingerprint: string, endsAt: number];
|
|
4
|
+
/** The readings of a re-read data type that were sent, by sync id. */
|
|
5
|
+
type SentReadings = Record<string, SentReading>;
|
|
6
|
+
/** The readings never sent, or whose value, period or components changed since they were. */
|
|
7
|
+
declare const unsentReadings: (groups: Observation[][], sent: SentReadings) => Observation[][];
|
|
8
|
+
/** `sent` with `groups` added, dropping readings that end before the window the sync reads again. */
|
|
9
|
+
declare const withSentReadings: (sent: SentReadings, groups: Observation[][], windowStart: Date) => SentReadings;
|
|
10
|
+
export { type SentReadings, unsentReadings, withSentReadings };
|
|
11
|
+
//# sourceMappingURL=sent-readings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sent-readings.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/utils/sent-readings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKjD,+EAA+E;AAC/E,KAAK,WAAW,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzD,sEAAsE;AACtE,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAuBhD,6FAA6F;AAC7F,QAAA,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,EAAE,EAAE,MAAM,YAAY,KAAG,WAAW,EAAE,EACE,CAAC;AAEtF,qGAAqG;AACrG,QAAA,MAAM,gBAAgB,GACpB,MAAM,YAAY,EAClB,QAAQ,WAAW,EAAE,EAAE,EACvB,aAAa,IAAI,KAChB,YAUF,CAAC;AAEF,OAAO,EAAE,KAAK,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC"}
|
package/lib/typescript/module/src/modules/data-sync/services/base-health-sync-service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-health-sync-service.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/services/base-health-sync-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-health-sync-service.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/services/base-health-sync-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAWzD,2DAA2D;AAC3D,MAAM,MAAM,iBAAiB,CAAC,eAAe,SAAS,MAAM,EAAE,iBAAiB,IAAI;IACjF,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,kBAAkB,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,EAAE,CACP,KAAK,EAAE,wBAAwB,CAAC,eAAe,CAAC,KAC7C,OAAO,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CACjF,CAAC;AAEF,8BAAsB,qBAAqB,CACzC,WAAW,SACT,sBAAsB,CAAC,YAAY,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,EAC3E,eAAe,SAAS,MAAM,EAC9B,iBAAiB,GAAG,OAAO;IAiBzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAf1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IAErD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmC;IACnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAI5B;gBAGA,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,EACnB,OAAO,EAAE,iBAAiB,CAAC,eAAe,EAAE,iBAAiB,CAAC;IA6BjF,2EAA2E;IAC9D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;YAQzB,OAAO;IAyBR,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAKjD,cAAc;YAUd,oBAAoB;YA0BpB,mBAAmB;YAqBnB,cAAc;IA8I5B,OAAO,CAAC,yBAAyB;CAGlC"}
|
|
@@ -2,6 +2,7 @@ import { Bundle, Observation } from "@medplum/fhirtypes";
|
|
|
2
2
|
import type { Ovok } from "../../../next/ovok";
|
|
3
3
|
import { HealthProvider } from "../../types/health-provider";
|
|
4
4
|
import { HealthDataMode } from "../../types/health-sync-keys";
|
|
5
|
+
import { SentReadings } from "../../utils/sent-readings";
|
|
5
6
|
export declare class StorageManager {
|
|
6
7
|
private readonly client;
|
|
7
8
|
private readonly provider;
|
|
@@ -19,7 +20,10 @@ export declare class StorageManager {
|
|
|
19
20
|
deleteObservations(recordIds: string[], patientId: string): Promise<void>;
|
|
20
21
|
saveAnchor(typeIdentifier: string, anchor: string): Promise<void>;
|
|
21
22
|
getAnchor(typeIdentifier: string): Promise<string | undefined>;
|
|
22
|
-
|
|
23
|
+
saveSentReadings(measurementTypeKey: string, sent: SentReadings): Promise<void>;
|
|
24
|
+
getSentReadings(measurementTypeKey: string): Promise<SentReadings>;
|
|
25
|
+
private sentReadingsKey;
|
|
26
|
+
private storageKey;
|
|
23
27
|
saveAnchors(anchors: Array<{
|
|
24
28
|
typeIdentifier: string;
|
|
25
29
|
anchor: string;
|
package/lib/typescript/module/src/modules/data-sync/services/managers/storage-manager.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-manager.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/data-sync/services/managers/storage-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-manager.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/data-sync/services/managers/storage-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAHT,MAAM,EAAE,IAAI,EACZ,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAG9B,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;;;OAIG;IACG,gBAAgB,CACpB,MAAM,EAAE,WAAW,EAAE,EAAE,EACvB,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC;IASlB,mFAAmF;IAC7E,kBAAkB,CACtB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IAuBV,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM9D,gBAAgB,CAAC,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/E,eAAe,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAQxE,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,UAAU;IAQZ,WAAW,CACf,OAAO,EAAE,KAAK,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC;CAKjB"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Observation } from "@medplum/fhirtypes";
|
|
2
|
+
/** A reading as it was last sent: a hash of what it says, and when it ends. */
|
|
3
|
+
type SentReading = [fingerprint: string, endsAt: number];
|
|
4
|
+
/** The readings of a re-read data type that were sent, by sync id. */
|
|
5
|
+
type SentReadings = Record<string, SentReading>;
|
|
6
|
+
/** The readings never sent, or whose value, period or components changed since they were. */
|
|
7
|
+
declare const unsentReadings: (groups: Observation[][], sent: SentReadings) => Observation[][];
|
|
8
|
+
/** `sent` with `groups` added, dropping readings that end before the window the sync reads again. */
|
|
9
|
+
declare const withSentReadings: (sent: SentReadings, groups: Observation[][], windowStart: Date) => SentReadings;
|
|
10
|
+
export { type SentReadings, unsentReadings, withSentReadings };
|
|
11
|
+
//# sourceMappingURL=sent-readings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sent-readings.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/data-sync/utils/sent-readings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKjD,+EAA+E;AAC/E,KAAK,WAAW,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzD,sEAAsE;AACtE,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAuBhD,6FAA6F;AAC7F,QAAA,MAAM,cAAc,GAAI,QAAQ,WAAW,EAAE,EAAE,EAAE,MAAM,YAAY,KAAG,WAAW,EAAE,EACE,CAAC;AAEtF,qGAAqG;AACrG,QAAA,MAAM,gBAAgB,GACpB,MAAM,YAAY,EAClB,QAAQ,WAAW,EAAE,EAAE,EACvB,aAAa,IAAI,KAChB,YAUF,CAAC;AAEF,OAAO,EAAE,KAAK,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC"}
|