peachsim 0.1.1625 → 0.1.1640

package/src/swift-compiler-digest.ts

@@ -0,0 +1,14 @@
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+
+// the lowering and manifest code in swift-compile.ts and its design-time lowering
+// decide the emitted output, so their text addresses every swift artifact. bundled
+// builds cannot read these files at runtime, so build-cli injects this digest.
+export function swiftCompilerSourceDigest(srcDir: string): string {
+  const hash = createHash('sha256')
+  for (const file of ['swift-compile.ts', 'swift-design-time.ts']) {
+    hash.update(readFileSync(path.join(srcDir, file)))
+  }
+  return hash.digest('hex')
+}

package/src/swift-distribution.lock.json

@@ -1,11 +1,15 @@
 {
-  "id": "1fda1fb984f25758",
-  "release": "swift-6.4.0-RELEASE",
-  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-34b989c2",
-  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-34b989c2.artifactbundle.tar.gz",
-  "wasmSdkChecksum": "1598ac9d063e07b20aa6232acb03c7147c9a94abf989d51f1e55688eb4aba854",
-  "source": "078b4f63d3734871dc1fbea898005e2ef95a73cb",
+  "id": "77123740e6b79652",
+  "release": "swift-6.4.0-RELEASE-custom-0d775d32d7c74eae",
+  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-21f60db0",
+  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-21f60db0.artifactbundle.tar.gz",
+  "wasmSdkChecksum": "7b7573fd23120549fc928581a42968676f5f00f9ef63e5618032a6928a724e16",
+  "source": "7625fb75d15f047f1e8c0b14b73407c50263f0c4",
   "targets": [
+    "ImagePlayground",
+    "QuickLookThumbnailing",
+    "libxml2",
+    "CarPlay",
     "System",
     "_LocationEssentials",
     "GeoToolbox",
@@ -36,12 +40,14 @@
     "FoundationNetworking",
     "DeveloperToolsSupport",
     "SwiftUI",
+    "os_workgroup",
     "Dispatch",
     "DarwinRecords",
     "Darwin",
     "MachO",
     "ObjectiveC",
     "PeachObjC",
+    "UIUtilities",
     "UIKitCore",
     "PeachICU",
     "PeachCMark",
@@ -54,6 +60,7 @@
     "DeviceCheck",
     "PassKit",
     "Translation",
+    "TipKit",
     "CoreSpotlight",
     "CoreVideo",
     "CoreMedia",
@@ -137,7 +144,12 @@
     "FoundationModels",
     "CoreTransferable",
     "AudioToolbox",
+    "CoreAudioTypes",
+    "AudioUnit",
     "Intents",
+    "IntentsUI",
+    "WatchConnectivity",
+    "CoreServices",
     "MobileCoreServices",
     "ImageIO",
     "CoreLocationEnums",
@@ -179,16 +191,16 @@
   },
   "hosts": {
     "darwin-arm64": {
-      "sha256": "6a3b956b13bcc76dbf0b55533088251e2ae29badcd5c8d66394a2459e0942a32",
-      "size": 63180761
+      "sha256": "cc4a8f39ea9e3f12864196793a248bea28c05917ef4e7220ad516447da88d582",
+      "size": 71374056
     },
     "linux-x64": {
-      "sha256": "37f26adff0a90c0647065b3c2e70bfdae05c84832b27add00915d441f2f79359",
-      "size": 63183751
+      "sha256": "c3938547ce5a453c63dc261e98753be6420ee8f2501b64d3622ef16f63d8bd1f",
+      "size": 71380196
     },
     "linux-arm64": {
-      "sha256": "e329424d19ede87f4c9257de40f88220cdaff42bd82f1ab47616394ec7f32f35",
-      "size": 63181548
+      "sha256": "0b32aaf29f8ad7a1ca021a42f889bc4da28d239680c4cff82ca96a803c3d31e1",
+      "size": 71378226
     }
   }
 }

package/src/swift-distribution.ts

@@ -5,6 +5,7 @@
 // build carries, and unpacks it under the peach home
 // (docs/swift-distribution.md). no path here asks Contrast to compile.
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
 import { installVerifiedTarball } from '@contrast/runtime-delivery'
 import { rnxHomeDir } from './home-paths'
@@ -16,7 +17,17 @@ import {
   swiftDistributionKey,
 } from './swift-distribution-contract'
 import lockJson from './swift-distribution.lock.json' with { type: 'json' }
-import { swiftToolchain } from './swift-toolchain'
+import {
+  confineSwiftScratch,
+  installSwiftWasmSdk,
+  swiftCompiler,
+  swiftCompilerInstallSteps,
+  swiftHostCompilerArchive,
+  swiftToolchain,
+  swiftToolchainBin,
+  verifySwiftHostCompiler,
+  type SwiftWasmSdk,
+} from './swift-toolchain'
 
 export const SWIFT_ENDPOINT_ENV = 'PEACH_SWIFT_ENDPOINT'
 
@@ -51,9 +62,9 @@ export async function swiftDistributionRoot(
       `peach has no Swift distribution for ${process.platform}-${process.arch}; it ships for macOS arm64 and Linux x64 and arm64`,
     )
   }
-  // the archive is useless without its compiler, so a missing or wrong
-  // toolchain fails before the download
-  swiftToolchain(lock.release, lock)
+  // the archive is useless without its compiler, so the toolchain installs
+  // or fails before the download
+  await installSwiftToolchain(lock.release, lock, signal)
   const dir = path.join(rnxHomeDir(), 'swift', `${lock.id}-${host}`)
   let pending = installs.get(dir)
   if (pending?.controller.signal.aborted) pending = undefined
@@ -126,6 +137,93 @@ export async function swiftDistributionRoot(
   }
 }
 
+/**
+ * the pinned compiler and wasm SDK, installed on first use without root: the
+ * compiler under PEACH_HOME/swift/toolchains (macOS: ~/Library/Developer/Toolchains) unless CONTRAST_SWIFT_TOOLCHAINS
+ * or an existing /opt/swift install selects another (swiftToolchainBin), the
+ * SDK in the --swift-sdks-path directory, PEACH_HOME/swift/sdks by default.
+ * a compiler in a directory the user selected is verified, never replaced.
+ */
+async function installSwiftToolchain(
+  release: string,
+  sdk: SwiftWasmSdk,
+  signal?: AbortSignal,
+): Promise<void> {
+  process.env.PEACH_SWIFT_SDKS_PATH ??= path.join(rnxHomeDir(), 'swift', 'sdks')
+  if (swiftToolchainReady(release, sdk)) return
+  const root = path.resolve(swiftToolchainBin(release), '../..')
+  // macOS installs where the locator looks first, the user's Toolchains
+  // directory, and only into a directory without a compiler; linux installs
+  // into the Peach-owned directory.
+  const owned =
+    process.platform === 'darwin'
+      ? path.join(os.homedir(), 'Library/Developer/Toolchains', `${release}.xctoolchain`)
+      : path.join(rnxHomeDir(), 'swift', 'toolchains', release)
+  const selectedCompiler =
+    process.platform === 'darwin' && fs.existsSync(path.join(root, 'usr/bin/swift'))
+  if (
+    release.includes('-custom-') &&
+    root === owned &&
+    !selectedCompiler &&
+    !swiftCompilerReady(release)
+  ) {
+    const archive = swiftHostCompilerArchive(release)
+    process.stderr.write(`peach: installing Swift compiler ${release} to ${root}…\n`)
+    await installVerifiedTarball({
+      signal,
+      url: archive.url,
+      digest: { algorithm: 'sha256', encoding: 'hex', value: archive.checksum },
+      destDir: root,
+      installedMarker: 'compiler.json',
+      stripComponents: 1,
+      label: `Swift compiler ${release}`,
+      verify: (dir) => verifySwiftHostCompiler(release, dir),
+    })
+  }
+  try {
+    swiftCompiler(release)
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error)
+    throw new Error(
+      `Swift compiler ${release} is unavailable or differs from its pin: ${reason}\n${swiftCompilerInstallSteps(release)}\nthen run the command again; it installs the SDK.`,
+      { cause: error },
+    )
+  }
+  if (swiftToolchainReady(release, sdk)) return
+  signal?.throwIfAborted()
+  const directory = process.env.PEACH_SWIFT_SDKS_PATH
+  process.stderr.write(`peach: installing Swift SDK ${sdk.wasmSdkId} to ${directory}…\n`)
+  try {
+    installSwiftWasmSdk(release, sdk)
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error)
+    throw new Error(
+      `could not install Swift SDK ${sdk.wasmSdkId} to ${directory}: ${reason}`,
+      {
+        cause: error,
+      },
+    )
+  }
+}
+
+function swiftCompilerReady(release: string): boolean {
+  try {
+    swiftCompiler(release)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function swiftToolchainReady(release: string, sdk: SwiftWasmSdk): boolean {
+  try {
+    swiftToolchain(release, sdk)
+    return true
+  } catch {
+    return false
+  }
+}
+
 /** the module this process compiles app Swift against: the checkout beside a
  *  source peach, else the distribution, else null. `required` callers compile
  *  nothing without it, so a checkout's toolchain error surfaces to them. */
@@ -134,6 +232,7 @@ export async function resolveSwiftModule({
   signal,
 }: { required?: boolean; signal?: AbortSignal } = {}): Promise<SwiftModule | null> {
   signal?.throwIfAborted()
+  confineSwiftScratch(path.join(rnxHomeDir(), 'cache', 'swift-tmp'))
   const checkout = path.resolve(import.meta.dirname, '../../sootsim-swift')
   if (fs.existsSync(path.join(checkout, 'toolchain.json'))) {
     // a checkout is implicit: without its toolchain, apps run without their