feat/enhance marshaller data structure

lib/api/common/activity.dart

@@ -23,13 +23,16 @@ final class Activity {
 
   factory Activity.fromJson(Map<String, dynamic> json) {
     return Activity(
-      name: json['name'],
-      type: ActivityType.values[json['type']],
-      url: json['url'],
-      createdAt: DateTime.fromMillisecondsSinceEpoch(json['created_at']),
-      details: json['details'],
-      state: json['state'],
-      emoji: Helper.createOrNull(field: json['emoji'], fn: () => ActivityEmoji(name: json['name'], id: json['id'], animated: json['animated'] ?? false))
-    );
+        name: json['name'],
+        type: ActivityType.values.firstWhere((element) => element.value == json['type'],
+            orElse: () => ActivityType.unknown),
+        url: json['url'],
+        createdAt: DateTime.fromMillisecondsSinceEpoch(json['created_at']),
+        details: json['details'],
+        state: json['state'],
+        emoji: Helper.createOrNull(
+            field: json['emoji'],
+            fn: () => ActivityEmoji(
+                name: json['name'], id: json['id'], animated: json['animated'] ?? false)));
   }
 }

lib/api/common/channel_properties.dart

@@ -76,22 +76,22 @@ final class ChannelProperties {
     required this.defaultForumLayout,
   });
 
-  static Future<ChannelProperties> make(
+  static Future<ChannelProperties> serializeRemote(
       MarshallerContract marshaller, Map<String, dynamic> element) async {
     final permissionOverwrites = await Helper.createOrNullAsync(
         field: element['permission_overwrites'],
         fn: () async => Future.wait(
               List.from(element['permission_overwrites'])
                   .map((json) async =>
-                      marshaller.serializers.channelPermissionOverwrite.serialize(json))
+                      marshaller.serializers.channelPermissionOverwrite.serializeRemote(json))
                   .toList(),
             ));
 
     final recipients = await Helper.createOrNullAsync(
         field: element['recipients'],
         fn: () async => Future.wait(
               List.from(element['recipients'])
-                  .map((json) async => marshaller.serializers.user.serialize(json))
+                  .map((json) async => marshaller.serializers.user.serializeRemote(json))
                   .toList(),
             ));
 
@@ -131,4 +131,60 @@ final class ChannelProperties {
       defaultForumLayout: element['default_forum_layout'],
     );
   }
+
+  static Future<ChannelProperties> serializeCache(
+      MarshallerContract marshaller, Map<String, dynamic> element) async {
+    final permissionOverwrites = await Helper.createOrNullAsync(
+        field: element['permission_overwrites'],
+        fn: () async => Future.wait(
+          List.from(element['permission_overwrites'])
+              .map((json) async =>
+              marshaller.serializers.channelPermissionOverwrite.serializeRemote(json))
+              .toList(),
+        ));
+
+    final recipients = await Helper.createOrNullAsync(
+        field: element['recipients'],
+        fn: () async => Future.wait(
+          List.from(element['recipients'])
+              .map((json) async => marshaller.serializers.user.serializeRemote(json))
+              .toList(),
+        ));
+
+    return ChannelProperties(
+      id: Snowflake(element['id']),
+      type: findInEnum(ChannelType.values, element['type']),
+      name: element['name'],
+      description: element['description'],
+      guildId: Helper.createOrNull(
+          field: element['guild_id'], fn: () => Snowflake(element['guild_id'])),
+      categoryId: Helper.createOrNull(
+          field: element['parent_id'], fn: () => Snowflake(element['parent_id'])),
+      position: element['position'],
+      nsfw: element['nsfw'] ?? false,
+      lastMessageId: Helper.createOrNull(
+          field: element['last_message_id'], fn: () => Snowflake(element['last_message_id'])),
+      bitrate: element['bitrate'],
+      userLimit: element['user_limit'],
+      rateLimitPerUser: element['rate_limit_per_user'],
+      recipients: recipients ?? [],
+      icon: element['icon'],
+      ownerId: element['owner_id'],
+      applicationId: element['application_id'],
+      lastPinTimestamp: element['last_pin_timestamp'],
+      rtcRegion: element['rtc_region'],
+      videoQualityMode: element['video_quality_mode'],
+      messageCount: element['message_count'],
+      memberCount: element['member_count'],
+      defaultAutoArchiveDuration: element['default_auto_archive_duration'],
+      permissions: permissionOverwrites,
+      flags: element['flags'],
+      totalMessageSent: element['total_message_sent'],
+      available: element['available'],
+      appliedTags: element['applied_tags'] ?? [],
+      defaultReactions: element['default_reactions'],
+      defaultSortOrder: element['default_sort_order'],
+      defaultForumLayout: element['default_forum_layout'],
+    );
+  }
 }

