Merge branch 'main' into 08-15-added_webCompat_as_a_docs_page

duckduckgo · Sep 26, 2023 · 5c50bb2 · 5c50bb2
2 parents 5f7f31a + febdbcd
commit 5c50bb2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/integration-test/playwright/page-objects/duckplayer-overlays.js b/integration-test/playwright/page-objects/duckplayer-overlays.js
@@ -167,17 +167,20 @@ export class DuckplayerOverlays {
 
     async userValuesCallIsProxied () {
         const calls = await this.page.evaluate(readOutgoingMessages)
-        expect(calls).toMatchObject([
-            {
-                payload: {
-                    context: this.messagingContext,
-                    featureName: 'duckPlayer',
-                    params: {},
-                    method: 'getUserValues',
-                    id: 'getUserValues.response'
-                }
-            }
-        ])
+        const message = calls[0]
+        const { id, ...rest } = message.payload
+
+        // just a sanity-check to ensure a none-empty string was used as the id
+        expect(typeof id).toBe('string')
+        expect(id.length).toBeGreaterThan(10)
+
+        // assert on the payload, minus the ID
+        expect(rest).toMatchObject({
+            context: this.messagingContext,
+            featureName: 'duckPlayer',
+            params: {},
+            method: 'getUserValues'
+        })
     }
 
     async overlayBlocksVideo () {

diff --git a/packages/messaging/index.js b/packages/messaging/index.js
@@ -93,7 +93,7 @@ export class Messaging {
      * @return {Promise<any>}
      */
     request (name, data = {}) {
-        const id = name + '.response'
+        const id = globalThis?.crypto?.randomUUID() || name + '.response'
         const message = new RequestMessage({
             context: this.messagingContext.context,
             featureName: this.messagingContext.featureName,