Add basic flavors

This commit is contained in:
problematicconsumer
2023-09-12 15:22:58 +03:30
parent ea81be3763
commit f1b0f8ee4b
24 changed files with 271 additions and 293 deletions

33
.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,33 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Hiddify Dev",
"request": "launch",
"type": "dart",
"flutterMode": "debug",
"program": "lib/main_dev.dart",
},
{
"name": "Hiddify Dev Release",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/main_dev.dart",
},
{
"name": "Hiddify Dev Profile",
"request": "launch",
"type": "dart",
"flutterMode": "profile",
"program": "lib/main_dev.dart",
},
{
"name": "Hiddify Prod",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/main_prod.dart",
}
]
}

View File

@@ -15,6 +15,13 @@ else
CORE_URL=https://github.com/hiddify/hiddify-next-core/releases/download/draft CORE_URL=https://github.com/hiddify/hiddify-next-core/releases/download/draft
endif endif
ifeq ($(BRANCH),RELEASE)
FLAVOR=prod
else
FLAVOR=dev
endif
TARGET=lib/main_$(FLAVOR).dart
get: get:
flutter pub get flutter pub get
@@ -25,23 +32,24 @@ translate:
dart run slang dart run slang
android-release: android-aab-release android-apk-release android-release: android-aab-release android-apk-release
android-apk-release: android-apk-release:
flutter build apk --target-platform android-arm,android-arm64,android-x64 --split-per-abi flutter build apk --target-platform android-arm,android-arm64,android-x64 --split-per-abi --target $(TARGET)
android-aab-release: android-aab-release:
flutter build appbundle flutter build appbundle --target $(TARGET)
windows-release: windows-release:
flutter_distributor package --platform windows --targets exe --skip-clean flutter_distributor package --platform windows --targets exe --skip-clean --build-target $(TARGET)
linux-release: linux-release:
flutter_distributor package --platform linux --targets appimage --skip-clean flutter_distributor package --platform linux --targets appimage --skip-clean --build-target $(TARGET)
macos-release: macos-release:
flutter_distributor package --platform macos --targets dmg --skip-clean flutter_distributor package --platform macos --targets dmg --skip-clean --build-target $(TARGET)
ios-release: #not tested ios-release: #not tested
flutter_distributor package --platform ios --targets ipa --build-export-options-plist ios/exportOptions.plist flutter_distributor package --platform ios --targets ipa --build-export-options-plist ios/exportOptions.plist --build-target $(TARGET)
android-libs: android-libs:
mkdir -p $(ANDROID_OUT) mkdir -p $(ANDROID_OUT)

View File