lib/api/common/message_properties.dart

@@ -25,7 +25,7 @@ final class MessageProperties<T extends Channel> {
   factory MessageProperties.fromJson(T channel, Map<String, dynamic> json) {
     final embedSerializer = ioc.resolve<MarshallerContract>().serializers.embed;
     final embeds = List.from(json['embeds'])
-        .map((element) => embedSerializer.serialize(element) as MessageEmbed)
+        .map((element) => embedSerializer.serializeRemote(element) as MessageEmbed)
         .toList();
 
     return MessageProperties(

lib/api/common/types/activity_type.dart

@@ -6,8 +6,11 @@ enum ActivityType implements EnhancedEnum<int> {
   listening(2),
   watching(3),
   custom(4),
-  competing(5);
+  competing(5),
+  unknown(-1);
 
+  @override
   final int value;
+
   const ActivityType(this.value);
-}
+}

lib/api/server/channels/server_announcement_channel.dart

@@ -33,12 +33,14 @@ final class ServerAnnouncementChannel extends ServerChannel {
 
   bool get isNsfw => _properties.nsfw;
 
-  ServerCategoryChannel? category;
-
   @override
   Snowflake get guildId => _properties.guildId!;
 
-  ServerAnnouncementChannel(this._properties, {required this.category})
+  Snowflake? get categoryId => _properties.categoryId;
+
+  late final ServerCategoryChannel? category;
+
+  ServerAnnouncementChannel(this._properties)
       : _methods = ChannelMethods(_properties.id);
 
   Future<void> setName(String name, {String? reason}) => _methods.setName(name, reason);

lib/api/server/channels/server_stage_channel.dart

@@ -33,11 +33,13 @@ final class ServerStageChannel extends ServerChannel {
 
   String? get description => _properties.description;
 
-  late final ServerCategoryChannel? category;
-
   @override
   Snowflake get guildId => _properties.guildId!;
 
+  Snowflake? get categoryId => _properties.categoryId;
+
+  late final ServerCategoryChannel? category;
+
   ServerStageChannel(this._properties) : _methods = ChannelMethods(_properties.id);
 
   Future<void> setName(String name, {String? reason}) => _methods.setName(name, reason);

lib/api/server/channels/server_text_channel.dart

@@ -33,11 +33,13 @@ final class ServerTextChannel extends ServerChannel {
 
   String? get description => _properties.description;
 
-  late final ServerCategoryChannel? category;
-
   @override
   Snowflake get guildId => _properties.guildId!;
 
+  Snowflake? get categoryId => _properties.categoryId;
+
+  late final ServerCategoryChannel? category;
+
   ServerTextChannel(this._properties) : _methods = ChannelMethods(_properties.id);
 
   Future<void> setName(String name, {String? reason}) => _methods.setName(name, reason);

lib/api/server/channels/server_voice_channel.dart

@@ -5,6 +5,7 @@ import 'package:mineral/api/common/managers/message_manager.dart';
 import 'package:mineral/api/common/snowflake.dart';
 import 'package:mineral/api/common/types/channel_type.dart';
 import 'package:mineral/api/common/video_quality.dart';
+import 'package:mineral/api/server/channels/server_category_channel.dart';
 import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/server_message.dart';
 
@@ -32,6 +33,10 @@ final class ServerVoiceChannel extends ServerChannel {
   @override
   Snowflake get guildId => _properties.guildId!;
 
+  Snowflake? get categoryId => _properties.categoryId;
+
+  late final ServerCategoryChannel? category;
+
   ServerVoiceChannel(this._properties) : _methods = ChannelMethods(_properties.id);
 
   Future<void> setName(String name, {String? reason}) => _methods.setName(name, reason);

lib/api/server/managers/channel_manager.dart

@@ -1,9 +1,7 @@
 import 'package:mineral/api/common/snowflake.dart';
-import 'package:mineral/api/common/types/channel_type.dart';
 import 'package:mineral/api/server/channels/server_channel.dart';
 import 'package:mineral/api/server/channels/server_text_channel.dart';
 import 'package:mineral/api/server/channels/server_voice_channel.dart';
-import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
 
 enum _ServerNamedChannel {
   afkChannel,
@@ -15,17 +13,25 @@ enum _ServerNamedChannel {
 }
 
 final class ChannelManager {
-  final Map<_ServerNamedChannel, Snowflake?> _namedChannels;
-  final Map<Snowflake, ServerChannel> _channels;
-
-  ChannelManager(this._channels, this._namedChannels);
+  final Map<_ServerNamedChannel, Snowflake?> _namedChannels = {};
+  final Map<Snowflake, ServerChannel> _channels = {};
+
+  ChannelManager(Map<String, dynamic> json) {
+    _namedChannels..putIfAbsent(
+        _ServerNamedChannel.afkChannel, () => json['afk_channel_id'])..putIfAbsent(
+        _ServerNamedChannel.systemChannel, () => json['system_channel_id'])..putIfAbsent(
+        _ServerNamedChannel.rulesChannel, () => json['rules_channel_id'])..putIfAbsent(
+        _ServerNamedChannel
+            .publicUpdatesChannel, () => json['public_updates_channel_id'])..putIfAbsent(
+        _ServerNamedChannel.safetyAlertsChannel, () => json['safety_alerts_channel_id']);
+  }
 
   Map<Snowflake, ServerChannel> get list => _channels;
 
   T? getOrNull<T extends ServerChannel>(Snowflake? id) => _channels[id] as T?;
 
   T getOrFail<T extends ServerChannel>(String id) =>
-      _channels.values.firstWhere((element) => element.id == id,
+      _channels.values.firstWhere((element) => element.id.value == id,
           orElse: () => throw Exception('Channel not found')) as T;
 
   ServerVoiceChannel? get afkChannel =>
@@ -45,29 +51,4 @@ final class ChannelManager {
 
   ServerTextChannel? get widgetChannel =>
       getOrNull<ServerTextChannel>(_namedChannels[_ServerNamedChannel.widgetChannel]);
-
-  static Future<ChannelManager> fromJson(
-      {required MarshallerContract marshaller,
-      required String guildId,
-      required Map<String, dynamic> json}) async {
-    final awaitedChannels = await Future.wait(List.from(json['channels'])
-        .where((element) => element['type'] != ChannelType.guildCategory.value)
-        .map((element) async => marshaller.serializers.channels.serialize({
-              ...element,
-              'guild_id': guildId,
-            })));
-
-    final Map<Snowflake, ServerChannel> channels = awaitedChannels.nonNulls.fold(
-        {}, (previousValue, element) => {...previousValue, element.id: element as ServerChannel});
-
-    final Map<_ServerNamedChannel, Snowflake?> namedChannels = {
-      _ServerNamedChannel.afkChannel: json['afk_channel_id'],
-      _ServerNamedChannel.systemChannel: json['system_channel_id'],
-      _ServerNamedChannel.rulesChannel: json['rules_channel_id'],
-      _ServerNamedChannel.publicUpdatesChannel: json['public_updates_channel_id'],
-      _ServerNamedChannel.safetyAlertsChannel: json['safety_alerts_channel_id'],
-    };
-
-    return ChannelManager(channels, namedChannels);
-  }
 }

lib/api/server/managers/emoji_manager.dart

@@ -13,7 +13,7 @@ final class EmojiManager {
   factory EmojiManager.fromJson(MarshallerContract marshaller,
       {required List<Role> roles, required List<dynamic> payload}) {
     return EmojiManager(Map<Snowflake, Emoji>.from(payload.fold({}, (value, element) {
-      final emoji = marshaller.serializers.emojis.serialize({
+      final emoji = marshaller.serializers.emojis.serializeRemote({
         'guildRoles': roles,
         ...element,
       }) as Emoji;

lib/api/server/managers/sticker_manager.dart

@@ -11,7 +11,7 @@ final class StickerManager {
 
   factory StickerManager.fromJson(MarshallerContract marshaller, List<dynamic> payload) {
     final Map<Snowflake, Sticker> stickers = payload.fold({}, (value, element) {
-      final sticker = marshaller.serializers.sticker.serialize(element) as Sticker;
+      final sticker = marshaller.serializers.sticker.serializeRemote(element) as Sticker;
       return {...value, sticker.id: sticker};
     });
 

lib/domains/commands/command_interaction_dispatcher.dart

@@ -52,8 +52,8 @@ final class CommandInteractionDispatcher implements InteractionDispatcherContrac
     final command = _interactionManager.commandsHandler.firstWhere((command) => command.$1 == data['data']['name']);
 
     final commandContext = switch (data['data']['guild_id']) {
-      String() => await _marshaller.serializers.guildCommandContext.serialize(data),
-      _ => await _marshaller.serializers.globalCommandContext.serialize(data),
+      String() => await _marshaller.serializers.guildCommandContext.serializeRemote(data),
+      _ => await _marshaller.serializers.globalCommandContext.serializeRemote(data),
     };
 
     final Map<Symbol, dynamic> options = {};
@@ -69,10 +69,10 @@ final class CommandInteractionDispatcher implements InteractionDispatcherContrac
       options[Symbol(option['name'])] = switch(type) {
         CommandOptionType.user => switch (commandContext) {
           ServerCommandContext() => await _marshaller.dataStore.member.getMember(guildId: commandContext.server.id, memberId: option['value']),
-          _ => _marshaller.serializers.user.serialize(option['value']),
+          _ => _marshaller.serializers.user.serializeRemote(option['value']),
         },
-        CommandOptionType.channel => await _marshaller.serializers.channels.serialize(option['value']),
-        CommandOptionType.role => await _marshaller.serializers.role.serialize(option['value']),
+        CommandOptionType.channel => await _marshaller.serializers.channels.serializeRemote(option['value']),
+        CommandOptionType.role => await _marshaller.serializers.role.serializeRemote(option['value']),
         // TODO attachement
         _ => option['value'],
       };

lib/infrastructure/internals/cache/cache_provider_contract.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:mineral/api/common/snowflake.dart';
 import 'package:mineral/infrastructure/services/logger/logger.dart';
 
 abstract interface class CacheProviderContract {
@@ -11,13 +10,14 @@ abstract interface class CacheProviderContract {
   FutureOr<void> init();
 
   Future<int> length();
+  Future<Map<String, dynamic>> getInternalValues();
   Future<List<Map<String, dynamic>>> getAll();
-  Future<Map<String, dynamic>?> get(Snowflake? key);
-  Future<Map<String, dynamic>> getOrFail(Snowflake key, { Exception Function()? onFail });
-  Future<bool> has(Snowflake key);
-  Future<void> put<T>(Snowflake key, T object);
-  Future<void> remove(Snowflake key);
-  Future<void> removeMany(List<Snowflake> key);
+  FutureOr<Map<String, dynamic>?> get(String? key);
+  FutureOr<Map<String, dynamic>> getOrFail(String key, { Exception Function()? onFail });
+  Future<bool> has(String key);
+  Future<void> put<T>(String key, T object);
+  Future<void> remove(String key);
+  Future<void> removeMany(List<String> key);
   Future<void> clear();
 
   Future<void> dispose();