Hotfix: sync data-loss fixes, exchange-rate integrity, and observability (v1.0.6) #214
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| import 'package:dio/dio.dart'; | ||
| import 'package:injectable/injectable.dart'; | ||
| import 'package:trakli/core/error/crash_reporting/crash_reporting_service.dart'; | ||
| import 'package:trakli/core/network/interceptors/crash_reporting_interceptor.dart'; | ||
| import 'package:trakli/core/network/interceptors/locale_interceptor.dart'; | ||
| import 'package:trakli/core/network/interceptors/logger_interceptor.dart'; | ||
| import 'package:trakli/core/network/interceptors/remove_null_exceptions.dart'; | ||
|
|
@@ -31,7 +33,8 @@ abstract class InjectHttpClientModule { | |
| RemoveNullValuesInterceptor(), | ||
| TokenInterceptor(getIt<TokenManager>(), getIt<AuthService>()), | ||
| LocaleInterceptor(), | ||
| LoggerInterceptor(), | ||
| CrashReportingInterceptor(getIt<CrashReportingService>()), | ||
| ]); | ||
|
|
||
| return dio; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import 'package:dio/dio.dart'; | ||
| import 'package:trakli/core/error/crash_reporting/crash_reporting_service.dart'; | ||
|
|
||
| /// Reports 5xx and 422 responses to Crashlytics as non-fatals, deduplicated | ||
| /// per method+path+status per session. | ||
| class CrashReportingInterceptor extends Interceptor { | ||
| CrashReportingInterceptor(this._crashReporting); | ||
|
|
||
| final CrashReportingService _crashReporting; | ||
| final Set<String> _reported = {}; | ||
|
|
||
| static const int _maxBodyLength = 2000; | ||
|
|
||
| bool shouldReport(int? status) => | ||
| status != null && (status >= 500 || status == 422); | ||
|
|
||
| /// Path with numeric/UUID segments replaced so the same endpoint | ||
| /// deduplicates across different record ids. | ||
| static String normalizePath(String path) { | ||
| return path | ||
| .split('/') | ||
| .map((s) => | ||
| RegExp(r'^(\d+|[0-9a-fA-F:-]{8,})$').hasMatch(s) ? '{id}' : s) | ||
| .join('/'); | ||
| } | ||
|
|
||
| @override | ||
| void onError(DioException err, ErrorInterceptorHandler handler) { | ||
| final status = err.response?.statusCode; | ||
| if (shouldReport(status)) { | ||
| final options = err.requestOptions; | ||
| final key = | ||
| '${options.method} ${normalizePath(options.uri.path)} $status'; | ||
| if (_reported.add(key)) { | ||
| final body = err.response?.data?.toString() ?? ''; | ||
| _crashReporting.recordError( | ||
| err, | ||
| stackTrace: err.stackTrace, | ||
| reason: 'HTTP $status on ${options.method} ${options.uri.path}', | ||
| information: { | ||
| 'url': options.uri.toString(), | ||
| 'status': status, | ||
| if (body.isNotEmpty) | ||
| 'response': body.length > _maxBodyLength | ||
| ? body.substring(0, _maxBodyLength) | ||
| : body, | ||
| }, | ||
| ); | ||
| } | ||
| } | ||
| handler.next(err); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| import 'dart:async'; | ||
|
|
||
| import 'package:collection/collection.dart'; | ||
| import 'package:drift_sync_core/drift_sync_core.dart'; | ||
| import 'package:injectable/injectable.dart'; | ||
| import 'package:trakli/core/utils/services/logger.dart' as app_logger; | ||
| import 'package:trakli/data/database/app_database.dart'; | ||
| import 'package:trakli/data/sync/transaction_sync_handler.dart'; | ||
| import 'package:trakli/data/sync/transfer_sync_handler.dart'; | ||
|
|
||
| @lazySingleton | ||
| class SynchAppDatabase extends DriftSynchronizer<AppDatabase> { | ||
|
|
@@ -18,10 +22,59 @@ class SynchAppDatabase extends DriftSynchronizer<AppDatabase> { | |
| classifyFailure: restFailureClassifier, | ||
| ); | ||
|
|
||
| /// Entity types swept by [reconcileOrphanedLocalChanges] → backing tables. | ||
| static const Map<String, String> reconciledEntityTables = { | ||
| TransactionSyncHandler.entity: 'transactions', | ||
| TransferSyncHandler.entity: 'transfers', | ||
| }; | ||
|
|
||
| final _syncStateController = StreamController<SyncState>.broadcast(); | ||
|
|
||
| Stream<SyncState> get syncStateStream => _syncStateController.stream; | ||
|
|
||
| @override | ||
| Future<void> sync() async { | ||
| try { | ||
| await reconcileOrphanedLocalChanges(); | ||
| } catch (e) { | ||
| app_logger.logger.w('[sync] orphan reconciliation failed: $e'); | ||
| } | ||
| return super.sync(); | ||
| } | ||
|
|
||
| /// Re-enqueues rows that have no server id and no local_changes entry. | ||
| Future<int> reconcileOrphanedLocalChanges() async { | ||
| var enqueued = 0; | ||
| for (final entry in reconciledEntityTables.entries) { | ||
| final handler = | ||
| typeHandlers.where((h) => h.entityType == entry.key).firstOrNull; | ||
| if (handler == null) continue; | ||
|
|
||
| final orphanIds = | ||
|
austin047 marked this conversation as resolved.
|
||
| await appDatabase.getOrphanedClientIds(entry.value, entry.key); | ||
| for (final clientId in orphanIds) { | ||
| try { | ||
| final entity = await handler.getLocalByClientId(clientId); | ||
| await appDatabase.insertLocalChange(PendingLocalChange.put( | ||
| entityType: entry.key, | ||
| entityData: handler.marshal(entity), | ||
| entityId: clientId, | ||
| entityRev: handler.getRev(entity), | ||
| )); | ||
| enqueued++; | ||
| } catch (e) { | ||
| app_logger.logger | ||
| .w('[sync] could not re-enqueue ${entry.key} $clientId: $e'); | ||
| } | ||
| } | ||
| } | ||
| if (enqueued > 0) { | ||
| app_logger.logger | ||
| .i('[sync] re-enqueued $enqueued orphaned local change(s)'); | ||
| } | ||
| return enqueued; | ||
| } | ||
|
|
||
| @override | ||
| Future<void> Function(SyncState previous, SyncState current)? | ||
| get onStateChanged => | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import 'package:dio/dio.dart'; | ||
|
|
||
| /// Human-readable form of a sync failure for local_changes.error, carrying | ||
| /// the response body DioException.toString() omits. | ||
| String describeSyncError(Object error, {int maxBodyLength = 500}) { | ||
| if (error is DioException) { | ||
| final options = error.requestOptions; | ||
| final status = error.response?.statusCode; | ||
| final head = | ||
| 'HTTP ${status ?? 'error'} on ${options.method} ${options.uri.path}'; | ||
| final body = error.response?.data?.toString() ?? ''; | ||
| if (body.isEmpty) return '$head — ${error.message ?? error.type.name}'; | ||
| return '$head — ${body.length > maxBodyLength ? body.substring(0, maxBodyLength) : body}'; | ||
| } | ||
| return error.toString(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| /// Truncated to milliseconds: the API rejects 6-digit fractional seconds. | ||
| String formatServerIsoDateTimeString(DateTime dateTime) { | ||
| final utc = dateTime.toUtc(); | ||
|
austin047 marked this conversation as resolved.
|
||
| return DateTime.fromMillisecondsSinceEpoch( | ||
| utc.millisecondsSinceEpoch, | ||
| isUtc: true, | ||
| ).toIso8601String(); | ||
| } | ||
|
|
||
| DateTime getNewFormattedUtcDateTime() { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ import 'package:drift/native.dart'; | |
| import 'package:drift_sync_core/drift_sync_core.dart'; | ||
| import 'package:path/path.dart' as p; | ||
| import 'package:path_provider/path_provider.dart'; | ||
| import 'package:trakli/core/sync/sync_error_description.dart'; | ||
| import 'package:trakli/core/utils/services/logger.dart'; | ||
| import 'package:trakli/data/database/converters/budget_progress_json_converter.dart'; | ||
| import 'package:trakli/data/database/converters/media_converter.dart'; | ||
|
|
@@ -164,6 +165,19 @@ class AppDatabase extends _$AppDatabase with SynchronizerDb { | |
| await delete(localChanges).go(); | ||
| } | ||
|
|
||
| /// Client ids with no server id and no local_changes row in any state. | ||
| Future<List<String>> getOrphanedClientIds( | ||
| String tableName, String entityType) async { | ||
| final rows = await customSelect( | ||
| 'SELECT t.client_id AS client_id FROM $tableName t ' | ||
| 'WHERE t.id IS NULL AND t.deleted_at IS NULL AND NOT EXISTS (' | ||
| 'SELECT 1 FROM local_changes lc ' | ||
| 'WHERE lc.entity_type = ?1 AND lc.entity_id = t.client_id)', | ||
| variables: [Variable.withString(entityType)], | ||
| ).get(); | ||
| return rows.map((r) => r.read<String>('client_id')).toList(); | ||
| } | ||
|
|
||
| /// True while transaction or transfer changes are still waiting to sync — | ||
| /// server /stats cannot include them yet. Dismissed and quarantined | ||
| /// changes don't count: dismissed changes never sync, and quarantined | ||
|
|
@@ -219,7 +233,7 @@ class AppDatabase extends _$AppDatabase with SynchronizerDb { | |
| .write( | ||
| LocalChangesCompanion( | ||
| concludedMoment: Value(DateTime.now()), | ||
| error: Value(describeSyncError(error)), | ||
| concluded: const Value(true), | ||
| attemptCount: Value(localChange.attemptCount + 1), | ||
| quarantinedAt: | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The method
_recordis not defined in this class. Based on the class definition and theCrashReportingInterface, you should callrecordErrorinstead. This is critical as it will cause a crash when a global error occurs.