peachsim 0.1.1644 → 0.1.1653

package/kotlin/fork/fork.json

@@ -1,46 +0,0 @@
-{
-  "toolchain": {
-    "jdk": {
-      "release": "jdk-21.0.12.1+1",
-      "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.12.1%2B1/OpenJDK21U-jdk_x64_linux_hotspot_21.0.12.1_1.tar.gz",
-      "sha256": "ce79869e1307ed8ee1e2baa86a412b1eb5b75d10a01006d788a6f968bcfaee94"
-    },
-    "androidCommandLineTools": {
-      "url": "https://dl.google.com/android/repository/commandlinetools-linux-16111833_latest.zip",
-      "sha256": "0877a1d048fe4a24efe2eff536ca4223f7adeb58648bb81909d33c446918cfa8"
-    },
-    "freetypeHeaders": {
-      "repository": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-      "commit": "264b5fbf5b912b39f98d038bf75d39be0a73f21b"
-    }
-  },
-  "upstreams": [
-    {
-      "name": "compose-multiplatform-core",
-      "repository": "https://github.com/JetBrains/compose-multiplatform-core",
-      "license": "Apache-2.0",
-      "tag": "v1.13.0-alpha01",
-      "commit": "a9e47e8aa04c95cfe572ab4297c770f3cbfb234e",
-      "patch": "compose-worker-globals.patch",
-      "patchSha256": "ad7b321ec49b9a6abb705dad564345a352c592edc75d5babd398da54e8decfa3"
-    },
-    {
-      "name": "skiko",
-      "repository": "https://github.com/JetBrains/skiko",
-      "license": "Apache-2.0",
-      "tag": "v0.152.0-alpha02",
-      "commit": "96378296bb23c23c5f30cd2b0d42d6f8fdeff730",
-      "patch": "skiko-worker-clock.patch",
-      "patchSha256": "fba649096773ac8990b5586e7c6123819edf7eb3caa453b4c5415dc7aac110a0"
-    },
-    {
-      "name": "skia",
-      "repository": "https://github.com/JetBrains/skia",
-      "license": "BSD-3-Clause",
-      "tag": "m152-2ca5fe6a81",
-      "commit": "2ca5fe6a8170e2f55f519d9de083be4dccc06e70",
-      "patch": "skia-android-shaping.patch",
-      "patchSha256": "04fae34c4e29dd92ce4b94dc57ace28848a46fff8e745c820877a7e03bc00867"
-    }
-  ]
-}

package/kotlin/fork/publish.ts

@@ -1,99 +0,0 @@
-// uploads the artifacts one build.sh run delivered to R2, each under its sha256
-// beside the record that run copied (patches, fork.json, LICENSE, NOTICE,
-// artifacts.sha256), and prints the toolchain.json entries that name them. keys
-// are immutable: an existing object with other bytes stops the publish. needs
-// R2 credentials; reads are public.
-//
-//   bun packages/peachsim/kotlin/fork/publish.ts .remote-out/kotlin-fork
-
-import { createHash } from 'node:crypto'
-import { readFileSync, readdirSync } from 'node:fs'
-import path from 'node:path'
-import { RNX_PUBLIC } from '../../../../src/site/rnxPublicContract'
-import { readR2Object, uploadToR2 } from '../../../peach-engine/scripts/s3'
-
-const delivered = process.argv[2]
-if (!delivered) throw new Error('usage: publish.ts <directory build.sh delivered>')
-
-const IMMUTABLE = 'public, max-age=31536000, immutable'
-const sha256 = (bytes: Buffer) => createHash('sha256').update(bytes).digest('hex')
-
-const files = readdirSync(delivered)
-const record = files.filter(
-  (name) =>
-    name.endsWith('.patch') ||
-    [
-      'fork.json',
-      'LICENSE',
-      'SKIA_LICENSE',
-      'NOTICE',
-      'artifacts.sha256',
-      'skiko-local.init.gradle',
-    ].includes(name),
-)
-if (
-  record.length !==
-  files.filter((name) => !name.endsWith('.klib') && !name.endsWith('.jar')).length
-)
-  throw new Error(`${delivered} holds files build.sh does not deliver`)
-if (!record.includes('artifacts.sha256') || !record.includes('fork.json'))
-  throw new Error(`${delivered} is not a build.sh delivery`)
-
-// the artifacts are exactly the ones the build hashed
-const built = new Map(
-  readFileSync(path.join(delivered, 'artifacts.sha256'), 'utf8')
-    .trim()
-    .split('\n')
-    .map((line) => {
-      const [hash, name] = line.split(/\s+/)
-      if (!hash || !name) throw new Error(`malformed artifacts.sha256 line: ${line}`)
-      return [name, hash]
-    }),
-)
-const artifacts = files
-  .filter((name) => name.endsWith('.klib') || name.endsWith('.jar'))
-  .sort()
-if (artifacts.length === 0 || artifacts.length !== built.size)
-  throw new Error(`${delivered} artifacts do not match artifacts.sha256`)
-
-async function put(key: string, bytes: Buffer, contentType: string) {
-  const existing = await readR2Object(key, 120000)
-  if (existing) {
-    if (!existing.equals(bytes)) throw new Error(`${key} already holds other bytes`)
-    return
-  }
-  await uploadToR2(key, bytes, contentType, IMMUTABLE)
-}
-
-const recordHash = sha256(
-  Buffer.concat(
-    record
-      .sort()
-      .flatMap((file) => [
-        Buffer.from(file + '\0'),
-        readFileSync(path.join(delivered, file)),
-      ]),
-  ),
-)
-const entries = []
-for (const name of artifacts) {
-  const bytes = readFileSync(path.join(delivered, name))
-  const hash = sha256(bytes)
-  if (built.get(name) !== hash)
-    throw new Error(`${name} is not the artifact the build hashed`)
-  const prefix = `peach-kotlin-fork/${hash}`
-  await put(`${prefix}/${name}`, bytes, 'application/octet-stream')
-  for (const file of record)
-    await put(
-      `${prefix}/records/${recordHash}/${file}`,
-      readFileSync(path.join(delivered, file)),
-      'text/plain; charset=utf-8',
-    )
-  // the loader caches a library by its name, so the name carries the hash
-  entries.push({
-    name: name.replace(/\.(klib|jar)$/, `-peach-${hash.slice(0, 12)}.$1`),
-    url: `${RNX_PUBLIC.publicR2Origin}/${prefix}/${name}`,
-    sha256: hash,
-  })
-}
-console.log(JSON.stringify(entries, null, 2))

