зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1814113: Add OutputByteWritableStreamsAlgorithm to be used for outgoing WebTransport streams r=saschanaz,nika
Differential Revision: https://phabricator.services.mozilla.com/D168408
This commit is contained in:
Родитель
eeed247450
Коммит
92d32428b7
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "mozilla/dom/UnderlyingSinkCallbackHelpers.h"
|
#include "mozilla/dom/UnderlyingSinkCallbackHelpers.h"
|
||||||
#include "StreamUtils.h"
|
#include "StreamUtils.h"
|
||||||
|
#include "mozilla/dom/UnionTypes.h"
|
||||||
|
|
||||||
using namespace mozilla::dom;
|
using namespace mozilla::dom;
|
||||||
|
|
||||||
|
@ -128,3 +129,137 @@ already_AddRefed<Promise> UnderlyingSinkAlgorithmsWrapper::AbortCallback(
|
||||||
[&](ErrorResult& aRv) { return AbortCallbackImpl(aCx, aReason, aRv); },
|
[&](ErrorResult& aRv) { return AbortCallbackImpl(aCx, aReason, aRv); },
|
||||||
aRv);
|
aRv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(WritableStreamToOutput,
|
||||||
|
UnderlyingSinkAlgorithmsBase,
|
||||||
|
nsIOutputStreamCallback)
|
||||||
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(WritableStreamToOutput,
|
||||||
|
UnderlyingSinkAlgorithmsBase, mParent,
|
||||||
|
mOutput, mPromise)
|
||||||
|
|
||||||
|
NS_IMETHODIMP
|
||||||
|
WritableStreamToOutput::OnOutputStreamReady(nsIAsyncOutputStream* aStream) {
|
||||||
|
if (!mData) {
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
MOZ_ASSERT(mPromise);
|
||||||
|
uint32_t written = 0;
|
||||||
|
nsresult rv = mOutput->Write(
|
||||||
|
reinterpret_cast<const char*>(mData->Elements() + mWritten),
|
||||||
|
mData->Length() - mWritten, &written);
|
||||||
|
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) {
|
||||||
|
mPromise->MaybeRejectWithAbortError("Error writing to stream"_ns);
|
||||||
|
ClearData();
|
||||||
|
// XXX should we add mErrored and fail future calls immediately?
|
||||||
|
// I presume new calls to Write() will fail though, too
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
if (NS_SUCCEEDED(rv)) {
|
||||||
|
mWritten += written;
|
||||||
|
MOZ_ASSERT(mWritten <= mData->Length());
|
||||||
|
if (mWritten >= mData->Length()) {
|
||||||
|
mPromise->MaybeResolveWithUndefined();
|
||||||
|
ClearData();
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
// more to write
|
||||||
|
}
|
||||||
|
// wrote partial or nothing
|
||||||
|
// Wait for space
|
||||||
|
nsCOMPtr<nsIEventTarget> target = mozilla::GetCurrentSerialEventTarget();
|
||||||
|
rv = mOutput->AsyncWait(this, 0, 0, target);
|
||||||
|
if (NS_FAILED(rv)) {
|
||||||
|
mPromise->MaybeRejectWithUnknownError("error waiting to write data");
|
||||||
|
ClearData();
|
||||||
|
// XXX should we add mErrored and fail future calls immediately?
|
||||||
|
// New calls to Write() will fail, note
|
||||||
|
// See step 5.2 of
|
||||||
|
// https://streams.spec.whatwg.org/#writable-stream-default-controller-process-write.
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<Promise> WritableStreamToOutput::WriteCallback(
|
||||||
|
JSContext* aCx, JS::Handle<JS::Value> aChunk,
|
||||||
|
WritableStreamDefaultController& aController, ErrorResult& aError) {
|
||||||
|
ArrayBufferViewOrArrayBuffer data;
|
||||||
|
if (!data.Init(aCx, aChunk)) {
|
||||||
|
aError.StealExceptionFromJSContext(aCx);
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
// buffer/bufferView
|
||||||
|
MOZ_ASSERT(data.IsArrayBuffer() || data.IsArrayBufferView());
|
||||||
|
|
||||||
|
RefPtr<Promise> promise = Promise::Create(mParent, aError);
|
||||||
|
if (NS_WARN_IF(aError.Failed())) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is a duplicate of dom/encoding/TextDecoderStream.cpp#51-69
|
||||||
|
// PeterV will deal with that when he lands his patch for TypedArrays
|
||||||
|
auto dataSpan = [&data]() {
|
||||||
|
if (data.IsArrayBuffer()) {
|
||||||
|
const ArrayBuffer& buffer = data.GetAsArrayBuffer();
|
||||||
|
buffer.ComputeState();
|
||||||
|
return Span{buffer.Data(), buffer.Length()};
|
||||||
|
}
|
||||||
|
MOZ_ASSERT(data.IsArrayBufferView());
|
||||||
|
const ArrayBufferView& buffer = data.GetAsArrayBufferView();
|
||||||
|
buffer.ComputeState();
|
||||||
|
return Span{buffer.Data(), buffer.Length()};
|
||||||
|
}();
|
||||||
|
|
||||||
|
// Try to write first, and only enqueue data if we were already blocked
|
||||||
|
// or the write didn't write it all. This avoids allocations and copies
|
||||||
|
// in common cases.
|
||||||
|
MOZ_ASSERT(!mPromise);
|
||||||
|
MOZ_ASSERT(mWritten == 0);
|
||||||
|
uint32_t written = 0;
|
||||||
|
nsresult rv = mOutput->Write(mozilla::AsChars(dataSpan).Elements(),
|
||||||
|
dataSpan.Length(), &written);
|
||||||
|
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) {
|
||||||
|
promise->MaybeRejectWithAbortError("error writing data");
|
||||||
|
return promise.forget();
|
||||||
|
}
|
||||||
|
if (NS_SUCCEEDED(rv)) {
|
||||||
|
if (written == dataSpan.Length()) {
|
||||||
|
promise->MaybeResolveWithUndefined();
|
||||||
|
return promise.forget();
|
||||||
|
}
|
||||||
|
dataSpan = dataSpan.From(written);
|
||||||
|
}
|
||||||
|
|
||||||
|
auto buffer = Buffer<uint8_t>::CopyFrom(dataSpan);
|
||||||
|
if (buffer.isNothing()) {
|
||||||
|
promise->MaybeReject(NS_ERROR_OUT_OF_MEMORY);
|
||||||
|
return promise.forget();
|
||||||
|
}
|
||||||
|
mData = std::move(buffer);
|
||||||
|
mPromise = promise;
|
||||||
|
|
||||||
|
nsCOMPtr<nsIEventTarget> target = mozilla::GetCurrentSerialEventTarget();
|
||||||
|
rv = mOutput->AsyncWait(this, 0, 0, target);
|
||||||
|
if (NS_FAILED(rv)) {
|
||||||
|
ClearData();
|
||||||
|
promise->MaybeRejectWithUnknownError("error waiting to write data");
|
||||||
|
}
|
||||||
|
return promise.forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<Promise> WritableStreamToOutput::AbortCallbackImpl(
|
||||||
|
JSContext* aCx, const Optional<JS::Handle<JS::Value>>& aReason,
|
||||||
|
ErrorResult& aRv) {
|
||||||
|
// https://streams.spec.whatwg.org/#writablestream-set-up
|
||||||
|
// Step 3. Let abortAlgorithmWrapper be an algorithm that runs these steps:
|
||||||
|
|
||||||
|
// XXX The close or rather a dedicated abort should be async. For now we have
|
||||||
|
// to always fall back to the Step 3.3 below.
|
||||||
|
mOutput->CloseWithStatus(NS_ERROR_ABORT);
|
||||||
|
|
||||||
|
// Step 3.3. Return a promise resolved with undefined.
|
||||||
|
// Wrapper handles this
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void WritableStreamToOutput::ReleaseObjects() { mOutput->Close(); }
|
||||||
|
|
|
@ -7,12 +7,15 @@
|
||||||
#ifndef mozilla_dom_UnderlyingSinkCallbackHelpers_h
|
#ifndef mozilla_dom_UnderlyingSinkCallbackHelpers_h
|
||||||
#define mozilla_dom_UnderlyingSinkCallbackHelpers_h
|
#define mozilla_dom_UnderlyingSinkCallbackHelpers_h
|
||||||
|
|
||||||
|
#include "mozilla/Maybe.h"
|
||||||
|
#include "mozilla/Buffer.h"
|
||||||
#include "mozilla/HoldDropJSObjects.h"
|
#include "mozilla/HoldDropJSObjects.h"
|
||||||
#include "mozilla/dom/Promise.h"
|
#include "mozilla/dom/Promise.h"
|
||||||
#include "mozilla/dom/UnderlyingSinkBinding.h"
|
#include "mozilla/dom/UnderlyingSinkBinding.h"
|
||||||
#include "nsCycleCollectionParticipant.h"
|
#include "nsCycleCollectionParticipant.h"
|
||||||
#include "nsISupports.h"
|
#include "nsISupports.h"
|
||||||
#include "nsISupportsImpl.h"
|
#include "nsISupportsImpl.h"
|
||||||
|
#include "nsIAsyncOutputStream.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* See the comment in UnderlyingSourceCallbackHelpers.h!
|
* See the comment in UnderlyingSourceCallbackHelpers.h!
|
||||||
|
@ -153,6 +156,47 @@ class UnderlyingSinkAlgorithmsWrapper : public UnderlyingSinkAlgorithmsBase {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class WritableStreamToOutput final : public UnderlyingSinkAlgorithmsWrapper,
|
||||||
|
public nsIOutputStreamCallback {
|
||||||
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
|
NS_DECL_NSIOUTPUTSTREAMCALLBACK
|
||||||
|
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(WritableStreamToOutput,
|
||||||
|
UnderlyingSinkAlgorithmsBase)
|
||||||
|
|
||||||
|
WritableStreamToOutput(nsIGlobalObject* aParent,
|
||||||
|
nsIAsyncOutputStream* aOutput)
|
||||||
|
: mWritten(0), mParent(aParent), mOutput(aOutput) {}
|
||||||
|
|
||||||
|
// Streams algorithms
|
||||||
|
|
||||||
|
already_AddRefed<Promise> WriteCallback(
|
||||||
|
JSContext* aCx, JS::Handle<JS::Value> aChunk,
|
||||||
|
WritableStreamDefaultController& aController, ErrorResult& aRv) override;
|
||||||
|
|
||||||
|
// No CloseCallbackImpl() since ReleaseObjects() will call Close()
|
||||||
|
|
||||||
|
already_AddRefed<Promise> AbortCallbackImpl(
|
||||||
|
JSContext* aCx, const Optional<JS::Handle<JS::Value>>& aReason,
|
||||||
|
ErrorResult& aRv) override;
|
||||||
|
|
||||||
|
void ReleaseObjects() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
~WritableStreamToOutput() override = default;
|
||||||
|
|
||||||
|
void ClearData() {
|
||||||
|
mData = Nothing();
|
||||||
|
mPromise = nullptr;
|
||||||
|
mWritten = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t mWritten;
|
||||||
|
nsCOMPtr<nsIGlobalObject> mParent;
|
||||||
|
nsCOMPtr<nsIAsyncOutputStream> mOutput;
|
||||||
|
RefPtr<Promise> mPromise; // Resolved when entirely written
|
||||||
|
Maybe<Buffer<uint8_t>> mData;
|
||||||
|
};
|
||||||
|
|
||||||
} // namespace mozilla::dom
|
} // namespace mozilla::dom
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче