mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Cleanup blocking socket flag.
PiperOrigin-RevId: 803211100
This commit is contained in:
Francis Tsui
committed by
Copybara-Service
Copybara-Service
parent
d25872b2e0
commit
beaab63d4b
@@ -33,18 +33,12 @@ namespace nearby {
|
||||
namespace windows {
|
||||
|
||||
WifiLanSocket::WifiLanSocket() {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
client_socket_ = std::make_unique<NearbyClientSocket>();
|
||||
input_stream_ = SocketInputStream(client_socket_.get());
|
||||
output_stream_ = SocketOutputStream(client_socket_.get());
|
||||
}
|
||||
|
||||
WifiLanSocket::WifiLanSocket(StreamSocket socket) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
stream_soket_ = socket;
|
||||
VLOG(1) << "Socket send buffer size: "
|
||||
<< socket.Control().OutboundBufferSizeInBytes();
|
||||
@@ -56,9 +50,6 @@ WifiLanSocket::WifiLanSocket(StreamSocket socket) {
|
||||
}
|
||||
|
||||
WifiLanSocket::WifiLanSocket(std::unique_ptr<NearbyClientSocket> socket) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
client_socket_ = std::move(socket);
|
||||
input_stream_ = SocketInputStream(client_socket_.get());
|
||||
output_stream_ = SocketOutputStream(client_socket_.get());
|
||||
@@ -71,28 +62,9 @@ InputStream& WifiLanSocket::GetInputStream() { return input_stream_; }
|
||||
OutputStream& WifiLanSocket::GetOutputStream() { return output_stream_; }
|
||||
|
||||
Exception WifiLanSocket::Close() {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ != nullptr) {
|
||||
return client_socket_->Close();
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
if (stream_soket_ != nullptr) {
|
||||
stream_soket_.Close();
|
||||
}
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ != nullptr) {
|
||||
return client_socket_->Close();
|
||||
}
|
||||
|
||||
return {Exception::kSuccess};
|
||||
}
|
||||
|
||||
@@ -102,215 +74,73 @@ bool WifiLanSocket::Connect(const std::string& ip_address, int port) {
|
||||
|
||||
// SocketInputStream
|
||||
WifiLanSocket::SocketInputStream::SocketInputStream(IInputStream input_stream) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
input_stream_ = input_stream;
|
||||
}
|
||||
|
||||
WifiLanSocket::SocketInputStream::SocketInputStream(
|
||||
NearbyClientSocket* client_socket) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
client_socket_ = client_socket;
|
||||
}
|
||||
|
||||
ExceptionOr<ByteArray> WifiLanSocket::SocketInputStream::Read(
|
||||
std::int64_t size) {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
LOG(ERROR) << "Failed to read data due to no client socket.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Read(size);
|
||||
} else {
|
||||
try {
|
||||
if (read_buffer_ == nullptr || read_buffer_.Capacity() < size) {
|
||||
read_buffer_ = Buffer(size);
|
||||
}
|
||||
|
||||
// Reset the buffer length to 0.
|
||||
read_buffer_.Length(0);
|
||||
|
||||
auto ibuffer =
|
||||
input_stream_.ReadAsync(read_buffer_, size, InputStreamOptions::None)
|
||||
.get();
|
||||
|
||||
if (ibuffer.Length() != size) {
|
||||
LOG(WARNING) << "Only read partial of data: [" << ibuffer.Length()
|
||||
<< "/" << size << "].";
|
||||
}
|
||||
|
||||
ByteArray data((char*)ibuffer.data(), ibuffer.Length());
|
||||
return ExceptionOr(std::move(data));
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
LOG(ERROR) << "Failed to read data due to no client socket.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Read(size);
|
||||
}
|
||||
|
||||
ExceptionOr<size_t> WifiLanSocket::SocketInputStream::Skip(size_t offset) {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Skip(offset);
|
||||
} else {
|
||||
try {
|
||||
Buffer buffer = Buffer(offset);
|
||||
|
||||
auto ibuffer =
|
||||
input_stream_.ReadAsync(buffer, offset, InputStreamOptions::None)
|
||||
.get();
|
||||
return ExceptionOr((size_t)ibuffer.Length());
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Skip(offset);
|
||||
}
|
||||
|
||||
Exception WifiLanSocket::SocketInputStream::Close() {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Close();
|
||||
} else {
|
||||
try {
|
||||
input_stream_.Close();
|
||||
return {Exception::kSuccess};
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Close();
|
||||
}
|
||||
|
||||
// SocketOutputStream
|
||||
WifiLanSocket::SocketOutputStream::SocketOutputStream(
|
||||
IOutputStream output_stream) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
output_stream_ = output_stream;
|
||||
}
|
||||
|
||||
WifiLanSocket::SocketOutputStream::SocketOutputStream(
|
||||
NearbyClientSocket* client_socket) {
|
||||
enable_blocking_socket_ = NearbyFlags::GetInstance().GetBoolFlag(
|
||||
nearby::platform::config_package_nearby::nearby_platform_feature::
|
||||
kEnableBlockingSocket);
|
||||
client_socket_ = client_socket;
|
||||
}
|
||||
|
||||
Exception WifiLanSocket::SocketOutputStream::Write(const ByteArray& data) {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Write(data);
|
||||
} else {
|
||||
try {
|
||||
Buffer buffer = Buffer(data.size());
|
||||
std::memcpy(buffer.data(), data.data(), data.size());
|
||||
buffer.Length(data.size());
|
||||
uint32_t wrote_bytes = output_stream_.WriteAsync(buffer).get();
|
||||
if (wrote_bytes != data.size()) {
|
||||
LOG(WARNING) << "Only wrote partial of data:[" << wrote_bytes << "/"
|
||||
<< data.size() << "].";
|
||||
}
|
||||
|
||||
return {Exception::kSuccess};
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Write(data);
|
||||
}
|
||||
|
||||
Exception WifiLanSocket::SocketOutputStream::Flush() {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Flush();
|
||||
} else {
|
||||
try {
|
||||
output_stream_.FlushAsync().get();
|
||||
return {Exception::kSuccess};
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Flush();
|
||||
}
|
||||
|
||||
Exception WifiLanSocket::SocketOutputStream::Close() {
|
||||
if (enable_blocking_socket_) {
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Close();
|
||||
} else {
|
||||
try {
|
||||
output_stream_.Close();
|
||||
return {Exception::kSuccess};
|
||||
} catch (std::exception exception) {
|
||||
LOG(ERROR) << __func__ << ": Exception: " << exception.what();
|
||||
return {Exception::kIo};
|
||||
} catch (const winrt::hresult_error& error) {
|
||||
LOG(ERROR) << __func__ << ": WinRT exception: " << error.code() << ": "
|
||||
<< winrt::to_string(error.message());
|
||||
return {Exception::kIo};
|
||||
} catch (...) {
|
||||
LOG(ERROR) << __func__ << ": Unknown exception.";
|
||||
return {Exception::kIo};
|
||||
}
|
||||
if (client_socket_ == nullptr) {
|
||||
return {Exception::kIo};
|
||||
}
|
||||
|
||||
return client_socket_->Close();
|
||||
}
|
||||
|
||||
} // namespace windows
|
||||
|
||||
Reference in New Issue
Block a user