Bug 1897871 - Implement PushMessageData .bytes() method. r=saschana…

…z,webidl Implements w3c/push-api#370 Differential Revision: https://phabricator.services.mozilla.com/D212319
mozilla · Jun 3, 2024 · 6518590 · 6518590
1 parent 2645d76
commit 6518590
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/dom/push/test/test_data.html b/dom/push/test/test_data.html
@@ -130,6 +130,7 @@
     );
     isDeeply(new Uint8Array(message.data.arrayBuffer), typedArray,
       "Wrong array buffer message data");
+    isDeeply(message.data.bytes, typedArray, "Wrong bytes message data");
 
     message = await waitForMessage(
       pushSubscription,

diff --git a/dom/push/test/worker.js b/dom/push/test/worker.js
@@ -73,6 +73,7 @@ function handlePush(event) {
         arrayBuffer: event.data.arrayBuffer(),
         json: getJSON(event.data),
         blob: event.data.blob(),
+        bytes: event.data.bytes(),
       };
     }
     broadcast(event, message);

diff --git a/dom/serviceworkers/ServiceWorkerEvents.cpp b/dom/serviceworkers/ServiceWorkerEvents.cpp
@@ -1100,6 +1100,16 @@ already_AddRefed<mozilla::dom::Blob> PushMessageData::Blob(ErrorResult& aRv) {
   return nullptr;
 }
 
+void PushMessageData::Bytes(JSContext* cx, JS::MutableHandle<JSObject*> aRetval,
+                            ErrorResult& aRv) {
+  uint8_t* data = GetContentsCopy();
+  if (data) {
+    UniquePtr<uint8_t[], JS::FreePolicy> dataPtr(data);
+    BodyUtil::ConsumeBytes(cx, aRetval, mBytes.Length(), std::move(dataPtr),
+                           aRv);
+  }
+}
+
 nsresult PushMessageData::EnsureDecodedText() {
   if (mBytes.IsEmpty() || !mDecodedText.IsEmpty()) {
     return NS_OK;

diff --git a/dom/serviceworkers/ServiceWorkerEvents.h b/dom/serviceworkers/ServiceWorkerEvents.h
@@ -215,6 +215,8 @@ class PushMessageData final : public nsISupports, public nsWrapperCache {
   void ArrayBuffer(JSContext* cx, JS::MutableHandle<JSObject*> aRetval,
                    ErrorResult& aRv);
   already_AddRefed<mozilla::dom::Blob> Blob(ErrorResult& aRv);
+  void Bytes(JSContext* cx, JS::MutableHandle<JSObject*> aRetval,
+             ErrorResult& aRv);
 
   PushMessageData(nsIGlobalObject* aOwner, nsTArray<uint8_t>&& aBytes);
 

diff --git a/dom/webidl/PushMessageData.webidl b/dom/webidl/PushMessageData.webidl
@@ -16,6 +16,8 @@ interface PushMessageData
     [Throws]
     Blob        blob();
     [Throws]
+    Uint8Array  bytes();
+    [Throws]
     any         json();
     USVString   text();
 };