Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

THRIFT-5712 - Added Dart 3 Compatibility #2930

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

THRIFT-5712 - Added Dart 3 Compatibility #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/docker/old/ubuntu-artful/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN apt-get update && \
RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > \
/etc/apt/sources.list.d/dart_stable.list
ENV DART_VERSION 1.24.3-1
ENV DART_VERSION 2.12.0

# dotnet (netcore)
RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg && \
Expand Down
488 changes: 240 additions & 248 deletions compiler/cpp/src/thrift/generate/t_dart_generator.cc
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 23 additions & 33 deletions lib/dart/lib/src/browser/t_web_socket.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ library thrift.src.browser;

import 'dart:async';
import 'dart:convert' show base64;
import 'dart:html' show CloseEvent;
import 'dart:html' show Event;
import 'dart:html' show MessageEvent;
import 'dart:html' show WebSocket;
import 'dart:html' show CloseEvent, Event, MessageEvent, WebSocket;
import 'dart:typed_data' show Uint8List;

import 'package:thrift/thrift.dart';
Expand All @@ -31,62 +28,61 @@ import 'package:thrift/thrift.dart';
class TWebSocket implements TSocket {
final Uri url;

final StreamController<TSocketState> _onStateController;
final StreamController<TSocketState> _onStateController =
StreamController.broadcast();
@override
Stream<TSocketState> get onState => _onStateController.stream;

final StreamController<Object> _onErrorController;
final StreamController<Object> _onErrorController =
StreamController.broadcast();
@override
Stream<Object> get onError => _onErrorController.stream;

final StreamController<Uint8List> _onMessageController;
final StreamController<Uint8List> _onMessageController =
StreamController.broadcast();
@override
Stream<Uint8List> get onMessage => _onMessageController.stream;

final List<Uint8List> _requests = [];

TWebSocket(this.url)
: _onStateController = StreamController.broadcast(),
_onErrorController = StreamController.broadcast(),
_onMessageController = StreamController.broadcast() {
if (url == null || !url.hasAuthority || !url.hasPort) {
TWebSocket(this.url) {
if (!url.hasAuthority || !url.hasPort) {
throw ArgumentError('Invalid url');
}
}

WebSocket _socket;
late WebSocket _socket;

@override
bool get isOpen => _socket != null && _socket.readyState == WebSocket.OPEN;
bool get isOpen => _socket.readyState == WebSocket.OPEN;

@override
bool get isClosed =>
_socket == null || _socket.readyState == WebSocket.CLOSED;
bool get isClosed => _socket.readyState == WebSocket.CLOSED;

@override
Future open() {
Future<void> open() async {
if (!isClosed) {
throw TTransportError(
TTransportErrorType.ALREADY_OPEN, 'Socket already connected');
}

_socket = WebSocket(url.toString());
_socket.onError.listen(_onError);
_socket.onOpen.listen(_onOpen);
await _socket.onOpen.first;
_socket.onClose.listen(_onClose);
_socket.onMessage.listen(_onMessage);

return _socket.onOpen.first;
_onStateController.add(TSocketState.OPEN);
_sendRequests();
}

@override
Future close() {
if (_socket != null) {
Future<void> close() async {
if (_socket.readyState == WebSocket.OPEN) {
_socket.close();
return _socket.onClose.first;
} else {
return Future.value();
await _socket.onClose.first;
}
_onStateController.add(TSocketState.CLOSED);
}

@override
Expand All @@ -102,26 +98,20 @@ class TWebSocket implements TSocket {
}
}

void _onOpen(Event event) {
_onStateController.add(TSocketState.OPEN);
_sendRequests();
}

void _onClose(CloseEvent event) {
_socket = null;

_socket = WebSocket('');
if (_requests.isNotEmpty) {
_onErrorController
.add(StateError('Socket was closed with pending requests'));
}
_requests.clear();

_onStateController.add(TSocketState.CLOSED);
}

void _onMessage(MessageEvent message) {
try {
Uint8List data = Uint8List.fromList(base64.decode(message.data));
Uint8List data =
Uint8List.fromList(base64.decode(message.data as String));
_onMessageController.add(data);
} on FormatException catch (_) {
var error = TProtocolError(TProtocolErrorType.INVALID_DATA,
Expand Down
50 changes: 28 additions & 22 deletions lib/dart/lib/src/console/t_tcp_socket.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
/// distributed with this work for additional information
/// regarding copyright ownership. The ASF licenses this file
/// to you under the Apache License, Version 2.0 (the
/// "License"); you may not use this file except in compliance
/// 'License'); you may not use this file except in compliance
/// with the License. You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing,
/// software distributed under the License is distributed on an
/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
/// 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
/// KIND, either express or implied. See the License for the
/// specific language governing permissions and limitations
/// under the License.
Expand All @@ -25,59 +25,65 @@ import 'package:thrift/thrift.dart';

/// A [TSocket] backed by a [Socket] from dart:io
class TTcpSocket implements TSocket {
final StreamController<TSocketState> _onStateController;
final StreamController<TSocketState> _onStateController =
StreamController.broadcast();
@override
Stream<TSocketState> get onState => _onStateController.stream;

final StreamController<Object> _onErrorController;
final StreamController<Object> _onErrorController =
StreamController.broadcast();
@override
Stream<Object> get onError => _onErrorController.stream;

final StreamController<Uint8List> _onMessageController;
final StreamController<Uint8List> _onMessageController =
StreamController.broadcast();
@override
Stream<Uint8List> get onMessage => _onMessageController.stream;

TTcpSocket(Socket socket)
: _onStateController = StreamController.broadcast(),
_onErrorController = StreamController.broadcast(),
_onMessageController = StreamController.broadcast() {
if (socket == null) {
throw ArgumentError.notNull('socket');
}

_socket = socket;
: _socket = socket,
_isOpen = false {
_socket.listen(_onMessage, onError: _onError, onDone: close);
}

Socket _socket;
bool _isOpen;

@override
bool get isOpen => _socket != null;
bool get isOpen => _isOpen;

@override
bool get isClosed => _socket == null;
bool get isClosed => !_isOpen;

@override
Future open() async {
Future<void> open() async {
_isOpen = true;
_onStateController.add(TSocketState.OPEN);
}

@override
Future close() async {
if (_socket != null) {
await _socket.close();
_socket = null;
}

Future<void> close() async {
await _socket.close();
_isOpen = false;
_onStateController.add(TSocketState.CLOSED);
}

@override
void send(Uint8List data) {
if (!isOpen) {
throw TTransportError(
TTransportErrorType.NOT_OPEN, 'Socket is not open for sending data');
}

_socket.add(data);
}

void _onMessage(List<int> message) {
if (!isOpen) {
throw TTransportError(TTransportErrorType.NOT_OPEN,
'Socket is not open for receiving data');
}

Uint8List data = Uint8List.fromList(message);
_onMessageController.add(data);
}
Expand Down
49 changes: 22 additions & 27 deletions lib/dart/lib/src/console/t_web_socket.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
/// distributed with this work for additional information
/// regarding copyright ownership. The ASF licenses this file
/// to you under the Apache License, Version 2.0 (the
/// "License"); you may not use this file except in compliance
/// 'License'); you may not use this file except in compliance
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why we need to modify the license header contents?
There are more places I will not comment every single one.

/// with the License. You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing,
/// software distributed under the License is distributed on an
/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
/// 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
/// KIND, either express or implied. See the License for the
/// specific language governing permissions and limitations
/// under the License.
Expand All @@ -26,50 +26,46 @@ import 'package:thrift/thrift.dart';

/// A [TSocket] backed by a [WebSocket] from dart:io
class TWebSocket implements TSocket {
final StreamController<TSocketState> _onStateController;
final StreamController<TSocketState> _onStateController =
StreamController.broadcast();
@override
Stream<TSocketState> get onState => _onStateController.stream;

final StreamController<Object> _onErrorController;
final StreamController<Object> _onErrorController =
StreamController.broadcast();
@override
Stream<Object> get onError => _onErrorController.stream;

final StreamController<Uint8List> _onMessageController;
final StreamController<Uint8List> _onMessageController =
StreamController.broadcast();
@override
Stream<Uint8List> get onMessage => _onMessageController.stream;

TWebSocket(WebSocket socket)
: _onStateController = StreamController.broadcast(),
_onErrorController = StreamController.broadcast(),
_onMessageController = StreamController.broadcast() {
if (socket == null) {
throw ArgumentError.notNull('socket');
}
final WebSocket _socket;

_socket = socket;
_socket.listen(_onMessage, onError: _onError, onDone: close);
TWebSocket(this._socket) {
_socket.listen(
(dynamic message) => _onMessage(message as String),
onError: (dynamic error) => _onError(error),
onDone: () => close(),
);
}

WebSocket _socket;

@override
bool get isOpen => _socket != null;
bool get isOpen =>
true; // Since _socket is not nullable, it's always considered open

@override
bool get isClosed => _socket == null;
bool get isClosed => false; // Similarly, it's never considered closed

@override
Future open() async {
Future<void> open() async {
_onStateController.add(TSocketState.OPEN);
}

@override
Future close() async {
if (_socket != null) {
await _socket.close();
_socket = null;
}

Future<void> close() async {
await _socket.close();
_onStateController.add(TSocketState.CLOSED);
}

Expand All @@ -89,8 +85,7 @@ class TWebSocket implements TSocket {
}
}

void _onError(Object error) {
close();
void _onError(dynamic error) {
_onErrorController.add('$error');
}
}