From 9bc0d35867deb6d058d2148ebd97f81891a0525e Mon Sep 17 00:00:00 2001 From: FoumaneDonald Date: Mon, 17 Mar 2025 16:08:33 +0100 Subject: [PATCH 1/2] Update dependencies because of conflicts with uuid recent versions --- .../lib/src/network/parse_live_query.dart | 100 +++++------------- packages/dart/pubspec.yaml | 10 +- packages/flutter/pubspec.yaml | 16 +-- 3 files changed, 39 insertions(+), 87 deletions(-) diff --git a/packages/dart/lib/src/network/parse_live_query.dart b/packages/dart/lib/src/network/parse_live_query.dart index 8778c0e0..049c03f8 100644 --- a/packages/dart/lib/src/network/parse_live_query.dart +++ b/packages/dart/lib/src/network/parse_live_query.dart @@ -13,14 +13,7 @@ class Subscription { T? _copyObject; int requestId; bool _enabled = false; - final List _liveQueryEvent = [ - 'create', - 'enter', - 'update', - 'leave', - 'delete', - 'error' - ]; + final List _liveQueryEvent = ['create', 'enter', 'update', 'leave', 'delete', 'error']; Map eventCallbacks = {}; void on(LiveQueryEvent op, Function callback) { @@ -40,14 +33,12 @@ class LiveQueryReconnectingController { this._eventStream, this.debug, ) { - final ParseConnectivityProvider? connectivityProvider = - ParseCoreData().connectivityProvider; + final ParseConnectivityProvider? connectivityProvider = ParseCoreData().connectivityProvider; if (connectivityProvider != null) { connectivityProvider.checkConnectivity().then(_connectivityChanged); connectivityProvider.connectivityStream.listen(_connectivityChanged); } else { - print( - 'LiveQuery does not work, if there is no ParseConnectivityProvider provided.'); + print('LiveQuery does not work, if there is no ParseConnectivityProvider provided.'); } _eventStream.listen((LiveQueryClientEvent event) { switch (event) { @@ -106,13 +97,8 @@ class LiveQueryReconnectingController { } void _setReconnect() { - if (_isOnline && - !_isConnected && - _currentTimer == null && - !_userDisconnected && - retryInterval[_retryState] >= 0) { - _currentTimer = - Timer(Duration(milliseconds: retryInterval[_retryState]), () { + if (_isOnline && !_isConnected && _currentTimer == null && !_userDisconnected && retryInterval[_retryState] >= 0) { + _currentTimer = Timer(Duration(milliseconds: retryInterval[_retryState]), () { _currentTimer = null; _reconnect(); }); @@ -129,17 +115,14 @@ class LiveQueryReconnectingController { class LiveQueryClient { factory LiveQueryClient() => _getInstance(); - LiveQueryClient._internal(this._liveQueryURL, - {bool? debug, bool? autoSendSessionId}) { + LiveQueryClient._internal(this._liveQueryURL, {bool? debug, bool? autoSendSessionId}) { _clientEventStreamController = StreamController(); - _clientEventStream = - _clientEventStreamController.stream.asBroadcastStream(); + _clientEventStream = _clientEventStreamController.stream.asBroadcastStream(); _debug = isDebugEnabled(objectLevelDebug: debug); _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId; - reconnectingController = LiveQueryReconnectingController( - () => reconnect(userInitialized: false), getClientEventStream, _debug); + reconnectingController = LiveQueryReconnectingController(() => reconnect(userInitialized: false), getClientEventStream, _debug); } static LiveQueryClient get instance => _getInstance(); @@ -148,8 +131,7 @@ class LiveQueryClient { static LiveQueryClient _getInstance({bool? debug, bool? autoSendSessionId}) { String? liveQueryURL = ParseCoreData().liveQueryURL; if (liveQueryURL == null) { - assert(false, - 'liveQueryUrl is not set. For how to setup Live Queries, see https://github.com/parse-community/Parse-SDK-Flutter/tree/master/packages/flutter#live-queries.'); + assert(false, 'liveQueryUrl is not set. For how to setup Live Queries, see https://github.com/parse-community/Parse-SDK-Flutter/tree/master/packages/flutter#live-queries.'); liveQueryURL = ""; } else { if (liveQueryURL.contains('https')) { @@ -158,9 +140,7 @@ class LiveQueryClient { liveQueryURL = liveQueryURL.replaceAll('http', 'ws'); } } - LiveQueryClient instance = _instance ?? - LiveQueryClient._internal(liveQueryURL, - debug: debug, autoSendSessionId: autoSendSessionId); + LiveQueryClient instance = _instance ?? LiveQueryClient._internal(liveQueryURL, debug: debug, autoSendSessionId: autoSendSessionId); _instance ??= instance; return instance; } @@ -197,8 +177,7 @@ class LiveQueryClient { Future disconnect({bool userInitialized = false}) async { parse_web_socket.WebSocket? webSocket = _webSocket; - if (webSocket != null && - webSocket.readyState == parse_web_socket.WebSocket.open) { + if (webSocket != null && webSocket.readyState == parse_web_socket.WebSocket.open) { if (_debug) { print('$_printConstLiveQuery: Socket closed'); } @@ -218,21 +197,16 @@ class LiveQueryClient { }); _connecting = false; if (userInitialized) { - _clientEventStreamController.sink - .add(LiveQueryClientEvent.userDisconnected); + _clientEventStreamController.sink.add(LiveQueryClientEvent.userDisconnected); } } - Future> subscribe( - QueryBuilder query, - {T? copyObject}) async { + Future> subscribe(QueryBuilder query, {T? copyObject}) async { if (_webSocket == null) { - await _clientEventStream.any((LiveQueryClientEvent event) => - event == LiveQueryClientEvent.connected); + await _clientEventStream.any((LiveQueryClientEvent event) => event == LiveQueryClientEvent.connected); } final int requestId = _requestIdGenerator(); - final Subscription subscription = - Subscription(query, requestId, copyObject: copyObject); + final Subscription subscription = Subscription(query, requestId, copyObject: copyObject); _requestSubscription[requestId] = subscription; //After a client connects to the LiveQuery server, //it can send a subscribe message to subscribe a ParseQuery. @@ -272,8 +246,7 @@ class LiveQueryClient { _connecting = true; try { - parse_web_socket.WebSocket webSocket = - await parse_web_socket.WebSocket.connect(_liveQueryURL); + parse_web_socket.WebSocket webSocket = await parse_web_socket.WebSocket.connect(_liveQueryURL); _webSocket = webSocket; _connecting = false; if (webSocket.readyState == parse_web_socket.WebSocket.open) { @@ -293,23 +266,16 @@ class LiveQueryClient { chanelStream?.sink.add(message); }, onDone: () { - _clientEventStreamController.sink - .add(LiveQueryClientEvent.disconnected); + _clientEventStreamController.sink.add(LiveQueryClientEvent.disconnected); if (_debug) { print('$_printConstLiveQuery: Done'); } }, onError: (Object error) { - _clientEventStreamController.sink - .add(LiveQueryClientEvent.disconnected); + _clientEventStreamController.sink.add(LiveQueryClientEvent.disconnected); if (_debug) { - print( - '$_printConstLiveQuery: Error: ${error.runtimeType.toString()}'); + print('$_printConstLiveQuery: Error: ${error.runtimeType.toString()}'); } - return Future.value(handleException( - Exception(error), - ParseApiRQ.liveQuery, - _debug, - !parseIsWeb ? 'IOWebSocketChannel' : 'HtmlWebSocketChannel')); + return Future.value(handleException(Exception(error), ParseApiRQ.liveQuery, _debug, !parseIsWeb ? 'IOWebSocketChannel' : 'HtmlWebSocketChannel')); }); } on Exception catch (e) { _connecting = false; @@ -328,10 +294,7 @@ class LiveQueryClient { } //The connect message is sent from a client to the LiveQuery server. //It should be the first message sent from a client after the WebSocket connection is established. - final Map connectMessage = { - 'op': 'connect', - 'applicationId': ParseCoreData().applicationId - }; + final Map connectMessage = {'op': 'connect', 'applicationId': ParseCoreData().applicationId}; if (_sendSessionId) { String? sessionId = ParseCoreData().sessionId; @@ -350,8 +313,7 @@ class LiveQueryClient { connectMessage['masterKey'] = masterKey; } - String? parseInstallation = - (await ParseInstallation.currentInstallation()).installationId; + String? parseInstallation = (await ParseInstallation.currentInstallation()).installationId; if (parseInstallation != null) { connectMessage['installationId'] = parseInstallation; } @@ -381,12 +343,7 @@ class LiveQueryClient { final Map subscribeMessage = { 'op': 'subscribe', 'requestId': subscription.requestId, - 'query': { - 'className': query.object.parseClassName, - 'where': whereMap, - if (keysToReturn != null && keysToReturn.isNotEmpty) - 'fields': keysToReturn - } + 'query': {'className': query.object.parseClassName, 'where': whereMap, if (keysToReturn != null && keysToReturn.isNotEmpty) 'fields': keysToReturn} }; if (_sendSessionId && ParseCoreData().sessionId != null) { subscribeMessage['sessionToken'] = ParseCoreData().sessionId; @@ -430,13 +387,9 @@ class LiveQueryClient { final String? className = map['className']; if (className != null) { if (className == keyClassUser) { - eventCallback((subscription.copyObject ?? - ParseCoreData.instance.createParseUser(null, null, null)) - .fromJson(map)); + eventCallback((subscription.copyObject ?? ParseCoreData.instance.createParseUser(null, null, null)).fromJson(map)); } else { - eventCallback((subscription.copyObject ?? - ParseCoreData.instance.createObject(className)) - .fromJson(map)); + eventCallback((subscription.copyObject ?? ParseCoreData.instance.createObject(className)).fromJson(map)); } } } else { @@ -451,8 +404,7 @@ class LiveQuery { LiveQuery({bool? debug, bool? autoSendSessionId}) { _debug = isDebugEnabled(objectLevelDebug: debug); _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId; - client = LiveQueryClient._getInstance( - debug: _debug, autoSendSessionId: _sendSessionId); + client = LiveQueryClient._getInstance(debug: _debug, autoSendSessionId: _sendSessionId); } bool? _debug; diff --git a/packages/dart/pubspec.yaml b/packages/dart/pubspec.yaml index ae668f69..088dbe69 100644 --- a/packages/dart/pubspec.yaml +++ b/packages/dart/pubspec.yaml @@ -24,25 +24,25 @@ dependencies: # Networking dio: ^5.7.0 http: ^1.2.0 - web_socket_channel: ^2.4.3 + web_socket_channel: ^3.0.2 #Database - sembast: ^3.6.0 + sembast: ^3.8.2 sembast_web: ^2.2.0 # Utils uuid: ^4.5.1 meta: ^1.16.0 path: ^1.9.0 - mime: ^1.0.0 - timezone: ^0.9.4 + mime: ^2.0.0 + timezone: ^0.10.0 universal_io: ^2.2.2 xxtea: ^2.1.0 collection: ^1.18.0 cross_file: ^0.3.3+8 dev_dependencies: - lints: ^4.0.0 + lints: ^5.1.1 # Testing build_runner: ^2.4.9 diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index 21f3d0a4..2c87fbd2 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -25,29 +25,29 @@ dependencies: flutter: sdk: flutter - parse_server_sdk: ^6.4.0 - # Uncomment for local testing - #parse_server_sdk: - # path: ../dart +# parse_server_sdk: ^8.0.0 +# Uncomment for local testing + parse_server_sdk: + path: ../dart # Networking connectivity_plus: ^6.0.3 #Database - shared_preferences: ^2.2.3 - sembast: ^3.6.0 + shared_preferences: ^2.5.2 + sembast: ^3.8.2 sembast_web: ^2.2.0 # Utils path_provider: ^2.1.4 - package_info_plus: ^5.0.1 + package_info_plus: ^8.3.0 path: ^1.8.3 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 path_provider_platform_interface: ^2.1.2 plugin_platform_interface: ^2.1.8 From 711d607e193db8a38dca88d58f6266d31266476f Mon Sep 17 00:00:00 2001 From: FoumaneDonald Date: Tue, 18 Mar 2025 08:16:13 +0100 Subject: [PATCH 2/2] style: refactoring fix --- .../lib/src/network/parse_live_query.dart | 116 +++++++++++++----- 1 file changed, 82 insertions(+), 34 deletions(-) diff --git a/packages/dart/lib/src/network/parse_live_query.dart b/packages/dart/lib/src/network/parse_live_query.dart index 049c03f8..992932ae 100644 --- a/packages/dart/lib/src/network/parse_live_query.dart +++ b/packages/dart/lib/src/network/parse_live_query.dart @@ -13,7 +13,14 @@ class Subscription { T? _copyObject; int requestId; bool _enabled = false; - final List _liveQueryEvent = ['create', 'enter', 'update', 'leave', 'delete', 'error']; + final List _liveQueryEvent = [ + 'create', + 'enter', + 'update', + 'leave', + 'delete', + 'error' + ]; Map eventCallbacks = {}; void on(LiveQueryEvent op, Function callback) { @@ -29,16 +36,18 @@ enum LiveQueryClientEvent { connected, disconnected, userDisconnected } class LiveQueryReconnectingController { LiveQueryReconnectingController( - this._reconnect, - this._eventStream, - this.debug, - ) { - final ParseConnectivityProvider? connectivityProvider = ParseCoreData().connectivityProvider; + this._reconnect, + this._eventStream, + this.debug, + ) { + final ParseConnectivityProvider? connectivityProvider = + ParseCoreData().connectivityProvider; if (connectivityProvider != null) { connectivityProvider.checkConnectivity().then(_connectivityChanged); connectivityProvider.connectivityStream.listen(_connectivityChanged); } else { - print('LiveQuery does not work, if there is no ParseConnectivityProvider provided.'); + print( + 'LiveQuery does not work, if there is no ParseConnectivityProvider provided.'); } _eventStream.listen((LiveQueryClientEvent event) { switch (event) { @@ -97,11 +106,16 @@ class LiveQueryReconnectingController { } void _setReconnect() { - if (_isOnline && !_isConnected && _currentTimer == null && !_userDisconnected && retryInterval[_retryState] >= 0) { - _currentTimer = Timer(Duration(milliseconds: retryInterval[_retryState]), () { - _currentTimer = null; - _reconnect(); - }); + if (_isOnline && + !_isConnected && + _currentTimer == null && + !_userDisconnected && + retryInterval[_retryState] >= 0) { + _currentTimer = + Timer(Duration(milliseconds: retryInterval[_retryState]), () { + _currentTimer = null; + _reconnect(); + }); if (debug) { print('$debugTag: Retry timer set to ${retryInterval[_retryState]}ms'); } @@ -115,14 +129,17 @@ class LiveQueryReconnectingController { class LiveQueryClient { factory LiveQueryClient() => _getInstance(); - LiveQueryClient._internal(this._liveQueryURL, {bool? debug, bool? autoSendSessionId}) { + LiveQueryClient._internal(this._liveQueryURL, + {bool? debug, bool? autoSendSessionId}) { _clientEventStreamController = StreamController(); - _clientEventStream = _clientEventStreamController.stream.asBroadcastStream(); + _clientEventStream = + _clientEventStreamController.stream.asBroadcastStream(); _debug = isDebugEnabled(objectLevelDebug: debug); _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId; - reconnectingController = LiveQueryReconnectingController(() => reconnect(userInitialized: false), getClientEventStream, _debug); + reconnectingController = LiveQueryReconnectingController( + () => reconnect(userInitialized: false), getClientEventStream, _debug); } static LiveQueryClient get instance => _getInstance(); @@ -131,7 +148,8 @@ class LiveQueryClient { static LiveQueryClient _getInstance({bool? debug, bool? autoSendSessionId}) { String? liveQueryURL = ParseCoreData().liveQueryURL; if (liveQueryURL == null) { - assert(false, 'liveQueryUrl is not set. For how to setup Live Queries, see https://github.com/parse-community/Parse-SDK-Flutter/tree/master/packages/flutter#live-queries.'); + assert(false, + 'liveQueryUrl is not set. For how to setup Live Queries, see https://github.com/parse-community/Parse-SDK-Flutter/tree/master/packages/flutter#live-queries.'); liveQueryURL = ""; } else { if (liveQueryURL.contains('https')) { @@ -140,7 +158,9 @@ class LiveQueryClient { liveQueryURL = liveQueryURL.replaceAll('http', 'ws'); } } - LiveQueryClient instance = _instance ?? LiveQueryClient._internal(liveQueryURL, debug: debug, autoSendSessionId: autoSendSessionId); + LiveQueryClient instance = _instance ?? + LiveQueryClient._internal(liveQueryURL, + debug: debug, autoSendSessionId: autoSendSessionId); _instance ??= instance; return instance; } @@ -177,7 +197,8 @@ class LiveQueryClient { Future disconnect({bool userInitialized = false}) async { parse_web_socket.WebSocket? webSocket = _webSocket; - if (webSocket != null && webSocket.readyState == parse_web_socket.WebSocket.open) { + if (webSocket != null && + webSocket.readyState == parse_web_socket.WebSocket.open) { if (_debug) { print('$_printConstLiveQuery: Socket closed'); } @@ -197,16 +218,21 @@ class LiveQueryClient { }); _connecting = false; if (userInitialized) { - _clientEventStreamController.sink.add(LiveQueryClientEvent.userDisconnected); + _clientEventStreamController.sink + .add(LiveQueryClientEvent.userDisconnected); } } - Future> subscribe(QueryBuilder query, {T? copyObject}) async { + Future> subscribe( + QueryBuilder query, + {T? copyObject}) async { if (_webSocket == null) { - await _clientEventStream.any((LiveQueryClientEvent event) => event == LiveQueryClientEvent.connected); + await _clientEventStream.any((LiveQueryClientEvent event) => + event == LiveQueryClientEvent.connected); } final int requestId = _requestIdGenerator(); - final Subscription subscription = Subscription(query, requestId, copyObject: copyObject); + final Subscription subscription = + Subscription(query, requestId, copyObject: copyObject); _requestSubscription[requestId] = subscription; //After a client connects to the LiveQuery server, //it can send a subscribe message to subscribe a ParseQuery. @@ -246,7 +272,8 @@ class LiveQueryClient { _connecting = true; try { - parse_web_socket.WebSocket webSocket = await parse_web_socket.WebSocket.connect(_liveQueryURL); + parse_web_socket.WebSocket webSocket = + await parse_web_socket.WebSocket.connect(_liveQueryURL); _webSocket = webSocket; _connecting = false; if (webSocket.readyState == parse_web_socket.WebSocket.open) { @@ -266,16 +293,23 @@ class LiveQueryClient { chanelStream?.sink.add(message); }, onDone: () { - _clientEventStreamController.sink.add(LiveQueryClientEvent.disconnected); + _clientEventStreamController.sink + .add(LiveQueryClientEvent.disconnected); if (_debug) { print('$_printConstLiveQuery: Done'); } }, onError: (Object error) { - _clientEventStreamController.sink.add(LiveQueryClientEvent.disconnected); + _clientEventStreamController.sink + .add(LiveQueryClientEvent.disconnected); if (_debug) { - print('$_printConstLiveQuery: Error: ${error.runtimeType.toString()}'); + print( + '$_printConstLiveQuery: Error: ${error.runtimeType.toString()}'); } - return Future.value(handleException(Exception(error), ParseApiRQ.liveQuery, _debug, !parseIsWeb ? 'IOWebSocketChannel' : 'HtmlWebSocketChannel')); + return Future.value(handleException( + Exception(error), + ParseApiRQ.liveQuery, + _debug, + !parseIsWeb ? 'IOWebSocketChannel' : 'HtmlWebSocketChannel')); }); } on Exception catch (e) { _connecting = false; @@ -294,7 +328,10 @@ class LiveQueryClient { } //The connect message is sent from a client to the LiveQuery server. //It should be the first message sent from a client after the WebSocket connection is established. - final Map connectMessage = {'op': 'connect', 'applicationId': ParseCoreData().applicationId}; + final Map connectMessage = { + 'op': 'connect', + 'applicationId': ParseCoreData().applicationId + }; if (_sendSessionId) { String? sessionId = ParseCoreData().sessionId; @@ -313,7 +350,8 @@ class LiveQueryClient { connectMessage['masterKey'] = masterKey; } - String? parseInstallation = (await ParseInstallation.currentInstallation()).installationId; + String? parseInstallation = + (await ParseInstallation.currentInstallation()).installationId; if (parseInstallation != null) { connectMessage['installationId'] = parseInstallation; } @@ -343,7 +381,12 @@ class LiveQueryClient { final Map subscribeMessage = { 'op': 'subscribe', 'requestId': subscription.requestId, - 'query': {'className': query.object.parseClassName, 'where': whereMap, if (keysToReturn != null && keysToReturn.isNotEmpty) 'fields': keysToReturn} + 'query': { + 'className': query.object.parseClassName, + 'where': whereMap, + if (keysToReturn != null && keysToReturn.isNotEmpty) + 'fields': keysToReturn + } }; if (_sendSessionId && ParseCoreData().sessionId != null) { subscribeMessage['sessionToken'] = ParseCoreData().sessionId; @@ -387,9 +430,13 @@ class LiveQueryClient { final String? className = map['className']; if (className != null) { if (className == keyClassUser) { - eventCallback((subscription.copyObject ?? ParseCoreData.instance.createParseUser(null, null, null)).fromJson(map)); + eventCallback((subscription.copyObject ?? + ParseCoreData.instance.createParseUser(null, null, null)) + .fromJson(map)); } else { - eventCallback((subscription.copyObject ?? ParseCoreData.instance.createObject(className)).fromJson(map)); + eventCallback((subscription.copyObject ?? + ParseCoreData.instance.createObject(className)) + .fromJson(map)); } } } else { @@ -404,10 +451,11 @@ class LiveQuery { LiveQuery({bool? debug, bool? autoSendSessionId}) { _debug = isDebugEnabled(objectLevelDebug: debug); _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId; - client = LiveQueryClient._getInstance(debug: _debug, autoSendSessionId: _sendSessionId); + client = LiveQueryClient._getInstance( + debug: _debug, autoSendSessionId: _sendSessionId); } bool? _debug; bool? _sendSessionId; late LiveQueryClient client; -} +} \ No newline at end of file