package/kotlin/fork/skia-android-shaping.patch

@@ -1,189 +0,0 @@
-diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
---- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
-+++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
-@@ -346,10 +346,15 @@
-     // Creating a sub font means that non-available functions
-     // are found from the parent.
-     HBFont skFont(hb_font_create_sub_font(typefaceFont.get()));
-+    // modified for the Android host: truncate static shaping size, preserving the run font.
-+    auto* measurementFont = new SkFont(font);
-+    if (!font.isSubpixel() && !font.isLinearMetrics()) {
-+        measurementFont->setSize(SkScalarFloorToScalar(font.getSize()));
-+    }
-     hb_font_set_funcs(skFont.get(), skhb_get_font_funcs(),
--                      reinterpret_cast<void *>(new SkFont(font)),
-+                      reinterpret_cast<void *>(measurementFont),
-                       [](void* user_data){ delete reinterpret_cast<SkFont*>(user_data); });
--    int scale = skhb_position(font.getSize());
-+    int scale = skhb_position(measurementFont->getSize());
-     hb_font_set_scale(skFont.get(), scale, scale);
-
-     return skFont;
-diff --git a/modules/skparagraph/src/Run.cpp b/modules/skparagraph/src/Run.cpp
---- a/modules/skparagraph/src/Run.cpp
-+++ b/modules/skparagraph/src/Run.cpp
-@@ -177,9 +177,13 @@
- SkScalar Run::addLetterSpacesEvenly(SkScalar space) {
-     SkScalar shift = 0;
-     for (size_t i = 0; i < this->size(); ++i) {
--        fPositions[i].fX += shift;
-+        // modified for the Android host: boundaries bisect inter-glyph spaces.
-+        const auto halfSpace = i == 0 ? 0 : space / 2;
-+        fPositions[i].fX += shift - halfSpace;
-+        fOffsets[i].fX += halfSpace;
-         shift += space;
-     }
-+    if (this->size() > 0) shift -= space;
-     fPositions[this->size()].fX += shift;
-     fAdvance.fX += shift;
-     return shift;
-@@ -190,8 +194,14 @@
-     SkScalar shift = 0;
-     for (size_t i = cluster->startPos(); i < cluster->endPos(); ++i) {
-         fPositions[i].fX += shift;
-+        // modified for the Android host: paint retains the inward half-space.
-+        const auto halfSpace = cluster->textRange().start == 0 && i == 0 ? 0 : space / 2;
-+        fOffsets[i].fX += halfSpace;
-         shift += space;
-     }
-+    // trim paragraph edges; font runs inside the paragraph keep their spacing.
-+    if (cluster->textRange().start == 0) shift -= space / 2;
-+    if (cluster->textRange().end == fOwner->text().size()) shift -= space / 2;
-     if (this->size() == cluster->endPos()) {
-         // To make calculations easier
-         fPositions[cluster->endPos()].fX += shift;
-diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
---- a/modules/skparagraph/src/TextLine.cpp
-+++ b/modules/skparagraph/src/TextLine.cpp
-@@ -177,13 +177,16 @@
-         }
-     }
-
--    // TODO: This is the fix for flutter. Must be removed...
--    for (auto cluster = &start; cluster <= &end; ++cluster) {
--        if (!cluster->run().isPlaceholder() && !cluster->run().isCursiveScript()) {
--            fShift += cluster->getHalfLetterSpacing();
--            break;
--        }
--    }
-+    // modified for the Android host: trim half-spaces at wrapped line edges.
-+    if (fClusterRange.start < fClusterRange.end) {
-+        const auto& first = fOwner->cluster(fClusterRange.start);
-+        const auto& last = fOwner->cluster(fClusterRange.end - 1);
-+        const auto leading = first.textRange().start == 0 ? 0 : first.getHalfLetterSpacing();
-+        const auto trailing = last.textRange().end == fOwner->text().size() ? 0 : last.getHalfLetterSpacing();
-+        fAdvance.fX -= leading + trailing;
-+        fWidthWithSpaces -= leading;
-+    }
-+
- }
-
- void TextLine::paint(ParagraphPainter* painter, SkScalar x, SkScalar y) {
-@@ -881,6 +884,10 @@
-     result.size = (end->isHardBreak() ? end->startPos() : end->endPos()) - start->startPos();
-     auto textStartInRun = run->positionX(start->startPos());
-     auto textStartInLine = runOffsetInLine + textOffsetInRunInLine;
-+    if (fClusterRange.start < fClusterRange.end) {
-+        const auto& first = fOwner->cluster(fClusterRange.start);
-+        if (first.textRange().start != 0) textStartInLine -= first.getHalfLetterSpacing();
-+    }
-     if (!run->leftToRight()) {
-         std::swap(start, end);
-     }
-@@ -928,6 +935,7 @@
-     }
-
-     result.clip.offset(textStartInLine, 0);
-+    if (originalTextRange.start == fTextExcludingSpaces.start) result.clip.fLeft = std::max(result.clip.fLeft, 0.0f);
-     //SkDebugf("@%f[%f:%f)\n", textStartInLine, result.clip.fLeft, result.clip.fRight);
-
-     if (compareRound(result.clip.fRight, fAdvance.fX, fOwner->getApplyRoundingHack()) > 0 && !includeGhostSpaces) {
---- a/modules/skparagraph/src/TextWrapper.cpp
-+++ b/modules/skparagraph/src/TextWrapper.cpp
-@@ -58,12 +58,19 @@
-     fClip.startFrom(fEndLine.startCluster(), fEndLine.startPos());
-
-     LineBreakerWithLittleRounding breaker(maxWidth, applyRoundingHack);
-+    // modified for the Android host: fit the same trimmed edges as TextLine.
-+    const auto lineWidth = [endOfClusters](SkScalar width, const Cluster* first, const Cluster* last) {
-+        if (first->textRange().start != 0) width -= first->getHalfLetterSpacing();
-+        if (last + 1 != endOfClusters) width -= last->getHalfLetterSpacing();
-+        return width;
-+    };
-     Cluster* nextNonBreakingSpace = nullptr;
-     for (auto cluster = fEndLine.endCluster(); cluster < endOfClusters; ++cluster) {
-         if (cluster->isHardBreak()) {
-         } else if (
-                 // TODO: Trying to deal with flutter rounding problem. Must be removed...
--                SkScalar width = fWords.width() + fClusters.width() + cluster->width();
-+                SkScalar width = lineWidth(fWords.width() + fClusters.width() + cluster->width(),
-+                                           fEndLine.startCluster(), cluster);
-                 breaker.breakLine(width)) {
-             if (cluster->isWhitespaceBreak()) {
-                 // It's the end of the word
-@@ -93,6 +100,7 @@
-             // Walk further to see if there is a too long word, cluster or glyph
-             SkScalar nextWordLength = fClusters.width();
-             SkScalar nextShortWordLength = nextWordLength;
-+            auto wordEnd = cluster;
-             for (auto further = cluster; further != endOfClusters; ++further) {
-                 if (further->isSoftBreak() || further->isHardBreak() || further->isWhitespaceBreak()) {
-                     break;
-@@ -113,8 +121,10 @@
-                     nextWordLength = std::max(nextWordLength, further->width());
-                 } else {
-                     nextWordLength += further->width();
--                }
--            }
-+                    wordEnd = further;
-+                }
-+            }
-+            nextWordLength = lineWidth(nextWordLength, fClusters.startCluster(), wordEnd);
-             if (nextWordLength > maxWidth) {
-                 if (nextNonBreakingSpace != nullptr) {
-                     // We only get here if the non-breaking space improves our situation
-diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
---- a/src/ports/SkFontHost_FreeType.cpp
-+++ b/src/ports/SkFontHost_FreeType.cpp
-@@ -990,10 +990,9 @@
-
-         if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) {
-             loadFlags |= FT_LOAD_FORCE_AUTOHINT;
--#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-         } else {
-+            // modified for the android host: disable implicit autohinting.
-             loadFlags |= FT_LOAD_NO_AUTOHINT;
--#endif
-         }
-
-         if ((fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag) == 0) {
-diff --git a/modules/skparagraph/include/DartTypes.h b/modules/skparagraph/include/DartTypes.h
---- a/modules/skparagraph/include/DartTypes.h
-+++ b/modules/skparagraph/include/DartTypes.h
-@@ -1,3 +1,4 @@
-+// modified for peach: Android center alignment retains its integer origin.
- // Copyright 2019 Google LLC
- 
- #ifndef DartTypes_DEFINED
-@@ -56,6 +57,7 @@
-     kJustify,
-     kStart,
-     kEnd,
-+    kCenterAndroid,
- };
- 
- enum class TextDirection {
-diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
---- a/modules/skparagraph/src/TextLine.cpp
-+++ b/modules/skparagraph/src/TextLine.cpp
-@@ -318,6 +318,10 @@
-         }
-     } else if (align == TextAlign::kRight) {
-         fShift = delta;
-+    } else if (align == TextAlign::kCenterAndroid) {
-+        const int extent = static_cast<int>(this->width()) & ~1;
-+        fShift = ((static_cast<int>(maxWidth - fIndent) - extent) >> 1) +
-+                 (isRtl ? 0 : fIndent);
-     } else if (align == TextAlign::kCenter) {
-         fShift = delta / 2 + (isRtl ? 0 : fIndent);
-     } else if (align == TextAlign::kLeft) {

package/kotlin/fork/skiko-local.init.gradle

@@ -1,10 +0,0 @@
-// consumes the fork built earlier in this invocation.
-allprojects {
-    def forkRepository = repositories.maven {
-        name = "peachSkikoFork"
-        url = uri(System.getProperty("maven.repo.local"))
-        content { includeModule("org.jetbrains.skiko", "skiko-wasm-js") }
-    }
-    repositories.remove(forkRepository)
-    repositories.addFirst(forkRepository)
-}

package/kotlin/fork/skiko-worker-clock.patch

@@ -1,122 +0,0 @@
-diff --git a/skiko/src/webMain/kotlin/org/jetbrains/skiko/Actuals.web.kt b/skiko/src/webMain/kotlin/org/jetbrains/skiko/Actuals.web.kt
-index 366ed37..d56c267 100644
---- a/skiko/src/webMain/kotlin/org/jetbrains/skiko/Actuals.web.kt
-+++ b/skiko/src/webMain/kotlin/org/jetbrains/skiko/Actuals.web.kt
-@@ -1,3 +1,8 @@
-+// Modified for Peach (https://peachsim.com): reads the worker-safe
-+// globalThis.performance clock instead of window.performance, so this code
-+// runs in a Web Worker as well as a document. See the Peach fork record for
-+// the patch and upstream revision.
-+
- package org.jetbrains.skiko
-
- import org.w3c.dom.HTMLElement
-@@ -5,7 +10,7 @@ import org.w3c.dom.HTMLElement
- internal actual inline fun <R> maybeSynchronized(lock: Any, block: () -> R): R =
-     block()
-
--actual fun currentNanoTime(): Long = currentNanoTimeWindowPerformance().toLong()
-+actual fun currentNanoTime(): Long = currentNanoTimePerformance().toLong()
-
- internal actual fun loadOpenGLLibrary() {
-    // Nothing to do here
-@@ -15,8 +20,8 @@ internal actual fun loadAngleLibrary() {
-     // Nothing to do here
- }
-
--private fun currentNanoTimeWindowPerformance() : Double =
-+private fun currentNanoTimePerformance() : Double =
-     //language=JavaScript
--    js("window.performance.now() * 1000000")
-+    js("globalThis.performance.now() * 1000000")
-
- annotation class WebImport(val name : String)
-diff --git a/skiko/buildSrc/src/main/kotlin/OptimizeSkikoWasmTask.kt b/skiko/buildSrc/src/main/kotlin/OptimizeSkikoWasmTask.kt
---- a/skiko/buildSrc/src/main/kotlin/OptimizeSkikoWasmTask.kt
-+++ b/skiko/buildSrc/src/main/kotlin/OptimizeSkikoWasmTask.kt
-@@ -65,6 +65,12 @@ abstract class OptimizeSkikoWasmTask : AbstractSkikoNativeToolTask() {
-                                     "${inputFile.nameWithoutExtension}.wasm",
-                                     "${libOutputFileName.get()}.wasm"
-                                 )
-+                                // peach tenants hide location from react native;
-+                                // emscripten already uses this module url below.
-+                                .replace(
-+                                    "scriptDirectory=self.location.href",
-+                                    "scriptDirectory=import.meta.url"
-+                                )
-                         )
-                     }
-                 }
-diff --git a/skiko/src/webMain/kotlin/org/jetbrains/skiko/OsArch.web.kt b/skiko/src/webMain/kotlin/org/jetbrains/skiko/OsArch.web.kt
---- a/skiko/src/webMain/kotlin/org/jetbrains/skiko/OsArch.web.kt
-+++ b/skiko/src/webMain/kotlin/org/jetbrains/skiko/OsArch.web.kt
-@@ -3,6 +3,15 @@
- import kotlinx.browser.window
- import kotlin.js.js
--
-+
--actual val hostOs: OS = detectHostOs()
-+private val defaultHostOs: OS by lazy { detectHostOs() }
-+private var hostOsProvider: () -> OS = { defaultHostOs }
-+
-+// modified for Peach: native hosts install their device's platform before
-+// any compose scene. see the fork record for the patch and upstream revision.
-+fun setHostOsProvider(provider: () -> OS) {
-+    hostOsProvider = provider
-+}
-+
-+actual val hostOs: OS get() = hostOsProvider()
--
-+
- actual val hostArch: Arch = Arch.Unknown
-diff --git a/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt b/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt
---- a/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt
-+++ b/skiko/buildSrc/src/main/kotlin/tasks/configuration/WasmTasksConfiguration.kt
-@@ -95,6 +95,7 @@
-
-         includeHeadersNonRecursive(project.projectDir.resolve("src/nativeJsMain/cpp"))
-         includeHeadersNonRecursive(project.projectDir.resolve("src/webMain/cpp"))
-+        includeHeadersNonRecursive(project.projectDir.resolve("src/nativeJsMain/cpp/freetype"))
-         includeHeadersNonRecursive(project.projectDir.resolve("src/commonMain/cpp/common/include"))
-         if (isSideModule) {
-             val coreProjectDir = project.rootProject.projectDir
-@@ -106,6 +107,10 @@
-         flags.set(
-             buildList {
-                 addAll(skiaPreprocessorFlags(OS.Wasm, buildType))
-+                // modified for the android host: use its text surface defaults.
-+                add("-USK_GAMMA_SRGB")
-+                add("-DSK_GAMMA_EXPONENT=1.4")
-+                add("-DSK_GAMMA_CONTRAST=0.0")
-                 addAll(buildType.clangFlags)
-                 add("-fno-rtti")
-                 add("-fno-exceptions")
-diff --git a/skiko/buildSrc/src/main/kotlin/LinkSkikoTask.kt b/skiko/buildSrc/src/main/kotlin/LinkSkikoTask.kt
---- a/skiko/buildSrc/src/main/kotlin/LinkSkikoTask.kt
-+++ b/skiko/buildSrc/src/main/kotlin/LinkSkikoTask.kt
-@@ -60,5 +60,7 @@ abstract class LinkSkikoTask : AbstractSkikoNativeToolTask() {
-             repeatedArg("-L", values = libDirs.get())
--            repeatedArg(values = objectFiles.files)
-+            // modified for peach: filesystem enumeration must not change wasm bytes.
-+            // archive order stays intact because it controls symbol resolution.
-+            repeatedArg(values = objectFiles.files.sortedBy { it.invariantSeparatorsPath })
-             repeatedArg(values = libFiles.files)
-             rawArgs(flags.get())
-         }
-diff --git a/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt b/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
---- a/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
-+++ b/skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt
-@@ -1,3 +1,4 @@
-+// modified for peach: carries Android center alignment to the native paragraph.
- package org.jetbrains.skia.paragraph
- 
- enum class Alignment {
-@@ -6,5 +7,6 @@
-     CENTER,
-     JUSTIFY,
-     START,
--    END;
-+    END,
-+    CENTER_ANDROID;
- }
-