Add multi world plugin and event system

Author: CodeDoctorDE

api/lib/src/event/event.mapper.dart

@@ -1713,8 +1713,8 @@ mixin ServerStateUpdatedMappable {
 
   ServerStateUpdatedCopyWith<ServerStateUpdated, ServerStateUpdated,
           ServerStateUpdated>
-      get copyWith => _ServerStateUpdatedCopyWithImpl(
-          this as ServerStateUpdated, $identity, $identity);
+      get copyWith => _ServerStateUpdatedCopyWithImpl<ServerStateUpdated,
+          ServerStateUpdated>(this as ServerStateUpdated, $identity, $identity);
   @override
   String toString() {
     return ServerStateUpdatedMapper.ensureInitialized()
@@ -1737,8 +1737,8 @@ mixin ServerStateUpdatedMappable {
 extension ServerStateUpdatedValueCopy<$R, $Out>
     on ObjectCopyWith<$R, ServerStateUpdated, $Out> {
   ServerStateUpdatedCopyWith<$R, ServerStateUpdated, $Out>
-      get $asServerStateUpdated =>
-          $base.as((v, t, t2) => _ServerStateUpdatedCopyWithImpl(v, t, t2));
+      get $asServerStateUpdated => $base.as(
+          (v, t, t2) => _ServerStateUpdatedCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
 abstract class ServerStateUpdatedCopyWith<$R, $In extends ServerStateUpdated,
@@ -1771,7 +1771,7 @@ class _ServerStateUpdatedCopyWithImpl<$R, $Out>
   @override
   ServerStateUpdatedCopyWith<$R2, ServerStateUpdated, $Out2> $chain<$R2, $Out2>(
           Then<$Out2, $R2> t) =>
-      _ServerStateUpdatedCopyWithImpl($value, $cast, t);
+      _ServerStateUpdatedCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
 
 class ClientWorldEventMapper extends SubClassMapperBase<ClientWorldEvent> {

api/lib/src/models/server.mapper.dart

@@ -822,7 +822,8 @@ mixin PlayerInfoMappable {
   }
 
   PlayerInfoCopyWith<PlayerInfo, PlayerInfo, PlayerInfo> get copyWith =>
-      _PlayerInfoCopyWithImpl(this as PlayerInfo, $identity, $identity);
+      _PlayerInfoCopyWithImpl<PlayerInfo, PlayerInfo>(
+          this as PlayerInfo, $identity, $identity);
   @override
   String toString() {
     return PlayerInfoMapper.ensureInitialized()
@@ -844,7 +845,7 @@ mixin PlayerInfoMappable {
 extension PlayerInfoValueCopy<$R, $Out>
     on ObjectCopyWith<$R, PlayerInfo, $Out> {
   PlayerInfoCopyWith<$R, PlayerInfo, $Out> get $asPlayerInfo =>
-      $base.as((v, t, t2) => _PlayerInfoCopyWithImpl(v, t, t2));
+      $base.as((v, t, t2) => _PlayerInfoCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
 abstract class PlayerInfoCopyWith<$R, $In extends PlayerInfo, $Out>
@@ -871,7 +872,7 @@ class _PlayerInfoCopyWithImpl<$R, $Out>
   @override
   PlayerInfoCopyWith<$R2, PlayerInfo, $Out2> $chain<$R2, $Out2>(
           Then<$Out2, $R2> t) =>
-      _PlayerInfoCopyWithImpl($value, $cast, t);
+      _PlayerInfoCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
 
 class ServerStateMapper extends ClassMapperBase<ServerState> {
@@ -930,7 +931,8 @@ mixin ServerStateMappable {
   }
 
   ServerStateCopyWith<ServerState, ServerState, ServerState> get copyWith =>
-      _ServerStateCopyWithImpl(this as ServerState, $identity, $identity);
+      _ServerStateCopyWithImpl<ServerState, ServerState>(
+          this as ServerState, $identity, $identity);
   @override
   String toString() {
     return ServerStateMapper.ensureInitialized()
@@ -952,7 +954,7 @@ mixin ServerStateMappable {
 extension ServerStateValueCopy<$R, $Out>
     on ObjectCopyWith<$R, ServerState, $Out> {
   ServerStateCopyWith<$R, ServerState, $Out> get $asServerState =>
-      $base.as((v, t, t2) => _ServerStateCopyWithImpl(v, t, t2));
+      $base.as((v, t, t2) => _ServerStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
 abstract class ServerStateCopyWith<$R, $In extends ServerState, $Out>
@@ -989,5 +991,5 @@ class _ServerStateCopyWithImpl<$R, $Out>
   @override
   ServerStateCopyWith<$R2, ServerState, $Out2> $chain<$R2, $Out2>(
           Then<$Out2, $R2> t) =>
-      _ServerStateCopyWithImpl($value, $cast, t);
+      _ServerStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }

app/lib/bloc/world/bloc.dart

@@ -17,6 +17,29 @@ ServerProcessed _compute(
 
 SetonixData _saveState(WorldState state) => state.save();
 
+class _WorldServerInterfaceImpl implements ServerInterface {
+  final WorldBloc bloc;
+
+  _WorldServerInterfaceImpl(this.bloc);
+
+  @override
+  void process(WorldEvent event, {bool force = false, required String plugin}) {
+    bloc.process(event);
+  }
+
+  @override
+  void sendEvent(PlayableWorldEvent event,
+      {Channel target = kAnyChannel, required String plugin}) {
+    bloc._processEvent(NetworkerPacket(event, target));
+  }
+
+  @override
+  WorldState get state => bloc.state.world;
+
+  @override
+  List<int> get players => bloc.state.multiplayer.clients.toList();
+}
+
 class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
   late final PluginSystem pluginSystem;
   bool _remoteEvent = false;
@@ -41,16 +64,7 @@ class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
             info: data?.getInfo() ?? const GameInfo(),
           ),
         )) {
-    pluginSystem = PluginSystem(
-      onProcess: (p0, p1, [force = false]) {
-        process(p1);
-      },
-      onSendEvent: (packet, worldName) {
-        _processEvent(packet);
-      },
-      playersGetter: () => state.multiplayer.clients.toList(),
-      stateGetter: () => state.world,
-    );
+    pluginSystem = PluginSystem(server: _WorldServerInterfaceImpl(this));
     state.multiplayer
       ..events.listen((event) {
         _remoteEvent = true;

plugin/lib/src/plugin.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ -12,49 +11,41 @@ typedef PluginProcessCallback = void Function(String, WorldEvent, [bool force]);
 typedef PluginSendEventCallback = void Function(
     NetworkerPacket<PlayableWorldEvent> packet, String? worldName);
 
+mixin ServerInterface {
+  void process(WorldEvent event, {bool force = false, required String plugin});
+  void sendEvent(PlayableWorldEvent event,
+      {Channel target = kAnyChannel, required String plugin});
+
+  WorldState get state;
+  List<int> get players;
+}
+
 final class PluginSystem {
-  final Map<
-      String,
-      (
-        SetonixPlugin,
-        StreamSubscription<ProcessMessage>,
-        StreamSubscription<SentEvent>
-      )> _plugins = {};
-  final PluginProcessCallback _onProcess;
-  final PluginSendEventCallback _onSendEvent;
-  final WorldState Function() stateGetter;
-  final List<int> Function() playersGetter;
+  final ServerInterface server;
+  final Map<String, SetonixPlugin> _plugins = {};
 
   PluginSystem({
-    required PluginProcessCallback onProcess,
-    required PluginSendEventCallback onSendEvent,
-    required this.stateGetter,
-    required this.playersGetter,
-  })  : _onProcess = onProcess,
-        _onSendEvent = onSendEvent;
-
-  void registerPlugin(String name, SetonixPlugin plugin) {
-    final processSub = plugin.onProcess
-        .listen((message) => _onProcess(name, message.event, message.force));
-    final sendSub = plugin.onSendEvent
-        .listen((event) => _onSendEvent(event.event, event.worldName));
-    _plugins[name] = (plugin, processSub, sendSub);
+    required this.server,
+  });
+
+  SetonixPlugin registerPlugin(String name,
+      SetonixPlugin Function(PluginServerInterface) pluginBuilder) {
+    final pluginServer = _PluginServerInterfaceImpl(server, name);
+    final plugin = pluginBuilder(pluginServer);
+    return _plugins[name] = plugin;
   }
 
   SetonixPlugin registerLuauPlugin(String name, String code,
       {void Function(String)? onPrint}) {
     if (!_nativeEnabled) throw Exception('Native not enabled');
-    final plugin = RustSetonixPlugin.build(
-        (c) => LuauPlugin(code: code, callback: c), this);
-    registerPlugin(name, plugin);
-    return plugin;
+    return registerPlugin(
+        name,
+        (pluginServer) => RustSetonixPlugin.build(
+            (c) => LuauPlugin(code: code, callback: c), pluginServer));
   }
 
   void unregisterPlugin(String name) {
-    final data = _plugins.remove(name);
-    data?.$1.dispose();
-    data?.$2.cancel();
-    data?.$3.cancel();
+    _plugins.remove(name);
   }
 
   void loadLuaPlugin(AssetManager assetManager, String script,
@@ -76,95 +67,104 @@ final class PluginSystem {
 
   void fire(Event event) {
     for (final plugin in _plugins.values) {
-      plugin.$1.eventSystem.fire(event);
+      plugin.eventSystem.fire(event);
     }
   }
 
   GameProperty runPing(HttpRequest request, GameProperty property) {
     var result = property;
     for (final plugin in _plugins.values) {
-      result = plugin.$1.eventSystem.runPing(request, result);
+      result = plugin.eventSystem.runPing(request, result);
     }
     return result;
   }
 
   void runLeaveCallback(Channel channel, ConnectionInfo info) {
     for (final plugin in _plugins.values) {
-      plugin.$1.eventSystem.runLeaveCallback(channel, info);
+      plugin.eventSystem.runLeaveCallback(channel, info);
     }
   }
 }
 
+abstract class PluginServerInterface {
+  void process(WorldEvent event, {bool force = false});
+  void sendEvent(PlayableWorldEvent event, {Channel target = kAnyChannel});
+  WorldState get state;
+  List<int> get players;
+}
+
+class _PluginServerInterfaceImpl implements PluginServerInterface {
+  final ServerInterface server;
+  final String pluginName;
+
+  _PluginServerInterfaceImpl(this.server, this.pluginName);
+
+  @override
+  void process(WorldEvent event, {bool force = false}) {
+    server.process(event, force: force, plugin: pluginName);
+  }
+
+  @override
+  void sendEvent(PlayableWorldEvent event, {Channel target = kAnyChannel}) {
+    server.sendEvent(event, target: target, plugin: pluginName);
+  }
+
+  @override
+  WorldState get state => server.state;
+
+  @override
+  List<int> get players => server.players;
+}
+
 final class ProcessMessage {
   final WorldEvent event;
   final bool force;
 
   ProcessMessage(this.event, this.force);
 }
 
-final class SentEvent {
-  final NetworkerPacket<PlayableWorldEvent> event;
-  final String? worldName;
-
-  SentEvent(this.event, [this.worldName]);
-}
-
 class SetonixPlugin {
+  final PluginServerInterface server;
   final EventSystem eventSystem = EventSystem();
-  final StreamController<ProcessMessage> _onProcessController =
-      StreamController.broadcast();
-  final StreamController<SentEvent> _onSendEventController =
-      StreamController.broadcast();
 
-  Stream<ProcessMessage> get onProcess => _onProcessController.stream;
-  Stream<SentEvent> get onSendEvent => _onSendEventController.stream;
-
-  void process(WorldEvent event, {bool force = false}) =>
-      _onProcessController.add(ProcessMessage(event, force));
-
-  void sendEvent(PlayableWorldEvent event,
-          {Channel target = kAnyChannel, String? worldName}) =>
-      _onSendEventController
-          .add(SentEvent(NetworkerPacket(event, target), worldName));
+  SetonixPlugin(this.server);
 
   void dispose() {
     eventSystem.dispose();
-    _onProcessController.close();
-    _onSendEventController.close();
   }
 }
 
 final class RustSetonixPlugin extends SetonixPlugin {
   final RustPlugin plugin;
 
-  RustSetonixPlugin._(this.plugin);
+  RustSetonixPlugin._(super.server, this.plugin);
 
   factory RustSetonixPlugin.build(
     RustPlugin Function(PluginCallback) builder,
-    PluginSystem pluginSystem, {
+    PluginServerInterface server, {
     void Function(String)? onPrint,
   }) {
     final callback = PluginCallback.default_();
     final plugin = builder(callback);
-    final instance = RustSetonixPlugin._(plugin);
+    final instance = RustSetonixPlugin._(server, plugin);
     if (onPrint != null) {
       callback.changeOnPrint(onPrint: onPrint);
     }
     callback.changeProcessEvent(processEvent: (eventSerizalized, force) {
       final event = WorldEventMapper.fromJson(eventSerizalized);
-      instance.process(event, force: force ?? false);
+      server.process(event, force: force ?? false);
     });
     callback.changeSendEvent(sendEvent: (eventSerizalized, target) {
       final event = PlayableWorldEventMapper.fromJson(eventSerizalized);
-      instance.sendEvent(event, target: target ?? kAnyChannel);
+      server.sendEvent(event, target: target ?? kAnyChannel);
     });
     callback.changeStateFieldAccess(stateFieldAccess: (field) {
-      final state = pluginSystem.stateGetter();
+      final state = server.state;
       return switch (field) {
         StateFieldAccess.info => state.info.toJson(),
         StateFieldAccess.table => state.table.toJson(),
         StateFieldAccess.tableName => jsonEncode(state.tableName),
-        StateFieldAccess.players => jsonEncode(pluginSystem.playersGetter()),
+        StateFieldAccess.players => jsonEncode(server.players),
         StateFieldAccess.teamMembers => jsonEncode(state.teamMembers),
       };
     });

server/example/dialog.dart

@@ -44,7 +44,7 @@ Future<void> onLoad(SetonixServer server) async {
   print("on load was called");
   final image = await File("../app/images/logo.png").readAsBytes();
   server.process(ImagesUpdated.single('logo', image));
-  server.eventSystem
+  server.defaultEventSystem
     ..on<ObjectsMoved>((e) {
       print("Listener was called, opening dialog");
       server.sendEvent(DialogOpened(

server/example/duplicate.dart

@@ -9,12 +9,12 @@ Future<void> onLoad(SetonixServer server) async {
   // Add your custom code here
   bool toggleCancel = false;
   // Put the event you want to listen to in the brackets
-  server.eventSystem.on<ObjectsMoved>((e) {
+  server.defaultEventSystem.on<ObjectsMoved>((e) {
     print("Listener was called, cancel: $toggleCancel");
     // Cancel the event every second time and duplicate the objects instead
     if (toggleCancel) {
       final event = e.clientEvent;
-      final table = server.state.getTableOrDefault(event.table);
+      final table = server.defaultState.getTableOrDefault(event.table);
       final cell = table.getCell(event.from);
       final objects = <GameObject>[];
       for (final index in event.objects) {

server/example/join.dart

@@ -6,7 +6,7 @@ Future<void> main(List<String> arguments) {
 
 Future<void> onLoad(SetonixServer server) async {
   print("on load was called");
-  server.eventSystem
+  server.defaultEventSystem
     ..on<UserJoined>((e) {
       server.sendEvent(DialogOpened(GameDialog(
         id: "joinDialog",