runcloud 0.2.153 → 0.2.154

package/dist/commands/appStoreEvaluate.js

@@ -289,7 +289,19 @@ function patternItem(root, item, regex, statusOnHit, messageOnHit, messageOnMiss
         return makeItem(item, statusOnHit, messageOnHit, evidence(matches));
     return makeItem(item, 'pass', messageOnMiss, `scan: no matches for ${regex}`);
 }
-const MICROPHONE_USE = /expo-av|AudioRecorder|requestRecordingPermissionsAsync|requestMicrophonePermissions/i;
+const MICROPHONE_USE = /expo-av|AudioRecorder|requestRecordingPermissionsAsync|requestMicrophonePermissions|useMicrophonePermissions|recordAsync/i;
+const CAMERA_USE = /expo-camera|CameraView|requestCameraPermissions|launchCameraAsync/i;
+const LOCATION_USE = /expo-location|getCurrentPositionAsync|watchPositionAsync/i;
+const ANDROID_PACKAGE_PERMISSIONS = [
+    { pkg: 'expo-camera', permissions: ['CAMERA'] },
+    { pkg: 'expo-camera', option: 'recordAudioAndroid', permissions: ['RECORD_AUDIO'] },
+    { pkg: 'expo-image-picker', permissions: ['CAMERA', 'READ_EXTERNAL_STORAGE'] },
+    { pkg: 'expo-image-picker', option: 'microphonePermission', permissions: ['RECORD_AUDIO'] },
+    { pkg: 'expo-audio', option: 'recordAudioAndroid', permissions: ['RECORD_AUDIO'] },
+    { pkg: 'expo-location', permissions: ['ACCESS_COARSE_LOCATION', 'ACCESS_FINE_LOCATION'] },
+    { pkg: 'expo-media-library', permissions: ['READ_EXTERNAL_STORAGE'] },
+    { pkg: 'expo-notifications', permissions: ['POST_NOTIFICATIONS'] },
+];
 function isFirebaseClientKey(root, match) {
     if (!/AIza[0-9A-Za-z_-]{30,}/.test(match.text))
         return false;
@@ -301,19 +313,36 @@ function isFirebaseClientKey(root, match) {
 }
 function missingPermissionRequirements(root, appJson) {
     const missing = [...missingIosUsageDescriptions(root, appJson)];
-    const permissions = arrayOfStrings(getPath(appJson, ['expo', 'android', 'permissions']));
+    const bare = (permission) => permission.replace(/^android\.permission\./, '');
+    const blocked = new Set(arrayOfStrings(getPath(appJson, ['expo', 'android', 'blockedPermissions'])).map(bare));
+    const picker = configPluginOptions(appJson, 'expo-image-picker');
+    if (picker?.cameraPermission === false)
+        blocked.add('CAMERA');
+    if (picker?.microphonePermission === false)
+        blocked.add('RECORD_AUDIO');
+    const installed = installedPackages(root);
+    const granted = new Set(arrayOfStrings(getPath(appJson, ['expo', 'android', 'permissions'])).map(bare));
+    for (const { pkg, option, permissions } of ANDROID_PACKAGE_PERMISSIONS) {
+        const listed = configPluginOptions(appJson, pkg);
+        const auto = PLUGIN_PURPOSE_STRINGS[pkg]?.auto ?? false;
+        const adds = option === undefined
+            ? installed.has(pkg) || listed !== undefined
+            : listed ? listed[option] !== false : auto && installed.has(pkg);
+        if (adds)
+            permissions.forEach((permission) => granted.add(permission));
+    }
     const source = sourceText(root, ['app', 'src', 'components']);
     const androidChecks = [
-        { name: 'camera', used: /expo-camera|CameraView|requestCameraPermissions/i, permissions: ['CAMERA'] },
-        { name: 'location', used: /expo-location|getCurrentPositionAsync|watchPositionAsync/i, permissions: ['ACCESS_FINE_LOCATION', 'ACCESS_COARSE_LOCATION'] },
-        { name: 'photos', used: /expo-image-picker|expo-media-library|MediaLibrary/i, permissions: ['READ_MEDIA_IMAGES', 'READ_EXTERNAL_STORAGE'] },
+        { name: 'camera', used: CAMERA_USE, permissions: ['CAMERA'] },
+        { name: 'location', used: LOCATION_USE, permissions: ['ACCESS_FINE_LOCATION', 'ACCESS_COARSE_LOCATION'] },
+        { name: 'photos', used: /expo-media-library|MediaLibrary/i, permissions: ['READ_MEDIA_IMAGES', 'READ_EXTERNAL_STORAGE'] },
         { name: 'microphone', used: MICROPHONE_USE, permissions: ['RECORD_AUDIO'] },
         { name: 'notifications', used: /expo-notifications/i, permissions: ['POST_NOTIFICATIONS'] },
     ];
     for (const check of androidChecks) {
         if (!check.used.test(source))
             continue;
-        if (!check.permissions.some((permission) => permissions.includes(permission))) {
+        if (!check.permissions.some((permission) => granted.has(permission) && !blocked.has(permission))) {
             missing.push(`android ${check.name} permission (${check.permissions.join(' or ')})`);
         }
     }
@@ -323,13 +352,12 @@ function missingIosUsageDescriptions(root, appJson) {
     const infoPlist = objectValue(getPath(appJson, ['expo', 'ios', 'infoPlist']));
     const source = sourceText(root, ['app', 'src', 'components']);
     const checks = [
-        { name: 'camera', used: /expo-camera|CameraView|requestCameraPermissions/i, keys: ['NSCameraUsageDescription'] },
-        { name: 'location', used: /expo-location|getCurrentPositionAsync|watchPositionAsync/i, keys: ['NSLocationWhenInUseUsageDescription', 'NSLocationAlwaysAndWhenInUseUsageDescription'] },
+        { name: 'camera', used: CAMERA_USE, keys: ['NSCameraUsageDescription'] },
+        { name: 'location', used: LOCATION_USE, keys: ['NSLocationWhenInUseUsageDescription', 'NSLocationAlwaysAndWhenInUseUsageDescription'] },
         { name: 'photos', used: /expo-image-picker|expo-media-library|MediaLibrary/i, keys: ['NSPhotoLibraryUsageDescription'] },
         { name: 'microphone', used: MICROPHONE_USE, keys: ['NSMicrophoneUsageDescription'] },
     ];
-    const pkg = readJson(path.join(root, 'package.json'));
-    const installed = new Set(['dependencies', 'devDependencies'].flatMap((field) => Object.keys(objectValue(getPath(pkg, [field])))));
+    const installed = installedPackages(root);
     const missing = [];
     for (const check of checks) {
         if (!check.used.test(source))
@@ -370,6 +398,10 @@ function builtWithPurposeString(key, infoPlist, appJson, installed) {
     }
     return written;
 }
+function installedPackages(root) {
+    const pkg = readJson(path.join(root, 'package.json'));
+    return new Set(['dependencies', 'devDependencies'].flatMap((field) => Object.keys(objectValue(getPath(pkg, [field])))));
+}
 function configPluginOptions(appJson, name) {
     const plugins = getPath(appJson, ['expo', 'plugins']);
     if (!Array.isArray(plugins))

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.2.153';
+export const CLI_VERSION = '0.2.154';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.2.153",
+  "version": "0.2.154",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [