Release build 4.55.0 [ci release]

jonathanKingston · github-actions[bot] · commit b121b2795fb6 · 2023-12-11T17:43:20.000Z
diff --git a/Sources/ContentScopeScripts/dist/contentScope.js b/Sources/ContentScopeScripts/dist/contentScope.js
@@ -2290,6 +2290,7 @@
       window.outerWidth = window.innerWidth;
     }
     const MSG_WEB_SHARE = "webShare";
+    const MSG_PERMISSIONS_QUERY = "permissionsQuery";
     function canShare(data) {
       if (typeof data !== "object")
         return false;
@@ -2509,38 +2510,28 @@
             this.onchange = null;
           }
         }
-        const defaultValidPermissionNames = [
-          "geolocation",
-          "notifications",
-          "push",
-          "persistent-storage",
-          "midi",
-          "accelerometer",
-          "ambient-light-sensor",
-          "background-sync",
-          "bluetooth",
-          "camera",
-          "clipboard",
-          "device-info",
-          "gyroscope",
-          "magnetometer",
-          "microphone",
-          "speaker"
-        ];
-        const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
-        const returnStatus = settings.permissionResponse || "prompt";
-        permissions.query = new Proxy((query) => {
+        permissions.query = new Proxy(async (query) => {
           this.addDebugFlag();
           if (!query) {
             throw new TypeError("Failed to execute 'query' on 'Permissions': 1 argument required, but only 0 present.");
           }
           if (!query.name) {
             throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.");
           }
-          if (!validPermissionNames.includes(query.name)) {
+          if (!settings.supportedPermissions || !(query.name in settings.supportedPermissions)) {
             throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`);
           }
-          return Promise.resolve(new PermissionStatus(query.name, returnStatus));
+          const permSetting = settings.supportedPermissions[query.name];
+          const returnName = permSetting.name || query.name;
+          let returnStatus = settings.permissionResponse || "prompt";
+          if (permSetting.native) {
+            try {
+              const response = await this.messaging.request(MSG_PERMISSIONS_QUERY, query);
+              returnStatus = response.state || "prompt";
+            } catch (err) {
+            }
+          }
+          return Promise.resolve(new PermissionStatus(returnName, returnStatus));
         }, {
           get(target, name) {
             return Reflect.get(target, name);
diff --git a/build/android/contentScope.js b/build/android/contentScope.js
@@ -7404,6 +7404,7 @@
     }
 
     const MSG_WEB_SHARE = 'webShare';
+    const MSG_PERMISSIONS_QUERY = 'permissionsQuery';
 
     function canShare (data) {
         if (typeof data !== 'object') return false
@@ -7640,39 +7641,29 @@
                     this.onchange = null; // noop
                 }
             }
-            // Default subset based upon Firefox (the full list is pretty large right now and these are the common ones)
-            const defaultValidPermissionNames = [
-                'geolocation',
-                'notifications',
-                'push',
-                'persistent-storage',
-                'midi',
-                'accelerometer',
-                'ambient-light-sensor',
-                'background-sync',
-                'bluetooth',
-                'camera',
-                'clipboard',
-                'device-info',
-                'gyroscope',
-                'magnetometer',
-                'microphone',
-                'speaker'
-            ];
-            const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
-            const returnStatus = settings.permissionResponse || 'prompt';
-            permissions.query = new Proxy((query) => {
+            permissions.query = new Proxy(async (query) => {
                 this.addDebugFlag();
                 if (!query) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': 1 argument required, but only 0 present.")
                 }
                 if (!query.name) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
-                if (!validPermissionNames.includes(query.name)) {
+                if (!settings.supportedPermissions || !(query.name in settings.supportedPermissions)) {
                     throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
-                return Promise.resolve(new PermissionStatus(query.name, returnStatus))
+                const permSetting = settings.supportedPermissions[query.name];
+                const returnName = permSetting.name || query.name;
+                let returnStatus = settings.permissionResponse || 'prompt';
+                if (permSetting.native) {
+                    try {
+                        const response = await this.messaging.request(MSG_PERMISSIONS_QUERY, query);
+                        returnStatus = response.state || 'prompt';
+                    } catch (err) {
+                        // do nothing - keep returnStatus as-is
+                    }
+                }
+                return Promise.resolve(new PermissionStatus(returnName, returnStatus))
             }, {
                 get (target, name) {
                     return Reflect.get(target, name)
diff --git a/build/contentScope.js b/build/contentScope.js
@@ -13573,6 +13573,7 @@
     }
 
     const MSG_WEB_SHARE = 'webShare';
+    const MSG_PERMISSIONS_QUERY = 'permissionsQuery';
 
     function canShare (data) {
         if (typeof data !== 'object') return false
@@ -13809,39 +13810,29 @@
                     this.onchange = null; // noop
                 }
             }
-            // Default subset based upon Firefox (the full list is pretty large right now and these are the common ones)
-            const defaultValidPermissionNames = [
-                'geolocation',
-                'notifications',
-                'push',
-                'persistent-storage',
-                'midi',
-                'accelerometer',
-                'ambient-light-sensor',
-                'background-sync',
-                'bluetooth',
-                'camera',
-                'clipboard',
-                'device-info',
-                'gyroscope',
-                'magnetometer',
-                'microphone',
-                'speaker'
-            ];
-            const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
-            const returnStatus = settings.permissionResponse || 'prompt';
-            permissions.query = new Proxy((query) => {
+            permissions.query = new Proxy(async (query) => {
                 this.addDebugFlag();
                 if (!query) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': 1 argument required, but only 0 present.")
                 }
                 if (!query.name) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
-                if (!validPermissionNames.includes(query.name)) {
+                if (!settings.supportedPermissions || !(query.name in settings.supportedPermissions)) {
                     throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
-                return Promise.resolve(new PermissionStatus(query.name, returnStatus))
+                const permSetting = settings.supportedPermissions[query.name];
+                const returnName = permSetting.name || query.name;
+                let returnStatus = settings.permissionResponse || 'prompt';
+                if (permSetting.native) {
+                    try {
+                        const response = await this.messaging.request(MSG_PERMISSIONS_QUERY, query);
+                        returnStatus = response.state || 'prompt';
+                    } catch (err) {
+                        // do nothing - keep returnStatus as-is
+                    }
+                }
+                return Promise.resolve(new PermissionStatus(returnName, returnStatus))
             }, {
                 get (target, name) {
                     return Reflect.get(target, name)
diff --git a/build/integration/contentScope.js b/build/integration/contentScope.js
@@ -13573,6 +13573,7 @@
     }
 
     const MSG_WEB_SHARE = 'webShare';
+    const MSG_PERMISSIONS_QUERY = 'permissionsQuery';
 
     function canShare (data) {
         if (typeof data !== 'object') return false
@@ -13809,39 +13810,29 @@
                     this.onchange = null; // noop
                 }
             }
-            // Default subset based upon Firefox (the full list is pretty large right now and these are the common ones)
-            const defaultValidPermissionNames = [
-                'geolocation',
-                'notifications',
-                'push',
-                'persistent-storage',
-                'midi',
-                'accelerometer',
-                'ambient-light-sensor',
-                'background-sync',
-                'bluetooth',
-                'camera',
-                'clipboard',
-                'device-info',
-                'gyroscope',
-                'magnetometer',
-                'microphone',
-                'speaker'
-            ];
-            const validPermissionNames = settings.validPermissionNames || defaultValidPermissionNames;
-            const returnStatus = settings.permissionResponse || 'prompt';
-            permissions.query = new Proxy((query) => {
+            permissions.query = new Proxy(async (query) => {
                 this.addDebugFlag();
                 if (!query) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': 1 argument required, but only 0 present.")
                 }
                 if (!query.name) {
                     throw new TypeError("Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': Required member is undefined.")
                 }
-                if (!validPermissionNames.includes(query.name)) {
+                if (!settings.supportedPermissions || !(query.name in settings.supportedPermissions)) {
                     throw new TypeError(`Failed to execute 'query' on 'Permissions': Failed to read the 'name' property from 'PermissionDescriptor': The provided value '${query.name}' is not a valid enum value of type PermissionName.`)
                 }
-                return Promise.resolve(new PermissionStatus(query.name, returnStatus))
+                const permSetting = settings.supportedPermissions[query.name];
+                const returnName = permSetting.name || query.name;
+                let returnStatus = settings.permissionResponse || 'prompt';
+                if (permSetting.native) {
+                    try {
+                        const response = await this.messaging.request(MSG_PERMISSIONS_QUERY, query);
+                        returnStatus = response.state || 'prompt';
+                    } catch (err) {
+                        // do nothing - keep returnStatus as-is
+                    }
+                }
+                return Promise.resolve(new PermissionStatus(returnName, returnStatus))
             }, {
                 get (target, name) {
                     return Reflect.get(target, name)
diff --git a/integration-test/test-web-compat.js b/integration-test/test-web-compat.js
diff --git a/src/features/web-compat.js b/src/features/web-compat.js
