Skip to content

Commit 68e5a31

Browse files
fix: net.isOnline always true in utility processes (#48152)
* fix: net.isOnline always true in utilityProcesses Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * Update shell/services/node/node_service.cc Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent 024d339 commit 68e5a31

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

shell/services/node/node_service.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "base/process/process.h"
1313
#include "base/strings/utf_string_conversions.h"
1414
#include "electron/mas.h"
15+
#include "net/base/network_change_notifier.h"
1516
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
1617
#include "services/network/public/mojom/host_resolver.mojom.h"
1718
#include "services/network/public/mojom/network_context.mojom.h"
@@ -126,6 +127,10 @@ void NodeService::Initialize(
126127

127128
node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
128129

130+
network_change_notifier_ = net::NetworkChangeNotifier::CreateIfNeeded(
131+
net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
132+
net::NetworkChangeNotifier::ConnectionSubtype::SUBTYPE_UNKNOWN);
133+
129134
// Append program path for process.argv0
130135
auto program = base::CommandLine::ForCurrentProcess()->GetProgram();
131136
#if defined(OS_WIN)

shell/services/node/node_service.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "mojo/public/cpp/bindings/pending_remote.h"
1212
#include "mojo/public/cpp/bindings/receiver.h"
1313
#include "mojo/public/cpp/bindings/remote.h"
14+
#include "net/base/network_change_notifier.h"
1415
#include "services/network/public/cpp/shared_url_loader_factory.h"
1516
#include "services/network/public/mojom/host_resolver.mojom.h"
1617
#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
@@ -84,6 +85,8 @@ class NodeService : public node::mojom::NodeService {
8485

8586
// depends-on: js_env_'s isolate
8687
std::shared_ptr<node::Environment> node_env_;
88+
89+
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
8790
};
8891

8992
} // namespace electron

0 commit comments

Comments
 (0)