@ovok/native 1.16.1-dev.2095 → 1.16.1-dev.2099

package/lib/module/modules/data-sync/services/managers/storage-manager.js

@@ -1,30 +1,22 @@
 "use strict";
 
+import CryptoJS from "crypto-js";
 import { OBSERVATION_SYNC_ID_SYSTEM } from "../../utils/fhir-systems.js";
 import { getHealthRecordIdentifier } from "../../utils/get-health-record-sync-id.js";
 import { replacesSavedObservation } from "../../utils/replaces-saved-observation.js";
+import { healthSyncOwner } from "../../utils/session-owner.js";
 export class StorageManager {
-  /**
-   * Where an anchor goes when the host client has no storage.
-   *
-   * `clientStorage` is assigned from `OvokClient`'s `storage` option and from
-   * nowhere else, so a host that constructs its client without one leaves it
-   * `undefined` — and the `?.` below then swallowed every write while
-   * `getAnchor` answered `undefined` for ever. That is not a lost
-   * optimisation: `getObservationBodiesForType` continues only when a full
-   * provider page includes an anchor, and `syncDataByType` loops while that is
-   * true. A full page without an anchor is the provider's final page, and a
-   * daily aggregate read has no cursor at all.
-   *
-   * The sync must not depend on what the host passed. This map keeps the
-   * anchor for the life of the service instance, which is what lets the loop
-   * end; when the host DOES provide storage the anchor also survives a
-   * restart, which is what keeps the next cold start short.
-   */
-  inMemoryAnchors = new Map();
-  constructor(client, provider) {
+  constructor(client, provider, ownerKey, patientId) {
     this.client = client;
     this.provider = provider;
+    this.ownerKey = ownerKey;
+    this.patientId = patientId;
+  }
+  async requireOwner(patientId) {
+    const owner = healthSyncOwner(this.client, await this.client.session.current());
+    if (!owner || owner.patientId !== patientId || owner.ownerKey !== this.ownerKey) {
+      throw new Error("Health sync session changed");
+    }
   }
 
   /**
@@ -33,7 +25,8 @@ export class StorageManager {
    * out of that check: all of a reading's observations share it.
    */
   async saveObservations(groups, mode) {
-    return this.client.saveObservationGroups(groups, {
+    await this.requireOwner(this.patientId);
+    return this.client.measurements.saveObservationGroups(groups, {
       identifierSystems: [OBSERVATION_SYNC_ID_SYSTEM],
       replace: replacesSavedObservation(mode)
     });
@@ -41,43 +34,46 @@ export class StorageManager {
 
   /** Deletes the observations imported from records the provider reports deleted. */
   async deleteObservations(recordIds, patientId) {
+    await this.requireOwner(patientId);
     for (const recordId of new Set(recordIds)) {
       const {
         system,
         value
       } = getHealthRecordIdentifier(this.provider, recordId);
       const observations = [];
-      for await (const page of this.client.searchResourcePages("Observation", {
+      for await (const observation of this.client.fhir.search("Observation", {
         subject: `Patient/${patientId}`,
         identifier: `${system}|${value}`
       })) {
-        observations.push(...page);
+        observations.push(observation);
+      }
+      for (const observation of observations) {
+        if (observation.id) {
+          await this.requireOwner(patientId);
+          await this.client.fhir.delete("Observation", observation.id);
+        }
       }
-      await Promise.all(observations.filter(observation => observation.id).map(observation => this.client.deleteResource("Observation", observation.id)));
     }
   }
-  saveAnchor(typeIdentifier, anchor) {
-    const key = this.anchorKey(typeIdentifier);
-    if (this.client.clientStorage) {
-      this.client.clientStorage.setString(key, anchor);
-      return;
-    }
-    this.inMemoryAnchors.set(key, anchor);
+  async saveAnchor(typeIdentifier, anchor) {
+    await this.requireOwner(this.patientId);
+    await this.client.storage.setItem(this.anchorKey(typeIdentifier), anchor);
   }
-  getAnchor(typeIdentifier) {
-    const key = this.anchorKey(typeIdentifier);
-    return this.client.clientStorage ? this.client.clientStorage.getString(key) : this.inMemoryAnchors.get(key);
+  async getAnchor(typeIdentifier) {
+    await this.requireOwner(this.patientId);
+    return (await this.client.storage.getItem(this.anchorKey(typeIdentifier))) ?? undefined;
   }
   anchorKey(typeIdentifier) {
-    return `${this.provider}-sync-${typeIdentifier}-anchor`;
+    const identity = CryptoJS.SHA256(JSON.stringify([this.ownerKey, this.provider, typeIdentifier])).toString();
+    return `health-sync.${identity}`;
   }
-  saveAnchors(anchors) {
-    anchors.forEach(({
+  async saveAnchors(anchors) {
+    for (const {
       typeIdentifier,
       anchor
-    }) => {
-      this.saveAnchor(typeIdentifier, anchor);
-    });
+    } of anchors) {
+      await this.saveAnchor(typeIdentifier, anchor);
+    }
   }
 }
 //# sourceMappingURL=storage-manager.js.map

package/lib/module/modules/data-sync/services/managers/storage-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","StorageManager","inMemoryAnchors","Map","constructor","client","provider","saveObservations","groups","mode","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","patientId","recordId","Set","system","value","observations","page","searchResourcePages","subject","identifier","push","Promise","all","filter","observation","id","map","deleteResource","saveAnchor","typeIdentifier","anchor","key","anchorKey","clientStorage","setString","set","getAnchor","getString","get","saveAnchors","anchors","forEach"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CryptoJS","OBSERVATION_SYNC_ID_SYSTEM","getHealthRecordIdentifier","replacesSavedObservation","healthSyncOwner","StorageManager","constructor","client","provider","ownerKey","patientId","requireOwner","owner","session","current","Error","saveObservations","groups","mode","measurements","saveObservationGroups","identifierSystems","replace","deleteObservations","recordIds","recordId","Set","system","value","observations","observation","fhir","search","subject","identifier","push","id","delete","saveAnchor","typeIdentifier","anchor","storage","setItem","anchorKey","getAnchor","getItem","undefined","identity","SHA256","JSON","stringify","toString","saveAnchors","anchors"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/storage-manager.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/services/managers/sync-state-manager.js.map

@@ -1 +1 @@
-{"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAA0B,EAAE;EAE1CC,SAASA,CAACC,MAA2B,EAAQ;IAC3C,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;EAEAG,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACZ,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAe,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAACf,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACa,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAAChB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;EAC9B;AACF","ignoreList":[]}
+{"version":3,"names":["SyncStateManager","rerunRequested","shouldStopSync","initialDataFetched","latestObservationDates","results","addResult","result","push","once","sync","inFlight","finally","undefined","reset","pauseReason","pause","reason","resume"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-state-manager.ts"],"mappings":";;AAIA,OAAO,MAAMA,gBAAgB,CAAC;EAC5B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEUC,cAAc,GAAG,KAAK;EAEvBC,cAAc,GAAG,KAAK;EAEtBC,kBAAkB,GAAG,KAAK;EAC1BC,sBAAsB,GAGxB,EAAE;EACAC,OAAO,GAAa,EAAE;EAE7BC,SAASA,CAACC,MAAc,EAAQ;IAC9B,IAAI,CAACF,OAAO,CAACG,IAAI,CAACD,MAAM,CAAC;EAC3B;;EAEA;EACA,MAAME,IAAIA,CAACC,IAAyB,EAAiB;IACnD,IAAI,IAAI,CAACC,QAAQ,EAAE;MACjB,IAAI,IAAI,CAACT,cAAc,EAAE;QACvB,IAAI,CAACD,cAAc,GAAG,IAAI;MAC5B;MAEA,MAAMU,QAAQ,GAAG,IAAI,CAACA,QAAQ;MAE9B,MAAMA,QAAQ;MAEd,IAAI,IAAI,CAACV,cAAc,IAAI,CAAC,IAAI,CAACU,QAAQ,EAAE;QACzC,IAAI,CAACV,cAAc,GAAG,KAAK;QAE3B,OAAO,IAAI,CAACQ,IAAI,CAACC,IAAI,CAAC;MACxB;MAEA;IACF;IAEA,IAAI,CAACC,QAAQ,GAAGD,IAAI,CAAC,CAAC,CAACE,OAAO,CAAC,MAAM;MACnC,IAAI,CAACD,QAAQ,GAAGE,SAAS;IAC3B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACF,QAAQ;EACtB;EAEAG,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACZ,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;IAC5B,IAAI,CAACV,kBAAkB,GAAG,KAAK;IAC/B,IAAI,CAACC,sBAAsB,GAAG,EAAE;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACJ,cAAc,GAAG,KAAK;EAC7B;EAEAe,KAAKA,CAACC,MAAwB,EAAQ;IACpC,IAAI,CAACf,cAAc,GAAG,IAAI;IAC1B,IAAI,CAACa,WAAW,GAAGE,MAAM;EAC3B;EAEAC,MAAMA,CAAA,EAAS;IACb,IAAI,CAAChB,cAAc,GAAG,KAAK;IAC3B,IAAI,CAACa,WAAW,GAAGF,SAAS;EAC9B;AACF","ignoreList":[]}

package/lib/module/modules/data-sync/types/health-sync-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { MeasurementTypeKey } from "@ovok/core";
+import { MeasurementTypeKey } from "@ovok/core/next";
 /** Health data that is not represented by a core measurement service. */
 var HealthDataType = /*#__PURE__*/function (HealthDataType) {
   HealthDataType["height"] = "height";

package/lib/module/modules/data-sync/types/health-sync-keys.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","HealthDataType","getHealthDataMode","key","configuredMode","stepCount","distance","activeEnergy","flightsClimbed","exerciseMinutes","heartRate","heartRateSummary","sleep","workout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/types/health-sync-keys.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,YAAY;AAO/C;AAAA,IACKC,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA,EAAdA,cAAc;AAyBnB,MAAMC,iBAAiB,GAAGA,CACxBC,GAAkB,EAClBC,cAA+B,KACZ;EACnB,IAAIA,cAAc,EAAE;IAClB,OAAOA,cAAc;EACvB;EAEA,QAAQD,GAAG;IACT,KAAKH,kBAAkB,CAACK,SAAS;IACjC,KAAKJ,cAAc,CAACK,QAAQ;IAC5B,KAAKL,cAAc,CAACM,YAAY;IAChC,KAAKN,cAAc,CAACO,cAAc;IAClC,KAAKP,cAAc,CAACQ,eAAe;MACjC,OAAO,aAAa;IACtB,KAAKT,kBAAkB,CAACU,SAAS;IACjC,KAAKT,cAAc,CAACU,gBAAgB;MAClC,OAAO,eAAe;IACxB,KAAKV,cAAc,CAACW,KAAK;IACzB,KAAKX,cAAc,CAACY,OAAO;MACzB,OAAO,SAAS;IAClB;MACE,OAAO,OAAO;EAClB;AACF,CAAC;AAED,SACEZ,cAAc,EACdC,iBAAiB","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","HealthDataType","getHealthDataMode","key","configuredMode","stepCount","distance","activeEnergy","flightsClimbed","exerciseMinutes","heartRate","heartRateSummary","sleep","workout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/types/health-sync-keys.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,iBAAiB;AAOpD;AAAA,IACKC,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA,EAAdA,cAAc;AAyBnB,MAAMC,iBAAiB,GAAGA,CACxBC,GAAkB,EAClBC,cAA+B,KACZ;EACnB,IAAIA,cAAc,EAAE;IAClB,OAAOA,cAAc;EACvB;EAEA,QAAQD,GAAG;IACT,KAAKH,kBAAkB,CAACK,SAAS;IACjC,KAAKJ,cAAc,CAACK,QAAQ;IAC5B,KAAKL,cAAc,CAACM,YAAY;IAChC,KAAKN,cAAc,CAACO,cAAc;IAClC,KAAKP,cAAc,CAACQ,eAAe;MACjC,OAAO,aAAa;IACtB,KAAKT,kBAAkB,CAACU,SAAS;IACjC,KAAKT,cAAc,CAACU,gBAAgB;MAClC,OAAO,eAAe;IACxB,KAAKV,cAAc,CAACW,KAAK;IACzB,KAAKX,cAAc,CAACY,OAAO;MACzB,OAAO,SAAS;IAClB;MACE,OAAO,OAAO;EAClB;AACF,CAAC;AAED,SACEZ,cAAc,EACdC,iBAAiB","ignoreList":[]}

package/lib/module/modules/data-sync/utils/convert-records-to-observation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { ObservationServiceCreator } from "@ovok/core";
+import { ObservationServiceCreator } from "@ovok/core/dist/client/observation/services/creator";
 import { convertGenericHealthDataToObservation } from "./convert-generic-health-data.js";
 import { getHealthObservationDevice } from "./health-observation-device.js";
 import { hasConfiguredNonLoincCoding } from "./normalize-core-health-observation.js";
@@ -40,7 +40,7 @@ export const convertRecordsToObservation = async props => {
   if (!measurement) {
     return [];
   }
-  const observationBody = await client.generateObservationBodiesByMeasurement({
+  const observationBody = await client.measurements.build({
     measurement
   });
   const typedRecordTiming = record;

package/lib/module/modules/data-sync/utils/convert-records-to-observation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertRecordsToObservation","props","data","client","measurementTypeKey","mode","record","service","getInstance","getService","typedRecord","measurement","convertRecordToMeasurement","observationBody","generateObservationBodiesByMeasurement","typedRecordTiming","device","manufacturer","metadata","model","sourceApp","dataOrigin","recordingMethod","timing","time","undefined","point","start","startTime","end","endTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-records-to-observation.ts"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,YAAY;AAKtD,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAMC,MAAM,GAAGJ,IAAI,CAAC,CAAC,CAAC;EAEtB,IAAI,CAACI,MAAM,EAAE;IACX,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGJ,MAAkC;EACtD,MAAMK,WAAW,GAAGJ,OAAO,EAAEK,0BAA0B,GAAGF,WAAW,CAAC;EAEtE,IAAI,CAACC,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMV,MAAM,CAACW,sCAAsC,CAAC;IAC1EH;EACF,CAAC,CAAC;EAEF,MAAMI,iBAAiB,GAAGT,MAIzB;EAED,MAAMU,MAAM,GAAGpB,0BAA0B,CAAC;IACxCqB,YAAY,EAAEP,WAAW,CAACQ,QAAQ,EAAEF,MAAM,EAAEC,YAAY;IACxDE,KAAK,EAAET,WAAW,CAACQ,QAAQ,EAAEF,MAAM,EAAEG,KAAK;IAC1CC,SAAS,EAAEV,WAAW,CAACQ,QAAQ,EAAEG,UAAU;IAC3CC,eAAe,EAAEZ,WAAW,CAACQ,QAAQ,EAAEI;EACzC,CAAC,CAAC;EAEF,MAAMC,MAAM,GACVR,iBAAiB,CAACS,IAAI,KAAKC,SAAS,GAChC;IAAEC,KAAK,EAAEX,iBAAiB,CAACS;EAAK,CAAC,GACjC;IAAEG,KAAK,EAAEZ,iBAAiB,CAACa,SAAS;IAAEC,GAAG,EAAEd,iBAAiB,CAACe;EAAQ,CAAC;EAE5E,OAAO/B,wBAAwB,CAACc,eAAe,EAAEZ,KAAK,EAAE,OAAO;IAAEe,MAAM;IAAEO;EAAO,CAAC,CAAC,CAAC;AACrF,CAAC","ignoreList":[]}
+{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertRecordsToObservation","props","data","client","measurementTypeKey","mode","record","service","getInstance","getService","typedRecord","measurement","convertRecordToMeasurement","observationBody","measurements","build","typedRecordTiming","device","manufacturer","metadata","model","sourceApp","dataOrigin","recordingMethod","timing","time","undefined","point","start","startTime","end","endTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-records-to-observation.ts"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,qDAAqD;AAK/F,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAMC,MAAM,GAAGJ,IAAI,CAAC,CAAC,CAAC;EAEtB,IAAI,CAACI,MAAM,EAAE;IACX,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGJ,MAAkC;EACtD,MAAMK,WAAW,GAAGJ,OAAO,EAAEK,0BAA0B,GAAGF,WAAW,CAAC;EAEtE,IAAI,CAACC,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMV,MAAM,CAACW,YAAY,CAACC,KAAK,CAAC;IACtDJ;EACF,CAAC,CAAC;EAEF,MAAMK,iBAAiB,GAAGV,MAIzB;EAED,MAAMW,MAAM,GAAGrB,0BAA0B,CAAC;IACxCsB,YAAY,EAAER,WAAW,CAACS,QAAQ,EAAEF,MAAM,EAAEC,YAAY;IACxDE,KAAK,EAAEV,WAAW,CAACS,QAAQ,EAAEF,MAAM,EAAEG,KAAK;IAC1CC,SAAS,EAAEX,WAAW,CAACS,QAAQ,EAAEG,UAAU;IAC3CC,eAAe,EAAEb,WAAW,CAACS,QAAQ,EAAEI;EACzC,CAAC,CAAC;EAEF,MAAMC,MAAM,GACVR,iBAAiB,CAACS,IAAI,KAAKC,SAAS,GAChC;IAAEC,KAAK,EAAEX,iBAAiB,CAACS;EAAK,CAAC,GACjC;IAAEG,KAAK,EAAEZ,iBAAiB,CAACa,SAAS;IAAEC,GAAG,EAAEd,iBAAiB,CAACe;EAAQ,CAAC;EAE5E,OAAOhC,wBAAwB,CAACc,eAAe,EAAEZ,KAAK,EAAE,OAAO;IAAEgB,MAAM;IAAEO;EAAO,CAAC,CAAC,CAAC;AACrF,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/convert-samples-to-observation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { ObservationServiceCreator } from "@ovok/core";
+import { ObservationServiceCreator } from "@ovok/core/dist/client/observation/services/creator";
 import { convertGenericHealthDataToObservation } from "./convert-generic-health-data.js";
 import { getHealthObservationDevice } from "./health-observation-device.js";
 import { hasConfiguredNonLoincCoding } from "./normalize-core-health-observation.js";
@@ -38,7 +38,7 @@ export const convertSamplesToObservation = async props => {
   if (!measurement) {
     return [];
   }
-  const observationBody = await client.generateObservationBodiesByMeasurement({
+  const observationBody = await client.measurements.build({
     measurement
   });
   return toCoreHealthObservations(observationBody, props, index => {

package/lib/module/modules/data-sync/utils/convert-samples-to-observation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertSamplesToObservation","props","data","client","measurementTypeKey","mode","length","service","getInstance","getService","measurement","convertSamplesToMeasurement","observationBody","generateObservationBodiesByMeasurement","index","sample","device","manufacturer","model","sourceApp","sourceRevision","source","name","undefined","timing","start","startDate","end","endDate"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-samples-to-observation.ts"],"mappings":";;AAKA,SAASA,yBAAyB,QAAgB,YAAY;AAI9D,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAIH,IAAI,CAACI,MAAM,KAAK,CAAC,EAAE;IACrB,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGH,OAAO,CAACI,2BAA2B,CACrDT,IACF,CAAC;EAED,IAAI,CAACQ,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMT,MAAM,CAACU,sCAAsC,CAAC;IAC1EH;EACF,CAAC,CAAC;EAEF,OAAOX,wBAAwB,CAACa,eAAe,EAAEX,KAAK,EAAGa,KAAK,IAAK;IACjE,MAAMC,MAAM,GAAGb,IAAI,GAAGY,KAAK,CAA2D;IAEtF,OAAO;MACLE,MAAM,EAAED,MAAM,GACVnB,0BAA0B,CAAC;QACzBqB,YAAY,EAAEF,MAAM,CAACC,MAAM,EAAEC,YAAY;QACzCC,KAAK,EAAEH,MAAM,CAACC,MAAM,EAAEE,KAAK;QAC3BC,SAAS,EAAEJ,MAAM,CAACK,cAAc,EAAEC,MAAM,EAAEC;MAC5C,CAAC,CAAC,GACFC,SAAS;MACbC,MAAM,EAAE;QAAEC,KAAK,EAAEV,MAAM,EAAEW,SAAS;QAAEC,GAAG,EAAEZ,MAAM,EAAEa;MAAQ;IAC3D,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["ObservationServiceCreator","convertGenericHealthDataToObservation","getHealthObservationDevice","hasConfiguredNonLoincCoding","isCoreMeasurementTypeKey","toCoreHealthObservations","convertSamplesToObservation","props","data","client","measurementTypeKey","mode","length","service","getInstance","getService","measurement","convertSamplesToMeasurement","observationBody","measurements","build","index","sample","device","manufacturer","model","sourceApp","sourceRevision","source","name","undefined","timing","start","startDate","end","endDate"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/convert-samples-to-observation.ts"],"mappings":";;AAKA,SAASA,yBAAyB,QAAQ,qDAAqD;AAM/F,SAASC,qCAAqC,QAAQ,kCAA+B;AACrF,SAASC,0BAA0B,QAAQ,gCAA6B;AACxE,SAASC,2BAA2B,QAAQ,wCAAqC;AACjF,SACEC,wBAAwB,EACxBC,wBAAwB,QACnB,kCAA+B;AAEtC,OAAO,MAAMC,2BAA2B,GAAG,MACzCC,KAAgC,IACL;EAC3B,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,kBAAkB;IAAEC,IAAI,GAAG;EAAQ,CAAC,GAAGJ,KAAK;EAElE,IAAII,IAAI,KAAK,OAAO,EAAE;IACpB,OAAOV,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAIH,IAAI,CAACI,MAAM,KAAK,CAAC,EAAE;IACrB,OAAO,EAAE;EACX;EAEA,IAAIT,2BAA2B,CAACI,KAAK,CAAC,EAAE;IACtC,OAAON,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,IAAI,CAACP,wBAAwB,CAACM,kBAAkB,CAAC,EAAE;IACjD,OAAOT,qCAAqC,CAAC;MAAE,GAAGM,KAAK;MAAEI;IAAK,CAAC,CAAC;EAClE;EAEA,MAAME,OAAO,GAAGb,yBAAyB,CAACc,WAAW,CAAC,CAAC,CAACC,UAAU,CAChEL,kBACF,CAAC;EAED,MAAMM,WAAW,GAAGH,OAAO,CAACI,2BAA2B,CACrDT,IACF,CAAC;EAED,IAAI,CAACQ,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EAEA,MAAME,eAAe,GAAG,MAAMT,MAAM,CAACU,YAAY,CAACC,KAAK,CAAC;IACtDJ;EACF,CAAC,CAAC;EAEF,OAAOX,wBAAwB,CAACa,eAAe,EAAEX,KAAK,EAAGc,KAAK,IAAK;IACjE,MAAMC,MAAM,GAAGd,IAAI,GAAGa,KAAK,CAA2D;IAEtF,OAAO;MACLE,MAAM,EAAED,MAAM,GACVpB,0BAA0B,CAAC;QACzBsB,YAAY,EAAEF,MAAM,CAACC,MAAM,EAAEC,YAAY;QACzCC,KAAK,EAAEH,MAAM,CAACC,MAAM,EAAEE,KAAK;QAC3BC,SAAS,EAAEJ,MAAM,CAACK,cAAc,EAAEC,MAAM,EAAEC;MAC5C,CAAC,CAAC,GACFC,SAAS;MACbC,MAAM,EAAE;QAAEC,KAAK,EAAEV,MAAM,EAAEW,SAAS;QAAEC,GAAG,EAAEZ,MAAM,EAAEa;MAAQ;IAC3D,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/get-latest-observation-dates-by-code.js

@@ -23,7 +23,7 @@ export const getLatestObservationDatesByCode = async ({
   provider
 }) => {
   const entries = codes.map(code => generateObservationSearchEntry(code, patientId, provider));
-  const bundle = await client.executeBatch({
+  const bundle = await client.fhir.batch({
     resourceType: "Bundle",
     type: "batch",
     entry: entries

package/lib/module/modules/data-sync/utils/get-latest-observation-dates-by-code.js.map

@@ -1 +1 @@
-{"version":3,"names":["OBSERVATION_SYNC_PROVIDER_SYSTEM","generateObservationSearchEntry","code","patientId","provider","searchParams","URLSearchParams","set","encodeURIComponent","request","method","url","toString","getLatestObservationDatesByCode","codes","client","entries","map","bundle","executeBatch","resourceType","type","entry","idx","observationResource","resource","observation","date","effectivePeriod","end","effectiveDateTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-latest-observation-dates-by-code.ts"],"mappings":";;AAKA,SAASA,gCAAgC,QAAQ,mBAAgB;AAEjE,MAAMC,8BAA8B,GAAGA,CACrCC,IAAY,EACZC,SAAiB,EACjBC,QAAgB,KACA;EAChB,MAAMC,YAAY,GAAG,IAAIC,eAAe,CAAC,CAAC;EAE1CD,YAAY,CAACE,GAAG,CAAC,MAAM,EAAEL,IAAI,CAAC;EAC9BG,YAAY,CAACE,GAAG,CACd,YAAY,EACZ,GAAGP,gCAAgC,IAAII,QAAQ,EACjD,CAAC;EACDC,YAAY,CAACE,GAAG,CAAC,SAAS,EAAE,WAAWC,kBAAkB,CAACL,SAAS,CAAC,EAAE,CAAC;EACvEE,YAAY,CAACE,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC;EAC1CF,YAAY,CAACE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;EAClCF,YAAY,CAACE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;EAE/B,OAAO;IACLE,OAAO,EAAE;MACPC,MAAM,EAAE,KAAK;MACbC,GAAG,EAAE,eAAeN,YAAY,CAACO,QAAQ,CAAC,CAAC;IAC7C;EACF,CAAC;AACH,CAAC;AASD,OAAO,MAAMC,+BAA+B,GAAG,MAAAA,CAAO;EACpDC,KAAK;EACLX,SAAS;EACTY,MAAM;EACNX;AACoC,CAAC,KAAK;EAC1C,MAAMY,OAAO,GAAGF,KAAK,CAACG,GAAG,CAAEf,IAAI,IAC7BD,8BAA8B,CAACC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,CAC1D,CAAC;EAED,MAAMc,MAAM,GAAG,MAAMH,MAAM,CAACI,YAAY,CAAC;IACvCC,YAAY,EAAE,QAAQ;IACtBC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAEN;EACT,CAAC,CAAC;EAEF,OAAO,CAACE,MAAM,CAACI,KAAK,IAAI,EAAE,EAAEL,GAAG,CAAC,CAACK,KAAK,EAAEC,GAAG,KAAK;IAC9C,MAAMC,mBAAmB,GAAGF,KAAK,CAACG,QAAkB;IAEpD,MAAMC,WAAW,GAAGF,mBAAmB,EAAEF,KAAK,GAAG,CAAC,CAAC,EAAEG,QAExC;IAEb,MAAME,IAAI,GACRD,WAAW,EAAEE,eAAe,EAAEC,GAAG,IAAIH,WAAW,EAAEI,iBAAiB;IAErE,OAAO;MACL5B,IAAI,EAAEY,KAAK,CAACS,GAAG,CAAC;MAChBI,IAAI,EAAEA;IACR,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["OBSERVATION_SYNC_PROVIDER_SYSTEM","generateObservationSearchEntry","code","patientId","provider","searchParams","URLSearchParams","set","encodeURIComponent","request","method","url","toString","getLatestObservationDatesByCode","codes","client","entries","map","bundle","fhir","batch","resourceType","type","entry","idx","observationResource","resource","observation","date","effectivePeriod","end","effectiveDateTime"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/get-latest-observation-dates-by-code.ts"],"mappings":";;AAMA,SAASA,gCAAgC,QAAQ,mBAAgB;AAEjE,MAAMC,8BAA8B,GAAGA,CACrCC,IAAY,EACZC,SAAiB,EACjBC,QAAgB,KACA;EAChB,MAAMC,YAAY,GAAG,IAAIC,eAAe,CAAC,CAAC;EAE1CD,YAAY,CAACE,GAAG,CAAC,MAAM,EAAEL,IAAI,CAAC;EAC9BG,YAAY,CAACE,GAAG,CACd,YAAY,EACZ,GAAGP,gCAAgC,IAAII,QAAQ,EACjD,CAAC;EACDC,YAAY,CAACE,GAAG,CAAC,SAAS,EAAE,WAAWC,kBAAkB,CAACL,SAAS,CAAC,EAAE,CAAC;EACvEE,YAAY,CAACE,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC;EAC1CF,YAAY,CAACE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;EAClCF,YAAY,CAACE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;EAE/B,OAAO;IACLE,OAAO,EAAE;MACPC,MAAM,EAAE,KAAK;MACbC,GAAG,EAAE,eAAeN,YAAY,CAACO,QAAQ,CAAC,CAAC;IAC7C;EACF,CAAC;AACH,CAAC;AASD,OAAO,MAAMC,+BAA+B,GAAG,MAAAA,CAAO;EACpDC,KAAK;EACLX,SAAS;EACTY,MAAM;EACNX;AACoC,CAAC,KAAK;EAC1C,MAAMY,OAAO,GAAGF,KAAK,CAACG,GAAG,CAAEf,IAAI,IAC7BD,8BAA8B,CAACC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,CAC1D,CAAC;EAED,MAAMc,MAAM,GAAG,MAAMH,MAAM,CAACI,IAAI,CAACC,KAAK,CAAC;IACrCC,YAAY,EAAE,QAAQ;IACtBC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAEP;EACT,CAAC,CAAC;EAEF,OAAO,CAACE,MAAM,CAACK,KAAK,IAAI,EAAE,EAAEN,GAAG,CAAC,CAACM,KAAK,EAAEC,GAAG,KAAK;IAC9C,MAAMC,mBAAmB,GAAGF,KAAK,CAACG,QAAkB;IAEpD,MAAMC,WAAW,GAAGF,mBAAmB,EAAEF,KAAK,GAAG,CAAC,CAAC,EAAEG,QAExC;IAEb,MAAME,IAAI,GACRD,WAAW,EAAEE,eAAe,EAAEC,GAAG,IAAIH,WAAW,EAAEI,iBAAiB;IAErE,OAAO;MACL7B,IAAI,EAAEY,KAAK,CAACU,GAAG,CAAC;MAChBI,IAAI,EAAEA;IACR,CAAC;EACH,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/retry-save.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { isRateLimitError, readOvokError } from "@ovok/core";
+import { OvokRateLimitError } from "@ovok/core/next";
 const RETRY_DELAYS_MS = [1000, 4000, 16000];
 
 // A throttle or a passing server or upstream fault; 501 (not set up) and every refusal fail fast.
@@ -33,7 +33,7 @@ const getNestedRecords = error => {
   return records;
 };
 const getResponseStatuses = record => [record.status, record.statusCode, asRecord(record.response)?.status, ...(Array.isArray(record.entry) ? record.entry.map(entry => asRecord(asRecord(entry)?.response)?.status) : [])];
-const getStatuses = error => [...getNestedRecords(error).flatMap(getResponseStatuses), readOvokError(error).status].map(statusNumber).filter(status => status !== undefined);
+const getStatuses = error => [...getNestedRecords(error).flatMap(getResponseStatuses)].map(statusNumber).filter(status => status !== undefined);
 class SyncRetryCancelledError extends Error {
   constructor() {
     super("Health sync retry cancelled");
@@ -63,8 +63,7 @@ const parseRateLimitReset = value => {
   return reset > nowInSeconds - 60 ? Math.max(0, reset * 1000 - Date.now()) : reset * 1000;
 };
 function getRetryAfterMs(error) {
-  const ovokRetryAfter = readOvokError(error).retryAfterMs;
-  const values = typeof ovokRetryAfter === "number" && ovokRetryAfter >= 0 ? [ovokRetryAfter] : [];
+  const values = [];
   for (const record of getNestedRecords(error)) {
     const retryAfter = record.retryAfterMs;
     if (typeof retryAfter === "number" && retryAfter >= 0) {
@@ -92,7 +91,7 @@ function getRetryAfterMs(error) {
   return values.length > 0 ? Math.max(...values) : undefined;
 }
 function isRetryableSyncError(error) {
-  if (isRateLimitError(error)) {
+  if (error instanceof OvokRateLimitError) {
     return true;
   }
   const statuses = getStatuses(error);

package/lib/module/modules/data-sync/utils/retry-save.js.map

@@ -1 +1 @@
-{"version":3,"names":["isRateLimitError","readOvokError","RETRY_DELAYS_MS","RETRYABLE_STATUSES","Set","asRecord","value","undefined","statusNumber","parsed","Number","parseInt","isInteger","getNestedRecords","error","records","pending","seen","length","record","shift","has","add","push","key","nested","getResponseStatuses","status","statusCode","response","Array","isArray","entry","map","getStatuses","flatMap","filter","SyncRetryCancelledError","Error","constructor","name","isSyncRetryCancelled","getHeader","headers","lowerName","toLowerCase","Object","entries","find","String","parseRetryAfter","seconds","isFinite","date","Date","parse","Math","max","now","parseRateLimitReset","reset","nowInSeconds","getRetryAfterMs","ovokRetryAfter","retryAfterMs","values","retryAfter","responseRetryAfter","retryAfterHeader","rateLimitReset","rateLimitResetMs","rateLimit","embeddedReset","match","embeddedResetMs","isRetryableSyncError","statuses","some","message","TypeError","test","getSyncRetryDelayMs","retryIndex","at","withSyncRetries","operation","shouldCancel","Promise","resolve","reject","timers","poll","setInterval","timer","clearTimeout","clearInterval","setTimeout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/retry-save.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OvokRateLimitError","RETRY_DELAYS_MS","RETRYABLE_STATUSES","Set","asRecord","value","undefined","statusNumber","parsed","Number","parseInt","isInteger","getNestedRecords","error","records","pending","seen","length","record","shift","has","add","push","key","nested","getResponseStatuses","status","statusCode","response","Array","isArray","entry","map","getStatuses","flatMap","filter","SyncRetryCancelledError","Error","constructor","name","isSyncRetryCancelled","getHeader","headers","lowerName","toLowerCase","Object","entries","find","String","parseRetryAfter","seconds","isFinite","date","Date","parse","Math","max","now","parseRateLimitReset","reset","nowInSeconds","getRetryAfterMs","values","retryAfter","retryAfterMs","responseRetryAfter","retryAfterHeader","rateLimitReset","rateLimitResetMs","rateLimit","embeddedReset","match","embeddedResetMs","isRetryableSyncError","statuses","some","message","TypeError","test","getSyncRetryDelayMs","retryIndex","at","withSyncRetries","operation","shouldCancel","Promise","resolve","reject","timers","poll","setInterval","timer","clearTimeout","clearInterval","setTimeout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/retry-save.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/utils/session-owner.js

@@ -0,0 +1,13 @@
+"use strict";
+
+export const healthSyncOwner = (client, session) => {
+  const patientId = session?.profile.reference.match(/^Patient\/([^/]+)$/)?.[1];
+  if (!session || !patientId) {
+    return null;
+  }
+  return {
+    patientId,
+    ownerKey: JSON.stringify([client.baseUrl, client.tenantCode, session.project.reference, session.profile.reference])
+  };
+};
+//# sourceMappingURL=session-owner.js.map

package/lib/module/modules/data-sync/utils/session-owner.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["healthSyncOwner","client","session","patientId","profile","reference","match","ownerKey","JSON","stringify","baseUrl","tenantCode","project"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/session-owner.ts"],"mappings":";;AAIA,OAAO,MAAMA,eAAe,GAAGA,CAC7BC,MAAY,EACZC,OAAuB,KAC4B;EACnD,MAAMC,SAAS,GAAGD,OAAO,EAAEE,OAAO,CAACC,SAAS,CAACC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;EAE7E,IAAI,CAACJ,OAAO,IAAI,CAACC,SAAS,EAAE;IAC1B,OAAO,IAAI;EACb;EAEA,OAAO;IACLA,SAAS;IACTI,QAAQ,EAAEC,IAAI,CAACC,SAAS,CAAC,CACvBR,MAAM,CAACS,OAAO,EACdT,MAAM,CAACU,UAAU,EACjBT,OAAO,CAACU,OAAO,CAACP,SAAS,EACzBH,OAAO,CAACE,OAAO,CAACC,SAAS,CAC1B;EACH,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/modules/data-sync/utils/to-core-health-observations.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { MeasurementTypeKey } from "@ovok/core";
+import { MeasurementTypeKey } from "@ovok/core/next";
 import { withHealthRecordTiming } from "./health-record-timing.js";
 import { normalizeCoreHealthObservation } from "./normalize-core-health-observation.js";
 const isCoreMeasurementTypeKey = value => Object.values(MeasurementTypeKey).includes(value);

package/lib/module/modules/data-sync/utils/to-core-health-observations.js.map

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","withHealthRecordTiming","normalizeCoreHealthObservation","isCoreMeasurementTypeKey","value","Object","values","includes","toCoreHealthObservations","observations","props","sourceAt","map","observation","index","device","timing","applyCatalogCoding","length","data"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/to-core-health-observations.ts"],"mappings":";;AACA,SAASA,kBAAkB,QAAQ,YAAY;AAI/C,SAASC,sBAAsB,QAAQ,2BAAwB;AAC/D,SAASC,8BAA8B,QAAQ,wCAAqC;AAOpF,MAAMC,wBAAwB,GAC5BC,KAAa,IAEbC,MAAM,CAACC,MAAM,CAACN,kBAAkB,CAAC,CAACO,QAAQ,CAACH,KAA2B,CAAC;;AAEzE;AACA,MAAMI,wBAAwB,GAAGA,CAC/BC,YAA2B,EAC3BC,KAAgC,EAChCC,QAA8C,KAE9CF,YAAY,CAACG,GAAG,CAAC,CAACC,WAAW,EAAEC,KAAK,KAAK;EACvC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGL,QAAQ,CAACG,KAAK,CAAC;EAE1C,OAAOZ,8BAA8B,CACnCD,sBAAsB,CACpB;IACE,GAAGY,WAAW;IACd,IAAIE,MAAM,GACN;MAAEA,MAAM,EAAE;QAAE,IAAIF,WAAW,CAACE,MAAM,IAAI,CAAC,CAAC,CAAC;QAAE,GAAGA;MAAO;IAAE,CAAC,GACxD,CAAC,CAAC;EACR,CAAC,EACDC,MACF,CAAC,EACD;IACE,GAAGN,KAAK;IACRO,kBAAkB,EAAER,YAAY,CAACS,MAAM,KAAK,CAAC,IAAIR,KAAK,CAACS,IAAI,CAACD,MAAM,KAAK;EACzE,CACF,CAAC;AACH,CAAC,CAAC;AAEJ,SAASf,wBAAwB,EAAEK,wBAAwB","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","withHealthRecordTiming","normalizeCoreHealthObservation","isCoreMeasurementTypeKey","value","Object","values","includes","toCoreHealthObservations","observations","props","sourceAt","map","observation","index","device","timing","applyCatalogCoding","length","data"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/to-core-health-observations.ts"],"mappings":";;AACA,SAASA,kBAAkB,QAAQ,iBAAiB;AAIpD,SAASC,sBAAsB,QAAQ,2BAAwB;AAC/D,SAASC,8BAA8B,QAAQ,wCAAqC;AAOpF,MAAMC,wBAAwB,GAC5BC,KAAa,IAEbC,MAAM,CAACC,MAAM,CAACN,kBAAkB,CAAC,CAACO,QAAQ,CAACH,KAA2B,CAAC;;AAEzE;AACA,MAAMI,wBAAwB,GAAGA,CAC/BC,YAA2B,EAC3BC,KAAgC,EAChCC,QAA8C,KAE9CF,YAAY,CAACG,GAAG,CAAC,CAACC,WAAW,EAAEC,KAAK,KAAK;EACvC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGL,QAAQ,CAACG,KAAK,CAAC;EAE1C,OAAOZ,8BAA8B,CACnCD,sBAAsB,CACpB;IACE,GAAGY,WAAW;IACd,IAAIE,MAAM,GACN;MAAEA,MAAM,EAAE;QAAE,IAAIF,WAAW,CAACE,MAAM,IAAI,CAAC,CAAC,CAAC;QAAE,GAAGA;MAAO;IAAE,CAAC,GACxD,CAAC,CAAC;EACR,CAAC,EACDC,MACF,CAAC,EACD;IACE,GAAGN,KAAK;IACRO,kBAAkB,EAAER,YAAY,CAACS,MAAM,KAAK,CAAC,IAAIR,KAAK,CAACS,IAAI,CAACD,MAAM,KAAK;EACzE,CACF,CAAC;AACH,CAAC,CAAC;AAEJ,SAASf,wBAAwB,EAAEK,wBAAwB","ignoreList":[]}

package/lib/module/modules/image/components/optimized-image.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
 import { Image as ExpoImage, useImage } from "expo-image";
 import * as React from "react";
 import { StyleSheet, View } from "react-native";
 import { SvgXml } from "react-native-svg";
+import { useNativeOvok } from "../../next/use-native-ovok.js";
 import { calculateDimension } from "../utils/calculate-dimension.js";
 import { getOptimizedImageUrl } from "../utils/get-optimized-image-url.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -23,7 +23,7 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
   aspectRatio: providedAspectRatio,
   ...rest
 }) => {
-  const client = useClient();
+  const client = useNativeOvok();
   const retryCount = React.useRef(0);
   const [failedUri, setFailedUri] = React.useState(null);
   const [containerSize, setContainerSize] = React.useState({
@@ -39,7 +39,7 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     width: calculatedWidth,
     height: calculatedHeight,
     fit,
-    baseUrl: client.getBaseUrl()
+    baseUrl: client.baseUrl
   }), [uri, calculatedWidth, calculatedHeight, fit, client]);
   React.useEffect(() => {
     retryCount.current = 0;

package/lib/module/modules/image/components/optimized-image.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","Image","ExpoImage","useImage","React","StyleSheet","View","SvgXml","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","onError","placeholder","fallback","maxRetries","containerStyle","aspectRatio","providedAspectRatio","rest","client","retryCount","useRef","failedUri","setFailedUri","useState","containerSize","setContainerSize","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","getBaseUrl","useEffect","current","image","error","retry","Error","message","String","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","startsWith","payload","split","xml","includes","globalThis","atob","decodeURIComponent","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Image","ExpoImage","useImage","React","StyleSheet","View","SvgXml","useNativeOvok","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","onError","placeholder","fallback","maxRetries","containerStyle","aspectRatio","providedAspectRatio","rest","client","retryCount","useRef","failedUri","setFailedUri","useState","containerSize","setContainerSize","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","useEffect","current","image","error","retry","Error","message","String","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","startsWith","payload","split","xml","includes","globalThis","atob","decodeURIComponent","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/next/ovok.js

@@ -15,12 +15,16 @@ class Ovok extends CoreOvok {
       getRandomValues,
       ...shared
     } = config;
+    const storage = new SecureStoreStorage(secureStore, secureStoreOptions);
     installRandomValues(getRandomValues);
     super({
       ...shared,
       clientSecret: undefined,
-      storage: new SecureStoreStorage(secureStore, secureStoreOptions)
+      storage
     });
+    this.baseUrl = shared.baseUrl.endsWith("/") ? shared.baseUrl : `${shared.baseUrl}/`;
+    this.tenantCode = shared.tenantCode;
+    this.storage = storage;
   }
 }
 export { Ovok };

package/lib/module/modules/next/ovok.js.map

@@ -1 +1 @@
-{"version":3,"names":["Ovok","CoreOvok","installRandomValues","SecureStoreStorage","constructor","config","secureStore","secureStoreOptions","getRandomValues","shared","clientSecret","undefined","storage"],"sourceRoot":"../../../../src","sources":["modules/next/ovok.ts"],"mappings":";;AAAA,SAASA,IAAI,IAAIC,QAAQ,QAAQ,iBAAiB;AAMlD,SAASC,mBAAmB,QAAQ,oBAAiB;AACrD,SAASC,kBAAkB,QAAQ,2BAAwB;;AAI3D;;AAOA;AACA,MAAMH,IAAI,SAASC,QAAQ,CAAC;EAC1BG,WAAWA,CAACC,MAAwB,EAAE;IACpC,MAAM;MAAEC,WAAW;MAAEC,kBAAkB;MAAEC,eAAe;MAAE,GAAGC;IAAO,CAAC,GAAGJ,MAAM;IAE9EH,mBAAmB,CAACM,eAAe,CAAC;IACpC,KAAK,CAAC;MACJ,GAAGC,MAAM;MACTC,YAAY,EAAEC,SAAS;MACvBC,OAAO,EAAE,IAAIT,kBAAkB,CAACG,WAAW,EAAEC,kBAAkB;IACjE,CAAC,CAAC;EACJ;AACF;AAEA,SAASP,IAAI","ignoreList":[]}
+{"version":3,"names":["Ovok","CoreOvok","installRandomValues","SecureStoreStorage","constructor","config","secureStore","secureStoreOptions","getRandomValues","shared","storage","clientSecret","undefined","baseUrl","endsWith","tenantCode"],"sourceRoot":"../../../../src","sources":["modules/next/ovok.ts"],"mappings":";;AAAA,SAASA,IAAI,IAAIC,QAAQ,QAAQ,iBAAiB;AAMlD,SAASC,mBAAmB,QAAQ,oBAAiB;AACrD,SAASC,kBAAkB,QAAQ,2BAAwB;;AAI3D;;AAOA;AACA,MAAMH,IAAI,SAASC,QAAQ,CAAC;EAK1BG,WAAWA,CAACC,MAAwB,EAAE;IACpC,MAAM;MAAEC,WAAW;MAAEC,kBAAkB;MAAEC,eAAe;MAAE,GAAGC;IAAO,CAAC,GAAGJ,MAAM;IAC9E,MAAMK,OAAO,GAAG,IAAIP,kBAAkB,CAACG,WAAW,EAAEC,kBAAkB,CAAC;IAEvEL,mBAAmB,CAACM,eAAe,CAAC;IACpC,KAAK,CAAC;MACJ,GAAGC,MAAM;MACTE,YAAY,EAAEC,SAAS;MACvBF;IACF,CAAC,CAAC;IACF,IAAI,CAACG,OAAO,GAAGJ,MAAM,CAACI,OAAO,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGL,MAAM,CAACI,OAAO,GAAG,GAAGJ,MAAM,CAACI,OAAO,GAAG;IACnF,IAAI,CAACE,UAAU,GAAGN,MAAM,CAACM,UAAU;IACnC,IAAI,CAACL,OAAO,GAAGA,OAAO;EACxB;AACF;AAEA,SAASV,IAAI","ignoreList":[]}

package/lib/module/modules/next/use-native-ovok.js

@@ -0,0 +1,12 @@
+"use strict";
+
+import { useOvok } from "@ovok/core/next/react";
+import { Ovok } from "./ovok.js";
+export const useNativeOvok = () => {
+  const client = useOvok();
+  if (!(client instanceof Ovok)) {
+    throw new Error("Native modules require an @ovok/native/next Ovok client.");
+  }
+  return client;
+};
+//# sourceMappingURL=use-native-ovok.js.map

package/lib/module/modules/next/use-native-ovok.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useOvok","Ovok","useNativeOvok","client","Error"],"sourceRoot":"../../../../src","sources":["modules/next/use-native-ovok.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,uBAAuB;AAE/C,SAASC,IAAI,QAAQ,WAAQ;AAE7B,OAAO,MAAMC,aAAa,GAAGA,CAAA,KAAY;EACvC,MAAMC,MAAM,GAAGH,OAAO,CAAC,CAAC;EAExB,IAAI,EAAEG,MAAM,YAAYF,IAAI,CAAC,EAAE;IAC7B,MAAM,IAAIG,KAAK,CAAC,0DAA0D,CAAC;EAC7E;EAEA,OAAOD,MAAM;AACf,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/questionnaire-form-provider.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable max-lines */
 
-import { getReferenceString, useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { useFormik } from "formik";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -27,7 +27,7 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
   resolveQuestionnaireConstraint,
   resolveQuestionnaireUnitOptions
 }) => {
-  const client = useClient();
+  const client = useOvok();
   const {
     i18n
   } = useTranslation();
@@ -69,13 +69,13 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
         submissionIdentifier.current = null;
         return;
       }
-      const activeProfile = await client.getProfileAsync();
-      if (!activeProfile) {
+      const profileReference = (await client.session.current())?.profile.reference;
+      if (!profileReference) {
         throw new Error("questionnaire-form.error.profile-not-found");
       }
       const response = QuestionnaireSubmitUtils.createQuestionnaireResponse(submittedValues, pages, questionnaire, renderItem, resolveQuestionnaireConstraint, resolveQuestionnaireUnitOptions);
       response.subject = {
-        reference: getReferenceString(activeProfile)
+        reference: profileReference
       };
       const currentSubmissionSignature = JSON.stringify({
         questionnaire: response.questionnaire,

package/lib/module/modules/questionnaire-response-form/components/questionnaire-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["getReferenceString","useClient","useFormik","React","useTranslation","QuestionnaireFormContext","useInitialSelectedValues","ConditionUtils","FormUtils","FormValidation","QuestionnaireSubmitUtils","QuestionnaireNavigationProvider","jsx","_jsx","QuestionnaireFormProvider","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","locale","renderItem","resolveQuestionnaireConstraint","resolveQuestionnaireUnitOptions","client","i18n","resolvedLocale","language","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","submissionError","setSubmissionError","submissionInFlight","useRef","submissionIdentifier","submissionSignature","pages","useMemo","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","current","validationResult","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","failureReason","submittedValues","currentLinkId","activeProfile","getProfileAsync","Error","response","createQuestionnaireResponse","subject","reference","currentSubmissionSignature","JSON","stringify","items","item","id","Date","now","Math","random","toString","slice","identifierValue","identifierSystem","identifier","system","value","extractObservations","questionnaireHasObservationExtraction","createdResponse","persistQuestionnaireResponse","error","typedError","message","startsWith","allItems","getAllQuestionnaireItems","formik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","enabledLinkIds","Set","getEnabledItems","map","linkId","forEach","has","undefined","setValues","Object","some","setFieldError","setFieldValue","useEffect","retrySubmit","submitForm","currentPage","enabledItems","getEnabledItemsForPage","length","max","min","currentItem","allEnabledItems","contextValue","Provider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","useFormik","React","useTranslation","QuestionnaireFormContext","useInitialSelectedValues","ConditionUtils","FormUtils","FormValidation","QuestionnaireSubmitUtils","QuestionnaireNavigationProvider","jsx","_jsx","QuestionnaireFormProvider","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","locale","renderItem","resolveQuestionnaireConstraint","resolveQuestionnaireUnitOptions","client","i18n","resolvedLocale","language","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","submissionError","setSubmissionError","submissionInFlight","useRef","submissionIdentifier","submissionSignature","pages","useMemo","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","current","validationResult","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","failureReason","submittedValues","currentLinkId","profileReference","session","profile","reference","Error","response","createQuestionnaireResponse","subject","currentSubmissionSignature","JSON","stringify","items","item","id","Date","now","Math","random","toString","slice","identifierValue","identifierSystem","identifier","system","value","extractObservations","questionnaireHasObservationExtraction","createdResponse","persistQuestionnaireResponse","error","typedError","message","startsWith","allItems","getAllQuestionnaireItems","formik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","enabledLinkIds","Set","getEnabledItems","map","linkId","forEach","has","undefined","setValues","Object","some","setFieldError","setFieldValue","useEffect","retrySubmit","submitForm","currentPage","enabledItems","getEnabledItemsForPage","length","max","min","currentItem","allEnabledItems","contextValue","Provider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":"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","ignoreList":[]}