Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2975dd3f60 | ||
|
|
d44f1eee22 | ||
|
|
c2fd3a8921 | ||
|
|
51d002410a | ||
|
|
84225f873f | ||
|
|
50445a571a | ||
|
|
41251f1d61 | ||
|
|
a71021c7da | ||
|
|
30d347a393 |
No files matched your search
@@ -1,16 +1,14 @@
|
||||
name: Android
|
||||
|
||||
# Arcade's own Android APKs, with the whole library for offline play, for an
|
||||
# Arcade release (node-arcade-VERSION). Game updates starts this on the new
|
||||
# release's tag; started by hand on master, it fills in the APKs of the
|
||||
# release master is at. Three signed editions are attached: arcade-VERSION.apk
|
||||
# and arcade-VERSION-fdroid.apk hold no Google library, arcade-VERSION-gplay.apk
|
||||
# is the only one with Play Billing.
|
||||
# Native host releases have their own VERSION and arcade-VERSION release.
|
||||
# Catalog/game publication never starts this workflow. All three signed
|
||||
# editions are verified before this workflow creates the native release tag.
|
||||
# Existing node-arcade-VERSION releases and their APK URLs remain unchanged.
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: Arcade release version; empty uses VERSION at the chosen ref
|
||||
description: Native host release version; empty uses VERSION at the chosen ref
|
||||
required: false
|
||||
type: string
|
||||
|
||||
@@ -32,6 +30,8 @@ jobs:
|
||||
shovey: ${{ steps.release.outputs.shovey }}
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
- name: Check version and release boundaries
|
||||
run: python3 tests/catalog_versions_test.py
|
||||
- name: Find the release and its locked dependencies
|
||||
id: release
|
||||
env:
|
||||
@@ -44,13 +44,14 @@ jobs:
|
||||
echo "::error::$GITHUB_REF is at Arcade $version, not $REQUESTED"
|
||||
exit 1
|
||||
fi
|
||||
# The APKs carry exactly the release's catalog and games.
|
||||
gh release view "node-arcade-$version" --json name > /dev/null
|
||||
assets=$(gh release view "node-arcade-$version" --json assets --jq '.assets[].name')
|
||||
due=false
|
||||
for name in "arcade-$version.apk" "arcade-$version-fdroid.apk" "arcade-$version-gplay.apk"; do
|
||||
printf '%s\n' "$assets" | grep -qxF "$name" || due=true
|
||||
done
|
||||
# A new native release needs no matching node catalog release.
|
||||
due=true
|
||||
if assets=$(gh release view "arcade-$version" --json assets --jq '.assets[].name'); then
|
||||
due=false
|
||||
for name in "arcade-$version.apk" "arcade-$version-fdroid.apk" "arcade-$version-gplay.apk"; do
|
||||
printf '%s\n' "$assets" | grep -qxF "$name" || due=true
|
||||
done
|
||||
fi
|
||||
if [ "$due" = false ]; then
|
||||
echo "::notice title=Android::Arcade $version already has its APKs"
|
||||
fi
|
||||
@@ -169,12 +170,23 @@ jobs:
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
repository: ziranlang/ziran
|
||||
ref: ${{ needs.release.outputs.toolchain }}
|
||||
path: ziranlang/ziran
|
||||
- name: Prepare the locked asset verifier dependencies
|
||||
run: |
|
||||
make -j2 -C ziranlang/ziran
|
||||
echo "$GITHUB_WORKSPACE/ziranlang/ziran/build/bin" >> "$GITHUB_PATH"
|
||||
printf '[overrides]\nziran = "ziranlang/ziran"\n' > ziran.local.toml
|
||||
ziranlang/ziran/build/bin/ziran fetch
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: arcade-android-*
|
||||
path: build/downloads
|
||||
merge-multiple: true
|
||||
- name: Check and attach the APKs to the release
|
||||
- name: Verify all editions and publish the native host release
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
VERSION: ${{ needs.release.outputs.version }}
|
||||
@@ -185,5 +197,16 @@ jobs:
|
||||
python3 scripts/android-release.py verify "build/downloads/arcade-$VERSION$suffix.apk" \
|
||||
--edition "$edition" --version "$VERSION"
|
||||
done
|
||||
gh release upload "node-arcade-$VERSION" "build/downloads/arcade-$VERSION.apk" \
|
||||
"build/downloads/arcade-$VERSION-fdroid.apk" "build/downloads/arcade-$VERSION-gplay.apk" --clobber
|
||||
tag="arcade-$VERSION"
|
||||
if gh release view "$tag" >/dev/null 2>&1; then
|
||||
# Retry only the same verified source, preserving past release URLs.
|
||||
target=$(gh api "repos/$GITHUB_REPOSITORY/commits/$tag" --jq '.sha')
|
||||
test "$target" = "$GITHUB_SHA"
|
||||
gh release upload "$tag" "build/downloads/arcade-$VERSION.apk" \
|
||||
"build/downloads/arcade-$VERSION-fdroid.apk" "build/downloads/arcade-$VERSION-gplay.apk" --clobber
|
||||
else
|
||||
gh release create "$tag" "build/downloads/arcade-$VERSION.apk" \
|
||||
"build/downloads/arcade-$VERSION-fdroid.apk" "build/downloads/arcade-$VERSION-gplay.apk" \
|
||||
--target "$GITHUB_SHA" --title "Arcade $VERSION" \
|
||||
--notes 'Native Arcade for Android: normal, F-Droid and Google Play editions. Games and library updates arrive separately.'
|
||||
fi
|
||||
@@ -2,8 +2,8 @@ name: Game updates
|
||||
|
||||
# Arcade follows its games by itself. When a game package (Shovey, Apfelwurm)
|
||||
# publishes a GitHub release, this pins Arcade to that release, adds the
|
||||
# game's notes to Arcade's changelog, builds and checks the collection,
|
||||
# commits the new Arcade version and attaches its catalog and game archive to
|
||||
# game's notes to Arcade's catalog changelog, builds and checks the collection,
|
||||
# commits the new catalog version and attaches its catalog and game archive to
|
||||
# the node-arcade-VERSION release. Inner Breeze's node follower then signs
|
||||
# that release and publishes it to Waozi's node, where Arcade downloads games.
|
||||
# A game's release workflow starts this at once; the timer is the fallback,
|
||||
@@ -33,7 +33,9 @@ jobs:
|
||||
with:
|
||||
path: waozixyz/arcade
|
||||
- name: Check release following
|
||||
run: python3 tests/game_updates_test.py
|
||||
run: |
|
||||
python3 tests/game_updates_test.py
|
||||
python3 tests/catalog_versions_test.py
|
||||
- name: Find newer game releases
|
||||
id: updates
|
||||
env:
|
||||
@@ -93,10 +95,10 @@ jobs:
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
run: |
|
||||
python3 scripts/follow-game-releases.py changelog --ziran ../../ziranlang/ziran/build/bin/ziran
|
||||
sh update_version.sh
|
||||
sh update_version.sh --catalog
|
||||
python3 scripts/follow-game-releases.py art
|
||||
echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
|
||||
head -12 CHANGELOG.md
|
||||
echo "version=$(cat catalog/VERSION)" >> "$GITHUB_OUTPUT"
|
||||
head -12 catalog/CHANGELOG.md
|
||||
- name: Build and check the collection
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
run: |
|
||||
@@ -112,8 +114,8 @@ jobs:
|
||||
run: |
|
||||
git config user.name Waozi
|
||||
git config user.email [email protected]
|
||||
git add ziran.toml ziran.lock CHANGELOG.md VERSION apps/versions.json assets/arcade/library
|
||||
git commit -q -m "Release Arcade $VERSION with the latest game releases"
|
||||
git add ziran.toml ziran.lock catalog/CHANGELOG.md catalog/VERSION apps/versions.json assets/arcade/library
|
||||
git commit -q -m "Release Arcade catalog $VERSION with the latest game releases"
|
||||
git push origin HEAD:master
|
||||
echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
|
||||
- name: Attach the checked catalog and game archive
|
||||
@@ -128,13 +130,6 @@ jobs:
|
||||
--target "$SHA" --title "Arcade $VERSION" \
|
||||
--notes 'Arcade downloads the selected game separately and preserves earned progress.'
|
||||
echo "Arcade $VERSION is ready for the node: sha256 $(sha256sum build/node-apps/arcade.zx | cut -d' ' -f1)"
|
||||
# Arcade's own APKs build from the release's tag and join its release.
|
||||
- name: Start the Android build
|
||||
if: steps.updates.outputs.changed == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
VERSION: ${{ steps.release.outputs.version }}
|
||||
run: gh workflow run android.yml -R "$GITHUB_REPOSITORY" --ref "node-arcade-$VERSION" -f version="$VERSION"
|
||||
# Breeze's node follower signs this release and publishes it to the
|
||||
# node now, not at its next timer. RELEASE_FOLLOW_TOKEN may only start
|
||||
# workflows in Arcade and Breeze; the follower takes no input and
|
||||
|
||||
@@ -27,6 +27,8 @@ jobs:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||
with:
|
||||
path: waozixyz/arcade
|
||||
- name: Check version and release boundaries
|
||||
run: python3 tests/catalog_versions_test.py
|
||||
- name: Read the fixed dependency revisions
|
||||
id: dependencies
|
||||
env:
|
||||
@@ -93,7 +95,7 @@ jobs:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
set -eu
|
||||
version=$(cat VERSION)
|
||||
version=$(cat catalog/VERSION)
|
||||
tag="node-arcade-$version"
|
||||
if gh release view "$tag" >/dev/null 2>&1; then
|
||||
mkdir -p build/prior-node-release
|
||||
@@ -105,6 +107,4 @@ jobs:
|
||||
gh release create "$tag" build/node-apps/arcade.zx build/node-apps/arcade.games.tar build/games/wurm.zx \
|
||||
--target "$GITHUB_SHA" --title "Arcade $version" \
|
||||
--notes 'Arcade downloads the selected game separately and preserves earned progress.'
|
||||
# Arcade's own APKs build from the release's tag and join its release.
|
||||
gh workflow run android.yml -R "$GITHUB_REPOSITORY" --ref "$tag" -f version="$version"
|
||||
fi
|
||||
@@ -71,8 +71,6 @@ jobs:
|
||||
# Its game archive holds the library art the site serves itself.
|
||||
gh release download "$tag" --repo waozixyz/arcade --pattern arcade.zx \
|
||||
--pattern arcade.games.tar --dir build/published
|
||||
# The Apps library that release packs, by the digest its own commit trusts.
|
||||
git show "$tag:apps-controller.sha256" > build/published/apps-controller.sha256
|
||||
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
|
||||
- name: Build the browser edition
|
||||
run: |
|
||||
@@ -80,7 +78,7 @@ jobs:
|
||||
python3 scripts/build-entity.py
|
||||
python3 scripts/build-apps.py --output build/apps-ui
|
||||
python3 scripts/build-web.py --bundle build/published/arcade.zx \
|
||||
--controller-sha256 "$(cat build/published/apps-controller.sha256)" \
|
||||
--controller-sha256 "$(cat apps-controller.sha256)" \
|
||||
--version '${{ steps.published.outputs.version }}'
|
||||
rm -f build/web-site/runtime.html
|
||||
- name: Wait for the published games the browser will download
|
||||
|
||||
@@ -1,5 +1,28 @@
|
||||
# Arcade changelog
|
||||
|
||||
## 0.7.117
|
||||
|
||||
- Ask before connecting to the node for Arcade's signed app library and compressed previews, with an offline choice and a connection control.
|
||||
- Refresh library membership and game versions independently of the APK, keeping downloaded apps and saved progress available offline.
|
||||
- Recover library thumbnails after failed requests and keep the native host release version separate from catalog releases.
|
||||
|
||||
## 0.7.116
|
||||
|
||||
- Android Arcade downloads games and library thumbnails on demand instead of bundling the entire game library; installed games remain playable offline with saved progress.
|
||||
|
||||
- Filter account-key imports to key files and related backup types on Android.
|
||||
|
||||
## 0.7.115
|
||||
|
||||
- Arcade opens correctly on Android instead of closing during startup.
|
||||
- Bundled offline games open with the full library installed.
|
||||
- The Android launcher icon fills its launcher shape with a larger gamepad.
|
||||
|
||||
## 0.7.114
|
||||
|
||||
- Apfelwurm Editor uses its painted logo cover in the library.
|
||||
- Tall library previews keep their titles visible in small, compressed cards.
|
||||
|
||||
## 0.7.113
|
||||
|
||||
- Choano 0.1.3 loads its artwork and sound from the paths the game requests.
|
||||
|
||||
@@ -54,6 +54,8 @@ run: all
|
||||
./build/arcade
|
||||
|
||||
test: all
|
||||
python3 tests/android_catalog_test.py
|
||||
python3 tests/android_jni_contract_test.py
|
||||
python3 tests/game_updates_test.py
|
||||
$(ZIRAN) fmt --check src/*.zi apps/chess/*.zi tests/chess_engine_behavior.zi tests/chess_app_behavior.zi
|
||||
python3 tests/chess_locale_test.py
|
||||
@@ -134,7 +136,7 @@ install: all install-arcade
|
||||
install -m 0644 build/shovey-icon.png '$(DATA_DIR)/icons/hicolor/256x256/apps/xyz.waozi.shovey.png'
|
||||
install -m 0644 packaging/xyz.waozi.arcade.desktop packaging/xyz.waozi.shovey.desktop '$(DATA_DIR)/applications/'
|
||||
|
||||
# Arcade's own APK opens its whole library offline. Each builds an unsigned
|
||||
# Arcade's APK is a thin catalog with on-demand games and art. Each builds an unsigned
|
||||
# release APK in build/android/; only -gplay carries a Google library.
|
||||
# scripts/android-release.py signs and checks them.
|
||||
.PHONY: android android-fdroid android-gplay
|
||||
@@ -147,7 +149,7 @@ android-fdroid: collection
|
||||
android-gplay: collection
|
||||
python3 scripts/build-android.py --product arcade --release --edition gplay
|
||||
|
||||
# The collection make android packed opens every game offline (desktop host).
|
||||
# Test the Android catalog through the generic install/cache path privately.
|
||||
.PHONY: android-offline-ui-test
|
||||
android-offline-ui-test: build/arcade build/entity.zx
|
||||
env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS \
|
||||
|
||||
@@ -15,7 +15,7 @@ their whole board; locked puzzles keep their lock until earned.
|
||||
|
||||
The published Arcade carries only its catalog, well under one megabyte. Its host supplies the shared Apps controller (Inner Breeze its own, standalone Arcade the `apps.zx` installed beside it), and the covers and previews download once as one separate art bundle. Library covers use thumbnails up to 640 pixels on their longest side, and logos up to 512 pixels, preserving full colours and transparency. Games keep their original artwork. The verified art bundle stays cached across restarts and is replaced when its content changes. The art lives in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes it when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
|
||||
downloads when opened, with its existing identity and saved progress. This
|
||||
catalog requires Inner Breeze host API 34. Downloaded games work offline;
|
||||
catalog requires Inner Breeze host API 41. Downloaded games work offline;
|
||||
standalone Shovey keeps its complete offline collection. Apfelwurm comes from
|
||||
its own package, with the same game identity and private editor records.
|
||||
|
||||
@@ -46,19 +46,26 @@ review are not implemented.
|
||||
|
||||
## Shared Apps library
|
||||
|
||||
Arcade embeds the shared `apps.zx` controller and artwork in a verified
|
||||
catalog. The catalog fixes the digest of every separately downloaded game. Each game package lists its apps in its own `apps.json`:
|
||||
Arcade includes the reviewed shared `apps.zx` controller and a small seed
|
||||
catalog. It asks before connecting to its node for the signed app library
|
||||
and compressed previews. The connection control can switch back to offline;
|
||||
verified cached apps, previews and saved progress remain available.
|
||||
The catalog fixes the digest of every separately downloaded game. Each game package lists its apps in its own `apps.json`:
|
||||
the app's `catalog.json`, and for an app the library opens from a cover, the
|
||||
cover's portrait art, landscape art, logo, caption and action. `games.json`
|
||||
names the game packages, and Arcade's own `apps.json` its own apps. Arcade
|
||||
presents every declared leaf directly, without a second chooser, and a cover
|
||||
opens its app straight into play or editing. Shovey’s separate standalone
|
||||
collection uses the same leaves and saves. Kryon’s shared `Carousel` handles
|
||||
navigation and painting. The local player does not offer node updates or OS
|
||||
actions it
|
||||
cannot perform. Inbe supplies its own account and package policy.
|
||||
navigation and painting. Library refreshes use the reusable Apps signed catalog
|
||||
loader and do not update the native host. Inbe supplies its own account and package policy.
|
||||
Arcade's launcher icon is MingCute's `game_2` gamepad (Apache-2.0).
|
||||
|
||||
An optional `artwork` mapping in `games.json` names a locked source-only
|
||||
dependency for a game's library pictures. Its paths still come from that
|
||||
game's declarations. This lets covers advance independently of playable
|
||||
code; the thumbnail source hashes remain checked when the catalog builds.
|
||||
|
||||
## One Chess game
|
||||
|
||||
Chess remains an installable app in Inner Breeze, where it also fits thoughtful
|
||||
@@ -126,8 +133,13 @@ and desktop-menu entry for the current user; it does not publish a release.
|
||||
|
||||
## Android
|
||||
|
||||
Arcade's APK opens the whole library offline: `make android` packs the
|
||||
collection with every game, its art and the Apps controller, and builds an
|
||||
Arcade's APK contains only the catalog, shared Apps controller, Entity host,
|
||||
font and launcher resources. Library thumbnails download when needed; games
|
||||
and their declared dependencies install after download consent. Installed
|
||||
games remain available offline, and updates preserve downloads and saves.
|
||||
Entity keeps ordinary profile pictures; optional game imagery falls back to
|
||||
the profile picture when absent.
|
||||
Standalone Shovey retains its complete offline collection. `make android` builds an
|
||||
unsigned release APK in `build/android/`. `make android-fdroid` and
|
||||
`make android-gplay` build the other editions; only `-gplay` carries a Google
|
||||
library (Play Billing). Builds need the Android SDK with NDK 28.2.13676358,
|
||||
@@ -143,8 +155,19 @@ The release key is `backup/android-signing/arcade-release.p12` (ignored) and
|
||||
the GitHub secrets `ARCADE_ANDROID_KEYSTORE` and
|
||||
`ARCADE_ANDROID_KEYSTORE_PASSWORD`; `packaging/android/certificate.pem` is its
|
||||
public certificate. The Android workflow attaches `arcade-VERSION.apk`,
|
||||
`arcade-VERSION-fdroid.apk` and `arcade-VERSION-gplay.apk` to each
|
||||
`node-arcade-VERSION` release; Game updates starts it for every new release.
|
||||
`arcade-VERSION-fdroid.apk` and `arcade-VERSION-gplay.apk` to a native
|
||||
`arcade-VERSION` release after verifying all three editions. Existing APKs
|
||||
on older `node-arcade-VERSION` releases keep their original URLs.
|
||||
|
||||
The native host uses root `CHANGELOG.md` and `VERSION`; synchronize a native
|
||||
release with `sh update_version.sh`. The signed game catalog uses
|
||||
`catalog/CHANGELOG.md` and `catalog/VERSION`; synchronize its release with
|
||||
`sh update_version.sh --catalog`. Both use numeric changelog entries and keep
|
||||
each game's own version ledger. Catalog publication keeps the existing
|
||||
`node-arcade-VERSION` tags and never starts Android builds. Game updates
|
||||
advance the catalog only, leaving pending native changes for the next host
|
||||
release. An APK's embedded seed catalog may have a different version from
|
||||
its native host.
|
||||
|
||||
Game packages are registered in `games.json`; each declares its apps in its
|
||||
`apps.json`. `scripts/build-games.py` generates the catalog and bundles
|
||||
|
||||
@@ -1 +1 @@
|
||||
fc63c84e19ce2f63fcd587478962c67aee31202353addcf840c9228d69c048c7
|
||||
d9348aac9e83664a55510ec34acacf9e4bedb568ad47aa09474bb79121f98d02
|
||||
@@ -34,8 +34,8 @@
|
||||
"arcade": {
|
||||
"id": "inbe.arcade",
|
||||
"title": "Arcade",
|
||||
"version": "0.7.113",
|
||||
"sequence": 192,
|
||||
"version": "0.7.117",
|
||||
"sequence": 196,
|
||||
"host_api": 41
|
||||
},
|
||||
"wurm": {
|
||||
|
||||
@@ -33,13 +33,13 @@
|
||||
"source_sha256": "96db251f36835c76cd03cd0104a6e1b5096e4c442d410960457edcd8e2377a38"
|
||||
},
|
||||
"wurm-editor-landscape": {
|
||||
"source_sha256": "670255e43a6fd232951fb3d1ce0d62d098d663230d731e7c447c44a944a907d3"
|
||||
"source_sha256": "b3616e68f1b391d1a4f9dd5d91538a63a889a7f977991e625831ec9caffa71c5"
|
||||
},
|
||||
"wurm-editor-portrait": {
|
||||
"source_sha256": "f3475185324e4f4bfa37561f09422546eab5595ab3887d26e684128b2ac9480b"
|
||||
"source_sha256": "07ff2ff0142c262cdcba3643bbc4d7d3d71643b7f9f4e678a910fee2bfd3eba1"
|
||||
},
|
||||
"wurm-editor-preview": {
|
||||
"source_sha256": "670255e43a6fd232951fb3d1ce0d62d098d663230d731e7c447c44a944a907d3"
|
||||
"source_sha256": "b3616e68f1b391d1a4f9dd5d91538a63a889a7f977991e625831ec9caffa71c5"
|
||||
},
|
||||
"wurm-landscape": {
|
||||
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30"
|
||||
|
||||
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 109 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 114 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 115 KiB |
@@ -0,0 +1,12 @@
|
||||
# Arcade catalog changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## 0.7.117
|
||||
|
||||
- Game and library updates arrive separately from native Arcade app updates.
|
||||
- Publish the verified game modules and compressed previews with the aligned shared host dependencies.
|
||||
|
||||
## 0.7.116
|
||||
|
||||
- Continue the existing signed Arcade catalog and game library release history.
|
||||
@@ -0,0 +1 @@
|
||||
0.7.117
|
||||
@@ -73,6 +73,7 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets.main.java.srcDir new File(kryonDir, 'templates/droid/droid/app/src/main/java/org/kryonlabs/platform')
|
||||
sourceSets.main.assets.srcDir "${rootProject.projectDir}/../build/entity-assets"
|
||||
// The collection, its receipt and the launcher icon, staged by make android
|
||||
// (scripts/build-android.py).
|
||||
|
||||
@@ -52,6 +52,8 @@ public class ArcadeActivity extends NativeActivity {
|
||||
private native void nativeTextInputCommit(int codepoint);
|
||||
private native void nativeTextInputBackspace();
|
||||
private native void nativeTextInputEnter();
|
||||
// Registered by the locked Kryon host even when using key-event input.
|
||||
private native void nativeTextInputState(long target, long revision, byte[] value, int cursor, int anchor);
|
||||
private native int nativeSyncLifecycleState(boolean paused, boolean windowFocused);
|
||||
private native void nativeInvalidateGraphicsResources();
|
||||
// Kryon's android_picker: a picked file arrives as a private copy's path.
|
||||
@@ -402,7 +404,7 @@ public class ArcadeActivity extends NativeActivity {
|
||||
try {
|
||||
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
|
||||
intent.addCategory(Intent.CATEGORY_OPENABLE);
|
||||
intent.setType(mimeTypes == null || mimeTypes.isEmpty() ? "*/*" : mimeTypes);
|
||||
org.kryonlabs.platform.DocumentTypes.apply(intent, mimeTypes);
|
||||
startActivityForResult(intent, REQUEST_OPEN_DOCUMENT);
|
||||
} catch (Exception error) {
|
||||
Log.e(TAG, "Could not open the document picker", error);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{
|
||||
"packages": ["shovey", "wurm", "choano"]
|
||||
"packages": ["shovey", "wurm", "choano"],
|
||||
"artwork": {"wurm": "wurm_art"}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 9.0 KiB |
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1 @@
|
||||
196
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"origin": "https://api.waozi.xyz",
|
||||
"app_id": "inbe.arcade",
|
||||
"key_id": "inbe-2026-10",
|
||||
"public_key": "d9a549043c0ac91a5197d85053a815c831d342a1082143c2bd1ffd43e1e6f145"
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Sign and verify Arcade's Android APKs: the normal and F-Droid editions,
|
||||
which hold no Google library, and the Google Play edition, the only one with
|
||||
Play Billing. Each carries the whole library for offline play."""
|
||||
Play Billing. Arcade downloads games on demand."""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
@@ -16,6 +16,27 @@ ROOT = Path(__file__).resolve().parents[1]
|
||||
ABIS = ['arm64-v8a', 'armeabi-v7a']
|
||||
|
||||
|
||||
def verify_launcher(apk, tools, names):
|
||||
"""Resolve compiled resource IDs, including shortened release paths."""
|
||||
resources = subprocess.check_output(
|
||||
[str(tools / 'aapt'), 'dump', '--values', 'resources', str(apk)], text=True)
|
||||
entries = re.findall(r'resource (0x[0-9a-f]+) [^\n]+:(drawable/ic_launcher_\w+|mipmap/ic_launcher):[^\n]*\n\s*\(string8\) "([^"]+)"', resources)
|
||||
paths = {path for _, _, path in entries}
|
||||
assert paths <= set(names), 'A launcher resource is missing from the APK'
|
||||
legacy = [path for _, name, path in entries if name == 'mipmap/ic_launcher' and path.endswith('.png')]
|
||||
assert len(legacy) == 5, 'All five legacy icon densities must be present'
|
||||
adaptive = [path for _, name, path in entries if name == 'mipmap/ic_launcher' and path.endswith('.xml')]
|
||||
assert len(adaptive) == 1 and 'config anydpi-v26:' in resources, 'The Android adaptive icon is missing'
|
||||
layers = {name: identifier for identifier, name, _ in entries if name.startswith('drawable/')}
|
||||
tree = subprocess.check_output(
|
||||
[str(tools / 'aapt'), 'dump', 'xmltree', str(apk), adaptive[0]], text=True)
|
||||
assert 'E: adaptive-icon' in tree, 'The launcher XML is not adaptive'
|
||||
for layer in ('background', 'foreground'):
|
||||
identifier = layers.get('drawable/ic_launcher_' + layer)
|
||||
assert identifier and re.search(r'E: ' + layer + r'[^\n]*\n[^\n]*@' + identifier, tree), \
|
||||
f'The adaptive {layer} drawable is missing'
|
||||
|
||||
|
||||
def build_tools():
|
||||
sdk = Path(os.environ.get('ANDROID_SDK_ROOT') or os.environ.get('ANDROID_HOME') or Path.home() / 'Android/Sdk')
|
||||
folders = sorted((sdk / 'build-tools').glob('*'), key=lambda p: tuple(int(n) for n in re.findall(r'\d+', p.name)))
|
||||
@@ -31,7 +52,7 @@ def verify(apk, version, tools, edition='direct'):
|
||||
assert package and package[1] == 'xyz.waozi.arcade' and package[3] == version, 'APK identity or version differs'
|
||||
assert "application-label:'Arcade'" in badging, 'The APK is not labelled Arcade'
|
||||
# Release builds shorten resource names; the manifest names the icon.
|
||||
icon = re.search(r"^application: label='Arcade' icon='(res/[^']+\.png)'", badging, re.M)
|
||||
icon = re.search(r"^application: label='Arcade' icon='(res/[^']+\.(?:png|xml))'", badging, re.M)
|
||||
assert icon, "Arcade's launcher icon is missing"
|
||||
assert 'application-debuggable' not in badging, 'A debug build cannot be published'
|
||||
google_play = edition == 'gplay'
|
||||
@@ -48,21 +69,26 @@ def verify(apk, version, tools, edition='direct'):
|
||||
abis = sorted(p.split('/')[1] for p in names if re.fullmatch(r'lib/[^/]+/libmain\.so', p))
|
||||
assert abis == ABIS, 'Both supported ARM architectures must be present'
|
||||
assert icon[1] in names, "Arcade's launcher icon is missing"
|
||||
if tuple(map(int, version.split('.'))) >= (0, 7, 115):
|
||||
verify_launcher(apk, tools, names)
|
||||
metadata = json.loads(archive.read('assets/arcade.json'))
|
||||
payload = archive.read('assets/arcade.zx')
|
||||
assert metadata['id'] == 'inbe.arcade' and metadata['version'] == version
|
||||
assert metadata['id'] == 'inbe.arcade', 'Embedded catalog identity differs'
|
||||
catalog_version = (ROOT / 'catalog/VERSION').read_text().strip()
|
||||
assert re.fullmatch(r'\d+\.\d+\.\d+', catalog_version), 'A numeric catalog version is required'
|
||||
assert metadata['version'] == catalog_version, 'Embedded catalog version differs from its source'
|
||||
assert metadata['sha256'] == hashlib.sha256(payload).hexdigest(), 'Embedded collection differs from its receipt'
|
||||
# Offline play: every game in the catalog is packed into the collection.
|
||||
assert metadata.get('games') == 'packed' and 'art' not in metadata and metadata['children'], \
|
||||
'The collection must pack its games and art'
|
||||
for child in metadata['children']:
|
||||
assert child['bundle'].encode() in payload, f"{child['id']} is not packed for offline play"
|
||||
from android_catalog import verify_assets
|
||||
verify_assets({name.removeprefix('assets/'): archive.read(name)
|
||||
for name in names if name.startswith('assets/') and not name.endswith('/')}, edition=edition)
|
||||
dex = b''.join(archive.read(name) for name in names if re.fullmatch(r'classes\d*\.dex', name))
|
||||
for marker in (b'Lorg/kryonlabs/play/PlayBilling;', b'Lcom/android/billingclient/'):
|
||||
assert (marker in dex) == google_play, 'Only the Google Play edition may include Play Billing'
|
||||
with apk.open('rb') as source:
|
||||
apk_digest = hashlib.file_digest(source, 'sha256').hexdigest()
|
||||
return dict(version=version, version_code=int(package[2]), package=package[1], abis=abis, edition=edition,
|
||||
sha256=hashlib.sha256(apk.read_bytes()).hexdigest(), certificate_sha256=expected,
|
||||
payload_sha256=metadata['sha256'], games=[child['id'] for child in metadata['children']],
|
||||
sha256=apk_digest, certificate_sha256=expected,
|
||||
catalog_version=metadata['version'], payload_sha256=metadata['sha256'], games=[child['id'] for child in metadata['children']],
|
||||
bytes=apk.stat().st_size)
|
||||
|
||||
|
||||
@@ -81,7 +107,7 @@ def main():
|
||||
apk = args.apk.resolve(strict=True)
|
||||
if args.action == 'verify':
|
||||
verify(apk, args.version, tools, args.edition)
|
||||
print(f'Arcade {args.version} {args.edition}: APK identity, signer, alignment and offline games verified')
|
||||
print(f'Arcade {args.version} {args.edition}: APK identity, signer, alignment and thin catalog verified')
|
||||
return
|
||||
suffix = '' if args.edition == 'direct' else '-' + args.edition
|
||||
output = (args.output or ROOT / f'build/android/arcade-{args.version}{suffix}.apk').resolve()
|
||||
@@ -112,7 +138,7 @@ def main():
|
||||
records = ROOT / 'backup/android-release'
|
||||
records.mkdir(parents=True, exist_ok=True)
|
||||
(records / f'verification{suffix}.json').write_text(json.dumps(result, indent=2) + '\n')
|
||||
print(f'Arcade {args.version} {args.edition}: signed {output}; identity, signer, alignment and offline games verified')
|
||||
print(f'Arcade {args.version} {args.edition}: signed {output}; identity, signer, alignment and thin catalog verified')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
"""Strict content boundary for the thin Android Arcade launcher."""
|
||||
import hashlib
|
||||
import io
|
||||
import json
|
||||
import struct
|
||||
import subprocess
|
||||
from functools import lru_cache
|
||||
from pathlib import Path
|
||||
from node_config import node_source
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
ESSENTIALS = {'arcade.zx', 'arcade.json', 'apps.zx', 'entity.zx', 'kryon-font.ttf'}
|
||||
|
||||
|
||||
@lru_cache(maxsize=1)
|
||||
def profile_asset_hashes():
|
||||
flags = [] if (ROOT / 'ziran.local.toml').is_file() else ['--locked']
|
||||
package = Path(subprocess.check_output(
|
||||
[str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'entity', *flags],
|
||||
cwd=ROOT, text=True).strip())
|
||||
paths = json.loads((package / 'asset-groups.json').read_text())['profile']
|
||||
result = {}
|
||||
for path in paths:
|
||||
with (package / path).open('rb') as source:
|
||||
result[path] = hashlib.file_digest(source, 'sha256').hexdigest()
|
||||
return result
|
||||
|
||||
|
||||
def profile_assets():
|
||||
return set(profile_asset_hashes())
|
||||
|
||||
|
||||
def bundle_assets(payload, limit):
|
||||
# The catalog is tiny. Reject packed collections before allocating/reading
|
||||
# their contents, then inspect every actual asset rather than path strings
|
||||
# in the JSON (which intentionally names remote game and art resources).
|
||||
assert len(payload) <= limit, 'Bundle exceeds its asset policy budget'
|
||||
stream = io.BytesIO(payload)
|
||||
def take(size):
|
||||
assert 0 <= size <= len(payload), 'Invalid bundle field'
|
||||
data = stream.read(size)
|
||||
assert len(data) == size, 'Truncated bundle'
|
||||
return data
|
||||
def number():
|
||||
return struct.unpack('<I', take(4))[0]
|
||||
def text():
|
||||
return take(number())
|
||||
assert take(8) == b'ZX\0\0\x1b\0\0\0', 'Unsupported catalog bundle'
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
for _ in range(7):
|
||||
text()
|
||||
take(8); text(); take(4)
|
||||
for _ in range(number()):
|
||||
text(); text(); text()
|
||||
take(number())
|
||||
assets = {}
|
||||
for _ in range(number()):
|
||||
name = text().decode()
|
||||
assert name not in assets, 'Duplicate bundle asset'
|
||||
assets[name] = take(number())
|
||||
assert not stream.read(1), 'Trailing bundle bytes'
|
||||
return assets
|
||||
|
||||
|
||||
def catalog_assets(payload):
|
||||
assets = bundle_assets(payload, 256 * 1024)
|
||||
assert set(assets) == {'assets/apps/catalog.json', 'assets/arcade/sidebar.shape'}, 'Game payload or art bundled in Arcade'
|
||||
return json.loads(assets['assets/apps/catalog.json'])
|
||||
|
||||
|
||||
def verify_assets(assets, essentials=True, edition='direct'):
|
||||
expected = ESSENTIALS if essentials else ESSENTIALS - {'entity.zx', 'kryon-font.ttf'}
|
||||
if essentials and edition == 'gplay':
|
||||
# AndroidX's generated ART startup profiles accompany Play Billing.
|
||||
expected = expected | {'dexopt/baseline.prof', 'dexopt/baseline.profm'}
|
||||
assert set(assets) == expected, 'Unexpected or missing Android asset: ' + str(set(assets) ^ expected)
|
||||
metadata = json.loads(assets['arcade.json'])
|
||||
assert metadata['id'] == 'inbe.arcade' and metadata.get('games') != 'packed'
|
||||
assert metadata.get('node') == node_source(ROOT), 'Node publisher binding differs from the reviewed host configuration'
|
||||
assert hashlib.sha256(assets['arcade.zx']).hexdigest() == metadata['sha256']
|
||||
trusted = (ROOT / 'apps-controller.sha256').read_text().strip()
|
||||
assert hashlib.sha256(assets['apps.zx']).hexdigest() == metadata['apps_sha256'] == trusted
|
||||
if essentials:
|
||||
pictures = bundle_assets(assets['entity.zx'], 16 * 1024 * 1024)
|
||||
assert set(pictures) == profile_assets(), 'Entity contains undeclared or game artwork'
|
||||
assert {name: hashlib.sha256(data).hexdigest() for name, data in pictures.items()} == profile_asset_hashes(), 'Entity profile artwork differs from its pinned declaration'
|
||||
assert not bundle_assets(assets['apps.zx'], 2 * 1024 * 1024), 'Apps controller must contain no art or game payloads'
|
||||
catalog = catalog_assets(assets['arcade.zx'])
|
||||
assert catalog['children'] == metadata['children'] and catalog['art'] == metadata['art']
|
||||
assert catalog['harness'] == 'assets/apps/apps.zx'
|
||||
return metadata
|
||||
@@ -1,17 +1,24 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Package Arcade's native Android host: Arcade with its whole library offline,
|
||||
"""Package Arcade's native Android host: a thin on-demand launcher,
|
||||
or the older standalone Shovey collection."""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
from PIL import Image
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def native_release():
|
||||
version = (ROOT / 'VERSION').read_text().strip()
|
||||
code = int((ROOT / 'packaging/android/version-code').read_text().strip())
|
||||
if not re.fullmatch(r'(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)', version) or not 0 < code <= 2100000000:
|
||||
raise ValueError('Invalid native Android version or versionCode')
|
||||
return dict(version=version, sequence=code)
|
||||
|
||||
def package(name):
|
||||
return Path(subprocess.check_output([str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', name], cwd=ROOT, text=True).strip())
|
||||
|
||||
@@ -23,6 +30,7 @@ def ziran_bundle(*arguments):
|
||||
|
||||
def launcher_icon(source, resources):
|
||||
"""Density variants are mechanical packaging of the original logo."""
|
||||
from PIL import Image
|
||||
icon = Image.open(source).convert('RGBA')
|
||||
if resources.exists():
|
||||
shutil.rmtree(resources)
|
||||
@@ -32,12 +40,11 @@ def launcher_icon(source, resources):
|
||||
icon.resize((size, size), Image.Resampling.LANCZOS).save(folder / 'ic_launcher.png')
|
||||
|
||||
def stage_arcade():
|
||||
"""Pack the staged collection with its games, art and Apps controller, so
|
||||
the APK opens the whole library offline. Returns Arcade's release."""
|
||||
"""Stage the catalog and reviewed shared controller without game payloads. Returns Arcade's release."""
|
||||
collection = ROOT / 'build/collection'
|
||||
receipt = json.loads((collection / 'receipt.json').read_text())
|
||||
release = json.loads((ROOT / 'apps/versions.json').read_text())['node_apps']['arcade']
|
||||
if receipt['version'] != release['version'] or receipt['version'] != (ROOT / 'VERSION').read_text().strip():
|
||||
if receipt['version'] != release['version'] or receipt['version'] != (ROOT / 'catalog/VERSION').read_text().strip():
|
||||
raise ValueError('The Arcade version changed; rebuild the collection first')
|
||||
controller = (collection / 'assets/apps/apps.zx').read_bytes()
|
||||
if hashlib.sha256(controller).hexdigest() != receipt['apps_sha256']:
|
||||
@@ -46,17 +53,20 @@ def stage_arcade():
|
||||
if assets.exists():
|
||||
shutil.rmtree(assets)
|
||||
assets.mkdir(parents=True)
|
||||
ziran_bundle('--root', str(ROOT / 'src'), '--entry', 'collection:Main',
|
||||
'--asset-dir', 'assets=' + str(collection / 'assets'), '-o', str(assets / 'arcade.zx'),
|
||||
str(ROOT / 'src/collection.zi'))
|
||||
# The library packs its games and art: the host downloads nothing.
|
||||
offline = {key: value for key, value in receipt.items() if key != 'art'} | {'games': 'packed'}
|
||||
offline['sha256'] = hashlib.sha256((assets / 'arcade.zx').read_bytes()).hexdigest()
|
||||
(assets / 'arcade.json').write_text(json.dumps(offline, indent=2) + '\n')
|
||||
# Reuse the standard thin catalog; standalone Shovey remains packed.
|
||||
for name in ('arcade.zx', 'arcade.json'):
|
||||
shutil.copyfile(ROOT / 'build' / name, assets / name)
|
||||
shutil.copyfile(collection / 'assets/apps/apps.zx', assets / 'apps.zx')
|
||||
from android_catalog import verify_assets
|
||||
metadata = verify_assets({p.name: p.read_bytes() for p in assets.iterdir()}, essentials=False)
|
||||
if metadata['version'] != release['version']:
|
||||
raise ValueError('The thin catalog version changed; rebuild the collection first')
|
||||
# Android before 10 has no font lookup; the Windows build ships the same font.
|
||||
shutil.copyfile(package('kryon') / 'assets/fonts/LiberationSans-Regular.ttf', assets / 'kryon-font.ttf')
|
||||
launcher_icon(ROOT / 'site/icon-512.png', ROOT / 'build/android-res')
|
||||
return release
|
||||
launcher_icon(ROOT / 'site/android-launcher-512.png', ROOT / 'build/android-res')
|
||||
# Only Arcade gets this adaptive icon; standalone Shovey keeps its art.
|
||||
shutil.copytree(ROOT / 'packaging/android/icon-res', ROOT / 'build/android-res', dirs_exist_ok=True)
|
||||
return native_release()
|
||||
|
||||
def stage_shovey():
|
||||
"""Shovey's standalone collection from Arcade's staging. Returns its release."""
|
||||
@@ -78,7 +88,7 @@ def stage_shovey():
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--product', choices=('shovey', 'arcade'), default='shovey',
|
||||
help='arcade: Arcade with its whole library; shovey: the standalone Shovey collection')
|
||||
help='arcade: thin Arcade launcher; shovey: the standalone Shovey collection')
|
||||
parser.add_argument('--release', action='store_true', help='Build an unsigned release APK for the release signer')
|
||||
parser.add_argument('--edition', choices=('direct', 'fdroid', 'gplay'), default='direct',
|
||||
help='The APK edition; only gplay carries a Google library')
|
||||
@@ -88,6 +98,8 @@ def main():
|
||||
parser.add_argument('--abis', default='arm64-v8a,armeabi-v7a', help='Native ABIs to build')
|
||||
parser.add_argument('--build-dir', type=Path, help='Separate Gradle and CMake output for verification')
|
||||
args = parser.parse_args()
|
||||
subprocess.run(['python3', str(ROOT / 'tests/android_jni_contract_test.py')],
|
||||
cwd=ROOT, check=True)
|
||||
arcade = args.product == 'arcade'
|
||||
if arcade and args.bundle:
|
||||
parser.error('Arcade builds APKs; the App Bundle is the standalone Shovey one')
|
||||
@@ -129,6 +141,7 @@ def main():
|
||||
output = ROOT / 'build/android' / (f'arcade{suffix}-unsigned.apk' if args.release else f'arcade{suffix}.apk')
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
shutil.copyfile(apk, output)
|
||||
subprocess.run(['python3', str(ROOT / 'tests/android_catalog_test.py'), str(output), '--edition', edition], cwd=ROOT, check=True)
|
||||
print(f'Arcade APK: {output}')
|
||||
return
|
||||
output = ROOT / ('build/shovey-test-unsigned.apk' if args.application_id else
|
||||
|
||||
@@ -47,8 +47,27 @@ def build(root, output):
|
||||
controller_context(root, context)
|
||||
package = Path(subprocess.check_output(
|
||||
['ziran', 'pkg', 'path', 'apps', '--locked'], cwd=context, text=True).strip())
|
||||
subprocess.run([sys.executable, str(package / 'scripts/build-ui.py'),
|
||||
'--output', str(output.resolve())], cwd=root, check=True)
|
||||
subprocess.run([sys.executable, str(package / 'scripts/generate-ui-locales.py'), '--check'],
|
||||
cwd=root, check=True)
|
||||
toolchain = Path(subprocess.check_output(
|
||||
['ziran', 'pkg', 'path', 'ziran', '--locked'], cwd=context, text=True).strip())
|
||||
compiler = toolchain / 'build/bin/ziran'
|
||||
if not compiler.is_file():
|
||||
compiler = root / 'build/toolchain/bin/ziran'
|
||||
subprocess.run(['make', '-s', '-C', str(toolchain),
|
||||
'BUILD_DIR=' + str(root / 'build/toolchain'), 'all'], check=True)
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
kryon = Path(subprocess.check_output(
|
||||
['ziran', 'pkg', 'path', 'kryon', '--locked'], cwd=context, text=True).strip())
|
||||
# Keep Apps' supported source entry mode with this host's exact graph.
|
||||
subprocess.run([str(compiler), 'bundle',
|
||||
'--module-path', str(package / 'src'),
|
||||
'--module-path', 'kryon=' + str(kryon / 'src/ui'),
|
||||
'--module-path', 'kryon=' + str(kryon / 'src/backend'),
|
||||
'--module-path', str(toolchain / 'std'),
|
||||
'--root', str(package / 'ui'), '--entry', 'apps:Main',
|
||||
'--define', 'KRYON_HOSTED_UI', '-o', str(output.resolve() / 'apps.zx'),
|
||||
str(package / 'ui/apps.zi')], cwd=context, check=True)
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
@@ -11,6 +11,7 @@ import shutil
|
||||
import subprocess
|
||||
import tarfile
|
||||
from game_packages import declared_packages
|
||||
from node_config import node_source
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
MAX_PAYLOAD_BYTES = 64 * 1024 * 1024
|
||||
@@ -21,6 +22,16 @@ def digest(path):
|
||||
return hashlib.sha256(path.read_bytes()).hexdigest()
|
||||
|
||||
|
||||
def catalog_version(root):
|
||||
"""The node receipt must name the synchronized catalog release."""
|
||||
version = (root / "catalog/VERSION").read_text().strip()
|
||||
component = json.loads((root / "apps/versions.json").read_text())["node_apps"]["arcade"]
|
||||
if (not re.fullmatch(r"\d+\.\d+\.\d+", version)
|
||||
or component["id"] != "inbe.arcade" or component["version"] != version):
|
||||
raise ValueError("Catalog version differs from its signed release ledger; run update_version.sh --catalog")
|
||||
return version
|
||||
|
||||
|
||||
def library_art(root, name, key, source):
|
||||
"""Arcade's committed library thumbnail (scripts/library-art.py), as
|
||||
(bytes, suffix): a PNG, or a JPEG for opaque cover art. Never pack a copy
|
||||
@@ -80,7 +91,8 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
bundle_bytes, preview_bytes = bundle.read_bytes(), preview.read_bytes()
|
||||
if not bundle_bytes or not preview_bytes:
|
||||
raise ValueError("Game bundles and previews must be built first")
|
||||
preview_bytes, preview_suffix = library_art(root, name, "preview", preview_bytes)
|
||||
preview_bytes, preview_suffix = library_art(root, name, "preview",
|
||||
(app["art_source"] / game["preview"]).read_bytes())
|
||||
total += len(bundle_bytes) + len(preview_bytes)
|
||||
child = dict(
|
||||
id=identifier, title=game["title"],
|
||||
@@ -112,7 +124,7 @@ def stage(root, controller, expected_controller_digest, output):
|
||||
relative = Path(cover[key])
|
||||
if relative.is_absolute() or ".." in relative.parts or relative.suffix not in {".png", ".jpg"}:
|
||||
raise ValueError("Invalid cover asset path")
|
||||
contents, suffix = library_art(root, name, key, (app["source"] / relative).read_bytes())
|
||||
contents, suffix = library_art(root, name, key, (app["art_source"] / relative).read_bytes())
|
||||
destination = Path("arcade/covers") / f"{name}-{key}{suffix}"
|
||||
packed_cover[key] = "assets/" + destination.as_posix()
|
||||
copies.append((contents, destination))
|
||||
@@ -209,6 +221,7 @@ def main():
|
||||
parser.add_argument("--apps-bundle", type=Path, required=True)
|
||||
parser.add_argument("--apps-sha256", required=True)
|
||||
args = parser.parse_args()
|
||||
version = catalog_version(ROOT)
|
||||
output = ROOT / "build/collection"
|
||||
catalog, packages = stage(ROOT, args.apps_bundle, args.apps_sha256, output)
|
||||
command = [args.ziran, "bundle", "--project", *(["--locked"] if args.locked else [])]
|
||||
@@ -265,10 +278,10 @@ def main():
|
||||
shutil.copyfile(node_apps / "arcade.zx", ROOT / "build/arcade.zx")
|
||||
# The desktop host supplies its controller from beside the collection.
|
||||
shutil.copyfile(args.apps_bundle, ROOT / "build/apps.zx")
|
||||
receipt = dict(id=catalog["id"], version=(ROOT / "VERSION").read_text().strip(),
|
||||
receipt = dict(id=catalog["id"], version=version,
|
||||
sha256=digest(ROOT / "build/arcade.zx"),
|
||||
apps_sha256=args.apps_sha256, children=catalog["children"], art=art,
|
||||
source_mode="project")
|
||||
source_mode="project", node=node_source(ROOT))
|
||||
(output / "receipt.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
(ROOT / "build/arcade.json").write_text(json.dumps(receipt, indent=2) + "\n")
|
||||
node_receipt = receipt | {"sha256": digest(node_apps / "arcade.zx")}
|
||||
|
||||
@@ -14,6 +14,9 @@ flags = ['--locked'] if args.locked or not (ROOT / 'ziran.local.toml').exists()
|
||||
def package(name):
|
||||
return Path(subprocess.check_output([ZIRAN, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
|
||||
entity, kryon, toolchain, qrcode = map(package, ('entity', 'kryon', 'ziran', 'qrcode'))
|
||||
staged = ROOT / 'build/entity-profile-source'
|
||||
subprocess.run(['python3', str(entity / 'scripts/stage-assets.py'), '--group', 'profile',
|
||||
'--output', str(staged)], cwd=ROOT, check=True)
|
||||
subprocess.run([ZIRAN, 'bundle', '--root', str(entity),
|
||||
'--module-path', str(entity / 'src'),
|
||||
'--module-path', str(kryon / 'src/ui'),
|
||||
@@ -21,7 +24,7 @@ subprocess.run([ZIRAN, 'bundle', '--root', str(entity),
|
||||
'--module-path', 'kryon=' + str(kryon / 'src/backend'),
|
||||
'--module-path', 'qrcode=' + str(qrcode / 'src'),
|
||||
'--module-path', str(toolchain / 'std'),
|
||||
'--define', 'KRYON_HOSTED_UI', '--asset-dir', 'assets=' + str(entity / 'assets'),
|
||||
'--define', 'KRYON_HOSTED_UI', '--asset-dir', 'assets=' + str(staged / 'assets'),
|
||||
'--entry', 'entity:Main', '-o', str(ROOT / 'build/entity.zx'), str(entity / 'src/entity.zi')],
|
||||
cwd=entity, check=True)
|
||||
|
||||
|
||||
@@ -43,11 +43,9 @@ def build(ziran, lock_flags):
|
||||
compiler = toolchain / "build/bin/ziran"
|
||||
if not compiler.is_file():
|
||||
compiler = ROOT / "build/toolchain/bin/ziran"
|
||||
def dependency(name, project):
|
||||
return Path(subprocess.check_output(
|
||||
[str(compiler), "pkg", "path", name, *lock_flags], cwd=project, text=True).strip())
|
||||
daochi_client = dependency("daochi_client", entity)
|
||||
crypto = dependency("crypto", daochi_client)
|
||||
# Resolve transitive packages from Arcade's lock, never their private graphs.
|
||||
daochi_client = package("daochi_client")
|
||||
crypto = package("crypto")
|
||||
entries = []
|
||||
apps = dependency_order(declared_apps(ROOT, ziran, lock_flags))
|
||||
by_id = {app['descriptor']['id']: app for app in apps}
|
||||
|
||||
@@ -39,8 +39,8 @@ COVER_QUALITY = 80
|
||||
|
||||
|
||||
def bundle_assets(data):
|
||||
"""The files embedded in a ZX v26 bundle by path; never runs it."""
|
||||
if data[:8] != b'ZX\0\0\x1a\0\0\0' or len(data) > ART_LIMIT:
|
||||
"""The files embedded in a ZX v26/v27 bundle by path; never runs it."""
|
||||
if data[:8] not in (b'ZX\0\0\x1a\0\0\0', b'ZX\0\0\x1b\0\0\0') or len(data) > ART_LIMIT:
|
||||
raise ValueError('unsupported bundle')
|
||||
at = 8
|
||||
|
||||
@@ -218,10 +218,11 @@ def main():
|
||||
args.controller_sha256 = receipt['apps_sha256']
|
||||
args.version = receipt['version']
|
||||
else:
|
||||
from node_config import node_source
|
||||
bundle = args.bundle.resolve()
|
||||
receipt = dict(id='inbe.arcade', version=args.version,
|
||||
sha256=hashlib.sha256(bundle.read_bytes()).hexdigest(),
|
||||
apps_sha256=args.controller_sha256)
|
||||
apps_sha256=args.controller_sha256, node=node_source(ROOT))
|
||||
# The host reads the receipt into a 4 KiB buffer.
|
||||
text = json.dumps(receipt, separators=(',', ':')) if args.shovey else json.dumps(receipt, indent=2) + '\n'
|
||||
if len(text.encode()) >= 4096:
|
||||
|
||||
@@ -7,7 +7,7 @@ game and its transitive dependencies. New game imports must reach the lock;
|
||||
unrelated packages and the compiler stay pinned. The updates are recorded in
|
||||
build/game-updates.json.
|
||||
|
||||
`changelog` adds an Arcade release entry naming each updated game with the
|
||||
`changelog` adds an Arcade catalog release entry naming each updated game with the
|
||||
notes of its newest release, for update_version.sh to synchronize.
|
||||
|
||||
`art` remakes the library's small copies of game art (scripts/library-art.py)
|
||||
@@ -127,12 +127,12 @@ def changelog(ziran):
|
||||
version, notes = newest_notes(manifest.with_name('CHANGELOG.md'))
|
||||
title = declaration['title']
|
||||
lines += [f'- {title} {version}: {note}' for note in notes] or [f'- {title} {version}.']
|
||||
path = ROOT / 'CHANGELOG.md'
|
||||
path = ROOT / 'catalog/CHANGELOG.md'
|
||||
text = path.read_text()
|
||||
current = re.search(r'^## (\d+)\.(\d+)\.(\d+)\s*$', text, re.M)
|
||||
if current is None:
|
||||
raise SystemExit('CHANGELOG.md needs a numeric release entry')
|
||||
# Arcade's own changes wait under Unreleased; this release ships them.
|
||||
raise SystemExit('catalog/CHANGELOG.md needs a numeric release entry')
|
||||
# Pending catalog changes ship with the next catalog release.
|
||||
pending = re.search(r'^## \[Unreleased\]\s*$', text[:current.start()], re.M)
|
||||
if pending is not None:
|
||||
lines = [line for line in text[pending.end():current.start()].splitlines() if line.startswith('- ')] + lines
|
||||
@@ -141,7 +141,7 @@ def changelog(ziran):
|
||||
version = f'{current[1]}.{current[2]}.{int(current[3]) + 1}'
|
||||
entry = f'## {version}\n\n' + '\n'.join(lines) + '\n\n'
|
||||
path.write_text(text[:current.start()] + entry + text[current.start():])
|
||||
print(f'Arcade {version}')
|
||||
print(f'Arcade catalog {version}')
|
||||
|
||||
|
||||
def art():
|
||||
|
||||
@@ -30,12 +30,19 @@ def relative_path(text):
|
||||
|
||||
def declared_packages(root, ziran=None, lock_flags=()):
|
||||
"""Arcade first, then each registered game package, with their apps."""
|
||||
names = ['self', *json.loads((Path(root) / 'games.json').read_text())['packages']]
|
||||
registration = json.loads((Path(root) / 'games.json').read_text())
|
||||
names = ['self', *registration['packages']]
|
||||
if len(set(names)) != len(names):
|
||||
raise ValueError('Duplicate game package')
|
||||
artwork = registration.get('artwork', {})
|
||||
if not isinstance(artwork, dict) or any(name not in names[1:] or
|
||||
not isinstance(alias, str) or not re.fullmatch(r'[A-Za-z_][A-Za-z0-9_]*', alias)
|
||||
for name, alias in artwork.items()):
|
||||
raise ValueError('Invalid artwork package')
|
||||
packages = []
|
||||
for name in names:
|
||||
source = package_root(root, name, ziran, lock_flags)
|
||||
art_source = package_root(root, artwork[name], ziran, lock_flags) if name in artwork else source
|
||||
declaration = json.loads((source / 'apps.json').read_text())
|
||||
apps = []
|
||||
for app in declaration['apps']:
|
||||
@@ -61,7 +68,7 @@ def declared_packages(root, ziran=None, lock_flags=()):
|
||||
not re.fullmatch(r'[A-Za-z_][A-Za-z0-9_]*:[A-Za-z_][A-Za-z0-9_]*', item)
|
||||
for item in library_entries) or len(set(library_entries)) != len(library_entries):
|
||||
raise ValueError(f'{name}: invalid portable library entries')
|
||||
apps.append(dict(package=name, source=source, manifest=manifest,
|
||||
apps.append(dict(package=name, source=source, art_source=art_source, manifest=manifest,
|
||||
descriptor=json.loads(manifest.read_text()),
|
||||
cover=app.get('cover'), requires=requires, shared_code=shared_code,
|
||||
shared_records=shared_records,
|
||||
|
||||
@@ -42,6 +42,11 @@ def small_copy(data, key):
|
||||
"""(bytes, suffix) of the library's copy of one picture."""
|
||||
image = Image.open(io.BytesIO(data))
|
||||
image.load()
|
||||
# The shared library cards are 2:3. Keep the top of taller paintings,
|
||||
# where their title lives, rather than letting the card centre-crop it.
|
||||
# Originals remain untouched; this framing belongs to the thumbnail.
|
||||
if key == 'portrait' and image.height > image.width * 1.5:
|
||||
image = image.crop((0, 0, image.width, round(image.width * 1.5)))
|
||||
longest = PREVIEW_LONGEST if key == 'preview' else LOGO_LONGEST if key == 'logo' else COVER_LONGEST
|
||||
scale = min(1.0, longest / max(image.size))
|
||||
alpha = 'A' in image.getbands() or 'transparency' in image.info
|
||||
@@ -72,10 +77,10 @@ def art(root=ROOT):
|
||||
if not app['enabled']:
|
||||
continue
|
||||
name = app['descriptor']['name']
|
||||
yield name, 'preview', (app['source'] / app['descriptor']['preview']).read_bytes()
|
||||
yield name, 'preview', (app['art_source'] / app['descriptor']['preview']).read_bytes()
|
||||
for key in ('portrait', 'landscape', 'logo'):
|
||||
if app['cover'] and key in app['cover']:
|
||||
yield name, key, (app['source'] / app['cover'][key]).read_bytes()
|
||||
yield name, key, (app['art_source'] / app['cover'][key]).read_bytes()
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
"""The native host's reviewed public node publisher binding."""
|
||||
import json
|
||||
import re
|
||||
|
||||
|
||||
def node_source(root):
|
||||
source = json.loads((root / 'packaging/node.json').read_text())
|
||||
if (set(source) != {'origin', 'app_id', 'key_id', 'public_key'}
|
||||
or source['origin'] != 'https://api.waozi.xyz'
|
||||
or source['app_id'] != 'inbe.arcade'
|
||||
or not re.fullmatch(r'[a-z0-9][a-z0-9.-]{0,62}', source['key_id'])
|
||||
or not re.fullmatch(r'[a-f0-9]{64}', source['public_key'])):
|
||||
raise ValueError('Invalid reviewed node publisher binding')
|
||||
sequence = json.loads((root / 'apps/versions.json').read_text())['node_apps']['arcade']['sequence']
|
||||
if type(sequence) is not int or not 1 <= sequence <= 2147483647:
|
||||
raise ValueError('Invalid catalog release floor')
|
||||
return source | {'minimum_sequence': sequence}
|
||||
@@ -72,7 +72,7 @@ class Reader:
|
||||
|
||||
def catalog_from_bundle(path):
|
||||
with Reader(path) as reader:
|
||||
if reader.take(8) != b"ZX\0\0\x1a\0\0\0":
|
||||
if reader.take(8) not in (b"ZX\0\0\x1a\0\0\0", b"ZX\0\0\x1b\0\0\0"):
|
||||
raise ValueError("unsupported bundle")
|
||||
reader.text()
|
||||
reader.text()
|
||||
|
||||
|
After Width: | Height: | Size: 20 KiB |
@@ -43,6 +43,8 @@ ArcadeStart :: () -> bool {
|
||||
// Standalone Shovey opens on its covers, as Arcade opens on its library.
|
||||
opened = CollectionOpenShoveyBytes(bundle, metadata, data)
|
||||
} else {
|
||||
// The reviewed shared Apps controller is a host asset, like Entity.
|
||||
collection_controller = ReadAppAsset("apps.zx")
|
||||
opened = CollectionOpenBytes(bundle, metadata, data)
|
||||
}
|
||||
if !opened {
|
||||
|
||||
@@ -28,6 +28,10 @@ collection_package_files: *AppFiles;
|
||||
// Packages the platform already holds, read-only and verified like a
|
||||
// download: the website's own copy of the library art. "" for none.
|
||||
collection_package_folder: string;
|
||||
// Set by the host's origin-specific connection choice. Cached bytes do not
|
||||
// need a connection; no new transfer is permitted while it is off.
|
||||
collection_package_allowed: bool;
|
||||
collection_package_origin: string;
|
||||
package_c :: #system_library "c";
|
||||
PackageFree :: (memory: *void) #foreign package_c "free";
|
||||
CollectionDownloadsOpen :: (files: *AppFiles) { collection_package_files = files }
|
||||
@@ -120,11 +124,12 @@ CollectionFetch :: (context: *void, account: string, parent: *AppNode,
|
||||
if operation != APPS_INSTALL { return false }
|
||||
// Cached installs and removals use the host's ordinary saved state.
|
||||
if package.bytes != "" { return false }
|
||||
if !collection_package_allowed { reply.status = APPS_REJECTED; return true }
|
||||
if package.transfer.status != .Downloading {
|
||||
FileDownloadRelease(*package.transfer)
|
||||
package.failed = false
|
||||
base := EnvironmentText("ARCADE_PACKAGE_ORIGIN")
|
||||
if base == "" { base = "https://api.waozi.xyz" }
|
||||
base := collection_package_origin
|
||||
if base == "" { return false }
|
||||
url: Vec(u8)
|
||||
BuilderPrint(*url, "%/api/v2/packages/inbe.arcade/%.zx", base, TextUntilNul(package.digest[:]))
|
||||
address := BuilderFinish(url)
|
||||
@@ -136,6 +141,28 @@ CollectionFetch :: (context: *void, account: string, parent: *AppNode,
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionDownloadsBusy :: () -> bool {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if package.transfer.status == .Downloading { return true }
|
||||
package = package.next
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionDownloadsAllow :: (allowed: bool) {
|
||||
collection_package_allowed = allowed
|
||||
if allowed { return }
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
if package.transfer.status == .Downloading {
|
||||
FileDownloadRelease(*package.transfer)
|
||||
package.failed = true
|
||||
}
|
||||
package = package.next
|
||||
}
|
||||
}
|
||||
|
||||
CollectionDownloadsPump :: () {
|
||||
package := collection_packages
|
||||
while package != null {
|
||||
|
||||
@@ -53,6 +53,9 @@ Codec :: #import "apps/node_codec";
|
||||
#import "kryon/image_raster"
|
||||
#import "kryon/loading_indicator"
|
||||
#import, file "collection_loading.zi";
|
||||
#import "apps/connection"
|
||||
#import "apps/remote_catalog"
|
||||
Labels :: #import "apps/words";
|
||||
#import "shovey/shovey_theme"
|
||||
ProfileIcon :: #import "mingcute/mingcute_regular_user_4";
|
||||
DewIcon :: #import "mingcute/mingcute_filled_drop";
|
||||
@@ -488,8 +491,8 @@ CollectionController :: (context: *void) -> HostedAsset {
|
||||
return controller
|
||||
}
|
||||
|
||||
// packed: the collection carries every game and its art, as the Android APK
|
||||
// does, so nothing is downloaded.
|
||||
// Packed standalone collections carry their games and art. Thin Arcade
|
||||
// uses the ordinary generic Apps download, install and cached bundle path.
|
||||
CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
data: string, locale: string, packed: bool) -> bool {
|
||||
if collection_ready { return false }
|
||||
@@ -499,6 +502,12 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
opened := AppFilesOpen(*collection_resources, collection_resource_root)
|
||||
if !opened { Report("Arcade: cannot open the private resources folder"); return false }
|
||||
CollectionDownloadsOpen(*collection_resources)
|
||||
return CollectionStart(bundle, digest, harness_digest, locale, packed)
|
||||
}
|
||||
|
||||
// Replacing a verified catalog reuses the host services and per-game saves.
|
||||
CollectionStart :: (bundle: string, digest: string, harness_digest: string,
|
||||
locale: string, packed: bool) -> bool {
|
||||
platform := AppPlatform.{.allows = CollectionAllows, .call = CollectionCall,
|
||||
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
|
||||
.effect = CollectionEffect, .host_api = GAME_HOST_API,
|
||||
@@ -511,6 +520,13 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
|
||||
}
|
||||
collection_ready = AppHostStart(*collection_host, bundle, "arcade.local", "inbe.arcade",
|
||||
"arcade", digest, "local", platform, harness_digest, locale)
|
||||
// The offline collection already contains every game's payload. Keep the
|
||||
// ordinary bounded game budget available in addition to that resident
|
||||
// collection; otherwise its packed bytes consume the game's allowance
|
||||
// before the first game opens. AppHostStart bounds the root to 64 MiB.
|
||||
if collection_ready && packed {
|
||||
collection_host.tree.byte_limit = APP_HOST_BYTE_LIMIT + bundle.count
|
||||
}
|
||||
if !collection_ready { Report("Arcade: the shared Apps host refused the collection") }
|
||||
return collection_ready
|
||||
}
|
||||
@@ -548,7 +564,23 @@ CollectionOpenBytes :: (bytes: string, metadata: string, data: string) -> bool {
|
||||
locale := EnvironmentText("LANG")
|
||||
language := ifx locale.count >= 2 then locale[:2] else "en"
|
||||
packed := AppsReadText(metadata, 0, "games", games[:]) && TextUntilNul(games[:]) == "packed"
|
||||
return CollectionOpen(bytes, TextUntilNul(digest[:]), TextUntilNul(harness[:]), data, language, packed)
|
||||
selected := bytes
|
||||
selected_digest := TextUntilNul(digest[:])
|
||||
if !packed {
|
||||
if !CollectionNodeOpen(metadata, data, bytes, selected_digest, TextUntilNul(harness[:]), language) { return false }
|
||||
if collection_node.ready {
|
||||
selected = collection_node.bytes
|
||||
selected_digest = TextUntilNul(collection_node.release.artifacts[0].sha256[:])
|
||||
}
|
||||
}
|
||||
opened := CollectionOpen(selected, selected_digest, TextUntilNul(harness[:]), data, language, packed)
|
||||
if !opened && !packed && collection_node_remote {
|
||||
collection_node_remote = false
|
||||
collection_node.failed = true
|
||||
opened = CollectionStart(collection_seed, TextUntilNul(collection_seed_digest[:]),
|
||||
TextUntilNul(collection_harness_digest[:]), language, false)
|
||||
}
|
||||
return opened
|
||||
}
|
||||
|
||||
// The standalone player needs only Shovey's own payload and metadata. Its
|
||||
@@ -606,6 +638,7 @@ CollectionCollect :: () {
|
||||
if entity_ready { EntityPump() }
|
||||
PublicationsReadPump()
|
||||
AppHostCollect(*collection_host)
|
||||
CollectionNodePump()
|
||||
for path: collection_frame_paths { AppFileFree(path) }
|
||||
while collection_frame_paths.count > 0 { unused VecPop(collection_frame_paths) }
|
||||
collection_widget_node = null
|
||||
@@ -615,6 +648,7 @@ CollectionClose :: () -> bool {
|
||||
if !EntityClose() { return false }
|
||||
if collection_ready && !AppHostStop(*collection_host) { return false }
|
||||
collection_ready = false
|
||||
CollectionNodeClose()
|
||||
collection_loading = .{}
|
||||
CollectionDownloadsClose()
|
||||
CollectionCollect()
|
||||
@@ -754,6 +788,7 @@ CollectionUpdatesQuestion :: (session: Session, viewport: Rectangle) {
|
||||
CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32) -> bool {
|
||||
collection_toolbar_visible = true
|
||||
defer { CollectionToolbar(session, viewport) }
|
||||
if CollectionNodeScreen(session, viewport) { collection_toolbar_visible = false; return true }
|
||||
if entity_visible { return EntityFrame(session, viewport, key, modifiers) }
|
||||
runtime := AppHostActiveRuntime(*collection_host)
|
||||
if runtime == null { Report("Arcade: no app is running\n"); return false }
|
||||
@@ -771,6 +806,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
asking := runtime.node.collection && !collection_host.platform.presentation.cover_grid && CollectionUpdates() == 2
|
||||
if asking { key = 0 }
|
||||
top: s32 = ifx !covered && !runtime.node.collection && (entity_ready || nested) then 56 else 0
|
||||
if runtime.node.collection && collection_node.files != null { top = 88 }
|
||||
now := cast(float64)MonotonicMilliseconds() / 1000.0
|
||||
runtime.app.session = session
|
||||
runtime.app.bounds = Rectangle.{viewport.x, viewport.y + cast(float32)top, viewport.width, viewport.height - cast(float32)top}
|
||||
@@ -829,6 +865,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
|
||||
}
|
||||
} else if runtime.node.collection {
|
||||
collection_loading = .{}
|
||||
CollectionNodeToolbar(session, viewport)
|
||||
}
|
||||
if asking {
|
||||
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
|
||||
@@ -879,3 +916,185 @@ CollectionToolbar :: (session: Session, viewport: Rectangle) {
|
||||
|
||||
c :: #system_library "c";
|
||||
CollectionFree :: (memory: *void) #foreign c "free";
|
||||
|
||||
// The native host composes the shared Apps connection and signed catalog.
|
||||
// Replacing a root uses the same services and saved-game namespaces.
|
||||
collection_node: AppRemoteCatalog;
|
||||
collection_node_files: AppFiles;
|
||||
collection_node_root: string;
|
||||
collection_node_choice: s32;
|
||||
collection_node_notice: bool;
|
||||
collection_node_initial: bool;
|
||||
collection_node_apply: bool;
|
||||
collection_node_remote: bool;
|
||||
collection_seed: string;
|
||||
collection_seed_digest: [65]u8;
|
||||
collection_harness_digest: [65]u8;
|
||||
collection_node_locale: [16]u8;
|
||||
|
||||
collection_signature :: #system_library "c";
|
||||
CollectionCheckSignature :: (signature: *u8, public_key: *u8, message: *u8,
|
||||
length: usize) -> s32 #foreign collection_signature "crypto_ed25519_check";
|
||||
CollectionVerifyRelease :: (signature: *u8, public_key: *u8, message: *u8,
|
||||
length: usize) -> bool { return CollectionCheckSignature(signature, public_key, message, length) == 0 }
|
||||
|
||||
CollectionNodeOpen :: (metadata: string, data: string, seed: string,
|
||||
digest: string, harness: string, locale: string) -> bool {
|
||||
source: AppRemoteSource
|
||||
source.oldest_host_api = 1
|
||||
source.host_api = GAME_HOST_API
|
||||
source.module_api = 2
|
||||
at := FieldAt(metadata, 0, "node")
|
||||
if at < 0 || !AppRemoteSourceRead(metadata, at, *source) || TextUntilNul(source.app_id[:]) != "inbe.arcade" { return false }
|
||||
// Private loopback fixtures can exercise the real transport. A production
|
||||
// environment variable cannot silently redirect a publisher's requests.
|
||||
test_origin := EnvironmentText("ARCADE_PACKAGE_ORIGIN")
|
||||
if test_origin.count > 17 && test_origin[:17] == "http://127.0.0.1:" && AppRemoteOriginValid(test_origin) {
|
||||
unused CopyCString(test_origin, source.origin[:])
|
||||
}
|
||||
collection_node_root = Join(data, "node")
|
||||
if !AppFilesOpen(*collection_node_files, collection_node_root) { return false }
|
||||
if !AppRemoteCatalogOpen(*collection_node, source, *collection_node_files, CollectionVerifyRelease) { return false }
|
||||
collection_seed = AppRemoteCopy(seed)
|
||||
unused CopyCString(digest, collection_seed_digest[:])
|
||||
unused CopyCString(harness, collection_harness_digest[:])
|
||||
unused CopyCString(locale, collection_node_locale[:])
|
||||
collection_package_origin = AppRemoteCopy(TextUntilNul(collection_node.source.origin[:]))
|
||||
collection_node_choice = AppConnectionRead(*collection_node_files, collection_package_origin)
|
||||
collection_node_notice = collection_node_choice == APP_CONNECTION_UNDECIDED
|
||||
allowed := collection_node_choice == APP_CONNECTION_ALLOWED
|
||||
CollectionDownloadsAllow(allowed)
|
||||
AppRemoteCatalogAllow(*collection_node, allowed)
|
||||
collection_node_remote = collection_node.ready
|
||||
if allowed { unused AppRemoteCatalogRefresh(*collection_node) }
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionNodeChoose :: (choice: s32) -> bool {
|
||||
if !AppConnectionRemember(*collection_node_files, collection_package_origin, choice) { return false }
|
||||
collection_node_choice = choice
|
||||
collection_node_notice = false
|
||||
allowed := choice == APP_CONNECTION_ALLOWED
|
||||
CollectionDownloadsAllow(allowed)
|
||||
AppRemoteCatalogAllow(*collection_node, allowed)
|
||||
if allowed {
|
||||
collection_node_initial = !collection_node_remote
|
||||
collection_node_apply = true
|
||||
unused AppRemoteCatalogRefresh(*collection_node)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
CollectionNodeActivate :: () -> bool {
|
||||
if !collection_node.changed || CollectionDownloadsBusy() { return false }
|
||||
runtime := AppHostActiveRuntime(*collection_host)
|
||||
if runtime == null || !runtime.node.collection { return false }
|
||||
if !AppHostStop(*collection_host) { return false }
|
||||
collection_ready = false
|
||||
{
|
||||
bytes := collection_node.bytes
|
||||
digest := TextUntilNul(collection_node.release.artifacts[0].sha256[:])
|
||||
collection_ready = CollectionStart(bytes, digest, TextUntilNul(collection_harness_digest[:]),
|
||||
TextUntilNul(collection_node_locale[:]), false)
|
||||
}
|
||||
if collection_ready {
|
||||
collection_node_remote = true
|
||||
AppRemoteCatalogCollect(*collection_node)
|
||||
} else {
|
||||
// Keep the former library and every game's separate save namespace.
|
||||
if collection_node.previous_bytes != "" {
|
||||
unused AppRemoteCatalogRestore(*collection_node)
|
||||
} else {
|
||||
unused AppFileWrite(*collection_node_files, "current.json", "")
|
||||
collection_node_remote = false
|
||||
collection_node.changed = false
|
||||
collection_node.failed = true
|
||||
}
|
||||
old_bytes := ifx collection_node_remote then collection_node.bytes else collection_seed
|
||||
old_digest := ifx collection_node_remote then TextUntilNul(collection_node.release.artifacts[0].sha256[:]) else TextUntilNul(collection_seed_digest[:])
|
||||
collection_ready = CollectionStart(old_bytes, old_digest, TextUntilNul(collection_harness_digest[:]),
|
||||
TextUntilNul(collection_node_locale[:]), false)
|
||||
}
|
||||
collection_loading = .{}
|
||||
return collection_ready
|
||||
}
|
||||
|
||||
CollectionNodePump :: () {
|
||||
if collection_node.files == null { return }
|
||||
AppRemoteCatalogPump(*collection_node)
|
||||
if collection_node_apply && collection_node.stage == 0 {
|
||||
if collection_node.changed && !CollectionNodeActivate() { return }
|
||||
collection_node_apply = false
|
||||
collection_node_initial = false
|
||||
}
|
||||
}
|
||||
|
||||
// Returns true when the notice/loading screen owns this frame's input.
|
||||
CollectionNodeScreen :: (session: Session, viewport: Rectangle) -> bool {
|
||||
if collection_node.files == null { return false }
|
||||
if collection_node_notice {
|
||||
choice := AppConnectionNotice(session, viewport, TextUntilNul(collection_node_locale[:]),
|
||||
collection_package_origin, cast(u64)49500)
|
||||
if choice != APP_CONNECTION_UNDECIDED { unused CollectionNodeChoose(choice) }
|
||||
return true
|
||||
}
|
||||
if collection_node_initial && collection_node.stage != 0 {
|
||||
Box(session, BoxProps.{.key = cast(u64)49510, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
|
||||
Text(session, TextProps.{.key = cast(u64)49511, .text = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "loading_library"),
|
||||
.font = 20, .bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0, viewport.width - 48.0, 64.0}})
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49512, .id = 49512,
|
||||
.label = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "stay_offline"),
|
||||
.bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0 + 72.0, viewport.width - 48.0, 44.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
unused CollectionNodeChoose(APP_CONNECTION_OFFLINE)
|
||||
}
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
CollectionNodeToolbar :: (session: Session, viewport: Rectangle) {
|
||||
if collection_node.files == null { return }
|
||||
unused WidgetPaletteUse(session, AppCoversPalette())
|
||||
defer { unused WidgetPaletteRestore(session) }
|
||||
Box(session, BoxProps.{.key = cast(u64)49519,
|
||||
.bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 88.0},
|
||||
.fill = Color.{17, 18, 35, 255}})
|
||||
locale := TextUntilNul(collection_node_locale[:])
|
||||
allowed := collection_node_choice == APP_CONNECTION_ALLOWED
|
||||
status := ifx !allowed then "offline_library" else ifx collection_node.stage != 0 then "loading_library" else ifx collection_node.failed then "library_unavailable" else "saved_library"
|
||||
width := ifx viewport.width - 180.0 < 320.0 then viewport.width - 180.0 else 320.0
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49520, .id = 49520,
|
||||
.label = Labels.AppsLabel(locale, ifx allowed then "refresh_library" else "connect_node"),
|
||||
.bounds = Rectangle.{viewport.x + 8.0, viewport.y + 6.0, width, 44.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
if !allowed { collection_node_notice = true }
|
||||
else if collection_node.changed { collection_node_apply = true }
|
||||
else { collection_node_apply = true; unused AppRemoteCatalogRefresh(*collection_node) }
|
||||
}
|
||||
// A separate connection control keeps revocation available after consent.
|
||||
if Button(session, ButtonProps.{.key = cast(u64)49521, .id = 49521,
|
||||
.label = Labels.AppsLabel(locale, "node_connection"),
|
||||
.bounds = Rectangle.{viewport.x + viewport.width - 170.0, viewport.y + 52.0, 158.0, 28.0},
|
||||
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
|
||||
collection_node_notice = true
|
||||
}
|
||||
Text(session, TextProps.{.key = cast(u64)49522, .text = Labels.AppsLabel(locale, status), .font = 12, .wrap = TextWrap.TextWrapAuto,
|
||||
.bounds = Rectangle.{viewport.x + 16.0, viewport.y + 58.0, viewport.width - 196.0, 26.0}})
|
||||
}
|
||||
|
||||
CollectionNodeClose :: () {
|
||||
CollectionDownloadsAllow(false)
|
||||
AppFileFree(collection_package_origin)
|
||||
collection_package_origin = ""
|
||||
AppRemoteCatalogClose(*collection_node)
|
||||
AppFilesClose(*collection_node_files)
|
||||
AppFileFree(collection_node_root)
|
||||
AppFileFree(collection_seed)
|
||||
collection_node_root = ""
|
||||
collection_seed = ""
|
||||
collection_node_notice = false
|
||||
collection_node_initial = false
|
||||
collection_node_apply = false
|
||||
collection_node_remote = false
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
"""Assert the actual staged/packaged Android assets contain no games or art."""
|
||||
import json
|
||||
import importlib.util
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import struct
|
||||
import hashlib
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
import tempfile
|
||||
import zipfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / 'scripts'))
|
||||
from android_catalog import verify_assets
|
||||
import android_catalog
|
||||
|
||||
|
||||
class ProfileAssetResolutionTests(unittest.TestCase):
|
||||
def test_dependency_resolution_matches_build_mode(self):
|
||||
(ROOT / 'work').mkdir(exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(dir=ROOT / 'work') as temporary:
|
||||
root = Path(temporary)
|
||||
package = root / 'entity'
|
||||
package.mkdir()
|
||||
(package / 'asset-groups.json').write_text('{"profile": []}')
|
||||
try:
|
||||
for local in (False, True):
|
||||
if local:
|
||||
(root / 'ziran.local.toml').write_text('[overrides]\n')
|
||||
android_catalog.profile_asset_hashes.cache_clear()
|
||||
with self.subTest(local=local), patch.object(android_catalog, 'ROOT', root), \
|
||||
patch.object(android_catalog.subprocess, 'check_output', return_value=str(package)) as resolve:
|
||||
self.assertEqual(android_catalog.profile_asset_hashes(), {})
|
||||
resolve.assert_called_once_with(
|
||||
[str(root / 'scripts/ziran.sh'), 'pkg', 'path', 'entity',
|
||||
*([] if local else ['--locked'])], cwd=root, text=True)
|
||||
finally:
|
||||
android_catalog.profile_asset_hashes.cache_clear()
|
||||
|
||||
|
||||
class AndroidCatalogTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
spec = importlib.util.spec_from_file_location('android_builder', ROOT / 'scripts/build-android.py')
|
||||
builder = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(builder)
|
||||
builder.stage_arcade()
|
||||
|
||||
def setUp(self):
|
||||
self.assets = {name: (ROOT / 'build' / name).read_bytes()
|
||||
for name in ('arcade.zx', 'arcade.json', 'apps.zx', 'entity.zx')}
|
||||
self.assets['kryon-font.ttf'] = b'font' # Content boundary, not a font renderer.
|
||||
|
||||
def test_standard_catalog(self):
|
||||
verify_assets(self.assets)
|
||||
|
||||
def test_reject_changed_node_trust_binding(self):
|
||||
for key, value in (('origin', 'https://example.org'), ('public_key', 'a' * 64),
|
||||
('app_id', 'inbe.other'), ('minimum_sequence', 0)):
|
||||
metadata = json.loads(self.assets['arcade.json'])
|
||||
metadata['node'][key] = value
|
||||
with self.subTest(field=key), self.assertRaisesRegex(AssertionError, 'publisher binding'):
|
||||
verify_assets(self.assets | {'arcade.json': json.dumps(metadata).encode()})
|
||||
|
||||
def test_reject_game_or_thumbnail_beside_catalog(self):
|
||||
for name in ('games/shovey.zx', 'covers/shovey.png'):
|
||||
with self.subTest(name=name), self.assertRaises(AssertionError):
|
||||
verify_assets(self.assets | {name: b'payload'})
|
||||
|
||||
def test_reject_packed_collection(self):
|
||||
with self.assertRaises(AssertionError):
|
||||
verify_assets(self.assets | {'arcade.zx': b'packed' * 100000})
|
||||
|
||||
def test_reject_game_or_art_inside_bundle(self):
|
||||
def number(n):
|
||||
return struct.pack('<I', n)
|
||||
def text(data):
|
||||
return number(len(data)) + data
|
||||
# Structurally valid ZX with a catalog and an extra embedded asset.
|
||||
for path in (b'assets/arcade/games/test.zx', b'assets/arcade/covers/test.png'):
|
||||
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + number(0) * 4
|
||||
payload += number(2) + text(b'assets/apps/catalog.json') + text(b'{}')
|
||||
payload += text(path) + text(b'payload')
|
||||
metadata = json.loads(self.assets['arcade.json'])
|
||||
metadata['sha256'] = hashlib.sha256(payload).hexdigest()
|
||||
with self.subTest(path=path), self.assertRaisesRegex(AssertionError, 'Game payload or art'):
|
||||
verify_assets(self.assets | {'arcade.zx': payload, 'arcade.json': json.dumps(metadata).encode()})
|
||||
|
||||
def test_reject_game_art_nested_in_entity(self):
|
||||
from android_catalog import profile_assets
|
||||
def text(data):
|
||||
return struct.pack('<I', len(data)) + data
|
||||
names = sorted(profile_assets() | {'assets/entity/game-art.png'})
|
||||
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + struct.pack('<IIII', 0, 0, 0, 0)
|
||||
payload += struct.pack('<I', len(names))
|
||||
payload += b''.join(text(name.encode()) + text(b'image') for name in names)
|
||||
with self.assertRaisesRegex(AssertionError, 'Entity contains'):
|
||||
verify_assets(self.assets | {'entity.zx': payload})
|
||||
|
||||
def test_reject_modified_profile_art(self):
|
||||
from android_catalog import profile_assets
|
||||
def text(data):
|
||||
return struct.pack('<I', len(data)) + data
|
||||
names = sorted(profile_assets())
|
||||
payload = b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + struct.pack('<IIII', 0, 0, 0, 0)
|
||||
payload += struct.pack('<I', len(names))
|
||||
payload += b''.join(text(name.encode()) + text(b'changed image') for name in names)
|
||||
with self.assertRaisesRegex(AssertionError, 'profile artwork differs'):
|
||||
verify_assets(self.assets | {'entity.zx': payload})
|
||||
|
||||
def test_reject_packed_policy(self):
|
||||
metadata = json.loads(self.assets['arcade.json']) | {'games': 'packed'}
|
||||
with self.assertRaises(AssertionError):
|
||||
verify_assets(self.assets | {'arcade.json': json.dumps(metadata).encode()})
|
||||
|
||||
def test_reject_unreviewed_controller(self):
|
||||
with self.assertRaises(AssertionError):
|
||||
verify_assets(self.assets | {'apps.zx': b'altered'})
|
||||
|
||||
def test_staged_android_assets(self):
|
||||
folder = ROOT / 'build/android-assets'
|
||||
if not folder.exists():
|
||||
self.skipTest('Run make android to stage Android assets')
|
||||
verify_assets({str(p.relative_to(folder)): p.read_bytes() for p in folder.rglob('*') if p.is_file()} |
|
||||
{'entity.zx': (ROOT / 'build/entity.zx').read_bytes()})
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) >= 2 and sys.argv[1].endswith('.apk'):
|
||||
import argparse
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('apk')
|
||||
parser.add_argument('--edition', choices=('direct', 'fdroid', 'gplay'), default='direct')
|
||||
args = parser.parse_args()
|
||||
with zipfile.ZipFile(args.apk) as apk:
|
||||
verify_assets({name[7:]: apk.read(name) for name in apk.namelist()
|
||||
if name.startswith('assets/') and not name.endswith('/')}, edition=args.edition)
|
||||
print('APK contains only the thin catalog and host essentials')
|
||||
else:
|
||||
unittest.main()
|
||||
@@ -0,0 +1,44 @@
|
||||
"""Every native registered on ArcadeActivity must exist with its JNI signature.
|
||||
|
||||
Android rejects the entire library in JNI_OnLoad when even one method is
|
||||
missing. Check the resolved host, so a package update cannot silently ship
|
||||
an activity that crashes before onCreate.
|
||||
"""
|
||||
from pathlib import Path
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def verify():
|
||||
kryon = Path(subprocess.check_output(
|
||||
[str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'kryon'],
|
||||
cwd=ROOT, text=True).strip())
|
||||
host = (kryon / 'src/backend/android_device.zi').read_text()
|
||||
glue = (ROOT / 'src/android_glue.zi').read_text()
|
||||
java = (ROOT / 'droid/app/src/main/java/xyz/waozi/arcade/ArcadeActivity.java').read_text()
|
||||
types = {'void': 'V', 'int': 'I', 'long': 'J', 'boolean': 'Z',
|
||||
'float': 'F', 'byte[]': '[B', 'String': 'Ljava/lang/String;'}
|
||||
declared = {}
|
||||
for result, name, arguments in re.findall(
|
||||
r'native\s+(\w+)\s+(\w+)\(([^)]*)\)', java):
|
||||
parameters = [argument.strip().split()[0] for argument in arguments.split(',') if argument.strip()]
|
||||
declared[name] = '(' + ''.join(types[t] for t in parameters) + ')' + types[result]
|
||||
registered = 0
|
||||
for source in (host, glue):
|
||||
names = dict((index, name) for name, index in re.findall(
|
||||
r'CopyCString\("(native\w+)", names\[(\d+)\]', source))
|
||||
signatures = dict((index, signature) for signature, index in re.findall(
|
||||
r'CopyCString\("([^"]+)", signatures\[(\d+)\]', source))
|
||||
for index, name in names.items():
|
||||
expected = signatures[index]
|
||||
assert declared.get(name) == expected, (
|
||||
f'{name}{expected} registered by native host, Java declares {declared.get(name)}')
|
||||
registered += 1
|
||||
assert registered >= 12, 'No Android JNI registration contract found'
|
||||
print(f'Android JNI contract: {registered} registered methods match ArcadeActivity')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
verify()
|
||||
@@ -1,10 +1,6 @@
|
||||
"""Check that the APK's collection opens Arcade's whole library offline.
|
||||
|
||||
The collection make android packs (build/android-assets) is opened by the
|
||||
desktop host from a private folder, as the Android host opens it from the
|
||||
APK's assets: no controller beside it and no reachable download origin, so
|
||||
every game and the art must come from the collection itself."""
|
||||
"""Exercise APK assets through generic Apps install, open and offline cache."""
|
||||
import argparse
|
||||
import contextlib
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
@@ -15,7 +11,10 @@ import sys
|
||||
import tempfile
|
||||
import time
|
||||
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(root / 'scripts'))
|
||||
from android_catalog import verify_assets
|
||||
from collection_ui_test import package_server, answer_library_question, answer_level_updates
|
||||
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, required=True)
|
||||
@@ -23,59 +22,129 @@ parser.add_argument('--inbe-source', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
|
||||
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
assets = root / 'build/android-assets'
|
||||
receipt = json.loads((assets / 'arcade.json').read_text())
|
||||
assert receipt['id'] == 'inbe.arcade' and receipt['games'] == 'packed' and 'art' not in receipt
|
||||
assert receipt['sha256'] == hashlib.sha256((assets / 'arcade.zx').read_bytes()).hexdigest()
|
||||
metadata = verify_assets({p.name: p.read_bytes() for p in assets.iterdir() if p.is_file()} |
|
||||
{'entity.zx': (root / 'build/entity.zx').read_bytes()})
|
||||
entries = {entry['expected_id']: entry for entry in metadata['children']}
|
||||
sys.path.insert(0, str(args.inbe_source / 'tests'))
|
||||
from ui_driver import UiDriver
|
||||
output = root / 'build/android-offline-ui-test'
|
||||
output = root / 'work/android-offline-ui-test'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
driver = UiDriver(output / 'driver')
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix='arcade-offline-') as temporary:
|
||||
with tempfile.TemporaryDirectory(prefix='host-', dir=output) as temporary, package_server(root) as (origin, server):
|
||||
install = Path(temporary) / 'app'
|
||||
install.mkdir()
|
||||
shutil.copy2(args.binary, install / 'arcade')
|
||||
for name in ('arcade.zx', 'arcade.json'):
|
||||
for name in ('arcade.zx', 'arcade.json', 'apps.zx'):
|
||||
shutil.copyfile(assets / name, install / name)
|
||||
# The shared profile, which the APK also carries.
|
||||
shutil.copyfile(root / 'build/entity.zx', install / 'entity.zx')
|
||||
profile = Path(temporary) / 'profile'
|
||||
log_path = output / 'arcade.log'
|
||||
with log_path.open('w') as log:
|
||||
# Port 9 (discard) refuses connections: any download would fail.
|
||||
child = subprocess.Popen([str(install / 'arcade')], cwd=install,
|
||||
env=os.environ | driver.environment() |
|
||||
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
|
||||
'LANG': 'en_US.UTF-8', 'ARCADE_PACKAGE_ORIGIN': 'http://127.0.0.1:9'},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
for title in ('Shovey', 'Shovey Editor', 'Apfelwurm'):
|
||||
driver.wait(label=title, role='button', timeout=60)
|
||||
covers = [node for node in driver.find(role='image', visible=True)
|
||||
if node['width'] >= 100 and node['height'] >= 140]
|
||||
assert len(covers) >= 2, 'The packed library art must draw without a download'
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
driver.press(label='Shovey', role='button')
|
||||
deadline = time.monotonic() + 30
|
||||
while True:
|
||||
assert not driver.find(label='Download', role='button'), 'A packed game must not ask to download'
|
||||
assert not driver.find(label='Try again', role='button'), 'A packed game must not download'
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
driver.wait_gone(label=LEVEL_UPDATES, role='text')
|
||||
if [node for node in driver.tree() if str(node.get('label', '')).startswith('Level 1 / ')]:
|
||||
break
|
||||
assert time.monotonic() < deadline, 'Shovey did not start from the packed collection'
|
||||
time.sleep(0.05)
|
||||
assert not list((profile / 'resources').rglob('*.zx')), 'Nothing may be downloaded'
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
print('The Android collection opens every game and its art offline')
|
||||
retained = profile / 'games/inbe.chess/records/computer'
|
||||
retained.parent.mkdir(parents=True)
|
||||
retained.write_bytes(b'existing private save')
|
||||
record = profile / 'games/arcade.shovey/records/local.campaign'
|
||||
|
||||
@contextlib.contextmanager
|
||||
def application(name):
|
||||
log_path = output / (name + '.log')
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(install / 'arcade')], cwd=install,
|
||||
env=os.environ | driver.environment() |
|
||||
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
|
||||
'LANG': 'en_US.UTF-8', 'ARCADE_PACKAGE_ORIGIN': origin},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
yield child
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
|
||||
def download(label='Download'):
|
||||
driver.wait(label=label, role='button', timeout=60)
|
||||
action = max(driver.find(label=label, role='button', visible=True), key=lambda node: node['width'])
|
||||
driver.press(key=action['key'], role='button')
|
||||
|
||||
def play():
|
||||
answer_level_updates(driver)
|
||||
if driver.find(label='How do you want to move?', role='text'):
|
||||
driver.press(label='Swipe and tap')
|
||||
driver.wait(label='Restart', role='button', timeout=60)
|
||||
assert not driver.find(label='Download', role='button')
|
||||
|
||||
with application('install'):
|
||||
answer_library_question(driver)
|
||||
games = {entry['sha256'] for entry in metadata['children']}
|
||||
assert not games & set(server['requests']), 'No game before download consent'
|
||||
driver.press(label='Shovey Editor', role='button')
|
||||
driver.wait(label='Cancel', role='button')
|
||||
driver.press(label='Cancel', role='button')
|
||||
assert not games & set(server['requests']), 'Cancel must download nothing'
|
||||
driver.press(label='Shovey Editor', role='button')
|
||||
server['corrupt_shovey'] = True
|
||||
download()
|
||||
driver.wait(label='Try again', role='button', timeout=60)
|
||||
assert not driver.find(label='New level', role='text'), 'Corrupt dependency must not open'
|
||||
server['corrupt_shovey'] = False
|
||||
download('Try again')
|
||||
driver.wait(label='New level', role='text', timeout=60)
|
||||
assert server['requests'].count(entries['shovey']['sha256']) == 2
|
||||
assert server['requests'].count(entries['shovey-editor']['sha256']) == 1
|
||||
driver.key('escape')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.press(label='Shovey', role='button')
|
||||
play()
|
||||
driver.key('right')
|
||||
deadline = time.monotonic() + 20
|
||||
while not record.exists() and time.monotonic() < deadline:
|
||||
driver.wait_idle(frames=5)
|
||||
assert record.exists(), 'Game must persist progress'
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.press(label='Apfelwurm', role='button')
|
||||
download()
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
driver.key('escape')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.press(label='Profile', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
driver.press(label='Leaderboard', role='button')
|
||||
driver.wait(label='Apfelwurm', role='button')
|
||||
driver.press(label='Apfelwurm', role='button')
|
||||
# The profile stays usable with its optional game sheets omitted.
|
||||
driver.wait(label='Back', role='button')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Account', role='text')
|
||||
driver.press(label='Back', role='button')
|
||||
driver.key('escape')
|
||||
driver.wait(label='Node connection', role='button')
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Stay offline', role='button')
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
saved = record.read_bytes()
|
||||
for name in ('shovey', 'shovey-editor', 'wurm'):
|
||||
entry = entries[name]
|
||||
cached = profile / 'resources/downloads' / (entry['sha256'] + '.zx')
|
||||
assert hashlib.sha256(cached.read_bytes()).hexdigest() == entry['sha256']
|
||||
assert metadata['art']['sha256'] in server['requests'], 'Art must download separately'
|
||||
requested = list(server['requests'])
|
||||
server['offline'] = True
|
||||
with application('offline'):
|
||||
answer_library_question(driver)
|
||||
driver.press(label='Shovey', role='button')
|
||||
play()
|
||||
driver.press(label='Back', role='button')
|
||||
driver.wait(label='Shovey Editor', role='button')
|
||||
driver.press(label='Shovey Editor', role='button')
|
||||
driver.wait(label='New level', role='text', timeout=60)
|
||||
driver.key('escape')
|
||||
driver.wait(label='Apfelwurm', role='button')
|
||||
driver.press(label='Apfelwurm', role='button')
|
||||
driver.wait(label='Play', role='button', timeout=60)
|
||||
assert server['requests'] == requested, 'Installed apps/art must reopen offline without requests'
|
||||
assert record.read_bytes() == saved, 'Offline restart must preserve saved progress'
|
||||
assert retained.read_bytes() == b'existing private save'
|
||||
print('Android catalog: consent, dependency verification/retry, install/open, cached offline and retained saves passed')
|
||||
@@ -14,7 +14,9 @@ spec.loader.exec_module(builder)
|
||||
|
||||
class ControllerSourceTests(unittest.TestCase):
|
||||
def test_local_overrides_do_not_reach_locked_resolution(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
scratch = ROOT / 'work/apps-controller-test'
|
||||
scratch.mkdir(parents=True, exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(dir=scratch) as directory:
|
||||
root = Path(directory)
|
||||
manifest = ('[package]\nname = "Arcade"\n'
|
||||
'[toolchain]\ngit = "https://github.com/ziranlang/ziran.git"\nref = "master"\n'
|
||||
@@ -30,10 +32,13 @@ class ControllerSourceTests(unittest.TestCase):
|
||||
(root / 'ziran.local.toml').write_text('unreviewed local dependency')
|
||||
package = root / 'cached-apps'
|
||||
output = root / 'output'
|
||||
compiler = root / 'cached-ziran/build/bin/ziran'
|
||||
compiler.parent.mkdir(parents=True)
|
||||
compiler.write_text('fixture compiler path; subprocess calls are mocked')
|
||||
contexts = []
|
||||
|
||||
def resolve(command, *, cwd, text):
|
||||
self.assertEqual(command, ['ziran', 'pkg', 'path', 'apps', '--locked'])
|
||||
self.assertIn(command, [['ziran', 'pkg', 'path', name, '--locked'] for name in ('apps', 'ziran', 'kryon')])
|
||||
self.assertTrue(text)
|
||||
self.assertNotIn('dependencies.wurm', (cwd / 'ziran.toml').read_text())
|
||||
selected = json.loads((cwd / 'ziran.lock').read_text())
|
||||
@@ -42,14 +47,18 @@ class ControllerSourceTests(unittest.TestCase):
|
||||
self.assertEqual(selected['toolchain'], lock['toolchain'])
|
||||
self.assertEqual({p.name for p in cwd.iterdir()}, {'ziran.toml', 'ziran.lock'})
|
||||
contexts.append(cwd)
|
||||
return str(package) + '\n'
|
||||
return str(package if command[3] == 'apps' else root / ('cached-' + command[3])) + '\n'
|
||||
|
||||
with patch.object(builder.subprocess, 'check_output', side_effect=resolve), \
|
||||
patch.object(builder.subprocess, 'run') as run:
|
||||
builder.build(root, output)
|
||||
run.assert_called_once_with(
|
||||
[builder.sys.executable, str(package / 'scripts/build-ui.py'),
|
||||
'--output', str(output)], cwd=root, check=True)
|
||||
self.assertEqual(run.call_count, 2)
|
||||
command = run.call_args.args[0]
|
||||
self.assertEqual(command[0], str(compiler))
|
||||
self.assertIn(str(package / 'ui/apps.zi'), command)
|
||||
self.assertIn('kryon=' + str(root / 'cached-kryon/src/ui'), command)
|
||||
self.assertIn(str(root / 'cached-ziran/std'), command)
|
||||
self.assertNotIn('--project', command)
|
||||
self.assertFalse(contexts[0].exists())
|
||||
self.assertEqual((root / 'ziran.toml').read_text(), manifest)
|
||||
self.assertEqual(json.loads((root / 'ziran.lock').read_text()), lock)
|
||||
|
||||
@@ -0,0 +1,281 @@
|
||||
"""Catalog releases advance independently; native APK verification stays strict."""
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import struct
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
import zipfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(ROOT / 'scripts'))
|
||||
import android_catalog
|
||||
|
||||
|
||||
def load(name, script):
|
||||
spec = importlib.util.spec_from_file_location(name, ROOT / 'scripts' / script)
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
builder = load('collection_versions', 'build-collection.py')
|
||||
release = load('android_release_versions', 'android-release.py')
|
||||
native_builder = load('android_native_versions', 'build-android.py')
|
||||
|
||||
|
||||
class Fixture(unittest.TestCase):
|
||||
def setUp(self):
|
||||
work = ROOT / 'work'
|
||||
work.mkdir(exist_ok=True)
|
||||
temporary = tempfile.TemporaryDirectory(prefix='catalog-versions-', dir=work)
|
||||
self.addCleanup(temporary.cleanup)
|
||||
self.root = Path(temporary.name)
|
||||
for directory in ('scripts', 'apps', 'catalog'):
|
||||
(self.root / directory).mkdir()
|
||||
(self.root / 'packaging').mkdir()
|
||||
shutil.copyfile(ROOT / 'packaging/node.json', self.root / 'packaging/node.json')
|
||||
|
||||
|
||||
class SynchronizerTests(Fixture):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
shutil.copyfile(ROOT / 'update_version.sh', self.root / 'update_version.sh')
|
||||
(self.root / 'scripts/game_packages.py').write_text(
|
||||
"from pathlib import Path\n"
|
||||
"def declared_apps(root):\n"
|
||||
" return [dict(descriptor=dict(name='game', id='inbe.game', title='Game', host_api=41),\n"
|
||||
" manifest=Path('apps/catalog.json'))]\n")
|
||||
(self.root / 'CHANGELOG.md').write_text('## [Unreleased]\n\n- Later host.\n\n## 0.7.117\n')
|
||||
(self.root / 'VERSION').write_text('0.7.116\n')
|
||||
(self.root / 'packaging/android').mkdir(parents=True)
|
||||
(self.root / 'packaging/android/version-code').write_text('195\n')
|
||||
(self.root / 'catalog/CHANGELOG.md').write_text('## 0.7.118\n\n- New games.\n')
|
||||
(self.root / 'catalog/VERSION').write_text('0.7.116\n')
|
||||
(self.root / 'packaging').mkdir(exist_ok=True)
|
||||
shutil.copyfile(ROOT / 'packaging/node.json', self.root / 'packaging/node.json')
|
||||
(self.root / 'apps/CHANGELOG.md').write_text('## [1.0.0] - 2026-10-31\n')
|
||||
self.original = {'node_apps': {
|
||||
'arcade': {'id': 'inbe.arcade', 'version': '0.7.116', 'sequence': 120},
|
||||
'game': {'id': 'inbe.game', 'version': '1.0.0', 'sequence': 7}}}
|
||||
self.write_ledger(self.original)
|
||||
|
||||
def write_ledger(self, value):
|
||||
(self.root / 'apps/versions.json').write_text(json.dumps(value))
|
||||
|
||||
def sync(self, *args, success=True):
|
||||
result = subprocess.run(['sh', str(self.root / 'update_version.sh'), *args],
|
||||
capture_output=True, text=True)
|
||||
self.assertEqual(result.returncode == 0, success, result.stdout + result.stderr)
|
||||
return json.loads((self.root / 'apps/versions.json').read_text())['node_apps']
|
||||
|
||||
def test_catalog_release_never_bumps_host_and_is_idempotent(self):
|
||||
ledger = self.sync('--catalog')
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '195\n')
|
||||
self.assertEqual((self.root / 'catalog/VERSION').read_text(), '0.7.118\n')
|
||||
self.assertEqual((ledger['arcade']['version'], ledger['arcade']['sequence']), ('0.7.118', 121))
|
||||
self.assertEqual(ledger['game'], self.original['node_apps']['game'])
|
||||
self.assertEqual(self.sync('--catalog'), ledger)
|
||||
|
||||
def test_host_release_never_advances_catalog_sequence(self):
|
||||
(self.root / 'catalog/CHANGELOG.md').write_text('## 0.7.116\n')
|
||||
ledger = self.sync()
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.117\n')
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '196\n')
|
||||
self.assertEqual(ledger, self.original['node_apps'])
|
||||
self.assertEqual(builder.catalog_version(self.root), '0.7.116')
|
||||
self.assertEqual(self.sync(), ledger)
|
||||
self.assertEqual((self.root / 'packaging/android/version-code').read_text(), '196\n')
|
||||
|
||||
def test_native_apk_identity_ignores_catalog_sequence(self):
|
||||
with patch.object(native_builder, 'ROOT', self.root):
|
||||
self.assertEqual(native_builder.native_release(), {'version': '0.7.116', 'sequence': 195})
|
||||
self.sync('--catalog')
|
||||
with patch.object(native_builder, 'ROOT', self.root):
|
||||
self.assertEqual(native_builder.native_release(), {'version': '0.7.116', 'sequence': 195})
|
||||
|
||||
def test_invalid_native_code_preserves_all_versions(self):
|
||||
(self.root / 'packaging/android/version-code').write_text('0\n')
|
||||
self.sync(success=False)
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual((self.root / 'catalog/VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual(json.loads((self.root / 'apps/versions.json').read_text()), self.original)
|
||||
|
||||
def test_catalog_release_updates_game_ledger_from_its_own_changelog(self):
|
||||
(self.root / 'apps/CHANGELOG.md').write_text('## [1.0.1] - 2026-10-31\n')
|
||||
ledger = self.sync('--catalog')
|
||||
self.assertEqual((ledger['game']['version'], ledger['game']['sequence']), ('1.0.1', 8))
|
||||
|
||||
def test_catalog_version_cannot_go_back_and_failure_preserves_files(self):
|
||||
(self.root / 'catalog/CHANGELOG.md').write_text('## 0.7.115\n')
|
||||
ledger = self.sync('--catalog', success=False)
|
||||
self.assertEqual(ledger, self.original['node_apps'])
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
self.assertEqual((self.root / 'catalog/VERSION').read_text(), '0.7.116\n')
|
||||
|
||||
def test_collection_rejects_stale_catalog_ledger(self):
|
||||
(self.root / 'catalog/VERSION').write_text('0.7.118\n')
|
||||
with self.assertRaisesRegex(ValueError, 'signed release ledger'):
|
||||
builder.catalog_version(self.root)
|
||||
|
||||
def test_unknown_switch_does_not_change_versions(self):
|
||||
self.sync('--wrong', success=False)
|
||||
self.assertEqual((self.root / 'VERSION').read_text(), '0.7.116\n')
|
||||
|
||||
|
||||
def bundle(assets):
|
||||
def number(value):
|
||||
return struct.pack('<I', value)
|
||||
def text(value):
|
||||
return number(len(value)) + value
|
||||
return (b'ZX\0\0\x1b\0\0\0' + text(b'') * 2 + number(0) * 4 + number(len(assets))
|
||||
+ b''.join(text(name.encode()) + text(value) for name, value in assets.items()))
|
||||
|
||||
|
||||
class AndroidVerifierTests(Fixture):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
(self.root / 'CHANGELOG.md').write_text('## 0.7.117\n')
|
||||
(self.root / 'catalog/VERSION').write_text('0.7.116\n')
|
||||
controller = bundle({})
|
||||
self.controller_digest = hashlib.sha256(controller).hexdigest()
|
||||
(self.root / 'apps-controller.sha256').write_text(self.controller_digest)
|
||||
catalog = {'children': [], 'art': {'sha256': 'a' * 64, 'bytes': 123},
|
||||
'harness': 'assets/apps/apps.zx'}
|
||||
payload = bundle({'assets/apps/catalog.json': json.dumps(catalog).encode(),
|
||||
'assets/arcade/sidebar.shape': b'shape'})
|
||||
self.metadata = {'id': 'inbe.arcade', 'version': '0.7.116',
|
||||
'sha256': hashlib.sha256(payload).hexdigest(),
|
||||
'apps_sha256': self.controller_digest, 'children': [], 'art': catalog['art']}
|
||||
ledger = {'node_apps': {'arcade': {'sequence': 195}}}
|
||||
(self.root / 'apps/versions.json').write_text(json.dumps(ledger))
|
||||
self.metadata['node'] = builder.node_source(self.root)
|
||||
self.assets = {'assets/arcade.zx': payload, 'assets/apps.zx': controller,
|
||||
'assets/entity.zx': bundle({}), 'assets/kryon-font.ttf': b'font',
|
||||
'res/icon.png': b'icon', 'lib/arm64-v8a/libmain.so': b'arm64',
|
||||
'lib/armeabi-v7a/libmain.so': b'arm', 'classes.dex': b'normal'}
|
||||
self.badging = ("package: name='xyz.waozi.arcade' versionCode='121' versionName='0.7.117'\n"
|
||||
"application-label:'Arcade'\napplication: label='Arcade' icon='res/icon.png'\n")
|
||||
self.signer = hashlib.sha256(b'certificate').hexdigest()
|
||||
|
||||
def verify(self, edition='direct'):
|
||||
apk = self.root / 'fixture.apk'
|
||||
with zipfile.ZipFile(apk, 'w') as output:
|
||||
for name, data in self.assets.items():
|
||||
output.writestr(name, data)
|
||||
output.writestr('assets/arcade.json', json.dumps(self.metadata))
|
||||
|
||||
def command(args, **kwargs):
|
||||
if args[0] == 'openssl':
|
||||
return b'certificate'
|
||||
if 'apksigner' in args[0]:
|
||||
return 'Number of signers: 1\nSigner #1 certificate SHA-256 digest: ' + self.signer + '\n'
|
||||
self.assertIn('badging', args)
|
||||
return self.badging
|
||||
|
||||
with patch.object(release, 'ROOT', self.root), patch.object(android_catalog, 'ROOT', self.root), \
|
||||
patch.object(android_catalog, 'profile_asset_hashes', return_value={}), \
|
||||
patch.object(release, 'verify_launcher'), \
|
||||
patch.object(release.subprocess, 'check_output', side_effect=command), \
|
||||
patch.object(release.subprocess, 'run'):
|
||||
return release.verify(apk, '0.7.117', self.root / 'tools', edition)
|
||||
|
||||
def test_host_and_embedded_catalog_versions_may_differ(self):
|
||||
for edition in ('direct', 'fdroid'):
|
||||
result = self.verify(edition)
|
||||
self.assertEqual((result['version'], result['catalog_version']), ('0.7.117', '0.7.116'))
|
||||
|
||||
def test_wrong_native_identity_or_version_rejected(self):
|
||||
for old, new in (('xyz.waozi.arcade', 'xyz.waozi.other'), ('0.7.117', '0.7.116')):
|
||||
original = self.badging
|
||||
self.badging = original.replace(old, new)
|
||||
with self.assertRaisesRegex(AssertionError, 'APK identity or version'):
|
||||
self.verify()
|
||||
self.badging = original
|
||||
|
||||
def test_wrong_catalog_identity_or_source_version_rejected(self):
|
||||
for key, value in (('id', 'inbe.other'), ('version', '0.7.117')):
|
||||
original = self.metadata[key]
|
||||
self.metadata[key] = value
|
||||
with self.assertRaisesRegex(AssertionError, 'catalog (identity|version)'):
|
||||
self.verify()
|
||||
self.metadata[key] = original
|
||||
|
||||
def test_payload_hash_stays_required(self):
|
||||
self.assets['assets/arcade.zx'] += b'changed'
|
||||
with self.assertRaisesRegex(AssertionError, 'differs from its receipt'):
|
||||
self.verify()
|
||||
|
||||
def test_controller_digest_stays_required(self):
|
||||
self.assets['assets/apps.zx'] += b'changed'
|
||||
with self.assertRaises(AssertionError):
|
||||
self.verify()
|
||||
|
||||
def test_extra_assets_and_oversized_catalog_rejected(self):
|
||||
self.assets['assets/game.zx'] = b'game'
|
||||
with self.assertRaisesRegex(AssertionError, 'Unexpected or missing'):
|
||||
self.verify()
|
||||
del self.assets['assets/game.zx']
|
||||
self.assets['assets/arcade.zx'] = b'x' * (256 * 1024 + 1)
|
||||
self.metadata['sha256'] = hashlib.sha256(self.assets['assets/arcade.zx']).hexdigest()
|
||||
with self.assertRaisesRegex(AssertionError, 'asset policy budget'):
|
||||
self.verify()
|
||||
|
||||
def test_google_edition_gates_stay_required(self):
|
||||
self.badging += "uses-permission: name='com.android.vending.BILLING'\n"
|
||||
with self.assertRaisesRegex(AssertionError, 'Only the Google Play edition'):
|
||||
self.verify()
|
||||
self.assets['assets/dexopt/baseline.prof'] = b'profile'
|
||||
self.assets['assets/dexopt/baseline.profm'] = b'metadata'
|
||||
with self.assertRaisesRegex(AssertionError, 'Only the Google Play edition'):
|
||||
self.verify('gplay')
|
||||
self.assets['classes.dex'] = b'Lorg/kryonlabs/play/PlayBilling; Lcom/android/billingclient/'
|
||||
self.assertEqual(self.verify('gplay')['edition'], 'gplay')
|
||||
self.badging = self.badging.split('uses-permission:')[0]
|
||||
del self.assets['assets/dexopt/baseline.prof']
|
||||
del self.assets['assets/dexopt/baseline.profm']
|
||||
with self.assertRaisesRegex(AssertionError, 'Only the Google Play edition'):
|
||||
self.verify()
|
||||
|
||||
def test_signer_and_native_architectures_stay_required(self):
|
||||
self.signer = '0' * 64
|
||||
with self.assertRaisesRegex(AssertionError, 'APK signer differs'):
|
||||
self.verify()
|
||||
self.signer = hashlib.sha256(b'certificate').hexdigest()
|
||||
del self.assets['lib/armeabi-v7a/libmain.so']
|
||||
with self.assertRaisesRegex(AssertionError, 'Both supported ARM architectures'):
|
||||
self.verify()
|
||||
|
||||
|
||||
class WorkflowTests(unittest.TestCase):
|
||||
def test_catalog_publication_never_dispatches_android(self):
|
||||
for name in ('game-updates.yml', 'node-release.yml'):
|
||||
text = (ROOT / '.github/workflows' / name).read_text()
|
||||
self.assertNotIn('gh workflow run android.yml', text)
|
||||
self.assertNotIn('cat VERSION', text)
|
||||
self.assertIn('cat catalog/VERSION', text)
|
||||
follower = (ROOT / '.github/workflows/game-updates.yml').read_text()
|
||||
self.assertIn('sh update_version.sh --catalog', follower)
|
||||
self.assertNotIn('ziran.lock CHANGELOG.md VERSION', follower)
|
||||
|
||||
def test_native_release_is_created_after_all_editions_verify(self):
|
||||
text = (ROOT / '.github/workflows/android.yml').read_text()
|
||||
publish = text[text.index(' publish:'):]
|
||||
self.assertIn('edition: [direct, fdroid, gplay]', text)
|
||||
self.assertIn('needs: [release, build]', publish)
|
||||
self.assertIn('for edition in direct fdroid gplay', publish)
|
||||
self.assertLess(publish.index('scripts/android-release.py verify'), publish.index('gh release create'))
|
||||
self.assertIn('tag="arcade-$VERSION"', publish)
|
||||
self.assertIn('--target "$GITHUB_SHA"', publish)
|
||||
self.assertNotIn('"node-arcade-', text)
|
||||
self.assertIn("expect-google: 'true'", text)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -28,7 +28,7 @@ spec.loader.exec_module(published_games)
|
||||
def bundle_asset_paths(path):
|
||||
"""Read the actual bundle index without loading its images or executing it."""
|
||||
with published_games.Reader(path) as reader:
|
||||
if reader.take(8) != b"ZX\0\0\x1a\0\0\0":
|
||||
if reader.take(8) != b"ZX\0\0\x1b\0\0\0":
|
||||
raise ValueError("Unsupported game bundle")
|
||||
reader.text()
|
||||
reader.text()
|
||||
@@ -149,6 +149,10 @@ class CollectionTests(unittest.TestCase):
|
||||
(library / "sources.json").write_text(json.dumps(sources))
|
||||
|
||||
def stage_four_leaf_wurm_fixture(self):
|
||||
registration = self.root / 'games.json'
|
||||
value = json.loads(registration.read_text())
|
||||
value.pop('artwork', None)
|
||||
registration.write_text(json.dumps(value))
|
||||
source = self.root / "fixture-packages/wurm"
|
||||
(source / "editor").mkdir(parents=True)
|
||||
(source / "assets").mkdir()
|
||||
@@ -260,6 +264,26 @@ class CollectionTests(unittest.TestCase):
|
||||
with self.assertRaisesRegex(ValueError, "wurm-portrait art changed"):
|
||||
self.stage()
|
||||
|
||||
def test_artwork_input_changes_no_game_payload_or_version(self):
|
||||
packages = builder.declared_packages(self.root)
|
||||
game = next(app for package in packages for app in package['apps']
|
||||
if app['descriptor']['name'] == 'wurm-editor')
|
||||
self.assertNotEqual(game['source'], game['art_source'])
|
||||
self.assertEqual(hashlib.sha256((game['art_source'] / game['cover']['portrait']).read_bytes()).hexdigest(),
|
||||
'07ff2ff0142c262cdcba3643bbc4d7d3d71643b7f9f4e678a910fee2bfd3eba1')
|
||||
catalog = self.stage()
|
||||
child = next(item for item in catalog['children'] if item['expected_id'] == 'wurm-editor')
|
||||
self.assertEqual(child['version'], '0.1.0')
|
||||
self.assertEqual(child['sha256'], builder.digest(self.root / 'build/games/wurm-editor.zx'))
|
||||
|
||||
def test_artwork_override_must_name_a_registered_game(self):
|
||||
path = self.root / 'games.json'
|
||||
value = json.loads(path.read_text())
|
||||
value['artwork'] = {'unknown-game': 'wurm_art'}
|
||||
path.write_text(json.dumps(value))
|
||||
with self.assertRaisesRegex(ValueError, 'Invalid artwork package'):
|
||||
self.stage()
|
||||
|
||||
def test_every_library_cover_uses_a_bounded_thumbnail(self):
|
||||
catalog, packages = builder.stage(self.root, self.controller, self.controller_digest, self.output)
|
||||
children = {child['id']: child for child in catalog['children']}
|
||||
@@ -271,7 +295,7 @@ class CollectionTests(unittest.TestCase):
|
||||
for key in ('portrait', 'landscape', 'logo'):
|
||||
if key not in app['cover']:
|
||||
continue
|
||||
original = (app['source'] / app['cover'][key]).read_bytes()
|
||||
original = (app['art_source'] / app['cover'][key]).read_bytes()
|
||||
with self.subTest(app=child['id'], image=key):
|
||||
with Image.open(io.BytesIO(original)) as source:
|
||||
with Image.open(self.output / child['cover'][key]) as thumbnail:
|
||||
@@ -279,8 +303,11 @@ class CollectionTests(unittest.TestCase):
|
||||
self.assertLessEqual(max(thumbnail.size), limit)
|
||||
self.assertLessEqual(thumbnail.width, source.width)
|
||||
self.assertLessEqual(thumbnail.height, source.height)
|
||||
expected_ratio = source.width / source.height
|
||||
if key == 'portrait':
|
||||
expected_ratio = max(2 / 3, expected_ratio)
|
||||
self.assertAlmostEqual(thumbnail.width / thumbnail.height,
|
||||
source.width / source.height, delta=0.01)
|
||||
expected_ratio, delta=0.01)
|
||||
self.assertIn(thumbnail.mode, ('RGB', 'RGBA'))
|
||||
# Opaque cover art is a JPEG; transparency stays PNG.
|
||||
self.assertEqual(thumbnail.format, 'JPEG' if key != 'logo' and
|
||||
@@ -431,6 +458,21 @@ class CollectionTests(unittest.TestCase):
|
||||
|
||||
|
||||
class LibraryThumbnailTests(unittest.TestCase):
|
||||
def test_tall_portrait_keeps_title_inside_the_library_card(self):
|
||||
source = Image.new('RGB', (800, 1600), (25, 50, 75))
|
||||
source.paste((220, 180, 40), (80, 100, 720, 220))
|
||||
data = io.BytesIO()
|
||||
source.save(data, 'PNG')
|
||||
contents, suffix = artist.small_copy(data.getvalue(), 'portrait')
|
||||
self.assertEqual(suffix, '.jpg')
|
||||
with Image.open(io.BytesIO(contents)) as thumbnail:
|
||||
self.assertEqual(thumbnail.size, (427, 640))
|
||||
# The real card's centred cover fit now leaves the title intact.
|
||||
red, green, blue = thumbnail.getpixel((213, 85))
|
||||
self.assertGreater(red, 200)
|
||||
self.assertGreater(green, 160)
|
||||
self.assertLess(blue, 60)
|
||||
|
||||
def test_cover_keeps_full_colour_at_thumbnail_resolution(self):
|
||||
source = Image.new('RGB', (900, 1200))
|
||||
source.putdata([(x % 256, y % 256, (x + y) % 256)
|
||||
|
||||
@@ -18,7 +18,15 @@ from PIL import Image
|
||||
LEVEL_UPDATES = 'Download new levels when they come out?'
|
||||
|
||||
def answer_library_question(driver):
|
||||
"""Keep the test's bundled levels when the library asks about updates."""
|
||||
"""Consent to the loopback library, keeping bundled game levels."""
|
||||
deadline = time.monotonic() + 60
|
||||
while time.monotonic() < deadline:
|
||||
if driver.find(label='Connect', role='button', visible=True):
|
||||
driver.press(label='Connect', role='button')
|
||||
break
|
||||
if driver.find(label='Shovey', role='button', visible=True):
|
||||
break
|
||||
driver.wait_idle(frames=3)
|
||||
driver.wait(label='Shovey', role='button', timeout=60)
|
||||
if driver.find(label=LEVEL_UPDATES, role='text'):
|
||||
driver.press(label='Not now', role='button')
|
||||
|
||||
@@ -111,14 +111,17 @@ class GameUpdates(unittest.TestCase):
|
||||
game.mkdir()
|
||||
(game / 'apps.json').write_text(json.dumps({'title': 'Apfelwurm', 'apps': [{'manifest': 'catalog.json'}]}))
|
||||
(game / 'CHANGELOG.md').write_text('## [Unreleased]\n\n- Later.\n\n## [0.2.1] - 2026-10-29\n\n- Faster.\n')
|
||||
(root / 'CHANGELOG.md').write_text('# Arcade changelog\n\n## [Unreleased]\n\n- Keyboard first.\n\n'
|
||||
(root / 'catalog').mkdir()
|
||||
(root / 'CHANGELOG.md').write_text('## 9.0.0\n\n- Host changes stay here.\n')
|
||||
(root / 'catalog/CHANGELOG.md').write_text('# Arcade changelog\n\n## [Unreleased]\n\n- Keyboard first.\n\n'
|
||||
'## 0.7.1\n\n- Older.\n')
|
||||
updates = root / 'updates.json'
|
||||
updates.write_text(json.dumps([{'name': 'wurm'}]))
|
||||
with patch.object(follower, 'ROOT', root), patch.object(follower, 'UPDATES', updates), \
|
||||
patch.object(follower.subprocess, 'check_output', return_value=str(game) + '\n'):
|
||||
follower.changelog('ziran')
|
||||
self.assertEqual((root / 'CHANGELOG.md').read_text(),
|
||||
self.assertEqual((root / 'CHANGELOG.md').read_text(), '## 9.0.0\n\n- Host changes stay here.\n')
|
||||
self.assertEqual((root / 'catalog/CHANGELOG.md').read_text(),
|
||||
'# Arcade changelog\n\n## 0.7.2\n\n- Keyboard first.\n'
|
||||
'- Apfelwurm 0.2.1: Faster.\n\n## 0.7.1\n\n- Older.\n')
|
||||
|
||||
|
||||
@@ -0,0 +1,272 @@
|
||||
"""Private host test: consent, signed node membership, art and offline cache."""
|
||||
import argparse
|
||||
import contextlib
|
||||
import hashlib
|
||||
import http.server
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import struct
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import threading
|
||||
from PIL import Image
|
||||
|
||||
from cryptography.hazmat.primitives import serialization
|
||||
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def capture_window(child, path):
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)],
|
||||
text=True, timeout=10).splitlines()[0]
|
||||
assert int(subprocess.check_output(['xdotool', 'getwindowpid', window], text=True, timeout=10)) == child.pid
|
||||
subprocess.run(['import', '-window', window, str(path)], check=True, timeout=10)
|
||||
return path
|
||||
|
||||
|
||||
def live_library(binary, driver, work):
|
||||
"""Use a disposable profile against the real public node; download no game."""
|
||||
import time
|
||||
from android_catalog import catalog_assets
|
||||
with tempfile.TemporaryDirectory(dir=work) as temporary:
|
||||
profile = Path(temporary)
|
||||
log_path = work / 'live-node.log'
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(binary.resolve())], cwd=ROOT,
|
||||
env=os.environ | driver.environment() | {'ARCADE_DATA': str(profile),
|
||||
'ENTITY_DATA': str(profile / 'entity'), 'LANG': 'en_US.UTF-8'},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
driver.wait(label='Connect', role='button', timeout=60)
|
||||
driver.press(label='Connect', role='button')
|
||||
driver.wait(label='Apfelwurm Editor', role='button', timeout=60)
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
metadata = json.loads((profile / 'node/current.json').read_text())
|
||||
assert metadata['app_id'] == 'inbe.arcade'
|
||||
source = json.loads((ROOT / 'build/arcade.json').read_text())['node']
|
||||
assert metadata['sequence'] >= source['minimum_sequence']
|
||||
digest = next(item['sha256'] for item in metadata['artifacts'] if item['variant'] == 'module')
|
||||
catalog = catalog_assets((profile / 'node' / (digest + '.zx')).read_bytes())
|
||||
art = profile / 'resources/downloads' / (catalog['art']['sha256'] + '.zx')
|
||||
deadline = time.monotonic() + 60
|
||||
while (not art.exists() or art.stat().st_size != catalog['art']['bytes']) and time.monotonic() < deadline:
|
||||
driver.wait_idle(frames=5)
|
||||
assert art.stat().st_size == catalog['art']['bytes']
|
||||
with art.open('rb') as stream:
|
||||
assert hashlib.file_digest(stream, 'sha256').hexdigest() == catalog['art']['sha256']
|
||||
driver.wait_idle(frames=40)
|
||||
card = driver.wait(label='Shovey', role='button')
|
||||
with Image.open(capture_window(child, work / 'live-node-library.png')) as image:
|
||||
crop = image.crop((card['x'], card['y'], card['x'] + card['width'], card['y'] + card['height']))
|
||||
assert len(crop.convert('RGB').getcolors(1000000) or []) > 500
|
||||
cached = {path.stem for path in (profile / 'resources/downloads').glob('*.zx')}
|
||||
assert cached == {catalog['art']['sha256']}, 'No game payload may download during library browsing'
|
||||
print('Live node signed catalog and verified thumbnail pixels passed:', metadata['version'])
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
|
||||
|
||||
def with_catalog(payload, catalog):
|
||||
"""Keep the real root program and replace only its fixture catalog asset."""
|
||||
assert len(payload) <= 262144
|
||||
source = io.BytesIO(payload)
|
||||
def number():
|
||||
return struct.unpack('<I', source.read(4))[0]
|
||||
def text():
|
||||
return source.read(number())
|
||||
assert source.read(8) == b'ZX\0\0\x1b\0\0\0'
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
text(); text()
|
||||
for _ in range(number()):
|
||||
for _ in range(7):
|
||||
text()
|
||||
source.read(8); text(); source.read(4)
|
||||
for _ in range(number()):
|
||||
text(); text(); text()
|
||||
source.read(number())
|
||||
prefix = payload[:source.tell()]
|
||||
assets = {text(): text() for _ in range(number())}
|
||||
assert not source.read(1)
|
||||
assets[b'assets/apps/catalog.json'] = json.dumps(catalog).encode()
|
||||
def packed(value):
|
||||
return struct.pack('<I', len(value)) + value
|
||||
return prefix + struct.pack('<I', len(assets)) + b''.join(
|
||||
packed(name) + packed(value) for name, value in assets.items())
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--binary', type=Path, required=True)
|
||||
parser.add_argument('--inbe-source', type=Path, required=True)
|
||||
parser.add_argument('--apps-source', type=Path, required=True)
|
||||
parser.add_argument('--live', action='store_true', help='Verify the real public node using a disposable profile')
|
||||
args = parser.parse_args()
|
||||
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
|
||||
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
|
||||
subprocess.run(['git', 'check-ignore', 'work/node-library-ui/data'], cwd=ROOT, check=True)
|
||||
sys.path[:0] = [str(args.inbe_source / 'tests'), str(args.apps_source / 'tests'), str(ROOT / 'scripts')]
|
||||
from ui_driver import UiDriver
|
||||
from remote_catalog_test import descriptor
|
||||
from android_catalog import catalog_assets
|
||||
work = ROOT / 'work/node-library-ui'
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
driver = UiDriver(work / 'driver')
|
||||
if args.live:
|
||||
live_library(args.binary, driver, work)
|
||||
return
|
||||
key = Ed25519PrivateKey.generate()
|
||||
seed = (ROOT / 'build/arcade.zx').read_bytes()
|
||||
catalog = catalog_assets(seed)
|
||||
entry = next(child for child in catalog['children'] if child['expected_id'] == 'shovey')
|
||||
first_entry = dict(entry, title='Node Shovey')
|
||||
if 'cover' in entry:
|
||||
first_entry['cover'] = dict(entry['cover'], caption='Node Shovey')
|
||||
first = dict(catalog, children=[first_entry])
|
||||
payloads = [with_catalog(seed, first), with_catalog(seed, catalog)]
|
||||
digests = [hashlib.sha256(data).hexdigest() for data in payloads]
|
||||
state = {'revision': 0, 'requests': []}
|
||||
|
||||
class Handler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, *args):
|
||||
pass
|
||||
def do_GET(self):
|
||||
state['requests'].append(self.path)
|
||||
relative = self.path.removeprefix('/api/v2/packages/inbe.arcade/')
|
||||
if relative.startswith('latest?'):
|
||||
index = state['revision']
|
||||
data = json.dumps(descriptor(key, payloads[index], 196 + index, module_api=2)).encode()
|
||||
elif relative.removesuffix('.zx') in digests:
|
||||
data = payloads[digests.index(relative.removesuffix('.zx'))]
|
||||
else:
|
||||
package = ROOT / 'build/node-apps/arcade.games' / relative
|
||||
if not package.is_file():
|
||||
self.send_error(404)
|
||||
return
|
||||
data = package.read_bytes()
|
||||
self.send_response(200)
|
||||
self.send_header('Content-Length', str(len(data)))
|
||||
self.end_headers()
|
||||
self.wfile.write(data)
|
||||
|
||||
server = http.server.ThreadingHTTPServer(('127.0.0.1', 0), Handler)
|
||||
thread = threading.Thread(target=server.serve_forever)
|
||||
thread.start()
|
||||
origin = f'http://127.0.0.1:{server.server_port}'
|
||||
try:
|
||||
with tempfile.TemporaryDirectory(dir=work) as temporary:
|
||||
folder = Path(temporary)
|
||||
app = folder / 'app'
|
||||
app.mkdir()
|
||||
shutil.copy2(args.binary, app / 'arcade')
|
||||
for name in ('arcade.zx', 'apps.zx', 'entity.zx'):
|
||||
shutil.copyfile(ROOT / 'build' / name, app / name)
|
||||
receipt = json.loads((ROOT / 'build/arcade.json').read_text())
|
||||
receipt['node'] = dict(origin=origin, app_id='inbe.arcade', key_id='fixture-2026', minimum_sequence=195,
|
||||
public_key=key.public_key().public_bytes(serialization.Encoding.Raw, serialization.PublicFormat.Raw).hex())
|
||||
(app / 'arcade.json').write_text(json.dumps(receipt))
|
||||
profile = folder / 'data'
|
||||
save = profile / 'games/inbe.chess/records/computer'
|
||||
save.parent.mkdir(parents=True)
|
||||
save.write_bytes(b'prior saved game')
|
||||
|
||||
@contextlib.contextmanager
|
||||
def application(name):
|
||||
log_path = work / (name + '.log')
|
||||
with log_path.open('w') as log:
|
||||
child = subprocess.Popen([str(app / 'arcade')], cwd=app,
|
||||
env=os.environ | driver.environment() | {'ARCADE_DATA': str(profile),
|
||||
'ENTITY_DATA': str(profile / 'entity'), 'LANG': 'en_US.UTF-8'},
|
||||
stdout=log, stderr=subprocess.STDOUT)
|
||||
driver.attach(child, log_path)
|
||||
try:
|
||||
yield child
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.terminate()
|
||||
child.wait(timeout=10)
|
||||
|
||||
def capture(child, name):
|
||||
return capture_window(child, work / (name + '.png'))
|
||||
|
||||
def resize(child, width, height):
|
||||
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)],
|
||||
text=True, timeout=10).splitlines()[0]
|
||||
subprocess.run(['xdotool', 'windowsize', window, str(width), str(height)], check=True, timeout=10)
|
||||
# The previous tree may already be stable while X11's resize
|
||||
# event is still queued. Wait for the accepted viewport first.
|
||||
import time
|
||||
deadline = time.monotonic() + 10
|
||||
while max(node['width'] for node in driver.tree()) != width:
|
||||
assert time.monotonic() < deadline, 'The host did not accept the new viewport'
|
||||
time.sleep(0.05)
|
||||
driver.wait_idle(frames=20)
|
||||
|
||||
with application('consent-refresh') as child:
|
||||
driver.wait(label='Connect', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
assert not state['requests'], 'No node traffic before consent'
|
||||
capture(child, 'consent')
|
||||
resize(child, 360, 740)
|
||||
capture(child, 'phone-consent')
|
||||
resize(child, 1000, 820)
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Shovey', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
assert not state['requests'], 'Offline choice must prevent preview downloads'
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Connect', role='button')
|
||||
driver.press(label='Connect', role='button')
|
||||
driver.wait(label='Node Shovey', role='button', timeout=60)
|
||||
assert not driver.find(label='Choano', role='button'), 'Membership must come from the signed node catalog'
|
||||
driver.wait_idle(frames=60)
|
||||
assert any(path.endswith(catalog['art']['sha256'] + '.zx') for path in state['requests']), 'Node previews must be fetched'
|
||||
assert driver.find(role='image', visible=True), 'Verified previews must draw'
|
||||
card = driver.wait(label='Node Shovey', role='button')
|
||||
assert card['y'] >= 88, 'The library must leave room for its connection controls'
|
||||
with Image.open(capture(child, 'node-library')) as image:
|
||||
crop = image.crop((card['x'], card['y'], card['x'] + card['width'], card['y'] + card['height']))
|
||||
assert len(crop.convert('RGB').getcolors(1000000) or []) > 500, 'The preview must paint actual image pixels'
|
||||
game_hashes = {entry['sha256'] for entry in catalog['children']}
|
||||
assert not any(any(digest in path for digest in game_hashes) for path in state['requests']), 'No game payload before Download'
|
||||
state['revision'] = 1
|
||||
driver.press(label='Refresh library', role='button')
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
driver.wait(label='Apfelwurm Editor', role='button')
|
||||
driver.wait_idle(frames=20)
|
||||
capture(child, 'refreshed-library')
|
||||
resize(child, 360, 740)
|
||||
capture(child, 'phone-library')
|
||||
resize(child, 1000, 820)
|
||||
assert save.read_bytes() == b'prior saved game'
|
||||
driver.press(label='Node connection', role='button')
|
||||
driver.wait(label='Stay offline', role='button')
|
||||
driver.press(label='Stay offline', role='button')
|
||||
driver.wait(label='Choano', role='button')
|
||||
driver.wait_idle(frames=10)
|
||||
count = len(state['requests'])
|
||||
driver.wait_idle(frames=40)
|
||||
assert len(state['requests']) == count, 'Revocation must stop node traffic'
|
||||
with application('cached-offline'):
|
||||
driver.wait(label='Choano', role='button', timeout=60)
|
||||
driver.wait(label='Apfelwurm Editor', role='button')
|
||||
driver.wait_idle(frames=40)
|
||||
assert len(state['requests']) == count, 'Saved offline choice and signed catalog must survive restart'
|
||||
assert save.read_bytes() == b'prior saved game'
|
||||
finally:
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
thread.join()
|
||||
print('Arcade node consent, signed membership refresh, preview rendering, game download consent and offline restart passed')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -22,7 +22,7 @@ def bundle(files):
|
||||
def text(value):
|
||||
return struct.pack("<I", len(value)) + value
|
||||
|
||||
data = b"ZX\0\0\x1a\0\0\0" + text(b"arcade") + text(b"Main")
|
||||
data = b"ZX\0\0\x1b\0\0\0" + text(b"arcade") + text(b"Main")
|
||||
data += struct.pack("<IIII", 0, 0, 0, 0) + struct.pack("<I", len(files))
|
||||
for path in sorted(files):
|
||||
data += text(path.encode()) + text(files[path])
|
||||
@@ -63,7 +63,7 @@ class Handler(http.server.BaseHTTPRequestHandler):
|
||||
self.end_headers()
|
||||
self.wfile.write(b"{}")
|
||||
return
|
||||
body = response.get("body", b"ZX\0\0\x1a\0\0\0port")
|
||||
body = response.get("body", b"ZX\0\0\x1b\0\0\0port")
|
||||
self.send_response(response.get("status", 200))
|
||||
self.send_header("Content-Type", response.get("type", "application/octet-stream"))
|
||||
if "etag" in response:
|
||||
|
||||
@@ -18,10 +18,10 @@ spec.loader.exec_module(web)
|
||||
|
||||
|
||||
def bundle(files):
|
||||
"""A minimal ZX v26 bundle: empty program sections, then its files."""
|
||||
"""A minimal ZX v27 bundle: empty program sections, then its files."""
|
||||
def text(value):
|
||||
return struct.pack('<I', len(value)) + value
|
||||
data = b'ZX\0\0\x1a\0\0\0' + text(b'art') + text(b'Main') + struct.pack('<IIII', 0, 0, 0, 0)
|
||||
data = b'ZX\0\0\x1b\0\0\0' + text(b'art') + text(b'Main') + struct.pack('<IIII', 0, 0, 0, 0)
|
||||
data += struct.pack('<I', len(files))
|
||||
for path in sorted(files):
|
||||
data += text(path.encode()) + text(files[path])
|
||||
|
||||
@@ -240,6 +240,11 @@ try {
|
||||
};
|
||||
const libraryFetched = async () => evaluate(`performance.getEntriesByType('resource').map(entry => entry.name)
|
||||
.filter(name => /\\/library\\//.test(new URL(name).pathname) || name.includes(${JSON.stringify(library?.art || '-')}))`);
|
||||
// This private page chooses the public node connection explicitly. A
|
||||
// returning visit reuses its saved origin-specific answer.
|
||||
const initial = await waitButton(['Connect', 'Shovey']);
|
||||
if (initial.label === 'Connect') await click(initial);
|
||||
await waitButton('Shovey');
|
||||
if (library) {
|
||||
// The first visit draws every cover from the small copies alone.
|
||||
const colours = await coversDrawn();
|
||||
|
||||
@@ -1,17 +1,39 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")"
|
||||
python3 - <<'PY'
|
||||
python3 - "$@" <<'PY'
|
||||
from pathlib import Path
|
||||
import re
|
||||
import json
|
||||
import sys
|
||||
sys.path.insert(0, 'scripts')
|
||||
from game_packages import declared_apps
|
||||
version = re.search(r'^## (\d+\.\d+\.\d+)\s*$', Path('CHANGELOG.md').read_text(), re.M)
|
||||
if version is None:
|
||||
raise SystemExit('CHANGELOG.md needs a numeric release entry')
|
||||
Path('VERSION').write_text(version[1] + '\n')
|
||||
if sys.argv[1:] not in ([], ['--catalog']):
|
||||
raise SystemExit('Usage: update_version.sh [--catalog]')
|
||||
catalog_only = sys.argv[1:] == ['--catalog']
|
||||
|
||||
def release(path):
|
||||
entry = re.search(r'^## (\d+\.\d+\.\d+)\s*$', path.read_text(), re.M)
|
||||
if entry is None:
|
||||
raise SystemExit(f'{path} needs a numeric release entry')
|
||||
return entry[1]
|
||||
|
||||
catalog_version = release(Path('catalog/CHANGELOG.md'))
|
||||
host_version = None if catalog_only else release(Path('CHANGELOG.md'))
|
||||
host_code = None
|
||||
host_code_path = Path('packaging/android/version-code')
|
||||
if not catalog_only:
|
||||
host_code = int(host_code_path.read_text().strip())
|
||||
if not 0 < host_code <= 2100000000:
|
||||
raise SystemExit('Invalid native Android versionCode')
|
||||
previous = Path('VERSION').read_text().strip()
|
||||
if previous != host_version:
|
||||
if tuple(map(int, host_version.split('.'))) <= tuple(map(int, previous.split('.'))):
|
||||
raise SystemExit('Native host version must increase')
|
||||
host_code += 1
|
||||
if host_code > 2100000000:
|
||||
raise SystemExit('Native Android versionCode is exhausted')
|
||||
# Validate all versions before writing either version source or the ledger.
|
||||
ledger_path = Path('apps/versions.json')
|
||||
if ledger_path.exists():
|
||||
ledger = json.loads(ledger_path.read_text())
|
||||
@@ -30,9 +52,9 @@ if ledger_path.exists():
|
||||
ledger['node_apps'][game['name']] = dict(
|
||||
id=game['id'], title=game['title'], version=entry[1], sequence=1, host_api=game['host_api'])
|
||||
for name, component in ledger['node_apps'].items():
|
||||
# Arcade itself is released at the version of the root changelog.
|
||||
# The signed catalog has its own release history, independent of the host.
|
||||
if name == 'arcade':
|
||||
current = version[1]
|
||||
current = catalog_version
|
||||
else:
|
||||
entry = re.search(r'^## \[(\d+\.\d+\.\d+)\] - \d{4}-\d{2}-\d{2}$',
|
||||
changelogs[name].read_text(), re.M)
|
||||
@@ -47,4 +69,8 @@ if ledger_path.exists():
|
||||
component['version'] = current
|
||||
component['sequence'] += 1
|
||||
ledger_path.write_text(json.dumps(ledger, indent=2) + '\n')
|
||||
Path('catalog/VERSION').write_text(catalog_version + '\n')
|
||||
if not catalog_only:
|
||||
Path('VERSION').write_text(host_version + '\n')
|
||||
host_code_path.write_text(str(host_code) + '\n')
|
||||
PY
|
||||
@@ -2,13 +2,13 @@
|
||||
"format": 1,
|
||||
"packages": [
|
||||
{
|
||||
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
|
||||
"dependencies": {},
|
||||
"id": "p09fa77e94b0dfc6c",
|
||||
"name": "rini",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/rini.git"
|
||||
"commit": "a02feeb703192f1481e72160b1ccff401d17ef9d",
|
||||
"dependencies": {"raylib": "pcc7aa76725f2fb2f"},
|
||||
"dependency_refs": {"raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e"},
|
||||
"id": "p0797a2ec7b9d9b0e",
|
||||
"name": "kryon",
|
||||
"ref": "a02feeb703192f1481e72160b1ccff401d17ef9d",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "2944b2e668e735438d8ce24e47a39be3f5c36af5",
|
||||
@@ -20,149 +20,170 @@
|
||||
},
|
||||
{
|
||||
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p7de54c8ad98fe034", "entity": "pb6d17ac2aeb5844f", "game2d": "pf2f54c7603f6e861", "kryon": "p43481d12b77897ce", "kss": "p1b13dda539ed2a39", "liboqs": "p1aaef6f156781e69", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p9079dde0fcc11248", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "p1d80baafaa5fa18a"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "crypto": "pc23fbf455e97614d", "curl": "p8da229d15597ab5c", "daochi_client": "p89503086b39ba0fb", "entity": "p22476639990592a5", "game2d": "pf2f54c7603f6e861", "kryon": "pb1ba3b1950f642b9", "kss": "p1b13dda539ed2a39", "liboqs": "p983c695d118b6109", "mingcute": "pe1027b9d16704793", "monocypher": "p6c9f89ec97d929eb", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p71f489a3ce887de0", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "p810dc0509cd1b75d"},
|
||||
"dependency_refs": {"apps": "master", "crypto": "master", "curl": "master", "daochi_client": "master", "entity": "master", "game2d": "master", "kryon": "master", "kss": "master", "liboqs": "main", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "master", "practices": "master", "qrcode": "master", "rini": "main", "sqlite": "master"},
|
||||
"id": "p183b01bccc6424e7",
|
||||
"name": "Inbe",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/inbe.git"
|
||||
},
|
||||
{
|
||||
"commit": "a9ad1876e14c2be093a538aca41fd3468fe3cf19",
|
||||
"dependencies": {},
|
||||
"id": "p1aaef6f156781e69",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
|
||||
"dependencies": {"kryon": "p43481d12b77897ce"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "p1b13dda539ed2a39",
|
||||
"name": "Kss",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kss.git"
|
||||
},
|
||||
{
|
||||
"commit": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "curl": "p1ca0e8d3c19dbe4c", "entity": "pb6d17ac2aeb5844f", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
|
||||
"id": "p1b5832789c5a5053",
|
||||
"name": "Shovey",
|
||||
"ref": "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
"commit": "dc47384266d96aaa0f86b8fe104404878179e90b",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e", "monocypher": "p6c9f89ec97d929eb", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
|
||||
"id": "p22476639990592a5",
|
||||
"name": "Entity",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
|
||||
"commit": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"dependencies": {},
|
||||
"id": "p1ca0e8d3c19dbe4c",
|
||||
"name": "curl",
|
||||
"ref": "master",
|
||||
"id": "p276ae0189cfc10bc",
|
||||
"name": "wurm_art",
|
||||
"ref": "2fa52f64eb0c29e8351b437176e896b938ece8e8",
|
||||
"source": true,
|
||||
"url": "https://github.com/curl/curl.git"
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
},
|
||||
{
|
||||
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
|
||||
"dependencies": {},
|
||||
"id": "p1d80baafaa5fa18a",
|
||||
"name": "sqlite",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/sqlite/sqlite.git"
|
||||
},
|
||||
{
|
||||
"commit": "e1c1135dbd731560964ce26dc4529014eefcec5c",
|
||||
"dependencies": {"raylib": "p5a77c9c35110e925"},
|
||||
"id": "p43481d12b77897ce",
|
||||
"name": "kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"dependencies": {},
|
||||
"id": "p5a77c9c35110e925",
|
||||
"name": "raylib",
|
||||
"ref": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/raylib.git"
|
||||
},
|
||||
{
|
||||
"commit": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p43481d12b77897ce"},
|
||||
"id": "p6a59d2d6364debd6",
|
||||
"name": "Apps",
|
||||
"ref": "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "p1aaef6f156781e69"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "8250ece58a03f4d9c07cd8434780d659b54f5d7f",
|
||||
"commit": "970d5e44b1702158cb16469892da6ff50f142427",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
"id": "p7de54c8ad98fe034",
|
||||
"dependency_refs": {"crypto": "master", "oqs": "master"},
|
||||
"id": "p6af0b5bd9fd0cd31",
|
||||
"name": "DaochiClient",
|
||||
"ref": "master",
|
||||
"ref": "970d5e44b1702158cb16469892da6ff50f142427",
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
},
|
||||
{
|
||||
"commit": "f5f0a19a5dc6c14a49adb3cd63ea79a60f6ba77b",
|
||||
"dependencies": {},
|
||||
"id": "p809b4d31a48625a3",
|
||||
"id": "p6c9f89ec97d929eb",
|
||||
"name": "monocypher",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/LoupVaillant/Monocypher.git"
|
||||
},
|
||||
{
|
||||
"commit": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766",
|
||||
"dependencies": {"curl": "p8da229d15597ab5c", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e", "monocypher": "p6c9f89ec97d929eb", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"},
|
||||
"dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "monocypher": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"},
|
||||
"id": "p70971d078c43aca3",
|
||||
"name": "Entity",
|
||||
"ref": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
|
||||
"dependencies": {"liboqs": "p983c695d118b6109"},
|
||||
"dependency_refs": {"liboqs": "main"},
|
||||
"id": "p7098ac9cd92f7e5f",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
|
||||
"dependencies": {},
|
||||
"id": "p9079dde0fcc11248",
|
||||
"id": "p71f489a3ce887de0",
|
||||
"name": "practices",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/waozixyz/practices.git"
|
||||
},
|
||||
{
|
||||
"commit": "5b67236a8e355e67ce4f8cc0389b9ce3805b874b",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p43481d12b77897ce"},
|
||||
"id": "p9928fc15e7b93288",
|
||||
"name": "Apps",
|
||||
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
|
||||
"dependencies": {},
|
||||
"id": "p810dc0509cd1b75d",
|
||||
"name": "sqlite",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
"source": true,
|
||||
"url": "https://github.com/sqlite/sqlite.git"
|
||||
},
|
||||
{
|
||||
"commit": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
|
||||
"dependencies": {},
|
||||
"id": "p82dbc05081cd4d96",
|
||||
"name": "zlib",
|
||||
"ref": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
|
||||
"source": true,
|
||||
"url": "https://github.com/madler/zlib.git"
|
||||
},
|
||||
{
|
||||
"commit": "256fe6ff049d48a25dfe2a8b0db7ad84477fd282",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
|
||||
"dependency_refs": {"crypto": "master", "oqs": "master"},
|
||||
"id": "p89503086b39ba0fb",
|
||||
"name": "DaochiClient",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/daochi-client.git"
|
||||
},
|
||||
{
|
||||
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
|
||||
"dependencies": {},
|
||||
"id": "p8da229d15597ab5c",
|
||||
"name": "curl",
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/curl/curl.git"
|
||||
},
|
||||
{
|
||||
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
|
||||
"dependencies": {},
|
||||
"id": "p8ea355e8cb04093e",
|
||||
"name": "rini",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/rini.git"
|
||||
},
|
||||
{
|
||||
"commit": "e77d81dab791c13bf1c4e5d9a7160c403be9bbe0",
|
||||
"dependencies": {},
|
||||
"id": "p983c695d118b6109",
|
||||
"name": "liboqs",
|
||||
"ref": "main",
|
||||
"source": true,
|
||||
"url": "https://github.com/open-quantum-safe/liboqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
|
||||
"dependencies": {"kryon": "p43481d12b77897ce"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "pab5377a2950368a2",
|
||||
"name": "plot",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/plot.git"
|
||||
},
|
||||
{
|
||||
"commit": "849eb903e5b6fb9aed996c530ab82f94c4371ee5",
|
||||
"dependencies": {"raylib": "pcc7aa76725f2fb2f"},
|
||||
"dependency_refs": {"raylib": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e"},
|
||||
"id": "pb1ba3b1950f642b9",
|
||||
"name": "kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "99d9ad777325e9dfc15cd8610056948819dc1f07",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "crypto": "pc23fbf455e97614d", "entity": "pb6d17ac2aeb5844f", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "crypto": "pc23fbf455e97614d", "entity": "p22476639990592a5", "kryon": "pb1ba3b1950f642b9", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "master", "crypto": "master", "entity": "master", "kryon": "master", "mingcute": "master"},
|
||||
"id": "pb4256918f4b7855d",
|
||||
"name": "Apfelwurm",
|
||||
"ref": "99d9ad777325e9dfc15cd8610056948819dc1f07",
|
||||
"url": "https://github.com/waozixyz/wurm.git"
|
||||
},
|
||||
{
|
||||
"commit": "33e54462886507cfb355f86e6d2d93cef7b2331c",
|
||||
"dependencies": {"daochi_client": "p7de54c8ad98fe034", "kryon": "p43481d12b77897ce", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
|
||||
"id": "pb6d17ac2aeb5844f",
|
||||
"name": "Entity",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/entity.git"
|
||||
},
|
||||
{
|
||||
"commit": "528618898db605b0f2960759d49871cde2209086",
|
||||
"dependencies": {"apps": "p9928fc15e7b93288", "entity": "pb6d17ac2aeb5844f", "game2d": "pf2f54c7603f6e861", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "entity": "p22476639990592a5", "game2d": "pf2f54c7603f6e861", "kryon": "pb1ba3b1950f642b9", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "master", "entity": "master", "game2d": "master", "kryon": "master", "mingcute": "master"},
|
||||
"id": "pba7b4d6a4dcf84ae",
|
||||
"name": "Choano",
|
||||
"ref": "528618898db605b0f2960759d49871cde2209086",
|
||||
@@ -176,6 +197,15 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/crypto.git"
|
||||
},
|
||||
{
|
||||
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"dependencies": {},
|
||||
"id": "pcc7aa76725f2fb2f",
|
||||
"name": "raylib",
|
||||
"ref": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
|
||||
"source": true,
|
||||
"url": "https://github.com/raysan5/raylib.git"
|
||||
},
|
||||
{
|
||||
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
|
||||
"dependencies": {},
|
||||
@@ -186,15 +216,35 @@
|
||||
},
|
||||
{
|
||||
"commit": "d32e4b606ece83e8869c954f66c334f44f7b4838",
|
||||
"dependencies": {"kryon": "p43481d12b77897ce"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "pe878ed78ee9f8300",
|
||||
"name": "Game2D",
|
||||
"ref": "d32e4b606ece83e8869c954f66c334f44f7b4838",
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "c152526893b92e75c82f55b0adf2c684e47fdbc2",
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "entity": "p22476639990592a5", "kryon": "p0797a2ec7b9d9b0e", "mingcute": "pe1027b9d16704793"},
|
||||
"dependency_refs": {"apps": "master", "entity": "master", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "mingcute": "master"},
|
||||
"id": "peb73114e93098006",
|
||||
"name": "Shovey",
|
||||
"ref": "c152526893b92e75c82f55b0adf2c684e47fdbc2",
|
||||
"url": "https://github.com/waozixyz/shovey.git"
|
||||
},
|
||||
{
|
||||
"commit": "47ce0302664fe2f87f3cb05407eac7aa09066c96",
|
||||
"dependencies": {"crypto": "pc23fbf455e97614d", "daochi_client": "p6af0b5bd9fd0cd31", "kryon": "p0797a2ec7b9d9b0e"},
|
||||
"dependency_refs": {"crypto": "master", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d"},
|
||||
"id": "pf1707c15f1b95b28",
|
||||
"name": "Apps",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/waozixyz/apps.git"
|
||||
},
|
||||
{
|
||||
"commit": "cee04692f3461dcb098833472f071c434980debb",
|
||||
"dependencies": {"kryon": "p43481d12b77897ce"},
|
||||
"dependencies": {"kryon": "pb1ba3b1950f642b9"},
|
||||
"dependency_refs": {"kryon": "master"},
|
||||
"id": "pf2f54c7603f6e861",
|
||||
"name": "Game2D",
|
||||
"ref": "master",
|
||||
@@ -202,12 +252,13 @@
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"apps": "p6a59d2d6364debd6", "choano": "pba7b4d6a4dcf84ae", "entity": "pb6d17ac2aeb5844f", "game2d": "pe878ed78ee9f8300", "inbe": "p183b01bccc6424e7", "kryon": "p43481d12b77897ce", "mingcute": "pe1027b9d16704793", "shovey": "p1b5832789c5a5053", "wurm": "pb4256918f4b7855d"},
|
||||
"dependencies": {"apps": "pf1707c15f1b95b28", "choano": "pba7b4d6a4dcf84ae", "daochi_client": "p6af0b5bd9fd0cd31", "entity": "p70971d078c43aca3", "game2d": "pe878ed78ee9f8300", "inbe": "p183b01bccc6424e7", "kryon": "p0797a2ec7b9d9b0e", "mingcute": "pe1027b9d16704793", "shovey": "peb73114e93098006", "wurm": "pb4256918f4b7855d", "wurm_art": "p276ae0189cfc10bc"},
|
||||
"dependency_refs": {"apps": "47ce0302664fe2f87f3cb05407eac7aa09066c96", "choano": "528618898db605b0f2960759d49871cde2209086", "daochi_client": "970d5e44b1702158cb16469892da6ff50f142427", "entity": "51f8cc62a9ab61d114d246897b7b2ba76c4e3766", "game2d": "d32e4b606ece83e8869c954f66c334f44f7b4838", "inbe": "master", "kryon": "a02feeb703192f1481e72160b1ccff401d17ef9d", "mingcute": "master", "shovey": "c152526893b92e75c82f55b0adf2c684e47fdbc2", "wurm": "99d9ad777325e9dfc15cd8610056948819dc1f07", "wurm_art": "2fa52f64eb0c29e8351b437176e896b938ece8e8"},
|
||||
"name": "Arcade"
|
||||
},
|
||||
"toolchain": {
|
||||
"commit": "a97e88b5b0a956c9c9977cce593ea4ecdb7ad72b",
|
||||
"ref": "master",
|
||||
"commit": "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac",
|
||||
"ref": "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac",
|
||||
"url": "https://github.com/ziranlang/ziran.git"
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ bridge_modules = ["app"]
|
||||
|
||||
[toolchain]
|
||||
git = "https://github.com/ziranlang/ziran.git"
|
||||
ref = "master"
|
||||
ref = "b8d0ac17eb1e2d2d9997729a769dbea681cc74ac"
|
||||
|
||||
[install]
|
||||
bin = "arcade"
|
||||
@@ -29,17 +29,17 @@ abis = "arm64-v8a,x86_64"
|
||||
|
||||
[dependencies.kryon]
|
||||
git = "https://github.com/kryonlabs/kryon.git"
|
||||
ref = "master"
|
||||
ref = "a02feeb703192f1481e72160b1ccff401d17ef9d"
|
||||
|
||||
[dependencies.apps]
|
||||
git = "https://github.com/waozixyz/apps.git"
|
||||
# Use the shared controller reviewed with the supported collection host.
|
||||
ref = "94095a939e5fa5dee1d4d9af3a9af0e9a1cb630a"
|
||||
ref = "47ce0302664fe2f87f3cb05407eac7aa09066c96"
|
||||
|
||||
# Shovey's editions and editor are available as separate downloads.
|
||||
[dependencies.shovey]
|
||||
git = "https://github.com/waozixyz/shovey.git"
|
||||
ref = "da1a7f9b7ed54abaa2ac7c08ecfaaa3b09b842fd"
|
||||
ref = "c152526893b92e75c82f55b0adf2c684e47fdbc2"
|
||||
|
||||
# Compatibility tooling runs Inner Breeze's host checks; releases check its publisher pins.
|
||||
[dependencies.inbe]
|
||||
@@ -48,7 +48,7 @@ ref = "master"
|
||||
|
||||
[dependencies.entity]
|
||||
git = "https://github.com/waozixyz/entity.git"
|
||||
ref = "master"
|
||||
ref = "51f8cc62a9ab61d114d246897b7b2ba76c4e3766"
|
||||
|
||||
[dependencies.mingcute]
|
||||
git = "https://github.com/kryonlabs/mingcute.git"
|
||||
@@ -65,3 +65,13 @@ ref = "d32e4b606ece83e8869c954f66c334f44f7b4838"
|
||||
[dependencies.choano]
|
||||
git = "https://github.com/waozixyz/choano.git"
|
||||
ref = "528618898db605b0f2960759d49871cde2209086"
|
||||
|
||||
# Library art can advance independently of the tested game payload.
|
||||
[dependencies.wurm_art]
|
||||
git = "https://github.com/waozixyz/wurm.git"
|
||||
ref = "2fa52f64eb0c29e8351b437176e896b938ece8e8"
|
||||
source = true
|
||||
|
||||
[dependencies.daochi_client]
|
||||
git = "https://github.com/ziranlang/daochi-client.git"
|
||||
ref = "970d5e44b1702158cb16469892da6ff50f142427"
|
||||