@ovok/native 1.5.5 → 1.6.0

package/lib/module/modules/bt-management/utils/result-identity.js

@@ -0,0 +1,57 @@
+"use strict";
+
+/* eslint-disable import/group-exports */
+
+const canonicalize = value => {
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  if (Array.isArray(value)) {
+    return value.map(canonicalize);
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, nested]) => [key, canonicalize(nested)]));
+  }
+  return value;
+};
+const hash = value => {
+  let first = 0x811c9dc5;
+  let second = 0x01000193;
+  for (let index = 0; index < value.length; index += 1) {
+    const code = value.charCodeAt(index);
+    first = Math.imul(first ^ code, 0x01000193);
+    second = Math.imul(second ^ code + index, 0x811c9dc5);
+  }
+  return `${(first >>> 0).toString(16).padStart(8, "0")}${(second >>> 0).toString(16).padStart(8, "0")}`;
+};
+
+/**
+ * Creates an identity that is stable when a device sends its stored history again.
+ * Recording IDs, timestamps and indexes are retained in the canonical payload; transient
+ * delivery metadata is deliberately not part of the key.
+ */
+export const createStableResultId = (deviceData, data) => {
+  const deviceIdentity = deviceData.sn || deviceData.id || deviceData.name;
+  return `ovok:${hash(JSON.stringify(canonicalize({
+    device: deviceIdentity,
+    name: deviceData.name,
+    data
+  })))}`;
+};
+export const reviveResultDates = value => {
+  const revive = (current, key) => {
+    if (typeof current === "string" && ["recordedAt", "start", "end"].includes(key ?? "")) {
+      const date = new Date(current);
+      return Number.isNaN(date.getTime()) ? current : date;
+    }
+    if (Array.isArray(current)) {
+      return current.map(item => revive(item));
+    }
+    if (current && typeof current === "object") {
+      return Object.fromEntries(Object.entries(current).map(([childKey, childValue]) => [childKey, revive(childValue, childKey)]));
+    }
+    return current;
+  };
+  return revive(value);
+};
+//# sourceMappingURL=result-identity.js.map

