split EventBus into DaemonBus + MessageBus
DaemonBus (was EventBus): typed events for system/IPC layer. MessageBus: channel-based pub/sub for UI/extension coordination. Messages carry publisher (auto-stamped from extension ID), channel (required), timestamp, and payload. Subscribe by publisher, channel, or both — zero collision across extensions. Extension context gains publish() and subscribe() convenience methods that auto-stamp the extension's ID as publisher. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
library;
|
||||
|
||||
export 'src/events/bus.dart';
|
||||
export 'src/events/message_bus.dart';
|
||||
export 'src/events/types.dart';
|
||||
export 'src/ipc/client.dart';
|
||||
export 'src/log.dart';
|
||||
|
||||
@@ -2,8 +2,8 @@ import 'dart:async';
|
||||
|
||||
import 'package:clide/kernel/src/events/types.dart';
|
||||
|
||||
class EventBus {
|
||||
EventBus();
|
||||
class DaemonBus {
|
||||
DaemonBus();
|
||||
|
||||
final StreamController<ClideEventEnvelope> _controller =
|
||||
StreamController<ClideEventEnvelope>.broadcast();
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
import 'dart:async';
|
||||
|
||||
class Message {
|
||||
Message({
|
||||
required this.publisher,
|
||||
required this.channel,
|
||||
required this.data,
|
||||
}) : timestamp = DateTime.now();
|
||||
|
||||
final String publisher;
|
||||
final String channel;
|
||||
final DateTime timestamp;
|
||||
final Map<String, Object?> data;
|
||||
|
||||
String get address => '$publisher/$channel';
|
||||
}
|
||||
|
||||
class MessageBus {
|
||||
final _controller = StreamController<Message>.broadcast();
|
||||
|
||||
void publish(String publisher, String channel, Map<String, Object?> data) {
|
||||
_controller.add(Message(publisher: publisher, channel: channel, data: data));
|
||||
}
|
||||
|
||||
Stream<Message> subscribe({String? publisher, String? channel}) {
|
||||
return _controller.stream.where((m) {
|
||||
if (publisher != null && m.publisher != publisher) return false;
|
||||
if (channel != null && m.channel != channel) return false;
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
void dispose() {
|
||||
_controller.close();
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import 'package:clide/kernel/src/commands/palette.dart';
|
||||
import 'package:clide/kernel/src/commands/registry.dart';
|
||||
import 'package:clide/kernel/src/dialog.dart';
|
||||
import 'package:clide/kernel/src/events/bus.dart';
|
||||
import 'package:clide/kernel/src/events/message_bus.dart';
|
||||
import 'package:clide/kernel/src/events/types.dart';
|
||||
import 'package:clide/kernel/src/files.dart';
|
||||
import 'package:clide/kernel/src/focus.dart';
|
||||
@@ -30,6 +31,7 @@ class ExtensionManager extends ChangeNotifier {
|
||||
ExtensionManager({
|
||||
required this.log,
|
||||
required this.events,
|
||||
required this.messages,
|
||||
required this.settings,
|
||||
required this.theme,
|
||||
required this.i18n,
|
||||
@@ -52,7 +54,8 @@ class ExtensionManager extends ChangeNotifier {
|
||||
});
|
||||
|
||||
final Logger log;
|
||||
final EventBus events;
|
||||
final DaemonBus events;
|
||||
final MessageBus messages;
|
||||
final SettingsStore settings;
|
||||
final ThemeController theme;
|
||||
final I18n i18n;
|
||||
@@ -239,7 +242,9 @@ class _ExtensionContext implements ClideExtensionContext {
|
||||
@override
|
||||
Logger get log => manager.log;
|
||||
@override
|
||||
EventBus get events => manager.events;
|
||||
DaemonBus get events => manager.events;
|
||||
@override
|
||||
MessageBus get messages => manager.messages;
|
||||
@override
|
||||
SettingsStore get settings => manager.settings;
|
||||
@override
|
||||
|
||||
@@ -8,6 +8,7 @@ import 'package:clide/kernel/src/commands/palette.dart';
|
||||
import 'package:clide/kernel/src/commands/registry.dart';
|
||||
import 'package:clide/kernel/src/dialog.dart';
|
||||
import 'package:clide/kernel/src/events/bus.dart';
|
||||
import 'package:clide/kernel/src/events/message_bus.dart';
|
||||
import 'package:clide/kernel/src/extensions_manager.dart';
|
||||
import 'package:clide/kernel/src/files.dart';
|
||||
import 'package:clide/kernel/src/focus.dart';
|
||||
@@ -38,6 +39,7 @@ class KernelServices {
|
||||
required this.log,
|
||||
required this.settings,
|
||||
required this.events,
|
||||
required this.messages,
|
||||
required this.ipc,
|
||||
required this.theme,
|
||||
required this.i18n,
|
||||
@@ -63,7 +65,8 @@ class KernelServices {
|
||||
|
||||
final Logger log;
|
||||
final SettingsStore settings;
|
||||
final EventBus events;
|
||||
final DaemonBus events;
|
||||
final MessageBus messages;
|
||||
final DaemonClient ipc;
|
||||
final ThemeController theme;
|
||||
final I18n i18n;
|
||||
@@ -95,11 +98,12 @@ class KernelServices {
|
||||
Locale? initialLocale,
|
||||
List<Locale> availableLocales = const [Locale('en', 'US')],
|
||||
String? socketPath,
|
||||
DaemonClient Function(Logger, EventBus)? daemonClientFactory,
|
||||
DaemonClient Function(Logger, DaemonBus)? daemonClientFactory,
|
||||
bool autoStartDaemonClient = true,
|
||||
}) async {
|
||||
final log = Logger();
|
||||
final events = EventBus();
|
||||
final events = DaemonBus();
|
||||
final messages = MessageBus();
|
||||
|
||||
final settings = SettingsStore(appDir: appDir);
|
||||
await settings.load();
|
||||
@@ -147,6 +151,7 @@ class KernelServices {
|
||||
final extensions = ExtensionManager(
|
||||
log: log,
|
||||
events: events,
|
||||
messages: messages,
|
||||
settings: settings,
|
||||
theme: theme,
|
||||
i18n: i18n,
|
||||
@@ -176,6 +181,7 @@ class KernelServices {
|
||||
log: log,
|
||||
settings: settings,
|
||||
events: events,
|
||||
messages: messages,
|
||||
ipc: ipc,
|
||||
theme: theme,
|
||||
i18n: i18n,
|
||||
@@ -218,6 +224,7 @@ class KernelServices {
|
||||
project.dispose();
|
||||
extensions.dispose();
|
||||
await log.dispose();
|
||||
messages.dispose();
|
||||
await events.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ class FilesDropped extends ClideEvent {
|
||||
/// the service surface real.
|
||||
class FileServices {
|
||||
FileServices(this._events);
|
||||
final EventBus _events;
|
||||
final DaemonBus _events;
|
||||
|
||||
Future<List<String>> pickOpen({
|
||||
List<String> extensions = const [],
|
||||
|
||||
@@ -13,13 +13,13 @@ class DaemonClient extends ChangeNotifier {
|
||||
DaemonClient({
|
||||
required this.socketPath,
|
||||
required Logger log,
|
||||
required EventBus events,
|
||||
required DaemonBus events,
|
||||
}) : _log = log,
|
||||
_events = events;
|
||||
|
||||
final String socketPath;
|
||||
final Logger _log;
|
||||
final EventBus _events;
|
||||
final DaemonBus _events;
|
||||
|
||||
Socket? _socket;
|
||||
bool _connected = false;
|
||||
|
||||
@@ -7,7 +7,7 @@ import 'package:clide/src/daemon/dispatcher.dart';
|
||||
class InProcessClient extends DaemonClient {
|
||||
InProcessClient({
|
||||
required Logger log,
|
||||
required EventBus events,
|
||||
required DaemonBus events,
|
||||
required this.dispatcher,
|
||||
}) : super(socketPath: '', log: log, events: events);
|
||||
|
||||
|
||||
@@ -16,12 +16,12 @@ class OsLifecycleEvent extends ClideEvent {
|
||||
}
|
||||
|
||||
class OsBridge {
|
||||
OsBridge({required Logger log, required EventBus events})
|
||||
OsBridge({required Logger log, required DaemonBus events})
|
||||
: _log = log,
|
||||
_events = events;
|
||||
|
||||
final Logger _log;
|
||||
final EventBus _events;
|
||||
final DaemonBus _events;
|
||||
|
||||
Future<bool> openURL(String url) async {
|
||||
final cmd = _openCommand();
|
||||
|
||||
@@ -45,14 +45,14 @@ class RecentProject {
|
||||
class ProjectManager extends ChangeNotifier {
|
||||
ProjectManager({
|
||||
required Logger log,
|
||||
required EventBus events,
|
||||
required DaemonBus events,
|
||||
required SettingsStore settings,
|
||||
}) : _log = log,
|
||||
_events = events,
|
||||
_settings = settings;
|
||||
|
||||
final Logger _log;
|
||||
final EventBus _events;
|
||||
final DaemonBus _events;
|
||||
final SettingsStore _settings;
|
||||
|
||||
Directory? _current;
|
||||
|
||||
Reference in New Issue
Block a user