@ovok/native 1.17.0-dev.2287 → 1.17.0-dev.2293
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/components/android/android-health-connect-authorization-provider.js +14 -5
- package/lib/commonjs/modules/data-sync/components/android/android-health-connect-authorization-provider.js.map +1 -1
- package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js +4 -7
- package/lib/commonjs/modules/data-sync/services/base-health-sync-service.js.map +1 -1
- package/lib/commonjs/modules/data-sync/services/managers/data-processor.js +22 -9
- package/lib/commonjs/modules/data-sync/services/managers/data-processor.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-health-record-sync-id.js +21 -2
- package/lib/commonjs/modules/data-sync/utils/get-health-record-sync-id.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-records-from-health-connect.js +2 -1
- package/lib/commonjs/modules/data-sync/utils/get-records-from-health-connect.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-samples-from-health.js +2 -1
- package/lib/commonjs/modules/data-sync/utils/get-samples-from-health.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-total-records-count.js +4 -0
- package/lib/commonjs/modules/data-sync/utils/get-total-records-count.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-total-samples-count.js +4 -0
- package/lib/commonjs/modules/data-sync/utils/get-total-samples-count.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/health-connect-series.js +4 -7
- package/lib/commonjs/modules/data-sync/utils/health-connect-series.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/healthkit-series.js +5 -8
- package/lib/commonjs/modules/data-sync/utils/healthkit-series.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/hourly-series.js +42 -2
- package/lib/commonjs/modules/data-sync/utils/hourly-series.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/identify-imported-observations.js +9 -1
- package/lib/commonjs/modules/data-sync/utils/identify-imported-observations.js.map +1 -1
- package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js +15 -6
- package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js.map +1 -1
- package/lib/module/modules/data-sync/services/base-health-sync-service.js +4 -7
- package/lib/module/modules/data-sync/services/base-health-sync-service.js.map +1 -1
- package/lib/module/modules/data-sync/services/managers/data-processor.js +23 -10
- package/lib/module/modules/data-sync/services/managers/data-processor.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-health-record-sync-id.js +19 -1
- package/lib/module/modules/data-sync/utils/get-health-record-sync-id.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-records-from-health-connect.js +2 -1
- package/lib/module/modules/data-sync/utils/get-records-from-health-connect.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-samples-from-health.js +2 -1
- package/lib/module/modules/data-sync/utils/get-samples-from-health.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-total-records-count.js +4 -0
- package/lib/module/modules/data-sync/utils/get-total-records-count.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-total-samples-count.js +4 -0
- package/lib/module/modules/data-sync/utils/get-total-samples-count.js.map +1 -1
- package/lib/module/modules/data-sync/utils/health-connect-series.js +5 -8
- package/lib/module/modules/data-sync/utils/health-connect-series.js.map +1 -1
- package/lib/module/modules/data-sync/utils/healthkit-series.js +6 -9
- package/lib/module/modules/data-sync/utils/healthkit-series.js.map +1 -1
- package/lib/module/modules/data-sync/utils/hourly-series.js +41 -3
- package/lib/module/modules/data-sync/utils/hourly-series.js.map +1 -1
- package/lib/module/modules/data-sync/utils/identify-imported-observations.js +9 -1
- package/lib/module/modules/data-sync/utils/identify-imported-observations.js.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/components/android/android-health-connect-authorization-provider.d.ts.map +1 -1
- 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/data-processor.d.ts +19 -16
- package/lib/typescript/commonjs/src/modules/data-sync/services/managers/data-processor.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/types/health-authorization-status.d.ts +8 -1
- package/lib/typescript/commonjs/src/modules/data-sync/types/health-authorization-status.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-health-record-sync-id.d.ts +6 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-health-record-sync-id.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-records-from-health-connect.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-samples-from-health.d.ts +5 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-samples-from-health.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-total-records-count.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/get-total-samples-count.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/health-connect-series.d.ts +9 -5
- package/lib/typescript/commonjs/src/modules/data-sync/utils/health-connect-series.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/healthkit-series.d.ts +10 -6
- package/lib/typescript/commonjs/src/modules/data-sync/utils/healthkit-series.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/hourly-series.d.ts +24 -4
- package/lib/typescript/commonjs/src/modules/data-sync/utils/hourly-series.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/identify-imported-observations.d.ts +3 -1
- package/lib/typescript/commonjs/src/modules/data-sync/utils/identify-imported-observations.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/components/android/android-health-connect-authorization-provider.d.ts.map +1 -1
- 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/data-processor.d.ts +19 -16
- package/lib/typescript/module/src/modules/data-sync/services/managers/data-processor.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/types/health-authorization-status.d.ts +8 -1
- package/lib/typescript/module/src/modules/data-sync/types/health-authorization-status.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-health-record-sync-id.d.ts +6 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-health-record-sync-id.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-records-from-health-connect.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-samples-from-health.d.ts +5 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-samples-from-health.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-total-records-count.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/get-total-samples-count.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/health-connect-series.d.ts +9 -5
- package/lib/typescript/module/src/modules/data-sync/utils/health-connect-series.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/healthkit-series.d.ts +10 -6
- package/lib/typescript/module/src/modules/data-sync/utils/healthkit-series.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/hourly-series.d.ts +24 -4
- package/lib/typescript/module/src/modules/data-sync/utils/hourly-series.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/data-sync/utils/identify-imported-observations.d.ts +3 -1
- package/lib/typescript/module/src/modules/data-sync/utils/identify-imported-observations.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -76,14 +76,14 @@ const recordMinutes = async (typeIdentifier, from, to) => {
|
|
|
76
76
|
};
|
|
77
77
|
};
|
|
78
78
|
|
|
79
|
-
/**
|
|
80
|
-
const getHealthConnectSeries = async (typeIdentifier,
|
|
79
|
+
/** A page of finished hours, one `series` item an hour, read a day at a time. */
|
|
80
|
+
const getHealthConnectSeries = async (typeIdentifier, page) => {
|
|
81
81
|
const minutes = [];
|
|
82
82
|
let unit = typeIdentifier === "HeartRate" ? HEART_RATE_UNIT : undefined;
|
|
83
83
|
for (const {
|
|
84
84
|
from,
|
|
85
85
|
to
|
|
86
|
-
} of
|
|
86
|
+
} of page.windows) {
|
|
87
87
|
if (typeIdentifier === "HeartRate") {
|
|
88
88
|
minutes.push(...(await heartRateMinutes(from, to)));
|
|
89
89
|
} else {
|
|
@@ -92,10 +92,7 @@ const getHealthConnectSeries = async (typeIdentifier, startDate) => {
|
|
|
92
92
|
unit ??= read.unit;
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
return
|
|
96
|
-
data: (0, _hourlySeries.toHourlySeries)(typeIdentifier, unit ?? "1", minutes),
|
|
97
|
-
anchor: undefined
|
|
98
|
-
};
|
|
95
|
+
return (0, _hourlySeries.toSeriesResult)(typeIdentifier, page, (0, _hourlySeries.toHourlySeries)(typeIdentifier, unit ?? "1", minutes));
|
|
99
96
|
};
|
|
100
97
|
exports.getHealthConnectSeries = getHealthConnectSeries;
|
|
101
98
|
//# sourceMappingURL=health-connect-series.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeHealthConnect","require","_constants","_convertGenericHealthData","_hourlySeries","HEART_RATE_UNIT","between","from","to","operator","startTime","toISOString","endTime","heartRateMinutes","groups","aggregateGroupByDuration","recordType","timeRangeFilter","timeRangeSlicer","duration","length","flatMap","group","average","result","BPM_AVG","Number","isFinite","start","Date","value","recordMinutes","typeIdentifier","sums","Map","unit","pageToken","page","readRecords","records","forEach","record","raw","measured","extractValue","time","minute","Math","floor","getTime","SERIES_SLOT_MS","sum","get","total","count","set","minutes","entries","map","getHealthConnectSeries","
|
|
1
|
+
{"version":3,"names":["_reactNativeHealthConnect","require","_constants","_convertGenericHealthData","_hourlySeries","HEART_RATE_UNIT","between","from","to","operator","startTime","toISOString","endTime","heartRateMinutes","groups","aggregateGroupByDuration","recordType","timeRangeFilter","timeRangeSlicer","duration","length","flatMap","group","average","result","BPM_AVG","Number","isFinite","start","Date","value","recordMinutes","typeIdentifier","sums","Map","unit","pageToken","page","readRecords","records","forEach","record","raw","measured","extractValue","time","minute","Math","floor","getTime","SERIES_SLOT_MS","sum","get","total","count","set","minutes","entries","map","getHealthConnectSeries","undefined","windows","push","read","toSeriesResult","toHourlySeries","exports"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/health-connect-series.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,10 +9,10 @@ var _healthUnits = require("./health-units.js");
|
|
|
9
9
|
var _hourlySeries = require("./hourly-series.js");
|
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
11
|
/**
|
|
12
|
-
*
|
|
13
|
-
*
|
|
12
|
+
* A page of finished hours, one `series` item an hour, from HealthKit's own average a minute: it follows the user's
|
|
13
|
+
* source priority where a watch and another app both recorded. Read a day at a time.
|
|
14
14
|
*/
|
|
15
|
-
const getHealthKitSeries = async (typeIdentifier,
|
|
15
|
+
const getHealthKitSeries = async (typeIdentifier, page) => {
|
|
16
16
|
const unit = (0, _healthUnits.healthUnitFor)(typeIdentifier);
|
|
17
17
|
|
|
18
18
|
// HealthKit gives a percentage as a fraction (0.97); a reading of it says 97 %, as a single sample's does.
|
|
@@ -21,7 +21,7 @@ const getHealthKitSeries = async (typeIdentifier, startDate) => {
|
|
|
21
21
|
for (const {
|
|
22
22
|
from,
|
|
23
23
|
to
|
|
24
|
-
} of
|
|
24
|
+
} of page.windows) {
|
|
25
25
|
const statistics = await _reactNativeHealthkit.default.queryStatisticsCollectionForQuantity(typeIdentifier, ["discreteAverage"], from, {
|
|
26
26
|
minute: 1
|
|
27
27
|
}, {
|
|
@@ -47,10 +47,7 @@ const getHealthKitSeries = async (typeIdentifier, startDate) => {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
return
|
|
51
|
-
data: (0, _hourlySeries.toHourlySeries)(typeIdentifier, unit ?? "1", minutes),
|
|
52
|
-
anchor: undefined
|
|
53
|
-
};
|
|
50
|
+
return (0, _hourlySeries.toSeriesResult)(typeIdentifier, page, (0, _hourlySeries.toHourlySeries)(typeIdentifier, unit ?? "1", minutes));
|
|
54
51
|
};
|
|
55
52
|
exports.getHealthKitSeries = getHealthKitSeries;
|
|
56
53
|
//# sourceMappingURL=healthkit-series.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeHealthkit","_interopRequireDefault","require","_healthUnits","_hourlySeries","e","__esModule","default","getHealthKitSeries","typeIdentifier","
|
|
1
|
+
{"version":3,"names":["_reactNativeHealthkit","_interopRequireDefault","require","_healthUnits","_hourlySeries","e","__esModule","default","getHealthKitSeries","typeIdentifier","page","unit","healthUnitFor","scale","minutes","from","to","windows","statistics","Healthkit","queryStatisticsCollectionForQuantity","minute","filter","date","startDate","endDate","forEach","start","averageQuantity","push","value","quantity","toSeriesResult","toHourlySeries","exports"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/healthkit-series.ts"],"mappings":";;;;;;AAAA,IAAAA,qBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AAA0F,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE1F;AACA;AACA;AACA;AACA,MAAMG,kBAAkB,GAAG,MAAAA,CAAOC,cAAsC,EAAEC,IAAgB,KAAK;EAC7F,MAAMC,IAAI,GAAG,IAAAC,0BAAa,EAACH,cAAc,CAAC;;EAE1C;EACA,MAAMI,KAAK,GAAGF,IAAI,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC;EACpC,MAAMG,OAAsB,GAAG,EAAE;EAEjC,KAAK,MAAM;IAAEC,IAAI;IAAEC;EAAG,CAAC,IAAIN,IAAI,CAACO,OAAO,EAAE;IACvC,MAAMC,UAAU,GAAG,MAAMC,6BAAS,CAACC,oCAAoC,CACrEX,cAAc,EACd,CAAC,iBAAiB,CAAC,EACnBM,IAAI,EACJ;MAAEM,MAAM,EAAE;IAAE,CAAC,EACb;MAAEV,IAAI;MAAEW,MAAM,EAAE;QAAEC,IAAI,EAAE;UAAEC,SAAS,EAAET,IAAI;UAAEU,OAAO,EAAET;QAAG;MAAE;IAAE,CAC7D,CAAC;;IAED;IACAE,UAAU,CAACQ,OAAO,CAAC,CAAC;MAAEF,SAAS,EAAEG,KAAK;MAAEC;IAAgB,CAAC,KAAK;MAC5D,IAAID,KAAK,IAAIA,KAAK,IAAIZ,IAAI,IAAIY,KAAK,GAAGX,EAAE,IAAIY,eAAe,EAAE;QAC3Dd,OAAO,CAACe,IAAI,CAAC;UAAEF,KAAK;UAAEG,KAAK,EAAEF,eAAe,CAACG,QAAQ,GAAGlB;QAAM,CAAC,CAAC;MAClE;IACF,CAAC,CAAC;EACJ;EAEA,OAAO,IAAAmB,4BAAc,EAACvB,cAAc,EAAEC,IAAI,EAAE,IAAAuB,4BAAc,EAACxB,cAAc,EAAEE,IAAI,IAAI,GAAG,EAAEG,OAAO,CAAC,CAAC;AACnG,CAAC;AAACoB,OAAA,CAAA1B,kBAAA,GAAAA,kBAAA","ignoreList":[]}
|
|
@@ -3,10 +3,12 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.toHourlySeries = exports.finishedHourWindows = void 0;
|
|
6
|
+
exports.toSeriesResult = exports.toHourlySeries = exports.seriesPage = exports.seriesHoursLeft = exports.finishedHourWindows = void 0;
|
|
7
|
+
var _dateFns = require("date-fns");
|
|
7
8
|
var _constants = require("../constants.js");
|
|
9
|
+
const HOURS_PER_DAY = 24;
|
|
8
10
|
const HOUR_MS = 3_600_000;
|
|
9
|
-
const DAY_MS =
|
|
11
|
+
const DAY_MS = HOURS_PER_DAY * HOUR_MS;
|
|
10
12
|
|
|
11
13
|
/** A minute's value: the average of what was measured in it. */
|
|
12
14
|
|
|
@@ -53,5 +55,43 @@ const finishedHourWindows = (start, now = new Date()) => {
|
|
|
53
55
|
}
|
|
54
56
|
return windows;
|
|
55
57
|
};
|
|
58
|
+
|
|
59
|
+
/** The day windows one read of a series takes, and where it got to. */
|
|
56
60
|
exports.finishedHourWindows = finishedHourWindows;
|
|
61
|
+
/** From the window's start, or a few hours before where the series was read up to: an hour read may still get minutes. */
|
|
62
|
+
const seriesReadStart = (startDate, readUpTo) => {
|
|
63
|
+
const cursor = readUpTo ? new Date(readUpTo) : undefined;
|
|
64
|
+
const resumeAt = cursor && !Number.isNaN(cursor.getTime()) ? (0, _dateFns.subHours)(cursor, _constants.SERIES_REREAD_HOURS) : undefined;
|
|
65
|
+
return resumeAt && resumeAt > startDate ? resumeAt : startDate;
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
/** The next days of a series to read, at most `chunkSize` hours: what one save sends. */
|
|
69
|
+
const seriesPage = (startDate, readUpTo, chunkSize) => {
|
|
70
|
+
const windows = finishedHourWindows(seriesReadStart(startDate, readUpTo));
|
|
71
|
+
const page = windows.slice(0, Math.max(1, Math.floor(chunkSize / HOURS_PER_DAY)));
|
|
72
|
+
return {
|
|
73
|
+
windows: page,
|
|
74
|
+
readUpTo: page.at(-1)?.to,
|
|
75
|
+
hasMore: windows.length > page.length
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
/** The finished hours a series has left to read, for progress, without reading them. */
|
|
80
|
+
exports.seriesPage = seriesPage;
|
|
81
|
+
const seriesHoursLeft = (startDate, readUpTo) => finishedHourWindows(seriesReadStart(startDate, readUpTo)).reduce((hours, {
|
|
82
|
+
from,
|
|
83
|
+
to
|
|
84
|
+
}) => hours + (to.getTime() - from.getTime()) / HOUR_MS, 0);
|
|
85
|
+
|
|
86
|
+
/** A page of a series as a provider result: its hours, the hour it was read up to as the anchor, and whether more is left. */
|
|
87
|
+
exports.seriesHoursLeft = seriesHoursLeft;
|
|
88
|
+
const toSeriesResult = (typeIdentifier, page, data) => ({
|
|
89
|
+
data,
|
|
90
|
+
hasMore: page.hasMore,
|
|
91
|
+
anchor: page.readUpTo ? {
|
|
92
|
+
typeIdentifier,
|
|
93
|
+
anchor: page.readUpTo.toISOString()
|
|
94
|
+
} : undefined
|
|
95
|
+
});
|
|
96
|
+
exports.toSeriesResult = toSeriesResult;
|
|
57
97
|
//# sourceMappingURL=hourly-series.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_dateFns","require","_constants","HOURS_PER_DAY","HOUR_MS","DAY_MS","toHourlySeries","typeIdentifier","unit","minutes","hours","Map","forEach","start","value","time","getTime","hour","Math","floor","slots","get","Array","SERIES_SLOT_MS","fill","set","entries","sort","first","second","map","values","kind","startDate","Date","endDate","periodMs","exports","finishedHourWindows","now","windows","end","from","push","to","min","seriesReadStart","readUpTo","cursor","undefined","resumeAt","Number","isNaN","subHours","SERIES_REREAD_HOURS","seriesPage","chunkSize","page","slice","max","at","hasMore","length","seriesHoursLeft","reduce","toSeriesResult","data","anchor","toISOString"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/hourly-series.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -36,9 +36,11 @@ const identifyImportedObservations = ({
|
|
|
36
36
|
provider,
|
|
37
37
|
groupedObservationSyncIds,
|
|
38
38
|
groupedRecordIds,
|
|
39
|
+
groupedFormerSyncIds,
|
|
39
40
|
mode
|
|
40
41
|
}) => groupedObservationBodies.map((observationBodies, groupIndex) => {
|
|
41
42
|
const recordId = groupedRecordIds?.[groupIndex];
|
|
43
|
+
const formerSourceId = groupedFormerSyncIds?.[groupIndex];
|
|
42
44
|
return observationBodies.map((observationBody, bodyIndex) => {
|
|
43
45
|
const syncId = getStableObservationId({
|
|
44
46
|
observation: observationBody,
|
|
@@ -46,6 +48,12 @@ const identifyImportedObservations = ({
|
|
|
46
48
|
sourceId: groupedObservationSyncIds?.[groupIndex],
|
|
47
49
|
bodyIndex
|
|
48
50
|
});
|
|
51
|
+
const formerSyncId = formerSourceId ? getStableObservationId({
|
|
52
|
+
observation: observationBody,
|
|
53
|
+
provider,
|
|
54
|
+
sourceId: formerSourceId,
|
|
55
|
+
bodyIndex
|
|
56
|
+
}) : undefined;
|
|
49
57
|
|
|
50
58
|
// A day's total saved before sync ids named their source carries its old id; naming the total by that id as
|
|
51
59
|
// well is what lets the save find it and write over it.
|
|
@@ -55,7 +63,7 @@ const identifyImportedObservations = ({
|
|
|
55
63
|
identifier: [...(observationBody.identifier || []), {
|
|
56
64
|
system: _fhirSystems.OBSERVATION_SYNC_PROVIDER_SYSTEM,
|
|
57
65
|
value: provider
|
|
58
|
-
}, syncIdentifier(syncId), ...(
|
|
66
|
+
}, syncIdentifier(syncId), ...[formerSyncId, legacySyncId].filter(id => Boolean(id) && id !== syncId).map(syncIdentifier), ...(recordId ? [(0, _getHealthRecordSyncId.getHealthRecordIdentifier)(provider, recordId)] : [])],
|
|
59
67
|
device: {
|
|
60
68
|
...(observationBody.device ?? {}),
|
|
61
69
|
identifier: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_fhirSystems","require","_getHealthRecordSyncId","_isDailyAggregateMode","getObservationCode","observation","code","coding","map","system","join","text","getObservationTime","effectivePeriod","start","end","effectiveDateTime","slice","getStableObservationId","provider","sourceId","bodyIndex","id","exports","syncIdentifier","value","OBSERVATION_SYNC_ID_SYSTEM","identifyImportedObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","mode","observationBodies","groupIndex","recordId","observationBody","syncId","
|
|
1
|
+
{"version":3,"names":["_fhirSystems","require","_getHealthRecordSyncId","_isDailyAggregateMode","getObservationCode","observation","code","coding","map","system","join","text","getObservationTime","effectivePeriod","start","end","effectiveDateTime","slice","getStableObservationId","provider","sourceId","bodyIndex","id","exports","syncIdentifier","value","OBSERVATION_SYNC_ID_SYSTEM","identifyImportedObservations","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","groupedFormerSyncIds","mode","observationBodies","groupIndex","recordId","formerSourceId","observationBody","syncId","formerSyncId","undefined","legacySyncId","isDailyAggregateMode","identifier","OBSERVATION_SYNC_PROVIDER_SYSTEM","filter","Boolean","getHealthRecordIdentifier","device"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/identify-imported-observations.ts"],"mappings":";;;;;;AAKA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,qBAAA,GAAAF,OAAA;AAeA,MAAMG,kBAAkB,GAAIC,WAAwB,IAClDA,WAAW,CAACC,IAAI,EAAEC,MAAM,EACpBC,GAAG,CAAED,MAAM,IAAK,GAAGA,MAAM,CAACE,MAAM,IAAI,EAAE,IAAIF,MAAM,CAACD,IAAI,IAAI,EAAE,EAAE,CAAC,CAC/DI,IAAI,CAAC,GAAG,CAAC,IACZL,WAAW,CAACC,IAAI,EAAEK,IAAI,IACtB,SAAS;AAEX,MAAMC,kBAAkB,GAAIP,WAAwB,IAAa;EAC/D,IAAIA,WAAW,CAACQ,eAAe,EAAE;IAC/B,OAAO,GAAGR,WAAW,CAACQ,eAAe,CAACC,KAAK,IAAI,EAAE,IAAIT,WAAW,CAACQ,eAAe,CAACE,GAAG,IAAI,EAAE,EAAE;EAC9F;EAEA,OAAOV,WAAW,CAACW,iBAAiB,EAAEC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS;AACjE,CAAC;AAED,MAAMC,sBAAsB,GAAGA,CAAC;EAC9Bb,WAAW;EACXc,QAAQ;EACRC,QAAQ;EACRC;AAMF,CAAC,KACChB,WAAW,CAACiB,EAAE,IAAI,CAACF,QAAQ,GACvB,GAAGD,QAAQ,IAAId,WAAW,CAACiB,EAAE,EAAE,GAC/B,CACEH,QAAQ,EACRC,QAAQ,IAAIR,kBAAkB,CAACP,WAAW,CAAC,EAC3CD,kBAAkB,CAACC,WAAW,CAAC,EAC/BgB,SAAS,CACV,CAACX,IAAI,CAAC,GAAG,CAAC;AAACa,OAAA,CAAAL,sBAAA,GAAAA,sBAAA;AAElB,MAAMM,cAAc,GAAIC,KAAa,KAAkB;EACrDhB,MAAM,EAAEiB,uCAA0B;EAClCD;AACF,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA,MAAME,4BAA4B,GAAGA,CAAC;EACpCC,wBAAwB;EACxBT,QAAQ;EACRU,yBAAyB;EACzBC,gBAAgB;EAChBC,oBAAoB;EACpBC;AACiC,CAAC,KAClCJ,wBAAwB,CAACpB,GAAG,CAAC,CAACyB,iBAAiB,EAAEC,UAAU,KAAK;EAC9D,MAAMC,QAAQ,GAAGL,gBAAgB,GAAGI,UAAU,CAAC;EAC/C,MAAME,cAAc,GAAGL,oBAAoB,GAAGG,UAAU,CAAC;EAEzD,OAAOD,iBAAiB,CAACzB,GAAG,CAAC,CAAC6B,eAAe,EAAEhB,SAAS,KAAK;IAC3D,MAAMiB,MAAM,GAAGpB,sBAAsB,CAAC;MACpCb,WAAW,EAAEgC,eAAe;MAC5BlB,QAAQ;MACRC,QAAQ,EAAES,yBAAyB,GAAGK,UAAU,CAAC;MACjDb;IACF,CAAC,CAAC;IAEF,MAAMkB,YAAY,GAAGH,cAAc,GAC/BlB,sBAAsB,CAAC;MAAEb,WAAW,EAAEgC,eAAe;MAAElB,QAAQ;MAAEC,QAAQ,EAAEgB,cAAc;MAAEf;IAAU,CAAC,CAAC,GACvGmB,SAAS;;IAEb;IACA;IACA,MAAMC,YAAY,GAChB,IAAAC,0CAAoB,EAACV,IAAI,CAAC,IAAIK,eAAe,CAACf,EAAE,GAC5C,GAAGH,QAAQ,IAAIkB,eAAe,CAACf,EAAE,EAAE,GACnCkB,SAAS;IAEf,OAAO;MACL,GAAGH,eAAe;MAClBM,UAAU,EAAE,CACV,IAAIN,eAAe,CAACM,UAAU,IAAI,EAAE,CAAC,EACrC;QAAElC,MAAM,EAAEmC,6CAAgC;QAAEnB,KAAK,EAAEN;MAAS,CAAC,EAC7DK,cAAc,CAACc,MAAM,CAAC,EACtB,GAAG,CAACC,YAAY,EAAEE,YAAY,CAAC,CAC5BI,MAAM,CAAEvB,EAAE,IAAmBwB,OAAO,CAACxB,EAAE,CAAC,IAAIA,EAAE,KAAKgB,MAAM,CAAC,CAC1D9B,GAAG,CAACgB,cAAc,CAAC,EACtB,IAAIW,QAAQ,GAAG,CAAC,IAAAY,gDAAyB,EAAC5B,QAAQ,EAAEgB,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC,CACrE;MACDa,MAAM,EAAE;QACN,IAAIX,eAAe,CAACW,MAAM,IAAI,CAAC,CAAC,CAAC;QACjCL,UAAU,EAAE;UACVlC,MAAM,EAAEmC,6CAAgC;UACxCnB,KAAK,EAAEN;QACT;MACF;IACF,CAAC;EACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAACI,OAAA,CAAAI,4BAAA,GAAAA,4BAAA","ignoreList":[]}
|
|
@@ -4,10 +4,16 @@
|
|
|
4
4
|
|
|
5
5
|
import * as React from "react";
|
|
6
6
|
import { AppState } from "react-native";
|
|
7
|
-
import { getGrantedPermissions, initialize, requestPermission } from "react-native-health-connect";
|
|
7
|
+
import { getGrantedPermissions, getSdkStatus, initialize, requestPermission, SdkAvailabilityStatus } from "react-native-health-connect";
|
|
8
8
|
import { toError } from "../../../helpers/utils/to-error.js";
|
|
9
9
|
import { HealthAuthorizationContext } from "../../contexts/health-authorization-context.js";
|
|
10
10
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
11
|
+
const AVAILABILITY_BY_SDK_STATUS = {
|
|
12
|
+
[SdkAvailabilityStatus.SDK_AVAILABLE]: "available",
|
|
13
|
+
[SdkAvailabilityStatus.SDK_UNAVAILABLE]: "notInstalled",
|
|
14
|
+
[SdkAvailabilityStatus.SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED]: "updateRequired"
|
|
15
|
+
};
|
|
16
|
+
const healthConnectAvailability = async () => AVAILABILITY_BY_SDK_STATUS[await getSdkStatus()] ?? "notInstalled";
|
|
11
17
|
const isHealthConnectUnavailable = error => /not available|not installed|unsupported|unavailable/i.test(error instanceof Error ? error.message : String(error));
|
|
12
18
|
const useHealthConnectAuthorization = (readIdentifiers, writeIdentifiers, backgroundAccess = false, onStatusChange) => {
|
|
13
19
|
const [status, setStatus] = React.useState({
|
|
@@ -45,12 +51,14 @@ const useHealthConnectAuthorization = (readIdentifiers, writeIdentifiers, backgr
|
|
|
45
51
|
}, [onStatusChange]);
|
|
46
52
|
const checkAuthorization = React.useCallback(async () => {
|
|
47
53
|
try {
|
|
48
|
-
const
|
|
54
|
+
const availability = await healthConnectAvailability();
|
|
55
|
+
const isInitialized = availability === "available" && (await initialize());
|
|
49
56
|
if (!isInitialized) {
|
|
50
|
-
const error = new Error("Health Connect is not available");
|
|
57
|
+
const error = new Error(availability === "updateRequired" ? "Health Connect needs an update" : "Health Connect is not available");
|
|
51
58
|
updateStatus({
|
|
52
59
|
state: "error",
|
|
53
60
|
error,
|
|
61
|
+
availability,
|
|
54
62
|
missingTypes: permissionsRef.current.filter(permission => permission.recordType !== "BackgroundAccessPermission").map(permission => permission.recordType),
|
|
55
63
|
...(backgroundAccess ? {
|
|
56
64
|
backgroundAccess: "unsupported"
|
|
@@ -68,6 +76,7 @@ const useHealthConnectAuthorization = (readIdentifiers, writeIdentifiers, backgr
|
|
|
68
76
|
const answeredWithSomeShared = hasRequestedRef.current && requiredPermissions.some(permission => permission.accessType === "read" && isGranted(permission));
|
|
69
77
|
const backgroundGranted = backgroundPermission ? isGranted(backgroundPermission) : undefined;
|
|
70
78
|
updateStatus({
|
|
79
|
+
availability,
|
|
71
80
|
state: missingTypes.length === 0 || answeredWithSomeShared ? "authorized" : hasRequestedRef.current ? "refused" : "shouldRequest",
|
|
72
81
|
missingTypes,
|
|
73
82
|
...(backgroundPermission ? {
|
|
@@ -93,9 +102,9 @@ const useHealthConnectAuthorization = (readIdentifiers, writeIdentifiers, backgr
|
|
|
93
102
|
state: "requesting"
|
|
94
103
|
});
|
|
95
104
|
try {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
105
|
+
if ((await healthConnectAvailability()) !== "available" || !(await initialize())) {
|
|
106
|
+
await checkAuthorization();
|
|
107
|
+
return;
|
|
99
108
|
}
|
|
100
109
|
await requestPermission(permissionsRef.current);
|
|
101
110
|
await checkAuthorization();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","AppState","getGrantedPermissions","initialize","requestPermission","toError","HealthAuthorizationContext","Fragment","_Fragment","jsx","_jsx","isHealthConnectUnavailable","error","test","Error","message","String","useHealthConnectAuthorization","readIdentifiers","writeIdentifiers","backgroundAccess","onStatusChange","status","setStatus","useState","state","hasRequestedRef","useRef","hasRequestedBackgroundRef","identifiersRef","permissionsRef","current","readPermissions","map","recordType","accessType","writePermissions","backgroundPermissions","updateStatus","useCallback","nextStatus","checkAuthorization","isInitialized","missingTypes","filter","permission","grantedPermissions","isGranted","some","granted","backgroundPermission","find","requiredPermissions","answeredWithSomeShared","backgroundGranted","undefined","length","requestAuthorization","useEffect","subscription","addEventListener","remove","AndroidHealthConnectAuthorizationProvider","memo","fallback","children","skipRequest","renderManualRequestUI","onAuthorizationStatusChange","authorizationStatus","backgroundAccessPending","shouldRenderManualRequestUI","includes","shouldRenderFallback","authorizationValue","useMemo","platform","request","content","Provider","value"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/components/android/android-health-connect-authorization-provider.tsx"],"mappings":";;AAAA;;AAEA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,QAAQ,cAAc;AACvC,SACEC,qBAAqB,EACrBC,UAAU,EACVC,iBAAiB,
|
|
1
|
+
{"version":3,"names":["React","AppState","getGrantedPermissions","getSdkStatus","initialize","requestPermission","SdkAvailabilityStatus","toError","HealthAuthorizationContext","Fragment","_Fragment","jsx","_jsx","AVAILABILITY_BY_SDK_STATUS","SDK_AVAILABLE","SDK_UNAVAILABLE","SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED","healthConnectAvailability","isHealthConnectUnavailable","error","test","Error","message","String","useHealthConnectAuthorization","readIdentifiers","writeIdentifiers","backgroundAccess","onStatusChange","status","setStatus","useState","state","hasRequestedRef","useRef","hasRequestedBackgroundRef","identifiersRef","permissionsRef","current","readPermissions","map","recordType","accessType","writePermissions","backgroundPermissions","updateStatus","useCallback","nextStatus","checkAuthorization","availability","isInitialized","missingTypes","filter","permission","grantedPermissions","isGranted","some","granted","backgroundPermission","find","requiredPermissions","answeredWithSomeShared","backgroundGranted","undefined","length","requestAuthorization","useEffect","subscription","addEventListener","remove","AndroidHealthConnectAuthorizationProvider","memo","fallback","children","skipRequest","renderManualRequestUI","onAuthorizationStatusChange","authorizationStatus","backgroundAccessPending","shouldRenderManualRequestUI","includes","shouldRenderFallback","authorizationValue","useMemo","platform","request","content","Provider","value"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/components/android/android-health-connect-authorization-provider.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -116,20 +116,17 @@ export class BaseHealthSyncService {
|
|
|
116
116
|
let sentReadings = replacesSavedObservation(mode) ? await this.storageManager.getSentReadings(measurementTypeKey) : undefined;
|
|
117
117
|
let hasMore = true;
|
|
118
118
|
while (hasMore && !this.stateManager.shouldStopSync) {
|
|
119
|
+
const page = await this.dataProcessor.getObservationBodiesForType(measurementTypeKey, data, latestValidStartDate);
|
|
119
120
|
const {
|
|
120
|
-
observationBodies,
|
|
121
|
-
observationSyncIds,
|
|
122
|
-
observationRecordIds,
|
|
123
121
|
deletedRecordIds,
|
|
124
|
-
hasMore: currentHasMore,
|
|
125
122
|
anchors,
|
|
126
123
|
carriedRecords
|
|
127
|
-
} =
|
|
128
|
-
hasMore =
|
|
124
|
+
} = page;
|
|
125
|
+
hasMore = page.hasMore;
|
|
129
126
|
if (this.stateManager.shouldStopSync) {
|
|
130
127
|
break;
|
|
131
128
|
}
|
|
132
|
-
const readGroups = this.dataProcessor.identifyObservations(
|
|
129
|
+
const readGroups = this.dataProcessor.identifyObservations(page, mode);
|
|
133
130
|
const groups = sentReadings ? unsentReadings(readGroups, sentReadings) : readGroups;
|
|
134
131
|
const unchangedCount = readGroups.flat().length - groups.flat().length;
|
|
135
132
|
if (unchangedCount !== 0) {
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
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","page","getObservationBodiesForType","deletedRecordIds","anchors","carriedRecords","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":[]}
|
|
@@ -4,16 +4,22 @@
|
|
|
4
4
|
|
|
5
5
|
import { getHealthDataMode } from "../../types/health-sync-keys.js";
|
|
6
6
|
import { getDefaultHealthCoding } from "../../utils/default-health-coding.js";
|
|
7
|
-
import { getHealthRecordSourceId, getHealthRecordSyncId, getHealthRecordType } from "../../utils/get-health-record-sync-id.js";
|
|
7
|
+
import { getHealthDaySyncId, getHealthRecordSourceId, getHealthRecordSyncId, getHealthRecordType } from "../../utils/get-health-record-sync-id.js";
|
|
8
8
|
import { getLatestObservationDatesByCode } from "../../utils/get-latest-observation-dates-by-code.js";
|
|
9
9
|
import { getLatestValidStartDate } from "../../utils/get-latest-valid-start-date.js";
|
|
10
10
|
import { identifyImportedObservations } from "../../utils/identify-imported-observations.js";
|
|
11
|
+
import { isDailyAggregateMode } from "../../utils/is-daily-aggregate-mode.js";
|
|
11
12
|
import { readingGroupsFor } from "../../utils/reading-groups.js";
|
|
12
13
|
import { replacesSavedObservation } from "../../utils/replaces-saved-observation.js";
|
|
13
14
|
import { anchoredReadStart } from "../../utils/sync-window-start.js";
|
|
14
15
|
/** Where a read starts: from the newest import, or for a type read by anchor, from its history window. */
|
|
15
16
|
const readStart = (data, mode, anchor, latestValidStartDate) => anchor && !replacesSavedObservation(mode) ? anchoredReadStart(data.minDate, latestValidStartDate) : latestValidStartDate;
|
|
16
17
|
|
|
18
|
+
/** One page of a data type's readings, as observations, with what names them. */
|
|
19
|
+
|
|
20
|
+
/** A series keeps the hour it was read up to, not a provider anchor, so it is stored apart from its type's anchor. */
|
|
21
|
+
const anchorKeyFor = (typeIdentifier, mode) => mode === "series" ? `${typeIdentifier}:series` : typeIdentifier;
|
|
22
|
+
|
|
17
23
|
/** A record read twice, once held back and once again after a stop, counts once. */
|
|
18
24
|
const uniqueRecords = records => [...new Map(records.map(record => [getHealthRecordSourceId(record) ?? record, record])).values()];
|
|
19
25
|
const withoutDeletedRecords = (records, deletedRecordIds) => {
|
|
@@ -52,7 +58,7 @@ export class DataProcessor {
|
|
|
52
58
|
const totalCounts = await Promise.all(data.typeIdentifiers?.map(async ({
|
|
53
59
|
typeIdentifier
|
|
54
60
|
}) => {
|
|
55
|
-
const anchor = await this.storageManager.getAnchor(typeIdentifier);
|
|
61
|
+
const anchor = await this.storageManager.getAnchor(anchorKeyFor(typeIdentifier, mode));
|
|
56
62
|
return this.getTotalCountsFunction({
|
|
57
63
|
typeIdentifier: typeIdentifier,
|
|
58
64
|
startDate: latestValidStartDate?.toISOString(),
|
|
@@ -95,7 +101,7 @@ export class DataProcessor {
|
|
|
95
101
|
const results = await Promise.all(data.typeIdentifiers?.map(async ({
|
|
96
102
|
typeIdentifier
|
|
97
103
|
}) => {
|
|
98
|
-
const anchor = await this.storageManager.getAnchor(typeIdentifier);
|
|
104
|
+
const anchor = await this.storageManager.getAnchor(anchorKeyFor(typeIdentifier, mode));
|
|
99
105
|
return {
|
|
100
106
|
typeIdentifier,
|
|
101
107
|
result: await this.getDataFromProviderFunction({
|
|
@@ -108,9 +114,12 @@ export class DataProcessor {
|
|
|
108
114
|
})
|
|
109
115
|
};
|
|
110
116
|
}));
|
|
111
|
-
const newAnchors = results.
|
|
117
|
+
const newAnchors = results.flatMap(({
|
|
112
118
|
result
|
|
113
|
-
}) => result.anchor
|
|
119
|
+
}) => result.anchor ? [{
|
|
120
|
+
typeIdentifier: anchorKeyFor(result.anchor.typeIdentifier, mode),
|
|
121
|
+
anchor: result.anchor.anchor
|
|
122
|
+
}] : []);
|
|
114
123
|
const deletedRecordIds = results.flatMap(({
|
|
115
124
|
result
|
|
116
125
|
}) => result.deletedRecordIds ?? []);
|
|
@@ -143,7 +152,9 @@ export class DataProcessor {
|
|
|
143
152
|
typeIdentifierCodeSystems,
|
|
144
153
|
typeIdentifierCodeDisplays
|
|
145
154
|
})));
|
|
146
|
-
const
|
|
155
|
+
const daysByDate = isDailyAggregateMode(mode);
|
|
156
|
+
const observationSyncIds = dataGroups.map(group => daysByDate ? getHealthDaySyncId(group[0], measurementTypeKey) : getHealthRecordSyncId(group[0], measurementTypeKey));
|
|
157
|
+
const observationFormerSyncIds = daysByDate ? dataGroups.map(group => getHealthRecordSyncId(group[0], measurementTypeKey)) : undefined;
|
|
147
158
|
|
|
148
159
|
// A group is named after its first record, as its sync id is.
|
|
149
160
|
const observationRecordIds = dataGroups.map(group => getHealthRecordSourceId(group[0]));
|
|
@@ -151,18 +162,20 @@ export class DataProcessor {
|
|
|
151
162
|
observationBodies,
|
|
152
163
|
observationSyncIds,
|
|
153
164
|
observationRecordIds,
|
|
165
|
+
observationFormerSyncIds,
|
|
154
166
|
deletedRecordIds,
|
|
155
167
|
hasMore,
|
|
156
168
|
anchors: newAnchors,
|
|
157
169
|
carriedRecords: readingGroups ? heldReadings.flat() : undefined
|
|
158
170
|
};
|
|
159
171
|
}
|
|
160
|
-
identifyObservations(
|
|
172
|
+
identifyObservations(page, mode) {
|
|
161
173
|
return identifyImportedObservations({
|
|
162
|
-
groupedObservationBodies: observationBodies,
|
|
174
|
+
groupedObservationBodies: page.observationBodies,
|
|
163
175
|
provider: this.provider,
|
|
164
|
-
groupedObservationSyncIds: observationSyncIds,
|
|
165
|
-
groupedRecordIds: observationRecordIds,
|
|
176
|
+
groupedObservationSyncIds: page.observationSyncIds,
|
|
177
|
+
groupedRecordIds: page.observationRecordIds,
|
|
178
|
+
groupedFormerSyncIds: page.observationFormerSyncIds,
|
|
166
179
|
mode
|
|
167
180
|
});
|
|
168
181
|
}
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
1
|
+
{"version":3,"names":["getHealthDataMode","getDefaultHealthCoding","getHealthDaySyncId","getHealthRecordSourceId","getHealthRecordSyncId","getHealthRecordType","getLatestObservationDatesByCode","getLatestValidStartDate","identifyImportedObservations","isDailyAggregateMode","readingGroupsFor","replacesSavedObservation","anchoredReadStart","readStart","data","mode","anchor","latestValidStartDate","minDate","anchorKeyFor","typeIdentifier","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","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","hasMore","some","length","Boolean","readings","group","pageEnd","typeCount","lastRead","at","heldReadings","reading","mayContinue","dataGroups","includes","observationBodies","daysByDate","observationSyncIds","observationFormerSyncIds","observationRecordIds","anchors","flat","identifyObservations","page","groupedObservationBodies","groupedObservationSyncIds","groupedRecordIds","groupedFormerSyncIds","latestObservationDates","resolvedMode","resolvedData"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":";;AAAA;;AAaA,SACEA,iBAAiB,QAGZ,iCAA8B;AACrC,SAASC,sBAAsB,QAAQ,sCAAmC;AAC1E,SACEC,kBAAkB,EAClBC,uBAAuB,EACvBC,qBAAqB,EACrBC,mBAAmB,QACd,0CAAuC;AAC9C,SAASC,+BAA+B,QAAQ,qDAAkD;AAClG,SAASC,uBAAuB,QAAQ,4CAAyC;AACjF,SAASC,4BAA4B,QAAQ,+CAA4C;AACzF,SAASC,oBAAoB,QAAQ,wCAAqC;AAC1E,SAASC,gBAAgB,QAAQ,+BAA4B;AAC7D,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;;AAgBA;AACA,MAAME,YAAY,GAAGA,CAACC,cAAsB,EAAEL,IAAoB,KAChEA,IAAI,KAAK,QAAQ,GAAG,GAAGK,cAAc,SAAS,GAAGA,cAAc;;AAEjE;AACA,MAAMC,aAAa,GAAaC,OAAkB,IAAgB,CAChE,GAAG,IAAIC,GAAG,CACRD,OAAO,CAACE,GAAG,CAAEC,MAAM,IAAK,CAACtB,uBAAuB,CAACsB,MAAM,CAAC,IAAIA,MAAM,EAAEA,MAAM,CAAC,CAC7E,CAAC,CAACC,MAAM,CAAC,CAAC,CACX;AAED,MAAMC,qBAAqB,GAAGA,CAC5BL,OAAkB,EAClBM,gBAA0B,KACZ;EACd,MAAMC,OAAO,GAAG,IAAIC,GAAG,CAACF,gBAAgB,CAAC;EAEzC,OAAON,OAAO,CAACS,MAAM,CAAEN,MAAM,IAAK,CAACI,OAAO,CAACG,GAAG,CAAC7B,uBAAuB,CAACsB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,OAAO,MAAMQ,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,EAAElC,IAAI,CAAC,KACjCA,IAAI,EAAEmC,eAAe,CAACzB,GAAG,CAAC,CAAC;MAAEJ,cAAc;MAAE8B;IAAK,CAAC,KACjDC,MAAM,CACJD,IAAI,IACFjD,sBAAsB,CACpB,IAAI,CAACoC,QAAQ,EACbW,GAAG,EACHG,MAAM,CAAC/B,cAAc,CAAC,EACtBpB,iBAAiB,CAACgD,GAAG,EAAElC,IAAI,CAACC,IAAI,CAClC,CAAC,CAACmC,IACN,CACF,CAAC,IAAI,EACP,CAAC;EACH;EAEA,MAAME,yBAAyBA,CAACR,UAAuB,EAKrD;IACA,MAAMS,KAAK,GAAG,IAAI,CAACV,YAAY,CAACC,UAAU,CAAC;IAE3C,OAAOtC,+BAA+B,CAAC;MACrC6B,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBkB,KAAK;MACLjB,SAAS,EAAE,IAAI,CAACA,SAAS;MACzBC,QAAQ,EAAE,IAAI,CAACA;IACjB,CAAC,CAAC;EACJ;EAEA,MAAMiB,2BAA2BA,CAC/BC,kBAAiC,EACjCzC,IAA6C,EAC7CG,oBAAsC,EACrB;IACjB,MAAMF,IAAI,GAAGf,iBAAiB,CAACuD,kBAAkB,EAAEzC,IAAI,CAACC,IAAI,CAAC;IAE7D,MAAMyC,WAAW,GAAG,MAAMC,OAAO,CAACC,GAAG,CACnC5C,IAAI,CAACmC,eAAe,EAAEzB,GAAG,CAAC,OAAO;MAAEJ;IAAe,CAAC,KAAK;MACtD,MAAMJ,MAAM,GAAG,MAAM,IAAI,CAACuB,cAAc,CAACoB,SAAS,CAACxC,YAAY,CAACC,cAAc,EAAEL,IAAI,CAAC,CAAC;MAEtF,OAAO,IAAI,CAACyB,sBAAsB,CAAC;QACjCpB,cAAc,EAAEA,cAAiC;QACjDwC,SAAS,EAAE3C,oBAAoB,EAAE4C,WAAW,CAAC,CAAC;QAC9C7C,MAAM;QACND;MACF,CAAC,CAAC;IACJ,CAAC,CACH,CAAC;IAED,OAAOyC,WAAW,CAACM,MAAM,CAAC,CAACC,GAAG,EAAEC,KAAK,KAAKD,GAAG,GAAGC,KAAK,EAAE,CAAC,CAAC;EAC3D;EAEA,MAAMC,2BAA2BA,CAC/BV,kBAAiC,EACjCzC,IAA6C,EAC7CG,oBAAsC,EACO;IAC7C,MAAMF,IAAI,GAAGf,iBAAiB,CAACuD,kBAAkB,EAAEzC,IAAI,CAACC,IAAI,CAAC;IAE7D,MAAMmD,iBAAiB,GAAGpD,IAAI,CAACmC,eAAe,CAACzB,GAAG,CAChD,CAAC;MAAEJ,cAAc;MAAE8B,IAAI;MAAEiB,MAAM;MAAEC;IAAQ,CAAC,KAAK;MAC7C,MAAMC,aAAa,GAAGpE,sBAAsB,CAC1C,IAAI,CAACoC,QAAQ,EACbkB,kBAAkB,EAClBJ,MAAM,CAAC/B,cAAc,CAAC,EACtBL,IACF,CAAC;MAED,OAAO;QACLK,cAAc,EAAE+B,MAAM,CAAC/B,cAAc,CAAC;QACtC8B,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,GAAGzB,MAAM,CAAC0B,WAAW,CAC5CN,iBAAiB,CAAC1C,GAAG,CAAC,CAAC;MAAEJ,cAAc;MAAE8B;IAAK,CAAC,KAAK,CAClD9B,cAAc,EACd8B,IAAI,CACL,CACH,CAAC;IAED,MAAMuB,yBAAyB,GAAG3B,MAAM,CAAC0B,WAAW,CAClDN,iBAAiB,CAACnB,OAAO,CAAC,CAAC;MAAE3B,cAAc;MAAE+C;IAAO,CAAC,KACnDA,MAAM,GAAG,CAAC,CAAC/C,cAAc,EAAE+C,MAAM,CAAC,CAAC,GAAG,EACxC,CACF,CAAC;IAED,MAAMO,0BAA0B,GAAG5B,MAAM,CAAC0B,WAAW,CACnDN,iBAAiB,CAACnB,OAAO,CAAC,CAAC;MAAE3B,cAAc;MAAEgD;IAAQ,CAAC,KACpDA,OAAO,GAAG,CAAC,CAAChD,cAAc,EAAEgD,OAAO,CAAC,CAAC,GAAG,EAC1C,CACF,CAAC;IAED,MAAMO,aAAa,GAAGjE,gBAAgB,CAAC,IAAI,CAAC2B,QAAQ,EAAEkB,kBAAkB,CAAC;IAEzE,MAAMqB,cAAc,GAAGD,aAAa,GAC9B,MAAM,IAAI,CAACpC,cAAc,CAACsC,iBAAiB,CAACtB,kBAAkB,CAAC,GACjE,EAAE;IAEN,MAAMuB,OAAO,GAAG,MAAMrB,OAAO,CAACC,GAAG,CAC/B5C,IAAI,CAACmC,eAAe,EAAEzB,GAAG,CAAC,OAAO;MAAEJ;IAAe,CAAC,KAAK;MACtD,MAAMJ,MAAM,GAAG,MAAM,IAAI,CAACuB,cAAc,CAACoB,SAAS,CAACxC,YAAY,CAACC,cAAc,EAAEL,IAAI,CAAC,CAAC;MAEtF,OAAO;QACLK,cAAc;QACd2D,MAAM,EAAE,MAAM,IAAI,CAACtC,2BAA2B,CAAC;UAC7CrB,cAAc,EAAEA,cAAiC;UACjD4B,GAAG,EAAEO,kBAAkB;UACvBK,SAAS,EAAE/C,SAAS,CAACC,IAAI,EAAEC,IAAI,EAAEC,MAAM,EAAEC,oBAAoB,CAAC,EAAE4C,WAAW,CAAC,CAAC;UAC7E7C,MAAM;UACNsB,SAAS,EAAE,IAAI,CAACA,SAAS;UACzBvB;QACF,CAAC;MACH,CAAC;IACH,CAAC,CACH,CAAC;IAED,MAAMiE,UAAU,GAAGF,OAAO,CAAC/B,OAAO,CAAC,CAAC;MAAEgC;IAAO,CAAC,KAC5CA,MAAM,CAAC/D,MAAM,GACT,CAAC;MAAEI,cAAc,EAAED,YAAY,CAAC4D,MAAM,CAAC/D,MAAM,CAACI,cAAc,EAAEL,IAAI,CAAC;MAAEC,MAAM,EAAE+D,MAAM,CAAC/D,MAAM,CAACA;IAAO,CAAC,CAAC,GACpG,EACN,CAAC;IAED,MAAMY,gBAAgB,GAAGkD,OAAO,CAAC/B,OAAO,CACtC,CAAC;MAAEgC;IAAO,CAAC,KAAKA,MAAM,CAACnD,gBAAgB,IAAI,EAC7C,CAAC;IAED,MAAMqD,OAAO,GAAGH,OAAO,CAACI,IAAI,CAC1B,CAAC;MAAEH;IAAO,CAAC,KACTA,MAAM,CAACE,OAAO,KACb,CAACF,MAAM,CAACjE,IAAI,CAACqE,MAAM,IAAI,IAAI,CAAC7C,SAAS,IACpC,CAACyC,MAAM,CAACnD,gBAAgB,EAAEuD,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC7C,SAAS,KACxD8C,OAAO,CAACL,MAAM,CAAC/D,MAAM,CAAC,CAC5B,CAAC;;IAED;IACA,MAAMM,OAAO,GAAGK,qBAAqB,CACnCN,aAAa,CACXyD,OAAO,CAAC/B,OAAO,CAAC,CAAC;MAAE3B,cAAc;MAAE2D;IAAO,CAAC,KAAK,CAC9C,GAAGH,cAAc,CAAC7C,MAAM,CACrBN,MAAM,IAAKpB,mBAAmB,CAACoB,MAAM,CAAC,KAAK0B,MAAM,CAAC/B,cAAc,CACnE,CAAC,EACD,GAAG2D,MAAM,CAACjE,IAAI,CACf,CACH,CAAC,EACDc,gBACF,CAAC;IAED,MAAMyD,QAAQ,GAAGV,aAAa,EAAEW,KAAK,CAAChE,OAAO,CAAC,IAAIA,OAAO,CAACE,GAAG,CAAEC,MAAM,IAAK,CAACA,MAAM,CAAC,CAAC;IAEnF,MAAM8D,OAAO,GAAG;MACdC,SAAS,EAAE1E,IAAI,CAACmC,eAAe,CAACkC,MAAM;MACtCM,QAAQ,EAAE,IAAI3D,GAAG,CAACgD,OAAO,CAACtD,GAAG,CAAC,CAAC;QAAEuD;MAAO,CAAC,KAAKA,MAAM,CAACjE,IAAI,CAAC4E,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,MAAMC,YAAY,GAAGV,OAAO,GACxBI,QAAQ,CAACtD,MAAM,CAAE6D,OAAO,IAAKjB,aAAa,EAAEkB,WAAW,CAACD,OAAO,EAAEL,OAAO,CAAC,CAAC,GAC1E,EAAE;IAEN,MAAMO,UAAU,GAAGT,QAAQ,CAACtD,MAAM,CAAE6D,OAAO,IAAK,CAACD,YAAY,CAACI,QAAQ,CAACH,OAAO,CAAC,CAAC;IAEhF,MAAMI,iBAAiB,GAAG,MAAMvC,OAAO,CAACC,GAAG,CACzCoC,UAAU,CAACtE,GAAG,CAAE8D,KAAK,IACnB,IAAI,CAAC5C,oBAAoB,CAAC;MACxB5B,IAAI,EAAEwE,KAAK;MACXnD,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBC,SAAS,EAAE,IAAI,CAACA,SAAS;MACzBmB,kBAAkB;MAClBnC,cAAc,EACZN,IAAI,CAACmC,eAAe,EAAEkC,MAAM,KAAK,CAAC,GAC9BhC,MAAM,CAACrC,IAAI,CAACmC,eAAe,CAAC,CAAC,CAAC,EAAE7B,cAAc,CAAC,GAC/CkD,SAAS;MACfvD,IAAI;MACJwD,mBAAmB;MACnBE,yBAAyB;MACzBC;IACF,CAAC,CACH,CACF,CAAC;IAED,MAAMuB,UAAU,GAAGxF,oBAAoB,CAACM,IAAI,CAAC;IAE7C,MAAMmF,kBAAkB,GAAGJ,UAAU,CAACtE,GAAG,CAAE8D,KAAK,IAC9CW,UAAU,GACN/F,kBAAkB,CAACoF,KAAK,CAAC,CAAC,CAAC,EAAE/B,kBAAkB,CAAC,GAChDnD,qBAAqB,CAACkF,KAAK,CAAC,CAAC,CAAC,EAAE/B,kBAAkB,CACxD,CAAC;IAED,MAAM4C,wBAAwB,GAAGF,UAAU,GACvCH,UAAU,CAACtE,GAAG,CAAE8D,KAAK,IAAKlF,qBAAqB,CAACkF,KAAK,CAAC,CAAC,CAAC,EAAE/B,kBAAkB,CAAC,CAAC,GAC9Ee,SAAS;;IAEb;IACA,MAAM8B,oBAAoB,GAAGN,UAAU,CAACtE,GAAG,CAAE8D,KAAK,IAChDnF,uBAAuB,CAACmF,KAAK,CAAC,CAAC,CAAC,CAClC,CAAC;IAED,OAAO;MACLU,iBAAiB;MACjBE,kBAAkB;MAClBE,oBAAoB;MACpBD,wBAAwB;MACxBvE,gBAAgB;MAChBqD,OAAO;MACPoB,OAAO,EAAErB,UAAU;MACnBJ,cAAc,EAAED,aAAa,GAAGgB,YAAY,CAACW,IAAI,CAAC,CAAC,GAAGhC;IACxD,CAAC;EACH;EAEAiC,oBAAoBA,CAACC,IAAqB,EAAEzF,IAAqB,EAAE;IACjE,OAAOP,4BAA4B,CAAC;MAClCiG,wBAAwB,EAAED,IAAI,CAACR,iBAAiB;MAChD3D,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvBqE,yBAAyB,EAAEF,IAAI,CAACN,kBAAkB;MAClDS,gBAAgB,EAAEH,IAAI,CAACJ,oBAAoB;MAC3CQ,oBAAoB,EAAEJ,IAAI,CAACL,wBAAwB;MACnDpF;IACF,CAAC,CAAC;EACJ;EAEAR,uBAAuBA,CACrBsG,sBAGE,EACF/F,IAA6C,EAC7CyC,kBAAiC,EACjCxC,IAA4D,EAC1C;IAClB,MAAM+F,YAAY,GAAG9G,iBAAiB,CAACuD,kBAAkB,EAAExC,IAAI,IAAID,IAAI,CAACC,IAAI,CAAC;IAE7E,MAAMgG,YAAY,GAAG;MACnB,GAAGjG,IAAI;MACPmC,eAAe,EAAEnC,IAAI,CAACmC,eAAe,CAACzB,GAAG,CAAC,CAAC;QAAEJ,cAAc;QAAE8B;MAAK,CAAC,MAAM;QACvE9B,cAAc;QACd8B,IAAI,EACFA,IAAI,IACJjD,sBAAsB,CACpB,IAAI,CAACoC,QAAQ,EACbkB,kBAAkB,EAClBJ,MAAM,CAAC/B,cAAc,CAAC,EACtB0F,YACF,CAAC,CAAC5D;MACJ,CAAC,CACH;IACF,CAAC;IAED,OAAO3C,uBAAuB,CAAC;MAC7BsG,sBAAsB;MACtB/F,IAAI,EAAEiG,YAAqE;MAC3EhG,IAAI,EAAE+F;IACR,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
|