package/lib/module/modules/bt-management/utils/result-identity.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["canonicalize","value","Date","toISOString","Array","isArray","map","Object","fromEntries","entries","sort","left","right","localeCompare","key","nested","hash","first","second","index","length","code","charCodeAt","Math","imul","toString","padStart","createStableResultId","deviceData","data","deviceIdentity","sn","id","name","JSON","stringify","device","reviveResultDates","revive","current","includes","date","Number","isNaN","getTime","item","childKey","childValue"],"sourceRoot":"../../../../../src","sources":["modules/bt-management/utils/result-identity.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js

@@ -50,9 +50,15 @@ const useHealthConnectAuthorization = (readIdentifiers, writeIdentifiers, backgr
         return;
       }
       const grantedPermissions = await getGrantedPermissions();
-      const allGranted = permissionsRef.current.every(permission => grantedPermissions.some(granted => granted.accessType === permission.accessType && granted.recordType === permission.recordType));
+      const backgroundPermission = permissionsRef.current.find(permission => permission.recordType === "BackgroundAccessPermission");
+      const requiredPermissions = permissionsRef.current.filter(permission => permission !== backgroundPermission);
+      const allGranted = requiredPermissions.every(permission => grantedPermissions.some(granted => granted.accessType === permission.accessType && granted.recordType === permission.recordType));
+      const backgroundGranted = backgroundPermission ? grantedPermissions.some(granted => granted.accessType === backgroundPermission.accessType && granted.recordType === backgroundPermission.recordType) : undefined;
       updateStatus({
-        state: allGranted ? "authorized" : hasRequestedRef.current ? "refused" : "shouldRequest"
+        state: allGranted ? "authorized" : hasRequestedRef.current ? "refused" : "shouldRequest",
+        ...(backgroundPermission ? {
+          backgroundAccess: backgroundGranted ? "authorized" : hasRequestedRef.current ? "refused" : "shouldRequest"
+        } : {})
       });
     } catch (error) {
       updateStatus({

package/lib/module/modules/data-sync/components/android/android-health-connect-authorization-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","AppState","getGrantedPermissions","initialize","requestPermission","Fragment","_Fragment","jsx","_jsx","toError","error","Error","String","useHealthConnectAuthorization","readIdentifiers","writeIdentifiers","backgroundAccess","onStatusChange","status","setStatus","useState","state","hasRequestedRef","useRef","identifiersRef","permissionsRef","current","readPermissions","map","recordType","accessType","writePermissions","backgroundPermissions","updateStatus","useCallback","nextStatus","checkAuthorization","isInitialized","grantedPermissions","allGranted","every","permission","some","granted","requestAuthorization","useEffect","subscription","addEventListener","remove","AndroidHealthConnectAuthorizationProvider","memo","fallback","children","skipRequest","renderManualRequestUI","onAuthorizationStatusChange","authorizationStatus","shouldRenderManualRequestUI","includes","shouldRenderFallback"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/components/android/android-health-connect-authorization-provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","AppState","getGrantedPermissions","initialize","requestPermission","Fragment","_Fragment","jsx","_jsx","toError","error","Error","String","useHealthConnectAuthorization","readIdentifiers","writeIdentifiers","backgroundAccess","onStatusChange","status","setStatus","useState","state","hasRequestedRef","useRef","identifiersRef","permissionsRef","current","readPermissions","map","recordType","accessType","writePermissions","backgroundPermissions","updateStatus","useCallback","nextStatus","checkAuthorization","isInitialized","grantedPermissions","backgroundPermission","find","permission","requiredPermissions","filter","allGranted","every","some","granted","backgroundGranted","undefined","requestAuthorization","useEffect","subscription","addEventListener","remove","AndroidHealthConnectAuthorizationProvider","memo","fallback","children","skipRequest","renderManualRequestUI","onAuthorizationStatusChange","authorizationStatus","shouldRenderManualRequestUI","includes","shouldRenderFallback"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/components/android/android-health-connect-authorization-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/data-sync/services/base-health-sync-service.js

@@ -1,5 +1,9 @@
 "use strict";
 
+/* eslint-disable max-lines */
+
+import { recordOvokDuration, recordOvokMetric, withOvokSpan } from "../../helpers/utils/telemetry.js";
+import { withSyncRetries } from "../utils/retry-save.js";
 import { DataProcessor } from "./managers/data-processor.js";
 import { StorageManager } from "./managers/storage-manager.js";
 import { SyncProgressManager } from "./managers/sync-progress-manager.js";
@@ -17,7 +21,9 @@ export class BaseHealthSyncService {
   }
   /** One run at a time; see `SyncStateManager.once` for why that matters. */
   async startSync() {
-    return this.stateManager.once(() => this.runSync());
+    return this.stateManager.once(() => withOvokSpan("health.import", {
+      provider: this.getProviderName()
+    }, () => this.runSync()));
   }
   async runSync() {
     try {
@@ -88,22 +94,35 @@ export class BaseHealthSyncService {
     while (hasAnchor && !this.stateManager.shouldStopSync) {
       const {
         observationBodies,
-        hasAnchor: currentHasAnchor
+        hasAnchor: currentHasAnchor,
+        anchors
       } = await this.dataProcessor.getObservationBodiesForType(measurementTypeKey, data, latestValidStartDate);
       hasAnchor = currentHasAnchor;
       if (this.stateManager.shouldStopSync) {
         break;
       }
       const entries = this.dataProcessor.generateObservationEntries(observationBodies);
-      this.progressManager.incrementSyncedObservations(measurementTypeKey, entries.length);
       if (entries.length !== 0 && !this.stateManager.shouldStopSync) {
         try {
-          const result = await this.storageManager.saveObservations(entries);
+          const startedAt = Date.now();
+          const result = await withSyncRetries(() => this.storageManager.saveObservations(entries));
+          recordOvokMetric("ovok.health.samples.imported", entries.length, {
+            provider: this.getProviderName(),
+            measurementTypeKey
+          });
+          recordOvokDuration("ovok.measurement.save.duration", Date.now() - startedAt, {
+            provider: this.getProviderName()
+          });
           this.stateManager.addResult(result);
+          this.progressManager.incrementSyncedObservations(measurementTypeKey, entries.length);
+          this.storageManager.saveAnchors(anchors);
         } catch (error) {
+          this.progressManager.setStatus(measurementTypeKey, "failed");
           this.onSyncError(error);
           return;
         }
+      } else {
+        this.storageManager.saveAnchors(anchors);
       }
     }
     this.progressManager.setStatus(measurementTypeKey, this.stateManager.shouldStopSync ? "idle" : "completed");

package/lib/module/modules/data-sync/services/base-health-sync-service.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","client","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","getProviderName","dataProcessor","chunkSize","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","startSync","once","runSync","isInitialized","Error","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","hasAnchor","observationBodies","currentHasAnchor","getObservationBodiesForType","entries","generateObservationEntries","incrementSyncedObservations","length","result","saveObservations","addResult"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":";;AAmBA,SAASA,aAAa,QAAQ,8BAA2B;AACzD,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SAASC,mBAAmB,QAAQ,qCAAkC;AACtE,SAASC,gBAAgB,QAAQ,kCAA+B;AAEhE,OAAO,MAAeC,qBAAqB,CAUzC;EAeAC,WAAWA,CAACC,KAAoC,EAAE;IAChD,IAAI,CAACC,MAAM,GAAGD,KAAK,CAACC,MAAM;IAC1B,IAAI,CAACC,SAAS,GAAGF,KAAK,CAACE,SAAS;IAChC,IAAI,CAACC,UAAU,GAAGH,KAAK,CAACG,UAAU;IAClC,IAAI,CAACC,WAAW,GAAGJ,KAAK,CAACI,WAAW;IAEpC,IAAI,CAACC,eAAe,GAAG,IAAIT,mBAAmB,CAC5CI,KAAK,CAACM,cAAc,EACpBN,KAAK,CAACG,UACR,CAAC;IACD,IAAI,CAACI,YAAY,GAAG,IAAIV,gBAAgB,CAAC,CAAC;IAC1C,IAAI,CAACW,cAAc,GAAG,IAAIb,cAAc,CACtCK,KAAK,CAACC,MAAM,EACZ,IAAI,CAACQ,eAAe,CAAC,CACvB,CAAC;IACD,IAAI,CAACC,aAAa,GAAG,IAAIhB,aAAa,CACpCM,KAAK,CAACC,MAAM,EACZD,KAAK,CAACE,SAAS,EACf,IAAI,CAACO,eAAe,CAAC,CAAC,EACtBT,KAAK,CAACW,SAAS,IAAI,IAAI,EACvB,IAAI,CAACH,cAAc,EACnB,IAAI,CAACI,sBAAsB,CAAC,CAAC,EAC7B,IAAI,CAACC,2BAA2B,CAAC,CAAC,EAClC,IAAI,CAACC,oBAAoB,CAAC,CAC5B,CAAC;EACH;EAgBA;EACA,MAAaC,SAASA,CAAA,EAAkB;IACtC,OAAO,IAAI,CAACR,YAAY,CAACS,IAAI,CAAC,MAAM,IAAI,CAACC,OAAO,CAAC,CAAC,CAAC;EACrD;EAEA,MAAcA,OAAOA,CAAA,EAAkB;IACrC,IAAI;MACF,IAAI,CAAC,IAAI,CAAChB,MAAM,CAACiB,aAAa,EAAE;QAC9B,IAAI,CAACd,WAAW,CAAC,IAAIe,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAErD;MACF;MAEA,IAAI,CAAC,IAAI,CAACjB,SAAS,EAAE;QACnB,IAAI,CAACE,WAAW,CAAC,IAAIe,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEhD;MACF;MAEA,IAAI,CAACZ,YAAY,CAACa,MAAM,CAAC,CAAC;MAC1B,IAAI,CAACf,eAAe,CAACgB,qBAAqB,CAAC,CAAC;MAE5C,IAAI,CAAC,IAAI,CAACd,YAAY,CAACe,kBAAkB,EAAE;QACzC,MAAM,IAAI,CAACC,cAAc,CAAC,CAAC;MAC7B;MAEA,MAAM,IAAI,CAACC,mBAAmB,CAAC,CAAC;MAEhC,IAAI,CAACnB,eAAe,CAACoB,gBAAgB,CAAC,IAAI,CAAClB,YAAY,CAACmB,WAAW,CAAC;IACtE,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,IAAI,CAACvB,WAAW,CAACuB,KAAc,CAAC;IAClC;EACF;EAEA,MAAaC,QAAQA,CAAA,EAAkB;IACrC,IAAI,CAACvB,eAAe,CAACwB,QAAQ,CAAC,CAAC;IAC/B,IAAI,CAACtB,YAAY,CAACuB,KAAK,CAAC,CAAC;IACzB,IAAI,CAACvB,YAAY,CAACwB,cAAc,GAAG,IAAI;EACzC;EAEA,MAAaC,SAASA,CAACC,MAAwB,EAAiB;IAC9D,IAAI,CAAC1B,YAAY,CAAC2B,KAAK,CAACD,MAAM,CAAC;IAC/B,IAAI,CAAC5B,eAAe,CAACoB,gBAAgB,CAACQ,MAAM,CAAC;EAC/C;EAEA,MAAcV,cAAcA,CAAA,EAAkB;IAC5C,MAAMY,sBAAsB,GAC1B,MAAM,IAAI,CAACzB,aAAa,CAAC0B,yBAAyB,CAAC,IAAI,CAACjC,UAAU,CAAC;IAErE,IAAI,CAACI,YAAY,CAAC4B,sBAAsB,GAAGA,sBAAsB;IAEjE,MAAM,IAAI,CAACE,oBAAoB,CAAC,CAAC;IACjC,IAAI,CAAC9B,YAAY,CAACe,kBAAkB,GAAG,IAAI;EAC7C;EAEA,MAAce,oBAAoBA,CAAA,EAAkB;IAClD,KAAK,MAAMC,GAAG,IAAIC,MAAM,CAACC,IAAI,CAAC,IAAI,CAACrC,UAAqC,CAAC,EAAE;MACzE,MAAMsC,kBAAkB,GAAGH,GAAqB;MAChD,MAAMI,IAAI,GAAG,IAAI,CAACC,yBAAyB,CAACF,kBAAkB,CAAC;MAE/D,IAAI,CAACC,IAAI,EAAE;QACT;MACF;MAEA,MAAME,oBAAoB,GAAG,IAAI,CAAClC,aAAa,CAACmC,uBAAuB,CACrE,IAAI,CAACtC,YAAY,CAAC4B,sBAAsB,EACxCO,IACF,CAAC;MAED,MAAMI,UAAU,GAAG,MAAM,IAAI,CAACpC,aAAa,CAACqC,2BAA2B,CACrEL,IAAI,EACJE,oBACF,CAAC;MAED,IAAI,CAACvC,eAAe,CAAC2C,oBAAoB,CAACP,kBAAkB,EAAEK,UAAU,CAAC;IAC3E;EACF;EAEA,MAActB,mBAAmBA,CAAA,EAAkB;IACjD,KAAK,MAAMc,GAAG,IAAIC,MAAM,CAACC,IAAI,CAC3B,IAAI,CAACrC,UACP,CAAC,EAAE;MACD,IAAI,IAAI,CAACI,YAAY,CAACwB,cAAc,EAAE;QACpC;MACF;MAEA,MAAMU,kBAAkB,GAAGH,GAAqB;MAChD,MAAMI,IAAI,GAAG,IAAI,CAACC,yBAAyB,CAACF,kBAAkB,CAAC;MAE/D,IAAI,CAACC,IAAI,EAAE;QACT,IAAI,CAACrC,eAAe,CAAC4C,SAAS,CAACR,kBAAkB,EAAE,MAAM,CAAC;QAC1D;MACF;MAEA,IAAI,CAACpC,eAAe,CAAC4C,SAAS,CAACR,kBAAkB,EAAE,SAAS,CAAC;MAC7D,MAAM,IAAI,CAACS,cAAc,CAACT,kBAAkB,EAAEC,IAAI,CAAC;IACrD;EACF;EAEA,MAAcQ,cAAcA,CAC1BT,kBAAkC,EAClCC,IAA8C,EAC/B;IACf,MAAME,oBAAoB,GAAG,IAAI,CAAClC,aAAa,CAACmC,uBAAuB,CACrE,IAAI,CAACtC,YAAY,CAAC4B,sBAAsB,EACxCO,IACF,CAAC;IAED,IAAIS,SAAS,GAAG,IAAI;IAEpB,OAAOA,SAAS,IAAI,CAAC,IAAI,CAAC5C,YAAY,CAACwB,cAAc,EAAE;MACrD,MAAM;QAAEqB,iBAAiB;QAAED,SAAS,EAAEE;MAAiB,CAAC,GACtD,MAAM,IAAI,CAAC3C,aAAa,CAAC4C,2BAA2B,CAClDb,kBAAkB,EAClBC,IAAI,EACJE,oBACF,CAAC;MAEHO,SAAS,GAAGE,gBAAgB;MAE5B,IAAI,IAAI,CAAC9C,YAAY,CAACwB,cAAc,EAAE;QACpC;MACF;MAEA,MAAMwB,OAAO,GACX,IAAI,CAAC7C,aAAa,CAAC8C,0BAA0B,CAACJ,iBAAiB,CAAC;MAElE,IAAI,CAAC/C,eAAe,CAACoD,2BAA2B,CAC9ChB,kBAAkB,EAClBc,OAAO,CAACG,MACV,CAAC;MAED,IAAIH,OAAO,CAACG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAACnD,YAAY,CAACwB,cAAc,EAAE;QAC7D,IAAI;UACF,MAAM4B,MAAM,GAAG,MAAM,IAAI,CAACnD,cAAc,CAACoD,gBAAgB,CAACL,OAAO,CAAC;UAElE,IAAI,CAAChD,YAAY,CAACsD,SAAS,CAACF,MAAM,CAAC;QACrC,CAAC,CAAC,OAAOhC,KAAK,EAAE;UACd,IAAI,CAACvB,WAAW,CAACuB,KAAc,CAAC;UAEhC;QACF;MACF;IACF;IAEA,IAAI,CAACtB,eAAe,CAAC4C,SAAS,CAC5BR,kBAAkB,EAClB,IAAI,CAAClC,YAAY,CAACwB,cAAc,GAAG,MAAM,GAAG,WAC9C,CAAC;EACH;EAEQY,yBAAyBA,CAACF,kBAAkC,EAAE;IACpE,OAAO,IAAI,CAACtC,UAAU,CAACsC,kBAAkB,CAAC;EAC5C;AACF","ignoreList":[]}
+{"version":3,"names":["recordOvokDuration","recordOvokMetric","withOvokSpan","withSyncRetries","DataProcessor","StorageManager","SyncProgressManager","SyncStateManager","BaseHealthSyncService","constructor","props","client","patientId","dataToSync","onSyncError","progressManager","updateProgress","stateManager","storageManager","getProviderName","dataProcessor","chunkSize","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","startSync","once","provider","runSync","isInitialized","Error","resume","setNotStartedStatuses","initialDataFetched","initializeSync","processAllDataTypes","setPauseStatuses","pauseReason","error","stopSync","resetAll","reset","shouldStopSync","pauseSync","reason","pause","latestObservationDates","getLatestObservationDates","calculateTotalCounts","key","Object","keys","measurementTypeKey","data","getDataForMeasurementType","latestValidStartDate","getLatestValidStartDate","totalCount","getTotalRecordsCountForType","setTotalObservations","setStatus","syncDataByType","hasAnchor","observationBodies","currentHasAnchor","anchors","getObservationBodiesForType","entries","generateObservationEntries","length","startedAt","Date","now","result","saveObservations","addResult","incrementSyncedObservations","saveAnchors"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/services/base-health-sync-service.ts"],"mappings":"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","ignoreList":[]}

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

@@ -53,7 +53,6 @@ export class DataProcessor {
       });
     }));
     const newAnchors = results.map(result => result.anchor).flat().filter(Boolean);
-    this.storageManager.saveAnchors(newAnchors);
     const allData = results.flatMap(result => result.data);
     const dataGroups = this.provider === "apple-health" && measurementTypeKey === MeasurementTypeKey.bloodPressure ? Array.from(allData.reduce((groups, sample) => {
       const value = sample;
@@ -70,7 +69,8 @@ export class DataProcessor {
     })));
     return {
       observationBodies,
-      hasAnchor: newAnchors.length > 0
+      hasAnchor: newAnchors.length > 0,
+      anchors: newAnchors
     };
   }
   generateObservationEntries(observationBodies) {

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

@@ -1 +1 @@
-{"version":3,"names":["MeasurementTypeKey","generateObservationEntry","getLatestObservationDatesByCode","getLatestValidStartDate","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","Object","values","flatMap","data","typeIdentifiers","map","identifier","code","getLatestObservationDates","codes","getTotalRecordsCountForType","latestValidStartDate","totalCounts","Promise","all","typeIdentifier","anchor","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","measurementTypeKey","results","newAnchors","result","flat","filter","Boolean","saveAnchors","allData","dataGroups","bloodPressure","Array","from","groups","sample","value","key","Date","getTime","endDate","group","get","push","set","Map","observationBodies","hasAnchor","length","generateObservationEntries","groupedObservationBodies","latestObservationDates"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["MeasurementTypeKey","generateObservationEntry","getLatestObservationDatesByCode","getLatestValidStartDate","DataProcessor","constructor","client","patientId","provider","chunkSize","storageManager","getTotalCountsFunction","getDataFromProviderFunction","getConverterFunction","extractCodes","dataToSync","Object","values","flatMap","data","typeIdentifiers","map","identifier","code","getLatestObservationDates","codes","getTotalRecordsCountForType","latestValidStartDate","totalCounts","Promise","all","typeIdentifier","anchor","getAnchor","startDate","toISOString","reduce","acc","count","getObservationBodiesForType","measurementTypeKey","results","newAnchors","result","flat","filter","Boolean","allData","dataGroups","bloodPressure","Array","from","groups","sample","value","key","Date","getTime","endDate","group","get","push","set","Map","observationBodies","hasAnchor","length","anchors","generateObservationEntries","groupedObservationBodies","latestObservationDates"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/data-processor.ts"],"mappings":"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","ignoreList":[]}

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

@@ -20,7 +20,7 @@ export class SyncProgressManager {
     for (const key of Object.keys(this.syncData)) {
       const measurementTypeKey = key;
       const currentStatus = this.getStatus(measurementTypeKey);
-      if (currentStatus !== "completed") {
+      if (currentStatus !== "completed" && currentStatus !== "failed") {
         this.setStatus(measurementTypeKey, "paused", reason);
       }
     }

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

@@ -1 +1 @@
-{"version":3,"names":["defaultSyncData","syncedObservations","totalObservations","status","SyncProgressManager","syncData","constructor","updateProgress","dataToSync","key","Object","keys","measurementTypeKey","setPauseStatuses","reason","currentStatus","getStatus","setStatus","setNotStartedStatuses","getProgress","done","total","setTotalObservations","notifyProgress","incrementSyncedObservations","count","undefined","resetAll","forEach","progress"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-progress-manager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["defaultSyncData","syncedObservations","totalObservations","status","SyncProgressManager","syncData","constructor","updateProgress","dataToSync","key","Object","keys","measurementTypeKey","setPauseStatuses","reason","currentStatus","getStatus","setStatus","setNotStartedStatuses","getProgress","done","total","setTotalObservations","notifyProgress","incrementSyncedObservations","count","undefined","resetAll","forEach","progress"],"sourceRoot":"../../../../../../src","sources":["modules/data-sync/services/managers/sync-progress-manager.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,60 @@
+"use strict";
+
+const RETRY_DELAYS_MS = [1000, 4000, 16000];
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : undefined;
+}
+function getStatus(error) {
+  const record = asRecord(error);
+  const response = asRecord(record?.response);
+  const statuses = [record?.status, record?.statusCode, response?.status, ...(Array.isArray(record?.entry) ? record.entry.map(entry => asRecord(entry)?.response).map(asRecord) : [])];
+  for (const status of statuses) {
+    const numberStatus = Number(status);
+    if (Number.isInteger(numberStatus) && numberStatus > 0) {
+      return numberStatus;
+    }
+  }
+  return undefined;
+}
+function getRetryAfterMs(error) {
+  const record = asRecord(error);
+  const response = asRecord(record?.response);
+  const retryAfter = record?.retryAfterMs ?? response?.retryAfterMs;
+  if (typeof retryAfter === "number" && retryAfter >= 0) {
+    return retryAfter;
+  }
+  const headers = asRecord(response?.headers);
+  const header = headers?.["retry-after"] ?? headers?.["Retry-After"];
+  if (typeof header !== "string") {
+    return undefined;
+  }
+  const seconds = Number(header);
+  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1000 : undefined;
+}
+function isRetryableSyncError(error) {
+  const status = getStatus(error);
+  if (status !== undefined) {
+    return status === 429 || status >= 500;
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  return error instanceof TypeError || /network|fetch|timeout|connection|offline|unreachable/i.test(message);
+}
+function getSyncRetryDelayMs(error, retryIndex) {
+  return Math.max(RETRY_DELAYS_MS[retryIndex] ?? RETRY_DELAYS_MS.at(-1), getRetryAfterMs(error) ?? 0);
+}
+async function withSyncRetries(operation) {
+  for (let retryIndex = 0;; retryIndex += 1) {
+    try {
+      return await operation();
+    } catch (error) {
+      if (!isRetryableSyncError(error) || retryIndex >= RETRY_DELAYS_MS.length) {
+        throw error;
+      }
+      await new Promise(resolve => {
+        setTimeout(resolve, getSyncRetryDelayMs(error, retryIndex));
+      });
+    }
+  }
+}
+export { getSyncRetryDelayMs, isRetryableSyncError, withSyncRetries };
+//# sourceMappingURL=retry-save.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["RETRY_DELAYS_MS","asRecord","value","undefined","getStatus","error","record","response","statuses","status","statusCode","Array","isArray","entry","map","numberStatus","Number","isInteger","getRetryAfterMs","retryAfter","retryAfterMs","headers","header","seconds","isFinite","isRetryableSyncError","message","Error","String","TypeError","test","getSyncRetryDelayMs","retryIndex","Math","max","at","withSyncRetries","operation","length","Promise","resolve","setTimeout"],"sourceRoot":"../../../../../src","sources":["modules/data-sync/utils/retry-save.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/helpers/form-items/form-field.js

@@ -11,6 +11,7 @@ export const FormField = /*#__PURE__*/React.memo(({
   name,
   context,
   containerStyle,
+  inputRef,
   testID,
   ...props
 }) => {
@@ -38,6 +39,7 @@ export const FormField = /*#__PURE__*/React.memo(({
     testID: testID,
     children: [/*#__PURE__*/_jsx(TextInput, {
       ...props,
+      ref: inputRef,
       mode: "outlined",
       autoCapitalize: "none",
       value: value,

package/lib/module/modules/helpers/form-items/form-field.js.map

@@ -1 +1 @@
-{"version":3,"names":["getIn","React","useTranslation","View","HelperText","TextInput","useAppTheme","jsx","_jsx","jsxs","_jsxs","FormField","memo","name","context","containerStyle","testID","props","t","theme","values","errors","touched","handleChange","handleBlur","useContext","value","useMemo","error","onBlur","e","style","gap","spacing","children","mode","autoCapitalize","roundness","borderRadius","onChangeText","onFocus","undefined","type"],"sourceRoot":"../../../../../src","sources":["modules/helpers/form-items/form-field.tsx"],"mappings":";;AAAA,SAASA,KAAK,QAAmB,QAAQ;AACzC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAGEC,IAAI,QAEC,cAAc;AACrB,SAASC,UAAU,EAAEC,SAAS,QAA6B,oBAAoB;AAE/E,SAASC,WAAW,QAAQ,sBAAa;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAa1C,OAAO,MAAMC,SAAS,gBAAGV,KAAK,CAACW,IAAI,CACjC,CAAC;EAAEC,IAAI;EAAEC,OAAO;EAAEC,cAAc;EAAEC,MAAM;EAAE,GAAGC;AAAsB,CAAC,KAAK;EACvE,MAAM;IAAEC;EAAE,CAAC,GAAGhB,cAAc,CAAC,CAAC;EAC9B,MAAMiB,KAAK,GAAGb,WAAW,CAAC,CAAC;EAE3B,MAAM;IAAEc,MAAM;IAAEC,MAAM;IAAEC,OAAO;IAAEC,YAAY;IAAEC;EAAW,CAAC,GACzDvB,KAAK,CAACwB,UAAU,CAACX,OAAO,CAAiC;EAE3D,MAAMY,KAAK,GAAGzB,KAAK,CAAC0B,OAAO,CAAC,MAAM3B,KAAK,CAACoB,MAAM,EAAEP,IAAI,CAAC,EAAE,CAACO,MAAM,EAAEP,IAAI,CAAC,CAAC;EAEtE,MAAMe,KAAK,GAAG3B,KAAK,CAAC0B,OAAO,CACzB,MAAM3B,KAAK,CAACsB,OAAO,EAAET,IAAI,CAAC,IAAIb,KAAK,CAACqB,MAAM,EAAER,IAAI,CAAC,EACjD,CAACS,OAAO,EAAED,MAAM,EAAER,IAAI,CACxB,CAAC;EAED,MAAMgB,MAAM,GAAIC,CAAgD,IAAK;IACnEN,UAAU,CAACX,IAAI,CAAC,CAACiB,CAAC,CAAC;IACnBb,KAAK,CAACY,MAAM,GAAGC,CAAC,CAAC;EACnB,CAAC;EAED,oBACEpB,KAAA,CAACP,IAAI;IACH4B,KAAK,EAAE,CAAC;MAAEC,GAAG,EAAEb,KAAK,CAACc,OAAO,CAAC,GAAG;IAAE,CAAC,EAAElB,cAAc,CAAE;IACrDC,MAAM,EAAEA,MAAO;IAAAkB,QAAA,gBAEf1B,IAAA,CAACH,SAAS;MAAA,GACJY,KAAK;MACTkB,IAAI,EAAC,UAAU;MACfC,cAAc,EAAC,MAAM;MACrBV,KAAK,EAAEA,KAAM;MACbP,KAAK,EAAE;QACLkB,SAAS,EAAElB,KAAK,CAACmB,YAAY,CAAC,CAAC,CAAC;QAChC,GAAGrB,KAAK,CAACE;MACX,CAAE;MACFS,KAAK,EAAE,CAAC,CAACA,KAAM;MACfW,YAAY,EAAEhB,YAAY,CAACV,IAAI;MAC/B;MAAA;MACAgB,MAAM,EAAEA,MAAc;MACtBW,OAAO,EAAEvB,KAAK,CAACuB,OAAQ;MACvBxB,MAAM,EAAEA,MAAM,GAAG,GAAGA,MAAM,QAAQ,GAAGyB;IAAU,CAChD,CAAC,EACDb,KAAK,gBACJpB,IAAA,CAACJ,UAAU;MACTsC,IAAI,EAAC,OAAO;MACZ1B,MAAM,EAAEA,MAAM,GAAG,GAAGA,MAAM,QAAQ,GAAGyB,SAAU;MAAAP,QAAA,EAE9ChB,CAAC,CAACU,KAAK;IAAC,CACC,CAAC,GACX,IAAI;EAAA,CACJ,CAAC;AAEX,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getIn","React","useTranslation","View","HelperText","TextInput","useAppTheme","jsx","_jsx","jsxs","_jsxs","FormField","memo","name","context","containerStyle","inputRef","testID","props","t","theme","values","errors","touched","handleChange","handleBlur","useContext","value","useMemo","error","onBlur","e","style","gap","spacing","children","ref","mode","autoCapitalize","roundness","borderRadius","onChangeText","onFocus","undefined","type"],"sourceRoot":"../../../../../src","sources":["modules/helpers/form-items/form-field.tsx"],"mappings":";;AAAA,SAASA,KAAK,QAAmB,QAAQ;AACzC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAGEC,IAAI,QAEC,cAAc;AACrB,SAASC,UAAU,EAAEC,SAAS,QAA6B,oBAAoB;AAE/E,SAASC,WAAW,QAAQ,sBAAa;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAc1C,OAAO,MAAMC,SAAS,gBAAGV,KAAK,CAACW,IAAI,CACjC,CAAC;EACCC,IAAI;EACJC,OAAO;EACPC,cAAc;EACdC,QAAQ;EACRC,MAAM;EACN,GAAGC;AACW,CAAC,KAAK;EACpB,MAAM;IAAEC;EAAE,CAAC,GAAGjB,cAAc,CAAC,CAAC;EAC9B,MAAMkB,KAAK,GAAGd,WAAW,CAAC,CAAC;EAE3B,MAAM;IAAEe,MAAM;IAAEC,MAAM;IAAEC,OAAO;IAAEC,YAAY;IAAEC;EAAW,CAAC,GACzDxB,KAAK,CAACyB,UAAU,CAACZ,OAAO,CAAiC;EAE3D,MAAMa,KAAK,GAAG1B,KAAK,CAAC2B,OAAO,CAAC,MAAM5B,KAAK,CAACqB,MAAM,EAAER,IAAI,CAAC,EAAE,CAACQ,MAAM,EAAER,IAAI,CAAC,CAAC;EAEtE,MAAMgB,KAAK,GAAG5B,KAAK,CAAC2B,OAAO,CACzB,MAAM5B,KAAK,CAACuB,OAAO,EAAEV,IAAI,CAAC,IAAIb,KAAK,CAACsB,MAAM,EAAET,IAAI,CAAC,EACjD,CAACU,OAAO,EAAED,MAAM,EAAET,IAAI,CACxB,CAAC;EAED,MAAMiB,MAAM,GAAIC,CAAgD,IAAK;IACnEN,UAAU,CAACZ,IAAI,CAAC,CAACkB,CAAC,CAAC;IACnBb,KAAK,CAACY,MAAM,GAAGC,CAAC,CAAC;EACnB,CAAC;EAED,oBACErB,KAAA,CAACP,IAAI;IACH6B,KAAK,EAAE,CAAC;MAAEC,GAAG,EAAEb,KAAK,CAACc,OAAO,CAAC,GAAG;IAAE,CAAC,EAAEnB,cAAc,CAAE;IACrDE,MAAM,EAAEA,MAAO;IAAAkB,QAAA,gBAEf3B,IAAA,CAACH,SAAS;MAAA,GACJa,KAAK;MACTkB,GAAG,EAAEpB,QAAiE;MACtEqB,IAAI,EAAC,UAAU;MACfC,cAAc,EAAC,MAAM;MACrBX,KAAK,EAAEA,KAAM;MACbP,KAAK,EAAE;QACLmB,SAAS,EAAEnB,KAAK,CAACoB,YAAY,CAAC,CAAC,CAAC;QAChC,GAAGtB,KAAK,CAACE;MACX,CAAE;MACFS,KAAK,EAAE,CAAC,CAACA,KAAM;MACfY,YAAY,EAAEjB,YAAY,CAACX,IAAI;MAC/B;MAAA;MACAiB,MAAM,EAAEA,MAAc;MACtBY,OAAO,EAAExB,KAAK,CAACwB,OAAQ;MACvBzB,MAAM,EAAEA,MAAM,GAAG,GAAGA,MAAM,QAAQ,GAAG0B;IAAU,CAChD,CAAC,EACDd,KAAK,gBACJrB,IAAA,CAACJ,UAAU;MACTwC,IAAI,EAAC,OAAO;MACZ3B,MAAM,EAAEA,MAAM,GAAG,GAAGA,MAAM,QAAQ,GAAG0B,SAAU;MAAAR,QAAA,EAE9ChB,CAAC,CAACU,KAAK;IAAC,CACC,CAAC,GACX,IAAI;EAAA,CACJ,CAAC;AAEX,CACF,CAAC","ignoreList":[]}

package/lib/module/modules/helpers/index.js

@@ -5,6 +5,7 @@ export * from "./form-items/form-field.js";
 export * from "./form-items/form-select.js";
 export * from "./form-items/form-date-field.js";
 export * from "./utils/s-log.js";
+export * from "./utils/telemetry.js";
 export * from "./utils/with-animated.js";
 export { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 //# sourceMappingURL=index.js.map

package/lib/module/modules/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["BottomSheetModalProvider"],"sourceRoot":"../../../../src","sources":["modules/helpers/index.tsx"],"mappings":";;AAAA,cAAc,kBAAe;AAE7B,cAAc,4BAAyB;AAEvC,cAAc,6BAA0B;AAExC,cAAc,iCAA8B;AAE5C,cAAc,kBAAe;AAE7B,cAAc,0BAAuB;AACrC,SAASA,wBAAwB,QAAQ,sBAAsB","ignoreList":[]}
+{"version":3,"names":["BottomSheetModalProvider"],"sourceRoot":"../../../../src","sources":["modules/helpers/index.tsx"],"mappings":";;AAAA,cAAc,kBAAe;AAE7B,cAAc,4BAAyB;AAEvC,cAAc,6BAA0B;AAExC,cAAc,iCAA8B;AAE5C,cAAc,kBAAe;AAE7B,cAAc,sBAAmB;AAEjC,cAAc,0BAAuB;AACrC,SAASA,wBAAwB,QAAQ,sBAAsB","ignoreList":[]}

package/lib/module/modules/helpers/utils/s-log.js

@@ -1,20 +1,12 @@
 "use strict";
 
-import * as Sentry from "@sentry/react-native";
+import { sentryLogger } from "./sentry-logger.js";
 export const slog = (error, scope,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 additionalData = {}, level = "error") => {
-  if (__DEV__) {
-    // eslint-disable-next-line no-console
-    console.log(error, scope, JSON.stringify(additionalData, null, 2), level);
-    return;
-  }
-  Sentry.captureException(error, {
-    extra: {
-      scope,
-      additionalData
-    },
-    level
+  sentryLogger(level, scope, {
+    error,
+    additionalData
   });
 };
 //# sourceMappingURL=s-log.js.map

package/lib/module/modules/helpers/utils/s-log.js.map

@@ -1 +1 @@
-{"version":3,"names":["Sentry","slog","error","scope","additionalData","level","__DEV__","console","log","JSON","stringify","captureException","extra"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/s-log.ts"],"mappings":";;AAAA,OAAO,KAAKA,MAAM,MAAM,sBAAsB;AAE9C,OAAO,MAAMC,IAAI,GAAGA,CAElBC,KAAU,EACVC,KAAa;AACb;AACAC,cAAmC,GAAG,CAAC,CAAC,EACxCC,KAA6C,GAAG,OAAO,KACpD;EACH,IAAIC,OAAO,EAAE;IACX;IACAC,OAAO,CAACC,GAAG,CAACN,KAAK,EAAEC,KAAK,EAAEM,IAAI,CAACC,SAAS,CAACN,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAEC,KAAK,CAAC;IAEzE;EACF;EAEAL,MAAM,CAACW,gBAAgB,CAACT,KAAK,EAAE;IAC7BU,KAAK,EAAE;MACLT,KAAK;MACLC;IACF,CAAC;IACDC;EACF,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["sentryLogger","slog","error","scope","additionalData","level"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/s-log.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,oBAAiB;AAE9C,OAAO,MAAMC,IAAI,GAAGA,CAElBC,KAAU,EACVC,KAAa;AACb;AACAC,cAAmC,GAAG,CAAC,CAAC,EACxCC,KAA6C,GAAG,OAAO,KACpD;EACHL,YAAY,CAACK,KAAK,EAAEF,KAAK,EAAE;IAAED,KAAK;IAAEE;EAAe,CAAC,CAAC;AACvD,CAAC","ignoreList":[]}

package/lib/module/modules/helpers/utils/sentry-logger.js

@@ -1,20 +1,32 @@
 "use strict";
 
 /* eslint-disable no-console */
-import * as Sentry from "@sentry/react-native";
-export const sentryLogger = (type, message, extra = {}) => {
-  if (__DEV__) {
-    console.log("Sentry logger:", message, JSON.stringify(extra, null, 2));
-    return;
+/* eslint-disable import/group-exports */
+
+import { emitOvokLog, recordOvokMetric, sanitizeOvokTelemetryAttributes } from "./telemetry.js";
+const consoleLogger = (level, message, extra = {}) => {
+  const method = level === "warning" ? "warn" : level === "trace" ? "debug" : level;
+  const log = method === "fatal" ? console.error : console[method] ?? console.log;
+  log(`[Ovok] ${message}`, extra);
+};
+let configuredLogger;
+
+/** Configure the SDK logger. The default is the console and OpenTelemetry when present. */
+export const configureOvokLogger = logger => {
+  configuredLogger = logger;
+};
+export const ovokLogger = (type, message, extra = {}) => {
+  const safeExtra = sanitizeOvokTelemetryAttributes(extra);
+  emitOvokLog(type, message, safeExtra);
+  if (type === "error" || type === "fatal") {
+    recordOvokMetric("ovok.errors", 1, {
+      errorCode: typeof extra.errorCode === "string" ? extra.errorCode : "unknown"
+    });
   }
-  const functionMap = {
-    error: Sentry.logger.error,
-    warning: Sentry.logger.warn,
-    info: Sentry.logger.info,
-    debug: Sentry.logger.debug,
-    fatal: Sentry.logger.fatal,
-    trace: Sentry.logger.trace
-  };
-  functionMap[type](message, extra);
+  const logger = configuredLogger ?? consoleLogger;
+  logger(type, message, safeExtra);
 };
+
+/** @deprecated Use ovokLogger. Kept as a source-compatible alias for existing apps. */
+export const sentryLogger = ovokLogger;
 //# sourceMappingURL=sentry-logger.js.map

package/lib/module/modules/helpers/utils/sentry-logger.js.map

@@ -1 +1 @@
-{"version":3,"names":["Sentry","sentryLogger","type","message","extra","__DEV__","console","log","JSON","stringify","functionMap","error","logger","warning","warn","info","debug","fatal","trace"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/sentry-logger.ts"],"mappings":";;AAAA;AACA,OAAO,KAAKA,MAAM,MAAM,sBAAsB;AAE9C,OAAO,MAAMC,YAAY,GAAGA,CAC1BC,IAAgE,EAChEC,OAAe,EACfC,KAA8B,GAAG,CAAC,CAAC,KAChC;EACH,IAAIC,OAAO,EAAE;IACXC,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEJ,OAAO,EAAEK,IAAI,CAACC,SAAS,CAACL,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEtE;EACF;EACA,MAAMM,WAAW,GAAG;IAClBC,KAAK,EAAEX,MAAM,CAACY,MAAM,CAACD,KAAK;IAC1BE,OAAO,EAAEb,MAAM,CAACY,MAAM,CAACE,IAAI;IAC3BC,IAAI,EAAEf,MAAM,CAACY,MAAM,CAACG,IAAI;IACxBC,KAAK,EAAEhB,MAAM,CAACY,MAAM,CAACI,KAAK;IAC1BC,KAAK,EAAEjB,MAAM,CAACY,MAAM,CAACK,KAAK;IAC1BC,KAAK,EAAElB,MAAM,CAACY,MAAM,CAACM;EACvB,CAAC;EAEDR,WAAW,CAACR,IAAI,CAAC,CAACC,OAAO,EAAEC,KAAK,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["emitOvokLog","recordOvokMetric","sanitizeOvokTelemetryAttributes","consoleLogger","level","message","extra","method","log","console","error","configuredLogger","configureOvokLogger","logger","ovokLogger","type","safeExtra","errorCode","sentryLogger"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/sentry-logger.ts"],"mappings":";;AAAA;AACA;;AAEA,SAASA,WAAW,EAAEC,gBAAgB,EAAEC,+BAA+B,QAAQ,gBAAa;AAgB5F,MAAMC,aAAyB,GAAGA,CAACC,KAAK,EAAEC,OAAO,EAAEC,KAAK,GAAG,CAAC,CAAC,KAAK;EAChE,MAAMC,MAAM,GAAGH,KAAK,KAAK,SAAS,GAAG,MAAM,GAAGA,KAAK,KAAK,OAAO,GAAG,OAAO,GAAGA,KAAK;EAEjF,MAAMI,GAAG,GACPD,MAAM,KAAK,OAAO,GACdE,OAAO,CAACC,KAAK,GACbD,OAAO,CAACF,MAAM,CAAwC,IAAIE,OAAO,CAACD,GAAG;EAE3EA,GAAG,CAAC,UAAUH,OAAO,EAAE,EAAEC,KAAK,CAAC;AACjC,CAAC;AAED,IAAIK,gBAAwC;;AAE5C;AACA,OAAO,MAAMC,mBAAmB,GAAIC,MAAmB,IAAW;EAChEF,gBAAgB,GAAGE,MAAM;AAC3B,CAAC;AAED,OAAO,MAAMC,UAAU,GAAGA,CACxBC,IAAkB,EAClBV,OAAe,EACfC,KAA8B,GAAG,CAAC,CAAC,KAChC;EACH,MAAMU,SAAS,GAAGd,+BAA+B,CAACI,KAAK,CAAC;EAExDN,WAAW,CAACe,IAAI,EAAEV,OAAO,EAAEW,SAAS,CAAC;EACrC,IAAID,IAAI,KAAK,OAAO,IAAIA,IAAI,KAAK,OAAO,EAAE;IACxCd,gBAAgB,CAAC,aAAa,EAAE,CAAC,EAAE;MACjCgB,SAAS,EAAE,OAAOX,KAAK,CAACW,SAAS,KAAK,QAAQ,GAAGX,KAAK,CAACW,SAAS,GAAG;IACrE,CAAC,CAAC;EACJ;EAEA,MAAMJ,MAAM,GAAGF,gBAAgB,IAAIR,aAAa;EAEhDU,MAAM,CAACE,IAAI,EAAEV,OAAO,EAAEW,SAAS,CAAC;AAClC,CAAC;;AAED;AACA,OAAO,MAAME,YAAY,GAAGJ,UAAU","ignoreList":[]}