flutter work

veilid-flutter/lib/veilid.dart

@@ -8,8 +8,162 @@ import 'veilid_stub.dart'
 
 //////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////////////////
+// FFI Platform-specific config
+
+class VeilidFFIConfigLoggingTerminal {
+  bool enabled;
+  VeilidLogLevel level;
+
+  VeilidFFIConfigLoggingTerminal({
+    required this.enabled,
+    required this.level,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'enabled': enabled,
+      'level': level.json,
+    };
+  }
+
+  VeilidFFIConfigLoggingTerminal.fromJson(Map<String, dynamic> json)
+      : enabled = json['enabled'],
+        level = veilidLogLevelFromJson(json['level']);
+}
+
+class VeilidFFIConfigLoggingOtlp {
+  bool enabled;
+  VeilidLogLevel level;
+  String grpcEndpoint;
+  String serviceName;
+
+  VeilidFFIConfigLoggingOtlp({
+    required this.enabled,
+    required this.level,
+    required this.grpcEndpoint,
+    required this.serviceName,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'enabled': enabled,
+      'level': level.json,
+      'grpc_endpoint': grpcEndpoint,
+      'service_name': serviceName,
+    };
+  }
+
+  VeilidFFIConfigLoggingOtlp.fromJson(Map<String, dynamic> json)
+      : enabled = json['enabled'],
+        level = veilidLogLevelFromJson(json['level']),
+        grpcEndpoint = json['grpc_endpoint'],
+        serviceName = json['service_name'];
+}
+
+class VeilidFFIConfigLogging {
+  VeilidFFIConfigLoggingTerminal terminal;
+  VeilidFFIConfigLoggingOtlp otlp;
+
+  VeilidFFIConfigLogging({required this.terminal, required this.otlp});
+
+  Map<String, dynamic> get json {
+    return {
+      'terminal': terminal.json,
+      'otlp': otlp.json,
+    };
+  }
+
+  VeilidFFIConfigLogging.fromJson(Map<String, dynamic> json)
+      : terminal = VeilidFFIConfigLoggingTerminal.fromJson(json['terminal']),
+        otlp = VeilidFFIConfigLoggingOtlp.fromJson(json['otlp']);
+}
+
+class VeilidFFIConfig {
+  VeilidFFIConfigLogging logging;
+
+  VeilidFFIConfig({
+    required this.logging,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'logging': logging.json,
+    };
+  }
+
+  VeilidFFIConfig.fromJson(Map<String, dynamic> json)
+      : logging = VeilidFFIConfigLogging.fromJson(json['logging']);
+}
+
+//////////////////////////////////////////////////////////
+// WASM Platform-specific config
+
+class VeilidWASMConfigLoggingPerformance {
+  bool enabled;
+  VeilidLogLevel level;
+  bool logsInTimings;
+  bool logsInConsole;
+
+  VeilidWASMConfigLoggingPerformance({
+    required this.enabled,
+    required this.level,
+    required this.logsInTimings,
+    required this.logsInConsole,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'enabled': enabled,
+      'level': level.json,
+      'logs_in_timings': logsInTimings,
+      'logs_in_console': logsInConsole,
+    };
+  }
+
+  VeilidWASMConfigLoggingPerformance.fromJson(Map<String, dynamic> json)
+      : enabled = json['enabled'],
+        level = veilidLogLevelFromJson(json['level']),
+        logsInTimings = json['logs_in_timings'],
+        logsInConsole = json['logs_in_console'];
+}
+
+class VeilidWASMConfigLogging {
+  VeilidWASMConfigLoggingPerformance performance;
+
+  VeilidWASMConfigLogging({required this.performance});
+
+  Map<String, dynamic> get json {
+    return {
+      'performance': performance.json,
+    };
+  }
+
+  VeilidWASMConfigLogging.fromJson(Map<String, dynamic> json)
+      : performance =
+            VeilidWASMConfigLoggingPerformance.fromJson(json['performance']);
+}
+
+class VeilidWASMConfig {
+  VeilidWASMConfigLogging logging;
+
+  VeilidWASMConfig({
+    required this.logging,
+  });
+
+  Map<String, dynamic> get json {
+    return {
+      'logging': logging.json,
+    };
+  }
+
+  VeilidWASMConfig.fromJson(Map<String, dynamic> json)
+      : logging = VeilidWASMConfigLogging.fromJson(json['logging']);
+}
+
 //////////////////////////////////////
 /// JSON Encode Helper