@@ -5,10 +5,12 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:hiddify/core/app/app.dart'; import 'package:hiddify/core/app/app.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/data/data_providers.dart'; import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/data/repository/app_repository_impl.dart';
import 'package:hiddify/domain/environment.dart';
import 'package:hiddify/features/common/active_profile/active_profile_notifier.dart'; import 'package:hiddify/features/common/active_profile/active_profile_notifier.dart';
import 'package:hiddify/features/common/common.dart';
import 'package:hiddify/features/common/window/window_controller.dart'; import 'package:hiddify/features/common/window/window_controller.dart';
import 'package:hiddify/features/system_tray/system_tray.dart'; import 'package:hiddify/features/system_tray/system_tray.dart';
import 'package:hiddify/services/auto_start_service.dart'; import 'package:hiddify/services/auto_start_service.dart';
@@ -23,15 +25,22 @@ import 'package:window_manager/window_manager.dart';
final _loggy = Loggy('bootstrap'); final _loggy = Loggy('bootstrap');
final _stopWatch = Stopwatch(); final _stopWatch = Stopwatch();
Future<void> lazyBootstrap(WidgetsBinding widgetsBinding) async { Future<void> lazyBootstrap(
WidgetsBinding widgetsBinding,
Environment env,
) async {
_stopWatch.start(); _stopWatch.start();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
if (PlatformUtils.isDesktop) await windowManager.ensureInitialized(); if (PlatformUtils.isDesktop) await windowManager.ensureInitialized();
final appInfo = await AppRepositoryImpl.getAppInfo(env);
final sharedPreferences = await SharedPreferences.getInstance(); final sharedPreferences = await SharedPreferences.getInstance();
final container = ProviderContainer( final container = ProviderContainer(
overrides: [sharedPreferencesProvider.overrideWithValue(sharedPreferences)], overrides: [
appInfoProvider.overrideWithValue(appInfo),
sharedPreferencesProvider.overrideWithValue(sharedPreferences),
],
); );
final debug = container.read(debugModeNotifierProvider) || kDebugMode; final debug = container.read(debugModeNotifierProvider) || kDebugMode;
@@ -40,7 +49,9 @@ Future<void> lazyBootstrap(WidgetsBinding widgetsBinding) async {
await filesEditor.init(); await filesEditor.init();
initLoggers(container.read, debug); initLoggers(container.read, debug);
await container.read(runtimeDetailsServiceProvider).init(); _loggy.info(
"os: [${Platform.operatingSystem}](${Platform.operatingSystemVersion}), processor count [${Platform.numberOfProcessors}]",
);
_loggy.info("basic setup took [${_stopWatch.elapsedMilliseconds}]ms"); _loggy.info("basic setup took [${_stopWatch.elapsedMilliseconds}]ms");
final silentStart = container.read(silentStartNotifierProvider); final silentStart = container.read(silentStartNotifierProvider);
@@ -104,7 +115,6 @@ Future<void> initControllers(
[ [
read(activeProfileProvider.future), read(activeProfileProvider.future),
read(deepLinkServiceProvider.future), read(deepLinkServiceProvider.future),
read(runtimeDetailsNotifierProvider.future),
if (PlatformUtils.isDesktop) read(systemTrayControllerProvider.future), if (PlatformUtils.isDesktop) read(systemTrayControllerProvider.future),
], ],
); );

View File

@@ -1,8 +1,17 @@
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/domain/app/app.dart';
import 'package:hiddify/domain/environment.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'core_providers.g.dart'; part 'core_providers.g.dart';
@Riverpod(keepAlive: true)
AppInfo appInfo(AppInfoRef ref) =>
throw UnimplementedError('AppInfo must be overridden');
@Riverpod(keepAlive: true)
Environment env(EnvRef ref) => ref.watch(appInfoProvider).environment;
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
TranslationsEn translations(TranslationsRef ref) => TranslationsEn translations(TranslationsRef ref) =>
ref.watch(localeNotifierProvider).build(); ref.watch(localeNotifierProvider).build();

View File

@@ -1,4 +1,6 @@
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/data/data_providers.dart'; import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/environment.dart';
import 'package:hiddify/utils/pref_notifier.dart'; import 'package:hiddify/utils/pref_notifier.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -20,8 +22,11 @@ class SilentStartNotifier extends _$SilentStartNotifier {
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
class DebugModeNotifier extends _$DebugModeNotifier { class DebugModeNotifier extends _$DebugModeNotifier {
late final _pref = late final _pref = Pref(
Pref(ref.watch(sharedPreferencesProvider), "debug_mode", false); ref.watch(sharedPreferencesProvider),
"debug_mode",
ref.read(envProvider) == Environment.dev,
);
@override @override
bool build() => _pref.getValue(); bool build() => _pref.getValue();

View File

@@ -1,10 +1,11 @@
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/data/api/clash_api.dart'; import 'package:hiddify/data/api/clash_api.dart';
import 'package:hiddify/data/local/dao/dao.dart'; import 'package:hiddify/data/local/dao/dao.dart';
import 'package:hiddify/data/local/database.dart'; import 'package:hiddify/data/local/database.dart';
import 'package:hiddify/data/repository/app_repository_impl.dart';
import 'package:hiddify/data/repository/config_options_store.dart'; import 'package:hiddify/data/repository/config_options_store.dart';
import 'package:hiddify/data/repository/repository.dart'; import 'package:hiddify/data/repository/repository.dart';
import 'package:hiddify/data/repository/update_repository_impl.dart';
import 'package:hiddify/domain/app/app.dart'; import 'package:hiddify/domain/app/app.dart';
import 'package:hiddify/domain/constants.dart'; import 'package:hiddify/domain/constants.dart';
import 'package:hiddify/domain/core_facade.dart'; import 'package:hiddify/domain/core_facade.dart';
@@ -27,7 +28,7 @@ SharedPreferences sharedPreferences(SharedPreferencesRef ref) =>
Dio dio(DioRef ref) => Dio( Dio dio(DioRef ref) => Dio(
BaseOptions( BaseOptions(
headers: { headers: {
"User-Agent": ref.watch(runtimeDetailsServiceProvider).userAgent, "User-Agent": ref.watch(appInfoProvider).userAgent,
}, },
), ),
); );
@@ -47,8 +48,8 @@ ProfilesRepository profilesRepository(ProfilesRepositoryRef ref) =>
); );
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
UpdateRepository updateRepository(UpdateRepositoryRef ref) => AppRepository appRepository(AppRepositoryRef ref) =>
UpdateRepositoryImpl(ref.watch(dioProvider)); AppRepositoryImpl(ref.watch(dioProvider));
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
ClashApi clashApi(ClashApiRef ref) => ClashApi(Defaults.clashApiPort); ClashApi clashApi(ClashApiRef ref) => ClashApi(Defaults.clashApiPort);

View File

@@ -1,41 +1,35 @@
import 'dart:io';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:fpdart/fpdart.dart'; import 'package:fpdart/fpdart.dart';
import 'package:hiddify/data/repository/exception_handlers.dart'; import 'package:hiddify/data/repository/exception_handlers.dart';
import 'package:hiddify/domain/app/app.dart'; import 'package:hiddify/domain/app/app.dart';
import 'package:hiddify/domain/constants.dart'; import 'package:hiddify/domain/constants.dart';
import 'package:hiddify/domain/environment.dart';
import 'package:hiddify/utils/custom_loggers.dart'; import 'package:hiddify/utils/custom_loggers.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
class UpdateRepositoryImpl class AppRepositoryImpl
with ExceptionHandler, InfraLogger with ExceptionHandler, InfraLogger
implements UpdateRepository { implements AppRepository {
UpdateRepositoryImpl(this.dio); AppRepositoryImpl(this.dio);
final Dio dio; final Dio dio;
@override static Future<AppInfo> getAppInfo(Environment environment) async {
TaskEither<UpdateFailure, InstalledVersionInfo> getCurrentVersion() { final packageInfo = await PackageInfo.fromPlatform();
return exceptionHandler( return AppInfo(
() async { name: packageInfo.appName,
loggy.debug("getting current app version"); version: packageInfo.version,
final packageInfo = await PackageInfo.fromPlatform(); buildNumber: packageInfo.buildNumber,
return right( installerMedia: packageInfo.installerStore,
InstalledVersionInfo( operatingSystem: Platform.operatingSystem,
version: packageInfo.version, environment: environment,
buildNumber: packageInfo.buildNumber,
installerMedia: packageInfo.installerStore,
),
);
},
(error, stackTrace) {
loggy.warning("error getting current app version", error, stackTrace);
return UpdateFailure.unexpected(error, stackTrace);
},
); );
} }
@override @override
TaskEither<UpdateFailure, RemoteVersionInfo> getLatestVersion({ TaskEither<AppFailure, RemoteVersionInfo> getLatestVersion({
bool includePreReleases = false, bool includePreReleases = false,
}) { }) {
return exceptionHandler( return exceptionHandler(
@@ -44,7 +38,7 @@ class UpdateRepositoryImpl
if (response.statusCode != 200 || response.data == null) { if (response.statusCode != 200 || response.data == null) {
loggy.warning("failed to fetch latest version info"); loggy.warning("failed to fetch latest version info");
return left(const UpdateFailure.unexpected()); return left(const AppFailure.unexpected());
} }
final releases = response.data! final releases = response.data!
@@ -57,7 +51,7 @@ class UpdateRepositoryImpl
} }
return right(latest); return right(latest);
}, },
UpdateFailure.unexpected, AppFailure.unexpected,
); );
} }
} }

