CacheStorage: Implement Cache.addAll() behind a flag

Source/modules/cachestorage/Cache.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/cachestorage/Cache.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "bindings/modules/v8/V8Response.h"
 #include "core/dom/DOMException.h"
 #include "modules/cachestorage/CacheStorageError.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/GlobalFetch.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "public/platform/WebServiceWorkerCache.h"
 
@@ skipping 106 matching lines @@
     {
         OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
         m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
-ScriptPromise rejectAsNotImplemented(ScriptState* scriptState)
-{
-    return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "Cache is not implemented"));
-}
-
 } // namespace
 
 class Cache::FetchResolvedForAdd final : public ScriptFunction {
 public:
-    static v8::Local<v8::Function> create(ScriptState* scriptState, Cache* cache, Request* request)
+    static v8::Local<v8::Function> create(ScriptState* scriptState, Cache* cache, const HeapVector<Member<Request>>& requests)
     {
-        FetchResolvedForAdd* self = new FetchResolvedForAdd(scriptState, cache, request);
+        FetchResolvedForAdd* self = new FetchResolvedForAdd(scriptState, cache, requests);
         return self->bindToV8Function();
     }
 
     ScriptValue call(ScriptValue value) override
     {
-        Response* response = V8Response::toImplWithTypeCheck(scriptState()->isolate(), value.v8Value());
-        ScriptPromise putPromise = m_cache->putImpl(scriptState(), HeapVector<Member<Request>>(1, m_request), HeapVector<Member<Response>>(1, response));
+        NonThrowableExceptionState exceptionState;
+        HeapVector<Member<Response>> responses = toMemberNativeArray<Response, V8Response>(value.v8Value(), m_requests.size(), scriptState()->isolate(), exceptionState);
+        ScriptPromise putPromise = m_cache->putImpl(scriptState(), m_requests, responses);
         return ScriptValue(scriptState(), putPromise.v8Value());
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_cache);
-        visitor->trace(m_request);
+        visitor->trace(m_requests);
         ScriptFunction::trace(visitor);
     }
 
 private:
-    FetchResolvedForAdd(ScriptState* scriptState, Cache* cache, Request* request)
+    FetchResolvedForAdd(ScriptState* scriptState, Cache* cache, const HeapVector<Member<Request>>& requests)
         : ScriptFunction(scriptState)
         , m_cache(cache)
-        , m_request(request)
+        , m_requests(requests)
     {
     }
 
     Member<Cache> m_cache;
