runcloud 0.2.153 → 0.2.155

package/dist/commands/appStoreEvaluate.js

@@ -1,13 +1,13 @@
 import { existsSync, readFileSync, readdirSync, statSync, } from 'node:fs';
 import path from 'node:path';
+const PREVIEW_APP_ID = 'app.newly.preview';
 const CONFIG_RULES = {
     app_name: { path: ['expo', 'name'], absent: 'fail' },
     slug: { path: ['expo', 'slug'], absent: 'fail' },
-    ios_bundle_id: { path: ['expo', 'ios', 'bundleIdentifier'], absent: 'fail' },
-    android_package: { path: ['expo', 'android', 'package'], absent: 'fail' },
+    ios_bundle_id: { path: ['expo', 'ios', 'bundleIdentifier'], absent: 'info', storeId: /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+$/ },
+    android_package: { path: ['expo', 'android', 'package'], absent: 'info', storeId: /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/ },
     version: { path: ['expo', 'version'], absent: 'warning' },
     scheme: { path: ['expo', 'scheme'], absent: 'info' },
-    ios_encryption: { path: ['expo', 'ios', 'infoPlist', 'ITSAppUsesNonExemptEncryption'], absent: 'warning' },
     user_interface_style: { path: ['expo', 'userInterfaceStyle'], absent: 'info' },
     orientation: { path: ['expo', 'orientation'], absent: 'info' },
     ios_supports_tablet: { path: ['expo', 'ios', 'supportsTablet'], absent: 'info' },
@@ -183,6 +183,8 @@ function evaluateLocalItem(root, appJson, item) {
             return evaluateExpoLayout(root, item);
         case 'expo_duplicate_route':
             return evaluateDuplicateRoutes(root, item);
+        case 'ios_encryption':
+            return evaluateEncryption(appJson, item);
         case 'plugin_permission_missing':
             return evaluatePluginPermissions(root, appJson, item);
         case 'permission_descriptions':
@@ -202,10 +204,25 @@ function evaluateConfigItem(appJson, item, rule) {
     const value = getPath(appJson, rule.path);
     const present = hasValue(value);
     const evidence = `app.json ${rule.path.join('.')} = ${value === undefined ? 'undefined' : JSON.stringify(value)}`;
+    if (rule.storeId) {
+        const id = stringValue(value);
+        if (!id || id.toLowerCase() === PREVIEW_APP_ID)
+            return makeItem(item, rule.absent, `${item.label} is assigned when you publish.`, evidence);
+        if (!rule.storeId.test(id) || id.length > 255)
+            return makeItem(item, 'fail', `${item.label} is not valid. Use a reverse-domain ID like com.yourname.app.`, evidence);
+    }
     if (present)
         return makeItem(item, 'pass', `${item.label} is set.`, evidence);
     return makeItem(item, rule.absent, `${item.label} is not set.`, evidence);
 }
+function evaluateEncryption(appJson, item) {
+    const plist = getPath(appJson, ['expo', 'ios', 'infoPlist', 'ITSAppUsesNonExemptEncryption']);
+    const config = getPath(appJson, ['expo', 'ios', 'config', 'usesNonExemptEncryption']);
+    const evidence = `app.json expo.ios.infoPlist.ITSAppUsesNonExemptEncryption = ${JSON.stringify(plist) ?? 'undefined'}, expo.ios.config.usesNonExemptEncryption = ${JSON.stringify(config) ?? 'undefined'}`;
+    if (hasValue(plist) || hasValue(config))
+        return makeItem(item, 'pass', `${item.label} is set.`, evidence);
+    return makeItem(item, 'info', `${item.label} is declared exempt (no non-exempt encryption) when you publish.`, evidence);
+}
 function evaluateRestorePurchases(root, item) {
     const iap = scan(root, /react-native-purchases|expo-in-app-purchases|StoreKit/i);
     if (!iap.length)
@@ -242,14 +259,14 @@ function evaluateExpoLayout(root, item) {
     return makeItem(item, 'fail', 'Expo Router directories without _layout files found.', missing.slice(0, 8).join(', '));
 }
 function evaluateDuplicateRoutes(root, item) {
-    const appDir = path.join(root, 'app');
+    const appDir = routerDir(root);
     if (!existsSync(appDir))
         return makeItem(item, 'pass', 'No Expo Router app directory found.', 'scan: app/ directory absent');
     const routes = new Map();
     for (const file of walkFiles(appDir)) {
         if (!/\.(tsx|ts|jsx|js)$/.test(file) || /(^|\/)_layout\.(tsx|ts|jsx|js)$/.test(toRel(root, file)))
             continue;
-        const route = routePath(root, file);
+        const route = routePath(appDir, file);
         const current = routes.get(route) ?? [];
         current.push(toRel(root, file));
         routes.set(route, current);
@@ -289,7 +306,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 +330,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 +369,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 +415,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))
@@ -390,14 +439,10 @@ function unresolvedReason(item) {
     return `no deterministic evaluator is registered for ${item.check} item`;
 }
 function targetPlatformsFromAppJson(appJson) {
-    const ios = stringValue(getPath(appJson, ['expo', 'ios', 'bundleIdentifier']));
-    const android = stringValue(getPath(appJson, ['expo', 'android', 'package']));
-    const platforms = [];
-    if (ios)
-        platforms.push('ios');
-    if (android)
-        platforms.push('android');
-    return platforms.length ? platforms : ['ios', 'android'];
+    const declared = getPath(appJson, ['expo', 'platforms']);
+    if (!Array.isArray(declared))
+        return ['ios', 'android'];
+    return ['ios', 'android'].filter((platform) => declared.includes(platform));
 }
 function targetsItem(item, targetPlatforms) {
     return item.platform.some((platform) => targetPlatforms.includes(platform));
@@ -494,8 +539,12 @@ function sourceText(root, dirs) {
 function hasLayoutFile(dir) {
     return ['_layout.tsx', '_layout.ts', '_layout.jsx', '_layout.js'].some((name) => existsSync(path.join(dir, name)));
 }
-function routePath(root, file) {
-    const rel = toRel(root, file).replace(/^app\//, '').replace(/\.(tsx|ts|jsx|js)$/, '');
+function routerDir(root) {
+    const src = path.join(root, 'src', 'app');
+    return safeStat(src)?.isDirectory() ? src : path.join(root, 'app');
+}
+function routePath(appDir, file) {
+    const rel = toRel(appDir, file).replace(/\.(tsx|ts|jsx|js)$/, '');
     const parts = rel.split('/').filter((part) => part && !/^\(.+\)$/.test(part));
     if (parts[parts.length - 1] === 'index')
         parts.pop();

package/dist/version.js

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

package/package.json

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