View File

@@ -1,3 +1,3 @@
export 'update_failure.dart'; export 'app_failure.dart';
export 'update_repository.dart'; export 'app_info.dart';
export 'version_info.dart'; export 'app_repository.dart';

View File

@@ -2,13 +2,13 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/core/prefs/prefs.dart'; import 'package:hiddify/core/prefs/prefs.dart';
import 'package:hiddify/domain/failures.dart'; import 'package:hiddify/domain/failures.dart';
part 'update_failure.freezed.dart'; part 'app_failure.freezed.dart';
@freezed @freezed
sealed class UpdateFailure with _$UpdateFailure, Failure { sealed class AppFailure with _$AppFailure, Failure {
const UpdateFailure._(); const AppFailure._();
const factory UpdateFailure.unexpected([ const factory AppFailure.unexpected([
Object? error, Object? error,
StackTrace? stackTrace, StackTrace? stackTrace,
]) = UpdateUnexpectedFailure; ]) = UpdateUnexpectedFailure;

View File

@@ -1,24 +1,27 @@
import 'package:dartx/dartx.dart'; import 'package:dartx/dartx.dart';
import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/domain/environment.dart';
part 'version_info.freezed.dart'; part 'app_info.freezed.dart';
part 'version_info.g.dart'; part 'app_info.g.dart';
@freezed @freezed
class InstalledVersionInfo with _$InstalledVersionInfo { class AppInfo with _$AppInfo {
const InstalledVersionInfo._(); const AppInfo._();
const factory InstalledVersionInfo({ const factory AppInfo({
required String name,
required String version, required String version,
required String buildNumber, required String buildNumber,
String? installerMedia, String? installerMedia,
}) = _InstalledVersionInfo; required String operatingSystem,
required Environment environment,
}) = _AppInfo;
String get fullVersion => String get userAgent => "HiddifyNext/$version ($operatingSystem)";
buildNumber.isBlank ? version : "$version+$buildNumber";
factory InstalledVersionInfo.fromJson(Map<String, dynamic> json) => factory AppInfo.fromJson(Map<String, dynamic> json) =>
_$InstalledVersionInfoFromJson(json); _$AppInfoFromJson(json);
} }
// TODO ignore drafts // TODO ignore drafts

View File

@@ -0,0 +1,9 @@
import 'package:fpdart/fpdart.dart';
import 'package:hiddify/domain/app/app_failure.dart';
import 'package:hiddify/domain/app/app_info.dart';
abstract interface class AppRepository {
TaskEither<AppFailure, RemoteVersionInfo> getLatestVersion({
bool includePreReleases = false,
});
}

View File

@@ -1,11 +0,0 @@
import 'package:fpdart/fpdart.dart';
import 'package:hiddify/domain/app/update_failure.dart';
import 'package:hiddify/domain/app/version_info.dart';
abstract interface class UpdateRepository {
TaskEither<UpdateFailure, InstalledVersionInfo> getCurrentVersion();
TaskEither<UpdateFailure, RemoteVersionInfo> getLatestVersion({
bool includePreReleases = false,
});
}

View File

@@ -0,0 +1,4 @@
enum Environment {
prod,
dev;
}

View File

@@ -3,8 +3,8 @@ import 'package:gap/gap.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/domain/constants.dart'; import 'package:hiddify/domain/constants.dart';
import 'package:hiddify/domain/failures.dart'; import 'package:hiddify/domain/failures.dart';
import 'package:hiddify/features/common/common.dart';
import 'package:hiddify/features/common/new_version_dialog.dart'; import 'package:hiddify/features/common/new_version_dialog.dart';
import 'package:hiddify/features/common/runtime_details.dart';
import 'package:hiddify/gen/assets.gen.dart'; import 'package:hiddify/gen/assets.gen.dart';
import 'package:hiddify/services/service_providers.dart'; import 'package:hiddify/services/service_providers.dart';
import 'package:hiddify/utils/utils.dart'; import 'package:hiddify/utils/utils.dart';
@@ -16,33 +16,22 @@ class AboutPage extends HookConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider); final t = ref.watch(translationsProvider);
final appVersion = ref.watch(appVersionProvider); final appInfo = ref.watch(appInfoProvider);
final appUpdate = ref.watch(appUpdateNotifierProvider);
final isCheckingForUpdate = ref.watch(
runtimeDetailsNotifierProvider.select(
(value) => value.maybeWhen(
data: (data) => data.latestVersion.isLoading,
orElse: () => false,
),
),
);
ref.listen( ref.listen(
runtimeDetailsNotifierProvider, appUpdateNotifierProvider,
(_, next) async { (_, next) async {
if (next case AsyncData(:final value)) { switch (next) {
switch (value.latestVersion) { case AsyncData(value: final remoteVersion?):
case AsyncError(:final error): await NewVersionDialog(
CustomToast.error(t.printError(error)).show(context); appInfo.version,
default: remoteVersion,
if (value.newVersionAvailable) { canIgnore: false,
await NewVersionDialog( ).show(context);
value.appVersion, case AsyncError(:final error):
value.latestVersion.value!, if (!context.mounted) return;
canIgnore: false, CustomToast.error(t.printError(error)).show(context);
).show(context);
}
}
} }
}, },
); );
@@ -53,86 +42,77 @@ class AboutPage extends HookConsumerWidget {
SliverAppBar( SliverAppBar(
title: Text(t.about.pageTitle), title: Text(t.about.pageTitle),
), ),
...switch (appVersion) { SliverToBoxAdapter(
AsyncData(:final value) => [ child: Padding(
SliverToBoxAdapter( padding: const EdgeInsets.all(16),
child: Padding( child: Row(
padding: const EdgeInsets.all(16), mainAxisAlignment: MainAxisAlignment.center,
child: Row( children: [
mainAxisAlignment: MainAxisAlignment.center, Assets.images.logo.svg(width: 64, height: 64),
children: [ const Gap(16),
Assets.images.logo.svg(width: 64, height: 64), Column(
const Gap(16), crossAxisAlignment: CrossAxisAlignment.start,
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, Text(
children: [ t.general.appTitle,
Text( style: Theme.of(context).textTheme.titleLarge,
t.general.appTitle,
style: Theme.of(context).textTheme.titleLarge,
),
const Gap(4),
Text(
"${t.about.version} ${value.version} ${value.buildNumber}",
),
],
),
],
),
),
),
SliverList(
delegate: SliverChildListDelegate(
[
ListTile(
title: Text(t.about.sourceCode),
trailing: const Icon(Icons.open_in_new),
onTap: () async {
await UriUtils.tryLaunch(
Uri.parse(Constants.githubUrl),
);
},
), ),
ListTile( const Gap(4),
title: Text(t.about.telegramChannel), Text(
trailing: const Icon(Icons.open_in_new), "${t.about.version} ${appInfo.version}",
onTap: () async {
await UriUtils.tryLaunch(
Uri.parse(Constants.telegramChannelUrl),
);
},
),
ListTile(
title: Text(t.about.checkForUpdate),
trailing: isCheckingForUpdate
? const SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(),
)
: const Icon(Icons.update),
onTap: () async {
await ref
.read(runtimeDetailsNotifierProvider.notifier)
.checkForUpdates();
},
),
ListTile(
title: Text(t.settings.general.openWorkingDir),
trailing: const Icon(Icons.arrow_outward_outlined),
onTap: () async {
final path = ref
.read(filesEditorServiceProvider)
.workingDir
.uri;
await UriUtils.tryLaunch(path);
},
), ),
], ],
), ),
],
),
),
),
SliverList(
delegate: SliverChildListDelegate(
[
ListTile(
title: Text(t.about.sourceCode),
trailing: const Icon(Icons.open_in_new),
onTap: () async {
await UriUtils.tryLaunch(
Uri.parse(Constants.githubUrl),
);
},
),
ListTile(
title: Text(t.about.telegramChannel),
trailing: const Icon(Icons.open_in_new),
onTap: () async {
await UriUtils.tryLaunch(
Uri.parse(Constants.telegramChannelUrl),
);
},
),
ListTile(
title: Text(t.about.checkForUpdate),
trailing: appUpdate.isLoading
? const SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(),
)
: const Icon(Icons.update),
onTap: () {
ref.invalidate(appUpdateNotifierProvider);
},
),
ListTile(
title: Text(t.settings.general.openWorkingDir),
trailing: const Icon(Icons.arrow_outward_outlined),
onTap: () async {
final path =
ref.read(filesEditorServiceProvider).workingDir.uri;
await UriUtils.tryLaunch(path);
},
), ),
], ],
_ => [], ),
}, ),
], ],
), ),
); );

