Add option for server to send link information

Author: CodeDoctorDE

api/lib/src/event/event.dart

@@ -18,11 +18,13 @@ const kBroadcastPort = 28007;
 
 @MappableClass(discriminatorKey: 'type')
 sealed class WorldEvent with WorldEventMappable {
-  WorldEvent();
+  const WorldEvent();
 }
 
 /// Events that can be processed by the event management system
 /// This can be a ServerWorldEvent or a LocalWorldEvent
 @MappableClass(discriminatorKey: 'type')
 sealed class PlayableWorldEvent extends WorldEvent
-    with PlayableWorldEventMappable {}
+    with PlayableWorldEventMappable {
+  const PlayableWorldEvent();
+}

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

@@ -134,6 +134,7 @@ class ServerWorldEventMapper extends SubClassMapperBase<ServerWorldEvent> {
       DialogOpenedMapper.ensureInitialized();
       DialogsClosedMapper.ensureInitialized();
       ImagesUpdatedMapper.ensureInitialized();
+      ServerStateUpdatedMapper.ensureInitialized();
       HybridWorldEventMapper.ensureInitialized();
     }
     return _instance!;
@@ -1650,6 +1651,129 @@ class _ImagesUpdatedCopyWithImpl<$R, $Out>
       _ImagesUpdatedCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
 
