mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-18 14:23:42 +00:00
fix: avoid hanging the main thread on repeat start (#584)
This commit is contained in:
3 files changed
+20
-35
No files matched your search
+18
-7
@@ -19,31 +19,42 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
srv *http.Server
|
srv *http.Server
|
||||||
|
runningPort int
|
||||||
|
|
||||||
Downloader *download.Downloader
|
Downloader *download.Downloader
|
||||||
)
|
)
|
||||||
|
|
||||||
func Start(startCfg *model.StartConfig) (int, error) {
|
func Start(startCfg *model.StartConfig) (port int, err error) {
|
||||||
srv, listener, err := BuildServer(startCfg)
|
// avoid repeat start
|
||||||
|
if srv != nil {
|
||||||
|
return runningPort, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var listener net.Listener
|
||||||
|
srv, listener, err = BuildServer(startCfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
|
if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
port := 0
|
|
||||||
if addr, ok := listener.Addr().(*net.TCPAddr); ok {
|
if addr, ok := listener.Addr().(*net.TCPAddr); ok {
|
||||||
port = addr.Port
|
port = addr.Port
|
||||||
|
runningPort = port
|
||||||
}
|
}
|
||||||
return port, nil
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func Stop() {
|
func Stop() {
|
||||||
|
defer func() {
|
||||||
|
srv = nil
|
||||||
|
}()
|
||||||
|
|
||||||
if srv != nil {
|
if srv != nil {
|
||||||
if err := srv.Shutdown(context.TODO()); err != nil {
|
if err := srv.Shutdown(context.TODO()); err != nil {
|
||||||
Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
|
Downloader.Logger.Warn().Err(err).Msg("shutdown server failed")
|
||||||
|
|||||||
@@ -54,15 +54,6 @@ class Database {
|
|||||||
_startConfig, (json) => StartConfigEntity.fromJson(json));
|
_startConfig, (json) => StartConfigEntity.fromJson(json));
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveLastRunningConfig(StartConfigEntity entity) {
|
|
||||||
save<StartConfigEntity>(_lastRunningConfig, entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
StartConfigEntity? getLastRunningConfig() {
|
|
||||||
return get<StartConfigEntity>(
|
|
||||||
_lastRunningConfig, (json) => StartConfigEntity.fromJson(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Patch non-null fields with the original value
|
/// Patch non-null fields with the original value
|
||||||
void saveWindowState(WindowStateEntity entity) {
|
void saveWindowState(WindowStateEntity entity) {
|
||||||
final state = getWindowState();
|
final state = getWindowState();
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import 'package:args/args.dart';
|
import 'package:args/args.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
|
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
@@ -10,7 +9,6 @@ import 'app/modules/app/controllers/app_controller.dart';
|
|||||||
import 'app/modules/app/views/app_view.dart';
|
import 'app/modules/app/views/app_view.dart';
|
||||||
import 'core/libgopeed_boot.dart';
|
import 'core/libgopeed_boot.dart';
|
||||||
import 'database/database.dart';
|
import 'database/database.dart';
|
||||||
import 'database/entity.dart';
|
|
||||||
import 'i18n/message.dart';
|
import 'i18n/message.dart';
|
||||||
import 'util/locale_manager.dart';
|
import 'util/locale_manager.dart';
|
||||||
import 'util/log_util.dart';
|
import 'util/log_util.dart';
|
||||||
@@ -77,23 +75,8 @@ Future<void> init(Args args) async {
|
|||||||
try {
|
try {
|
||||||
await controller.loadStartConfig();
|
await controller.loadStartConfig();
|
||||||
final startCfg = controller.startConfig.value;
|
final startCfg = controller.startConfig.value;
|
||||||
// When the app is closed by swiping on the mobile, the backend server is actually still running, don't need to start again.
|
controller.runningPort.value = await LibgopeedBoot.instance.start(startCfg);
|
||||||
final isRunning =
|
api.init(startCfg.network, controller.runningAddress(), startCfg.apiToken);
|
||||||
Util.isMobile() && (await FlutterForegroundTask.isRunningService);
|
|
||||||
if (!isRunning) {
|
|
||||||
controller.runningPort.value =
|
|
||||||
await LibgopeedBoot.instance.start(startCfg);
|
|
||||||
api.init(
|
|
||||||
startCfg.network, controller.runningAddress(), startCfg.apiToken);
|
|
||||||
Database.instance.saveLastRunningConfig(StartConfigEntity(
|
|
||||||
network: startCfg.network,
|
|
||||||
address: controller.runningAddress(),
|
|
||||||
apiToken: startCfg.apiToken));
|
|
||||||
} else {
|
|
||||||
final lastRunningConfig = Database.instance.getLastRunningConfig()!;
|
|
||||||
api.init(lastRunningConfig.network, lastRunningConfig.address,
|
|
||||||
lastRunningConfig.apiToken);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.e("libgopeed init fail", e);
|
logger.e("libgopeed init fail", e);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user