View File

@@ -0,0 +1,33 @@
import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/app/app.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'app_update_notifier.g.dart';
@Riverpod(keepAlive: true)
class AppUpdateNotifier extends _$AppUpdateNotifier with AppLogger {
@override
Future<RemoteVersionInfo?> build() async {
loggy.debug("checking for update");
final currentVersion = ref.watch(appInfoProvider).version;
return ref
.watch(appRepositoryProvider)
.getLatestVersion(includePreReleases: true)
.match(
(l) {
loggy.warning("failed to get latest version, $l");
throw l;
},
(remote) {
if (remote.version.compareTo(currentVersion) > 0) {
loggy.info("new version available: $remote");
return remote;
}
loggy.info("already using latest version[$currentVersion], remote: $remote");
return null;
},
).run();
}
}

View File

@@ -1,5 +1,5 @@
export 'app_update_notifier.dart';
export 'confirmation_dialogs.dart'; export 'confirmation_dialogs.dart';
export 'custom_app_bar.dart'; export 'custom_app_bar.dart';
export 'profile_tile.dart'; export 'profile_tile.dart';
export 'qr_code_scanner_screen.dart'; export 'qr_code_scanner_screen.dart';
export 'runtime_details.dart';

View File

@@ -16,7 +16,7 @@ class NewVersionDialog extends HookConsumerWidget {
this.canIgnore = true, this.canIgnore = true,
}); });
final InstalledVersionInfo currentVersion; final String currentVersion;
final RemoteVersionInfo newVersion; final RemoteVersionInfo newVersion;
final bool canIgnore; final bool canIgnore;
@@ -48,7 +48,7 @@ class NewVersionDialog extends HookConsumerWidget {
style: theme.textTheme.bodySmall, style: theme.textTheme.bodySmall,
), ),
TextSpan( TextSpan(
text: currentVersion.fullVersion, text: currentVersion,
style: theme.textTheme.labelMedium, style: theme.textTheme.labelMedium,
), ),
], ],