+class ServerStateUpdatedMapper extends SubClassMapperBase<ServerStateUpdated> {
+  ServerStateUpdatedMapper._();
+
+  static ServerStateUpdatedMapper? _instance;
+  static ServerStateUpdatedMapper ensureInitialized() {
+    if (_instance == null) {
+      MapperContainer.globals.use(_instance = ServerStateUpdatedMapper._());
+      ServerWorldEventMapper.ensureInitialized().addSubMapper(_instance!);
+      ServerStateMapper.ensureInitialized();
+    }
+    return _instance!;
+  }
+
+  @override
+  final String id = 'ServerStateUpdated';
+
+  static ServerState _$state(ServerStateUpdated v) => v.state;
+  static const Field<ServerStateUpdated, ServerState> _f$state =
+      Field('state', _$state);
+
+  @override
+  final MappableFields<ServerStateUpdated> fields = const {
+    #state: _f$state,
+  };
+
+  @override
+  final String discriminatorKey = 'type';
+  @override
+  final dynamic discriminatorValue = 'ServerStateUpdated';
+  @override
+  late final ClassMapperBase superMapper =
+      ServerWorldEventMapper.ensureInitialized();
+
+  static ServerStateUpdated _instantiate(DecodingData data) {
+    return ServerStateUpdated(data.dec(_f$state));
+  }
+
+  @override
+  final Function instantiate = _instantiate;
+
+  static ServerStateUpdated fromMap(Map<String, dynamic> map) {
+    return ensureInitialized().decodeMap<ServerStateUpdated>(map);
+  }
+
+  static ServerStateUpdated fromJson(String json) {
+    return ensureInitialized().decodeJson<ServerStateUpdated>(json);
+  }
+}
+
+mixin ServerStateUpdatedMappable {
+  String toJson() {
+    return ServerStateUpdatedMapper.ensureInitialized()
+        .encodeJson<ServerStateUpdated>(this as ServerStateUpdated);
+  }
+
+  Map<String, dynamic> toMap() {
+    return ServerStateUpdatedMapper.ensureInitialized()
+        .encodeMap<ServerStateUpdated>(this as ServerStateUpdated);
+  }
+
+  ServerStateUpdatedCopyWith<ServerStateUpdated, ServerStateUpdated,
+          ServerStateUpdated>
+      get copyWith => _ServerStateUpdatedCopyWithImpl(
+          this as ServerStateUpdated, $identity, $identity);
+  @override
+  String toString() {
+    return ServerStateUpdatedMapper.ensureInitialized()
+        .stringifyValue(this as ServerStateUpdated);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return ServerStateUpdatedMapper.ensureInitialized()
+        .equalsValue(this as ServerStateUpdated, other);
+  }
+
+  @override
+  int get hashCode {
+    return ServerStateUpdatedMapper.ensureInitialized()
+        .hashValue(this as ServerStateUpdated);
+  }
+}
+
+extension ServerStateUpdatedValueCopy<$R, $Out>
+    on ObjectCopyWith<$R, ServerStateUpdated, $Out> {
+  ServerStateUpdatedCopyWith<$R, ServerStateUpdated, $Out>
+      get $asServerStateUpdated =>
+          $base.as((v, t, t2) => _ServerStateUpdatedCopyWithImpl(v, t, t2));
+}
+
+abstract class ServerStateUpdatedCopyWith<$R, $In extends ServerStateUpdated,
+    $Out> implements ServerWorldEventCopyWith<$R, $In, $Out> {
+  ServerStateCopyWith<$R, ServerState, ServerState> get state;
+  @override
+  $R call({ServerState? state});
+  ServerStateUpdatedCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+      Then<$Out2, $R2> t);
+}
+
+class _ServerStateUpdatedCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ServerStateUpdated, $Out>
+    implements ServerStateUpdatedCopyWith<$R, ServerStateUpdated, $Out> {
+  _ServerStateUpdatedCopyWithImpl(super.value, super.then, super.then2);
+
+  @override
+  late final ClassMapperBase<ServerStateUpdated> $mapper =
+      ServerStateUpdatedMapper.ensureInitialized();
+  @override
+  ServerStateCopyWith<$R, ServerState, ServerState> get state =>
+      $value.state.copyWith.$chain((v) => call(state: v));
+  @override
+  $R call({ServerState? state}) =>
+      $apply(FieldCopyWithData({if (state != null) #state: state}));
+  @override
+  ServerStateUpdated $make(CopyWithData data) =>
+      ServerStateUpdated(data.get(#state, or: $value.state));
+
+  @override
+  ServerStateUpdatedCopyWith<$R2, ServerStateUpdated, $Out2> $chain<$R2, $Out2>(
+          Then<$Out2, $R2> t) =>
+      _ServerStateUpdatedCopyWithImpl($value, $cast, t);
+}
+
 class ClientWorldEventMapper extends SubClassMapperBase<ClientWorldEvent> {
   ClientWorldEventMapper._();
 

api/lib/src/event/process/server.dart

@@ -326,5 +326,9 @@ ServerProcessed processServerEvent(
           ...event.images,
         },
       ));
+    case ServerStateUpdated():
+      return ServerProcessed(state.copyWith(
+        serverState: event.state,
+      ));
   }
 }

api/lib/src/event/server.dart

@@ -4,7 +4,9 @@ part of 'event.dart';
 /// Naming convention: present tense + Event
 @MappableClass(discriminatorKey: 'type')
 sealed class ServerWorldEvent extends PlayableWorldEvent
-    with ServerWorldEventMappable {}
+    with ServerWorldEventMappable {
+  const ServerWorldEvent();
+}
 
 @MappableClass()
 final class WorldInitialized extends ServerWorldEvent
@@ -211,6 +213,14 @@ class Base64IdMapHook extends SimpleMapper<Map<String, Uint8List>> {
 final class ImagesUpdated extends ServerWorldEvent with ImagesUpdatedMappable {
   final Map<String, Uint8List> images;
 
-  ImagesUpdated(this.images);
+  const ImagesUpdated(this.images);
   ImagesUpdated.single(String id, Uint8List image) : images = {id: image};
 }
+
+@MappableClass()
+final class ServerStateUpdated extends ServerWorldEvent
+    with ServerStateUpdatedMappable {
+  final ServerState state;
+
+  const ServerStateUpdated(this.state);
+}

api/lib/src/event/state.dart

@@ -8,6 +8,7 @@ import '../models/data.dart';
 import '../models/dialog.dart';
 import '../models/info.dart';
 import '../models/meta.dart';
+import '../models/server.dart';
 import '../models/table.dart';
 import '../models/vector.dart';
 
@@ -32,6 +33,7 @@ final class WorldState with WorldStateMappable {
   final List<ChatMessage> messages;
   final List<GameDialog> dialogs;
   final Map<String, Uint8List> images;
+  final ServerState serverState;
 
   const WorldState({
     this.name,
@@ -44,6 +46,7 @@ final class WorldState with WorldStateMappable {
     this.id = kAuthorityChannel,
     this.dialogs = const [],
     this.images = const {},
+    this.serverState = const ServerState(),
     required this.data,
   });
 

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

@@ -64,6 +64,7 @@ class WorldStateMapper extends ClassMapperBase<WorldState> {
       FileMetadataMapper.ensureInitialized();
       ChatMessageMapper.ensureInitialized();
       GameDialogMapper.ensureInitialized();
+      ServerStateMapper.ensureInitialized();
     }
     return _instance!;
   }
@@ -101,6 +102,9 @@ class WorldStateMapper extends ClassMapperBase<WorldState> {
   static Map<String, Uint8List> _$images(WorldState v) => v.images;
   static const Field<WorldState, Map<String, Uint8List>> _f$images =
       Field('images', _$images, opt: true, def: const {});
+  static ServerState _$serverState(WorldState v) => v.serverState;
+  static const Field<WorldState, ServerState> _f$serverState =
+      Field('serverState', _$serverState, opt: true, def: const ServerState());
   static SetonixData _$data(WorldState v) => v.data;
   static const Field<WorldState, SetonixData> _f$data = Field('data', _$data);
 
@@ -116,6 +120,7 @@ class WorldStateMapper extends ClassMapperBase<WorldState> {
     #id: _f$id,
     #dialogs: _f$dialogs,
     #images: _f$images,
+    #serverState: _f$serverState,
     #data: _f$data,
   };
 
@@ -131,6 +136,7 @@ class WorldStateMapper extends ClassMapperBase<WorldState> {
         id: data.dec(_f$id),
         dialogs: data.dec(_f$dialogs),
         images: data.dec(_f$images),
+        serverState: data.dec(_f$serverState),
         data: data.dec(_f$data));
   }
 
@@ -197,6 +203,7 @@ abstract class WorldStateCopyWith<$R, $In extends WorldState, $Out>
       get dialogs;
   MapCopyWith<$R, String, Uint8List, ObjectCopyWith<$R, Uint8List, Uint8List>>
       get images;
+  ServerStateCopyWith<$R, ServerState, ServerState> get serverState;
   $R call(
       {String? name,
       GameTable? table,
@@ -208,6 +215,7 @@ abstract class WorldStateCopyWith<$R, $In extends WorldState, $Out>
       int? id,
       List<GameDialog>? dialogs,
       Map<String, Uint8List>? images,
+      ServerState? serverState,
       SetonixData? data});
   WorldStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
@@ -249,6 +257,9 @@ class _WorldStateCopyWithImpl<$R, $Out>
       get images => MapCopyWith($value.images,
           (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(images: v));
   @override
+  ServerStateCopyWith<$R, ServerState, ServerState> get serverState =>
+      $value.serverState.copyWith.$chain((v) => call(serverState: v));
+  @override
   $R call(
           {Object? name = $none,
           GameTable? table,
@@ -260,6 +271,7 @@ class _WorldStateCopyWithImpl<$R, $Out>
           int? id,
           List<GameDialog>? dialogs,
           Map<String, Uint8List>? images,
+          ServerState? serverState,
           SetonixData? data}) =>
       $apply(FieldCopyWithData({
         if (name != $none) #name: name,
@@ -272,6 +284,7 @@ class _WorldStateCopyWithImpl<$R, $Out>
         if (id != null) #id: id,
         if (dialogs != null) #dialogs: dialogs,
         if (images != null) #images: images,
+        if (serverState != null) #serverState: serverState,
         if (data != null) #data: data
       }));
   @override
@@ -286,6 +299,7 @@ class _WorldStateCopyWithImpl<$R, $Out>
       id: data.get(#id, or: $value.id),
       dialogs: data.get(#dialogs, or: $value.dialogs),
       images: data.get(#images, or: $value.images),
+      serverState: data.get(#serverState, or: $value.serverState),
       data: data.get(#data, or: $value.data));
 
   @override

api/lib/src/models/server.dart

@@ -1,4 +1,5 @@
 import 'package:dart_mappable/dart_mappable.dart';
+import 'package:networker/networker.dart';
 
 import '../event/event.dart';
 import 'meta.dart';
@@ -98,3 +99,22 @@ class ListProperty extends GameProperty with ListPropertyMappable {
     super.packsSignature,
   });
 }
+
+@MappableClass()
+final class PlayerInfo with PlayerInfoMappable {
+  final Channel id;
+  final String? name;
+
+  const PlayerInfo({
+    required this.id,
+    this.name,
+  });
+}
+
+@MappableClass()
+final class ServerState with ServerStateMappable {
+  final String? link;
+  final List<PlayerInfo> players;
+
+  const ServerState({this.link, this.players = const []});
+}