+
 Object? veilidApiToEncodable(Object? value) {
   if (value == null) {
     return value;
@@ -797,7 +951,7 @@ abstract class VeilidUpdate {
       case "Log":
         {
           return VeilidUpdateLog(
-              veilidLogLevelFromJson(json["api_log_level"]), json["message"]);
+              veilidLogLevelFromJson(json["log_level"]), json["message"]);
         }
       case "Attachment":
         {
@@ -1098,6 +1252,7 @@ class VeilidVersion {
 abstract class Veilid {
   static late Veilid instance = getVeilid();
 
+  void configureVeilidPlatform(Map<String, dynamic> platformConfigJson);
   Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config);
   Future<VeilidState> getVeilidState();
   Future<void> changeApiLogLevel(VeilidConfigLogLevel logLevel);

veilid-flutter/lib/veilid_ffi.dart

@@ -29,6 +29,9 @@ typedef _FreeStringDart = void Function(Pointer<Utf8>);
 // fn initialize_veilid_flutter(dart_post_c_object_ptr: ffi::DartPostCObjectFnType)
 typedef _InitializeVeilidFlutterC = Void Function(Pointer<_DartPostCObject>);
 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 startup_veilid_core(port: i64, config: FfiStr)
 typedef _StartupVeilidCoreC = Void Function(Int64, Pointer<Utf8>);
 typedef _StartupVeilidCoreDart = void Function(int, Pointer<Utf8>);
@@ -228,9 +231,10 @@ Stream<T> processStreamJson<T>(
           }
       }
     }
-  } catch (e) {
+  } catch (e, s) {
     // Wrap all other errors in VeilidAPIExceptionInternal
-    throw VeilidAPIExceptionInternal(e.toString());
+    throw VeilidAPIExceptionInternal(
+        "${e.toString()}\nStack Trace:\n${s.toString()}");
   }
 }
 
@@ -241,6 +245,7 @@ class VeilidFFI implements Veilid {
 
   // Shared library functions
   final _FreeStringDart _freeString;
+  final _ConfigureVeilidPlatformDart _configureVeilidPlatform;
   final _StartupVeilidCoreDart _startupVeilidCore;
   final _GetVeilidStateDart _getVeilidState;
   final _ChangeApiLogLevelDart _changeApiLogLevel;
@@ -253,6 +258,9 @@ class VeilidFFI implements Veilid {
       : _dylib = dylib,
         _freeString =
             dylib.lookupFunction<_FreeStringC, _FreeStringDart>('free_string'),
+        _configureVeilidPlatform = dylib.lookupFunction<
+            _ConfigureVeilidPlatformC,
+            _ConfigureVeilidPlatformDart>('configure_veilid_platform'),
         _startupVeilidCore =
             dylib.lookupFunction<_StartupVeilidCoreC, _StartupVeilidCoreDart>(
                 'startup_veilid_core'),
@@ -278,6 +286,17 @@ class VeilidFFI implements Veilid {
     initializeVeilidFlutter(NativeApi.postCObject);
   }
 
+  @override
+  void configureVeilidPlatform(Map<String, dynamic> platformConfigJson) {
+    var nativePlatformConfig =
+        jsonEncode(platformConfigJson, toEncodable: veilidApiToEncodable)
+            .toNativeUtf8();
+
+    _configureVeilidPlatform(nativePlatformConfig);
+
+    malloc.free(nativePlatformConfig);
+  }
+
   @override
   Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config) {
     var nativeConfig =

veilid-flutter/lib/veilid_js.dart

@@ -19,6 +19,14 @@ Future<T> _wrapApiPromise<T>(Object p) {
 }
 
 class VeilidJS implements Veilid {
+  @override
+  void configureVeilidPlatform(Map<String, dynamic> platformConfigJson) {
+    var platformConfigJsonString =
+        jsonEncode(platformConfigJson, toEncodable: veilidApiToEncodable);
+    js_util.callMethod(
+        wasm, "configure_veilid_platform", [platformConfigJsonString]);
+  }
+
   @override
   Stream<VeilidUpdate> startupVeilidCore(VeilidConfig config) async* {
     var streamController = StreamController<VeilidUpdate>();