mirror of
https://gitlab.com/veilid/veilid.git
synced 2025-02-21 06:59:55 -05:00
update api surface for create_dht_record with owner
This commit is contained in:
parent
bebdbee41b
commit
69378ca9b0
@ -292,16 +292,18 @@ impl JsonRequestProcessor {
|
||||
),
|
||||
}
|
||||
}
|
||||
RoutingContextRequestOp::CreateDhtRecord { schema, kind } => {
|
||||
RoutingContextResponseOp::CreateDhtRecord {
|
||||
result: to_json_api_result(
|
||||
routing_context
|
||||
.create_dht_record(schema, None, kind)
|
||||
.await
|
||||
.map(Box::new),
|
||||
),
|
||||
}
|
||||
}
|
||||
RoutingContextRequestOp::CreateDhtRecord {
|
||||
schema,
|
||||
owner,
|
||||
kind,
|
||||
} => RoutingContextResponseOp::CreateDhtRecord {
|
||||
result: to_json_api_result(
|
||||
routing_context
|
||||
.create_dht_record(schema, owner, kind)
|
||||
.await
|
||||
.map(Box::new),
|
||||
),
|
||||
},
|
||||
RoutingContextRequestOp::OpenDhtRecord { key, writer } => {
|
||||
RoutingContextResponseOp::OpenDhtRecord {
|
||||
result: to_json_api_result(
|
||||
|
@ -41,6 +41,8 @@ pub enum RoutingContextRequestOp {
|
||||
CreateDhtRecord {
|
||||
schema: DHTSchema,
|
||||
#[schemars(with = "Option<String>")]
|
||||
owner: Option<KeyPair>,
|
||||
#[schemars(with = "Option<String>")]
|
||||
kind: Option<CryptoKind>,
|
||||
},
|
||||
OpenDhtRecord {
|
||||
|
@ -14,6 +14,7 @@ import 'test_veilid_config.dart';
|
||||
|
||||
void main() {
|
||||
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
final fixture =
|
||||
DefaultVeilidFixture(programName: 'veilid_flutter integration test');
|
||||
|
||||
@ -72,6 +73,7 @@ void main() {
|
||||
testCreateDeleteDHTRecordNoClose);
|
||||
test('get dht value nonexistent', testGetDHTValueNonexistent);
|
||||
test('set get dht value', testSetGetDHTValue);
|
||||
test('set get dht value with owner', testSetGetDHTValueWithOwner);
|
||||
test('open writer dht value', testOpenWriterDHTValue);
|
||||
// xxx: needs to be a multi-server integration test
|
||||
// test('watch dht values',
|
||||
|
@ -102,6 +102,33 @@ Future<void> testSetGetDHTValue() async {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> testSetGetDHTValueWithOwner() async {
|
||||
final rc = await Veilid.instance.routingContext();
|
||||
try {
|
||||
final cs = await Veilid.instance.bestCryptoSystem();
|
||||
final ownerKeyPair = await cs.generateKeyPair();
|
||||
|
||||
final rec = await rc.createDHTRecord(const DHTSchema.dflt(oCnt: 2),
|
||||
owner: ownerKeyPair);
|
||||
expect(await rc.setDHTValue(rec.key, 0, utf8.encode('BLAH BLAH BLAH')),
|
||||
isNull);
|
||||
final vd2 = await rc.getDHTValue(rec.key, 0);
|
||||
expect(vd2, isNotNull);
|
||||
|
||||
final vd3 = await rc.getDHTValue(rec.key, 0, forceRefresh: true);
|
||||
expect(vd3, isNotNull);
|
||||
|
||||
final vd4 = await rc.getDHTValue(rec.key, 1);
|
||||
expect(vd4, isNull);
|
||||
|
||||
expect(vd2, equals(vd3));
|
||||
|
||||
await rc.deleteDHTRecord(rec.key);
|
||||
} finally {
|
||||
rc.close();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> testOpenWriterDHTValue() async {
|
||||
final rc = await Veilid.instance.routingContext();
|
||||
try {
|
||||
|
@ -26,10 +26,10 @@ EXTERNAL SOURCES:
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
|
||||
macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
|
||||
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
|
||||
veilid: a54f57b7bcf0e4e072fe99272d76ca126b2026d0
|
||||
macos_window_utils: 3bca8603c2a1cf2257351dfe6bbccc9accf739fd
|
||||
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
|
||||
veilid: 319e2e78836d7b3d08203596d0b4a0e244b68d29
|
||||
|
||||
PODFILE CHECKSUM: 73d2f470b1d889e27fcfda1d6e6efec66f98af3f
|
||||
|
||||
COCOAPODS: 1.15.2
|
||||
COCOAPODS: 1.16.2
|
||||
|
@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
|
||||
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
@ -13,10 +13,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: async
|
||||
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
|
||||
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.12.0"
|
||||
version: "2.11.0"
|
||||
async_tools:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -29,10 +29,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: boolean_selector
|
||||
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
|
||||
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.2"
|
||||
version: "2.1.1"
|
||||
change_case:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -45,10 +45,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: characters
|
||||
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
|
||||
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
version: "1.3.0"
|
||||
charcode:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -61,18 +61,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: clock
|
||||
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
|
||||
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.2"
|
||||
version: "1.1.1"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
|
||||
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.19.1"
|
||||
version: "1.19.0"
|
||||
convert:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -101,10 +101,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fake_async
|
||||
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
|
||||
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.2"
|
||||
version: "1.3.1"
|
||||
ffi:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -117,10 +117,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file
|
||||
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
||||
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.1"
|
||||
version: "7.0.0"
|
||||
fixnum:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -195,18 +195,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
|
||||
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.8"
|
||||
version: "10.0.7"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
|
||||
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.9"
|
||||
version: "3.0.8"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -243,10 +243,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
|
||||
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.12.17"
|
||||
version: "0.12.16+1"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -259,18 +259,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
|
||||
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.16.0"
|
||||
version: "1.15.0"
|
||||
path:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: path
|
||||
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
|
||||
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.9.1"
|
||||
version: "1.9.0"
|
||||
path_provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -323,10 +323,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: platform
|
||||
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
||||
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.6"
|
||||
version: "3.1.5"
|
||||
plugin_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -339,10 +339,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: process
|
||||
sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
|
||||
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.3"
|
||||
version: "5.0.2"
|
||||
quiver:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -360,34 +360,34 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: source_span
|
||||
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
|
||||
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.10.1"
|
||||
version: "1.10.0"
|
||||
stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stack_trace
|
||||
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
|
||||
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.12.1"
|
||||
version: "1.12.0"
|
||||
stream_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stream_channel
|
||||
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
|
||||
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.1.2"
|
||||
string_scanner:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
|
||||
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.1"
|
||||
version: "1.3.0"
|
||||
sync_http:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -416,18 +416,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: term_glyph
|
||||
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
|
||||
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.2"
|
||||
version: "1.2.1"
|
||||
test_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
|
||||
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.4"
|
||||
version: "0.7.3"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -462,10 +462,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
|
||||
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "14.3.1"
|
||||
version: "14.3.0"
|
||||
webdriver:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -499,5 +499,5 @@ packages:
|
||||
source: hosted
|
||||
version: "0.0.6"
|
||||
sdks:
|
||||
dart: ">=3.7.0-0 <4.0.0"
|
||||
dart: ">=3.5.0 <4.0.0"
|
||||
flutter: ">=3.24.0"
|
||||
|
@ -1,3 +1,3 @@
|
||||
import 'package:integration_test/integration_test_driver.dart';
|
||||
|
||||
Future<void> main() => integrationDriver();
|
||||
Future<void> main() async => integrationDriver();
|
||||
|
@ -24,20 +24,25 @@
|
||||
<!-- iOS meta tags & icons -->
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-title" content="ftest">
|
||||
<meta name="apple-mobile-web-app-title" content="Veilid-flutter Example">
|
||||
<link rel="apple-touch-icon" href="icons/Icon-192.png">
|
||||
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png" />
|
||||
|
||||
<title>ftest</title>
|
||||
<title>Veilid-flutter Example</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
|
||||
<!-- Load WASM modules -->
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<script type="module">
|
||||
{{flutter_js}}
|
||||
{{flutter_build_config}}
|
||||
|
||||
import * as veilid_wasm_module from './wasm/veilid_wasm.js';
|
||||
|
||||
async function run() {
|
||||
async function initVeilidWASM() {
|
||||
// save the wasm exports
|
||||
window.veilid_wasm = veilid_wasm_module;
|
||||
// init the js module
|
||||
@ -45,13 +50,23 @@
|
||||
// init the wasm library
|
||||
await veilid_wasm_module.initialize_veilid_wasm();
|
||||
}
|
||||
run();
|
||||
|
||||
const loading = document.createElement('div');
|
||||
document.body.appendChild(loading);
|
||||
loading.textContent = "Loading Entrypoint...";
|
||||
_flutter.loader.load({
|
||||
onEntrypointLoaded: async function (engineInitializer) {
|
||||
loading.textContent = "Initializing engine...";
|
||||
const appRunner = await engineInitializer.initializeEngine();
|
||||
|
||||
loading.textContent = "Initializing Veilid...";
|
||||
await initVeilidWASM();
|
||||
|
||||
loading.textContent = "Running example...";
|
||||
await appRunner.runApp();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<script src="flutter_bootstrap.js" async></script>
|
||||
</body>
|
||||
|
||||
</html>
|
@ -293,7 +293,7 @@ abstract class VeilidRoutingContext {
|
||||
|
||||
// DHT Operations
|
||||
Future<DHTRecordDescriptor> createDHTRecord(DHTSchema schema,
|
||||
{CryptoKind kind = 0});
|
||||
{KeyPair? owner, CryptoKind kind = 0});
|
||||
Future<DHTRecordDescriptor> openDHTRecord(TypedKey key, {KeyPair? writer});
|
||||
Future<void> closeDHTRecord(TypedKey key);
|
||||
Future<void> deleteDHTRecord(TypedKey key);
|
||||
|
@ -65,9 +65,9 @@ typedef _RoutingContextAppCallDart = void Function(
|
||||
typedef _RoutingContextAppMessageDart = void Function(
|
||||
int, int, Pointer<Utf8>, Pointer<Utf8>);
|
||||
// fn routing_context_create_dht_record(port: i64,
|
||||
// id: u32, kind: u32, schema: FfiStr)
|
||||
// id: u32, schema: FfiStr, owner: FfiStr, kind: u32)
|
||||
typedef _RoutingContextCreateDHTRecordDart = void Function(
|
||||
int, int, Pointer<Utf8>, int);
|
||||
int, int, Pointer<Utf8>, Pointer<Utf8>, int);
|
||||
// fn routing_context_open_dht_record(port: i64,
|
||||
// id: u32, key: FfiStr, writer: FfiStr)
|
||||
typedef _RoutingContextOpenDHTRecordDart = void Function(
|
||||
@ -618,13 +618,15 @@ class VeilidRoutingContextFFI extends VeilidRoutingContext {
|
||||
|
||||
@override
|
||||
Future<DHTRecordDescriptor> createDHTRecord(DHTSchema schema,
|
||||
{CryptoKind kind = 0}) async {
|
||||
{KeyPair? owner, CryptoKind kind = 0}) async {
|
||||
_ctx.ensureValid();
|
||||
final nativeSchema = jsonEncode(schema).toNativeUtf8();
|
||||
final nativeOwner =
|
||||
owner != null ? jsonEncode(owner).toNativeUtf8() : nullptr;
|
||||
final recvPort = ReceivePort('routing_context_create_dht_record');
|
||||
final sendPort = recvPort.sendPort;
|
||||
_ctx.ffi._routingContextCreateDHTRecord(
|
||||
sendPort.nativePort, _ctx.id!, nativeSchema, kind);
|
||||
sendPort.nativePort, _ctx.id!, nativeSchema, nativeOwner, kind);
|
||||
final dhtRecordDescriptor =
|
||||
await processFutureJson(DHTRecordDescriptor.fromJson, recvPort.first);
|
||||
return dhtRecordDescriptor;
|
||||
@ -1283,10 +1285,12 @@ class VeilidFFI extends Veilid {
|
||||
_routingContextAppMessage = dylib.lookupFunction<
|
||||
Void Function(Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>),
|
||||
_RoutingContextAppMessageDart>('routing_context_app_message'),
|
||||
_routingContextCreateDHTRecord = dylib.lookupFunction<
|
||||
Void Function(Int64, Uint32, Pointer<Utf8>, Uint32),
|
||||
_RoutingContextCreateDHTRecordDart>(
|
||||
'routing_context_create_dht_record'),
|
||||
_routingContextCreateDHTRecord =
|
||||
dylib.lookupFunction<
|
||||
Void Function(
|
||||
Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>, Uint32),
|
||||
_RoutingContextCreateDHTRecordDart>(
|
||||
'routing_context_create_dht_record'),
|
||||
_routingContextOpenDHTRecord = dylib.lookupFunction<
|
||||
Void Function(Int64, Uint32, Pointer<Utf8>, Pointer<Utf8>),
|
||||
_RoutingContextOpenDHTRecordDart>(
|
||||
|
@ -134,11 +134,15 @@ class VeilidRoutingContextJS extends VeilidRoutingContext {
|
||||
|
||||
@override
|
||||
Future<DHTRecordDescriptor> createDHTRecord(DHTSchema schema,
|
||||
{CryptoKind kind = 0}) async {
|
||||
{KeyPair? owner, CryptoKind kind = 0}) async {
|
||||
final id = _ctx.requireId();
|
||||
return DHTRecordDescriptor.fromJson(jsonDecode(await _wrapApiPromise(js_util
|
||||
.callMethod(wasm, 'routing_context_create_dht_record',
|
||||
[id, jsonEncode(schema), kind]))));
|
||||
.callMethod(wasm, 'routing_context_create_dht_record', [
|
||||
id,
|
||||
jsonEncode(schema),
|
||||
if (owner != null) jsonEncode(owner) else null,
|
||||
kind
|
||||
]))));
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -2,6 +2,7 @@ include: package:lint_hard/all.yaml
|
||||
analyzer:
|
||||
errors:
|
||||
invalid_annotation_target: ignore
|
||||
one_member_abstracts: ignore
|
||||
exclude:
|
||||
- '**/*.g.dart'
|
||||
- '**/*.freezed.dart'
|
||||
|
@ -109,7 +109,7 @@ class DefaultVeilidFixture implements VeilidFixture {
|
||||
|
||||
_veilidUpdateSubscription = us.listen((update) {
|
||||
if (update is VeilidLog) {
|
||||
// print(update.message);
|
||||
print(update.message);
|
||||
} else if (update is VeilidUpdateAttachment) {
|
||||
} else if (update is VeilidUpdateConfig) {
|
||||
} else if (update is VeilidUpdateNetwork) {
|
||||
|
@ -657,7 +657,13 @@ pub extern "C" fn routing_context_app_message(port: i64, id: u32, target: FfiStr
|
||||
|
||||
#[no_mangle]
|
||||
#[instrument(level = "trace", target = "ffi", skip_all)]
|
||||
pub extern "C" fn routing_context_create_dht_record(port: i64, id: u32, schema: FfiStr, kind: u32) {
|
||||
pub extern "C" fn routing_context_create_dht_record(
|
||||
port: i64,
|
||||
id: u32,
|
||||
schema: FfiStr,
|
||||
owner: FfiStr,
|
||||
kind: u32,
|
||||
) {
|
||||
let crypto_kind = if kind == 0 {
|
||||
None
|
||||
} else {
|
||||
@ -665,13 +671,16 @@ pub extern "C" fn routing_context_create_dht_record(port: i64, id: u32, schema:
|
||||
};
|
||||
let schema: veilid_core::DHTSchema =
|
||||
veilid_core::deserialize_opt_json(schema.into_opt_string()).unwrap();
|
||||
let owner: Option<veilid_core::KeyPair> = owner
|
||||
.into_opt_string()
|
||||
.map(|s| veilid_core::deserialize_json(&s).unwrap());
|
||||
|
||||
DartIsolateWrapper::new(port).spawn_result_json(
|
||||
async move {
|
||||
let routing_context = get_routing_context(id, "routing_context_create_dht_record")?;
|
||||
|
||||
let dht_record_descriptor = routing_context
|
||||
.create_dht_record(schema, None, crypto_kind)
|
||||
.create_dht_record(schema, owner, crypto_kind)
|
||||
.await?;
|
||||
APIResult::Ok(dht_record_descriptor)
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ async def test_create_delete_dht_record_simple(api_connection: veilid.VeilidAPI)
|
||||
rc = await api_connection.new_routing_context()
|
||||
async with rc:
|
||||
rec = await rc.create_dht_record(
|
||||
veilid.DHTSchema.dflt(1), veilid.CryptoKind.CRYPTO_KIND_VLD0
|
||||
veilid.DHTSchema.dflt(1), kind=veilid.CryptoKind.CRYPTO_KIND_VLD0
|
||||
)
|
||||
await rc.close_dht_record(rec.key)
|
||||
await rc.delete_dht_record(rec.key)
|
||||
@ -95,6 +95,38 @@ async def test_set_get_dht_value(api_connection: veilid.VeilidAPI):
|
||||
await rc.delete_dht_record(rec.key)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_set_get_dht_value_with_owner(api_connection: veilid.VeilidAPI):
|
||||
rc = await api_connection.new_routing_context()
|
||||
async with rc:
|
||||
|
||||
cs = await api_connection.best_crypto_system()
|
||||
async with cs:
|
||||
owner = await cs.generate_key_pair()
|
||||
|
||||
rec = await rc.create_dht_record(veilid.DHTSchema.dflt(2), owner=owner)
|
||||
|
||||
vd = await rc.set_dht_value(rec.key, ValueSubkey(0), b"BLAH BLAH BLAH")
|
||||
assert vd is None
|
||||
|
||||
vd2 = await rc.get_dht_value(rec.key, ValueSubkey(0), False)
|
||||
assert vd2 is not None
|
||||
|
||||
vd3 = await rc.get_dht_value(rec.key, ValueSubkey(0), True)
|
||||
assert vd3 is not None
|
||||
|
||||
vd4 = await rc.get_dht_value(rec.key, ValueSubkey(1), False)
|
||||
assert vd4 is None
|
||||
|
||||
print("vd2: {}", vd2.__dict__)
|
||||
print("vd3: {}", vd3.__dict__)
|
||||
|
||||
assert vd2 == vd3
|
||||
|
||||
await rc.close_dht_record(rec.key)
|
||||
await rc.delete_dht_record(rec.key)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_open_writer_dht_value(api_connection: veilid.VeilidAPI):
|
||||
rc = await api_connection.new_routing_context()
|
||||
|
@ -49,7 +49,7 @@ class RoutingContext(ABC):
|
||||
|
||||
@abstractmethod
|
||||
async def create_dht_record(
|
||||
self, schema: types.DHTSchema, kind: Optional[types.CryptoKind] = None
|
||||
self, schema: types.DHTSchema, owner: Optional[types.KeyPair] = None, kind: Optional[types.CryptoKind] = None
|
||||
) -> types.DHTRecordDescriptor:
|
||||
pass
|
||||
|
||||
|
@ -578,7 +578,7 @@ class _JsonRoutingContext(RoutingContext):
|
||||
)
|
||||
|
||||
async def create_dht_record(
|
||||
self, schema: DHTSchema, kind: Optional[CryptoKind] = None
|
||||
self, schema: DHTSchema, owner: Optional[KeyPair] = None, kind: Optional[CryptoKind] = None
|
||||
) -> DHTRecordDescriptor:
|
||||
return DHTRecordDescriptor.from_json(
|
||||
raise_api_result(
|
||||
@ -588,6 +588,7 @@ class _JsonRoutingContext(RoutingContext):
|
||||
rc_id=self.rc_id,
|
||||
rc_op=RoutingContextOperation.CREATE_DHT_RECORD,
|
||||
kind=kind,
|
||||
owner=owner,
|
||||
schema=schema,
|
||||
)
|
||||
)
|
||||
|
@ -327,6 +327,12 @@
|
||||
"null"
|
||||
]
|
||||
},
|
||||
"owner": {
|
||||
"type": [
|
||||
"string",
|
||||
"null"
|
||||
]
|
||||
},
|
||||
"rc_op": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
|
@ -488,20 +488,29 @@ pub fn routing_context_app_message(id: u32, target_string: String, message: Stri
|
||||
}
|
||||
|
||||
#[wasm_bindgen()]
|
||||
pub fn routing_context_create_dht_record(id: u32, schema: String, kind: u32) -> Promise {
|
||||
pub fn routing_context_create_dht_record(
|
||||
id: u32,
|
||||
schema: String,
|
||||
owner: Option<String>,
|
||||
kind: u32,
|
||||
) -> Promise {
|
||||
wrap_api_future_json(async move {
|
||||
let crypto_kind = if kind == 0 {
|
||||
None
|
||||
} else {
|
||||
Some(veilid_core::FourCC::from(kind))
|
||||
};
|
||||
let owner: Option<veilid_core::KeyPair> = match owner {
|
||||
Some(s) => Some(veilid_core::deserialize_json(&s).map_err(VeilidAPIError::generic)?),
|
||||
None => None,
|
||||
};
|
||||
let schema: veilid_core::DHTSchema =
|
||||
veilid_core::deserialize_json(&schema).map_err(VeilidAPIError::generic)?;
|
||||
|
||||
let routing_context = get_routing_context(id, "routing_context_create_dht_record")?;
|
||||
|
||||
let dht_record_descriptor = routing_context
|
||||
.create_dht_record(schema, None, crypto_kind)
|
||||
.create_dht_record(schema, owner, crypto_kind)
|
||||
.await?;
|
||||
APIResult::Ok(dht_record_descriptor)
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user