-    Member<Request> m_request;
+    HeapVector<Member<Request>> m_requests;
 };
 
 class Cache::BarrierCallbackForPut final : public GarbageCollectedFinalized<BarrierCallbackForPut> {
 public:
     BarrierCallbackForPut(int numberOfOperations, Cache* cache, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_numberOfRemainingOperations(numberOfOperations)
         , m_cache(cache)
         , m_resolver(resolver)
     {
         ASSERT(0 < m_numberOfRemainingOperations);
@@ skipping 98 matching lines @@
         return matchAllImpl(scriptState, request.getAsRequest(), options);
     Request* newRequest = Request::create(scriptState, request.getAsUSVString(), exceptionState);
     if (exceptionState.hadException())
         return ScriptPromise();
     return matchAllImpl(scriptState, newRequest, options);
 }
 
 ScriptPromise Cache::add(ScriptState* scriptState, const RequestInfo& request, ExceptionState& exceptionState)
 {
     ASSERT(!request.isNull());
-    Request* newRequest;
+    HeapVector<Member<Request>> requests;
     if (request.isRequest()) {
-        newRequest = request.getAsRequest();
+        requests.append(request.getAsRequest());
     } else {
-        newRequest = Request::create(scriptState, request.getAsUSVString(), exceptionState);
-
+        requests.append(Request::create(scriptState, request.getAsUSVString(), exceptionState));
         if (exceptionState.hadException())
             return ScriptPromise();
     }
 
-    Vector<Request*> requestVector;
-    requestVector.append(newRequest);
-    return addAllImpl(scriptState, requestVector, exceptionState);
+    return addAllImpl(scriptState, requests, exceptionState);
 }
 
-ScriptPromise Cache::addAll(ScriptState* scriptState, const Vector<ScriptValue>& rawRequests)
+ScriptPromise Cache::addAll(ScriptState* scriptState, const HeapVector<RequestInfo>& rawRequests, ExceptionState& exceptionState)
 {
-    // FIXME: Implement this.
-    return rejectAsNotImplemented(scriptState);
+    HeapVector<Member<Request>> requests;
+    for (RequestInfo request : rawRequests) {
+        if (request.isRequest()) {
+            requests.append(request.getAsRequest());
+        } else {
+            requests.append(Request::create(scriptState, request.getAsUSVString(), exceptionState));
+            if (exceptionState.hadException())
+                return ScriptPromise();
+        }
+    }
+
+    return addAllImpl(scriptState, requests, exceptionState);
 }
 
 ScriptPromise Cache::deleteFunction(ScriptState* scriptState, const RequestInfo& request, const CacheQueryOptions& options, ExceptionState& exceptionState)
 {
     ASSERT(!request.isNull());
     if (request.isRequest())
         return deleteImpl(scriptState, request.getAsRequest(), options);
     Request* newRequest = Request::create(scriptState, request.getAsUSVString(), exceptionState);
     if (exceptionState.hadException())
         return ScriptPromise();
@@ skipping 57 matching lines @@
 {
     WebServiceWorkerRequest webRequest;
     request->populateWebServiceWorkerRequest(webRequest);
 
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
     m_webCache->dispatchMatchAll(new CacheWithResponsesCallbacks(resolver), webRequest, toWebQueryParams(options));
     return promise;
 }
 
-ScriptPromise Cache::addAllImpl(ScriptState* scriptState, const Vector<Request*>& requests, ExceptionState& exceptionState)
+// This class provides Promise.all() for ScriptPromise.
+class ScriptPromiseAll final : public GarbageCollectedFinalized<ScriptPromiseAll> {

[jkarlin, 2015/06/26 19:40:28]

I'm sad that we have to go through V8 to wait on the fetch promise. Perhaps add
a TODO to make this all C++ one day?

[nhiroki, 2015/07/02 09:31:54]

Done.

+public:
+    class AdapterFunction : public ScriptFunction {
+    public:
+        enum ResolveType {
+            Fulfilled,
+            Rejected,
+        };
+
+        static v8::Local<v8::Function> create(ScriptState* scriptState, ResolveType resolveType, size_t index, ScriptPromiseAll* promiseAll)
+        {
+            AdapterFunction* self = new AdapterFunction(scriptState, resolveType, index, promiseAll);
+            return self->bindToV8Function();
+        }
+
+        DEFINE_INLINE_VIRTUAL_TRACE()
+        {
+            visitor->trace(m_promiseAll);
+            ScriptFunction::trace(visitor);
+        }
+
+    private:
+        AdapterFunction(ScriptState* scriptState, ResolveType resolveType, size_t index, ScriptPromiseAll* promiseAll)
+            : ScriptFunction(scriptState)
+            , m_resolveType(resolveType)
+            , m_index(index)
+            , m_promiseAll(promiseAll) { }
+
+        ScriptValue call(ScriptValue value) override
+        {
+            if (m_resolveType == Fulfilled) {
+                m_promiseAll->onFulfilled(m_index, value);
+            } else {
+                m_promiseAll->onRejected(value);
+            }
+            return ScriptValue(scriptState(), m_promiseAll->promise().v8Value());
+        }
+
+        const ResolveType m_resolveType;
+        const size_t m_index;
+        Member<ScriptPromiseAll> m_promiseAll;
+    };
+
+    ScriptPromiseAll(Vector<ScriptPromise> promises, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
+        : m_numberOfPendingPromises(promises.size())
+        , m_resolver(resolver)
+    {
+        m_values.resize(promises.size());
+        for (size_t i = 0; i < promises.size(); ++i)
+            promises[i].then(createFulfillFunction(i), createRejectFunction());
+    }
+
+    void onFulfilled(size_t index, const ScriptValue& value)
+    {
+        ASSERT(index < m_values.size());
+        if (m_isResolvedOrRejected)
+            return;
+        m_values[index] = value;
+        if (--m_numberOfPendingPromises > 0)
+            return;
+        m_isResolvedOrRejected = true;
+        m_resolver->resolve(m_values);
+    }
+
+    void onRejected(const ScriptValue& value)
+    {
+        if (m_isResolvedOrRejected)
+            return;
+        m_isResolvedOrRejected = true;
+        m_resolver->reject(value);
+    }
+
+    v8::Local<v8::Function> createFulfillFunction(size_t index)

[jkarlin, 2015/06/26 19:40:28]

The create functions should be private

[nhiroki, 2015/07/02 09:31:54]

Done.

+    {
+        return AdapterFunction::create(m_resolver->scriptState(), AdapterFunction::Fulfilled, index, this);
+    }
+
+    v8::Local<v8::Function> createRejectFunction()
+    {
+        return AdapterFunction::create(m_resolver->scriptState(), AdapterFunction::Rejected, 0, this);
+    }
+
+    ScriptPromise promise() { return m_resolver->promise(); }
+
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_resolver);
+        visitor->trace(m_values);
+    }
+
+private:
+    size_t m_numberOfPendingPromises;
+    RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
+    bool m_isResolvedOrRejected = false;

[jkarlin, 2015/06/26 19:40:28]

I believe 'settled' is the term for a promise that is either resolved or
rejected. So please use m_isSettled.

[nhiroki, 2015/07/02 09:31:54]

Done.

+    Vector<ScriptValue> m_values;
+};
+
+ScriptPromise Cache::addAllImpl(ScriptState* scriptState, const HeapVector<Member<Request>>& requests, ExceptionState& exceptionState)
 {
-    // TODO(gavinp,nhiroki): Implement addAll for more than one element.
-    ASSERT(requests.size() == 1);
-
     Vector<RequestInfo> requestInfos;
     requestInfos.resize(requests.size());
+    Vector<ScriptPromise> promises;
+    promises.resize(requests.size());
     for (size_t i = 0; i < requests.size(); ++i) {
         if (!requests[i]->url().protocolIsInHTTPFamily())
             return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Add/AddAll does not support schemes other than \"http\" or \"https\""));
         if (requests[i]->method() != "GET")
             return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Add/AddAll only supports the GET request method."));
         requestInfos[i].setRequest(requests[i]);
+
+        promises[i] = m_scopedFetcher->fetch(scriptState, requestInfos[i], Dictionary(), exceptionState);
     }
 
-    ScriptPromise fetchPromise = m_scopedFetcher->fetch(scriptState, requestInfos[0], Dictionary(), exceptionState);
-    return fetchPromise.then(FetchResolvedForAdd::create(scriptState, this, requests[0]));
+    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseAll* promiseAll = new ScriptPromiseAll(promises, resolver.get());
+    return promiseAll->promise().then(FetchResolvedForAdd::create(scriptState, this, requests));
 }
 
 ScriptPromise Cache::deleteImpl(ScriptState* scriptState, const Request* request, const CacheQueryOptions& options)
 {
     WebVector<WebServiceWorkerCache::BatchOperation> batchOperations(size_t(1));
     batchOperations[0].operationType = WebServiceWorkerCache::OperationTypeDelete;
     request->populateWebServiceWorkerRequest(batchOperations[0].request);
     batchOperations[0].matchParams = toWebQueryParams(options);
 
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
@@ skipping 61 matching lines @@
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 WebServiceWorkerCache* Cache::webCache() const
 {
     return m_webCache.get();
 }
 
 } // namespace blink