d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
182 lines
5.8 KiB
Text
182 lines
5.8 KiB
Text
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/auto_updater.h"
|
|
|
|
#include <string>
|
|
|
|
#import <ReactiveObjC/NSObject+RACPropertySubscribing.h>
|
|
#import <ReactiveObjC/RACCommand.h>
|
|
#import <ReactiveObjC/RACSignal.h>
|
|
#import <Squirrel/Squirrel.h>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/time/time.h"
|
|
#include "gin/arguments.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/error_thrower.h"
|
|
|
|
namespace auto_updater {
|
|
|
|
namespace {
|
|
|
|
// The global SQRLUpdater object.
|
|
SQRLUpdater* g_updater = nil;
|
|
|
|
} // namespace
|
|
|
|
namespace {
|
|
|
|
bool g_update_available = false;
|
|
std::string update_url_ = ""; // NOLINT(runtime/string)
|
|
|
|
} // namespace
|
|
|
|
std::string AutoUpdater::GetFeedURL() {
|
|
return update_url_;
|
|
}
|
|
|
|
// static
|
|
void AutoUpdater::SetFeedURL(gin::Arguments* args) {
|
|
gin_helper::ErrorThrower thrower(args->isolate());
|
|
gin_helper::Dictionary opts;
|
|
|
|
std::string feed;
|
|
HeaderMap requestHeaders;
|
|
std::string serverType = "default";
|
|
v8::Local<v8::Value> first_arg = args->PeekNext();
|
|
if (!first_arg.IsEmpty() && first_arg->IsString()) {
|
|
if (args->GetNext(&feed)) {
|
|
args->GetNext(&requestHeaders);
|
|
}
|
|
} else if (args->GetNext(&opts)) {
|
|
if (!opts.Get("url", &feed)) {
|
|
thrower.ThrowError(
|
|
"Expected options object to contain a 'url' string property in "
|
|
"setFeedUrl call");
|
|
return;
|
|
}
|
|
opts.Get("headers", &requestHeaders);
|
|
opts.Get("serverType", &serverType);
|
|
if (serverType != "default" && serverType != "json") {
|
|
thrower.ThrowError("Expected serverType to be 'default' or 'json'");
|
|
return;
|
|
}
|
|
} else {
|
|
thrower.ThrowError(
|
|
"Expected an options object with a 'url' property to be provided");
|
|
return;
|
|
}
|
|
|
|
Delegate* delegate = GetDelegate();
|
|
if (!delegate)
|
|
return;
|
|
|
|
update_url_ = feed;
|
|
|
|
NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
|
|
NSMutableURLRequest* urlRequest = [NSMutableURLRequest requestWithURL:url];
|
|
|
|
for (const auto& it : requestHeaders) {
|
|
[urlRequest setValue:base::SysUTF8ToNSString(it.second)
|
|
forHTTPHeaderField:base::SysUTF8ToNSString(it.first)];
|
|
}
|
|
|
|
if (g_updater)
|
|
[g_updater release];
|
|
|
|
// Initialize the SQRLUpdater.
|
|
@try {
|
|
if (serverType == "json") {
|
|
NSString* nsAppVersion =
|
|
base::SysUTF8ToNSString(electron::Browser::Get()->GetVersion());
|
|
g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest
|
|
forVersion:nsAppVersion];
|
|
} else {
|
|
// default
|
|
g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
|
|
}
|
|
} @catch (NSException* error) {
|
|
delegate->OnError(base::SysNSStringToUTF8(error.reason));
|
|
return;
|
|
}
|
|
|
|
[[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
|
|
subscribeNext:^(NSNumber* stateNumber) {
|
|
int state = [stateNumber integerValue];
|
|
// Dispatching the event on main thread.
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
if (state == SQRLUpdaterStateCheckingForUpdate)
|
|
delegate->OnCheckingForUpdate();
|
|
else if (state == SQRLUpdaterStateDownloadingUpdate)
|
|
delegate->OnUpdateAvailable();
|
|
});
|
|
}];
|
|
}
|
|
|
|
// static
|
|
void AutoUpdater::CheckForUpdates() {
|
|
Delegate* delegate = GetDelegate();
|
|
if (!delegate)
|
|
return;
|
|
|
|
[[[[g_updater.checkForUpdatesCommand execute:nil]
|
|
// Send a `nil` after everything...
|
|
concat:[RACSignal return:nil]]
|
|
// But only take the first value. If an update is sent, we'll get that.
|
|
// Otherwise, we'll get our inserted `nil` value.
|
|
take:1]
|
|
subscribeNext:^(SQRLDownloadedUpdate* downloadedUpdate) {
|
|
if (downloadedUpdate) {
|
|
g_update_available = true;
|
|
SQRLUpdate* update = downloadedUpdate.update;
|
|
// There is a new update that has been downloaded.
|
|
delegate->OnUpdateDownloaded(
|
|
base::SysNSStringToUTF8(update.releaseNotes),
|
|
base::SysNSStringToUTF8(update.releaseName),
|
|
base::Time::FromDoubleT(update.releaseDate.timeIntervalSince1970),
|
|
base::SysNSStringToUTF8(update.updateURL.absoluteString));
|
|
} else {
|
|
g_update_available = false;
|
|
// When the completed event is sent with no update, then we know there
|
|
// is no update available.
|
|
delegate->OnUpdateNotAvailable();
|
|
}
|
|
}
|
|
error:^(NSError* error) {
|
|
NSMutableString* failureString =
|
|
[NSMutableString stringWithString:error.localizedDescription];
|
|
if (error.localizedFailureReason) {
|
|
[failureString appendString:@": "];
|
|
[failureString appendString:error.localizedFailureReason];
|
|
}
|
|
if (error.localizedRecoverySuggestion) {
|
|
if (![failureString hasSuffix:@"."])
|
|
[failureString appendString:@"."];
|
|
[failureString appendString:@" "];
|
|
[failureString appendString:error.localizedRecoverySuggestion];
|
|
}
|
|
delegate->OnError(base::SysNSStringToUTF8(failureString), error.code,
|
|
base::SysNSStringToUTF8(error.domain));
|
|
}];
|
|
}
|
|
|
|
void AutoUpdater::QuitAndInstall() {
|
|
Delegate* delegate = AutoUpdater::GetDelegate();
|
|
if (g_update_available) {
|
|
[[g_updater relaunchToInstallUpdate] subscribeError:^(NSError* error) {
|
|
if (delegate)
|
|
delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription),
|
|
error.code, base::SysNSStringToUTF8(error.domain));
|
|
}];
|
|
} else {
|
|
if (delegate)
|
|
delegate->OnError("No update available, can't quit and install");
|
|
}
|
|
}
|
|
|
|
} // namespace auto_updater
|