fix: cloud sync (#769)

lib/data/model/server/custom.dart

@@ -1,32 +1,27 @@
-import 'package:hive_flutter/adapters.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'custom.g.dart';
 
-@JsonSerializable()
-@HiveType(typeId: 7)
+@JsonSerializable(includeIfNull: false)
 final class ServerCustom {
   // @HiveField(0)
   // final String? temperature;
-  @HiveField(1)
+
   final String? pveAddr;
-  @HiveField(2, defaultValue: false)
+
   final bool pveIgnoreCert;
 
   /// {"title": "cmd"}
-  @HiveField(3)
   final Map<String, String>? cmds;
-  @HiveField(4)
+
   final String? preferTempDev;
-  @HiveField(5)
+
   final String? logoUrl;
 
   /// The device name of the network interface displayed in the home server card.
-  @HiveField(6)
   final String? netDev;
 
   /// The directory where the script is stored.
-  @HiveField(7)
   final String? scriptDir;
 
   const ServerCustom({
@@ -40,8 +35,7 @@ final class ServerCustom {
     this.scriptDir,
   });
 
-  factory ServerCustom.fromJson(Map<String, dynamic> json) =>
-      _$ServerCustomFromJson(json);
+  factory ServerCustom.fromJson(Map<String, dynamic> json) => _$ServerCustomFromJson(json);
 
   Map<String, dynamic> toJson() => _$ServerCustomToJson(this);
 

lib/data/model/server/custom.g.dart

@@ -2,85 +2,29 @@
 
 part of 'custom.dart';
 
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
-  @override
-  final int typeId = 7;
-
-  @override
-  ServerCustom read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return ServerCustom(
-      pveAddr: fields[1] as String?,
-      pveIgnoreCert: fields[2] == null ? false : fields[2] as bool,
-      cmds: (fields[3] as Map?)?.cast<String, String>(),
-      preferTempDev: fields[4] as String?,
-      logoUrl: fields[5] as String?,
-      netDev: fields[6] as String?,
-      scriptDir: fields[7] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, ServerCustom obj) {
-    writer
-      ..writeByte(7)
-      ..writeByte(1)
-      ..write(obj.pveAddr)
-      ..writeByte(2)
-      ..write(obj.pveIgnoreCert)
-      ..writeByte(3)
-      ..write(obj.cmds)
-      ..writeByte(4)
-      ..write(obj.preferTempDev)
-      ..writeByte(5)
-      ..write(obj.logoUrl)
-      ..writeByte(6)
-      ..write(obj.netDev)
-      ..writeByte(7)
-      ..write(obj.scriptDir);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is ServerCustomAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
 ServerCustom _$ServerCustomFromJson(Map<String, dynamic> json) => ServerCustom(
-      pveAddr: json['pveAddr'] as String?,
-      pveIgnoreCert: json['pveIgnoreCert'] as bool? ?? false,
-      cmds: (json['cmds'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      ),
-      preferTempDev: json['preferTempDev'] as String?,
-      logoUrl: json['logoUrl'] as String?,
-      netDev: json['netDev'] as String?,
-      scriptDir: json['scriptDir'] as String?,
-    );
+  pveAddr: json['pveAddr'] as String?,
+  pveIgnoreCert: json['pveIgnoreCert'] as bool? ?? false,
+  cmds: (json['cmds'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String),
+  ),
+  preferTempDev: json['preferTempDev'] as String?,
+  logoUrl: json['logoUrl'] as String?,
+  netDev: json['netDev'] as String?,
+  scriptDir: json['scriptDir'] as String?,
+);
 
 Map<String, dynamic> _$ServerCustomToJson(ServerCustom instance) =>
     <String, dynamic>{
-      'pveAddr': instance.pveAddr,
+      if (instance.pveAddr case final value?) 'pveAddr': value,
       'pveIgnoreCert': instance.pveIgnoreCert,
-      'cmds': instance.cmds,
-      'preferTempDev': instance.preferTempDev,
-      'logoUrl': instance.logoUrl,
-      'netDev': instance.netDev,
-      'scriptDir': instance.scriptDir,
+      if (instance.cmds case final value?) 'cmds': value,
+      if (instance.preferTempDev case final value?) 'preferTempDev': value,
+      if (instance.logoUrl case final value?) 'logoUrl': value,
+      if (instance.netDev case final value?) 'netDev': value,
+      if (instance.scriptDir case final value?) 'scriptDir': value,
     };

lib/data/model/server/private_key_info.dart

@@ -1,15 +1,11 @@
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'private_key_info.g.dart';
 
 @JsonSerializable()
-@HiveType(typeId: 1)
 class PrivateKeyInfo {
-  @HiveField(0)
   final String id;
   @JsonKey(name: 'private_key')
-  @HiveField(1)
   final String key;
 
   const PrivateKeyInfo({
@@ -17,8 +13,7 @@ class PrivateKeyInfo {
     required this.key,
   });
 
-  factory PrivateKeyInfo.fromJson(Map<String, dynamic> json) =>
-      _$PrivateKeyInfoFromJson(json);
+  factory PrivateKeyInfo.fromJson(Map<String, dynamic> json) => _$PrivateKeyInfoFromJson(json);
 
   Map<String, dynamic> toJson() => _$PrivateKeyInfoToJson(this);
 

lib/data/model/server/private_key_info.g.dart

@@ -2,47 +2,6 @@
 
 part of 'private_key_info.dart';
 
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class PrivateKeyInfoAdapter extends TypeAdapter<PrivateKeyInfo> {
-  @override
-  final int typeId = 1;
-
-  @override
-  PrivateKeyInfo read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return PrivateKeyInfo(
-      id: fields[0] as String,
-      key: fields[1] as String,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, PrivateKeyInfo obj) {
-    writer
-      ..writeByte(2)
-      ..writeByte(0)
-      ..write(obj.id)
-      ..writeByte(1)
-      ..write(obj.key);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is PrivateKeyInfoAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
@@ -54,7 +13,4 @@ PrivateKeyInfo _$PrivateKeyInfoFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$PrivateKeyInfoToJson(PrivateKeyInfo instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'private_key': instance.key,
-    };
+    <String, dynamic>{'id': instance.id, 'private_key': instance.key};

lib/data/model/server/server.dart

@@ -1,5 +1,5 @@
 import 'package:dartssh2/dartssh2.dart';
-import 'package:server_box/data/model/app/error.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/data/model/app/shell_func.dart';
 import 'package:server_box/data/model/server/battery.dart';
 import 'package:server_box/data/model/server/conn.dart';

lib/data/model/server/server_private_info.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:fl_lib/fl_lib.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hive_flutter/hive_flutter.dart';
+import 'package:hive_ce_flutter/hive_flutter.dart';
 import 'package:server_box/data/model/server/custom.dart';
 import 'package:server_box/data/model/server/server.dart';
 import 'package:server_box/data/model/server/wol_cfg.dart';
@@ -20,31 +20,31 @@ part 'server_private_info.freezed.dart';
 /// Some params named as `spi` in the codebase which is the abbreviation of `ServerPrivateInfo`.
 ///
 /// Nowaday, more fields are added to this class, and it's renamed to `Spi`.
-@freezed
-@HiveType(typeId: 3)
+@Freezed(fromJson: false)
+@JsonSerializable(includeIfNull: false)
 class Spi with _$Spi {
   const Spi._();
 
   const factory Spi({
-    @HiveField(0) required String name,
-    @HiveField(1) required String ip,
-    @HiveField(2) required int port,
-    @HiveField(3) required String user,
-    @HiveField(4) String? pwd,
+    required String name,
+    required String ip,
+    required int port,
+    required String user,
+    String? pwd,
 
     /// [id] of private key
-    @JsonKey(name: 'pubKeyId') @HiveField(5) String? keyId,
-    @HiveField(6) List<String>? tags,
-    @HiveField(7) String? alterUrl,
-    @HiveField(8, defaultValue: true) @Default(true) bool autoConnect,
+    @JsonKey(name: 'pubKeyId') String? keyId,
+    List<String>? tags,
+    String? alterUrl,
+    @Default(true) @JsonKey(defaultValue: true) bool autoConnect,
 
     /// [id] of the jump server
-    @HiveField(9) String? jumpId,
-    @HiveField(10) ServerCustom? custom,
-    @HiveField(11) WakeOnLanCfg? wolCfg,
+    String? jumpId,
+    ServerCustom? custom,
+    WakeOnLanCfg? wolCfg,
 
     /// It only applies to SSH terminal.
-    @HiveField(12) Map<String, String>? envs,
+    Map<String, String>? envs,
     @JsonKey(fromJson: Spi.parseId) @HiveField(13, defaultValue: '') required String id,
   }) = _Spi;
 

lib/data/model/server/server_private_info.freezed.dart

@@ -12,46 +12,31 @@ part of 'server_private_info.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-Spi _$SpiFromJson(Map<String, dynamic> json) {
-  return _Spi.fromJson(json);
-}
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
 
 /// @nodoc
 mixin _$Spi {
-  @HiveField(0)
   String get name => throw _privateConstructorUsedError;
-  @HiveField(1)
   String get ip => throw _privateConstructorUsedError;
-  @HiveField(2)
   int get port => throw _privateConstructorUsedError;
-  @HiveField(3)
   String get user => throw _privateConstructorUsedError;
-  @HiveField(4)
   String? get pwd => throw _privateConstructorUsedError;
 
   /// [id] of private key
   @JsonKey(name: 'pubKeyId')
-  @HiveField(5)
   String? get keyId => throw _privateConstructorUsedError;
-  @HiveField(6)
   List<String>? get tags => throw _privateConstructorUsedError;
-  @HiveField(7)
   String? get alterUrl => throw _privateConstructorUsedError;
-  @HiveField(8, defaultValue: true)
+  @JsonKey(defaultValue: true)
   bool get autoConnect => throw _privateConstructorUsedError;
 
   /// [id] of the jump server
-  @HiveField(9)
   String? get jumpId => throw _privateConstructorUsedError;
-  @HiveField(10)
   ServerCustom? get custom => throw _privateConstructorUsedError;
-  @HiveField(11)
   WakeOnLanCfg? get wolCfg => throw _privateConstructorUsedError;
 
   /// It only applies to SSH terminal.
-  @HiveField(12)
   Map<String, String>? get envs => throw _privateConstructorUsedError;
   @JsonKey(fromJson: Spi.parseId)
   @HiveField(13, defaultValue: '')
@@ -71,23 +56,22 @@ abstract class $SpiCopyWith<$Res> {
   factory $SpiCopyWith(Spi value, $Res Function(Spi) then) =
       _$SpiCopyWithImpl<$Res, Spi>;
   @useResult
-  $Res call(
-      {@HiveField(0) String name,
-      @HiveField(1) String ip,
-      @HiveField(2) int port,
-      @HiveField(3) String user,
-      @HiveField(4) String? pwd,
-      @JsonKey(name: 'pubKeyId') @HiveField(5) String? keyId,
-      @HiveField(6) List<String>? tags,
-      @HiveField(7) String? alterUrl,
-      @HiveField(8, defaultValue: true) bool autoConnect,
-      @HiveField(9) String? jumpId,
-      @HiveField(10) ServerCustom? custom,
-      @HiveField(11) WakeOnLanCfg? wolCfg,
-      @HiveField(12) Map<String, String>? envs,
-      @JsonKey(fromJson: Spi.parseId)
-      @HiveField(13, defaultValue: '')
-      String id});
+  $Res call({
+    String name,
+    String ip,
+    int port,
+    String user,
+    String? pwd,
+    @JsonKey(name: 'pubKeyId') String? keyId,
+    List<String>? tags,
+    String? alterUrl,
+    @JsonKey(defaultValue: true) bool autoConnect,
+    String? jumpId,
+    ServerCustom? custom,
+    WakeOnLanCfg? wolCfg,
+    Map<String, String>? envs,
+    @JsonKey(fromJson: Spi.parseId) @HiveField(13, defaultValue: '') String id,
+  });
 }
 
 /// @nodoc
@@ -119,64 +103,67 @@ class _$SpiCopyWithImpl<$Res, $Val extends Spi> implements $SpiCopyWith<$Res> {
     Object? envs = freezed,
     Object? id = null,
   }) {
-    return _then(_value.copyWith(
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      ip: null == ip
-          ? _value.ip
-          : ip // ignore: cast_nullable_to_non_nullable
-              as String,
-      port: null == port
-          ? _value.port
-          : port // ignore: cast_nullable_to_non_nullable
-              as int,
-      user: null == user
-          ? _value.user
-          : user // ignore: cast_nullable_to_non_nullable
-              as String,
-      pwd: freezed == pwd
-          ? _value.pwd
-          : pwd // ignore: cast_nullable_to_non_nullable
-              as String?,
-      keyId: freezed == keyId
-          ? _value.keyId
-          : keyId // ignore: cast_nullable_to_non_nullable
-              as String?,
-      tags: freezed == tags
-          ? _value.tags
-          : tags // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-      alterUrl: freezed == alterUrl
-          ? _value.alterUrl
-          : alterUrl // ignore: cast_nullable_to_non_nullable
-              as String?,
-      autoConnect: null == autoConnect
-          ? _value.autoConnect
-          : autoConnect // ignore: cast_nullable_to_non_nullable
-              as bool,
-      jumpId: freezed == jumpId
-          ? _value.jumpId
-          : jumpId // ignore: cast_nullable_to_non_nullable
-              as String?,
-      custom: freezed == custom
-          ? _value.custom
-          : custom // ignore: cast_nullable_to_non_nullable
-              as ServerCustom?,
-      wolCfg: freezed == wolCfg
-          ? _value.wolCfg
-          : wolCfg // ignore: cast_nullable_to_non_nullable
-              as WakeOnLanCfg?,
-      envs: freezed == envs
-          ? _value.envs
-          : envs // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>?,
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-    ) as $Val);
+    return _then(
+      _value.copyWith(
+            name: null == name
+                ? _value.name
+                : name // ignore: cast_nullable_to_non_nullable
+                      as String,
+            ip: null == ip
+                ? _value.ip
+                : ip // ignore: cast_nullable_to_non_nullable
+                      as String,
+            port: null == port
+                ? _value.port
+                : port // ignore: cast_nullable_to_non_nullable
+                      as int,
+            user: null == user
+                ? _value.user
+                : user // ignore: cast_nullable_to_non_nullable
+                      as String,
+            pwd: freezed == pwd
+                ? _value.pwd
+                : pwd // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            keyId: freezed == keyId
+                ? _value.keyId
+                : keyId // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            tags: freezed == tags
+                ? _value.tags
+                : tags // ignore: cast_nullable_to_non_nullable
+                      as List<String>?,
+            alterUrl: freezed == alterUrl
+                ? _value.alterUrl
+                : alterUrl // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            autoConnect: null == autoConnect
+                ? _value.autoConnect
+                : autoConnect // ignore: cast_nullable_to_non_nullable
+                      as bool,
+            jumpId: freezed == jumpId
+                ? _value.jumpId
+                : jumpId // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            custom: freezed == custom
+                ? _value.custom
+                : custom // ignore: cast_nullable_to_non_nullable
+                      as ServerCustom?,
+            wolCfg: freezed == wolCfg
+                ? _value.wolCfg
+                : wolCfg // ignore: cast_nullable_to_non_nullable
+                      as WakeOnLanCfg?,
+            envs: freezed == envs
+                ? _value.envs
+                : envs // ignore: cast_nullable_to_non_nullable
+                      as Map<String, String>?,
+            id: null == id
+                ? _value.id
+                : id // ignore: cast_nullable_to_non_nullable
+                      as String,
+          )
+          as $Val,
+    );
   }
 }
 
@@ -186,30 +173,29 @@ abstract class _$$SpiImplCopyWith<$Res> implements $SpiCopyWith<$Res> {
       __$$SpiImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call(
-      {@HiveField(0) String name,
-      @HiveField(1) String ip,
-      @HiveField(2) int port,
-      @HiveField(3) String user,
-      @HiveField(4) String? pwd,
-      @JsonKey(name: 'pubKeyId') @HiveField(5) String? keyId,
-      @HiveField(6) List<String>? tags,
-      @HiveField(7) String? alterUrl,
-      @HiveField(8, defaultValue: true) bool autoConnect,
-      @HiveField(9) String? jumpId,
-      @HiveField(10) ServerCustom? custom,
-      @HiveField(11) WakeOnLanCfg? wolCfg,
-      @HiveField(12) Map<String, String>? envs,
-      @JsonKey(fromJson: Spi.parseId)
-      @HiveField(13, defaultValue: '')
-      String id});
+  $Res call({
+    String name,
+    String ip,
+    int port,
+    String user,
+    String? pwd,
+    @JsonKey(name: 'pubKeyId') String? keyId,
+    List<String>? tags,
+    String? alterUrl,
+    @JsonKey(defaultValue: true) bool autoConnect,
+    String? jumpId,
+    ServerCustom? custom,
+    WakeOnLanCfg? wolCfg,
+    Map<String, String>? envs,
+    @JsonKey(fromJson: Spi.parseId) @HiveField(13, defaultValue: '') String id,
+  });
 }
 
 /// @nodoc
 class __$$SpiImplCopyWithImpl<$Res> extends _$SpiCopyWithImpl<$Res, _$SpiImpl>
     implements _$$SpiImplCopyWith<$Res> {
   __$$SpiImplCopyWithImpl(_$SpiImpl _value, $Res Function(_$SpiImpl) _then)
-      : super(_value, _then);
+    : super(_value, _then);
 
   /// Create a copy of Spi
   /// with the given fields replaced by the non-null parameter values.
@@ -231,118 +217,110 @@ class __$$SpiImplCopyWithImpl<$Res> extends _$SpiCopyWithImpl<$Res, _$SpiImpl>
     Object? envs = freezed,
     Object? id = null,
   }) {
-    return _then(_$SpiImpl(
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      ip: null == ip
-          ? _value.ip
-          : ip // ignore: cast_nullable_to_non_nullable
-              as String,
-      port: null == port
-          ? _value.port
-          : port // ignore: cast_nullable_to_non_nullable
-              as int,
-      user: null == user
-          ? _value.user
-          : user // ignore: cast_nullable_to_non_nullable
-              as String,
-      pwd: freezed == pwd
-          ? _value.pwd
-          : pwd // ignore: cast_nullable_to_non_nullable
-              as String?,
-      keyId: freezed == keyId
-          ? _value.keyId
-          : keyId // ignore: cast_nullable_to_non_nullable
-              as String?,
-      tags: freezed == tags
-          ? _value._tags
-          : tags // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-      alterUrl: freezed == alterUrl
-          ? _value.alterUrl
-          : alterUrl // ignore: cast_nullable_to_non_nullable
-              as String?,
-      autoConnect: null == autoConnect
-          ? _value.autoConnect
-          : autoConnect // ignore: cast_nullable_to_non_nullable
-              as bool,
-      jumpId: freezed == jumpId
-          ? _value.jumpId
-          : jumpId // ignore: cast_nullable_to_non_nullable
-              as String?,
-      custom: freezed == custom
-          ? _value.custom
-          : custom // ignore: cast_nullable_to_non_nullable
-              as ServerCustom?,
-      wolCfg: freezed == wolCfg
-          ? _value.wolCfg
-          : wolCfg // ignore: cast_nullable_to_non_nullable
-              as WakeOnLanCfg?,
-      envs: freezed == envs
-          ? _value._envs
-          : envs // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>?,
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-    ));
+    return _then(
+      _$SpiImpl(
+        name: null == name
+            ? _value.name
+            : name // ignore: cast_nullable_to_non_nullable
+                  as String,
+        ip: null == ip
+            ? _value.ip
+            : ip // ignore: cast_nullable_to_non_nullable
+                  as String,
+        port: null == port
+            ? _value.port
+            : port // ignore: cast_nullable_to_non_nullable
+                  as int,
+        user: null == user
+            ? _value.user
+            : user // ignore: cast_nullable_to_non_nullable
+                  as String,
+        pwd: freezed == pwd
+            ? _value.pwd
+            : pwd // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        keyId: freezed == keyId
+            ? _value.keyId
+            : keyId // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        tags: freezed == tags
+            ? _value._tags
+            : tags // ignore: cast_nullable_to_non_nullable
+                  as List<String>?,
+        alterUrl: freezed == alterUrl
+            ? _value.alterUrl
+            : alterUrl // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        autoConnect: null == autoConnect
+            ? _value.autoConnect
+            : autoConnect // ignore: cast_nullable_to_non_nullable
+                  as bool,
+        jumpId: freezed == jumpId
+            ? _value.jumpId
+            : jumpId // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        custom: freezed == custom
+            ? _value.custom
+            : custom // ignore: cast_nullable_to_non_nullable
+                  as ServerCustom?,
+        wolCfg: freezed == wolCfg
+            ? _value.wolCfg
+            : wolCfg // ignore: cast_nullable_to_non_nullable
+                  as WakeOnLanCfg?,
+        envs: freezed == envs
+            ? _value._envs
+            : envs // ignore: cast_nullable_to_non_nullable
+                  as Map<String, String>?,
+        id: null == id
+            ? _value.id
+            : id // ignore: cast_nullable_to_non_nullable
+                  as String,
+      ),
+    );
   }
 }
 
 /// @nodoc
-@JsonSerializable()
+@JsonSerializable(createFactory: false)
 class _$SpiImpl extends _Spi {
-  const _$SpiImpl(
-      {@HiveField(0) required this.name,
-      @HiveField(1) required this.ip,
-      @HiveField(2) required this.port,
-      @HiveField(3) required this.user,
-      @HiveField(4) this.pwd,
-      @JsonKey(name: 'pubKeyId') @HiveField(5) this.keyId,
-      @HiveField(6) final List<String>? tags,
-      @HiveField(7) this.alterUrl,
-      @HiveField(8, defaultValue: true) this.autoConnect = true,
-      @HiveField(9) this.jumpId,
-      @HiveField(10) this.custom,
-      @HiveField(11) this.wolCfg,
-      @HiveField(12) final Map<String, String>? envs,
-      @JsonKey(fromJson: Spi.parseId)
-      @HiveField(13, defaultValue: '')
-      required this.id})
-      : _tags = tags,
-        _envs = envs,
-        super._();
-
-  factory _$SpiImpl.fromJson(Map<String, dynamic> json) =>
-      _$$SpiImplFromJson(json);
+  const _$SpiImpl({
+    required this.name,
+    required this.ip,
+    required this.port,
+    required this.user,
+    this.pwd,
+    @JsonKey(name: 'pubKeyId') this.keyId,
+    final List<String>? tags,
+    this.alterUrl,
+    @JsonKey(defaultValue: true) this.autoConnect = true,
+    this.jumpId,
+    this.custom,
+    this.wolCfg,
+    final Map<String, String>? envs,
+    @JsonKey(fromJson: Spi.parseId)
+    @HiveField(13, defaultValue: '')
+    required this.id,
+  }) : _tags = tags,
+       _envs = envs,
+       super._();
 
   @override
-  @HiveField(0)
   final String name;
   @override
-  @HiveField(1)
   final String ip;
   @override
-  @HiveField(2)
   final int port;
   @override
-  @HiveField(3)
   final String user;
   @override
-  @HiveField(4)
   final String? pwd;
 
   /// [id] of private key
   @override
   @JsonKey(name: 'pubKeyId')
-  @HiveField(5)
   final String? keyId;
   final List<String>? _tags;
   @override
-  @HiveField(6)
   List<String>? get tags {
     final value = _tags;
     if (value == null) return null;
@@ -352,22 +330,17 @@ class _$SpiImpl extends _Spi {
   }
 
   @override
-  @HiveField(7)
   final String? alterUrl;
   @override
-  @JsonKey()
-  @HiveField(8, defaultValue: true)
+  @JsonKey(defaultValue: true)
   final bool autoConnect;
 
   /// [id] of the jump server
   @override
-  @HiveField(9)
   final String? jumpId;
   @override
-  @HiveField(10)
   final ServerCustom? custom;
   @override
-  @HiveField(11)
   final WakeOnLanCfg? wolCfg;
 
   /// It only applies to SSH terminal.
@@ -375,7 +348,6 @@ class _$SpiImpl extends _Spi {
 
   /// It only applies to SSH terminal.
   @override
-  @HiveField(12)
   Map<String, String>? get envs {
     final value = _envs;
     if (value == null) return null;
@@ -415,21 +387,22 @@ class _$SpiImpl extends _Spi {
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(
-      runtimeType,
-      name,
-      ip,
-      port,
-      user,
-      pwd,
-      keyId,
-      const DeepCollectionEquality().hash(_tags),
-      alterUrl,
-      autoConnect,
-      jumpId,
-      custom,
-      wolCfg,
-      const DeepCollectionEquality().hash(_envs),
-      id);
+    runtimeType,
+    name,
+    ip,
+    port,
+    user,
+    pwd,
+    keyId,
+    const DeepCollectionEquality().hash(_tags),
+    alterUrl,
+    autoConnect,
+    jumpId,
+    custom,
+    wolCfg,
+    const DeepCollectionEquality().hash(_envs),
+    id,
+  );
 
   /// Create a copy of Spi
   /// with the given fields replaced by the non-null parameter values.
@@ -441,79 +414,64 @@ class _$SpiImpl extends _Spi {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$SpiImplToJson(
-      this,
-    );
+    return _$$SpiImplToJson(this);
   }
 }
 
 abstract class _Spi extends Spi {
-  const factory _Spi(
-      {@HiveField(0) required final String name,
-      @HiveField(1) required final String ip,
-      @HiveField(2) required final int port,
-      @HiveField(3) required final String user,
-      @HiveField(4) final String? pwd,
-      @JsonKey(name: 'pubKeyId') @HiveField(5) final String? keyId,
-      @HiveField(6) final List<String>? tags,
-      @HiveField(7) final String? alterUrl,
-      @HiveField(8, defaultValue: true) final bool autoConnect,
-      @HiveField(9) final String? jumpId,
-      @HiveField(10) final ServerCustom? custom,
-      @HiveField(11) final WakeOnLanCfg? wolCfg,
-      @HiveField(12) final Map<String, String>? envs,
-      @JsonKey(fromJson: Spi.parseId)
-      @HiveField(13, defaultValue: '')
-      required final String id}) = _$SpiImpl;
+  const factory _Spi({
+    required final String name,
+    required final String ip,
+    required final int port,
+    required final String user,
+    final String? pwd,
+    @JsonKey(name: 'pubKeyId') final String? keyId,
+    final List<String>? tags,
+    final String? alterUrl,
+    @JsonKey(defaultValue: true) final bool autoConnect,
+    final String? jumpId,
+    final ServerCustom? custom,
+    final WakeOnLanCfg? wolCfg,
+    final Map<String, String>? envs,
+    @JsonKey(fromJson: Spi.parseId)
+    @HiveField(13, defaultValue: '')
+    required final String id,
+  }) = _$SpiImpl;
   const _Spi._() : super._();
 
-  factory _Spi.fromJson(Map<String, dynamic> json) = _$SpiImpl.fromJson;
-
   @override
-  @HiveField(0)
   String get name;
   @override
-  @HiveField(1)
   String get ip;
   @override
-  @HiveField(2)
   int get port;
   @override
-  @HiveField(3)
   String get user;
   @override
-  @HiveField(4)
   String? get pwd;
 
   /// [id] of private key
   @override
   @JsonKey(name: 'pubKeyId')
-  @HiveField(5)
   String? get keyId;
   @override
-  @HiveField(6)
   List<String>? get tags;
   @override
-  @HiveField(7)
   String? get alterUrl;
   @override
-  @HiveField(8, defaultValue: true)
+  @JsonKey(defaultValue: true)
   bool get autoConnect;
 
   /// [id] of the jump server
   @override
-  @HiveField(9)
   String? get jumpId;
   @override
-  @HiveField(10)
   ServerCustom? get custom;
   @override
-  @HiveField(11)
   WakeOnLanCfg? get wolCfg;
 
   /// It only applies to SSH terminal.
   @override
-  @HiveField(12)
   Map<String, String>? get envs;
   @override
   @JsonKey(fromJson: Spi.parseId)

lib/data/model/server/server_private_info.g.dart

@@ -2,123 +2,63 @@
 
 part of 'server_private_info.dart';
 
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class SpiAdapter extends TypeAdapter<Spi> {
-  @override
-  final int typeId = 3;
-
-  @override
-  Spi read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Spi(
-      name: fields[0] as String,
-      ip: fields[1] as String,
-      port: fields[2] as int,
-      user: fields[3] as String,
-      pwd: fields[4] as String?,
-      keyId: fields[5] as String?,
-      tags: (fields[6] as List?)?.cast<String>(),
-      alterUrl: fields[7] as String?,
-      autoConnect: fields[8] == null ? true : fields[8] as bool,
-      jumpId: fields[9] as String?,
-      custom: fields[10] as ServerCustom?,
-      wolCfg: fields[11] as WakeOnLanCfg?,
-      envs: (fields[12] as Map?)?.cast<String, String>(),
-      id: fields[13] == null ? '' : fields[13] as String,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Spi obj) {
-    writer
-      ..writeByte(14)
-      ..writeByte(0)
-      ..write(obj.name)
-      ..writeByte(1)
-      ..write(obj.ip)
-      ..writeByte(2)
-      ..write(obj.port)
-      ..writeByte(3)
-      ..write(obj.user)
-      ..writeByte(4)
-      ..write(obj.pwd)
-      ..writeByte(5)
-      ..write(obj.keyId)
-      ..writeByte(6)
-      ..write(obj.tags)
-      ..writeByte(7)
-      ..write(obj.alterUrl)
-      ..writeByte(8)
-      ..write(obj.autoConnect)
-      ..writeByte(9)
-      ..write(obj.jumpId)
-      ..writeByte(10)
-      ..write(obj.custom)
-      ..writeByte(11)
-      ..write(obj.wolCfg)
-      ..writeByte(12)
-      ..write(obj.envs)
-      ..writeByte(13)
-      ..write(obj.id);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is SpiAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$SpiImpl _$$SpiImplFromJson(Map<String, dynamic> json) => _$SpiImpl(
-      name: json['name'] as String,
-      ip: json['ip'] as String,
-      port: (json['port'] as num).toInt(),
-      user: json['user'] as String,
-      pwd: json['pwd'] as String?,
-      keyId: json['pubKeyId'] as String?,
-      tags: (json['tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
-      alterUrl: json['alterUrl'] as String?,
-      autoConnect: json['autoConnect'] as bool? ?? true,
-      jumpId: json['jumpId'] as String?,
-      custom: json['custom'] == null
-          ? null
-          : ServerCustom.fromJson(json['custom'] as Map<String, dynamic>),
-      wolCfg: json['wolCfg'] == null
-          ? null
-          : WakeOnLanCfg.fromJson(json['wolCfg'] as Map<String, dynamic>),
-      envs: (json['envs'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      ),
-      id: Spi.parseId(json['id']),
-    );
+Spi _$SpiFromJson(Map<String, dynamic> json) => Spi(
+  name: json['name'] as String,
+  ip: json['ip'] as String,
+  port: (json['port'] as num).toInt(),
+  user: json['user'] as String,
+  pwd: json['pwd'] as String?,
+  keyId: json['pubKeyId'] as String?,
+  tags: (json['tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
+  alterUrl: json['alterUrl'] as String?,
+  autoConnect: json['autoConnect'] as bool? ?? true,
+  jumpId: json['jumpId'] as String?,
+  custom: json['custom'] == null
+      ? null
+      : ServerCustom.fromJson(json['custom'] as Map<String, dynamic>),
+  wolCfg: json['wolCfg'] == null
+      ? null
+      : WakeOnLanCfg.fromJson(json['wolCfg'] as Map<String, dynamic>),
+  envs: (json['envs'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String),
+  ),
+  id: Spi.parseId(json['id']),
+);
+
+Map<String, dynamic> _$SpiToJson(Spi instance) => <String, dynamic>{
+  'name': instance.name,
+  'ip': instance.ip,
+  'port': instance.port,
+  'user': instance.user,
+  if (instance.pwd case final value?) 'pwd': value,
+  if (instance.keyId case final value?) 'pubKeyId': value,
+  if (instance.tags case final value?) 'tags': value,
+  if (instance.alterUrl case final value?) 'alterUrl': value,
+  'autoConnect': instance.autoConnect,
+  if (instance.jumpId case final value?) 'jumpId': value,
+  if (instance.custom case final value?) 'custom': value,
+  if (instance.wolCfg case final value?) 'wolCfg': value,
+  if (instance.envs case final value?) 'envs': value,
+  'id': instance.id,
+};
 
 Map<String, dynamic> _$$SpiImplToJson(_$SpiImpl instance) => <String, dynamic>{
-      'name': instance.name,
-      'ip': instance.ip,
-      'port': instance.port,
-      'user': instance.user,
-      'pwd': instance.pwd,
-      'pubKeyId': instance.keyId,
-      'tags': instance.tags,
-      'alterUrl': instance.alterUrl,
-      'autoConnect': instance.autoConnect,
-      'jumpId': instance.jumpId,
-      'custom': instance.custom,
-      'wolCfg': instance.wolCfg,
-      'envs': instance.envs,
-      'id': instance.id,
-    };
+  'name': instance.name,
+  'ip': instance.ip,
+  'port': instance.port,
+  'user': instance.user,
+  'pwd': instance.pwd,
+  'pubKeyId': instance.keyId,
+  'tags': instance.tags,
+  'alterUrl': instance.alterUrl,
+  'autoConnect': instance.autoConnect,
+  'jumpId': instance.jumpId,
+  'custom': instance.custom,
+  'wolCfg': instance.wolCfg,
+  'envs': instance.envs,
+  'id': instance.id,
+};

lib/data/model/server/snippet.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:fl_lib/fl_lib.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:xterm/core.dart';
 
@@ -10,20 +9,19 @@ part 'snippet.g.dart';
 part 'snippet.freezed.dart';
 
 @freezed
-@HiveType(typeId: 2)
 class Snippet with _$Snippet {
   const factory Snippet({
-    @HiveField(0) required String name,
-    @HiveField(1) required String script,
-    @HiveField(2) List<String>? tags,
-    @HiveField(3) String? note,
-    
+    required String name,
+    required String script,
+    List<String>? tags,
+    String? note,
+
     /// List of server id that this snippet should be auto run on
-    @HiveField(4) List<String>? autoRunOn,
+    List<String>? autoRunOn,
   }) = _Snippet;
 
   factory Snippet.fromJson(Map<String, dynamic> json) => _$SnippetFromJson(json);
-  
+
   static const example = Snippet(
     name: 'example',
     script: 'echo hello',
@@ -59,7 +57,7 @@ extension SnippetX on Snippet {
 
     /// There is no [TerminalKey] in the script
     if (matches.isEmpty) {
-      terminal.textInput(argsFmted);  
+      terminal.textInput(argsFmted);
       if (autoEnter) terminal.keyInput(TerminalKey.enter);
       return;
     }

lib/data/model/server/snippet.freezed.dart

@@ -12,7 +12,8 @@ part of 'snippet.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
 
 Snippet _$SnippetFromJson(Map<String, dynamic> json) {
   return _Snippet.fromJson(json);
@@ -20,17 +21,12 @@ Snippet _$SnippetFromJson(Map<String, dynamic> json) {
 
 /// @nodoc
 mixin _$Snippet {
-  @HiveField(0)
   String get name => throw _privateConstructorUsedError;
-  @HiveField(1)
   String get script => throw _privateConstructorUsedError;
-  @HiveField(2)
   List<String>? get tags => throw _privateConstructorUsedError;
-  @HiveField(3)
   String? get note => throw _privateConstructorUsedError;
 
   /// List of server id that this snippet should be auto run on
-  @HiveField(4)
   List<String>? get autoRunOn => throw _privateConstructorUsedError;
 
   /// Serializes this Snippet to a JSON map.
@@ -47,12 +43,13 @@ abstract class $SnippetCopyWith<$Res> {
   factory $SnippetCopyWith(Snippet value, $Res Function(Snippet) then) =
       _$SnippetCopyWithImpl<$Res, Snippet>;
   @useResult
-  $Res call(
-      {@HiveField(0) String name,
-      @HiveField(1) String script,
-      @HiveField(2) List<String>? tags,
-      @HiveField(3) String? note,
-      @HiveField(4) List<String>? autoRunOn});
+  $Res call({
+    String name,
+    String script,
+    List<String>? tags,
+    String? note,
+    List<String>? autoRunOn,
+  });
 }
 
 /// @nodoc
@@ -76,44 +73,49 @@ class _$SnippetCopyWithImpl<$Res, $Val extends Snippet>
     Object? note = freezed,
     Object? autoRunOn = freezed,
   }) {
-    return _then(_value.copyWith(
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      script: null == script
-          ? _value.script
-          : script // ignore: cast_nullable_to_non_nullable
-              as String,
-      tags: freezed == tags
-          ? _value.tags
-          : tags // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-      note: freezed == note
-          ? _value.note
-          : note // ignore: cast_nullable_to_non_nullable
-              as String?,
-      autoRunOn: freezed == autoRunOn
-          ? _value.autoRunOn
-          : autoRunOn // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-    ) as $Val);
+    return _then(
+      _value.copyWith(
+            name: null == name
+                ? _value.name
+                : name // ignore: cast_nullable_to_non_nullable
+                      as String,
+            script: null == script
+                ? _value.script
+                : script // ignore: cast_nullable_to_non_nullable
+                      as String,
+            tags: freezed == tags
+                ? _value.tags
+                : tags // ignore: cast_nullable_to_non_nullable
+                      as List<String>?,
+            note: freezed == note
+                ? _value.note
+                : note // ignore: cast_nullable_to_non_nullable
+                      as String?,
+            autoRunOn: freezed == autoRunOn
+                ? _value.autoRunOn
+                : autoRunOn // ignore: cast_nullable_to_non_nullable
+                      as List<String>?,
+          )
+          as $Val,
+    );
   }
 }
 
 /// @nodoc
 abstract class _$$SnippetImplCopyWith<$Res> implements $SnippetCopyWith<$Res> {
   factory _$$SnippetImplCopyWith(
-          _$SnippetImpl value, $Res Function(_$SnippetImpl) then) =
-      __$$SnippetImplCopyWithImpl<$Res>;
+    _$SnippetImpl value,
+    $Res Function(_$SnippetImpl) then,
+  ) = __$$SnippetImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call(
-      {@HiveField(0) String name,
-      @HiveField(1) String script,
-      @HiveField(2) List<String>? tags,
-      @HiveField(3) String? note,
-      @HiveField(4) List<String>? autoRunOn});
+  $Res call({
+    String name,
+    String script,
+    List<String>? tags,
+    String? note,
+    List<String>? autoRunOn,
+  });
 }
 
 /// @nodoc
@@ -121,8 +123,9 @@ class __$$SnippetImplCopyWithImpl<$Res>
     extends _$SnippetCopyWithImpl<$Res, _$SnippetImpl>
     implements _$$SnippetImplCopyWith<$Res> {
   __$$SnippetImplCopyWithImpl(
-      _$SnippetImpl _value, $Res Function(_$SnippetImpl) _then)
-      : super(_value, _then);
+    _$SnippetImpl _value,
+    $Res Function(_$SnippetImpl) _then,
+  ) : super(_value, _then);
 
   /// Create a copy of Snippet
   /// with the given fields replaced by the non-null parameter values.
@@ -135,55 +138,54 @@ class __$$SnippetImplCopyWithImpl<$Res>
     Object? note = freezed,
     Object? autoRunOn = freezed,
   }) {
-    return _then(_$SnippetImpl(
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      script: null == script
-          ? _value.script
-          : script // ignore: cast_nullable_to_non_nullable
-              as String,
-      tags: freezed == tags
-          ? _value._tags
-          : tags // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-      note: freezed == note
-          ? _value.note
-          : note // ignore: cast_nullable_to_non_nullable
-              as String?,
-      autoRunOn: freezed == autoRunOn
-          ? _value._autoRunOn
-          : autoRunOn // ignore: cast_nullable_to_non_nullable
-              as List<String>?,
-    ));
+    return _then(
+      _$SnippetImpl(
+        name: null == name
+            ? _value.name
+            : name // ignore: cast_nullable_to_non_nullable
+                  as String,
+        script: null == script
+            ? _value.script
+            : script // ignore: cast_nullable_to_non_nullable
+                  as String,
+        tags: freezed == tags
+            ? _value._tags
+            : tags // ignore: cast_nullable_to_non_nullable
+                  as List<String>?,
+        note: freezed == note
+            ? _value.note
+            : note // ignore: cast_nullable_to_non_nullable
+                  as String?,
+        autoRunOn: freezed == autoRunOn
+            ? _value._autoRunOn
+            : autoRunOn // ignore: cast_nullable_to_non_nullable
+                  as List<String>?,
+      ),
+    );
   }
 }
 
 /// @nodoc
 @JsonSerializable()
 class _$SnippetImpl implements _Snippet {
-  const _$SnippetImpl(
-      {@HiveField(0) required this.name,
-      @HiveField(1) required this.script,
-      @HiveField(2) final List<String>? tags,
-      @HiveField(3) this.note,
-      @HiveField(4) final List<String>? autoRunOn})
-      : _tags = tags,
-        _autoRunOn = autoRunOn;
+  const _$SnippetImpl({
+    required this.name,
+    required this.script,
+    final List<String>? tags,
+    this.note,
+    final List<String>? autoRunOn,
+  }) : _tags = tags,
+       _autoRunOn = autoRunOn;
 
   factory _$SnippetImpl.fromJson(Map<String, dynamic> json) =>
       _$$SnippetImplFromJson(json);
 
   @override
-  @HiveField(0)
   final String name;
   @override
-  @HiveField(1)
   final String script;
   final List<String>? _tags;
   @override
-  @HiveField(2)
   List<String>? get tags {
     final value = _tags;
     if (value == null) return null;
@@ -193,7 +195,6 @@ class _$SnippetImpl implements _Snippet {
   }
 
   @override
-  @HiveField(3)
   final String? note;
 
   /// List of server id that this snippet should be auto run on
@@ -201,7 +202,6 @@ class _$SnippetImpl implements _Snippet {
 
   /// List of server id that this snippet should be auto run on
   @override
-  @HiveField(4)
   List<String>? get autoRunOn {
     final value = _autoRunOn;
     if (value == null) return null;
@@ -224,19 +224,22 @@ class _$SnippetImpl implements _Snippet {
             (identical(other.script, script) || other.script == script) &&
             const DeepCollectionEquality().equals(other._tags, _tags) &&
             (identical(other.note, note) || other.note == note) &&
-            const DeepCollectionEquality()
-                .equals(other._autoRunOn, _autoRunOn));
+            const DeepCollectionEquality().equals(
+              other._autoRunOn,
+              _autoRunOn,
+            ));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(
-      runtimeType,
-      name,
-      script,
-      const DeepCollectionEquality().hash(_tags),
-      note,
-      const DeepCollectionEquality().hash(_autoRunOn));
+    runtimeType,
+    name,
+    script,
+    const DeepCollectionEquality().hash(_tags),
+    note,
+    const DeepCollectionEquality().hash(_autoRunOn),
+  );
 
   /// Create a copy of Snippet
   /// with the given fields replaced by the non-null parameter values.
@@ -248,38 +251,32 @@ class _$SnippetImpl implements _Snippet {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$SnippetImplToJson(
-      this,
-    );
+    return _$$SnippetImplToJson(this);
   }
 }
 
 abstract class _Snippet implements Snippet {
-  const factory _Snippet(
-      {@HiveField(0) required final String name,
-      @HiveField(1) required final String script,
-      @HiveField(2) final List<String>? tags,
-      @HiveField(3) final String? note,
-      @HiveField(4) final List<String>? autoRunOn}) = _$SnippetImpl;
+  const factory _Snippet({
+    required final String name,
+    required final String script,
+    final List<String>? tags,
+    final String? note,
+    final List<String>? autoRunOn,
+  }) = _$SnippetImpl;
 
   factory _Snippet.fromJson(Map<String, dynamic> json) = _$SnippetImpl.fromJson;
 
   @override
-  @HiveField(0)
   String get name;
   @override
-  @HiveField(1)
   String get script;
   @override
-  @HiveField(2)
   List<String>? get tags;
   @override
-  @HiveField(3)
   String? get note;
 
   /// List of server id that this snippet should be auto run on
   @override
-  @HiveField(4)
   List<String>? get autoRunOn;
 
   /// Create a copy of Snippet

lib/data/model/server/snippet.g.dart

@@ -2,56 +2,6 @@
 
 part of 'snippet.dart';
 
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class SnippetAdapter extends TypeAdapter<Snippet> {
-  @override
-  final int typeId = 2;
-
-  @override
-  Snippet read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Snippet(
-      name: fields[0] as String,
-      script: fields[1] as String,
-      tags: (fields[2] as List?)?.cast<String>(),
-      note: fields[3] as String?,
-      autoRunOn: (fields[4] as List?)?.cast<String>(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Snippet obj) {
-    writer
-      ..writeByte(5)
-      ..writeByte(0)
-      ..write(obj.name)
-      ..writeByte(1)
-      ..write(obj.script)
-      ..writeByte(2)
-      ..write(obj.tags)
-      ..writeByte(3)
-      ..write(obj.note)
-      ..writeByte(4)
-      ..write(obj.autoRunOn);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is SnippetAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************

lib/data/model/server/wol_cfg.dart

@@ -1,19 +1,14 @@
 import 'dart:io';
 
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:wake_on_lan/wake_on_lan.dart';
 
 part 'wol_cfg.g.dart';
 
-@JsonSerializable()
-@HiveType(typeId: 8)
+@JsonSerializable(includeIfNull: false)
 final class WakeOnLanCfg {
-  @HiveField(0)
   final String mac;
-  @HiveField(1)
   final String ip;
-  @HiveField(2)
   final String? pwd;
 
   const WakeOnLanCfg({
@@ -26,18 +21,12 @@ final class WakeOnLanCfg {
     final macValidation = MACAddress.validate(mac);
     final ipValidation = IPAddress.validate(
       ip,
-      type: ip.contains(':')
-          ? InternetAddressType.IPv6
-          : InternetAddressType.IPv4,
+      type: ip.contains(':') ? InternetAddressType.IPv6 : InternetAddressType.IPv4,
     );
-    final pwdValidation = pwd != null
-        ? SecureONPassword.validate(pwd)
-        : (state: true, error: null);
+    final pwdValidation = pwd != null ? SecureONPassword.validate(pwd) : (state: true, error: null);
 
-    final valid =
-        macValidation.state && ipValidation.state && pwdValidation.state;
-    final err =
-        macValidation.error ?? ipValidation.error ?? pwdValidation.error;
+    final valid = macValidation.state && ipValidation.state && pwdValidation.state;
+    final err = macValidation.error ?? ipValidation.error ?? pwdValidation.error;
     return (err, valid);
   }
 
@@ -56,8 +45,7 @@ final class WakeOnLanCfg {
     );
   }
 
-  factory WakeOnLanCfg.fromJson(Map<String, dynamic> json) =>
-      _$WakeOnLanCfgFromJson(json);
+  factory WakeOnLanCfg.fromJson(Map<String, dynamic> json) => _$WakeOnLanCfgFromJson(json);
 
   Map<String, dynamic> toJson() => _$WakeOnLanCfgToJson(this);
 }

lib/data/model/server/wol_cfg.g.dart

@@ -2,63 +2,19 @@
 
 part of 'wol_cfg.dart';
 
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class WakeOnLanCfgAdapter extends TypeAdapter<WakeOnLanCfg> {
-  @override
-  final int typeId = 8;
-
-  @override
-  WakeOnLanCfg read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return WakeOnLanCfg(
-      mac: fields[0] as String,
-      ip: fields[1] as String,
-      pwd: fields[2] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, WakeOnLanCfg obj) {
-    writer
-      ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.mac)
-      ..writeByte(1)
-      ..write(obj.ip)
-      ..writeByte(2)
-      ..write(obj.pwd);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is WakeOnLanCfgAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
 WakeOnLanCfg _$WakeOnLanCfgFromJson(Map<String, dynamic> json) => WakeOnLanCfg(
-      mac: json['mac'] as String,
-      ip: json['ip'] as String,
-      pwd: json['pwd'] as String?,
-    );
+  mac: json['mac'] as String,
+  ip: json['ip'] as String,
+  pwd: json['pwd'] as String?,
+);
 
 Map<String, dynamic> _$WakeOnLanCfgToJson(WakeOnLanCfg instance) =>
     <String, dynamic>{
       'mac': instance.mac,
       'ip': instance.ip,
-      'pwd': instance.pwd,
+      if (instance.pwd case final value?) 'pwd': value,
     };