Merge pull request #52 from atsign-foundation/cache-fixes

feat: support for caching of objects properly

Author: cconstab

.vscode/settings.json

@@ -9,5 +9,6 @@
         "mqtt",
         "mwcmanager",
         "ZARIOT"
-    ]
+    ],
+    "cmake.configureOnOpen": false
 }

flutter/iot_receiver/ios/Podfile.lock

@@ -127,7 +127,7 @@ SPEC CHECKSUMS:
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e

flutter/iot_receiver/lib/main.dart

@@ -42,8 +42,8 @@ Future<AtClientPreference> loadAtClientPreference() async {
     ..hiveStoragePath = dir.path
     ..commitLogPath = dir.path
     ..isLocalStoreRequired = true
-    ..syncIntervalMins = 1;
-  // ..fetchOfflineNotifications = true;
+    //..syncIntervalMins = 1
+    ..fetchOfflineNotifications = false;
 }
 
 class MyApp extends StatefulWidget {

flutter/iot_receiver/lib/screens/device_owners_screen.dart

@@ -21,7 +21,7 @@ class _DeviceOwnersScreenState extends State<DeviceOwnersScreen> {
 
   @override
   Widget build(BuildContext context) {
-    _hrO2DataService.getDeviceOwners();
+    // _hrO2DataService.getDeviceOwners();
     return Scaffold(
       appBar: NewGradientAppBar(
         title: const AutoSizeText(

flutter/iot_receiver/lib/services/hro2_data_service.dart

@@ -22,8 +22,7 @@ class Hro2DataService {
   }
 
   Future<bool> deleteAllForKey(String key) async {
-    var atKeys =
-        await AtClientManager.getInstance().atClient.getAtKeys(regex: key);
+    var atKeys = await AtClientManager.getInstance().atClient.getAtKeys(regex: key);
     for (var atKey in atKeys) {
       await delete(atKey);
     }
@@ -41,10 +40,9 @@ class Hro2DataService {
 
   Future<List<HrO2Device>> getDevices() async {
     List<HrO2Device> hrO2DeviceList = [];
-    // var atClient = AtClientManager.getInstance().atClient;
-    var keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.deviceKey);
+    var keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.deviceKey);
+    _logger.info('getDevices keys ${keys.toString()}');
+
     for (var element in keys) {
       var data = await AtClientManager.getInstance().atClient.get(element);
       _logger.info('getDevices got ${data.value}');
@@ -62,27 +60,29 @@ class Hro2DataService {
   }
 
   Future<bool> putDevice(HrO2Device hrO2Device) async {
-    AtKey atKey = AtKey()..key = AppConstants.deviceKey;
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      ..ttr = -1;
+    AtKey atKey = AtKey()
+      ..sharedWith = hrO2Device.deviceAtsign
+      ..metadata = metadata
+      ..key = AppConstants.deviceKey;
     var value = jsonEncode(hrO2Device);
-    var response =
-        await AtClientManager.getInstance().atClient.put(atKey, value);
+    var response = await AtClientManager.getInstance().atClient.put(atKey, value);
     _logger.info('putDeviceList success = $response');
     return response;
   }
 
   Future<bool> deleteDevice(HrO2Device hrO2Device) async {
     bool response = false;
-    List<AtKey> keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.deviceKey);
+    List<AtKey> keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.deviceKey);
     _logger.info('deleteDevice processing ${keys.length} items');
     for (var key in keys) {
       AtValue data = await AtClientManager.getInstance().atClient.get(key);
       var atKeyString = jsonDecode(data.value);
       HrO2Device device = HrO2Device.fromJson(atKeyString);
       if (device.deviceAtsign == hrO2Device.deviceAtsign) {
-        _logger.info(
-            'deleteReceiver deleting ${hrO2Device.deviceAtsign}\'s entry');
+        _logger.info('deleteReceiver deleting ${hrO2Device.deviceAtsign}\'s entry');
         response = await delete(key);
       }
     }
@@ -92,15 +92,12 @@ class Hro2DataService {
   Future<List<HrO2Receiver>> getReceivers() async {
     List<HrO2Receiver> hrO2ReceiverList = [];
     // var atClient = _atClient;
-    var keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.receiverKey);
+    var keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.receiverKey);
     for (var element in keys) {
       var data = await AtClientManager.getInstance().atClient.get(element);
       _logger.info('getReceivers got ${data.value}');
       try {
-        HrO2Receiver hrO2Receiver =
-            HrO2Receiver.fromJson(jsonDecode(data.value));
+        HrO2Receiver hrO2Receiver = HrO2Receiver.fromJson(jsonDecode(data.value));
         hrO2ReceiverList.add(hrO2Receiver);
       } catch (error) {
         // found some dirty data, consider deleting
@@ -113,12 +110,15 @@ class Hro2DataService {
   }
 
   Future<bool> putReceiver(HrO2Receiver hrO2Receiver) async {
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      ..ttr = -1;
     AtKey atKey = AtKey()
       ..sharedWith = hrO2Receiver.receiverAtsign
+      ..metadata = metadata
       ..key = AppConstants.receiverKey;
     var value = jsonEncode(hrO2Receiver);
-    var success =
-        await AtClientManager.getInstance().atClient.put(atKey, value);
+    var success = await AtClientManager.getInstance().atClient.put(atKey, value);
     _logger.info('putReceiver success = $success');
     var receiverSuccess = await updateDeviceReceivers(hrO2Receiver.hrO2Device);
     return success && receiverSuccess;
@@ -127,17 +127,14 @@ class Hro2DataService {
   Future<bool> deleteReceiver(HrO2Receiver hrO2Receiver) async {
     bool deleteSuccess = false;
     bool deviceUpdated = false;
-    List<AtKey> keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.receiverKey);
+    List<AtKey> keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.receiverKey);
     _logger.info('deleteReceiver processing ${keys.length} items');
     for (var key in keys) {
       AtValue data = await AtClientManager.getInstance().atClient.get(key);
       var atKeyString = jsonDecode(data.value);
       HrO2Receiver rec = HrO2Receiver.fromJson(atKeyString);
       if (rec.receiverAtsign == hrO2Receiver.receiverAtsign) {
-        _logger.info(
-            'deleteReceiver deleting ${hrO2Receiver.receiverAtsign}\'s entry');
+        _logger.info('deleteReceiver deleting ${hrO2Receiver.receiverAtsign}\'s entry');
         deleteSuccess = await delete(key);
         deviceUpdated = await updateDeviceReceivers(hrO2Receiver.hrO2Device);
       }
@@ -147,54 +144,50 @@ class Hro2DataService {
 
   Future<List<HrO2DataOwner>> getDataOwners() async {
     List<HrO2DataOwner> hrO2DataOwnerList = [];
-    var keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.dataOwnerKey, sharedBy: "@mwcmanager");
+    var keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.dataOwnerKey);
+    _logger.info('getDataOwners keys $keys');
     for (var element in keys) {
       var data = await AtClientManager.getInstance().atClient.get(element);
       _logger.info('getDataOwners got ${data.value}');
       try {
-        HrO2DataOwner hrO2DataOwner =
-            HrO2DataOwner.fromJson(jsonDecode(data.value));
+        HrO2DataOwner hrO2DataOwner = HrO2DataOwner.fromJson(jsonDecode(data.value));
         hrO2DataOwnerList.add(hrO2DataOwner);
       } catch (error) {
         // found some dirty data, consider deleting
         _logger.severe('getDataOwners error $error for ${element.key}');
-        await AtClientManager.getInstance().atClient.delete(element);
+        // await AtClientManager.getInstance().atClient.delete(element);
       }
     }
     return hrO2DataOwnerList;
   }
 
   Future<bool> putDataOwner(HrO2DataOwner hrO2DataOwner) async {
-    AtClientManager.getInstance().syncService.sync();
+    // AtClientManager.getInstance().syncService.sync();
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      ..ttr = -1;
     AtKey atKey = AtKey()
       ..sharedWith = hrO2DataOwner.dataOwnerAtsign
+      ..metadata = metadata
       ..key = AppConstants.dataOwnerKey;
-    var success = await AtClientManager.getInstance()
-        .atClient
-        .put(atKey, jsonEncode(hrO2DataOwner));
+    var success = await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(hrO2DataOwner));
     _logger.info('putDataOwner success = $success');
-    var dataOwnerSuccess =
-        await updateDeviceDataOwners(hrO2DataOwner.hrO2Device);
+    var dataOwnerSuccess = await updateDeviceDataOwners(hrO2DataOwner.hrO2Device);
     _logger.info('putDataOwner updateDevice success = $dataOwnerSuccess');
     return success && dataOwnerSuccess;
   }
 
   Future<bool> deleteDataOwner(HrO2DataOwner hrO2DataOwner) async {
     bool deleteSuccess = false;
     bool deviceUpdated = false;
-    List<AtKey> keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.dataOwnerKey);
+    List<AtKey> keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.dataOwnerKey);
     _logger.info('deleteDataOwner processing ${keys.length} items');
     for (var key in keys) {
       AtValue data = await AtClientManager.getInstance().atClient.get(key);
       var atKeyString = jsonDecode(data.value);
       HrO2DataOwner owner = HrO2DataOwner.fromJson(atKeyString);
       if (owner.dataOwnerAtsign == hrO2DataOwner.dataOwnerAtsign) {
-        _logger.info(
-            'deleteDataOwner deleting ${hrO2DataOwner.dataOwnerAtsign}\'s entry');
+        _logger.info('deleteDataOwner deleting ${hrO2DataOwner.dataOwnerAtsign}\'s entry');
         deleteSuccess = await delete(key);
         deviceUpdated = await updateDeviceDataOwners(hrO2DataOwner.hrO2Device);
       }
@@ -204,16 +197,12 @@ class Hro2DataService {
 
   Future<List<HrO2DeviceOwner>> getDeviceOwners() async {
     List<HrO2DeviceOwner> hrO2DeviceOwnerList = [];
-    var keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.deviceOwnerKey);
+    var keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.deviceOwnerKey);
     for (var element in keys) {
-      var deviceOwnerData =
-          await AtClientManager.getInstance().atClient.get(element);
+      var deviceOwnerData = await AtClientManager.getInstance().atClient.get(element);
       _logger.info('getDeviceOwners got ${deviceOwnerData.value}');
       try {
-        HrO2DeviceOwner hrO2DeviceOwner =
-            HrO2DeviceOwner.fromJson(jsonDecode(deviceOwnerData.value));
+        HrO2DeviceOwner hrO2DeviceOwner = HrO2DeviceOwner.fromJson(jsonDecode(deviceOwnerData.value));
         hrO2DeviceOwnerList.add(hrO2DeviceOwner);
       } catch (error) {
         // found some dirty data, consider deleting
@@ -225,21 +214,21 @@ class Hro2DataService {
   }
 
   Future<bool> putDeviceOwner(HrO2DeviceOwner hrO2DeviceOwner) async {
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      ..ttr = -1;
     AtKey atKey = AtKey()
       ..key = AppConstants.deviceOwnerKey
+      ..metadata = metadata
       ..sharedWith = hrO2DeviceOwner.deviceOwnerAtsign;
-    var response = await AtClientManager.getInstance()
-        .atClient
-        .put(atKey, jsonEncode(hrO2DeviceOwner));
+    var response = await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(hrO2DeviceOwner));
     _logger.info('putDeviceOwner success = $response');
     return response;
   }
 
   Future<bool> deleteDeviceOwner(HrO2DeviceOwner hrO2DeviceOwner) async {
     bool deleteSuccess = false;
-    List<AtKey> keys = await AtClientManager.getInstance()
-        .atClient
-        .getAtKeys(regex: AppConstants.deviceOwnerKey);
+    List<AtKey> keys = await AtClientManager.getInstance().atClient.getAtKeys(regex: AppConstants.deviceOwnerKey);
     _logger.info('deleteDeviceOwner processing ${keys.length} items');
     for (var key in keys) {
       AtValue data = await AtClientManager.getInstance().atClient.get(key);
@@ -255,27 +244,52 @@ class Hro2DataService {
   }
 
   Future<bool> updateDeviceReceivers(HrO2Device hrO2Device) async {
-    // update the device list of HrO2Receiver objects
+    // update the device list of recipients from HrO2Receiver objects
+    bool success = false;
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      //..namespaceAware
+      ..ttr = -1;
     AtKey atKey = AtKey()
       ..sharedWith = hrO2Device.deviceAtsign
+      ..metadata = metadata
       ..key = AppConstants.receiverListKey;
     List<HrO2Receiver> receiverList = await getReceivers();
-    var success = await AtClientManager.getInstance()
-        .atClient
-        .put(atKey, jsonEncode(receiverList));
-    _logger.info('updateDeviceReceivers success = $success');
+    NotificationService notify = AtClientManager.getInstance().notificationService;
+    try {
+      await notify.notify(NotificationParams.forUpdate(atKey, value: jsonEncode(receiverList)),
+          checkForFinalDeliveryStatus: false, onSuccess: (notification) {
+        success = true;
+        _logger.info('SUCCESS:$notification');
+      }, onError: (notification) {
+        _logger.info('ERROR:$notification');
+      }, onSentToSecondary: (notification) {
+        _logger.info('SENT:$notification');
+      }, waitForFinalDeliveryStatus: false);
+    } catch (e) {
+      _logger.severe(e.toString());
+    }
+    // var success = await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(receiverList));
+    // _logger.info('updateDeviceReceivers key = $atKey');
+    // _logger.info('updateDeviceReceivers receiverList = ${jsonEncode(receiverList)}');
+    // _logger.info('updateDeviceReceivers success = $success');
+    // AtClientManager.getInstance().syncService.sync();
     return success;
   }
 
   Future<bool> updateDeviceDataOwners(HrO2Device hrO2Device) async {
-    // update the device list of HrO2DataOwner objects
+    // update the device list of recipients from HrO2DataOwner objects
+    Metadata metadata = Metadata()
+      // ..ttl = 10000
+      ..ttr = -1;
     AtKey atKey = AtKey()
       ..sharedWith = hrO2Device.deviceAtsign
+      ..metadata = metadata
       ..key = AppConstants.dataOwnerListKey;
     List<HrO2DataOwner> owners = await getDataOwners();
-    var success = await AtClientManager.getInstance()
-        .atClient
-        .put(atKey, jsonEncode(owners));
+    _logger.info('updateDeviceDataOwners found = ${owners.toString()}');
+    var success = await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(owners));
+    _logger.info('updateDeviceDataOwners key = $atKey');
     _logger.info('updateDeviceDataOwners success = $success');
     return success;
   }
@@ -288,10 +302,8 @@ class AppConstants {
   static const String deviceKey = 'device.$libraryNamespace';
   static const String deviceListKey = 'device_list.$libraryNamespace';
   static const String deviceOwnerKey = 'device_owner.$libraryNamespace';
-  static const String deviceOwnerListKey =
-      'device_owner_list.$libraryNamespace';
-  static const String deviceDataOwnerKey =
-      'device_data_owner.$libraryNamespace';
+  static const String deviceOwnerListKey = 'device_owner_list.$libraryNamespace';
+  static const String deviceDataOwnerKey = 'device_data_owner.$libraryNamespace';
   static const String deviceReceiverKey = 'device_receiver.$libraryNamespace';
   static const String receiverKey = 'receiver.$libraryNamespace';
   static const int responseTimeLimit = 30;

flutter/iot_receiver/pubspec.yaml

@@ -5,7 +5,7 @@ description: A new Flutter project.
 environment: 
   sdk: '>=2.15.1 <3.0.0'
 
-dependency_overrides:
+#dependency_overrides:
   # biometric_storage: ^4.1.3
   # at_client:
   #   git: