@expo/cli 0.17.9 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/bin/cli +11 -7
- package/build/bin/cli.map +1 -1
- package/build/src/api/getExpoSchema.js +23 -5
- package/build/src/api/getExpoSchema.js.map +1 -1
- package/build/src/api/graphql/client.js +28 -10
- package/build/src/api/graphql/client.js.map +1 -1
- package/build/src/api/graphql/queries/AppQuery.js +16 -4
- package/build/src/api/graphql/queries/AppQuery.js.map +1 -1
- package/build/src/api/graphql/queries/UserQuery.js +8 -2
- package/build/src/api/graphql/queries/UserQuery.js.map +1 -1
- package/build/src/api/graphql/types/App.js +8 -2
- package/build/src/api/graphql/types/App.js.map +1 -1
- package/build/src/api/rest/cache/FileSystemCache.js +21 -9
- package/build/src/api/rest/cache/FileSystemCache.js.map +1 -1
- package/build/src/api/rest/cache/response.js +9 -3
- package/build/src/api/rest/cache/response.js.map +1 -1
- package/build/src/api/rest/cache/wrapFetchWithCache.js +32 -8
- package/build/src/api/rest/cache/wrapFetchWithCache.js.map +1 -1
- package/build/src/api/rest/client.js +23 -5
- package/build/src/api/rest/client.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithBaseUrl.js +9 -4
- package/build/src/api/rest/wrapFetchWithBaseUrl.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithProxy.js +8 -2
- package/build/src/api/rest/wrapFetchWithProxy.js.map +1 -1
- package/build/src/api/settings.js +8 -2
- package/build/src/api/settings.js.map +1 -1
- package/build/src/api/updateDevelopmentSession.js +18 -6
- package/build/src/api/updateDevelopmentSession.js.map +1 -1
- package/build/src/api/user/UserSettings.js +26 -8
- package/build/src/api/user/UserSettings.js.map +1 -1
- package/build/src/api/user/actions.js +17 -5
- package/build/src/api/user/actions.js.map +1 -1
- package/build/src/api/user/expoSsoLauncher.js +32 -8
- package/build/src/api/user/expoSsoLauncher.js.map +1 -1
- package/build/src/api/user/otp.js +17 -5
- package/build/src/api/user/otp.js.map +1 -1
- package/build/src/api/user/user.js +19 -12
- package/build/src/api/user/user.js.map +1 -1
- package/build/src/config/configAsync.js +25 -7
- package/build/src/config/configAsync.js.map +1 -1
- package/build/src/config/index.js +9 -3
- package/build/src/config/index.js.map +1 -1
- package/build/src/customize/customizeAsync.js +8 -2
- package/build/src/customize/customizeAsync.js.map +1 -1
- package/build/src/customize/generate.js +16 -4
- package/build/src/customize/generate.js.map +1 -1
- package/build/src/customize/index.js +10 -4
- package/build/src/customize/index.js.map +1 -1
- package/build/src/customize/templates.js +33 -9
- package/build/src/customize/templates.js.map +1 -1
- package/build/src/customize/typescript.js +8 -2
- package/build/src/customize/typescript.js.map +1 -1
- package/build/src/export/createMetadataJson.js +8 -2
- package/build/src/export/createMetadataJson.js.map +1 -1
- package/build/src/export/embed/exportEmbedAsync.js +58 -18
- package/build/src/export/embed/exportEmbedAsync.js.map +1 -1
- package/build/src/export/embed/index.js +17 -5
- package/build/src/export/embed/index.js.map +1 -1
- package/build/src/export/embed/resolveOptions.js +8 -2
- package/build/src/export/embed/resolveOptions.js.map +1 -1
- package/build/src/export/embed/xcodeCompilerLogger.js +16 -4
- package/build/src/export/embed/xcodeCompilerLogger.js.map +1 -1
- package/build/src/export/exportApp.js +32 -12
- package/build/src/export/exportApp.js.map +1 -1
- package/build/src/export/exportAssets.js +27 -9
- package/build/src/export/exportAssets.js.map +1 -1
- package/build/src/export/exportAsync.js +10 -2
- package/build/src/export/exportAsync.js.map +1 -1
- package/build/src/export/exportHermes.js +29 -17
- package/build/src/export/exportHermes.js.map +1 -1
- package/build/src/export/exportStaticAsync.js +69 -37
- package/build/src/export/exportStaticAsync.js.map +1 -1
- package/build/src/export/favicon.js +33 -9
- package/build/src/export/favicon.js.map +1 -1
- package/build/src/export/fork-bundleAsync.js +61 -16
- package/build/src/export/fork-bundleAsync.js.map +1 -1
- package/build/src/export/getPublicExpoManifest.js +8 -2
- package/build/src/export/getPublicExpoManifest.js.map +1 -1
- package/build/src/export/getResolvedLocales.js +15 -3
- package/build/src/export/getResolvedLocales.js.map +1 -1
- package/build/src/export/index.js +11 -5
- package/build/src/export/index.js.map +1 -1
- package/build/src/export/metroAssetLocalPath.js +9 -3
- package/build/src/export/metroAssetLocalPath.js.map +1 -1
- package/build/src/export/persistMetroAssets.js +27 -15
- package/build/src/export/persistMetroAssets.js.map +1 -1
- package/build/src/export/publicFolder.js +18 -6
- package/build/src/export/publicFolder.js.map +1 -1
- package/build/src/export/resolveOptions.js +8 -2
- package/build/src/export/resolveOptions.js.map +1 -1
- package/build/src/export/saveAssets.js +43 -19
- package/build/src/export/saveAssets.js.map +1 -1
- package/build/src/export/web/exportWebAsync.js +16 -4
- package/build/src/export/web/exportWebAsync.js.map +1 -1
- package/build/src/export/web/index.js +9 -3
- package/build/src/export/web/index.js.map +1 -1
- package/build/src/install/applyPlugins.js +8 -2
- package/build/src/install/applyPlugins.js.map +1 -1
- package/build/src/install/checkPackages.js +18 -6
- package/build/src/install/checkPackages.js.map +1 -1
- package/build/src/install/fixPackages.js +8 -2
- package/build/src/install/fixPackages.js.map +1 -1
- package/build/src/install/index.js +14 -8
- package/build/src/install/index.js.map +1 -1
- package/build/src/install/installAsync.js +27 -9
- package/build/src/install/installAsync.js.map +1 -1
- package/build/src/install/installExpoPackage.js +17 -5
- package/build/src/install/installExpoPackage.js.map +1 -1
- package/build/src/install/utils/autoAddConfigPlugins.js +17 -5
- package/build/src/install/utils/autoAddConfigPlugins.js.map +1 -1
- package/build/src/log.js +9 -3
- package/build/src/log.js.map +1 -1
- package/build/src/prebuild/clearNativeFolder.js +37 -13
- package/build/src/prebuild/clearNativeFolder.js.map +1 -1
- package/build/src/prebuild/configureProjectAsync.js +16 -4
- package/build/src/prebuild/configureProjectAsync.js.map +1 -1
- package/build/src/prebuild/copyTemplateFiles.js +29 -11
- package/build/src/prebuild/copyTemplateFiles.js.map +1 -1
- package/build/src/prebuild/ensureConfigAsync.js +24 -6
- package/build/src/prebuild/ensureConfigAsync.js.map +1 -1
- package/build/src/prebuild/index.js +14 -8
- package/build/src/prebuild/index.js.map +1 -1
- package/build/src/prebuild/prebuildAsync.js +9 -3
- package/build/src/prebuild/prebuildAsync.js.map +1 -1
- package/build/src/prebuild/renameTemplateAppName.js +119 -0
- package/build/src/prebuild/renameTemplateAppName.js.map +1 -0
- package/build/src/prebuild/resolveOptions.js +32 -8
- package/build/src/prebuild/resolveOptions.js.map +1 -1
- package/build/src/prebuild/resolveTemplate.js +44 -14
- package/build/src/prebuild/resolveTemplate.js.map +1 -1
- package/build/src/prebuild/updateFromTemplate.js +18 -2
- package/build/src/prebuild/updateFromTemplate.js.map +1 -1
- package/build/src/prebuild/updatePackageJson.js +49 -13
- package/build/src/prebuild/updatePackageJson.js.map +1 -1
- package/build/src/prebuild/validateTemplatePlatforms.js +16 -4
- package/build/src/prebuild/validateTemplatePlatforms.js.map +1 -1
- package/build/src/run/android/index.js +20 -4
- package/build/src/run/android/index.js.map +1 -1
- package/build/src/run/android/resolveGradlePropsAsync.js +55 -0
- package/build/src/run/android/resolveGradlePropsAsync.js.map +1 -0
- package/build/src/run/android/resolveInstallApkName.js +18 -6
- package/build/src/run/android/resolveInstallApkName.js.map +1 -1
- package/build/src/run/android/resolveLaunchProps.js +10 -4
- package/build/src/run/android/resolveLaunchProps.js.map +1 -1
- package/build/src/run/android/resolveOptions.js +5 -3
- package/build/src/run/android/resolveOptions.js.map +1 -1
- package/build/src/run/android/runAndroidAsync.js +13 -4
- package/build/src/run/android/runAndroidAsync.js.map +1 -1
- package/build/src/run/ensureNativeProject.js +15 -3
- package/build/src/run/ensureNativeProject.js.map +1 -1
- package/build/src/run/hints.js +10 -4
- package/build/src/run/hints.js.map +1 -1
- package/build/src/run/index.js +8 -2
- package/build/src/run/index.js.map +1 -1
- package/build/src/run/ios/XcodeBuild.js +57 -21
- package/build/src/run/ios/XcodeBuild.js.map +1 -1
- package/build/src/run/ios/appleDevice/AppleDevice.js +25 -7
- package/build/src/run/ios/appleDevice/AppleDevice.js.map +1 -1
- package/build/src/run/ios/appleDevice/ClientManager.js +10 -4
- package/build/src/run/ios/appleDevice/ClientManager.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/AFCClient.js +34 -10
- package/build/src/run/ios/appleDevice/client/AFCClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/DebugserverClient.js +16 -4
- package/build/src/run/ios/appleDevice/client/DebugserverClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/InstallationProxyClient.js +8 -2
- package/build/src/run/ios/appleDevice/client/InstallationProxyClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/LockdowndClient.js +17 -5
- package/build/src/run/ios/appleDevice/client/LockdowndClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/MobileImageMounterClient.js +17 -5
- package/build/src/run/ios/appleDevice/client/MobileImageMounterClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/UsbmuxdClient.js +25 -7
- package/build/src/run/ios/appleDevice/client/UsbmuxdClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/installOnDeviceAsync.js +24 -6
- package/build/src/run/ios/appleDevice/installOnDeviceAsync.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/AFCProtocol.js +8 -2
- package/build/src/run/ios/appleDevice/protocol/AFCProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/AbstractProtocol.js +16 -4
- package/build/src/run/ios/appleDevice/protocol/AbstractProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/GDBProtocol.js +8 -2
- package/build/src/run/ios/appleDevice/protocol/GDBProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/LockdownProtocol.js +16 -4
- package/build/src/run/ios/appleDevice/protocol/LockdownProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/UsbmuxProtocol.js +16 -4
- package/build/src/run/ios/appleDevice/protocol/UsbmuxProtocol.js.map +1 -1
- package/build/src/run/ios/codeSigning/Security.js +17 -5
- package/build/src/run/ios/codeSigning/Security.js.map +1 -1
- package/build/src/run/ios/codeSigning/configureCodeSigning.js +8 -2
- package/build/src/run/ios/codeSigning/configureCodeSigning.js.map +1 -1
- package/build/src/run/ios/codeSigning/resolveCertificateSigningIdentity.js +9 -3
- package/build/src/run/ios/codeSigning/resolveCertificateSigningIdentity.js.map +1 -1
- package/build/src/run/ios/codeSigning/simulatorCodeSigning.js +25 -7
- package/build/src/run/ios/codeSigning/simulatorCodeSigning.js.map +1 -1
- package/build/src/run/ios/codeSigning/xcodeCodeSigning.js +22 -10
- package/build/src/run/ios/codeSigning/xcodeCodeSigning.js.map +1 -1
- package/build/src/run/ios/index.js +19 -7
- package/build/src/run/ios/index.js.map +1 -1
- package/build/src/run/ios/launchApp.js +17 -5
- package/build/src/run/ios/launchApp.js.map +1 -1
- package/build/src/run/ios/options/promptDevice.js +9 -3
- package/build/src/run/ios/options/promptDevice.js.map +1 -1
- package/build/src/run/ios/options/resolveDevice.js +1 -2
- package/build/src/run/ios/options/resolveDevice.js.map +1 -1
- package/build/src/run/ios/options/resolveNativeScheme.js +27 -9
- package/build/src/run/ios/options/resolveNativeScheme.js.map +1 -1
- package/build/src/run/ios/options/resolveXcodeProject.js +8 -2
- package/build/src/run/ios/options/resolveXcodeProject.js.map +1 -1
- package/build/src/run/ios/runIosAsync.js +10 -2
- package/build/src/run/ios/runIosAsync.js.map +1 -1
- package/build/src/run/startBundler.js +16 -4
- package/build/src/run/startBundler.js.map +1 -1
- package/build/src/start/detectDevClient.js +29 -0
- package/build/src/start/detectDevClient.js.map +1 -0
- package/build/src/start/doctor/SecurityBinPrerequisite.js +8 -2
- package/build/src/start/doctor/SecurityBinPrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/SimulatorAppPrerequisite.js +16 -4
- package/build/src/start/doctor/apple/SimulatorAppPrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcodeDeveloperDiskImagePrerequisite.js +16 -4
- package/build/src/start/doctor/apple/XcodeDeveloperDiskImagePrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcodePrerequisite.js +79 -29
- package/build/src/start/doctor/apple/XcodePrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcrunPrerequisite.js +24 -6
- package/build/src/start/doctor/apple/XcrunPrerequisite.js.map +1 -1
- package/build/src/start/doctor/dependencies/bundledNativeModules.js +25 -7
- package/build/src/start/doctor/dependencies/bundledNativeModules.js.map +1 -1
- package/build/src/start/doctor/dependencies/ensureDependenciesAsync.js +27 -9
- package/build/src/start/doctor/dependencies/ensureDependenciesAsync.js.map +1 -1
- package/build/src/start/doctor/dependencies/getMissingPackages.js +24 -6
- package/build/src/start/doctor/dependencies/getMissingPackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/getVersionedPackages.js +8 -2
- package/build/src/start/doctor/dependencies/getVersionedPackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/resolvePackages.js +25 -7
- package/build/src/start/doctor/dependencies/resolvePackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/validateDependenciesVersions.js +32 -21
- package/build/src/start/doctor/dependencies/validateDependenciesVersions.js.map +1 -1
- package/build/src/start/doctor/ngrok/ExternalModule.js +33 -9
- package/build/src/start/doctor/ngrok/ExternalModule.js.map +1 -1
- package/build/src/start/doctor/typescript/TypeScriptProjectPrerequisite.js +18 -6
- package/build/src/start/doctor/typescript/TypeScriptProjectPrerequisite.js.map +1 -1
- package/build/src/start/doctor/typescript/updateTSConfig.js +29 -11
- package/build/src/start/doctor/typescript/updateTSConfig.js.map +1 -1
- package/build/src/start/doctor/web/WebSupportProjectPrerequisite.js +18 -6
- package/build/src/start/doctor/web/WebSupportProjectPrerequisite.js.map +1 -1
- package/build/src/start/index.js +17 -11
- package/build/src/start/index.js.map +1 -1
- package/build/src/start/interface/commandsTable.js +27 -9
- package/build/src/start/interface/commandsTable.js.map +1 -1
- package/build/src/start/interface/interactiveActions.js +17 -11
- package/build/src/start/interface/interactiveActions.js.map +1 -1
- package/build/src/start/interface/startInterface.js +8 -2
- package/build/src/start/interface/startInterface.js.map +1 -1
- package/build/src/start/platforms/AppIdResolver.js +9 -3
- package/build/src/start/platforms/AppIdResolver.js.map +1 -1
- package/build/src/start/platforms/DeviceManager.js +8 -2
- package/build/src/start/platforms/DeviceManager.js.map +1 -1
- package/build/src/start/platforms/ExpoGoInstaller.js +30 -14
- package/build/src/start/platforms/ExpoGoInstaller.js.map +1 -1
- package/build/src/start/platforms/PlatformManager.js +33 -13
- package/build/src/start/platforms/PlatformManager.js.map +1 -1
- package/build/src/start/platforms/android/ADBServer.js +17 -5
- package/build/src/start/platforms/android/ADBServer.js.map +1 -1
- package/build/src/start/platforms/android/AndroidAppIdResolver.js +13 -7
- package/build/src/start/platforms/android/AndroidAppIdResolver.js.map +1 -1
- package/build/src/start/platforms/android/AndroidDeviceManager.js +19 -7
- package/build/src/start/platforms/android/AndroidDeviceManager.js.map +1 -1
- package/build/src/start/platforms/android/AndroidSdk.js +34 -10
- package/build/src/start/platforms/android/AndroidSdk.js.map +1 -1
- package/build/src/start/platforms/android/activateWindow.js +16 -4
- package/build/src/start/platforms/android/activateWindow.js.map +1 -1
- package/build/src/start/platforms/android/adb.js +21 -4
- package/build/src/start/platforms/android/adb.js.map +1 -1
- package/build/src/start/platforms/android/emulator.js +32 -8
- package/build/src/start/platforms/android/emulator.js.map +1 -1
- package/build/src/start/platforms/android/gradle.js +23 -6
- package/build/src/start/platforms/android/gradle.js.map +1 -1
- package/build/src/start/platforms/android/promptAndroidDevice.js +10 -4
- package/build/src/start/platforms/android/promptAndroidDevice.js.map +1 -1
- package/build/src/start/platforms/ios/AppleAppIdResolver.js +26 -8
- package/build/src/start/platforms/ios/AppleAppIdResolver.js.map +1 -1
- package/build/src/start/platforms/ios/AppleDeviceManager.js +50 -18
- package/build/src/start/platforms/ios/AppleDeviceManager.js.map +1 -1
- package/build/src/start/platforms/ios/assertSystemRequirements.js +4 -3
- package/build/src/start/platforms/ios/assertSystemRequirements.js.map +1 -1
- package/build/src/start/platforms/ios/ensureSimulatorAppRunning.js +16 -4
- package/build/src/start/platforms/ios/ensureSimulatorAppRunning.js.map +1 -1
- package/build/src/start/platforms/ios/getBestSimulator.js +8 -2
- package/build/src/start/platforms/ios/getBestSimulator.js.map +1 -1
- package/build/src/start/platforms/ios/promptAppleDevice.js +9 -3
- package/build/src/start/platforms/ios/promptAppleDevice.js.map +1 -1
- package/build/src/start/platforms/ios/simctl.js +12 -6
- package/build/src/start/platforms/ios/simctl.js.map +1 -1
- package/build/src/start/platforms/ios/simctlLogging.js +40 -10
- package/build/src/start/platforms/ios/simctlLogging.js.map +1 -1
- package/build/src/start/platforms/ios/xcrun.js +16 -4
- package/build/src/start/platforms/ios/xcrun.js.map +1 -1
- package/build/src/start/project/dotExpo.js +27 -9
- package/build/src/start/project/dotExpo.js.map +1 -1
- package/build/src/start/resolveOptions.js +33 -15
- package/build/src/start/resolveOptions.js.map +1 -1
- package/build/src/start/server/AsyncNgrok.js +34 -10
- package/build/src/start/server/AsyncNgrok.js.map +1 -1
- package/build/src/start/server/BundlerDevServer.js +16 -4
- package/build/src/start/server/BundlerDevServer.js.map +1 -1
- package/build/src/start/server/DevServerManager.js +28 -10
- package/build/src/start/server/DevServerManager.js.map +1 -1
- package/build/src/start/server/DevToolsPluginManager.js +16 -4
- package/build/src/start/server/DevToolsPluginManager.js.map +1 -1
- package/build/src/start/server/DevelopmentSession.js +9 -3
- package/build/src/start/server/DevelopmentSession.js.map +1 -1
- package/build/src/start/server/ReactDevToolsProxy.js +26 -8
- package/build/src/start/server/ReactDevToolsProxy.js.map +1 -1
- package/build/src/start/server/UrlCreator.js +19 -6
- package/build/src/start/server/UrlCreator.js.map +1 -1
- package/build/src/start/server/getStaticRenderFunctions.js +91 -55
- package/build/src/start/server/getStaticRenderFunctions.js.map +1 -1
- package/build/src/start/server/metro/MetroBundlerDevServer.js +231 -83
- package/build/src/start/server/metro/MetroBundlerDevServer.js.map +1 -1
- package/build/src/start/server/metro/MetroTerminalReporter.js +30 -15
- package/build/src/start/server/metro/MetroTerminalReporter.js.map +1 -1
- package/build/src/start/server/metro/TerminalReporter.js +26 -8
- package/build/src/start/server/metro/TerminalReporter.js.map +1 -1
- package/build/src/start/server/metro/TerminalReporter.types.js.map +1 -1
- package/build/src/start/server/metro/createExpoMetroResolver.js +56 -20
- package/build/src/start/server/metro/createExpoMetroResolver.js.map +1 -1
- package/build/src/start/server/metro/createJResolver.js +90 -45
- package/build/src/start/server/metro/createJResolver.js.map +1 -1
- package/build/src/start/server/metro/createServerRouteMiddleware.js +29 -28
- package/build/src/start/server/metro/createServerRouteMiddleware.js.map +1 -1
- package/build/src/start/server/metro/debugging/MessageHandler.js +27 -0
- package/build/src/start/server/metro/debugging/MessageHandler.js.map +1 -0
- package/build/src/start/server/metro/debugging/createDebugMiddleware.js +11 -8
- package/build/src/start/server/metro/debugging/createDebugMiddleware.js.map +1 -1
- package/build/src/start/server/metro/debugging/createHandlersFactory.js +63 -0
- package/build/src/start/server/metro/debugging/createHandlersFactory.js.map +1 -0
- package/build/src/start/server/metro/debugging/{inspectorHandlers/utils.js → getDebuggerType.js} +1 -6
- package/build/src/start/server/metro/debugging/getDebuggerType.js.map +1 -0
- package/build/src/start/server/metro/debugging/{inspectorHandlers → messageHandlers}/NetworkResponse.js +8 -5
- package/build/src/start/server/metro/debugging/messageHandlers/NetworkResponse.js.map +1 -0
- package/build/src/start/server/metro/debugging/{inspectorHandlers → messageHandlers}/PageReload.js +7 -6
- package/build/src/start/server/metro/debugging/messageHandlers/PageReload.js.map +1 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerGetPossibleBreakpoints.js +25 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerGetPossibleBreakpoints.js.map +1 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerSetBreakpointByUrl.js +22 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerSetBreakpointByUrl.js.map +1 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeCallFunctionOn.js +28 -0
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeCallFunctionOn.js.map +1 -0
- package/build/src/start/server/metro/debugging/{inspectorHandlers → messageHandlers}/VscodeRuntimeGetProperties.js +10 -6
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeGetProperties.js.map +1 -0
- package/build/src/start/server/metro/debugging/pageIsSupported.js +14 -0
- package/build/src/start/server/metro/debugging/pageIsSupported.js.map +1 -0
- package/build/src/start/server/metro/debugging/types.js.map +1 -0
- package/build/src/start/server/metro/externals.js +51 -64
- package/build/src/start/server/metro/externals.js.map +1 -1
- package/build/src/start/server/metro/fetchRouterManifest.js +8 -2
- package/build/src/start/server/metro/fetchRouterManifest.js.map +1 -1
- package/build/src/start/server/metro/formatFileCandidates.js +8 -2
- package/build/src/start/server/metro/formatFileCandidates.js.map +1 -1
- package/build/src/start/server/metro/getCssModulesFromBundler.js +34 -10
- package/build/src/start/server/metro/getCssModulesFromBundler.js.map +1 -1
- package/build/src/start/server/metro/instantiateMetro.js +96 -30
- package/build/src/start/server/metro/instantiateMetro.js.map +1 -1
- package/build/src/start/server/metro/metroErrorInterface.js +40 -21
- package/build/src/start/server/metro/metroErrorInterface.js.map +1 -1
- package/build/src/start/server/metro/metroVirtualModules.js +82 -0
- package/build/src/start/server/metro/metroVirtualModules.js.map +1 -0
- package/build/src/start/server/metro/metroWatchTypeScriptFiles.js +8 -2
- package/build/src/start/server/metro/metroWatchTypeScriptFiles.js.map +1 -1
- package/build/src/start/server/metro/router.js +44 -17
- package/build/src/start/server/metro/router.js.map +1 -1
- package/build/src/start/server/metro/runServer-fork.js +56 -14
- package/build/src/start/server/metro/runServer-fork.js.map +1 -1
- package/build/src/start/server/metro/serializeHtml.js +25 -12
- package/build/src/start/server/metro/serializeHtml.js.map +1 -1
- package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js +8 -2
- package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js.map +1 -1
- package/build/src/start/server/metro/withMetroMultiPlatform.js +148 -46
- package/build/src/start/server/metro/withMetroMultiPlatform.js.map +1 -1
- package/build/src/start/server/metro/withMetroResolvers.js +31 -13
- package/build/src/start/server/metro/withMetroResolvers.js.map +1 -1
- package/build/src/start/server/middleware/CreateFileMiddleware.js +22 -10
- package/build/src/start/server/middleware/CreateFileMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/DevToolsPluginMiddleware.js +16 -4
- package/build/src/start/server/middleware/DevToolsPluginMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js +42 -12
- package/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ExpoMiddleware.js +8 -2
- package/build/src/start/server/middleware/ExpoMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/InterstitialPageMiddleware.js +41 -11
- package/build/src/start/server/middleware/InterstitialPageMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ManifestMiddleware.js +40 -10
- package/build/src/start/server/middleware/ManifestMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ReactDevToolsPageMiddleware.js +24 -6
- package/build/src/start/server/middleware/ReactDevToolsPageMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js +8 -2
- package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ServeStaticMiddleware.js +24 -6
- package/build/src/start/server/middleware/ServeStaticMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/inspector/JsInspector.js +25 -8
- package/build/src/start/server/middleware/inspector/JsInspector.js.map +1 -1
- package/build/src/start/server/middleware/inspector/LaunchBrowser.js +10 -4
- package/build/src/start/server/middleware/inspector/LaunchBrowser.js.map +1 -1
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplLinux.js +24 -6
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplLinux.js.map +1 -1
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplMacOS.js +33 -9
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplMacOS.js.map +1 -1
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplWindows.js +27 -11
- package/build/src/start/server/middleware/inspector/LaunchBrowserImplWindows.js.map +1 -1
- package/build/src/start/server/middleware/inspector/createJsInspectorMiddleware.js +33 -9
- package/build/src/start/server/middleware/inspector/createJsInspectorMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/metroOptions.js +12 -2
- package/build/src/start/server/middleware/metroOptions.js.map +1 -1
- package/build/src/start/server/middleware/resolveAssets.js +17 -5
- package/build/src/start/server/middleware/resolveAssets.js.map +1 -1
- package/build/src/start/server/middleware/resolvePlatform.js +8 -2
- package/build/src/start/server/middleware/resolvePlatform.js.map +1 -1
- package/build/src/start/server/platformBundlers.js +8 -2
- package/build/src/start/server/platformBundlers.js.map +1 -1
- package/build/src/start/server/serverLogLikeMetro.js +37 -13
- package/build/src/start/server/serverLogLikeMetro.js.map +1 -1
- package/build/src/start/server/type-generation/expo-env.js +16 -4
- package/build/src/start/server/type-generation/expo-env.js.map +1 -1
- package/build/src/start/server/type-generation/routes.js +91 -37
- package/build/src/start/server/type-generation/routes.js.map +1 -1
- package/build/src/start/server/type-generation/startTypescriptTypeGeneration.js +27 -9
- package/build/src/start/server/type-generation/startTypescriptTypeGeneration.js.map +1 -1
- package/build/src/start/server/type-generation/tsconfig.js +27 -9
- package/build/src/start/server/type-generation/tsconfig.js.map +1 -1
- package/build/src/start/server/webTemplate.js +26 -8
- package/build/src/start/server/webTemplate.js.map +1 -1
- package/build/src/start/server/webpack/WebpackBundlerDevServer.js +36 -12
- package/build/src/start/server/webpack/WebpackBundlerDevServer.js.map +1 -1
- package/build/src/start/server/webpack/compile.js +17 -5
- package/build/src/start/server/webpack/compile.js.map +1 -1
- package/build/src/start/server/webpack/resolveFromProject.js +8 -2
- package/build/src/start/server/webpack/resolveFromProject.js.map +1 -1
- package/build/src/start/server/webpack/tls.js +35 -11
- package/build/src/start/server/webpack/tls.js.map +1 -1
- package/build/src/start/startAsync.js +36 -11
- package/build/src/start/startAsync.js.map +1 -1
- package/build/src/utils/FileNotifier.js +32 -8
- package/build/src/utils/FileNotifier.js.map +1 -1
- package/build/src/utils/analytics/getDevClientProperties.js +26 -8
- package/build/src/utils/analytics/getDevClientProperties.js.map +1 -1
- package/build/src/utils/analytics/metroDebuggerMiddleware.js +2 -2
- package/build/src/utils/analytics/metroDebuggerMiddleware.js.map +1 -1
- package/build/src/utils/args.js +32 -8
- package/build/src/utils/args.js.map +1 -1
- package/build/src/utils/cocoapods.js +64 -28
- package/build/src/utils/cocoapods.js.map +1 -1
- package/build/src/utils/codesigning.js +79 -29
- package/build/src/utils/codesigning.js.map +1 -1
- package/build/src/utils/createFileTransform.js +24 -69
- package/build/src/utils/createFileTransform.js.map +1 -1
- package/build/src/utils/dir.js +33 -26
- package/build/src/utils/dir.js.map +1 -1
- package/build/src/utils/downloadAppAsync.js +40 -10
- package/build/src/utils/downloadAppAsync.js.map +1 -1
- package/build/src/utils/downloadExpoGoAsync.js +26 -11
- package/build/src/utils/downloadExpoGoAsync.js.map +1 -1
- package/build/src/utils/editor.js +18 -6
- package/build/src/utils/editor.js.map +1 -1
- package/build/src/utils/env.js +40 -31
- package/build/src/utils/env.js.map +1 -1
- package/build/src/utils/errors.js +20 -5
- package/build/src/utils/errors.js.map +1 -1
- package/build/src/utils/findUp.js +18 -6
- package/build/src/utils/findUp.js.map +1 -1
- package/build/src/utils/getOrPromptApplicationId.js +19 -7
- package/build/src/utils/getOrPromptApplicationId.js.map +1 -1
- package/build/src/utils/getRunningProcess.js +18 -6
- package/build/src/utils/getRunningProcess.js.map +1 -1
- package/build/src/utils/git.js +18 -6
- package/build/src/utils/git.js.map +1 -1
- package/build/src/utils/glob.js +9 -3
- package/build/src/utils/glob.js.map +1 -1
- package/build/src/utils/ip.js +8 -2
- package/build/src/utils/ip.js.map +1 -1
- package/build/src/utils/isModuleSymlinked.js +16 -4
- package/build/src/utils/isModuleSymlinked.js.map +1 -1
- package/build/src/utils/link.js +18 -6
- package/build/src/utils/link.js.map +1 -1
- package/build/src/utils/mergeGitIgnorePaths.js +25 -13
- package/build/src/utils/mergeGitIgnorePaths.js.map +1 -1
- package/build/src/utils/modifyConfigAsync.js +18 -6
- package/build/src/utils/modifyConfigAsync.js.map +1 -1
- package/build/src/utils/modifyConfigPlugins.js +8 -2
- package/build/src/utils/modifyConfigPlugins.js.map +1 -1
- package/build/src/utils/nodeEnv.js +2 -0
- package/build/src/utils/nodeEnv.js.map +1 -1
- package/build/src/utils/nodeModules.js +23 -5
- package/build/src/utils/nodeModules.js.map +1 -1
- package/build/src/utils/npm.js +64 -17
- package/build/src/utils/npm.js.map +1 -1
- package/build/src/utils/open.js +9 -3
- package/build/src/utils/open.js.map +1 -1
- package/build/src/utils/ora.js +16 -4
- package/build/src/utils/ora.js.map +1 -1
- package/build/src/utils/plist.js +24 -6
- package/build/src/utils/plist.js.map +1 -1
- package/build/src/utils/port.js +22 -10
- package/build/src/utils/port.js.map +1 -1
- package/build/src/utils/profile.js +8 -2
- package/build/src/utils/profile.js.map +1 -1
- package/build/src/utils/progress.js +8 -2
- package/build/src/utils/progress.js.map +1 -1
- package/build/src/utils/prompts.js +16 -4
- package/build/src/utils/prompts.js.map +1 -1
- package/build/src/utils/scheme.js +75 -23
- package/build/src/utils/scheme.js.map +1 -1
- package/build/src/utils/tar.js +16 -4
- package/build/src/utils/tar.js.map +1 -1
- package/build/src/utils/telemetry/DetachedClient.js +87 -0
- package/build/src/utils/telemetry/DetachedClient.js.map +1 -0
- package/build/src/utils/telemetry/RudderClient.js +98 -0
- package/build/src/utils/telemetry/RudderClient.js.map +1 -0
- package/build/src/utils/telemetry/flushDetached.js +43 -0
- package/build/src/utils/telemetry/flushDetached.js.map +1 -0
- package/build/src/utils/telemetry/getContext.js +92 -0
- package/build/src/utils/telemetry/getContext.js.map +1 -0
- package/build/src/utils/telemetry/index.js +32 -0
- package/build/src/utils/telemetry/index.js.map +1 -0
- package/build/src/utils/telemetry/types.js +6 -0
- package/build/src/utils/telemetry/types.js.map +1 -0
- package/build/src/utils/tsconfig/evaluateTsConfig.js +16 -4
- package/build/src/utils/tsconfig/evaluateTsConfig.js.map +1 -1
- package/build/src/utils/tsconfig/loadTsConfigPaths.js +18 -6
- package/build/src/utils/tsconfig/loadTsConfigPaths.js.map +1 -1
- package/build/src/utils/tsconfig/resolveWithTsConfigPaths.js +10 -4
- package/build/src/utils/tsconfig/resolveWithTsConfigPaths.js.map +1 -1
- package/build/src/utils/url.js +19 -10
- package/build/src/utils/url.js.map +1 -1
- package/build/src/utils/validateApplicationId.js +18 -6
- package/build/src/utils/validateApplicationId.js.map +1 -1
- package/build/src/whoami/whoamiAsync.js +8 -2
- package/build/src/whoami/whoamiAsync.js.map +1 -1
- package/package.json +15 -16
- package/static/canary/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js +27907 -0
- package/static/canary/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js +9494 -0
- package/static/canary/react-native/Libraries/Renderer/implementations/ReactFabric-profiling.js +10015 -0
- package/static/canary/react-native/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js +28375 -0
- package/static/canary/react-native/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js +9714 -0
- package/build/src/run/android/resolveGradleProps.js +0 -37
- package/build/src/run/android/resolveGradleProps.js.map +0 -1
- package/build/src/start/server/metro/bundleApiRoutes.js +0 -52
- package/build/src/start/server/metro/bundleApiRoutes.js.map +0 -1
- package/build/src/start/server/metro/debugging/InspectorDevice.js +0 -80
- package/build/src/start/server/metro/debugging/InspectorDevice.js.map +0 -1
- package/build/src/start/server/metro/debugging/InspectorProxy.js +0 -116
- package/build/src/start/server/metro/debugging/InspectorProxy.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/NetworkResponse.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/PageReload.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerGetPossibleBreakpoints.js +0 -21
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerGetPossibleBreakpoints.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerScriptParsed.js +0 -56
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerScriptParsed.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerSetBreakpointByUrl.js +0 -18
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeDebuggerSetBreakpointByUrl.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeRuntimeCallFunctionOn.js +0 -24
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeRuntimeCallFunctionOn.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/VscodeRuntimeGetProperties.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/types.js.map +0 -1
- package/build/src/start/server/metro/debugging/inspectorHandlers/utils.js.map +0 -1
- package/build/src/start/server/type-generation/__typetests__/fixtures/basic.js +0 -38
- package/build/src/start/server/type-generation/__typetests__/fixtures/basic.js.map +0 -1
- package/build/src/start/server/type-generation/__typetests__/generateFixtures.js +0 -38
- package/build/src/start/server/type-generation/__typetests__/generateFixtures.js.map +0 -1
- package/build/src/start/server/type-generation/__typetests__/route.test.js +0 -184
- package/build/src/start/server/type-generation/__typetests__/route.test.js.map +0 -1
- package/build/src/utils/analytics/rudderstackClient.js +0 -147
- package/build/src/utils/analytics/rudderstackClient.js.map +0 -1
- /package/build/src/start/server/metro/debugging/{inspectorHandlers/types.js → types.js} +0 -0
|
@@ -2,8 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
function _plist() {
|
|
6
|
+
const data = _interopRequireDefault(require("@expo/plist"));
|
|
7
|
+
_plist = function() {
|
|
8
|
+
return data;
|
|
9
|
+
};
|
|
10
|
+
return data;
|
|
11
|
+
}
|
|
12
|
+
function _debug() {
|
|
13
|
+
const data = _interopRequireDefault(require("debug"));
|
|
14
|
+
_debug = function() {
|
|
15
|
+
return data;
|
|
16
|
+
};
|
|
17
|
+
return data;
|
|
18
|
+
}
|
|
7
19
|
var _errors = require("../../../../utils/errors");
|
|
8
20
|
var _plist1 = require("../../../../utils/plist");
|
|
9
21
|
function _interopRequireDefault(obj) {
|
|
@@ -12,7 +24,7 @@ function _interopRequireDefault(obj) {
|
|
|
12
24
|
};
|
|
13
25
|
}
|
|
14
26
|
const BPLIST_MAGIC = Buffer.from("bplist00");
|
|
15
|
-
const debug = (
|
|
27
|
+
const debug = _debug().default("expo:apple-device:protocol");
|
|
16
28
|
class ProtocolClientError extends _errors.CommandError {
|
|
17
29
|
constructor(msg, error, protocolMessage){
|
|
18
30
|
super(msg);
|
|
@@ -88,7 +100,7 @@ class PlistProtocolReader extends ProtocolReader {
|
|
|
88
100
|
if (BPLIST_MAGIC.compare(body, 0, 8) === 0) {
|
|
89
101
|
return (0, _plist1).parsePlistBuffer(body);
|
|
90
102
|
} else {
|
|
91
|
-
return _plist.default.parse(body.toString("utf8"));
|
|
103
|
+
return _plist().default.parse(body.toString("utf8"));
|
|
92
104
|
}
|
|
93
105
|
}
|
|
94
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/AbstractProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport { CommandError } from '../../../../utils/errors';\nimport { parsePlistBuffer } from '../../../../utils/plist';\n\nconst BPLIST_MAGIC = Buffer.from('bplist00');\nconst debug = Debug('expo:apple-device:protocol');\n\nexport class ProtocolClientError extends CommandError {\n constructor(\n msg: string,\n public error: Error,\n public protocolMessage?: any\n ) {\n super(msg);\n }\n}\n\nexport type ProtocolReaderCallback = (resp: any, err?: Error) => void;\n\nexport class ProtocolReaderFactory<T> {\n constructor(private ProtocolReader: new (callback: ProtocolReaderCallback) => T) {}\n\n create(callback: (resp: any, err?: Error) => void): T {\n return new this.ProtocolReader(callback);\n }\n}\n\nexport abstract class ProtocolReader {\n protected body!: Buffer; // TODO: ! -> ?\n protected bodyLength!: number; // TODO: ! -> ?\n protected buffer = Buffer.alloc(0);\n constructor(\n protected headerSize: number,\n protected callback: ProtocolReaderCallback\n ) {\n this.onData = this.onData.bind(this);\n }\n\n /** Returns length of body, or -1 if header doesn't contain length */\n protected abstract parseHeader(data: Buffer): number;\n protected abstract parseBody(data: Buffer): any;\n\n onData(data?: Buffer) {\n try {\n // if there's data, add it on to existing buffer\n this.buffer = data ? Buffer.concat([this.buffer, data]) : this.buffer;\n // we haven't gotten the body length from the header yet\n if (!this.bodyLength) {\n if (this.buffer.length < this.headerSize) {\n // partial header, wait for rest\n return;\n }\n this.bodyLength = this.parseHeader(this.buffer);\n // move on to body\n this.buffer = this.buffer.slice(this.headerSize);\n if (!this.buffer.length) {\n // only got header, wait for body\n return;\n }\n }\n if (this.buffer.length < this.bodyLength) {\n // wait for rest of body\n return;\n }\n\n if (this.bodyLength === -1) {\n this.callback(this.parseBody(this.buffer));\n this.buffer = Buffer.alloc(0);\n } else {\n this.body = this.buffer.slice(0, this.bodyLength);\n this.bodyLength -= this.body.length;\n if (!this.bodyLength) {\n this.callback(this.parseBody(this.body));\n }\n this.buffer = this.buffer.slice(this.body.length);\n // There are multiple messages here, call parse again\n if (this.buffer.length) {\n this.onData();\n }\n }\n } catch (err: any) {\n this.callback(null, err);\n }\n }\n}\n\nexport abstract class PlistProtocolReader extends ProtocolReader {\n protected parseBody(body: Buffer) {\n if (BPLIST_MAGIC.compare(body, 0, 8) === 0) {\n return parsePlistBuffer(body);\n } else {\n return plist.parse(body.toString('utf8'));\n }\n }\n}\n\nexport interface ProtocolWriter {\n write(sock: Socket, msg: any): void;\n}\n\nexport abstract class ProtocolClient<MessageType = any> {\n constructor(\n public socket: Socket,\n protected readerFactory: ProtocolReaderFactory<ProtocolReader>,\n protected writer: ProtocolWriter\n ) {}\n\n sendMessage<ResponseType = any>(msg: MessageType): Promise<ResponseType>;\n sendMessage<CallbackType = void, ResponseType = any>(\n msg: MessageType,\n callback: (response: ResponseType, resolve: any, reject: any) => void\n ): Promise<CallbackType>;\n sendMessage<CallbackType = void, ResponseType = any>(\n msg: MessageType,\n callback?: (response: ResponseType, resolve: any, reject: any) => void\n ): Promise<CallbackType | ResponseType> {\n const onError = (error: Error) => {\n debug('Unexpected protocol socket error encountered: %s', error);\n throw new ProtocolClientError(\n `Unexpected protocol error encountered: ${error.message}`,\n error,\n msg\n );\n };\n\n return new Promise<ResponseType | CallbackType>((resolve, reject) => {\n const reader = this.readerFactory.create(async (response: ResponseType, error?: Error) => {\n if (error) {\n reject(error);\n return;\n }\n if (callback) {\n callback(\n response,\n (value: any) => {\n this.socket.removeListener('data', reader.onData);\n this.socket.removeListener('error', onError);\n resolve(value);\n },\n reject\n );\n } else {\n this.socket.removeListener('data', reader.onData);\n this.socket.removeListener('error', onError);\n resolve(response);\n }\n });\n this.socket.on('data', reader.onData);\n this.socket.on('error', onError);\n this.writer.write(this.socket, msg);\n });\n }\n}\n"],"names":["BPLIST_MAGIC","Buffer","from","debug","Debug","ProtocolClientError","CommandError","constructor","msg","error","protocolMessage","ProtocolReaderFactory","ProtocolReader","create","callback","headerSize","buffer","alloc","onData","bind","data","concat","bodyLength","length","parseHeader","slice","parseBody","body","err","PlistProtocolReader","compare","parsePlistBuffer","plist","parse","toString","ProtocolClient","socket","readerFactory","writer","sendMessage","onError","message","Promise","resolve","reject","reader","response","value","removeListener","on","write"],"mappings":"AAOA;;;;
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/AbstractProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport { CommandError } from '../../../../utils/errors';\nimport { parsePlistBuffer } from '../../../../utils/plist';\n\nconst BPLIST_MAGIC = Buffer.from('bplist00');\nconst debug = Debug('expo:apple-device:protocol');\n\nexport class ProtocolClientError extends CommandError {\n constructor(\n msg: string,\n public error: Error,\n public protocolMessage?: any\n ) {\n super(msg);\n }\n}\n\nexport type ProtocolReaderCallback = (resp: any, err?: Error) => void;\n\nexport class ProtocolReaderFactory<T> {\n constructor(private ProtocolReader: new (callback: ProtocolReaderCallback) => T) {}\n\n create(callback: (resp: any, err?: Error) => void): T {\n return new this.ProtocolReader(callback);\n }\n}\n\nexport abstract class ProtocolReader {\n protected body!: Buffer; // TODO: ! -> ?\n protected bodyLength!: number; // TODO: ! -> ?\n protected buffer = Buffer.alloc(0);\n constructor(\n protected headerSize: number,\n protected callback: ProtocolReaderCallback\n ) {\n this.onData = this.onData.bind(this);\n }\n\n /** Returns length of body, or -1 if header doesn't contain length */\n protected abstract parseHeader(data: Buffer): number;\n protected abstract parseBody(data: Buffer): any;\n\n onData(data?: Buffer) {\n try {\n // if there's data, add it on to existing buffer\n this.buffer = data ? Buffer.concat([this.buffer, data]) : this.buffer;\n // we haven't gotten the body length from the header yet\n if (!this.bodyLength) {\n if (this.buffer.length < this.headerSize) {\n // partial header, wait for rest\n return;\n }\n this.bodyLength = this.parseHeader(this.buffer);\n // move on to body\n this.buffer = this.buffer.slice(this.headerSize);\n if (!this.buffer.length) {\n // only got header, wait for body\n return;\n }\n }\n if (this.buffer.length < this.bodyLength) {\n // wait for rest of body\n return;\n }\n\n if (this.bodyLength === -1) {\n this.callback(this.parseBody(this.buffer));\n this.buffer = Buffer.alloc(0);\n } else {\n this.body = this.buffer.slice(0, this.bodyLength);\n this.bodyLength -= this.body.length;\n if (!this.bodyLength) {\n this.callback(this.parseBody(this.body));\n }\n this.buffer = this.buffer.slice(this.body.length);\n // There are multiple messages here, call parse again\n if (this.buffer.length) {\n this.onData();\n }\n }\n } catch (err: any) {\n this.callback(null, err);\n }\n }\n}\n\nexport abstract class PlistProtocolReader extends ProtocolReader {\n protected parseBody(body: Buffer) {\n if (BPLIST_MAGIC.compare(body, 0, 8) === 0) {\n return parsePlistBuffer(body);\n } else {\n return plist.parse(body.toString('utf8'));\n }\n }\n}\n\nexport interface ProtocolWriter {\n write(sock: Socket, msg: any): void;\n}\n\nexport abstract class ProtocolClient<MessageType = any> {\n constructor(\n public socket: Socket,\n protected readerFactory: ProtocolReaderFactory<ProtocolReader>,\n protected writer: ProtocolWriter\n ) {}\n\n sendMessage<ResponseType = any>(msg: MessageType): Promise<ResponseType>;\n sendMessage<CallbackType = void, ResponseType = any>(\n msg: MessageType,\n callback: (response: ResponseType, resolve: any, reject: any) => void\n ): Promise<CallbackType>;\n sendMessage<CallbackType = void, ResponseType = any>(\n msg: MessageType,\n callback?: (response: ResponseType, resolve: any, reject: any) => void\n ): Promise<CallbackType | ResponseType> {\n const onError = (error: Error) => {\n debug('Unexpected protocol socket error encountered: %s', error);\n throw new ProtocolClientError(\n `Unexpected protocol error encountered: ${error.message}`,\n error,\n msg\n );\n };\n\n return new Promise<ResponseType | CallbackType>((resolve, reject) => {\n const reader = this.readerFactory.create(async (response: ResponseType, error?: Error) => {\n if (error) {\n reject(error);\n return;\n }\n if (callback) {\n callback(\n response,\n (value: any) => {\n this.socket.removeListener('data', reader.onData);\n this.socket.removeListener('error', onError);\n resolve(value);\n },\n reject\n );\n } else {\n this.socket.removeListener('data', reader.onData);\n this.socket.removeListener('error', onError);\n resolve(response);\n }\n });\n this.socket.on('data', reader.onData);\n this.socket.on('error', onError);\n this.writer.write(this.socket, msg);\n });\n }\n}\n"],"names":["BPLIST_MAGIC","Buffer","from","debug","Debug","ProtocolClientError","CommandError","constructor","msg","error","protocolMessage","ProtocolReaderFactory","ProtocolReader","create","callback","headerSize","buffer","alloc","onData","bind","data","concat","bodyLength","length","parseHeader","slice","parseBody","body","err","PlistProtocolReader","compare","parsePlistBuffer","plist","parse","toString","ProtocolClient","socket","readerFactory","writer","sendMessage","onError","message","Promise","resolve","reject","reader","response","value","removeListener","on","write"],"mappings":"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"}
|
|
@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.validateChecksum = validateChecksum;
|
|
6
|
-
|
|
6
|
+
function _debug() {
|
|
7
|
+
const data = _interopRequireDefault(require("debug"));
|
|
8
|
+
_debug = function() {
|
|
9
|
+
return data;
|
|
10
|
+
};
|
|
11
|
+
return data;
|
|
12
|
+
}
|
|
7
13
|
var _abstractProtocol = require("./AbstractProtocol");
|
|
8
14
|
var _errors = require("../../../../utils/errors");
|
|
9
15
|
function _interopRequireDefault(obj) {
|
|
@@ -11,7 +17,7 @@ function _interopRequireDefault(obj) {
|
|
|
11
17
|
default: obj
|
|
12
18
|
};
|
|
13
19
|
}
|
|
14
|
-
const debug = (
|
|
20
|
+
const debug = _debug().default("expo:apple-device:protocol:gdb");
|
|
15
21
|
const ACK_SUCCESS = "+".charCodeAt(0);
|
|
16
22
|
class GDBProtocolClient extends _abstractProtocol.ProtocolClient {
|
|
17
23
|
constructor(socket){
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/GDBProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport {\n ProtocolClient,\n ProtocolReader,\n ProtocolReaderCallback,\n ProtocolReaderFactory,\n ProtocolWriter,\n} from './AbstractProtocol';\nimport { CommandError } from '../../../../utils/errors';\n\nconst debug = Debug('expo:apple-device:protocol:gdb');\nconst ACK_SUCCESS = '+'.charCodeAt(0);\n\nexport interface GDBMessage {\n cmd: string;\n args: string[];\n}\n\nexport class GDBProtocolClient extends ProtocolClient<GDBMessage> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(GDBProtocolReader), new GDBProtocolWriter());\n }\n}\n\nexport class GDBProtocolReader extends ProtocolReader {\n constructor(callback: ProtocolReaderCallback) {\n super(1 /* \"Header\" is '+' or '-' */, callback);\n }\n\n onData(data?: Buffer) {\n // the GDB protocol does not support body length in its header so we cannot rely on\n // the parent implementation to determine when a payload is complete\n try {\n // if there's data, add it to the existing buffer\n this.buffer = data ? Buffer.concat([this.buffer, data]) : this.buffer;\n\n // do we have enough bytes to proceed\n if (this.buffer.length < this.headerSize) {\n return; // incomplete header, wait for more\n }\n\n // first, check the header\n if (this.parseHeader(this.buffer) === -1) {\n // we have a valid header so check the body. GDB packets will always be a leading '$', data bytes,\n // a trailing '#', and a two digit checksum. minimum valid body is the empty response '$#00'\n // https://developer.apple.com/library/archive/documentation/DeveloperTools/gdb/gdb/gdb_33.html\n const packetData = this.buffer.toString().match('\\\\$.*#[0-9a-f]{2}');\n if (packetData == null) {\n return; // incomplete body, wait for more\n }\n // extract the body and update the buffer\n const body = Buffer.from(packetData[0]);\n this.buffer = this.buffer.slice(this.headerSize + body.length);\n // parse the payload and recurse if there is more data to process\n this.callback(this.parseBody(body));\n if (this.buffer.length) {\n this.onData();\n }\n }\n } catch (err: any) {\n this.callback(null, err);\n }\n }\n\n parseHeader(data: Buffer) {\n if (data[0] !== ACK_SUCCESS) {\n throw new CommandError('APPLE_DEVICE_GDB', 'Unsuccessful debugserver response');\n } // TODO: retry?\n return -1;\n }\n\n parseBody(buffer: Buffer) {\n debug(`Response body: ${buffer.toString()}`);\n // check for checksum\n const checksum = buffer.slice(-3).toString();\n if (checksum.match(/#[0-9a-f]{2}/)) {\n // remove '$' prefix and checksum\n const msg = buffer.slice(1, -3).toString();\n if (validateChecksum(checksum, msg)) {\n return msg;\n } else if (msg.startsWith('E')) {\n if (msg.match(/the device was not, or could not be, unlocked/)) {\n throw new CommandError('APPLE_DEVICE_LOCKED', 'Device is currently locked.');\n }\n\n // Error message from debugserver -- Drop the `E`\n return msg.slice(1);\n } else {\n throw new CommandError(\n 'APPLE_DEVICE_GDB',\n `Invalid checksum received from debugserver. (checksum: ${checksum}, msg: ${msg})`\n );\n }\n } else {\n throw new CommandError('APPLE_DEVICE_GDB', \"Didn't receive checksum\");\n }\n }\n}\n\nexport class GDBProtocolWriter implements ProtocolWriter {\n write(socket: Socket, msg: GDBMessage) {\n const { cmd, args } = msg;\n debug(`Socket write: ${cmd}, args: ${args}`);\n // hex encode and concat all args\n const encodedArgs = args\n .map((arg) => Buffer.from(arg).toString('hex'))\n .join()\n .toUpperCase();\n const checksumStr = calculateChecksum(cmd + encodedArgs);\n const formattedCmd = `$${cmd}${encodedArgs}#${checksumStr}`;\n socket.write(formattedCmd);\n }\n}\n\n// hex value of (sum of cmd chars mod 256)\nfunction calculateChecksum(cmdStr: string) {\n let checksum = 0;\n for (let i = 0; i < cmdStr.length; i++) {\n checksum += cmdStr.charCodeAt(i);\n }\n let result = (checksum % 256).toString(16);\n // pad if necessary\n if (result.length === 1) {\n result = `0${result}`;\n }\n return result;\n}\n\nexport function validateChecksum(checksum: string, msg: string) {\n // remove '#' from checksum\n const checksumVal = checksum.startsWith('#') ? checksum.slice(1) : checksum;\n // remove '$' from msg and calculate its checksum\n const computedChecksum = calculateChecksum(msg);\n // debug(`Checksum: ${checksumVal}, computed checksum: ${computedChecksum}`);\n return checksumVal === computedChecksum;\n}\n"],"names":["validateChecksum","debug","Debug","ACK_SUCCESS","charCodeAt","GDBProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","GDBProtocolReader","GDBProtocolWriter","ProtocolReader","callback","onData","data","buffer","Buffer","concat","length","headerSize","parseHeader","packetData","toString","match","body","from","slice","parseBody","err","CommandError","checksum","msg","startsWith","write","cmd","args","encodedArgs","map","arg","join","toUpperCase","checksumStr","calculateChecksum","formattedCmd","cmdStr","i","result","checksumVal","computedChecksum"],"mappings":"AAOA;;;;QAkIgBA,gBAAgB,GAAhBA,gBAAgB;
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/GDBProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport {\n ProtocolClient,\n ProtocolReader,\n ProtocolReaderCallback,\n ProtocolReaderFactory,\n ProtocolWriter,\n} from './AbstractProtocol';\nimport { CommandError } from '../../../../utils/errors';\n\nconst debug = Debug('expo:apple-device:protocol:gdb');\nconst ACK_SUCCESS = '+'.charCodeAt(0);\n\nexport interface GDBMessage {\n cmd: string;\n args: string[];\n}\n\nexport class GDBProtocolClient extends ProtocolClient<GDBMessage> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(GDBProtocolReader), new GDBProtocolWriter());\n }\n}\n\nexport class GDBProtocolReader extends ProtocolReader {\n constructor(callback: ProtocolReaderCallback) {\n super(1 /* \"Header\" is '+' or '-' */, callback);\n }\n\n onData(data?: Buffer) {\n // the GDB protocol does not support body length in its header so we cannot rely on\n // the parent implementation to determine when a payload is complete\n try {\n // if there's data, add it to the existing buffer\n this.buffer = data ? Buffer.concat([this.buffer, data]) : this.buffer;\n\n // do we have enough bytes to proceed\n if (this.buffer.length < this.headerSize) {\n return; // incomplete header, wait for more\n }\n\n // first, check the header\n if (this.parseHeader(this.buffer) === -1) {\n // we have a valid header so check the body. GDB packets will always be a leading '$', data bytes,\n // a trailing '#', and a two digit checksum. minimum valid body is the empty response '$#00'\n // https://developer.apple.com/library/archive/documentation/DeveloperTools/gdb/gdb/gdb_33.html\n const packetData = this.buffer.toString().match('\\\\$.*#[0-9a-f]{2}');\n if (packetData == null) {\n return; // incomplete body, wait for more\n }\n // extract the body and update the buffer\n const body = Buffer.from(packetData[0]);\n this.buffer = this.buffer.slice(this.headerSize + body.length);\n // parse the payload and recurse if there is more data to process\n this.callback(this.parseBody(body));\n if (this.buffer.length) {\n this.onData();\n }\n }\n } catch (err: any) {\n this.callback(null, err);\n }\n }\n\n parseHeader(data: Buffer) {\n if (data[0] !== ACK_SUCCESS) {\n throw new CommandError('APPLE_DEVICE_GDB', 'Unsuccessful debugserver response');\n } // TODO: retry?\n return -1;\n }\n\n parseBody(buffer: Buffer) {\n debug(`Response body: ${buffer.toString()}`);\n // check for checksum\n const checksum = buffer.slice(-3).toString();\n if (checksum.match(/#[0-9a-f]{2}/)) {\n // remove '$' prefix and checksum\n const msg = buffer.slice(1, -3).toString();\n if (validateChecksum(checksum, msg)) {\n return msg;\n } else if (msg.startsWith('E')) {\n if (msg.match(/the device was not, or could not be, unlocked/)) {\n throw new CommandError('APPLE_DEVICE_LOCKED', 'Device is currently locked.');\n }\n\n // Error message from debugserver -- Drop the `E`\n return msg.slice(1);\n } else {\n throw new CommandError(\n 'APPLE_DEVICE_GDB',\n `Invalid checksum received from debugserver. (checksum: ${checksum}, msg: ${msg})`\n );\n }\n } else {\n throw new CommandError('APPLE_DEVICE_GDB', \"Didn't receive checksum\");\n }\n }\n}\n\nexport class GDBProtocolWriter implements ProtocolWriter {\n write(socket: Socket, msg: GDBMessage) {\n const { cmd, args } = msg;\n debug(`Socket write: ${cmd}, args: ${args}`);\n // hex encode and concat all args\n const encodedArgs = args\n .map((arg) => Buffer.from(arg).toString('hex'))\n .join()\n .toUpperCase();\n const checksumStr = calculateChecksum(cmd + encodedArgs);\n const formattedCmd = `$${cmd}${encodedArgs}#${checksumStr}`;\n socket.write(formattedCmd);\n }\n}\n\n// hex value of (sum of cmd chars mod 256)\nfunction calculateChecksum(cmdStr: string) {\n let checksum = 0;\n for (let i = 0; i < cmdStr.length; i++) {\n checksum += cmdStr.charCodeAt(i);\n }\n let result = (checksum % 256).toString(16);\n // pad if necessary\n if (result.length === 1) {\n result = `0${result}`;\n }\n return result;\n}\n\nexport function validateChecksum(checksum: string, msg: string) {\n // remove '#' from checksum\n const checksumVal = checksum.startsWith('#') ? checksum.slice(1) : checksum;\n // remove '$' from msg and calculate its checksum\n const computedChecksum = calculateChecksum(msg);\n // debug(`Checksum: ${checksumVal}, computed checksum: ${computedChecksum}`);\n return checksumVal === computedChecksum;\n}\n"],"names":["validateChecksum","debug","Debug","ACK_SUCCESS","charCodeAt","GDBProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","GDBProtocolReader","GDBProtocolWriter","ProtocolReader","callback","onData","data","buffer","Buffer","concat","length","headerSize","parseHeader","packetData","toString","match","body","from","slice","parseBody","err","CommandError","checksum","msg","startsWith","write","cmd","args","encodedArgs","map","arg","join","toUpperCase","checksumStr","calculateChecksum","formattedCmd","cmdStr","i","result","checksumVal","computedChecksum"],"mappings":"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"}
|
|
@@ -5,8 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
exports.isLockdownResponse = isLockdownResponse;
|
|
6
6
|
exports.isLockdownErrorResponse = isLockdownErrorResponse;
|
|
7
7
|
exports.LOCKDOWN_HEADER_SIZE = void 0;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
function _plist() {
|
|
9
|
+
const data = _interopRequireDefault(require("@expo/plist"));
|
|
10
|
+
_plist = function() {
|
|
11
|
+
return data;
|
|
12
|
+
};
|
|
13
|
+
return data;
|
|
14
|
+
}
|
|
15
|
+
function _debug() {
|
|
16
|
+
const data = _interopRequireDefault(require("debug"));
|
|
17
|
+
_debug = function() {
|
|
18
|
+
return data;
|
|
19
|
+
};
|
|
20
|
+
return data;
|
|
21
|
+
}
|
|
10
22
|
var _abstractProtocol = require("./AbstractProtocol");
|
|
11
23
|
var _errors = require("../../../../utils/errors");
|
|
12
24
|
function _interopRequireDefault(obj) {
|
|
@@ -14,7 +26,7 @@ function _interopRequireDefault(obj) {
|
|
|
14
26
|
default: obj
|
|
15
27
|
};
|
|
16
28
|
}
|
|
17
|
-
const debug = (
|
|
29
|
+
const debug = _debug().default("expo:apple-device:protocol:lockdown");
|
|
18
30
|
const LOCKDOWN_HEADER_SIZE = 4;
|
|
19
31
|
exports.LOCKDOWN_HEADER_SIZE = LOCKDOWN_HEADER_SIZE;
|
|
20
32
|
function isDefined(val) {
|
|
@@ -62,7 +74,7 @@ exports.LockdownProtocolReader = LockdownProtocolReader;
|
|
|
62
74
|
class LockdownProtocolWriter {
|
|
63
75
|
write(socket, plistData) {
|
|
64
76
|
debug(`socket write: ${JSON.stringify(plistData)}`);
|
|
65
|
-
const plistMessage = _plist.default.build(plistData);
|
|
77
|
+
const plistMessage = _plist().default.build(plistData);
|
|
66
78
|
const header = Buffer.alloc(LOCKDOWN_HEADER_SIZE);
|
|
67
79
|
header.writeUInt32BE(plistMessage.length, 0);
|
|
68
80
|
socket.write(header);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/LockdownProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport type { ProtocolWriter } from './AbstractProtocol';\nimport { PlistProtocolReader, ProtocolClient, ProtocolReaderFactory } from './AbstractProtocol';\nimport { CommandError } from '../../../../utils/errors';\n\nconst debug = Debug('expo:apple-device:protocol:lockdown');\nexport const LOCKDOWN_HEADER_SIZE = 4;\n\nexport interface LockdownCommand {\n Command: string;\n [key: string]: any;\n}\n\nexport interface LockdownResponse {\n Status: string;\n [key: string]: any;\n}\n\nexport interface LockdownErrorResponse {\n Error: string;\n Request?: string;\n Service?: string;\n}\n\nexport interface LockdownRequest {\n Request: string;\n [key: string]: any;\n}\n\nfunction isDefined(val: any) {\n return typeof val !== 'undefined';\n}\n\nexport function isLockdownResponse(resp: any): resp is LockdownResponse {\n return isDefined(resp.Status);\n}\n\nexport function isLockdownErrorResponse(resp: any): resp is LockdownErrorResponse {\n return isDefined(resp.Error);\n}\n\nexport class LockdownProtocolClient<\n MessageType extends LockdownRequest | LockdownCommand = LockdownRequest,\n> extends ProtocolClient<MessageType> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(LockdownProtocolReader), new LockdownProtocolWriter());\n }\n}\n\nexport class LockdownProtocolReader extends PlistProtocolReader {\n constructor(callback: (data: any) => any) {\n super(LOCKDOWN_HEADER_SIZE, callback);\n }\n\n parseHeader(data: Buffer) {\n return data.readUInt32BE(0);\n }\n\n parseBody(data: Buffer) {\n const resp = super.parseBody(data);\n debug(`Response: ${JSON.stringify(resp)}`);\n if (isLockdownErrorResponse(resp)) {\n if (resp.Error === 'DeviceLocked') {\n throw new CommandError('APPLE_DEVICE_LOCKED', 'Device is currently locked.');\n }\n\n if (resp.Error === 'InvalidService') {\n let errorMessage = `${resp.Error}: ${resp.Service} (request: ${resp.Request})`;\n if (resp.Service === 'com.apple.debugserver') {\n errorMessage +=\n '\\nTry reconnecting your device. You can also debug service logs with `export DEBUG=expo:xdl:ios:*`';\n }\n throw new CommandError('APPLE_DEVICE_LOCKDOWN', errorMessage);\n }\n\n throw new CommandError('APPLE_DEVICE_LOCKDOWN', resp.Error);\n }\n return resp;\n }\n}\n\nexport class LockdownProtocolWriter implements ProtocolWriter {\n write(socket: Socket, plistData: any) {\n debug(`socket write: ${JSON.stringify(plistData)}`);\n const plistMessage = plist.build(plistData);\n const header = Buffer.alloc(LOCKDOWN_HEADER_SIZE);\n header.writeUInt32BE(plistMessage.length, 0);\n socket.write(header);\n socket.write(plistMessage);\n }\n}\n"],"names":["isLockdownResponse","isLockdownErrorResponse","debug","Debug","LOCKDOWN_HEADER_SIZE","isDefined","val","resp","Status","Error","LockdownProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","LockdownProtocolReader","LockdownProtocolWriter","PlistProtocolReader","callback","parseHeader","data","readUInt32BE","parseBody","JSON","stringify","CommandError","errorMessage","Service","Request","write","plistData","plistMessage","plist","build","header","Buffer","alloc","writeUInt32BE","length"],"mappings":"AAQA;;;;QAoCgBA,kBAAkB,GAAlBA,kBAAkB;QAIlBC,uBAAuB,GAAvBA,uBAAuB;;
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/LockdownProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport type { ProtocolWriter } from './AbstractProtocol';\nimport { PlistProtocolReader, ProtocolClient, ProtocolReaderFactory } from './AbstractProtocol';\nimport { CommandError } from '../../../../utils/errors';\n\nconst debug = Debug('expo:apple-device:protocol:lockdown');\nexport const LOCKDOWN_HEADER_SIZE = 4;\n\nexport interface LockdownCommand {\n Command: string;\n [key: string]: any;\n}\n\nexport interface LockdownResponse {\n Status: string;\n [key: string]: any;\n}\n\nexport interface LockdownErrorResponse {\n Error: string;\n Request?: string;\n Service?: string;\n}\n\nexport interface LockdownRequest {\n Request: string;\n [key: string]: any;\n}\n\nfunction isDefined(val: any) {\n return typeof val !== 'undefined';\n}\n\nexport function isLockdownResponse(resp: any): resp is LockdownResponse {\n return isDefined(resp.Status);\n}\n\nexport function isLockdownErrorResponse(resp: any): resp is LockdownErrorResponse {\n return isDefined(resp.Error);\n}\n\nexport class LockdownProtocolClient<\n MessageType extends LockdownRequest | LockdownCommand = LockdownRequest,\n> extends ProtocolClient<MessageType> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(LockdownProtocolReader), new LockdownProtocolWriter());\n }\n}\n\nexport class LockdownProtocolReader extends PlistProtocolReader {\n constructor(callback: (data: any) => any) {\n super(LOCKDOWN_HEADER_SIZE, callback);\n }\n\n parseHeader(data: Buffer) {\n return data.readUInt32BE(0);\n }\n\n parseBody(data: Buffer) {\n const resp = super.parseBody(data);\n debug(`Response: ${JSON.stringify(resp)}`);\n if (isLockdownErrorResponse(resp)) {\n if (resp.Error === 'DeviceLocked') {\n throw new CommandError('APPLE_DEVICE_LOCKED', 'Device is currently locked.');\n }\n\n if (resp.Error === 'InvalidService') {\n let errorMessage = `${resp.Error}: ${resp.Service} (request: ${resp.Request})`;\n if (resp.Service === 'com.apple.debugserver') {\n errorMessage +=\n '\\nTry reconnecting your device. You can also debug service logs with `export DEBUG=expo:xdl:ios:*`';\n }\n throw new CommandError('APPLE_DEVICE_LOCKDOWN', errorMessage);\n }\n\n throw new CommandError('APPLE_DEVICE_LOCKDOWN', resp.Error);\n }\n return resp;\n }\n}\n\nexport class LockdownProtocolWriter implements ProtocolWriter {\n write(socket: Socket, plistData: any) {\n debug(`socket write: ${JSON.stringify(plistData)}`);\n const plistMessage = plist.build(plistData);\n const header = Buffer.alloc(LOCKDOWN_HEADER_SIZE);\n header.writeUInt32BE(plistMessage.length, 0);\n socket.write(header);\n socket.write(plistMessage);\n }\n}\n"],"names":["isLockdownResponse","isLockdownErrorResponse","debug","Debug","LOCKDOWN_HEADER_SIZE","isDefined","val","resp","Status","Error","LockdownProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","LockdownProtocolReader","LockdownProtocolWriter","PlistProtocolReader","callback","parseHeader","data","readUInt32BE","parseBody","JSON","stringify","CommandError","errorMessage","Service","Request","write","plistData","plistMessage","plist","build","header","Buffer","alloc","writeUInt32BE","length"],"mappings":"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"}
|
|
@@ -3,15 +3,27 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.USBMUXD_HEADER_SIZE = void 0;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
function _plist() {
|
|
7
|
+
const data = _interopRequireDefault(require("@expo/plist"));
|
|
8
|
+
_plist = function() {
|
|
9
|
+
return data;
|
|
10
|
+
};
|
|
11
|
+
return data;
|
|
12
|
+
}
|
|
13
|
+
function _debug() {
|
|
14
|
+
const data = _interopRequireDefault(require("debug"));
|
|
15
|
+
_debug = function() {
|
|
16
|
+
return data;
|
|
17
|
+
};
|
|
18
|
+
return data;
|
|
19
|
+
}
|
|
8
20
|
var _abstractProtocol = require("./AbstractProtocol");
|
|
9
21
|
function _interopRequireDefault(obj) {
|
|
10
22
|
return obj && obj.__esModule ? obj : {
|
|
11
23
|
default: obj
|
|
12
24
|
};
|
|
13
25
|
}
|
|
14
|
-
const debug = (
|
|
26
|
+
const debug = _debug().default("expo:apple-device:protocol:usbmux");
|
|
15
27
|
const USBMUXD_HEADER_SIZE = 16;
|
|
16
28
|
exports.USBMUXD_HEADER_SIZE = USBMUXD_HEADER_SIZE;
|
|
17
29
|
class UsbmuxProtocolClient extends _abstractProtocol.ProtocolClient {
|
|
@@ -40,7 +52,7 @@ class UsbmuxProtocolWriter {
|
|
|
40
52
|
// TODO Usbmux message type
|
|
41
53
|
debug(`socket write: ${JSON.stringify(msg)}`);
|
|
42
54
|
const { messageType , extraFields } = msg;
|
|
43
|
-
const plistMessage = _plist.default.build({
|
|
55
|
+
const plistMessage = _plist().default.build({
|
|
44
56
|
BundleID: "dev.expo.native-run",
|
|
45
57
|
ClientVersionString: "usbmux.js",
|
|
46
58
|
MessageType: messageType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/UsbmuxProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport type { ProtocolWriter } from './AbstractProtocol';\nimport { PlistProtocolReader, ProtocolClient, ProtocolReaderFactory } from './AbstractProtocol';\n\nconst debug = Debug('expo:apple-device:protocol:usbmux');\n\nexport const USBMUXD_HEADER_SIZE = 16;\n\nexport interface UsbmuxMessage {\n messageType: string;\n extraFields?: { [key: string]: any };\n}\n\nexport class UsbmuxProtocolClient extends ProtocolClient<UsbmuxMessage> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(UsbmuxProtocolReader), new UsbmuxProtocolWriter());\n }\n}\n\nexport class UsbmuxProtocolReader extends PlistProtocolReader {\n constructor(callback: (data: any) => any) {\n super(USBMUXD_HEADER_SIZE, callback);\n }\n\n parseHeader(data: Buffer) {\n return data.readUInt32LE(0) - USBMUXD_HEADER_SIZE;\n }\n\n parseBody(data: Buffer) {\n const resp = super.parseBody(data);\n debug(`Response: ${JSON.stringify(resp)}`);\n return resp;\n }\n}\n\nexport class UsbmuxProtocolWriter implements ProtocolWriter {\n private useTag = 0;\n\n write(socket: Socket, msg: UsbmuxMessage) {\n // TODO Usbmux message type\n debug(`socket write: ${JSON.stringify(msg)}`);\n const { messageType, extraFields } = msg;\n const plistMessage = plist.build({\n BundleID: 'dev.expo.native-run', // TODO\n ClientVersionString: 'usbmux.js', // TODO\n MessageType: messageType,\n ProgName: 'native-run', // TODO\n kLibUSBMuxVersion: 3,\n ...extraFields,\n });\n\n const dataSize = plistMessage ? plistMessage.length : 0;\n const protocolVersion = 1;\n const messageCode = 8;\n\n const header = Buffer.alloc(USBMUXD_HEADER_SIZE);\n header.writeUInt32LE(USBMUXD_HEADER_SIZE + dataSize, 0);\n header.writeUInt32LE(protocolVersion, 4);\n header.writeUInt32LE(messageCode, 8);\n header.writeUInt32LE(this.useTag++, 12); // TODO\n socket.write(header);\n socket.write(plistMessage);\n }\n}\n"],"names":["debug","Debug","USBMUXD_HEADER_SIZE","UsbmuxProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","UsbmuxProtocolReader","UsbmuxProtocolWriter","PlistProtocolReader","callback","parseHeader","data","readUInt32LE","parseBody","resp","JSON","stringify","useTag","write","msg","messageType","extraFields","plistMessage","plist","build","BundleID","ClientVersionString","MessageType","ProgName","kLibUSBMuxVersion","dataSize","length","protocolVersion","messageCode","header","Buffer","alloc","writeUInt32LE"],"mappings":"AAQA;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/run/ios/appleDevice/protocol/UsbmuxProtocol.ts"],"sourcesContent":["/**\n * Copyright (c) 2021 Expo, Inc.\n * Copyright (c) 2018 Drifty Co.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport plist from '@expo/plist';\nimport Debug from 'debug';\nimport { Socket } from 'net';\n\nimport type { ProtocolWriter } from './AbstractProtocol';\nimport { PlistProtocolReader, ProtocolClient, ProtocolReaderFactory } from './AbstractProtocol';\n\nconst debug = Debug('expo:apple-device:protocol:usbmux');\n\nexport const USBMUXD_HEADER_SIZE = 16;\n\nexport interface UsbmuxMessage {\n messageType: string;\n extraFields?: { [key: string]: any };\n}\n\nexport class UsbmuxProtocolClient extends ProtocolClient<UsbmuxMessage> {\n constructor(socket: Socket) {\n super(socket, new ProtocolReaderFactory(UsbmuxProtocolReader), new UsbmuxProtocolWriter());\n }\n}\n\nexport class UsbmuxProtocolReader extends PlistProtocolReader {\n constructor(callback: (data: any) => any) {\n super(USBMUXD_HEADER_SIZE, callback);\n }\n\n parseHeader(data: Buffer) {\n return data.readUInt32LE(0) - USBMUXD_HEADER_SIZE;\n }\n\n parseBody(data: Buffer) {\n const resp = super.parseBody(data);\n debug(`Response: ${JSON.stringify(resp)}`);\n return resp;\n }\n}\n\nexport class UsbmuxProtocolWriter implements ProtocolWriter {\n private useTag = 0;\n\n write(socket: Socket, msg: UsbmuxMessage) {\n // TODO Usbmux message type\n debug(`socket write: ${JSON.stringify(msg)}`);\n const { messageType, extraFields } = msg;\n const plistMessage = plist.build({\n BundleID: 'dev.expo.native-run', // TODO\n ClientVersionString: 'usbmux.js', // TODO\n MessageType: messageType,\n ProgName: 'native-run', // TODO\n kLibUSBMuxVersion: 3,\n ...extraFields,\n });\n\n const dataSize = plistMessage ? plistMessage.length : 0;\n const protocolVersion = 1;\n const messageCode = 8;\n\n const header = Buffer.alloc(USBMUXD_HEADER_SIZE);\n header.writeUInt32LE(USBMUXD_HEADER_SIZE + dataSize, 0);\n header.writeUInt32LE(protocolVersion, 4);\n header.writeUInt32LE(messageCode, 8);\n header.writeUInt32LE(this.useTag++, 12); // TODO\n socket.write(header);\n socket.write(plistMessage);\n }\n}\n"],"names":["debug","Debug","USBMUXD_HEADER_SIZE","UsbmuxProtocolClient","ProtocolClient","constructor","socket","ProtocolReaderFactory","UsbmuxProtocolReader","UsbmuxProtocolWriter","PlistProtocolReader","callback","parseHeader","data","readUInt32LE","parseBody","resp","JSON","stringify","useTag","write","msg","messageType","extraFields","plistMessage","plist","build","BundleID","ClientVersionString","MessageType","ProgName","kLibUSBMuxVersion","dataSize","length","protocolVersion","messageCode","header","Buffer","alloc","writeUInt32LE"],"mappings":"AAQA;;;;;SAAkB,MAAa;gDAAb,aAAa;IAAb,MAAa;;;;;SACb,MAAO;gDAAP,OAAO;IAAP,MAAO;;;;;AAIkD,IAAA,iBAAoB,WAApB,oBAAoB,CAAA;;;;;;AAE/F,MAAMA,KAAK,GAAGC,MAAK,UAAA,CAAC,mCAAmC,CAAC,AAAC;AAElD,MAAMC,mBAAmB,GAAG,EAAE,AAAC;QAAzBA,mBAAmB,GAAnBA,mBAAmB;AAOzB,MAAMC,oBAAoB,SAASC,iBAAc,eAAA;IACtDC,YAAYC,MAAc,CAAE;QAC1B,KAAK,CAACA,MAAM,EAAE,IAAIC,iBAAqB,sBAAA,CAACC,oBAAoB,CAAC,EAAE,IAAIC,oBAAoB,EAAE,CAAC,CAAC;KAC5F;CACF;QAJYN,oBAAoB,GAApBA,oBAAoB;AAM1B,MAAMK,oBAAoB,SAASE,iBAAmB,oBAAA;IAC3DL,YAAYM,QAA4B,CAAE;QACxC,KAAK,CAACT,mBAAmB,EAAES,QAAQ,CAAC,CAAC;KACtC;IAEDC,WAAW,CAACC,IAAY,EAAE;QACxB,OAAOA,IAAI,CAACC,YAAY,CAAC,CAAC,CAAC,GAAGZ,mBAAmB,CAAC;KACnD;IAEDa,SAAS,CAACF,IAAY,EAAE;QACtB,MAAMG,IAAI,GAAG,KAAK,CAACD,SAAS,CAACF,IAAI,CAAC,AAAC;QACnCb,KAAK,CAAC,CAAC,UAAU,EAAEiB,IAAI,CAACC,SAAS,CAACF,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAOA,IAAI,CAAC;KACb;CACF;QAdYR,oBAAoB,GAApBA,oBAAoB;AAgB1B,MAAMC,oBAAoB;IAC/B,AAAQU,MAAM,GAAG,CAAC,CAAC;IAEnBC,KAAK,CAACd,MAAc,EAAEe,GAAkB,EAAE;QACxC,2BAA2B;QAC3BrB,KAAK,CAAC,CAAC,cAAc,EAAEiB,IAAI,CAACC,SAAS,CAACG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,EAAEC,WAAW,CAAA,EAAEC,WAAW,CAAA,EAAE,GAAGF,GAAG,AAAC;QACzC,MAAMG,YAAY,GAAGC,MAAK,UAAA,CAACC,KAAK,CAAC;YAC/BC,QAAQ,EAAE,qBAAqB;YAC/BC,mBAAmB,EAAE,WAAW;YAChCC,WAAW,EAAEP,WAAW;YACxBQ,QAAQ,EAAE,YAAY;YACtBC,iBAAiB,EAAE,CAAC;YACpB,GAAGR,WAAW;SACf,CAAC,AAAC;QAEH,MAAMS,QAAQ,GAAGR,YAAY,GAAGA,YAAY,CAACS,MAAM,GAAG,CAAC,AAAC;QACxD,MAAMC,eAAe,GAAG,CAAC,AAAC;QAC1B,MAAMC,WAAW,GAAG,CAAC,AAAC;QAEtB,MAAMC,MAAM,GAAGC,MAAM,CAACC,KAAK,CAACpC,mBAAmB,CAAC,AAAC;QACjDkC,MAAM,CAACG,aAAa,CAACrC,mBAAmB,GAAG8B,QAAQ,EAAE,CAAC,CAAC,CAAC;QACxDI,MAAM,CAACG,aAAa,CAACL,eAAe,EAAE,CAAC,CAAC,CAAC;QACzCE,MAAM,CAACG,aAAa,CAACJ,WAAW,EAAE,CAAC,CAAC,CAAC;QACrCC,MAAM,CAACG,aAAa,CAAC,IAAI,CAACpB,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO;QAChDb,MAAM,CAACc,KAAK,CAACgB,MAAM,CAAC,CAAC;QACrB9B,MAAM,CAACc,KAAK,CAACI,YAAY,CAAC,CAAC;KAC5B;CACF;QA5BYf,oBAAoB,GAApBA,oBAAoB"}
|
|
@@ -9,8 +9,20 @@ exports.extractCodeSigningInfo = extractCodeSigningInfo;
|
|
|
9
9
|
exports.resolveIdentitiesAsync = resolveIdentitiesAsync;
|
|
10
10
|
exports.resolveCertificateSigningInfoAsync = resolveCertificateSigningInfoAsync;
|
|
11
11
|
exports.extractSigningId = extractSigningId;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
function _spawnAsync() {
|
|
13
|
+
const data = _interopRequireDefault(require("@expo/spawn-async"));
|
|
14
|
+
_spawnAsync = function() {
|
|
15
|
+
return data;
|
|
16
|
+
};
|
|
17
|
+
return data;
|
|
18
|
+
}
|
|
19
|
+
function _nodeForge() {
|
|
20
|
+
const data = _interopRequireDefault(require("node-forge"));
|
|
21
|
+
_nodeForge = function() {
|
|
22
|
+
return data;
|
|
23
|
+
};
|
|
24
|
+
return data;
|
|
25
|
+
}
|
|
14
26
|
var _securityBinPrerequisite = require("../../../start/doctor/SecurityBinPrerequisite");
|
|
15
27
|
var _errors = require("../../../utils/errors");
|
|
16
28
|
function _interopRequireDefault(obj) {
|
|
@@ -20,7 +32,7 @@ function _interopRequireDefault(obj) {
|
|
|
20
32
|
}
|
|
21
33
|
async function getSecurityPemAsync(id) {
|
|
22
34
|
var ref;
|
|
23
|
-
const pem = (ref = (await (
|
|
35
|
+
const pem = (ref = (await _spawnAsync().default("security", [
|
|
24
36
|
"find-certificate",
|
|
25
37
|
"-c",
|
|
26
38
|
id,
|
|
@@ -33,12 +45,12 @@ async function getSecurityPemAsync(id) {
|
|
|
33
45
|
}
|
|
34
46
|
async function getCertificateForSigningIdAsync(id) {
|
|
35
47
|
const pem = await getSecurityPemAsync(id);
|
|
36
|
-
return _nodeForge.default.pki.certificateFromPem(pem);
|
|
48
|
+
return _nodeForge().default.pki.certificateFromPem(pem);
|
|
37
49
|
}
|
|
38
50
|
async function findIdentitiesAsync() {
|
|
39
51
|
var _stdout, ref;
|
|
40
52
|
await _securityBinPrerequisite.SecurityBinPrerequisite.instance.assertAsync();
|
|
41
|
-
const results = (ref = (_stdout = (await (
|
|
53
|
+
const results = (ref = (_stdout = (await _spawnAsync().default("security", [
|
|
42
54
|
"find-identity",
|
|
43
55
|
"-p",
|
|
44
56
|
"codesigning",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/Security.ts"],"sourcesContent":["import spawnAsync from '@expo/spawn-async';\nimport forge from 'node-forge';\n\nimport { SecurityBinPrerequisite } from '../../../start/doctor/SecurityBinPrerequisite';\nimport { CommandError } from '../../../utils/errors';\n\nexport type CertificateSigningInfo = {\n /**\n * @example 'AA00AABB0A'\n */\n signingCertificateId: string;\n /**\n * @example 'Apple Development: Evan Bacon (AA00AABB0A)'\n */\n codeSigningInfo?: string;\n /**\n * @example '650 Industries, Inc.'\n */\n appleTeamName?: string;\n /**\n * @example 'A1BCDEF234'\n */\n appleTeamId?: string;\n};\n\nexport async function getSecurityPemAsync(id: string) {\n const pem = (await spawnAsync('security', ['find-certificate', '-c', id, '-p'])).stdout?.trim?.();\n if (!pem) {\n throw new CommandError(`Failed to get PEM certificate for ID \"${id}\" using the 'security' bin`);\n }\n return pem;\n}\n\nexport async function getCertificateForSigningIdAsync(id: string): Promise<forge.pki.Certificate> {\n const pem = await getSecurityPemAsync(id);\n return forge.pki.certificateFromPem(pem);\n}\n\n/**\n * Get the signing identities from the security bin. Return a list of parsed values with duplicates removed.\n * @returns A list like ['Apple Development: bacon@expo.io (BB00AABB0A)', 'Apple Developer: Evan Bacon (AA00AABB0A)']\n */\nexport async function findIdentitiesAsync(): Promise<string[]> {\n await SecurityBinPrerequisite.instance.assertAsync();\n\n const results = (\n await spawnAsync('security', ['find-identity', '-p', 'codesigning', '-v'])\n ).stdout.trim?.();\n // Returns a string like:\n // 1) 12222234253761286351826735HGKDHAJGF45283 \"Apple Development: Evan Bacon (AA00AABB0A)\" (CSSMERR_TP_CERT_REVOKED)\n // 2) 12312234253761286351826735HGKDHAJGF45283 \"Apple Development: bacon@expo.io (BB00AABB0A)\"\n // 3) 12442234253761286351826735HGKDHAJGF45283 \"iPhone Distribution: Evan Bacon (CC00AABB0B)\" (CSSMERR_TP_CERT_REVOKED)\n // 4) 15672234253761286351826735HGKDHAJGF45283 \"Apple Development: Evan Bacon (AA00AABB0A)\"\n // 4 valid identities found\n\n const parsed = results\n .split('\\n')\n .map((line) => extractCodeSigningInfo(line))\n .filter(Boolean) as string[];\n\n // Remove duplicates\n return [...new Set(parsed)];\n}\n\n/**\n * @param value ' 2) 12312234253761286351826735HGKDHAJGF45283 \"Apple Development: bacon@expo.io (BB00AABB0A)\"'\n * @returns 'Apple Development: Evan Bacon (PH75MDXG4H)'\n */\nexport function extractCodeSigningInfo(value: string): string | null {\n return value.match(/^\\s*\\d+\\).+\"(.+Develop(ment|er).+)\"$/)?.[1] ?? null;\n}\n\nexport async function resolveIdentitiesAsync(\n identities: string[]\n): Promise<CertificateSigningInfo[]> {\n const values = identities.map(extractSigningId).filter(Boolean) as string[];\n return Promise.all(values.map(resolveCertificateSigningInfoAsync));\n}\n\n/**\n * @param signingCertificateId 'AA00AABB0A'\n */\nexport async function resolveCertificateSigningInfoAsync(\n signingCertificateId: string\n): Promise<CertificateSigningInfo> {\n const certificate = await getCertificateForSigningIdAsync(signingCertificateId);\n return {\n signingCertificateId,\n codeSigningInfo: certificate.subject.getField('CN')?.value,\n appleTeamName: certificate.subject.getField('O')?.value,\n appleTeamId: certificate.subject.getField('OU')?.value,\n };\n}\n\n/**\n * @param codeSigningInfo 'Apple Development: Evan Bacon (AA00AABB0A)'\n * @returns 'AA00AABB0A'\n */\nexport function extractSigningId(codeSigningInfo: string): string | null {\n return codeSigningInfo.match(/.*\\(([a-zA-Z0-9]+)\\)/)?.[1] ?? null;\n}\n"],"names":["getSecurityPemAsync","getCertificateForSigningIdAsync","findIdentitiesAsync","extractCodeSigningInfo","resolveIdentitiesAsync","resolveCertificateSigningInfoAsync","extractSigningId","id","pem","spawnAsync","stdout","trim","CommandError","forge","pki","certificateFromPem","SecurityBinPrerequisite","instance","assertAsync","results","parsed","split","map","line","filter","Boolean","Set","value","match","identities","values","Promise","all","signingCertificateId","certificate","codeSigningInfo","subject","getField","appleTeamName","appleTeamId"],"mappings":"AAAA;;;;QAyBsBA,mBAAmB,GAAnBA,mBAAmB;QAQnBC,+BAA+B,GAA/BA,+BAA+B;QAS/BC,mBAAmB,GAAnBA,mBAAmB;QA0BzBC,sBAAsB,GAAtBA,sBAAsB;QAIhBC,sBAAsB,GAAtBA,sBAAsB;QAUtBC,kCAAkC,GAAlCA,kCAAkC;QAgBxCC,gBAAgB,GAAhBA,gBAAgB;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/Security.ts"],"sourcesContent":["import spawnAsync from '@expo/spawn-async';\nimport forge from 'node-forge';\n\nimport { SecurityBinPrerequisite } from '../../../start/doctor/SecurityBinPrerequisite';\nimport { CommandError } from '../../../utils/errors';\n\nexport type CertificateSigningInfo = {\n /**\n * @example 'AA00AABB0A'\n */\n signingCertificateId: string;\n /**\n * @example 'Apple Development: Evan Bacon (AA00AABB0A)'\n */\n codeSigningInfo?: string;\n /**\n * @example '650 Industries, Inc.'\n */\n appleTeamName?: string;\n /**\n * @example 'A1BCDEF234'\n */\n appleTeamId?: string;\n};\n\nexport async function getSecurityPemAsync(id: string) {\n const pem = (await spawnAsync('security', ['find-certificate', '-c', id, '-p'])).stdout?.trim?.();\n if (!pem) {\n throw new CommandError(`Failed to get PEM certificate for ID \"${id}\" using the 'security' bin`);\n }\n return pem;\n}\n\nexport async function getCertificateForSigningIdAsync(id: string): Promise<forge.pki.Certificate> {\n const pem = await getSecurityPemAsync(id);\n return forge.pki.certificateFromPem(pem);\n}\n\n/**\n * Get the signing identities from the security bin. Return a list of parsed values with duplicates removed.\n * @returns A list like ['Apple Development: bacon@expo.io (BB00AABB0A)', 'Apple Developer: Evan Bacon (AA00AABB0A)']\n */\nexport async function findIdentitiesAsync(): Promise<string[]> {\n await SecurityBinPrerequisite.instance.assertAsync();\n\n const results = (\n await spawnAsync('security', ['find-identity', '-p', 'codesigning', '-v'])\n ).stdout.trim?.();\n // Returns a string like:\n // 1) 12222234253761286351826735HGKDHAJGF45283 \"Apple Development: Evan Bacon (AA00AABB0A)\" (CSSMERR_TP_CERT_REVOKED)\n // 2) 12312234253761286351826735HGKDHAJGF45283 \"Apple Development: bacon@expo.io (BB00AABB0A)\"\n // 3) 12442234253761286351826735HGKDHAJGF45283 \"iPhone Distribution: Evan Bacon (CC00AABB0B)\" (CSSMERR_TP_CERT_REVOKED)\n // 4) 15672234253761286351826735HGKDHAJGF45283 \"Apple Development: Evan Bacon (AA00AABB0A)\"\n // 4 valid identities found\n\n const parsed = results\n .split('\\n')\n .map((line) => extractCodeSigningInfo(line))\n .filter(Boolean) as string[];\n\n // Remove duplicates\n return [...new Set(parsed)];\n}\n\n/**\n * @param value ' 2) 12312234253761286351826735HGKDHAJGF45283 \"Apple Development: bacon@expo.io (BB00AABB0A)\"'\n * @returns 'Apple Development: Evan Bacon (PH75MDXG4H)'\n */\nexport function extractCodeSigningInfo(value: string): string | null {\n return value.match(/^\\s*\\d+\\).+\"(.+Develop(ment|er).+)\"$/)?.[1] ?? null;\n}\n\nexport async function resolveIdentitiesAsync(\n identities: string[]\n): Promise<CertificateSigningInfo[]> {\n const values = identities.map(extractSigningId).filter(Boolean) as string[];\n return Promise.all(values.map(resolveCertificateSigningInfoAsync));\n}\n\n/**\n * @param signingCertificateId 'AA00AABB0A'\n */\nexport async function resolveCertificateSigningInfoAsync(\n signingCertificateId: string\n): Promise<CertificateSigningInfo> {\n const certificate = await getCertificateForSigningIdAsync(signingCertificateId);\n return {\n signingCertificateId,\n codeSigningInfo: certificate.subject.getField('CN')?.value,\n appleTeamName: certificate.subject.getField('O')?.value,\n appleTeamId: certificate.subject.getField('OU')?.value,\n };\n}\n\n/**\n * @param codeSigningInfo 'Apple Development: Evan Bacon (AA00AABB0A)'\n * @returns 'AA00AABB0A'\n */\nexport function extractSigningId(codeSigningInfo: string): string | null {\n return codeSigningInfo.match(/.*\\(([a-zA-Z0-9]+)\\)/)?.[1] ?? null;\n}\n"],"names":["getSecurityPemAsync","getCertificateForSigningIdAsync","findIdentitiesAsync","extractCodeSigningInfo","resolveIdentitiesAsync","resolveCertificateSigningInfoAsync","extractSigningId","id","pem","spawnAsync","stdout","trim","CommandError","forge","pki","certificateFromPem","SecurityBinPrerequisite","instance","assertAsync","results","parsed","split","map","line","filter","Boolean","Set","value","match","identities","values","Promise","all","signingCertificateId","certificate","codeSigningInfo","subject","getField","appleTeamName","appleTeamId"],"mappings":"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"}
|
|
@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.ensureDeviceIsCodeSignedForDeploymentAsync = ensureDeviceIsCodeSignedForDeploymentAsync;
|
|
6
|
-
|
|
6
|
+
function _chalk() {
|
|
7
|
+
const data = _interopRequireDefault(require("chalk"));
|
|
8
|
+
_chalk = function() {
|
|
9
|
+
return data;
|
|
10
|
+
};
|
|
11
|
+
return data;
|
|
12
|
+
}
|
|
7
13
|
var Security = _interopRequireWildcard(require("./Security"));
|
|
8
14
|
var _resolveCertificateSigningIdentity = require("./resolveCertificateSigningIdentity");
|
|
9
15
|
var _xcodeCodeSigning = require("./xcodeCodeSigning");
|
|
@@ -52,7 +58,7 @@ function isCodeSigningConfigured(projectRoot) {
|
|
|
52
58
|
curr.developmentTeams[0]
|
|
53
59
|
]);
|
|
54
60
|
}, []);
|
|
55
|
-
Log.log(_chalk.default.dim`\u203A Auto signing app using team(s): ${teamList.join(", ")}`);
|
|
61
|
+
Log.log(_chalk().default.dim`\u203A Auto signing app using team(s): ${teamList.join(", ")}`);
|
|
56
62
|
return true;
|
|
57
63
|
}
|
|
58
64
|
const allTargetsHaveProfiles = Object.values(signingInfo).reduce((prev, curr)=>{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/configureCodeSigning.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as Security from './Security';\nimport { resolveCertificateSigningIdentityAsync } from './resolveCertificateSigningIdentity';\nimport { getCodeSigningInfoForPbxproj, setAutoCodeSigningInfoForPbxproj } from './xcodeCodeSigning';\nimport * as Log from '../../../log';\n\nexport async function ensureDeviceIsCodeSignedForDeploymentAsync(\n projectRoot: string\n): Promise<string | null> {\n if (isCodeSigningConfigured(projectRoot)) {\n return null;\n }\n return configureCodeSigningAsync(projectRoot);\n}\n\nfunction isCodeSigningConfigured(projectRoot: string): boolean {\n // Check if the app already has a development team defined.\n const signingInfo = getCodeSigningInfoForPbxproj(projectRoot);\n\n const allTargetsHaveTeams = Object.values(signingInfo).reduce((prev, curr) => {\n return prev && !!curr.developmentTeams.length;\n }, true);\n\n if (allTargetsHaveTeams) {\n const teamList = Object.values(signingInfo).reduce<string[]>((prev, curr) => {\n return prev.concat([curr.developmentTeams[0]]);\n }, []);\n Log.log(chalk.dim`\\u203A Auto signing app using team(s): ${teamList.join(', ')}`);\n return true;\n }\n\n const allTargetsHaveProfiles = Object.values(signingInfo).reduce((prev, curr) => {\n return prev && !!curr.provisioningProfiles.length;\n }, true);\n\n if (allTargetsHaveProfiles) {\n // this indicates that the user has manual code signing setup (possibly for production).\n return true;\n }\n return false;\n}\n\nasync function configureCodeSigningAsync(projectRoot: string) {\n const ids = await Security.findIdentitiesAsync();\n\n const id = await resolveCertificateSigningIdentityAsync(ids);\n\n Log.log(`\\u203A Signing and building iOS app with: ${id.codeSigningInfo}`);\n\n setAutoCodeSigningInfoForPbxproj(projectRoot, {\n appleTeamId: id.appleTeamId!,\n });\n return id.appleTeamId!;\n}\n"],"names":["ensureDeviceIsCodeSignedForDeploymentAsync","Security","Log","projectRoot","isCodeSigningConfigured","configureCodeSigningAsync","signingInfo","getCodeSigningInfoForPbxproj","allTargetsHaveTeams","Object","values","reduce","prev","curr","developmentTeams","length","teamList","concat","log","chalk","dim","join","allTargetsHaveProfiles","provisioningProfiles","ids","findIdentitiesAsync","id","resolveCertificateSigningIdentityAsync","codeSigningInfo","setAutoCodeSigningInfoForPbxproj","appleTeamId"],"mappings":"AAAA;;;;QAOsBA,0CAA0C,GAA1CA,0CAA0C;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/configureCodeSigning.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as Security from './Security';\nimport { resolveCertificateSigningIdentityAsync } from './resolveCertificateSigningIdentity';\nimport { getCodeSigningInfoForPbxproj, setAutoCodeSigningInfoForPbxproj } from './xcodeCodeSigning';\nimport * as Log from '../../../log';\n\nexport async function ensureDeviceIsCodeSignedForDeploymentAsync(\n projectRoot: string\n): Promise<string | null> {\n if (isCodeSigningConfigured(projectRoot)) {\n return null;\n }\n return configureCodeSigningAsync(projectRoot);\n}\n\nfunction isCodeSigningConfigured(projectRoot: string): boolean {\n // Check if the app already has a development team defined.\n const signingInfo = getCodeSigningInfoForPbxproj(projectRoot);\n\n const allTargetsHaveTeams = Object.values(signingInfo).reduce((prev, curr) => {\n return prev && !!curr.developmentTeams.length;\n }, true);\n\n if (allTargetsHaveTeams) {\n const teamList = Object.values(signingInfo).reduce<string[]>((prev, curr) => {\n return prev.concat([curr.developmentTeams[0]]);\n }, []);\n Log.log(chalk.dim`\\u203A Auto signing app using team(s): ${teamList.join(', ')}`);\n return true;\n }\n\n const allTargetsHaveProfiles = Object.values(signingInfo).reduce((prev, curr) => {\n return prev && !!curr.provisioningProfiles.length;\n }, true);\n\n if (allTargetsHaveProfiles) {\n // this indicates that the user has manual code signing setup (possibly for production).\n return true;\n }\n return false;\n}\n\nasync function configureCodeSigningAsync(projectRoot: string) {\n const ids = await Security.findIdentitiesAsync();\n\n const id = await resolveCertificateSigningIdentityAsync(ids);\n\n Log.log(`\\u203A Signing and building iOS app with: ${id.codeSigningInfo}`);\n\n setAutoCodeSigningInfoForPbxproj(projectRoot, {\n appleTeamId: id.appleTeamId!,\n });\n return id.appleTeamId!;\n}\n"],"names":["ensureDeviceIsCodeSignedForDeploymentAsync","Security","Log","projectRoot","isCodeSigningConfigured","configureCodeSigningAsync","signingInfo","getCodeSigningInfoForPbxproj","allTargetsHaveTeams","Object","values","reduce","prev","curr","developmentTeams","length","teamList","concat","log","chalk","dim","join","allTargetsHaveProfiles","provisioningProfiles","ids","findIdentitiesAsync","id","resolveCertificateSigningIdentityAsync","codeSigningInfo","setAutoCodeSigningInfoForPbxproj","appleTeamId"],"mappings":"AAAA;;;;QAOsBA,0CAA0C,GAA1CA,0CAA0C;SAP9C,MAAO;gDAAP,OAAO;IAAP,MAAO;;;;;AAEbC,IAAAA,QAAQ,mCAAM,YAAY,EAAlB;AACmC,IAAA,kCAAqC,WAArC,qCAAqC,CAAA;AACb,IAAA,iBAAoB,WAApB,oBAAoB,CAAA;AACvFC,IAAAA,GAAG,mCAAM,cAAc,EAApB;;;;;;;;;;;;;;;;;;;;;;;;;;;AAER,eAAeF,0CAA0C,CAC9DG,WAAmB,EACK;IACxB,IAAIC,uBAAuB,CAACD,WAAW,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IACD,OAAOE,yBAAyB,CAACF,WAAW,CAAC,CAAC;CAC/C;AAED,SAASC,uBAAuB,CAACD,WAAmB,EAAW;IAC7D,2DAA2D;IAC3D,MAAMG,WAAW,GAAGC,CAAAA,GAAAA,iBAA4B,AAAa,CAAA,6BAAb,CAACJ,WAAW,CAAC,AAAC;IAE9D,MAAMK,mBAAmB,GAAGC,MAAM,CAACC,MAAM,CAACJ,WAAW,CAAC,CAACK,MAAM,CAAC,CAACC,IAAI,EAAEC,IAAI,GAAK;QAC5E,OAAOD,IAAI,IAAI,CAAC,CAACC,IAAI,CAACC,gBAAgB,CAACC,MAAM,CAAC;KAC/C,EAAE,IAAI,CAAC,AAAC;IAET,IAAIP,mBAAmB,EAAE;QACvB,MAAMQ,QAAQ,GAAGP,MAAM,CAACC,MAAM,CAACJ,WAAW,CAAC,CAACK,MAAM,CAAW,CAACC,IAAI,EAAEC,IAAI,GAAK;YAC3E,OAAOD,IAAI,CAACK,MAAM,CAAC;gBAACJ,IAAI,CAACC,gBAAgB,CAAC,CAAC,CAAC;aAAC,CAAC,CAAC;SAChD,EAAE,EAAE,CAAC,AAAC;QACPZ,GAAG,CAACgB,GAAG,CAACC,MAAK,UAAA,CAACC,GAAG,CAAC,uCAAuC,EAAEJ,QAAQ,CAACK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;KACb;IAED,MAAMC,sBAAsB,GAAGb,MAAM,CAACC,MAAM,CAACJ,WAAW,CAAC,CAACK,MAAM,CAAC,CAACC,IAAI,EAAEC,IAAI,GAAK;QAC/E,OAAOD,IAAI,IAAI,CAAC,CAACC,IAAI,CAACU,oBAAoB,CAACR,MAAM,CAAC;KACnD,EAAE,IAAI,CAAC,AAAC;IAET,IAAIO,sBAAsB,EAAE;QAC1B,wFAAwF;QACxF,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;CACd;AAED,eAAejB,yBAAyB,CAACF,WAAmB,EAAE;IAC5D,MAAMqB,GAAG,GAAG,MAAMvB,QAAQ,CAACwB,mBAAmB,EAAE,AAAC;IAEjD,MAAMC,EAAE,GAAG,MAAMC,CAAAA,GAAAA,kCAAsC,AAAK,CAAA,uCAAL,CAACH,GAAG,CAAC,AAAC;IAE7DtB,GAAG,CAACgB,GAAG,CAAC,CAAC,0CAA0C,EAAEQ,EAAE,CAACE,eAAe,CAAC,CAAC,CAAC,CAAC;IAE3EC,CAAAA,GAAAA,iBAAgC,AAE9B,CAAA,iCAF8B,CAAC1B,WAAW,EAAE;QAC5C2B,WAAW,EAAEJ,EAAE,CAACI,WAAW;KAC5B,CAAC,CAAC;IACH,OAAOJ,EAAE,CAACI,WAAW,CAAE;CACxB"}
|
|
@@ -5,7 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
exports.sortDefaultIdToBeginningAsync = sortDefaultIdToBeginningAsync;
|
|
6
6
|
exports.resolveCertificateSigningIdentityAsync = resolveCertificateSigningIdentityAsync;
|
|
7
7
|
exports.selectDevelopmentTeamAsync = selectDevelopmentTeamAsync;
|
|
8
|
-
|
|
8
|
+
function _chalk() {
|
|
9
|
+
const data = _interopRequireDefault(require("chalk"));
|
|
10
|
+
_chalk = function() {
|
|
11
|
+
return data;
|
|
12
|
+
};
|
|
13
|
+
return data;
|
|
14
|
+
}
|
|
9
15
|
var Security = _interopRequireWildcard(require("./Security"));
|
|
10
16
|
var _settings = require("./settings");
|
|
11
17
|
var Log = _interopRequireWildcard(require("../../../log"));
|
|
@@ -58,7 +64,7 @@ async function sortDefaultIdToBeginningAsync(identities) {
|
|
|
58
64
|
* This links to an FYI page that was user tested internally.
|
|
59
65
|
*/ function assertCodeSigningSetup() {
|
|
60
66
|
// TODO: We can probably do this too automatically.
|
|
61
|
-
Log.log(`\u203A Your computer requires some additional setup before you can build onto physical iOS devices.\n ${_chalk.default.bold((0, _link).learnMore("https://expo.fyi/setup-xcode-signing"))}`);
|
|
67
|
+
Log.log(`\u203A Your computer requires some additional setup before you can build onto physical iOS devices.\n ${_chalk().default.bold((0, _link).learnMore("https://expo.fyi/setup-xcode-signing"))}`);
|
|
62
68
|
throw new _errors.CommandError("No code signing certificates are available to use.");
|
|
63
69
|
}
|
|
64
70
|
async function resolveCertificateSigningIdentityAsync(ids) {
|
|
@@ -84,7 +90,7 @@ async function resolveCertificateSigningIdentityAsync(ids) {
|
|
|
84
90
|
}
|
|
85
91
|
async function selectDevelopmentTeamAsync(identities, preferredId) {
|
|
86
92
|
const index = await (0, _prompts).selectAsync("Development team for signing the app", identities.map((value, i)=>{
|
|
87
|
-
const format = value.signingCertificateId === preferredId ? _chalk.default.bold : (message)=>message
|
|
93
|
+
const format = value.signingCertificateId === preferredId ? _chalk().default.bold : (message)=>message
|
|
88
94
|
;
|
|
89
95
|
return {
|
|
90
96
|
// Formatted like: `650 Industries, Inc. (A1BCDEF234) - Apple Development: Evan Bacon (AA00AABB0A)`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/resolveCertificateSigningIdentity.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as Security from './Security';\nimport { getLastDeveloperCodeSigningIdAsync, setLastDeveloperCodeSigningIdAsync } from './settings';\nimport * as Log from '../../../log';\nimport { CommandError } from '../../../utils/errors';\nimport { isInteractive } from '../../../utils/interactive';\nimport { learnMore } from '../../../utils/link';\nimport { selectAsync } from '../../../utils/prompts';\n\n/**\n * Sort the code signing items so the last selected item (user's default) is the first suggested.\n */\nexport async function sortDefaultIdToBeginningAsync(\n identities: Security.CertificateSigningInfo[]\n): Promise<[Security.CertificateSigningInfo[], string | null]> {\n const lastSelected = await getLastDeveloperCodeSigningIdAsync();\n\n if (lastSelected) {\n let iterations = 0;\n while (identities[0].signingCertificateId !== lastSelected && iterations < identities.length) {\n identities.push(identities.shift()!);\n iterations++;\n }\n }\n return [identities, lastSelected];\n}\n\n/**\n * Assert that the computer needs code signing setup.\n * This links to an FYI page that was user tested internally.\n */\nfunction assertCodeSigningSetup(): never {\n // TODO: We can probably do this too automatically.\n Log.log(\n `\\u203A Your computer requires some additional setup before you can build onto physical iOS devices.\\n ${chalk.bold(\n learnMore('https://expo.fyi/setup-xcode-signing')\n )}`\n );\n\n throw new CommandError('No code signing certificates are available to use.');\n}\n\n/**\n * Resolve the best certificate signing identity from a given list of IDs.\n * - If no IDs: Assert that the user has to setup code signing.\n * - If one ID: Return the first ID.\n * - If multiple IDs: Ask the user to select one, then store the value to be suggested first next time (since users generally use the same ID).\n */\nexport async function resolveCertificateSigningIdentityAsync(\n ids: string[]\n): Promise<Security.CertificateSigningInfo> {\n // The user has no valid code signing identities.\n if (!ids.length) {\n assertCodeSigningSetup();\n }\n\n // One ID available 🤝 Program is not interactive\n //\n // using the the first available option\n if (ids.length === 1 || !isInteractive()) {\n // This method is cheaper than `resolveIdentitiesAsync` and checking the\n // cached user preference so we should use this as early as possible.\n return Security.resolveCertificateSigningInfoAsync(ids[0]);\n }\n\n // Get identities and sort by the one that the user is most likely to choose.\n const [identities, preferred] = await sortDefaultIdToBeginningAsync(\n await Security.resolveIdentitiesAsync(ids)\n );\n\n const selected = await selectDevelopmentTeamAsync(identities, preferred);\n\n // Store the last used value and suggest it as the first value\n // next time the user has to select a code signing identity.\n await setLastDeveloperCodeSigningIdAsync(selected.signingCertificateId);\n\n return selected;\n}\n\n/** Prompt the user to select a development team, highlighting the preferred value based on the user history. */\nexport async function selectDevelopmentTeamAsync(\n identities: Security.CertificateSigningInfo[],\n preferredId: string | null\n): Promise<Security.CertificateSigningInfo> {\n const index = await selectAsync(\n 'Development team for signing the app',\n identities.map((value, i) => {\n const format =\n value.signingCertificateId === preferredId ? chalk.bold : (message: string) => message;\n return {\n // Formatted like: `650 Industries, Inc. (A1BCDEF234) - Apple Development: Evan Bacon (AA00AABB0A)`\n title: format(\n [value.appleTeamName, `(${value.appleTeamId}) -`, value.codeSigningInfo].join(' ')\n ),\n value: i,\n };\n })\n );\n\n return identities[index];\n}\n"],"names":["sortDefaultIdToBeginningAsync","resolveCertificateSigningIdentityAsync","selectDevelopmentTeamAsync","Security","Log","identities","lastSelected","getLastDeveloperCodeSigningIdAsync","iterations","signingCertificateId","length","push","shift","assertCodeSigningSetup","log","chalk","bold","learnMore","CommandError","ids","isInteractive","resolveCertificateSigningInfoAsync","preferred","resolveIdentitiesAsync","selected","setLastDeveloperCodeSigningIdAsync","preferredId","index","selectAsync","map","value","i","format","message","title","appleTeamName","appleTeamId","codeSigningInfo","join"],"mappings":"AAAA;;;;QAasBA,6BAA6B,GAA7BA,6BAA6B;QAoC7BC,sCAAsC,GAAtCA,sCAAsC;QAgCtCC,0BAA0B,GAA1BA,0BAA0B;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/resolveCertificateSigningIdentity.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as Security from './Security';\nimport { getLastDeveloperCodeSigningIdAsync, setLastDeveloperCodeSigningIdAsync } from './settings';\nimport * as Log from '../../../log';\nimport { CommandError } from '../../../utils/errors';\nimport { isInteractive } from '../../../utils/interactive';\nimport { learnMore } from '../../../utils/link';\nimport { selectAsync } from '../../../utils/prompts';\n\n/**\n * Sort the code signing items so the last selected item (user's default) is the first suggested.\n */\nexport async function sortDefaultIdToBeginningAsync(\n identities: Security.CertificateSigningInfo[]\n): Promise<[Security.CertificateSigningInfo[], string | null]> {\n const lastSelected = await getLastDeveloperCodeSigningIdAsync();\n\n if (lastSelected) {\n let iterations = 0;\n while (identities[0].signingCertificateId !== lastSelected && iterations < identities.length) {\n identities.push(identities.shift()!);\n iterations++;\n }\n }\n return [identities, lastSelected];\n}\n\n/**\n * Assert that the computer needs code signing setup.\n * This links to an FYI page that was user tested internally.\n */\nfunction assertCodeSigningSetup(): never {\n // TODO: We can probably do this too automatically.\n Log.log(\n `\\u203A Your computer requires some additional setup before you can build onto physical iOS devices.\\n ${chalk.bold(\n learnMore('https://expo.fyi/setup-xcode-signing')\n )}`\n );\n\n throw new CommandError('No code signing certificates are available to use.');\n}\n\n/**\n * Resolve the best certificate signing identity from a given list of IDs.\n * - If no IDs: Assert that the user has to setup code signing.\n * - If one ID: Return the first ID.\n * - If multiple IDs: Ask the user to select one, then store the value to be suggested first next time (since users generally use the same ID).\n */\nexport async function resolveCertificateSigningIdentityAsync(\n ids: string[]\n): Promise<Security.CertificateSigningInfo> {\n // The user has no valid code signing identities.\n if (!ids.length) {\n assertCodeSigningSetup();\n }\n\n // One ID available 🤝 Program is not interactive\n //\n // using the the first available option\n if (ids.length === 1 || !isInteractive()) {\n // This method is cheaper than `resolveIdentitiesAsync` and checking the\n // cached user preference so we should use this as early as possible.\n return Security.resolveCertificateSigningInfoAsync(ids[0]);\n }\n\n // Get identities and sort by the one that the user is most likely to choose.\n const [identities, preferred] = await sortDefaultIdToBeginningAsync(\n await Security.resolveIdentitiesAsync(ids)\n );\n\n const selected = await selectDevelopmentTeamAsync(identities, preferred);\n\n // Store the last used value and suggest it as the first value\n // next time the user has to select a code signing identity.\n await setLastDeveloperCodeSigningIdAsync(selected.signingCertificateId);\n\n return selected;\n}\n\n/** Prompt the user to select a development team, highlighting the preferred value based on the user history. */\nexport async function selectDevelopmentTeamAsync(\n identities: Security.CertificateSigningInfo[],\n preferredId: string | null\n): Promise<Security.CertificateSigningInfo> {\n const index = await selectAsync(\n 'Development team for signing the app',\n identities.map((value, i) => {\n const format =\n value.signingCertificateId === preferredId ? chalk.bold : (message: string) => message;\n return {\n // Formatted like: `650 Industries, Inc. (A1BCDEF234) - Apple Development: Evan Bacon (AA00AABB0A)`\n title: format(\n [value.appleTeamName, `(${value.appleTeamId}) -`, value.codeSigningInfo].join(' ')\n ),\n value: i,\n };\n })\n );\n\n return identities[index];\n}\n"],"names":["sortDefaultIdToBeginningAsync","resolveCertificateSigningIdentityAsync","selectDevelopmentTeamAsync","Security","Log","identities","lastSelected","getLastDeveloperCodeSigningIdAsync","iterations","signingCertificateId","length","push","shift","assertCodeSigningSetup","log","chalk","bold","learnMore","CommandError","ids","isInteractive","resolveCertificateSigningInfoAsync","preferred","resolveIdentitiesAsync","selected","setLastDeveloperCodeSigningIdAsync","preferredId","index","selectAsync","map","value","i","format","message","title","appleTeamName","appleTeamId","codeSigningInfo","join"],"mappings":"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"}
|
|
@@ -3,9 +3,27 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.simulatorBuildRequiresCodeSigning = simulatorBuildRequiresCodeSigning;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
function _configPlugins() {
|
|
7
|
+
const data = require("@expo/config-plugins");
|
|
8
|
+
_configPlugins = function() {
|
|
9
|
+
return data;
|
|
10
|
+
};
|
|
11
|
+
return data;
|
|
12
|
+
}
|
|
13
|
+
function _plist() {
|
|
14
|
+
const data = _interopRequireDefault(require("@expo/plist"));
|
|
15
|
+
_plist = function() {
|
|
16
|
+
return data;
|
|
17
|
+
};
|
|
18
|
+
return data;
|
|
19
|
+
}
|
|
20
|
+
function _fs() {
|
|
21
|
+
const data = _interopRequireDefault(require("fs"));
|
|
22
|
+
_fs = function() {
|
|
23
|
+
return data;
|
|
24
|
+
};
|
|
25
|
+
return data;
|
|
26
|
+
}
|
|
9
27
|
function _interopRequireDefault(obj) {
|
|
10
28
|
return obj && obj.__esModule ? obj : {
|
|
11
29
|
default: obj
|
|
@@ -21,12 +39,12 @@ const ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING = [
|
|
|
21
39
|
];
|
|
22
40
|
function getEntitlements(projectRoot) {
|
|
23
41
|
try {
|
|
24
|
-
const entitlementsPath = _configPlugins.IOSConfig.Entitlements.getEntitlementsPath(projectRoot);
|
|
25
|
-
if (!entitlementsPath || !_fs.default.existsSync(entitlementsPath)) {
|
|
42
|
+
const entitlementsPath = _configPlugins().IOSConfig.Entitlements.getEntitlementsPath(projectRoot);
|
|
43
|
+
if (!entitlementsPath || !_fs().default.existsSync(entitlementsPath)) {
|
|
26
44
|
return null;
|
|
27
45
|
}
|
|
28
|
-
const entitlementsContents = _fs.default.readFileSync(entitlementsPath, "utf8");
|
|
29
|
-
const entitlements = _plist.default.parse(entitlementsContents);
|
|
46
|
+
const entitlementsContents = _fs().default.readFileSync(entitlementsPath, "utf8");
|
|
47
|
+
const entitlements = _plist().default.parse(entitlementsContents);
|
|
30
48
|
return entitlements;
|
|
31
49
|
} catch (error) {
|
|
32
50
|
debug("Failed to read entitlements", error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/simulatorCodeSigning.ts"],"sourcesContent":["import { IOSConfig } from '@expo/config-plugins';\nimport plist from '@expo/plist';\nimport fs from 'fs';\n\nconst debug = require('debug')('expo:run:ios:codeSigning:simulator');\n\n// NOTE(EvanBacon): These are entitlements that work in a simulator\n// but still require the project to have development code signing setup.\n// There may be more, but this is fine for now.\nconst ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING = [\n 'com.apple.developer.associated-domains',\n 'com.apple.developer.applesignin',\n];\n\nfunction getEntitlements(projectRoot: string): Record<string, any> | null {\n try {\n const entitlementsPath = IOSConfig.Entitlements.getEntitlementsPath(projectRoot);\n if (!entitlementsPath || !fs.existsSync(entitlementsPath)) {\n return null;\n }\n\n const entitlementsContents = fs.readFileSync(entitlementsPath, 'utf8');\n const entitlements = plist.parse(entitlementsContents);\n return entitlements;\n } catch (error) {\n debug('Failed to read entitlements', error);\n }\n return null;\n}\n\n/** @returns true if the simulator build should be code signed for development. */\nexport function simulatorBuildRequiresCodeSigning(projectRoot: string): boolean {\n const entitlements = getEntitlements(projectRoot);\n if (!entitlements) {\n return false;\n }\n return ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING.some((entitlement) => entitlement in entitlements);\n}\n"],"names":["simulatorBuildRequiresCodeSigning","debug","require","ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING","getEntitlements","projectRoot","entitlementsPath","IOSConfig","Entitlements","getEntitlementsPath","fs","existsSync","entitlementsContents","readFileSync","entitlements","plist","parse","error","some","entitlement"],"mappings":"AAAA;;;;QA+BgBA,iCAAiC,GAAjCA,iCAAiC;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/codeSigning/simulatorCodeSigning.ts"],"sourcesContent":["import { IOSConfig } from '@expo/config-plugins';\nimport plist from '@expo/plist';\nimport fs from 'fs';\n\nconst debug = require('debug')('expo:run:ios:codeSigning:simulator');\n\n// NOTE(EvanBacon): These are entitlements that work in a simulator\n// but still require the project to have development code signing setup.\n// There may be more, but this is fine for now.\nconst ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING = [\n 'com.apple.developer.associated-domains',\n 'com.apple.developer.applesignin',\n];\n\nfunction getEntitlements(projectRoot: string): Record<string, any> | null {\n try {\n const entitlementsPath = IOSConfig.Entitlements.getEntitlementsPath(projectRoot);\n if (!entitlementsPath || !fs.existsSync(entitlementsPath)) {\n return null;\n }\n\n const entitlementsContents = fs.readFileSync(entitlementsPath, 'utf8');\n const entitlements = plist.parse(entitlementsContents);\n return entitlements;\n } catch (error) {\n debug('Failed to read entitlements', error);\n }\n return null;\n}\n\n/** @returns true if the simulator build should be code signed for development. */\nexport function simulatorBuildRequiresCodeSigning(projectRoot: string): boolean {\n const entitlements = getEntitlements(projectRoot);\n if (!entitlements) {\n return false;\n }\n return ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING.some((entitlement) => entitlement in entitlements);\n}\n"],"names":["simulatorBuildRequiresCodeSigning","debug","require","ENTITLEMENTS_THAT_REQUIRE_CODE_SIGNING","getEntitlements","projectRoot","entitlementsPath","IOSConfig","Entitlements","getEntitlementsPath","fs","existsSync","entitlementsContents","readFileSync","entitlements","plist","parse","error","some","entitlement"],"mappings":"AAAA;;;;QA+BgBA,iCAAiC,GAAjCA,iCAAiC;SA/BvB,cAAsB;yBAAtB,sBAAsB;IAAtB,cAAsB;;;;;SAC9B,MAAa;gDAAb,aAAa;IAAb,MAAa;;;;;SAChB,GAAI;gDAAJ,IAAI;IAAJ,GAAI;;;;;;;;;;AAEnB,MAAMC,KAAK,GAAGC,OAAO,CAAC,OAAO,CAAC,CAAC,oCAAoC,CAAC,AAAC;AAErE,mEAAmE;AACnE,wEAAwE;AACxE,+CAA+C;AAC/C,MAAMC,sCAAsC,GAAG;IAC7C,wCAAwC;IACxC,iCAAiC;CAClC,AAAC;AAEF,SAASC,eAAe,CAACC,WAAmB,EAA8B;IACxE,IAAI;QACF,MAAMC,gBAAgB,GAAGC,cAAS,YAAA,CAACC,YAAY,CAACC,mBAAmB,CAACJ,WAAW,CAAC,AAAC;QACjF,IAAI,CAACC,gBAAgB,IAAI,CAACI,GAAE,UAAA,CAACC,UAAU,CAACL,gBAAgB,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC;SACb;QAED,MAAMM,oBAAoB,GAAGF,GAAE,UAAA,CAACG,YAAY,CAACP,gBAAgB,EAAE,MAAM,CAAC,AAAC;QACvE,MAAMQ,YAAY,GAAGC,MAAK,UAAA,CAACC,KAAK,CAACJ,oBAAoB,CAAC,AAAC;QACvD,OAAOE,YAAY,CAAC;KACrB,CAAC,OAAOG,KAAK,EAAE;QACdhB,KAAK,CAAC,6BAA6B,EAAEgB,KAAK,CAAC,CAAC;KAC7C;IACD,OAAO,IAAI,CAAC;CACb;AAGM,SAASjB,iCAAiC,CAACK,WAAmB,EAAW;IAC9E,MAAMS,YAAY,GAAGV,eAAe,CAACC,WAAW,CAAC,AAAC;IAClD,IAAI,CAACS,YAAY,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IACD,OAAOX,sCAAsC,CAACe,IAAI,CAAC,CAACC,WAAW,GAAKA,WAAW,IAAIL,YAAY;IAAA,CAAC,CAAC;CAClG"}
|