@ovok/native 1.17.0-dev.2285 → 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 +11 -8
- 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 +53 -20
- package/lib/commonjs/modules/data-sync/services/managers/data-processor.js.map +1 -1
- package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js +14 -0
- package/lib/commonjs/modules/data-sync/services/managers/storage-manager.js.map +1 -1
- package/lib/commonjs/modules/data-sync/utils/get-health-record-sync-id.js +30 -4
- 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/commonjs/modules/data-sync/utils/reading-groups.js +38 -0
- package/lib/commonjs/modules/data-sync/utils/reading-groups.js.map +1 -0
- 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 +11 -8
- 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 +55 -22
- package/lib/module/modules/data-sync/services/managers/data-processor.js.map +1 -1
- package/lib/module/modules/data-sync/services/managers/storage-manager.js +14 -0
- package/lib/module/modules/data-sync/services/managers/storage-manager.js.map +1 -1
- package/lib/module/modules/data-sync/utils/get-health-record-sync-id.js +26 -2
- 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/module/modules/data-sync/utils/reading-groups.js +35 -0
- package/lib/module/modules/data-sync/utils/reading-groups.js.map +1 -0
- 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 -14
- 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/services/managers/storage-manager.d.ts +4 -0
- 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/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 +8 -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/commonjs/src/modules/data-sync/utils/reading-groups.d.ts +17 -0
- package/lib/typescript/commonjs/src/modules/data-sync/utils/reading-groups.d.ts.map +1 -0
- 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 -14
- 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/services/managers/storage-manager.d.ts +4 -0
- 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/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 +8 -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/lib/typescript/module/src/modules/data-sync/utils/reading-groups.d.ts +17 -0
- package/lib/typescript/module/src/modules/data-sync/utils/reading-groups.d.ts.map +1 -0
- package/package.json +1 -1
|
@@ -12,6 +12,7 @@ var _healthkitDataTypes = require("./healthkit-data-types.js");
|
|
|
12
12
|
var _healthkitQueryOptions = require("./healthkit-query-options.js");
|
|
13
13
|
var _healthkitSamples = require("./healthkit-samples.js");
|
|
14
14
|
var _healthkitSeries = require("./healthkit-series.js");
|
|
15
|
+
var _hourlySeries = require("./hourly-series.js");
|
|
15
16
|
var _isDailyAggregateMode = require("./is-daily-aggregate-mode.js");
|
|
16
17
|
var _syncWindowStart = require("./sync-window-start.js");
|
|
17
18
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
@@ -28,7 +29,7 @@ const getSamplesFromHealth = async ({
|
|
|
28
29
|
if (!(0, _healthkitDataTypes.isQuantityIdentifier)(typeIdentifier)) {
|
|
29
30
|
throw new _healthkitDataTypes.UnsupportedHealthKitDataError(typeIdentifier, `HealthKit ${mode} mode is only supported for quantity samples.`);
|
|
30
31
|
}
|
|
31
|
-
return mode === "series" ? (0, _healthkitSeries.getHealthKitSeries)(typeIdentifier, startDate) : (0, _healthkitDailyStatistics.getDailyStatistics)(typeIdentifier, mode, startDate, endDate);
|
|
32
|
+
return mode === "series" ? (0, _healthkitSeries.getHealthKitSeries)(typeIdentifier, (0, _hourlySeries.seriesPage)(startDate, anchor, chunkSize)) : (0, _healthkitDailyStatistics.getDailyStatistics)(typeIdentifier, mode, startDate, endDate);
|
|
32
33
|
}
|
|
33
34
|
const filter = (0, _healthkitQueryOptions.strictDateWindow)(startDate, endDate);
|
|
34
35
|
const options = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeHealthkit","_interopRequireWildcard","require","_constants","_healthUnits","_healthkitDailyStatistics","_healthkitDataTypes","_healthkitQueryOptions","_healthkitSamples","_healthkitSeries","_isDailyAggregateMode","_syncWindowStart","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","getSamplesFromHealth","startDate","_startDate","typeIdentifier","anchor","chunkSize","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","mode","syncWindowStart","endDate","Date","isDailyAggregateMode","isQuantityIdentifier","UnsupportedHealthKitDataError","getHealthKitSeries","getDailyStatistics","filter","strictDateWindow","options","limit","datesFrom","WorkoutTypeIdentifier","result","Healthkit","queryWorkoutSamplesWithAnchor","toAnchoredResult","workouts","map","toWorkoutRecord","ElectrocardiogramTypeIdentifier","Math","min","ECG_PAGE_SIZE","queryElectrocardiogramSamplesWithAnchor","includeVoltages","samples","toEcgRecord","hasMore","length","queryHeartbeatSeriesSamplesWithAnchor","toPlainSample","isCategoryIdentifier","queryCategorySamplesWithAnchor","isCorrelationIdentifier","correlations","queryCorrelationSamples","ALL_SAMPLES","ascending","data","toPlainCorrelation","undefined","queryStateOfMindSamples","queryQuantitySamplesWithAnchor","unit","healthUnitFor","unsupportedHealthKitTypeReason","exports","deletedRecordIds","recordIds","uuid","deletedSamples","newAnchor"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-samples-from-health.ts"],"mappings":";;;;;;AAAA,IAAAA,qBAAA,GAAAC,uBAAA,CAAAC,OAAA;AAKA,IAAAC,UAAA,GAAAD,OAAA;AAIA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,yBAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAOA,IAAAK,sBAAA,GAAAL,OAAA;AACA,IAAAM,iBAAA,GAAAN,OAAA;AAMA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,
|
|
1
|
+
{"version":3,"names":["_reactNativeHealthkit","_interopRequireWildcard","require","_constants","_healthUnits","_healthkitDailyStatistics","_healthkitDataTypes","_healthkitQueryOptions","_healthkitSamples","_healthkitSeries","_hourlySeries","_isDailyAggregateMode","_syncWindowStart","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","getSamplesFromHealth","startDate","_startDate","typeIdentifier","anchor","chunkSize","DEFAULT_HEALTH_SYNC_CHUNK_SIZE","mode","syncWindowStart","endDate","Date","isDailyAggregateMode","isQuantityIdentifier","UnsupportedHealthKitDataError","getHealthKitSeries","seriesPage","getDailyStatistics","filter","strictDateWindow","options","limit","datesFrom","WorkoutTypeIdentifier","result","Healthkit","queryWorkoutSamplesWithAnchor","toAnchoredResult","workouts","map","toWorkoutRecord","ElectrocardiogramTypeIdentifier","Math","min","ECG_PAGE_SIZE","queryElectrocardiogramSamplesWithAnchor","includeVoltages","samples","toEcgRecord","hasMore","length","queryHeartbeatSeriesSamplesWithAnchor","toPlainSample","isCategoryIdentifier","queryCategorySamplesWithAnchor","isCorrelationIdentifier","correlations","queryCorrelationSamples","ALL_SAMPLES","ascending","data","toPlainCorrelation","undefined","queryStateOfMindSamples","queryQuantitySamplesWithAnchor","unit","healthUnitFor","unsupportedHealthKitTypeReason","exports","deletedRecordIds","recordIds","uuid","deletedSamples","newAnchor"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-samples-from-health.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.getTotalRecordsCount = void 0;
|
|
7
7
|
var _reactNativeHealthConnect = require("react-native-health-connect");
|
|
8
8
|
var _getRecordsFromHealthConnect = require("./get-records-from-health-connect.js");
|
|
9
|
+
var _hourlySeries = require("./hourly-series.js");
|
|
9
10
|
var _syncWindowStart = require("./sync-window-start.js");
|
|
10
11
|
/** How many records a read will import, for progress; a type that can't be counted counts 0 and fails on its read. */
|
|
11
12
|
const getTotalRecordsCount = props => countRecords(props).catch(() => 0);
|
|
@@ -16,6 +17,9 @@ const countRecords = async ({
|
|
|
16
17
|
anchor,
|
|
17
18
|
mode = "point"
|
|
18
19
|
}) => {
|
|
20
|
+
if (mode === "series") {
|
|
21
|
+
return (0, _hourlySeries.seriesHoursLeft)((0, _syncWindowStart.syncWindowStart)(_startDate), anchor);
|
|
22
|
+
}
|
|
19
23
|
if (mode !== "point" && mode !== "session") {
|
|
20
24
|
const result = await (0, _getRecordsFromHealthConnect.getRecordsFromHealthConnect)({
|
|
21
25
|
typeIdentifier,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeHealthConnect","require","_getRecordsFromHealthConnect","_syncWindowStart","getTotalRecordsCount","props","countRecords","catch","exports","typeIdentifier","startDate","_startDate","anchor","mode","result","getRecordsFromHealthConnect","data","length","
|
|
1
|
+
{"version":3,"names":["_reactNativeHealthConnect","require","_getRecordsFromHealthConnect","_hourlySeries","_syncWindowStart","getTotalRecordsCount","props","countRecords","catch","exports","typeIdentifier","startDate","_startDate","anchor","mode","seriesHoursLeft","syncWindowStart","result","getRecordsFromHealthConnect","data","length","toISOString","endDate","Date","timeRangeFilter","operator","startTime","endTime","totalRecordsCount","totalResultsFetched","totalPageToken","startsWith","undefined","totalResult","readRecords","pageSize","pageToken","records"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-total-records-count.ts"],"mappings":";;;;;;AAAA,IAAAA,yBAAA,GAAAC,OAAA;AAQA,IAAAC,4BAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEA;AACO,MAAMI,oBAAoB,GAC/BC,KAAqC,IACjBC,YAAY,CAACD,KAAK,CAAC,CAACE,KAAK,CAAC,MAAM,CAAC,CAAC;AAACC,OAAA,CAAAJ,oBAAA,GAAAA,oBAAA;AAEzD,MAAME,YAAY,GAAG,MAAAA,CAAO;EAC1BG,cAAc;EACdC,SAAS,EAAEC,UAAU;EACrBC,MAAM;EACNC,IAAI,GAAG;AACuB,CAAC,KAAsB;EACrD,IAAIA,IAAI,KAAK,QAAQ,EAAE;IACrB,OAAO,IAAAC,6BAAe,EAAC,IAAAC,gCAAe,EAACJ,UAAU,CAAC,EAAEC,MAAM,CAAC;EAC7D;EAEA,IAAIC,IAAI,KAAK,OAAO,IAAIA,IAAI,KAAK,SAAS,EAAE;IAC1C,MAAMG,MAAM,GAAG,MAAM,IAAAC,wDAA2B,EAAC;MAC/CR,cAAc;MACdC,SAAS,EAAEC,UAAU;MACrBC,MAAM;MACNC;IACF,CAAC,CAAC;IAEF,OAAOG,MAAM,CAACE,IAAI,CAACC,MAAM;EAC3B;EAEA,MAAMT,SAAS,GAAG,IAAAK,gCAAe,EAACJ,UAAU,CAAC,CAACS,WAAW,CAAC,CAAC;EAE3D,MAAMC,OAAO,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACF,WAAW,CAAC,CAAC;EAExC,MAAMG,eAAe,GAAG;IACtBC,QAAQ,EAAE,SAAkB;IAC5BC,SAAS,EAAEf,SAAS;IACpBgB,OAAO,EAAEL;EACX,CAAC;EAED,IAAIM,iBAAiB,GAAG,CAAC;EACzB,IAAIC,mBAAmB,GAAG,KAAK;;EAE/B;EACA;EACA,IAAIC,cAAkC,GAAGjB,MAAM,EAAEkB,UAAU,CAAC,GAAG,CAAC,GAC5DC,SAAS,GACTnB,MAAM;EAEV,OAAO,CAACgB,mBAAmB,EAAE;IAC3B,MAAMI,WAA0C,GAAG,MAAM,IAAAC,qCAAW,EAClExB,cAAc,EACd;MACEc,eAAe;MACfW,QAAQ,EAAE,CAAC,GAAG,IAAI;MAClBC,SAAS,EAAEN;IACb,CACF,CAAC;IAEDF,iBAAiB,IAAIK,WAAW,CAACI,OAAO,CAACjB,MAAM;IAE/CS,mBAAmB,GAAG,CAACI,WAAW,CAACG,SAAS;IAC5CN,cAAc,GAAGG,WAAW,CAACG,SAAS;EACxC;EAEA,OAAOR,iBAAiB;AAC1B,CAAC","ignoreList":[]}
|
|
@@ -9,6 +9,7 @@ var _getSamplesFromHealth = require("./get-samples-from-health.js");
|
|
|
9
9
|
var _healthUnits = require("./health-units.js");
|
|
10
10
|
var _healthkitDataTypes = require("./healthkit-data-types.js");
|
|
11
11
|
var _healthkitQueryOptions = require("./healthkit-query-options.js");
|
|
12
|
+
var _hourlySeries = require("./hourly-series.js");
|
|
12
13
|
var _syncWindowStart = require("./sync-window-start.js");
|
|
13
14
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
15
|
const getTotalSamplesCount = async props => {
|
|
@@ -18,6 +19,9 @@ const getTotalSamplesCount = async props => {
|
|
|
18
19
|
anchor,
|
|
19
20
|
mode = "point"
|
|
20
21
|
} = props;
|
|
22
|
+
if (mode === "series") {
|
|
23
|
+
return (0, _hourlySeries.seriesHoursLeft)((0, _syncWindowStart.syncWindowStart)(startDate), anchor);
|
|
24
|
+
}
|
|
21
25
|
if (mode !== "point" || !(0, _healthkitDataTypes.isQuantityIdentifier)(typeIdentifier)) {
|
|
22
26
|
try {
|
|
23
27
|
const result = await (0, _getSamplesFromHealth.getSamplesFromHealth)(props);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeHealthkit","_interopRequireDefault","require","_getSamplesFromHealth","_healthUnits","_healthkitDataTypes","_healthkitQueryOptions","_syncWindowStart","e","__esModule","default","getTotalSamplesCount","props","typeIdentifier","startDate","anchor","mode","isQuantityIdentifier","result","getSamplesFromHealth","data","length","Healthkit","queryQuantitySamplesWithAnchor","limit","ALL_SAMPLES","unit","healthUnitFor","filter","datesFrom","
|
|
1
|
+
{"version":3,"names":["_reactNativeHealthkit","_interopRequireDefault","require","_getSamplesFromHealth","_healthUnits","_healthkitDataTypes","_healthkitQueryOptions","_hourlySeries","_syncWindowStart","e","__esModule","default","getTotalSamplesCount","props","typeIdentifier","startDate","anchor","mode","seriesHoursLeft","syncWindowStart","isQuantityIdentifier","result","getSamplesFromHealth","data","length","Healthkit","queryQuantitySamplesWithAnchor","limit","ALL_SAMPLES","unit","healthUnitFor","filter","datesFrom","samples","exports"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-total-samples-count.ts"],"mappings":";;;;;;AAAA,IAAAA,qBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAKA,IAAAC,qBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AAAsD,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE/C,MAAMG,oBAAoB,GAAG,MAClCC,KAAwD,IACpC;EACpB,MAAM;IAAEC,cAAc;IAAEC,SAAS;IAAEC,MAAM;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAEnE,IAAII,IAAI,KAAK,QAAQ,EAAE;IACrB,OAAO,IAAAC,6BAAe,EAAC,IAAAC,gCAAe,EAACJ,SAAS,CAAC,EAAEC,MAAM,CAAC;EAC5D;EAEA,IAAIC,IAAI,KAAK,OAAO,IAAI,CAAC,IAAAG,wCAAoB,EAACN,cAAc,CAAC,EAAE;IAC7D,IAAI;MACF,MAAMO,MAAM,GAAG,MAAM,IAAAC,0CAAoB,EAACT,KAAK,CAAC;MAEhD,OAAOQ,MAAM,CAACE,IAAI,CAACC,MAAM;IAC3B,CAAC,CAAC,MAAM;MACN,OAAO,CAAC;IACV;EACF;EAEA,IAAI;IACF,MAAMH,MAAM,GAAG,MAAMI,6BAAS,CAACC,8BAA8B,CAC3DZ,cAAc,EACd;MACEa,KAAK,EAAEC,kCAAW;MAClBZ,MAAM;MACNa,IAAI,EAAE,IAAAC,0BAAa,EAAChB,cAAc,CAAC;MACnCiB,MAAM,EAAE,IAAAC,gCAAS,EAAC,IAAAb,gCAAe,EAACJ,SAAS,CAAC;IAC9C,CACF,CAAC;IAED,OAAOM,MAAM,EAAEY,OAAO,EAAET,MAAM,IAAI,CAAC;EACrC,CAAC,CAAC,MAAM;IACN,OAAO,CAAC;EACV;AACF,CAAC;AAACU,OAAA,CAAAtB,oBAAA,GAAAA,oBAAA","ignoreList":[]}
|
|
@@ -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":";;;;;;AAAA,IAAAA,yBAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,yBAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AAEA,MAAMI,eAAe,GAAG,WAAW;AAEnC,MAAMC,OAAO,GAAGA,CAACC,IAAU,EAAEC,EAAQ,MAAM;EACzCC,QAAQ,EAAE,SAAkB;EAC5BC,SAAS,EAAEH,IAAI,CAACI,WAAW,CAAC,CAAC;EAC7BC,OAAO,EAAEJ,EAAE,CAACG,WAAW,CAAC;AAC1B,CAAC,CAAC;;AAEF;AACA,MAAME,gBAAgB,GAAG,MAAAA,CAAON,IAAU,EAAEC,EAAQ,KAA6B;EAC/E,MAAMM,MAAM,GAAG,MAAM,IAAAC,kDAAwB,EAAC;IAC5CC,UAAU,EAAE,WAAW;IACvBC,eAAe,EAAEX,OAAO,CAACC,IAAI,EAAEC,EAAE,CAAC;IAClCU,eAAe,EAAE;MAAEC,QAAQ,EAAE,SAAS;MAAEC,MAAM,EAAE;IAAE;EACpD,CAAC,CAAC;EAEF,OAAON,MAAM,CAACO,OAAO,CAAEC,KAAK,IAAK;IAC/B,MAAMC,OAAO,GAAID,KAAK,CAACE,MAAM,CAA2BC,OAAO;IAE/D,OAAO,OAAOF,OAAO,KAAK,QAAQ,IAAIG,MAAM,CAACC,QAAQ,CAACJ,OAAO,CAAC,GAC1D,CAAC;MAAEK,KAAK,EAAE,IAAIC,IAAI,CAACP,KAAK,CAACZ,SAAS,CAAC;MAAEoB,KAAK,EAAEP;IAAQ,CAAC,CAAC,GACtD,EAAE;EACR,CAAC,CAAC;AACJ,CAAC;;AAED;AACA,MAAMQ,aAAa,GAAG,MAAAA,CACpBC,cAA0B,EAC1BzB,IAAU,EACVC,EAAQ,KAC+C;EACvD,MAAMyB,IAAI,GAAG,IAAIC,GAAG,CAA2C,CAAC;EAChE,IAAIC,IAAwB;EAC5B,IAAIC,SAA6B;EAEjC,GAAG;IACD,MAAMC,IAAI,GAAG,MAAM,IAAAC,qCAAW,EAACN,cAAc,EAAE;MAAEf,eAAe,EAAEX,OAAO,CAACC,IAAI,EAAEC,EAAE,CAAC;MAAE4B;IAAU,CAAC,CAAC;IAEjGC,IAAI,CAACE,OAAO,CAACC,OAAO,CAAEC,MAAM,IAAK;MAC/B,MAAMC,GAAG,GAAGD,MAA4C;MACxD,MAAME,QAAQ,GAAG,IAAAC,sCAAY,EAACF,GAAG,CAAC;MAClC,MAAMG,IAAI,GAAGH,GAAG,CAACG,IAAI,IAAIH,GAAG,CAAChC,SAAS;MAEtC,IAAI,CAACiC,QAAQ,IAAI,OAAOE,IAAI,KAAK,QAAQ,EAAE;QACzC;MACF;MAEA,MAAMC,MAAM,GAAGC,IAAI,CAACC,KAAK,CAAC,IAAInB,IAAI,CAACgB,IAAI,CAAC,CAACI,OAAO,CAAC,CAAC,GAAGC,yBAAc,CAAC,GAAGA,yBAAc;MACrF,MAAMC,GAAG,GAAGlB,IAAI,CAACmB,GAAG,CAACN,MAAM,CAAC,IAAI;QAAEO,KAAK,EAAE,CAAC;QAAEC,KAAK,EAAE;MAAE,CAAC;MAEtDrB,IAAI,CAACsB,GAAG,CAACT,MAAM,EAAE;QAAEO,KAAK,EAAEF,GAAG,CAACE,KAAK,GAAGV,QAAQ,CAACb,KAAK;QAAEwB,KAAK,EAAEH,GAAG,CAACG,KAAK,GAAG;MAAE,CAAC,CAAC;MAC7EnB,IAAI,KAAKQ,QAAQ,CAACR,IAAI;IACxB,CAAC,CAAC;IACFC,SAAS,GAAGC,IAAI,CAACD,SAAS;EAC5B,CAAC,QAAQA,SAAS;EAElB,OAAO;IACLD,IAAI;IACJqB,OAAO,EAAE,CAAC,GAAGvB,IAAI,CAACwB,OAAO,CAAC,CAAC,CAAC,CAACC,GAAG,CAAC,CAAC,CAACZ,MAAM,EAAE;MAAEO,KAAK;MAAEC;IAAM,CAAC,CAAC,MAAM;MAAE1B,KAAK,EAAE,IAAIC,IAAI,CAACiB,MAAM,CAAC;MAAEhB,KAAK,EAAEuB,KAAK,GAAGC;IAAM,CAAC,CAAC;EACtH,CAAC;AACH,CAAC;;AAED;AACA,MAAMK,sBAAsB,GAAG,MAAAA,CAAO3B,cAA0B,EAAEK,IAAgB,KAAK;EACrF,MAAMmB,OAAsB,GAAG,EAAE;EACjC,IAAIrB,IAAI,GAAGH,cAAc,KAAK,WAAW,GAAG3B,eAAe,GAAGuD,SAAS;EAEvE,KAAK,MAAM;IAAErD,IAAI;IAAEC;EAAG,CAAC,IAAI6B,IAAI,CAACwB,OAAO,EAAE;IACvC,IAAI7B,cAAc,KAAK,WAAW,EAAE;MAClCwB,OAAO,CAACM,IAAI,CAAC,IAAI,MAAMjD,gBAAgB,CAACN,IAAI,EAAEC,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC,MAAM;MACL,MAAMuD,IAAI,GAAG,MAAMhC,aAAa,CAACC,cAAc,EAAEzB,IAAI,EAAEC,EAAE,CAAC;MAE1DgD,OAAO,CAACM,IAAI,CAAC,GAAGC,IAAI,CAACP,OAAO,CAAC;MAC7BrB,IAAI,KAAK4B,IAAI,CAAC5B,IAAI;IACpB;EACF;EAEA,OAAO,IAAA6B,4BAAc,EAAChC,cAAc,EAAEK,IAAI,EAAE,IAAA4B,4BAAc,EAACjC,cAAc,EAAEG,IAAI,IAAI,GAAG,EAAEqB,OAAO,CAAC,CAAC;AACnG,CAAC;AAACU,OAAA,CAAAP,sBAAA,GAAAA,sBAAA","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":"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","ignoreList":[]}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.readingGroupsFor = void 0;
|
|
7
|
+
var _next = require("@ovok/core/next");
|
|
8
|
+
var _healthSyncKeys = require("../types/health-sync-keys.js");
|
|
9
|
+
var _getHealthRecordSyncId = require("./get-health-record-sync-id.js");
|
|
10
|
+
var _groupSamplesByInterval = require("./group-samples-by-interval.js");
|
|
11
|
+
var _groupSleepSamples = require("./group-sleep-samples.js");
|
|
12
|
+
/** Where a page of records ended: what a reading on it may still be waiting for. */
|
|
13
|
+
|
|
14
|
+
/** How several platform records make one reading, and when a reading may go on in the next page. */
|
|
15
|
+
|
|
16
|
+
const BLOOD_PRESSURE_PAIRS = {
|
|
17
|
+
group: _groupSamplesByInterval.groupSamplesByInterval,
|
|
18
|
+
mayContinue: (reading, {
|
|
19
|
+
typeCount
|
|
20
|
+
}) => new Set(reading.map(_getHealthRecordSyncId.getHealthRecordType)).size < typeCount
|
|
21
|
+
};
|
|
22
|
+
const SLEEP_NIGHTS = {
|
|
23
|
+
group: _groupSleepSamples.groupSleepSamples,
|
|
24
|
+
mayContinue: (reading, {
|
|
25
|
+
lastRead
|
|
26
|
+
}) => reading.some(record => lastRead.has(record))
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
/** HealthKit keeps a blood pressure's halves and a night's sleep stages as separate samples. */
|
|
30
|
+
const APPLE_HEALTH_READINGS = {
|
|
31
|
+
[_next.MeasurementTypeKey.bloodPressure]: BLOOD_PRESSURE_PAIRS,
|
|
32
|
+
[_healthSyncKeys.HealthDataType.sleep]: SLEEP_NIGHTS
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
/** How a data type's records make readings, or nothing when each record is one reading. */
|
|
36
|
+
const readingGroupsFor = (provider, measurementTypeKey) => provider === "apple-health" ? APPLE_HEALTH_READINGS[measurementTypeKey] : undefined;
|
|
37
|
+
exports.readingGroupsFor = readingGroupsFor;
|
|
38
|
+
//# sourceMappingURL=reading-groups.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_next","require","_healthSyncKeys","_getHealthRecordSyncId","_groupSamplesByInterval","_groupSleepSamples","BLOOD_PRESSURE_PAIRS","group","groupSamplesByInterval","mayContinue","reading","typeCount","Set","map","getHealthRecordType","size","SLEEP_NIGHTS","groupSleepSamples","lastRead","some","record","has","APPLE_HEALTH_READINGS","MeasurementTypeKey","bloodPressure","HealthDataType","sleep","readingGroupsFor","provider","measurementTypeKey","undefined","exports"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/reading-groups.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,uBAAA,GAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AAEA;;AAMA;;AAMA,MAAMK,oBAAmC,GAAG;EAC1CC,KAAK,EAAEC,8CAAsB;EAC7BC,WAAW,EAAEA,CAACC,OAAO,EAAE;IAAEC;EAAU,CAAC,KAClC,IAAIC,GAAG,CAACF,OAAO,CAACG,GAAG,CAACC,0CAAmB,CAAC,CAAC,CAACC,IAAI,GAAGJ;AACrD,CAAC;AAED,MAAMK,YAA2B,GAAG;EAClCT,KAAK,EAAEU,oCAAiB;EACxBR,WAAW,EAAEA,CAACC,OAAO,EAAE;IAAEQ;EAAS,CAAC,KACjCR,OAAO,CAACS,IAAI,CAAEC,MAAM,IAAKF,QAAQ,CAACG,GAAG,CAACD,MAAM,CAAC;AACjD,CAAC;;AAED;AACA,MAAME,qBAAoE,GAAG;EAC3E,CAACC,wBAAkB,CAACC,aAAa,GAAGlB,oBAAoB;EACxD,CAACmB,8BAAc,CAACC,KAAK,GAAGV;AAC1B,CAAC;;AAED;AACA,MAAMW,gBAAgB,GAAGA,CACvBC,QAAwB,EACxBC,kBAAiC,KAEjCD,QAAQ,KAAK,cAAc,GACvBN,qBAAqB,CAACO,kBAAkB,CAAC,GACzCC,SAAS;AAACC,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA","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,19 +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
|
-
|
|
125
|
-
|
|
126
|
-
} =
|
|
127
|
-
hasMore =
|
|
122
|
+
anchors,
|
|
123
|
+
carriedRecords
|
|
124
|
+
} = page;
|
|
125
|
+
hasMore = page.hasMore;
|
|
128
126
|
if (this.stateManager.shouldStopSync) {
|
|
129
127
|
break;
|
|
130
128
|
}
|
|
131
|
-
const readGroups = this.dataProcessor.identifyObservations(
|
|
129
|
+
const readGroups = this.dataProcessor.identifyObservations(page, mode);
|
|
132
130
|
const groups = sentReadings ? unsentReadings(readGroups, sentReadings) : readGroups;
|
|
133
131
|
const unchangedCount = readGroups.flat().length - groups.flat().length;
|
|
134
132
|
if (unchangedCount !== 0) {
|
|
@@ -143,6 +141,11 @@ export class BaseHealthSyncService {
|
|
|
143
141
|
if (deletedRecordIds.length !== 0) {
|
|
144
142
|
await this.storageManager.deleteObservations(deletedRecordIds, this.patientId);
|
|
145
143
|
}
|
|
144
|
+
|
|
145
|
+
// Held records are kept before the anchor moves past them, or a stop in between would lose them.
|
|
146
|
+
if (carriedRecords) {
|
|
147
|
+
await this.storageManager.saveCarriedRecords(measurementTypeKey, carriedRecords);
|
|
148
|
+
}
|
|
146
149
|
await this.storageManager.saveAnchors(anchors);
|
|
147
150
|
if (refusal) {
|
|
148
151
|
this.failType(measurementTypeKey, refusal);
|