TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 14:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added SendPayloadDart()

Browse Source 
PiperOrigin-RevId: 409833593
This commit is contained in:
eidenkim
2021-11-14 13:30:53 -08:00
committed by Copybara-Service
parent 083d692205
commit 363c247eb0
3 changed files with 152 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/core_adapter.h
+1 -1
View File
@@ -193,7 +193,7 @@ DLL_EXPORT void __stdcall RejectConnection(Core *pCore, const char *endpoint_id,
// result_cb - to access the status of the operation when available.
// Possible status codes include:
// Status::STATUS_OUT_OF_ORDER_API_CALL if the device has not first
// performed advertisement or discovery (to set the Strategy.
// performed advertisement or discovery (to set the Strategy.)
// Status::STATUS_ENDPOINT_UNKNOWN if there's no active (or pending)
// connection to the remote endpoint.
// Status::STATUS_OK if none of the above errors occurred. Note that this
windows/dart/core_adapter_dart.cc
+114 -28
View File
@@ -14,6 +14,7 @@
#include "third_party/dart_lang/v2/runtime/include/dart_api_dl.h"
#include "third_party/dart_lang/v2/runtime/include/dart_native_api.h"
#include "core/core.h"
#include "third_party/nearby_connections/windows/dart/core_adapter_dart.h"
namespace location {
@@ -69,7 +70,7 @@ void StartAdvertisingDart(Core *pCore, const char *service_id,
return;
}
windows::AdvertisingOptions options;
AdvertisingOptions options;
options.strategy = GetStrategy(options_dart.strategy);
options.auto_upgrade_bandwidth = options_dart.auto_upgrade_bandwidth;
options.enforce_topology_constraints =
@@ -163,7 +164,7 @@ void StopAdvertisingDart(Core *pCore, Dart_Port result_cb) {
ResultCallback callback;
SetResultCallback(callback, result_cb);
windows::StopAdvertising(pCore, callback);
StopAdvertising(pCore, callback);
}
void StartDiscoveryDart(Core *pCore, const char *service_id,
@@ -175,7 +176,7 @@ void StartDiscoveryDart(Core *pCore, const char *service_id,
return;
}
windows::DiscoveryOptions options;
DiscoveryOptions options;
options.strategy = GetStrategy(options_dart.strategy);
options.allowed.bluetooth = options_dart.enable_bluetooth;
options.allowed.ble = options_dart.enable_ble;
@@ -260,7 +261,7 @@ void StopDiscoveryDart(Core *pCore, Dart_Port result_cb) {
ResultCallback callback;
SetResultCallback(callback, result_cb);
windows::StopDiscovery(pCore, callback);
StopDiscovery(pCore, callback);
}
void RequestConnectionDart(Core *pCore, const char *endpoint_id,
@@ -272,7 +273,7 @@ void RequestConnectionDart(Core *pCore, const char *endpoint_id,
return;
}
windows::ConnectionOptions options;
ConnectionOptions options;
options.enforce_topology_constraints = false;
options.allowed.bluetooth = options_dart.enable_bluetooth;
options.allowed.ble = options_dart.enable_ble;
@@ -350,7 +351,8 @@ void RequestConnectionDart(Core *pCore, const char *endpoint_id,
RequestConnection(pCore, endpoint_id, info, std::move(options), callback);
}
void AcceptConnectionDart(Core *pCore, const char *endpoint_id,
void AcceptConnectionDart(Core *pCore,
const char *endpoint_id,
PayloadListenerDart listener_dart,
Dart_Port result_cb) {
if (!pCore) {
@@ -360,36 +362,120 @@ void AcceptConnectionDart(Core *pCore, const char *endpoint_id,
PayloadListener listener;
listener.payload_cb = [listener_dart](const std::string &endpoint_id,
Payload payload) {
// TODO: pass payload in callback
Dart_CObject dart_object_payload;
dart_object_payload.type = Dart_CObject_kString;
dart_object_payload.value.as_string = (char *)endpoint_id.data();
const bool result =
Dart_PostCObject_DL(listener_dart.payload_cb, &dart_object_payload);
if (!result) {
NEARBY_LOG(INFO, "Posting message to port failed.");
Payload payload) {
NEARBY_LOG(INFO, "Payload callback called. id: %s, "
"payload_id: %d, type: %d, offset: %d",
endpoint_id.c_str(),
payload.GetId(),
payload.GetType(),
payload.GetOffset());
Dart_CObject dart_object_endpoint_id;
dart_object_endpoint_id.type = Dart_CObject_kString;
dart_object_endpoint_id.value.as_string =
(char *)endpoint_id.data();
Dart_CObject dart_object_payload_id;
dart_object_payload_id.type = Dart_CObject_kInt64;
dart_object_payload_id.value.as_int64 = payload.GetId();
Dart_CObject dart_object_payload_type;
dart_object_payload_type.type = Dart_CObject_kInt64;
dart_object_payload_type.value.as_int64 = (int)payload.GetType();
Dart_CObject dart_object_offset;
dart_object_offset.type = Dart_CObject_kInt64;
dart_object_offset.value.as_int64 = payload.GetOffset();
Dart_CObject* elements[4];
elements[0] = &dart_object_endpoint_id;
elements[1] = &dart_object_payload_id;
elements[2] = &dart_object_payload_type;
elements[3] = &dart_object_offset;
Dart_CObject dart_object_payload;
dart_object_payload.type = Dart_CObject_kArray;
dart_object_payload.value.as_array.length = 4;
dart_object_payload.value.as_array.values = elements;
const bool result = Dart_PostCObject_DL(listener_dart.payload_cb,
&dart_object_payload);
if (!result) {
NEARBY_LOG(INFO, "Posting message to port failed.");
}
};
listener.payload_progress_cb = [listener_dart](
const std::string &endpoint_id,
const PayloadProgressInfo &info) {
// TODO: pass payload progress info in callback
Dart_CObject dart_object_payload;
dart_object_payload.type = Dart_CObject_kString;
dart_object_payload.value.as_string = (char *)endpoint_id.data();
const bool result =
Dart_PostCObject_DL(listener_dart.payload_cb, &dart_object_payload);
if (!result) {
NEARBY_LOG(INFO, "Posting message to port failed.");
}
};
const std::string &endpoint_id,
const PayloadProgressInfo& info) {
NEARBY_LOG(INFO, "Payload progress callback called. id: %s, "
"payload_id: %d, bytes transferred: %d, total: %d, status: %d",
endpoint_id.c_str(),
info.payload_id,
info.bytes_transferred,
info.total_bytes,
info.status);
Dart_CObject dart_object_endpoint_id;
dart_object_endpoint_id.type = Dart_CObject_kString;
dart_object_endpoint_id.value.as_string =
(char *)endpoint_id.data();
Dart_CObject dart_object_payload_id;
dart_object_payload_id.type = Dart_CObject_kInt64;
dart_object_payload_id.value.as_int64 = info.payload_id;
Dart_CObject dart_object_bytes_transferred;
dart_object_bytes_transferred.type = Dart_CObject_kInt64;
dart_object_bytes_transferred.value.as_int64 = info.bytes_transferred;
Dart_CObject dart_object_total_bytes;
dart_object_total_bytes.type = Dart_CObject_kInt64;
dart_object_total_bytes.value.as_int64 = info.total_bytes;
Dart_CObject dart_object_status;
dart_object_status.type = Dart_CObject_kInt64;
dart_object_status.value.as_int64 = (int64_t)info.status;
Dart_CObject* elements[5];
elements[0] = &dart_object_endpoint_id;
elements[1] = &dart_object_payload_id;
elements[2] = &dart_object_bytes_transferred;
elements[3] = &dart_object_total_bytes;
elements[4] = &dart_object_status;
Dart_CObject dart_object_payload_progress;
dart_object_payload_progress.type = Dart_CObject_kArray;
dart_object_payload_progress.value.as_array.length = 5;
dart_object_payload_progress.value.as_array.values = elements;
const bool result =
Dart_PostCObject_DL(listener_dart.payload_progress_cb,
&dart_object_payload_progress);
if (!result) {
NEARBY_LOG(INFO,
"Posting message to port failed.");
}
};
ResultCallback callback;
SetResultCallback(callback, result_cb);
windows::AcceptConnection(pCore, endpoint_id, listener, callback);
AcceptConnection(pCore, endpoint_id, listener, callback);
}
void SendPayloadDart(Core *pCore, const char *endpoint_id,
PayloadDart payload_dart, Dart_Port result_cb) {
if (!pCore) {
PostResult(result_cb, Status::Value::kError);
return;
}
ResultCallback callback;
std::vector<string> endpoint_ids = {string(endpoint_id)};
Payload payload(Payload::GenerateId(), ByteArray(payload_dart.data));
SetResultCallback(callback, result_cb);
SendPayload(pCore, absl::Span<const std::string>(endpoint_ids),
std::move(payload), callback);
}
} // namespace windows
} // namespace connections
} // namespace nearby
windows/dart/core_adapter_dart.h
+37
View File
@@ -28,6 +28,13 @@ enum StrategyDart {
P2P_POINT_TO_POINT,
};
enum PayloadType {
UNKNOWN = 0,
BYTE,
STREAM,
FILE,
};
struct ConnectionOptionsDart {
StrategyDart strategy;
int64_t auto_upgrade_bandwidth;
@@ -63,6 +70,13 @@ struct PayloadListenerDart {
int64_t payload_progress_cb;
};
struct PayloadDart {
int64_t id;
PayloadType type;
int64_t size;
char* data;
};
// Starts advertising an endpoint for a local app.
//
// service_id - An identifier to advertise your app to other endpoints.
@@ -158,6 +172,29 @@ DLL_EXPORT void __stdcall RequestConnectionDart(
DLL_EXPORT void __stdcall AcceptConnectionDart(
Core *pCore, const char *endpoint_id, PayloadListenerDart listener_dart,
Dart_Port result_cb);
// Sends a Payload to a remote endpoint. Payloads can only be sent to remote
// endpoints once a notice of connection acceptance has been delivered via
// ConnectionListener::onConnectionResult().
//
// endpoint_id - Remote endpoint identifier for the to which the
// payload should be sent.
// payload - The Payload to be sent.
// result_cb - to access the status of the operation when available.
// Possible status codes include:
// Status::STATUS_OUT_OF_ORDER_API_CALL if the device has not first
// performed advertisement or discovery (to set the Strategy.)
// Status::STATUS_ENDPOINT_UNKNOWN if there's no active (or pending)
// connection to the remote endpoint.
// Status::STATUS_OK if none of the above errors occurred. Note that this
// indicates that Nearby Connections will attempt to send the Payload,
// but not that the send has successfully completed yet. Errors might
// still occur during transmission (and at different times for
// different endpoints), and will be delivered via
// PayloadCallback#onPayloadTransferUpdate.
DLL_EXPORT void __stdcall SendPayloadDart(Core* pCore,
const char* endpoint_id,
PayloadDart payload_dart,
Dart_Port result_cb);
} // namespace windows
} // namespace connections