api and log refactor

2022-07-01 12:13:52 -04:00
parent f409c84778
commit c106d324c8
25 changed files with 662 additions and 501 deletions
--- a/veilid-flutter/lib/veilid.dart
+++ b/veilid-flutter/lib/veilid.dart
@@ -13,7 +13,7 @@ import 'veilid_stub.dart'

 class VeilidFFIConfigLoggingTerminal {
  bool enabled;
-  VeilidLogLevel level;
+  VeilidConfigLogLevel level;

  VeilidFFIConfigLoggingTerminal({
    required this.enabled,
@@ -29,12 +29,12 @@ class VeilidFFIConfigLoggingTerminal {

  VeilidFFIConfigLoggingTerminal.fromJson(Map<String, dynamic> json)
      : enabled = json['enabled'],
-        level = veilidLogLevelFromJson(json['level']);
+        level = veilidConfigLogLevelFromJson(json['level']);
 }

 class VeilidFFIConfigLoggingOtlp {
  bool enabled;
-  VeilidLogLevel level;
+  VeilidConfigLogLevel level;
  String grpcEndpoint;
  String serviceName;

@@ -56,27 +56,52 @@ class VeilidFFIConfigLoggingOtlp {

  VeilidFFIConfigLoggingOtlp.fromJson(Map<String, dynamic> json)
      : enabled = json['enabled'],
-        level = veilidLogLevelFromJson(json['level']),
+        level = veilidConfigLogLevelFromJson(json['level']),
        grpcEndpoint = json['grpc_endpoint'],
        serviceName = json['service_name'];
 }

+class VeilidFFIConfigLoggingApi {
+  bool enabled;
+  VeilidConfigLogLevel level;
+
+  VeilidFFIConfigLoggingApi({
+    required this.enabled,
+    required this.level,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'enabled': enabled,
+      'level': level.json,
+    };
+  }
+
+  VeilidFFIConfigLoggingApi.fromJson(Map<String, dynamic> json)
+      : enabled = json['enabled'],
+        level = veilidConfigLogLevelFromJson(json['level']);
+}
+
 class VeilidFFIConfigLogging {
  VeilidFFIConfigLoggingTerminal terminal;
  VeilidFFIConfigLoggingOtlp otlp;
+  VeilidFFIConfigLoggingApi api;

-  VeilidFFIConfigLogging({required this.terminal, required this.otlp});
+  VeilidFFIConfigLogging(
+      {required this.terminal, required this.otlp, required this.api});

  Map<String, dynamic> get json {
    return {
      'terminal': terminal.json,
      'otlp': otlp.json,
+      'api': api.json,
    };
  }

  VeilidFFIConfigLogging.fromJson(Map<String, dynamic> json)
      : terminal = VeilidFFIConfigLoggingTerminal.fromJson(json['terminal']),
-        otlp = VeilidFFIConfigLoggingOtlp.fromJson(json['otlp']);
+        otlp = VeilidFFIConfigLoggingOtlp.fromJson(json['otlp']),
+        api = VeilidFFIConfigLoggingApi.fromJson(json['api']);
 }

 class VeilidFFIConfig {
@@ -101,7 +126,7 @@ class VeilidFFIConfig {

 class VeilidWASMConfigLoggingPerformance {
  bool enabled;
-  VeilidLogLevel level;
+  VeilidConfigLogLevel level;
  bool logsInTimings;
  bool logsInConsole;

@@ -123,25 +148,49 @@ class VeilidWASMConfigLoggingPerformance {

  VeilidWASMConfigLoggingPerformance.fromJson(Map<String, dynamic> json)
      : enabled = json['enabled'],
-        level = veilidLogLevelFromJson(json['level']),
+        level = veilidConfigLogLevelFromJson(json['level']),
        logsInTimings = json['logs_in_timings'],
        logsInConsole = json['logs_in_console'];
 }

+class VeilidWASMConfigLoggingApi {
+  bool enabled;
+  VeilidConfigLogLevel level;
+
+  VeilidWASMConfigLoggingApi({
+    required this.enabled,
+    required this.level,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'enabled': enabled,
+      'level': level.json,
+    };
+  }
+
+  VeilidWASMConfigLoggingApi.fromJson(Map<String, dynamic> json)
+      : enabled = json['enabled'],
+        level = veilidConfigLogLevelFromJson(json['level']);
+}
+
 class VeilidWASMConfigLogging {
  VeilidWASMConfigLoggingPerformance performance;
+  VeilidWASMConfigLoggingApi api;

-  VeilidWASMConfigLogging({required this.performance});
+  VeilidWASMConfigLogging({required this.performance, required this.api});

  Map<String, dynamic> get json {
    return {
      'performance': performance.json,
+      'api': api.json,
    };
  }

  VeilidWASMConfigLogging.fromJson(Map<String, dynamic> json)
      : performance =
-            VeilidWASMConfigLoggingPerformance.fromJson(json['performance']);
+            VeilidWASMConfigLoggingPerformance.fromJson(json['performance']),
+        api = VeilidWASMConfigLoggingApi.fromJson(json['api']);
 }

 class VeilidWASMConfig {
@@ -899,7 +948,6 @@ class VeilidConfigCapabilities {
 class VeilidConfig {
  String programName;
  String namespace;
-  VeilidConfigLogLevel apiLogLevel;
  VeilidConfigCapabilities capabilities;
  VeilidConfigProtectedStore protectedStore;
  VeilidConfigTableStore tableStore;
@@ -909,7 +957,6 @@ class VeilidConfig {
  VeilidConfig({
    required this.programName,
    required this.namespace,
-    required this.apiLogLevel,
    required this.capabilities,
    required this.protectedStore,
    required this.tableStore,
@@ -921,7 +968,6 @@ class VeilidConfig {
    return {
      'program_name': programName,
      'namespace': namespace,
-      'api_log_level': apiLogLevel.json,
      'capabilities': capabilities.json,
      'protected_store': protectedStore.json,
      'table_store': tableStore.json,
@@ -933,7 +979,6 @@ class VeilidConfig {
  VeilidConfig.fromJson(Map<String, dynamic> json)
      : programName = json['program_name'],
        namespace = json['namespace'],
-        apiLogLevel = json['api_log_level'],
        capabilities = VeilidConfigCapabilities.fromJson(json['capabilities']),
        protectedStore =
            VeilidConfigProtectedStore.fromJson(json['protected_store']),
@@ -1253,9 +1298,9 @@ abstract class Veilid {
  static late Veilid instance = getVeilid();

  void configureVeilidPlatform(Map<String, dynamic> platformConfigJson);
+  void changeLogLevel(String layer, VeilidConfigLogLevel logLevel);
  Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config);
  Future<VeilidState> getVeilidState();
-  Future<void> changeApiLogLevel(VeilidConfigLogLevel logLevel);
  Future<void> shutdownVeilidCore();
  Future<String> debug(String command);
  String veilidVersionString();
--- a/veilid-flutter/lib/veilid_ffi.dart
+++ b/veilid-flutter/lib/veilid_ffi.dart
@@ -32,15 +32,15 @@ typedef _InitializeVeilidFlutterDart = void Function(Pointer<_DartPostCObject>);
 // fn configure_veilid_platform(platform_config: FfiStr)
 typedef _ConfigureVeilidPlatformC = Void Function(Pointer<Utf8>);
 typedef _ConfigureVeilidPlatformDart = void Function(Pointer<Utf8>);
+// fn change_log_level(layer: FfiStr, log_level: FfiStr)
+typedef _ChangeLogLevelC = Void Function(Pointer<Utf8>, Pointer<Utf8>);
+typedef _ChangeLogLevelDart = void Function(Pointer<Utf8>, Pointer<Utf8>);
 // fn startup_veilid_core(port: i64, config: FfiStr)
 typedef _StartupVeilidCoreC = Void Function(Int64, Pointer<Utf8>);
 typedef _StartupVeilidCoreDart = void Function(int, Pointer<Utf8>);
 // fn get_veilid_state(port: i64)
 typedef _GetVeilidStateC = Void Function(Int64);
 typedef _GetVeilidStateDart = void Function(int);
-// fn change_api_log_level(port: i64, log_level: FfiStr)
-typedef _ChangeApiLogLevelC = Void Function(Int64, Pointer<Utf8>);
-typedef _ChangeApiLogLevelDart = void Function(int, Pointer<Utf8>);
 // fn debug(port: i64, log_level: FfiStr)
 typedef _DebugC = Void Function(Int64, Pointer<Utf8>);
 typedef _DebugDart = void Function(int, Pointer<Utf8>);
@@ -246,9 +246,9 @@ class VeilidFFI implements Veilid {
  // Shared library functions
  final _FreeStringDart _freeString;
  final _ConfigureVeilidPlatformDart _configureVeilidPlatform;
+  final _ChangeLogLevelDart _changeLogLevel;
  final _StartupVeilidCoreDart _startupVeilidCore;
  final _GetVeilidStateDart _getVeilidState;
-  final _ChangeApiLogLevelDart _changeApiLogLevel;
  final _ShutdownVeilidCoreDart _shutdownVeilidCore;
  final _DebugDart _debug;
  final _VeilidVersionStringDart _veilidVersionString;
@@ -261,15 +261,15 @@ class VeilidFFI implements Veilid {
        _configureVeilidPlatform = dylib.lookupFunction<
            _ConfigureVeilidPlatformC,
            _ConfigureVeilidPlatformDart>('configure_veilid_platform'),
+        _changeLogLevel =
+            dylib.lookupFunction<_ChangeLogLevelC, _ChangeLogLevelDart>(
+                'change_log_level'),
        _startupVeilidCore =
            dylib.lookupFunction<_StartupVeilidCoreC, _StartupVeilidCoreDart>(
                'startup_veilid_core'),
        _getVeilidState =
            dylib.lookupFunction<_GetVeilidStateC, _GetVeilidStateDart>(
                'get_veilid_state'),
-        _changeApiLogLevel =
-            dylib.lookupFunction<_ChangeApiLogLevelC, _ChangeApiLogLevelDart>(
-                'change_api_log_level'),
        _shutdownVeilidCore =
            dylib.lookupFunction<_ShutdownVeilidCoreC, _ShutdownVeilidCoreDart>(
                'shutdown_veilid_core'),
@@ -297,6 +297,17 @@ class VeilidFFI implements Veilid {
    malloc.free(nativePlatformConfig);
  }

+  @override
+  void changeLogLevel(String layer, VeilidConfigLogLevel logLevel) {
+    var nativeLogLevel =
+        jsonEncode(logLevel.json, toEncodable: veilidApiToEncodable)
+            .toNativeUtf8();
+    var nativeLayer = layer.toNativeUtf8();
+    _changeLogLevel(nativeLayer, nativeLogLevel);
+    malloc.free(nativeLayer);
+    malloc.free(nativeLogLevel);
+  }
+
  @override
  Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config) {
    var nativeConfig =
@@ -317,18 +328,6 @@ class VeilidFFI implements Veilid {
    return processFutureJson(VeilidState.fromJson, recvPort.first);
  }

-  @override
-  Future<void> changeApiLogLevel(VeilidConfigLogLevel logLevel) async {
-    var nativeLogLevel =
-        jsonEncode(logLevel.json, toEncodable: veilidApiToEncodable)
-            .toNativeUtf8();
-    final recvPort = ReceivePort("change_api_log_level");
-    final sendPort = recvPort.sendPort;
-    _changeApiLogLevel(sendPort.nativePort, nativeLogLevel);
-    malloc.free(nativeLogLevel);
-    return processFutureVoid(recvPort.first);
-  }
-
  @override
  Future<void> shutdownVeilidCore() async {
    final recvPort = ReceivePort("shutdown_veilid_core");
--- a/veilid-flutter/lib/veilid_js.dart
+++ b/veilid-flutter/lib/veilid_js.dart
@@ -27,6 +27,13 @@ class VeilidJS implements Veilid {
        wasm, "configure_veilid_platform", [platformConfigJsonString]);
  }

+  @override
+  void changeLogLevel(String layer, VeilidConfigLogLevel logLevel) {
+    var logLevelJsonString =
+        jsonEncode(logLevel.json, toEncodable: veilidApiToEncodable);
+    js_util.callMethod(wasm, "change_log_level", [layer, logLevelJsonString]);
+  }
+
  @override
  Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config) async* {
    var streamController = StreamController<VeilidUpdate>();
@@ -53,12 +60,6 @@ class VeilidJS implements Veilid {
        js_util.callMethod(wasm, "get_veilid_state", []))));
  }

-  @override
-  Future<void> changeApiLogLevel(VeilidConfigLogLevel logLevel) {
-    return _wrapApiPromise(js_util.callMethod(wasm, "change_api_log_level",
-        [jsonEncode(logLevel.json, toEncodable: veilidApiToEncodable)]));
-  }
-
  @override
  Future<void> shutdownVeilidCore() {
    return _wrapApiPromise(