View File

@@ -1,79 +0,0 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:hiddify/data/data_providers.dart';
import 'package:hiddify/domain/app/app.dart';
import 'package:hiddify/utils/utils.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'runtime_details.freezed.dart';
part 'runtime_details.g.dart';
// TODO add clash version
@Riverpod(keepAlive: true)
class RuntimeDetailsNotifier extends _$RuntimeDetailsNotifier with AppLogger {
@override
Future<RuntimeDetails> build() async {
loggy.debug("initializing");
final appVersion = await ref
.watch(updateRepositoryProvider)
.getCurrentVersion()
.getOrElse((l) => throw l)
.run();
return RuntimeDetails(appVersion: appVersion);
}
Future<void> checkForUpdates() async {
if (state case AsyncData(:final value)) {
switch (value.latestVersion) {
case AsyncLoading():
return;
default:
loggy.debug("checking for updates");
state =
AsyncData(value.copyWith(latestVersion: const AsyncLoading()));
// TODO use prefs
const includePreReleases = true;
await ref
.read(updateRepositoryProvider)
.getLatestVersion(includePreReleases: includePreReleases)
.match(
(l) {
loggy.warning("failed to get latest version, $l");
state = AsyncData(
value.copyWith(
latestVersion: AsyncError(l, StackTrace.current),
),
);
},
(r) {
state = AsyncData(
value.copyWith(latestVersion: AsyncData(r)),
);
},
).run();
}
}
}
}
@Riverpod(keepAlive: true)
AsyncValue<InstalledVersionInfo> appVersion(AppVersionRef ref) => ref.watch(
runtimeDetailsNotifierProvider
.select((value) => value.whenData((value) => value.appVersion)),
);
@freezed
class RuntimeDetails with _$RuntimeDetails {
const RuntimeDetails._();
const factory RuntimeDetails({
required InstalledVersionInfo appVersion,
@Default(AsyncData(null)) AsyncValue<RemoteVersionInfo?> latestVersion,
}) = _RuntimeDetails;
bool get newVersionAvailable => latestVersion.maybeWhen(
data: (data) =>
data != null &&
data.fullVersion.compareTo(this.appVersion.fullVersion) > 0,
orElse: () => false,
);
}

