28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
172 lines
5.4 KiB
C++
172 lines
5.4 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/node_stream_loader.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "mojo/public/cpp/system/string_data_source.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace electron {
|
|
|
|
NodeStreamLoader::NodeStreamLoader(
|
|
network::mojom::URLResponseHeadPtr head,
|
|
mojo::PendingReceiver<network::mojom::URLLoader> loader,
|
|
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Object> emitter)
|
|
: url_loader_(this, std::move(loader)),
|
|
client_(std::move(client)),
|
|
isolate_(isolate),
|
|
emitter_(isolate, emitter) {
|
|
url_loader_.set_disconnect_handler(
|
|
base::BindOnce(&NodeStreamLoader::NotifyComplete,
|
|
weak_factory_.GetWeakPtr(), net::ERR_FAILED));
|
|
|
|
Start(std::move(head));
|
|
}
|
|
|
|
NodeStreamLoader::~NodeStreamLoader() {
|
|
v8::Locker locker(isolate_);
|
|
v8::Isolate::Scope isolate_scope(isolate_);
|
|
v8::HandleScope handle_scope(isolate_);
|
|
|
|
// Unsubscribe all handlers.
|
|
for (const auto& it : handlers_) {
|
|
v8::Local<v8::Value> args[] = {gin::StringToV8(isolate_, it.first),
|
|
it.second.Get(isolate_)};
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
|
|
node::arraysize(args), args, {0, 0});
|
|
}
|
|
|
|
// Destroy the stream if not already ended
|
|
if (!ended_) {
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "destroy", 0, nullptr,
|
|
{0, 0});
|
|
}
|
|
}
|
|
|
|
void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
|
|
mojo::ScopedDataPipeProducerHandle producer;
|
|
mojo::ScopedDataPipeConsumerHandle consumer;
|
|
MojoResult rv = mojo::CreateDataPipe(nullptr, producer, consumer);
|
|
if (rv != MOJO_RESULT_OK) {
|
|
NotifyComplete(net::ERR_INSUFFICIENT_RESOURCES);
|
|
return;
|
|
}
|
|
|
|
producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
|
|
client_->OnReceiveResponse(std::move(head),
|
|
mojo::ScopedDataPipeConsumerHandle());
|
|
client_->OnStartLoadingResponseBody(std::move(consumer));
|
|
|
|
auto weak = weak_factory_.GetWeakPtr();
|
|
On("end",
|
|
base::BindRepeating(&NodeStreamLoader::NotifyComplete, weak, net::OK));
|
|
On("error", base::BindRepeating(&NodeStreamLoader::NotifyComplete, weak,
|
|
net::ERR_FAILED));
|
|
On("readable", base::BindRepeating(&NodeStreamLoader::NotifyReadable, weak));
|
|
}
|
|
|
|
void NodeStreamLoader::NotifyReadable() {
|
|
if (!readable_)
|
|
ReadMore();
|
|
else if (is_reading_)
|
|
has_read_waiting_ = true;
|
|
readable_ = true;
|
|
}
|
|
|
|
void NodeStreamLoader::NotifyComplete(int result) {
|
|
// Wait until write finishes or fails.
|
|
if (is_reading_ || is_writing_) {
|
|
ended_ = true;
|
|
result_ = result;
|
|
return;
|
|
}
|
|
|
|
client_->OnComplete(network::URLLoaderCompletionStatus(result));
|
|
delete this;
|
|
}
|
|
|
|
void NodeStreamLoader::ReadMore() {
|
|
if (is_reading_) {
|
|
// Calling read() can trigger the "readable" event again, making this
|
|
// function re-entrant. If we're already reading, we don't want to start
|
|
// a nested read, so short-circuit.
|
|
return;
|
|
}
|
|
is_reading_ = true;
|
|
auto weak = weak_factory_.GetWeakPtr();
|
|
v8::HandleScope scope(isolate_);
|
|
// buffer = emitter.read()
|
|
v8::MaybeLocal<v8::Value> ret = node::MakeCallback(
|
|
isolate_, emitter_.Get(isolate_), "read", 0, nullptr, {0, 0});
|
|
DCHECK(weak) << "We shouldn't have been destroyed when calling read()";
|
|
|
|
// If there is no buffer read, wait until |readable| is emitted again.
|
|
v8::Local<v8::Value> buffer;
|
|
if (!ret.ToLocal(&buffer) || !node::Buffer::HasInstance(buffer)) {
|
|
is_reading_ = false;
|
|
|
|
// If 'readable' was called after 'read()', try again
|
|
if (has_read_waiting_) {
|
|
has_read_waiting_ = false;
|
|
ReadMore();
|
|
return;
|
|
}
|
|
|
|
readable_ = false;
|
|
if (ended_) {
|
|
NotifyComplete(result_);
|
|
}
|
|
return;
|
|
}
|
|
|
|
// Hold the buffer until the write is done.
|
|
buffer_.Reset(isolate_, buffer);
|
|
|
|
// Write buffer to mojo pipe asynchronously.
|
|
is_reading_ = false;
|
|
is_writing_ = true;
|
|
producer_->Write(std::make_unique<mojo::StringDataSource>(
|
|
base::StringPiece(node::Buffer::Data(buffer),
|
|
node::Buffer::Length(buffer)),
|
|
mojo::StringDataSource::AsyncWritingMode::
|
|
STRING_STAYS_VALID_UNTIL_COMPLETION),
|
|
base::BindOnce(&NodeStreamLoader::DidWrite, weak));
|
|
}
|
|
|
|
void NodeStreamLoader::DidWrite(MojoResult result) {
|
|
is_writing_ = false;
|
|
// We were told to end streaming.
|
|
if (ended_) {
|
|
NotifyComplete(result_);
|
|
return;
|
|
}
|
|
|
|
if (result == MOJO_RESULT_OK && readable_)
|
|
ReadMore();
|
|
else
|
|
NotifyComplete(net::ERR_FAILED);
|
|
}
|
|
|
|
void NodeStreamLoader::On(const char* event, EventCallback callback) {
|
|
v8::Locker locker(isolate_);
|
|
v8::Isolate::Scope isolate_scope(isolate_);
|
|
v8::HandleScope handle_scope(isolate_);
|
|
|
|
// emitter.on(event, callback)
|
|
v8::Local<v8::Value> args[] = {
|
|
gin::StringToV8(isolate_, event),
|
|
gin_helper::CallbackToV8Leaked(isolate_, std::move(callback)),
|
|
};
|
|
handlers_[event].Reset(isolate_, args[1]);
|
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "on",
|
|
node::arraysize(args), args, {0, 0});
|
|
// No more code below, as this class may destruct when subscribing.
|
|
}
|
|
|
|
} // namespace electron
|