View File

@@ -1,7 +1,9 @@
import 'package:dartx/dartx.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:hiddify/core/core_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/core/router/router.dart'; import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/domain/environment.dart';
import 'package:hiddify/domain/failures.dart'; import 'package:hiddify/domain/failures.dart';
import 'package:hiddify/features/common/active_profile/active_profile_notifier.dart'; import 'package:hiddify/features/common/active_profile/active_profile_notifier.dart';
import 'package:hiddify/features/common/active_profile/has_any_profile_notifier.dart'; import 'package:hiddify/features/common/active_profile/has_any_profile_notifier.dart';
@@ -86,16 +88,12 @@ class AppVersionLabel extends HookConsumerWidget {
final t = ref.watch(translationsProvider); final t = ref.watch(translationsProvider);
final theme = Theme.of(context); final theme = Theme.of(context);
final version = ref.watch( final appInfo = ref.watch(appInfoProvider);
appVersionProvider.select( final version = appInfo.version +
(value) => switch (value) { (appInfo.environment == Environment.prod
AsyncData(:final value) => value.version, ? ""
_ => "", : " ${appInfo.environment.name}");
}, if (version.isBlank) return const SizedBox();
),
);
if (version.isEmpty) return const SizedBox();
return Semantics( return Semantics(
label: t.about.version, label: t.about.version,
@@ -111,6 +109,7 @@ class AppVersionLabel extends HookConsumerWidget {
), ),
child: Text( child: Text(
version, version,
textDirection: TextDirection.ltr,
style: theme.textTheme.bodySmall?.copyWith( style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSecondaryContainer, color: theme.colorScheme.onSecondaryContainer,
), ),

View File

@@ -1,7 +1,8 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:hiddify/bootstrap.dart'; import 'package:hiddify/bootstrap.dart';
import 'package:hiddify/domain/environment.dart';
void main() async { void main() async {
final widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
return lazyBootstrap(widgetsBinding); return lazyBootstrap(widgetsBinding, Environment.dev);
} }

8
lib/main_prod.dart Normal file
View File

@@ -0,0 +1,8 @@
import 'package:flutter/widgets.dart';
import 'package:hiddify/bootstrap.dart';
import 'package:hiddify/domain/environment.dart';
void main() async {
final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
return lazyBootstrap(widgetsBinding, Environment.prod);
}

View File

@@ -1,6 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:hiddify/services/service_providers.dart'; import 'package:hiddify/core/core_providers.dart';
import 'package:hiddify/utils/utils.dart'; import 'package:hiddify/utils/utils.dart';
import 'package:launch_at_startup/launch_at_startup.dart'; import 'package:launch_at_startup/launch_at_startup.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -13,9 +13,9 @@ class AutoStartService extends _$AutoStartService with InfraLogger {
Future<bool> build() async { Future<bool> build() async {
loggy.debug("initializing"); loggy.debug("initializing");
if (!PlatformUtils.isDesktop) return false; if (!PlatformUtils.isDesktop) return false;
final packageInfo = ref.watch(runtimeDetailsServiceProvider).packageInfo; final appInfo = ref.watch(appInfoProvider);
launchAtStartup.setup( launchAtStartup.setup(
appName: packageInfo.appName, appName: appInfo.name,
appPath: Platform.resolvedExecutable, appPath: Platform.resolvedExecutable,
); );
final isEnabled = await launchAtStartup.isEnabled(); final isEnabled = await launchAtStartup.isEnabled();

View File

@@ -1,24 +0,0 @@
import 'dart:io';
import 'package:hiddify/utils/utils.dart';
import 'package:package_info_plus/package_info_plus.dart';
class RuntimeDetailsService with InfraLogger {
late final PackageInfo packageInfo;
String get appVersion => packageInfo.version;
String get buildNumber => packageInfo.buildNumber;
late final String operatingSystem = Platform.operatingSystem;
late final String userAgent;
Future<void> init() async {
loggy.debug("initializing");
packageInfo = await PackageInfo.fromPlatform();
userAgent = "HiddifyNext/$appVersion ($operatingSystem)";
loggy.info(
"os: [$operatingSystem](${Platform.operatingSystemVersion}), processor count [${Platform.numberOfProcessors}]",
);
}
}

View File

@@ -1,6 +1,5 @@
import 'package:hiddify/services/files_editor_service.dart'; import 'package:hiddify/services/files_editor_service.dart';
import 'package:hiddify/services/platform_settings.dart'; import 'package:hiddify/services/platform_settings.dart';
import 'package:hiddify/services/runtime_details_service.dart';
import 'package:hiddify/services/singbox/singbox_service.dart'; import 'package:hiddify/services/singbox/singbox_service.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -10,10 +9,6 @@ part 'service_providers.g.dart';
FilesEditorService filesEditorService(FilesEditorServiceRef ref) => FilesEditorService filesEditorService(FilesEditorServiceRef ref) =>
FilesEditorService(); FilesEditorService();
@Riverpod(keepAlive: true)
RuntimeDetailsService runtimeDetailsService(RuntimeDetailsServiceRef ref) =>
RuntimeDetailsService();
@Riverpod(keepAlive: true) @Riverpod(keepAlive: true)
SingboxService singboxService(SingboxServiceRef ref) => SingboxService(); SingboxService singboxService(SingboxServiceRef ref) => SingboxService();