Compare commits

..
Author SHA1 Message Date
waozi a0f8946692 Release Arcade 0.7.96 with the latest game releases 2026-10-27 20:48:00 +00:00
waozi fb5d8d0af8 Keep Arcade browser runtime files on one cache revision 2026-10-27 17:26:02 -03:00
waozi 37f11bfe0b Release Arcade 0.7.95 with Shovey 0.6.157
Pip's tips keep what he points at in view: his card moves under the top
bar when it would cover it, such as the home in level 1.
2026-10-27 17:11:36 -03:00
waozi f687a500e7 Load arcade.waozi.xyz's runtime and Apps library sooner
The page fetched apps.zx (1.9 MB) uncompressed, since Cloudflare Pages does
not compress binary files, and only then started the 3.6 MB runtime. The
build now writes gzip copies beside apps.zx and runtime.data, which the page
unpacks with DecompressionStream (apps.zx 1.9 MB -> 0.24 MB), falling back
to the plain files; the file package is handed to the runtime rather than
fetched again. runtime.js and runtime.wasm are preloaded, so they download
while the page fetches the collection's files and waits for the sign-in.
2026-10-27 16:51:12 -03:00
waozi 7d5789d34d Release Arcade 0.7.94 with smaller library covers
The library downloaded 3.2 MB of art from the node before its covers
showed: six 640-pixel covers stored as lossless PNG made up 2.7 MB of it.
Opaque cover art is now a JPEG at quality 85 (445 KiB for all six), so the
art bundle is about a quarter of its size. Logos keep their transparency
and previews their pixel art as PNG. Every host decodes these JPEGs:
browsers, GdkPixbuf on Linux, and raylib with JPEG on Android and Windows.
2026-10-27 16:40:15 -03:00
waozi 732f28e025 Sign in once for every waozi.xyz site 2026-10-27 16:35:20 -03:00
waozi f4725cbf21 Rank Apfelwurm's best run by level and score, and open the Profile when a saved key is unreadable 2026-10-27 16:23:42 -03:00
waozi f52111be88 Compile the released Shovey into its browser page
scripts/build-web.py --shovey now passes the release's shovey.zx and
entity.zx to Entity's --linked, so the page compiles their programs, and the
game and Apps controller packed in shovey.zx, as Ziran's linked code
(Ziran 2e2fea84, Entity 9a88349). The page still opens those exact bytes;
the Shovey editor, which needs the game as a library, stays on the VM.
Walking in level 1 at 6x CPU throttle: 33 fps on the VM, 59 fps linked.

The lock follows Ziran and Entity master, which moved liboqs main too.
2026-10-27 16:10:43 -03:00
waozi cd64689a93 Repaint only damaged pixels in Arcade's browser edition
The browser host ended every frame with EndFrame, which repainted the whole
page: in a Shovey level that was 235 images and 1157 fills a frame, against
12 and 26 with Kryon's damage-only EndCanvasUiFrame (Kryon e09f3816).

The host can also run the released Shovey player, as the downloads do: a
receipt whose id is arcade.shovey-player opens Shovey's covers, and
scripts/build-web.py --shovey DIR --site DIR builds that page from a Shovey
download's shovey.zx, shovey.json and entity.zx, for shovey.waozi.xyz.
2026-10-27 15:07:33 -03:00
waozi d53446a2a6 Open dew.waozi.xyz from the Profile's Top up 2026-10-27 14:30:44 -03:00
waozi e6aa902016 Release Arcade 0.7.93 with the latest game releases 2026-10-27 16:37:17 +00:00
waozi bfd38fca73 Start the node follower as soon as Arcade releases a game update
GitHub runs scheduled workflows hours late, so a new node-arcade release
now starts Breeze's node follower directly with RELEASE_FOLLOW_TOKEN, a
token that may only start workflows. Without it the timer still follows.
2026-10-27 13:20:30 -03:00
waozi 0788c12f40 Release Arcade 0.7.92 with Shovey 0.6.156
Finishing Shovey's 175 levels opens a reward window to claim Dew paid by
finishing place: 100 for the first 10, 50 for the next 20, 20 up to the
100th and 5 after.
2026-10-27 13:07:43 -03:00
waozi 3c405887b8 Release Arcade 0.7.91 with the latest game releases 2026-10-27 06:34:13 +00:00
waozi 0c747f2c49 Release Arcade 0.7.90 with Shovey 0.6.155
Entity ca637d0 saves account aliases typed with capitals, an @ or spaces
and says when an alias is taken, in Arcade and its games.
2026-10-27 02:17:30 -03:00
waozi bc5606e32c Pin the shared Profile and verify installed-only game boards 2026-10-27 01:14:32 -03:00
waozi 37a0d8b0a7 Merge remote-tracking branch 'origin/master' 2026-10-27 00:58:42 -03:00
waozi 8452563b03 Release Arcade 0.7.89 with the latest game releases 2026-10-27 02:51:10 +00:00
waozi 96932541db Connect installed Arcade games to Profile leaderboards 2026-10-26 23:47:05 -03:00
waozi a442fe0621 Release Arcade 0.7.88 with the latest game releases 2026-10-27 01:41:10 +00:00
waozi d6ebf18af2 Preserve manifest sections while pinning game releases 2026-10-26 22:17:34 -03:00
waozi 84b3fd552a Use smaller cached thumbnails for every Arcade library cover 2026-10-26 22:06:28 -03:00
waozi 1239df4855 Resolve released game dependencies through Ziran 2026-10-26 22:01:00 -03:00
waozi 476e38ca41 Release Arcade 0.7.86 with the latest game releases 2026-10-27 00:26:50 +00:00
waozi 0b07d0d374 Follow published game source after recording release metadata 2026-10-26 20:56:33 -03:00
waozi 48d2216394 Record synchronized Shovey chests and current game releases 2026-10-26 20:42:19 -03:00
waozi bd5f4a4ccb Disable Dew funding in Google Play builds 2026-10-26 16:54:18 -03:00
waozi 9d050ff20b Include verified live legacy reward recovery in the shared host 2026-10-26 14:36:10 -03:00
waozi 6e835a5dad Ship legacy Shovey reward migration in the shared game host 2026-10-26 14:29:42 -03:00
waozi 4592ce5d95 Acknowledge Pip before testing native gameplay 2026-10-26 14:01:13 -03:00
waozi 1889eff0b7 Use the published game controls and reward dialog updates 2026-10-26 13:55:39 -03:00
waozi e4c52c82fe Merge the published Arcade release with title screen improvements 2026-10-26 13:53:43 -03:00
waozi 3fa55eb32f Show full-colour startup previews before original title art 2026-10-26 13:15:07 -03:00
waozi 11fce1e7db Keep original colours and resolution in game title screens 2026-10-26 12:58:20 -03:00
43 changed files with 907 additions and 230 deletions

No files matched your search

+54 -25
View File
@@ -6,6 +6,8 @@ name: Game updates
# commits the new Arcade 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,
# since GitHub runs scheduled workflows hours late.
on:
schedule:
- cron: '7,22,37,52 * * * *'
@@ -29,13 +31,15 @@ jobs:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
path: waozixyz/arcade
- name: Pin the latest game releases
id: pin
- name: Check release following
run: python3 tests/game_updates_test.py
- name: Find newer game releases
id: updates
env:
GH_TOKEN: ${{ github.token }}
run: |
python3 scripts/follow-game-releases.py pin
if git diff --quiet -- ziran.lock; then
python3 scripts/follow-game-releases.py check
if [ "$(python3 -c 'import json; print(len(json.load(open("build/game-updates.json"))))')" = 0 ]; then
echo "changed=false" >> "$GITHUB_OUTPUT"
echo "Arcade already pins every game's latest release."
exit 0
@@ -44,37 +48,48 @@ jobs:
python3 - <<'PY' >> "$GITHUB_OUTPUT"
import json
lock = json.load(open('ziran.lock'))
shovey = lock['root']['dependencies']['shovey']
print('toolchain=' + lock['toolchain']['commit'])
PY
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
if: steps.updates.outputs.changed == 'true'
with:
repository: ziranlang/ziran
ref: ${{ steps.updates.outputs.toolchain }}
path: ziranlang/ziran
- name: Install build dependencies
if: steps.updates.outputs.changed == 'true'
working-directory: .
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-cryptography
- name: Build the locked toolchain and pin game dependencies
id: pin
if: steps.updates.outputs.changed == 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
make -j2 -C ../../ziranlang/ziran
echo "$GITHUB_WORKSPACE/ziranlang/ziran/build/bin" >> "$GITHUB_PATH"
python3 scripts/follow-game-releases.py pin --ziran ../../ziranlang/ziran/build/bin/ziran
python3 - <<'PY' >> "$GITHUB_OUTPUT"
import json
lock = json.load(open('ziran.lock'))
shovey = lock['root']['dependencies']['shovey']
print('shovey=' + next(p['commit'] for p in lock['packages'] if p['id'] == shovey))
PY
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
if: steps.pin.outputs.changed == 'true'
with:
repository: ziranlang/ziran
ref: ${{ steps.pin.outputs.toolchain }}
path: ziranlang/ziran
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
if: steps.pin.outputs.changed == 'true'
if: steps.updates.outputs.changed == 'true'
with:
repository: waozixyz/shovey
ref: ${{ steps.pin.outputs.shovey }}
path: waozixyz/shovey
- name: Install build dependencies
if: steps.pin.outputs.changed == 'true'
working-directory: .
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-cryptography
- name: Build the locked toolchain and fetch packages
if: steps.pin.outputs.changed == 'true'
- name: Fetch the updated packages
if: steps.updates.outputs.changed == 'true'
run: |
make -j2 -C ../../ziranlang/ziran
echo "$GITHUB_WORKSPACE/ziranlang/ziran/build/bin" >> "$GITHUB_PATH"
# The game is generated in its own checkout at the pinned release.
printf '[overrides]\nshovey = "../shovey"\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
../../ziranlang/ziran/build/bin/ziran fetch
- name: Write the Arcade release
id: release
if: steps.pin.outputs.changed == 'true'
if: steps.updates.outputs.changed == 'true'
run: |
python3 scripts/follow-game-releases.py changelog --ziran ../../ziranlang/ziran/build/bin/ziran
sh update_version.sh
@@ -82,7 +97,7 @@ jobs:
echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
head -12 CHANGELOG.md
- name: Build and check the collection
if: steps.pin.outputs.changed == 'true'
if: steps.updates.outputs.changed == 'true'
run: |
make -C ../shovey levels landscape
make collection
@@ -90,18 +105,18 @@ jobs:
python3 tests/publisher_test.py
- name: Commit the release
id: commit
if: steps.pin.outputs.changed == 'true'
if: steps.updates.outputs.changed == 'true'
env:
VERSION: ${{ steps.release.outputs.version }}
run: |
git config user.name Waozi
git config user.email [email protected]
git add ziran.lock CHANGELOG.md VERSION apps/versions.json assets/arcade/library
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 push origin HEAD:master
echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
- name: Attach the checked catalog and game archive
if: steps.pin.outputs.changed == 'true'
if: steps.updates.outputs.changed == 'true'
env:
GH_TOKEN: ${{ github.token }}
VERSION: ${{ steps.release.outputs.version }}
@@ -112,3 +127,17 @@ 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)"
# 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
# checks Arcade's newest release itself. Without it the timer follows.
- name: Start the node follower
if: steps.updates.outputs.changed == 'true'
env:
GH_TOKEN: ${{ secrets.RELEASE_FOLLOW_TOKEN }}
run: |
if [ -z "$GH_TOKEN" ]; then
echo "No RELEASE_FOLLOW_TOKEN: Breeze's node follower picks this release up on its timer."
exit 0
fi
gh workflow run node-app-follow.yml -R waozixyz/breeze --ref master
+70
View File
@@ -1,5 +1,75 @@
# Arcade changelog
## 0.7.96
- Shovey 0.6.157: Pip's tips keep what he points at in view: his card moves under the top bar when it would cover it, such as the home in level 1.
- Apfelwurm 0.2.4: Play on the whole page at wurm.waozi.xyz, without a title bar above the game.
## 0.7.95
- Shovey 0.6.157: Pip's tips keep what he points at in view: his card moves under the top bar when it would cover it, such as the home in level 1.
## 0.7.94
- The library's game covers download about four times faster.
## 0.7.93
- Shovey 0.6.156: Finishing all 175 levels opens a reward window: press Claim to get your Dew. The first 10 players to finish get 100 Dew, the next 20 get 50, players up to the 100th get 20, and everyone after gets 5.
## 0.7.92
- Shovey 0.6.156: Finishing all 175 levels opens a reward window: press Claim to get your Dew. The first 10 players to finish get 100 Dew, the next 20 get 50, players up to the 100th get 20, and everyone after gets 5.
## 0.7.91
- Shovey 0.6.155: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
- Apfelwurm 0.2.2: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
## 0.7.90
- Set an account alias with capitals, an @ or spaces; a taken alias now says so.
- Shovey 0.6.155: Set an account alias with capitals, an @ or spaces; a taken alias now says so.
## 0.7.89
- Apfelwurm 0.2.1: Use Arcade or Inner Breeze's Profile, Dew and navigation when playing inside them, without duplicate title controls or an extra Back button.
- Apfelwurm 0.2.1: Open the shared Profile reliably from the skin shop's sign-in button.
## 0.7.88
- Apfelwurm 0.2.0: Play with softer Dusk, Forest and Sage themes, with saved sound and control settings.
- Apfelwurm 0.2.0: See a continuous painted meadow instead of a repeating grass grid, and clear Profile and Dew icons on the title.
- Apfelwurm 0.2.0: Sign in through the shared Profile to sync completed levels, playtime, settings and your chosen character across devices.
- Apfelwurm 0.2.0: Browse the skin shop from the title beside Profile and your Dew balance. Mint, Berry and Rose cost 10, 20 and 30 Dew, with confirmation before buying.
- Apfelwurm 0.2.0: Earn Night owl after five hours of active play, Golden apple by reaching level 40, and Explorer by visiting waozi.xyz. Purchased skins belong to your account.
- Apfelwurm 0.2.0: Unlock all 200 levels by playing. The mobile selector shows large previews for unlocked levels and only a lock for later ones. Dew is used for optional cosmetics.
## 0.7.87
- Open the game library faster with smaller cached cover thumbnails for every game.
- Keep covers sharp and logos transparent while downloading much less artwork.
## 0.7.86
- Shovey 0.6.154: Keep opened chests open across restarts and account sync; show the blue Dew diamond only while their reward is unclaimed.
- Shovey 0.6.154: Show an empty open chest after its Dew is claimed.
- Shovey 0.6.154: Use corrected campaign boards after an update, including level 29 when an older campaign was cached offline.
## 0.7.85
- Shovey keeps opened and claimed chests synchronized, with a blue diamond only for an unclaimed reward.
- Shovey uses corrected boards after an update instead of an older cached campaign.
- Apfelwurm shows level previews only after they are unlocked.
## 0.7.84
- Complete automatic reward recovery for older Shovey saves.
## 0.7.83
- Preserve earned Shovey reward eligibility when upgrading older synced saves.
## 0.7.82
- Apfelwurm 0.1.6: Try again after game over starts the furthest unlocked level with three lives and a fresh score.
+2
View File
@@ -54,11 +54,13 @@ run: all
./build/arcade
test: all
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
INBE_SOURCE='$(INBE_SOURCE)' python3 tests/catalog_test.py
python3 tests/publisher_test.py
python3 tests/apps_controller_test.py
python3 tests/startup_art_test.py
./build/arcade --list
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
sh tests/chess_app_test.sh '$(ZIRAN)'
+9 -1
View File
@@ -6,12 +6,14 @@ title-screen covers from the shared Apps controller. Click a cover to open
an installed game or download it first. There are no separate launch buttons.
Standalone Shovey opens on its own cover carousel;
swipe, use the arrows or scroll the wheel to choose, then press Play/Open.
Its desktop startup first draws a small full-colour title preview, then uses
the original artwork when the collection is ready.
Chess is temporarily disabled in Arcade; its code and
existing saved games remain available for a later return.
Each edition has a separate save and earned unlocks. Unlocked puzzles show
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: small copies of each game's art in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes them when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
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;
standalone Shovey keeps its complete offline collection. Apfelwurm comes from
@@ -198,6 +200,12 @@ puzzle. Shovey also runs as its own desktop app.
## Shared Entity profile
Leaderboard is inside the shared Profile, including standalone Arcade and
Shovey. Games report their own level totals under their verified identity;
Profile shows only games that are installed, with friend rankings for a
connected account. Removing a game hides its board while retaining its save
and reported score. Account switches keep rankings separate.
Standalone Shovey's Profile control on its covers opens the shared `entity.zx`
supplied by the Entity package. The host keeps account keys and native file
access behind Entity's versioned management service. Returning from Profile
+1 -1
View File
@@ -1 +1 @@
0.7.82
0.7.96
+8 -8
View File
@@ -13,8 +13,8 @@
"shovey": {
"id": "arcade.shovey",
"title": "Shovey",
"version": "0.6.150",
"sequence": 158,
"version": "0.6.157",
"sequence": 165,
"host_api": 12
},
"shovey-island": {
@@ -27,22 +27,22 @@
"shovey-editor": {
"id": "arcade.shovey-editor",
"title": "Shovey Editor",
"version": "0.2.142",
"sequence": 144,
"version": "0.2.144",
"sequence": 146,
"host_api": 12
},
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.82",
"sequence": 161,
"version": "0.7.96",
"sequence": 175,
"host_api": 36
},
"wurm": {
"id": "xyz.waozi.wurm",
"title": "Apfelwurm",
"version": "0.1.6",
"sequence": 4,
"version": "0.2.4",
"sequence": 10,
"host_api": 12
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 561 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

+2 -1
View File
@@ -47,7 +47,8 @@ android {
'-DZIRAN_DIR=' + ziranDir,
'-DRAYLIB_DIR=' + raylibDir,
'-DAPP_CODEGEN=' + appCodegen,
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF')
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF'),
'-DGOOGLE_PLAY=' + (project.findProperty('app.googlePlay') == 'true' ? 'ON' : 'OFF')
}
}
}
+3
View File
@@ -26,6 +26,9 @@ set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
if(SHOVEY_STANDALONE)
list(APPEND APP_ZIRAN_DEFINES --define SHOVEY_STANDALONE)
endif()
if(GOOGLE_PLAY)
list(APPEND APP_ZIRAN_DEFINES --define GOOGLE_PLAY)
endif()
if(NOT DEFINED APP_CODEGEN)
set(APP_CODEGEN c99)
endif()
+1
View File
@@ -49,6 +49,7 @@ def main():
LIBOQS_DIR=str(package('liboqs')), MONOCYPHER_DIR=str(package('monocypher')))
command = ['sh', str(ROOT / 'droid/gradlew'), '-p', str(ROOT / 'droid'), '--no-daemon', '--max-workers=2',
'-Papp.product=shovey', '-Papp.abis=' + args.abis,
'-Papp.googlePlay=' + ('true' if args.bundle else 'false'),
'-Pkryon.dir=' + str(package('kryon')), '-Pziran.dir=' + str(package('ziran')),
'-Praylib.dir=' + str(package('raylib') / 'src'),
'-Papp.versionName=' + metadata['version'], '-Papp.versionCode=' + str(release['sequence']),
+13 -10
View File
@@ -22,15 +22,18 @@ def digest(path):
def library_art(root, name, key, source):
"""Arcade's committed small copy of a game's art (scripts/library-art.py).
The library shows art, the games download separately: never pack the
packages' full-size images, and never pack a copy of outdated art."""
"""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
of outdated art."""
library = Path(root) / "assets/arcade/library"
sources = json.loads((library / "sources.json").read_text())
copy = f"{name}-{key}"
if sources.get(copy, {}).get("source_sha256") != hashlib.sha256(source).hexdigest():
raise ValueError(f"{copy} art changed; run scripts/library-art.py")
return (library / f"{copy}.png").read_bytes()
for suffix in (".png", ".jpg"):
if (library / (copy + suffix)).is_file():
return (library / (copy + suffix)).read_bytes(), suffix
raise ValueError(f"{copy} has no library copy; run scripts/library-art.py")
def stage(root, controller, expected_controller_digest, output):
@@ -76,7 +79,7 @@ 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 = library_art(root, name, "preview", preview_bytes)
preview_bytes, preview_suffix = library_art(root, name, "preview", preview_bytes)
total += len(bundle_bytes) + len(preview_bytes)
child = dict(
id=identifier, title=game["title"],
@@ -84,8 +87,8 @@ def stage(root, controller, expected_controller_digest, output):
expected_id=name, version=component["version"],
sha256=hashlib.sha256(bundle_bytes).hexdigest(),
bytes=len(bundle_bytes),
preview=f"assets/arcade/previews/{name}.png",
icon=f"assets/arcade/previews/{name}.png")
preview=f"assets/arcade/previews/{name}{preview_suffix}",
icon=f"assets/arcade/previews/{name}{preview_suffix}")
# A thin add-on links its required games' verified code as libraries.
if app.get('shared_code'):
child['shared_code'] = True
@@ -108,8 +111,8 @@ def stage(root, controller, expected_controller_digest, output):
relative = Path(cover[key])
if relative.is_absolute() or ".." in relative.parts or relative.suffix != ".png":
raise ValueError("Invalid cover asset path")
contents = library_art(root, name, key, (app["source"] / relative).read_bytes())
destination = Path("arcade/covers") / f"{name}-{key}.png"
contents, suffix = library_art(root, name, key, (app["source"] / relative).read_bytes())
destination = Path("arcade/covers") / f"{name}-{key}{suffix}"
packed_cover[key] = "assets/" + destination.as_posix()
copies.append((contents, destination))
total += len(contents)
@@ -117,7 +120,7 @@ def stage(root, controller, expected_controller_digest, output):
children.append(child)
package["children"].append(identifier)
copies += [(bundle_bytes, Path("arcade/games") / (name + ".zx")),
(preview_bytes, Path("arcade/previews") / (name + ".png"))]
(preview_bytes, Path("arcade/previews") / (name + preview_suffix))]
if total > MAX_PAYLOAD_BYTES:
raise ValueError("Arcade collection exceeds the host's payload limit")
catalog = dict(schema=1, id=arcade["id"], title=arcade["title"],
+13 -4
View File
@@ -11,6 +11,18 @@ ROOT = Path(__file__).resolve().parents[1]
ZIRAN = str(ROOT / 'scripts/ziran.sh')
def stage_startup_art(source, output):
"""Draw small full-colour images before the collection's originals load."""
from PIL import Image
startup = output / 'startup/shovey'
startup.mkdir(parents=True, exist_ok=True)
for name, edge in [('title-portrait.png', 640), ('title-landscape.png', 640), ('logo.png', 512)]:
with Image.open(source / 'assets/shovey' / name) as original:
image = original.convert('RGBA' if 'A' in original.getbands() else 'RGB')
image.thumbnail((edge, edge), Image.Resampling.LANCZOS)
image.save(startup / name, optimize=True)
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--output', type=Path)
@@ -59,10 +71,7 @@ def main():
if args.standalone_shovey:
from PIL import Image
source = Path(subprocess.check_output([ZIRAN, 'pkg', 'path', 'shovey', *lock], cwd=ROOT, text=True).strip())
startup = output.parent / 'startup/shovey'
startup.mkdir(parents=True, exist_ok=True)
for name in ('title-portrait.png', 'title-landscape.png', 'logo.png'):
shutil.copyfile(source / 'assets/shovey' / name, startup / name)
stage_startup_art(source, output.parent)
Image.open(source / 'assets/branding/shovey-icon.png').resize((256, 256), Image.Resampling.LANCZOS).save(output.parent / 'shovey-icon.png')
print(('Shovey' if args.standalone_shovey else 'Arcade') + ' native build passed')
+65 -8
View File
@@ -6,8 +6,15 @@ the website passes the published one Inner Breeze downloads. Arcade's own host
is compiled to WebAssembly with the account Profile. The receipt names the
collection's digest and the Apps library it trusts. Arcade's own copy of that
library goes beside it for collections that do not pack one.
With --shovey the page is shovey.waozi.xyz: the same host runs a released
Shovey download's own shovey.zx, shovey.json and entity.zx, unchanged, on the
page files --site names. Their programs, and the game and Apps controller
packed in shovey.zx, are compiled into the page, so they run as fast as a
native build of them; the page still opens those exact bytes.
"""
import argparse
import gzip
import hashlib
import json
import os
@@ -25,6 +32,35 @@ def package(name):
return Path(subprocess.check_output([ZIRAN, 'pkg', 'path', name, *flags], cwd=ROOT, text=True).strip())
def compress(path):
"""A gzip copy beside path, which the page fetches first: Cloudflare
Pages does not compress binary files (apps.zx 1.9 MB -> 0.24 MB)."""
with open(path.with_name(path.name + '.gz'), 'wb') as raw:
with gzip.GzipFile(filename='', mode='wb', compresslevel=9, fileobj=raw, mtime=0) as packed:
packed.write(path.read_bytes())
def version_assets(output, receipt):
"""Keep the runtime, its data and the verified collection on one cache key."""
page = output / 'index.html'
html = page.read_text()
if '__ARCADE_ASSET_REVISION__' not in html:
return
digest = hashlib.sha256()
for name in ('runtime.js', 'runtime.wasm', 'runtime.data', 'arcade.json', 'apps.zx'):
path = output / name
if path.is_file():
digest.update(name.encode() + b'\0')
digest.update(path.read_bytes())
revision = digest.hexdigest()
page.write_text(html.replace('__ARCADE_ASSET_REVISION__', revision))
source = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=ROOT, text=True).strip()
(output / 'build.json').write_text(json.dumps({
'source_revision': source, 'version': receipt['version'],
'assets_sha256': revision,
}, indent=2) + '\n')
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--bundle', type=Path, default=ROOT / 'build/node-apps/arcade.zx')
@@ -33,32 +69,53 @@ def main():
parser.add_argument('--profile', type=Path, default=ROOT / 'build/entity.zx')
parser.add_argument('--controller', type=Path, default=ROOT / 'build/apps-ui/apps.zx')
parser.add_argument('--output', type=Path, default=ROOT / 'build/web-site')
parser.add_argument('--shovey', type=Path, help='a released Shovey download folder')
parser.add_argument('--site', type=Path, default=ROOT / 'site')
args = parser.parse_args()
bundle = args.bundle.resolve()
receipt = dict(id='inbe.arcade', version=args.version,
sha256=hashlib.sha256(bundle.read_bytes()).hexdigest(),
apps_sha256=args.controller_sha256)
if args.shovey:
bundle = (args.shovey / 'shovey.zx').resolve()
receipt = json.loads((args.shovey / 'shovey.json').read_text())
if receipt.get('id') != 'arcade.shovey-player' or \
hashlib.sha256(bundle.read_bytes()).hexdigest() != receipt.get('sha256'):
raise SystemExit('The Shovey download does not match its shovey.json')
args.profile = args.shovey / 'entity.zx'
args.controller_sha256 = receipt['apps_sha256']
args.version = receipt['version']
else:
bundle = args.bundle.resolve()
receipt = dict(id='inbe.arcade', version=args.version,
sha256=hashlib.sha256(bundle.read_bytes()).hexdigest(),
apps_sha256=args.controller_sha256)
# 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:
raise SystemExit('The receipt exceeds the host buffer')
work = ROOT / 'build/web'
work.mkdir(parents=True, exist_ok=True)
env = {**os.environ, 'ZIRAN': str(package('ziran') / 'build/bin/ziran')}
linked = [item for path in (bundle, args.profile.resolve()) for item in ('--linked', str(path))] \
if args.shovey else []
subprocess.run([sys.executable, str(package('entity') / 'scripts/build-web.py'),
'--bundle', str(bundle), '--profile', str(args.profile.resolve()),
'--output', str(work / 'runtime.html'),
'--output', str(work / 'runtime.html'), *linked,
'--entry', 'runtime:main', '--source', 'src/web/runtime.zi'], cwd=ROOT, env=env, check=True)
output = args.output.resolve()
if output.exists():
shutil.rmtree(output)
shutil.copytree(ROOT / 'site', output)
shutil.copytree(args.site, output)
for name in ('runtime.js', 'runtime.wasm', 'runtime.data'):
shutil.copyfile(work / name, output / name)
(output / 'arcade.json').write_text(json.dumps(receipt, indent=2) + '\n')
compress(output / 'runtime.data')
(output / 'arcade.json').write_text(text)
# Only the library the receipt trusts; the host refuses any other.
controller = args.controller.read_bytes() if args.controller.is_file() else b''
if hashlib.sha256(controller).hexdigest() == args.controller_sha256:
(output / 'apps.zx').write_bytes(controller)
compress(output / 'apps.zx')
else:
print('No matching Apps controller beside the collection; it must pack its own')
print(f'Arcade {args.version} for the browser in {output}')
version_assets(output, receipt)
print(f'{"Shovey" if args.shovey else "Arcade"} {args.version} for the browser in {output}')
if __name__ == '__main__':
+54 -50
View File
@@ -1,11 +1,11 @@
#!/usr/bin/env python3
"""Follow the published releases of Arcade's game packages.
`pin` moves each game package in ziran.lock to the commit of its repository's
latest published GitHub release, when that commit is ahead of the current pin.
Only the game's own entry changes: its dependencies keep Arcade's pins, so the
games build against the same Kryon and Apps as Arcade. The ids and layout are
the ones `ziran lock` writes. The updates are recorded in build/game-updates.json.
`check` records newer published game releases without changing dependencies.
`pin` selects their exact commits in ziran.toml and asks Ziran to update each
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
notes of its newest release, for update_version.sh to synchronize.
@@ -26,31 +26,6 @@ ROOT = Path(__file__).resolve().parents[1]
UPDATES = ROOT / 'build/game-updates.json'
def package_id(url, commit):
"""The id `ziran lock` gives a source at a commit (PkgSourceId)."""
return 'p' + hashlib.sha256((url + '\n' + commit).encode()).hexdigest()[:16]
def write_lock(lock):
"""The lock as Ziran writes it: sorted keys, one-line maps, packages kept
in their order."""
def value(item):
if isinstance(item, dict):
return '{' + ', '.join(json.dumps(k) + ': ' + json.dumps(item[k]) for k in sorted(item)) + '}'
return json.dumps(item)
def block(item, indent):
pad = ' ' * indent
fields = [pad + ' ' + json.dumps(k) + ': ' + value(item[k]) for k in sorted(item)]
return pad + '{\n' + ',\n'.join(fields) + '\n' + pad + '}'
text = '{\n "format": ' + json.dumps(lock['format']) + ',\n "packages": [\n'
text += ',\n'.join(block(item, 4) for item in lock['packages']) + '\n ],\n'
text += ' "root": ' + block(lock['root'], 2).lstrip() + ',\n'
text += ' "toolchain": ' + block(lock['toolchain'], 2).lstrip() + '\n}\n'
return text
def gh(*args):
return subprocess.check_output(['gh', *args], text=True).strip()
@@ -62,13 +37,9 @@ def repository(url):
return match[1]
def pin():
lock_path = ROOT / 'ziran.lock'
lock = json.loads(lock_path.read_text())
if write_lock(lock) != lock_path.read_text():
raise SystemExit('ziran.lock is not in the layout ziran lock writes')
def released_updates():
lock = json.loads((ROOT / 'ziran.lock').read_text())
names = json.loads((ROOT / 'games.json').read_text())['packages']
ledger = json.loads((ROOT / 'apps/versions.json').read_text())['node_apps']
updates = []
for name in names:
old_id = lock['root']['dependencies'][name]
@@ -76,30 +47,61 @@ def pin():
repo = repository(entry['url'])
tag = gh('release', 'view', '--repo', repo, '--json', 'tagName', '--jq', '.tagName')
commit = gh('api', f'repos/{repo}/commits/{tag}', '--jq', '.sha')
if not re.fullmatch(r'[0-9a-f]{40}', commit):
raise SystemExit(f'{name}: invalid release commit')
if commit == entry['commit']:
continue
# A later tag of the version Arcade already ships is not a new release.
if name in ledger and ledger[name]['version'] == tag.removeprefix('v'):
continue
# Release metadata can be recorded before the game is published.
# The pinned source must still advance to that release's commit.
# Never move back: the release must contain the pinned commit.
status = gh('api', f'repos/{repo}/compare/{entry["commit"]}...{commit}', '--jq', '.status')
if status != 'ahead':
print(f'{name}: release {tag} is {status} of the pinned {entry["commit"][:12]}; kept')
continue
new_id = package_id(entry['url'], commit)
entry['commit'] = commit
entry['id'] = new_id
for owner in [lock['root'], *lock['packages']]:
for alias, target in owner['dependencies'].items():
if target == old_id:
owner['dependencies'][alias] = new_id
updates.append({'name': name, 'repository': repo, 'tag': tag, 'commit': commit})
print(f'{name}: {repo} {tag} ({commit[:12]})')
lock_path.write_text(write_lock(lock))
return updates
def record_updates(updates):
UPDATES.parent.mkdir(parents=True, exist_ok=True)
UPDATES.write_text(json.dumps(updates, indent=2) + '\n')
def pin(ziran):
updates = released_updates()
manifest = ROOT / 'ziran.toml'
lock_path = ROOT / 'ziran.lock'
original_manifest = manifest.read_bytes()
original_lock = lock_path.read_bytes()
try:
for update in updates:
name, commit = update['name'], update['commit']
# Edit the declaration; only the package manager writes the graph.
section = re.compile(r'(^\[dependencies\.' + re.escape(name) +
r'\]\s*\n)([^\[]*)', re.M)
text = manifest.read_text()
match = section.search(text)
if match is None:
raise ValueError(f'{name}: missing dependency declaration')
body, count = re.subn(r'^ref[ \t]*=[ \t]*"[^"\n]*"[ \t]*$',
f'ref = "{commit}"', match[2], flags=re.M)
if count != 1:
raise ValueError(f'{name}: expected one dependency ref')
manifest.write_text(text[:match.start(2)] + body + text[match.end(2):])
subprocess.run([str(ziran), 'update', name], cwd=ROOT, check=True)
lock = json.loads(lock_path.read_text())
target = lock['root']['dependencies'][name]
entry = next(p for p in lock['packages'] if p['id'] == target)
if entry['commit'] != commit:
raise ValueError(f'{name}: Ziran did not select the released commit; remove its local override')
except BaseException:
manifest.write_bytes(original_manifest)
lock_path.write_bytes(original_lock)
raise
record_updates(updates)
def newest_notes(changelog):
"""The bullets of a changelog's newest numeric release."""
text = changelog.read_text()
@@ -149,11 +151,13 @@ def art():
if __name__ == '__main__':
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('command', choices=['pin', 'changelog', 'art'])
parser.add_argument('command', choices=['check', 'pin', 'changelog', 'art'])
parser.add_argument('--ziran', default=str(ROOT / 'scripts/ziran.sh'))
args = parser.parse_args()
if args.command == 'pin':
pin()
if args.command == 'check':
record_updates(released_updates())
elif args.command == 'pin':
pin(args.ziran)
elif args.command == 'changelog':
changelog(args.ziran)
else:
+49 -21
View File
@@ -1,10 +1,11 @@
#!/usr/bin/env python3
"""Make Arcade's small copies of each game's cover and preview art.
"""Stage bounded thumbnails for every game's library covers and previews.
Game packages keep their full-size art for their own players and stores.
Arcade only shows that art in its library, so it packs copies sized for the
screen with a 256-colour palette: about a fifth of the bytes, with no visible
change. Arcade stays a small launcher; the games download separately.
Library covers retain full colour and transparency at thumbnail resolution:
opaque cover art is a JPEG, a sixth of its PNG size, while logos keep their
transparency and previews their pixel art as PNG. Games keep their own
original title artwork. Arcade downloads this small art
bundle separately from its launcher and caches it by its content digest.
The copies and sources.json, which records the SHA-256 of the art each copy
was made from, are committed. The collection build uses them as they are,
@@ -20,25 +21,48 @@ from game_packages import declared_packages
ROOT = Path(__file__).resolve().parents[1]
LIBRARY = ROOT / 'assets/arcade/library'
# Longest side: covers fill the library's screen, logos sit on them and
# previews are small tiles and icons.
LONGEST = {'portrait': 1280, 'landscape': 1280, 'logo': 800, 'preview': 480}
PREVIEW_LONGEST = 480
COVER_LONGEST = 640
LOGO_LONGEST = 512
COVER_QUALITY = 85
SUFFIXES = ('.png', '.jpg')
def copy_path(name):
"""The committed copy for name, whichever format it was made in."""
for suffix in SUFFIXES:
if (LIBRARY / (name + suffix)).is_file():
return LIBRARY / (name + suffix)
raise FileNotFoundError(f'{name} has no library copy; run scripts/library-art.py')
def small_copy(data, key):
"""(bytes, suffix) of the library's copy of one picture."""
image = Image.open(io.BytesIO(data))
image.load()
scale = min(1.0, LONGEST[key] / max(image.size))
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
photo = key in ('portrait', 'landscape') and not alpha
if scale == 1.0 and key != 'preview' and not photo:
return data, '.png'
image = image.convert('RGBA' if alpha else 'RGB')
if scale < 1.0:
size = (round(image.width * scale), round(image.height * scale))
image = image.convert('RGBA' if 'A' in image.getbands() else 'RGB').resize(size, Image.Resampling.LANCZOS)
if 'A' in image.getbands():
image = image.convert('RGBA').quantize(256, method=Image.Quantize.FASTOCTREE, dither=Image.Dither.FLOYDSTEINBERG)
else:
image = image.convert('RGB').quantize(256, dither=Image.Dither.FLOYDSTEINBERG)
size = (max(1, round(image.width * scale)), max(1, round(image.height * scale)))
image = image.resize(size, Image.Resampling.LANCZOS)
if key == 'preview':
if alpha:
image = image.quantize(256, method=Image.Quantize.FASTOCTREE, dither=Image.Dither.FLOYDSTEINBERG)
else:
image = image.quantize(256, dither=Image.Dither.FLOYDSTEINBERG)
output = io.BytesIO()
if photo:
image.save(output, 'JPEG', quality=COVER_QUALITY, optimize=True, progressive=True)
return output.getvalue(), '.jpg'
image.save(output, 'PNG', optimize=True)
return output.getvalue()
return output.getvalue(), '.png'
def art(root=ROOT):
@@ -57,15 +81,19 @@ def art(root=ROOT):
def main():
LIBRARY.mkdir(parents=True, exist_ok=True)
sources = {}
written = set()
for name, key, data in art():
copy = f'{name}-{key}'
(LIBRARY / f'{copy}.png').write_bytes(small_copy(data, key))
contents, suffix = small_copy(data, key)
(LIBRARY / (copy + suffix)).write_bytes(contents)
written.add(copy + suffix)
sources[copy] = {'source_sha256': hashlib.sha256(data).hexdigest()}
for stale in LIBRARY.glob('*.png'):
if stale.stem not in sources:
stale.unlink()
for suffix in SUFFIXES:
for stale in LIBRARY.glob('*' + suffix):
if stale.name not in written:
stale.unlink()
(LIBRARY / 'sources.json').write_text(json.dumps(dict(sorted(sources.items())), indent=2) + '\n')
total = sum((LIBRARY / f'{copy}.png').stat().st_size for copy in sources)
total = sum((LIBRARY / name).stat().st_size for name in written)
print(f'{len(sources)} library images, {total / 1048576:.1f} MiB')
+55 -9
View File
@@ -10,6 +10,9 @@
<link rel="icon" href="icon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link rel="manifest" href="manifest.webmanifest">
<!-- The runtime downloads while the page fetches the collection's files. -->
<link rel="preload" href="runtime.js?v=__ARCADE_ASSET_REVISION__" as="script">
<link rel="preload" href="runtime.wasm?v=__ARCADE_ASSET_REVISION__" as="fetch" type="application/wasm" crossorigin>
<meta property="og:type" content="website">
<meta property="og:url" content="https://arcade.waozi.xyz/">
<meta property="og:title" content="Arcade">
@@ -41,6 +44,12 @@
(function () {
var loading = document.getElementById('loading');
var bar = loading.querySelector('.bar');
var assetRevision = '__ARCADE_ASSET_REVISION__';
function assetUrl(name) {
var url = new URL(name, document.baseURI);
url.searchParams.set('v', assetRevision);
return url.href;
}
function failed() { loading.classList.add('error'); }
// Arcade's Profile reports ready once the library is about to draw.
function watch() {
@@ -49,6 +58,7 @@
}
window.Module = {
canvas: document.getElementById('canvas'),
locateFile: assetUrl,
setStatus: function (text) {
var match = /\((\d+(?:\.\d+)?)\/(\d+)\)/.exec(text || '');
if (match) bar.style.width = Math.min(100, 100 * match[1] / match[2]) + '%';
@@ -56,26 +66,62 @@
onAbort: failed,
onExit: function (code) { if (code !== 0) failed(); }
};
// Bundles travel gzip-compressed beside their plain copies: Cloudflare
// does not compress binary files. Browsers without DecompressionStream,
// or a missing .gz, take the plain file; null when neither exists.
function plain(name) {
return fetch(assetUrl(name)).then(function (response) {
return response.ok ? response.arrayBuffer() : null;
});
}
function bundle(name) {
if (typeof DecompressionStream !== 'function') return plain(name);
return fetch(assetUrl(name + '.gz')).then(function (response) {
if (!response.ok) throw new Error(response.status);
return response.arrayBuffer();
}).then(function (packed) {
var head = new Uint8Array(packed, 0, Math.min(2, packed.byteLength));
// A server that already decoded it hands over the plain bytes.
if (head[0] !== 0x1f || head[1] !== 0x8b) return packed;
return new Response(new Blob([packed]).stream()
.pipeThrough(new DecompressionStream('gzip'))).arrayBuffer();
}).catch(function () { return plain(name); });
}
// The build receipt names the collection's digest and its trusted Apps
// library; Arcade's own copy of that library goes in beside it.
Promise.all([
fetch('arcade.json', { cache: 'no-cache' }).then(function (response) {
fetch(assetUrl('arcade.json'), { cache: 'no-cache' }).then(function (response) {
if (!response.ok) throw new Error(response.status);
return response.text();
}),
fetch('apps.zx').then(function (response) {
return response.ok ? response.arrayBuffer() : null;
})
bundle('apps.zx'),
bundle('runtime.data')
]).then(function (loaded) {
Module.arcadeReceipt = loaded[0];
if (loaded[1]) {
Module.preRun = [function () { FS.writeFile('/apps.zx', new Uint8Array(loaded[1])); }];
}
var script = document.createElement('script');
script.src = 'runtime.js';
script.onerror = failed;
document.body.appendChild(script);
watch();
// The runtime's file package, already here, is not fetched again.
if (loaded[2]) {
Module.getPreloadedPackage = function () { return loaded[2]; };
}
function start() {
var script = document.createElement('script');
script.src = assetUrl('runtime.js');
script.onerror = failed;
document.body.appendChild(script);
watch();
}
// One sign-in for every waozi.xyz site: account.waozi.xyz hands over
// the shared profile before Arcade starts, or Arcade starts without it.
var started = false;
function go() { if (!started) { started = true; start(); } }
var shared = document.createElement('script');
shared.src = 'https://account.waozi.xyz/share.js';
shared.onload = function () { WaoziAccount.attach(Module, 2500).then(go, go); };
shared.onerror = go;
setTimeout(go, 4000);
document.head.appendChild(shared);
}).catch(failed);
})();
</script>
+38 -1
View File
@@ -43,6 +43,7 @@ Codec :: #import "apps/node_codec";
#import "entity/publications_read"
#import "entity/entity_records"
#import "entity/entity_dew"
#import "entity/leaderboard_native"
#import "kryon/widget_palette"
#import "kryon/image_raster"
#import "kryon/loading_indicator"
@@ -133,7 +134,7 @@ CollectionAllows :: (context: *void, node: *AppNode, name: string) -> bool {
name == "tile_map.sampling" || name == "arcade.controls" || name == "arcade.sound" || name == "arcade.navigation" ||
name == "arcade.updates" ||
name == PUBLICATIONS_READ_SERVICE || name == ENTITY_RECORDS_SERVICE || name == ENTITY_DEW_SERVICE ||
name == "entity.profile"
name == "entity.profile" || name == "leaderboard"
}
CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
@@ -176,6 +177,12 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
HostScalarValid(arguments[1], "string", cast(s32)HostString) {
service := AppArgumentText(arguments[0])
request := AppArgumentText(arguments[1])
if service == "leaderboard" {
saved := EntityLeaderboardReport("arcade", "Arcade", TextUntilNul(node.identity.id[:]),
TextUntilNul(node.entry.title[:]), request)
result.* = AppHostText(ifx saved then "{\"status\":\"saved\"}" else "{\"status\":\"rejected\"}")
return 1
}
// Public level collections, such as a game's live campaign.
if service == PUBLICATIONS_READ_SERVICE {
result.* = AppHostText(PublicationsReadAnswer(request))
@@ -322,6 +329,27 @@ CollectionWidgets :: (context: *void, node: *AppNode, module: *u8, function: *u8
return WidgetHostCall(context, module, function, arguments, count, result)
}
// Check the same saved install state and verified download plan as Apps.
// A cached payload or an old score alone is never installed membership.
CollectionLeaderboardInstalled :: (game: string) -> bool {
if !collection_ready { return false }
for slot: cast(s64)0..collection_host.tree.nodes.count - 1 {
parent := collection_host.tree.nodes[slot].node
if parent == null || !parent.collection { continue }
index := AppCatalogFind(*parent.catalog, game)
if index < 0 { continue }
entry := AppCatalogAt(*parent.catalog, index)
identity := AppIdentity.{.authority = parent.identity.authority, .id = entry.id}
state: AppState
plan: AppInstallPlan
if CollectionState(null, "local", *identity, *state) && state.installed &&
AppHostInstallPlan(*collection_host, parent, entry, *plan) && plan.count == 0 {
return true
}
}
return false
}
CollectionSave :: (context: *void, node: *AppNode) -> bool {
saved := collection_records
while saved != null {
@@ -400,6 +428,7 @@ CollectionController :: (context: *void) -> HostedAsset {
CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
data: string, locale: string) -> bool {
if collection_ready { return false }
leaderboard_installed = CollectionLeaderboardInstalled
collection_directory = data
collection_resource_root = Join(data, "resources")
opened := AppFilesOpen(*collection_resources, collection_resource_root)
@@ -464,8 +493,16 @@ CollectionOpenShovey :: (directory: string, data: string) -> bool {
return found && metadata_found && CollectionOpenShoveyBytes(bytes, metadata, data)
}
// Metadata of the standalone Shovey player, as the downloads and
// shovey.waozi.xyz carry it, rather than of Arcade's collection.
CollectionShoveyReceipt :: (metadata: string) -> bool {
id: [128]u8
return AppsReadText(metadata, 0, "id", id[:]) && TextUntilNul(id[:]) == "arcade.shovey-player"
}
CollectionOpenShoveyBytes :: (bytes: string, metadata: string, data: string) -> bool {
if collection_ready { return false }
leaderboard_installed = CollectionLeaderboardInstalled
id: [128]u8
digest: [65]u8
harness: [65]u8
+2
View File
@@ -18,6 +18,8 @@
sdl :: #system_library "SDL2";
SetTitle :: (window: *void, title: *u8) #foreign sdl "SDL_SetWindowTitle";
// First show small RGB/RGBA previews. The collection replaces them with its
// original artwork when ready, using the same layout and coloured logo.
DrawStartup :: (session: Session, directory: string, standalone: bool = true) -> bool {
if !PollDesktop() || WindowTakeCloseRequestHost() { return false }
BeginDesktopFrame()
+3
View File
@@ -43,6 +43,9 @@ EntityShoveyTokens :: () {
EntityOpen :: (bytes: string, data: string, shovey: bool = false) -> bool {
entity_shovey = shovey
#if #defined(GOOGLE_PLAY) {
EntityHostAllowFunding(false)
}
if shovey { EntityShoveyTokens() }
root := Join(data, "entity")
defer { EntityFree(root) }
+9 -3
View File
@@ -1,6 +1,8 @@
// Arcade in the browser: the same arcade.zx Inner Breeze downloads, with its
// shared Apps library, the account Profile and each game downloaded from the
// node when someone opens it. Saves stay in the page's persistent storage.
// Given the released Shovey player instead, the shovey.zx and shovey.json of
// the downloads, it is shovey.waozi.xyz and opens on Shovey's covers.
using Canvas :: #import "kryon/Canvas";
#import "kryon/bundle_storage_web"
#import "kryon/app_files"
@@ -54,7 +56,8 @@ ArcadeFrame :: (session: Session) -> bool {
TreeCancel(session)
return false
}
if EndFrame(session) != FrameStatus.FrameOk { return false }
// Only damaged pixels are cleared and repainted; the rest of the page stays.
if EndCanvasUiFrame(session) != FrameStatus.FrameOk { return false }
TestDriverFrame(session)
CanvasCursor(session)
ok := EndCanvasFrame()
@@ -78,8 +81,11 @@ main :: () -> s32 {
// The page writes Arcade's own Apps controller beside the collection.
controller, controller_found := ReadEntireFile("/apps.zx")
if controller_found { collection_controller = controller } else { AppFileFree(controller) }
if !found || !profile_found || receipt == "" || !CollectionOpenBytes(bytes, receipt, data) { return 1 }
if !EntityOpen(profile, data) { unused CollectionClose(); return 1 }
if !found || !profile_found || receipt == "" { return 1 }
shovey := CollectionShoveyReceipt(receipt)
opened := ifx shovey then CollectionOpenShoveyBytes(bytes, receipt, data) else CollectionOpenBytes(bytes, receipt, data)
if !opened { return 1 }
if !EntityOpen(profile, data, shovey) { unused CollectionClose(); return 1 }
session := SessionOpen()
if !SessionValid(session) { unused CollectionClose(); return 1 }
defer { SessionClose(session) }
+85 -3
View File
@@ -1,6 +1,7 @@
"""Exercise packaging from the actual registered game builds, preserving bytes."""
import hashlib
import importlib.util
import io
import json
from pathlib import Path
import shlex
@@ -9,12 +10,16 @@ import tempfile
import unittest
import sys
import tarfile
from PIL import Image
ROOT = Path(__file__).resolve().parents[1]
sys.path.insert(0, str(ROOT / "scripts"))
spec = importlib.util.spec_from_file_location("build_collection", ROOT / "scripts/build-collection.py")
builder = importlib.util.module_from_spec(spec)
spec.loader.exec_module(builder)
art_spec = importlib.util.spec_from_file_location("library_art", ROOT / "scripts/library-art.py")
artist = importlib.util.module_from_spec(art_spec)
art_spec.loader.exec_module(artist)
class CollectionTests(unittest.TestCase):
@@ -73,11 +78,11 @@ class CollectionTests(unittest.TestCase):
self.assertEqual(child["protocol"], "node/2")
# The library packs its own small copy of each game's art.
self.assertEqual((self.output / child["preview"]).read_bytes(),
(ROOT / f"assets/arcade/library/{name}-preview.png").read_bytes())
artist.copy_path(f"{name}-preview").read_bytes())
for key, path in child["cover"].items():
if key in ("portrait", "landscape", "logo"):
self.assertEqual((self.output / path).read_bytes(),
(ROOT / f"assets/arcade/library/{name}-{key}.png").read_bytes())
artist.copy_path(f"{name}-{key}").read_bytes())
self.assertEqual((self.output / catalog["harness"]).read_bytes(), self.controller.read_bytes())
def test_changed_game_art_needs_fresh_library_copies(self):
@@ -88,6 +93,32 @@ class CollectionTests(unittest.TestCase):
with self.assertRaisesRegex(ValueError, "wurm-portrait art changed"):
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']}
for package in packages:
for app in package['apps']:
if not app['enabled'] or not app['cover']:
continue
child = children[app['descriptor']['id']]
for key in ('portrait', 'landscape', 'logo'):
if key not in app['cover']:
continue
original = (app['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:
limit = 512 if key == 'logo' else 640
self.assertLessEqual(max(thumbnail.size), limit)
self.assertLessEqual(thumbnail.width, source.width)
self.assertLessEqual(thumbnail.height, source.height)
self.assertAlmostEqual(thumbnail.width / thumbnail.height,
source.width / source.height, 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
thumbnail.mode == 'RGB' else 'PNG')
def test_editor_download_reuses_verified_shovey_assets(self):
catalog = self.stage()
children = {child['id']: child for child in catalog['children']}
@@ -221,7 +252,7 @@ class CollectionTests(unittest.TestCase):
(self.root / "games.json").write_text(json.dumps({"packages": []}))
self.assertEqual(self.stage()["children"], [])
self.assertFalse((self.output / "assets/arcade/games/shovey.zx").exists())
self.assertFalse((self.output / "assets/arcade/covers/shovey-portrait.png").exists())
self.assertFalse((self.output / "assets/arcade/covers/shovey-portrait.jpg").exists())
def test_unknown_declaration_field_rejected(self):
declaration = json.loads((self.root / "apps.json").read_text())
@@ -232,5 +263,56 @@ class CollectionTests(unittest.TestCase):
self.assertFalse(self.output.exists())
class LibraryThumbnailTests(unittest.TestCase):
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)
for y in range(1200) for x in range(900)])
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.format, 'JPEG')
self.assertEqual(thumbnail.size, (480, 640))
self.assertEqual(thumbnail.mode, 'RGB')
self.assertIsNone(thumbnail.getcolors(256))
def test_logo_retains_transparency(self):
source = Image.new('RGBA', (1200, 400), (45, 155, 90, 0))
source.paste((200, 35, 100, 255), (100, 50, 1100, 350))
data = io.BytesIO()
source.save(data, 'PNG')
contents, suffix = artist.small_copy(data.getvalue(), 'logo')
self.assertEqual(suffix, '.png')
with Image.open(io.BytesIO(contents)) as thumbnail:
self.assertEqual(thumbnail.size, (512, 171))
self.assertEqual(thumbnail.mode, 'RGBA')
self.assertEqual(thumbnail.getpixel((0, 0))[3], 0)
self.assertEqual(thumbnail.getpixel((256, 85))[3], 255)
def test_small_covers_are_not_enlarged(self):
source = Image.new('RGB', (120, 180), (25, 50, 75))
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, (120, 180))
def test_small_transparent_art_is_not_reencoded(self):
source = Image.new('RGBA', (120, 60), (25, 50, 75, 128))
data = io.BytesIO()
source.save(data, 'PNG')
self.assertEqual(artist.small_copy(data.getvalue(), 'logo'), (data.getvalue(), '.png'))
def test_thin_logos_keep_at_least_one_pixel(self):
source = Image.new('RGBA', (4096, 1), (25, 50, 75, 255))
data = io.BytesIO()
source.save(data, 'PNG')
with Image.open(io.BytesIO(artist.small_copy(data.getvalue(), 'logo')[0])) as thumbnail:
self.assertEqual(thumbnail.size, (512, 1))
if __name__ == "__main__":
unittest.main()
+23
View File
@@ -224,6 +224,12 @@ def main():
driver.press(label='Profile', role='button')
driver.wait(label='Account', role='text')
capture(child, 'arcade-profile')
driver.press(label='Leaderboard', role='button')
driver.wait(label='Leaderboard', role='text')
driver.wait(label='No leaderboard data yet.', role='text')
capture(child, 'leaderboard-empty')
driver.press(label='Back', role='button')
driver.wait(label='Account', role='text')
driver.press(label="Back", role="button")
driver.wait(label='Shovey', role='button')
assert not [path for path in (profile / 'resources/downloads').glob('*.zx') if path.stem in games]
@@ -261,6 +267,23 @@ def main():
saved = wait(lambda: record.read_bytes() if record.exists() else None, "Classic did not save")
driver.press(label="Back", role="button")
driver.wait(label="Shovey Editor", role="button")
driver.press(label='Profile', role='button')
driver.press(label='Leaderboard', role='button')
driver.wait(label='Shovey', role='button')
assert not driver.find(label='Apfelwurm', role='button'), 'An undownloaded game has a board'
assert not driver.find(label='Shovey Editor', role='button'), 'An unranked editor has a board'
capture(child, 'leaderboard-installed')
state = profile / 'resources/state/arcade.shovey.json'
state.parent.mkdir(parents=True, exist_ok=True)
state.write_text('{"v":1,"installed":0,"favorite":0}')
driver.wait(label='No leaderboard data yet.', role='text')
assert not driver.find(label='Shovey', role='button'), 'A retained score kept an uninstalled board visible'
state.write_text('{"v":1,"installed":1,"favorite":0}')
driver.wait(label='Shovey', role='button')
driver.press(label='Back', role='button')
driver.wait(label='Account', role='text')
driver.press(label='Back', role='button')
driver.wait(label='Shovey Editor', role='button')
assert not driver.find(label=sizes["shovey"], role="text"), "Installed games must omit their download size"
driver.press(label="Shovey Editor", role="button")
driver.wait(label='Download size: ' + sizes['shovey-editor'], role='text')
+109
View File
@@ -0,0 +1,109 @@
"""Released games must bring new dependency edges without moving backwards."""
import importlib.util
import json
from pathlib import Path
import subprocess
import tempfile
import tomllib
import unittest
from unittest.mock import patch
ROOT = Path(__file__).resolve().parents[1]
spec = importlib.util.spec_from_file_location('follow_game_releases', ROOT / 'scripts/follow-game-releases.py')
follower = importlib.util.module_from_spec(spec)
spec.loader.exec_module(follower)
class GameUpdates(unittest.TestCase):
def follow(self, comparison, same_commit=False, failure=False, wrong_commit=False):
with tempfile.TemporaryDirectory(prefix='arcade-release-metadata-') as temporary:
root = Path(temporary)
(root / 'apps').mkdir()
old = '1' * 40
new = old if same_commit else '2' * 40
lock = {'format': 1, 'toolchain': {'commit': 'compiler'},
'root': {'dependencies': {'wurm': 'old', 'other': 'unrelated'}},
'packages': [{'id': 'old', 'name': 'Apfelwurm',
'url': 'https://github.com/waozixyz/wurm.git',
'commit': old, 'ref': 'master', 'dependencies': {}},
{'id': 'unrelated', 'commit': 'unchanged', 'dependencies': {}}]}
original_lock = json.dumps(lock)
(root / 'ziran.lock').write_text(original_lock)
original_manifest = ('[package]\nname = "Arcade"\n\n[dependencies.wurm]\n'
'git = "https://github.com/waozixyz/wurm.git"\nref = "master"\n\n'
'[dependencies.other]\nref = "stable"\n')
(root / 'ziran.toml').write_text(original_manifest)
(root / 'games.json').write_text(json.dumps({'packages': ['wurm']}))
# Release metadata may name a release before its source is pinned.
(root / 'apps/versions.json').write_text(json.dumps({'node_apps': {'wurm': {'version': '0.2.0'}}}))
def gh(*arguments):
if arguments[0] == 'release':
return 'v0.2.0'
return comparison if '/compare/' in arguments[1] else new
def resolve(command, **kwargs):
self.assertEqual(command, ['verified-ziran', 'update', 'wurm'])
self.assertEqual(kwargs, {'cwd': root, 'check': True})
self.assertIn(f'ref = "{new}"', (root / 'ziran.toml').read_text())
declaration = tomllib.loads((root / 'ziran.toml').read_text())
self.assertEqual(declaration['dependencies']['wurm']['ref'], new)
self.assertEqual(declaration['dependencies']['other']['ref'], 'stable')
if failure:
(root / 'ziran.lock').write_text('partial resolver output')
raise subprocess.CalledProcessError(1, command)
# A package-manager result with a newly introduced Entity import.
# The follower must retain this graph verbatim, rather than
# replacing the game id while preserving its old empty edges.
lock['root']['dependencies']['wurm'] = 'released'
lock['packages'][0].update(id='released', commit=old if wrong_commit else new,
ref=new, dependencies={'entity': 'accounts'})
lock['packages'].append({'id': 'accounts', 'commit': 'new-entity', 'dependencies': {}})
(root / 'ziran.lock').write_text(json.dumps(lock))
updates = root / 'updates.json'
with patch.object(follower, 'ROOT', root), patch.object(follower, 'UPDATES', updates), \
patch.object(follower, 'gh', gh), patch.object(follower.subprocess, 'run', side_effect=resolve) as run:
# Discovery must not require a compiler or modify either input.
follower.record_updates(follower.released_updates())
self.assertEqual((root / 'ziran.lock').read_text(), original_lock)
self.assertEqual((root / 'ziran.toml').read_text(), original_manifest)
run.assert_not_called()
if failure or wrong_commit:
with self.assertRaises((subprocess.CalledProcessError, ValueError)):
follower.pin('verified-ziran')
self.assertEqual((root / 'ziran.lock').read_text(), original_lock)
self.assertEqual((root / 'ziran.toml').read_text(), original_manifest)
else:
follower.pin('verified-ziran')
calls = run.call_count
return json.loads((root / 'ziran.lock').read_text()), json.loads(updates.read_text()), old, new, calls
def test_new_release_refreshes_transitive_graph(self):
lock, updates, old, new, calls = self.follow('ahead')
self.assertEqual(lock['packages'][0]['commit'], new)
self.assertEqual(lock['root']['dependencies']['wurm'], lock['packages'][0]['id'])
self.assertEqual(lock['packages'][0]['dependencies'], {'entity': 'accounts'})
self.assertEqual(lock['packages'][1]['commit'], 'unchanged')
self.assertEqual(lock['toolchain']['commit'], 'compiler')
self.assertEqual((len(updates), calls), (1, 1))
def test_same_source_is_unchanged(self):
lock, updates, old, new, calls = self.follow('identical', same_commit=True)
self.assertEqual(lock['packages'][0]['commit'], old)
self.assertEqual((updates, calls), ([], 0))
def test_older_release_never_moves_the_pin_back(self):
lock, updates, old, new, calls = self.follow('behind')
self.assertEqual(lock['packages'][0]['commit'], old)
self.assertEqual((updates, calls), ([], 0))
def test_failed_resolution_restores_manifest_and_lock(self):
self.follow('ahead', failure=True)
def test_local_override_cannot_publish_wrong_game(self):
self.follow('ahead', wrong_commit=True)
if __name__ == '__main__':
unittest.main()
+3
View File
@@ -230,6 +230,9 @@ def main():
resize_owned_window(child, 480, 820)
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.wait(label='Got it', role='button')
driver.press(label='Got it', role='button')
driver.wait_gone(label='Got it', role='button')
assert (profile / 'games/arcade.shovey-player/records/controls').read_text() == 'off'
assert not driver.find(label='Continue', role='button'), 'Classic must open straight on a level'
assert driver.find(label='Shovey', role='image', visible=True), 'Shovey must be drawn as a picture'
+3
View File
@@ -117,6 +117,9 @@ def main():
answer_level_updates(driver)
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.wait(label='Got it', role='button')
driver.press(label='Got it', role='button')
driver.wait_gone(label='Got it', role='button')
# Entering play may save the untouched campaign; a fresh profile may
# have no record until the first move.
deadline = time.monotonic() + 10
+51
View File
@@ -0,0 +1,51 @@
"""Startup previews keep full colour and alpha while the originals stay intact."""
import importlib.util
from pathlib import Path
import tempfile
import unittest
from PIL import Image
ROOT = Path(__file__).resolve().parents[1]
spec = importlib.util.spec_from_file_location('build_desktop', ROOT / 'scripts/build-desktop.py')
desktop = importlib.util.module_from_spec(spec)
spec.loader.exec_module(desktop)
class StartupArtTests(unittest.TestCase):
def test_previews_keep_colour_alpha_and_aspect_ratio(self):
work = ROOT / 'build/scratch'
work.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(prefix='startup-art-', dir=work) as temporary:
root = Path(temporary)
source = root / 'source/assets/shovey'
source.mkdir(parents=True)
# A continuous RGB gradient needs more than a 256-colour palette.
gradient = Image.new('RGB', (900, 1200))
gradient.putdata([(x % 256, y % 256, (x + y) % 256)
for y in range(1200) for x in range(900)])
gradient.save(source / 'title-portrait.png')
gradient.transpose(Image.Transpose.ROTATE_90).save(source / 'title-landscape.png')
logo = gradient.resize((1200, 400)).convert('RGBA')
alpha = Image.new('L', logo.size, 0)
alpha.paste(255, (100, 50, 1100, 350))
logo.putalpha(alpha)
logo.save(source / 'logo.png')
originals = {path.name: path.read_bytes() for path in source.iterdir()}
output = root / 'output'
desktop.stage_startup_art(root / 'source', output)
expected = {'title-portrait.png': (480, 640),
'title-landscape.png': (640, 480), 'logo.png': (512, 171)}
for name, size in expected.items():
with self.subTest(image=name), Image.open(output / 'startup/shovey' / name) as preview:
self.assertEqual(preview.size, size)
self.assertEqual(preview.mode, 'RGBA' if name == 'logo.png' else 'RGB')
self.assertIsNone(preview.getcolors(256), 'Title previews must not use a 256-colour palette')
if name == 'logo.png':
self.assertEqual(preview.getpixel((0, 0))[3], 0)
self.assertEqual(preview.getpixel((256, 85))[3], 255)
self.assertEqual((source / name).read_bytes(), originals[name])
if __name__ == '__main__':
unittest.main()
+77
View File
@@ -0,0 +1,77 @@
"""Verify coloured startup previews, original covers and title transitions privately."""
import argparse
import json
import os
from pathlib import Path
import subprocess
import sys
import tempfile
from PIL import Image
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--binary', type=Path, required=True)
parser.add_argument('--driver-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'
sys.path.insert(0, str(args.driver_source / 'tests'))
from ui_driver import UiDriver
root = Path(__file__).resolve().parents[1]
output = root / 'build/scratch/title-progressive/ui'
output.mkdir(parents=True, exist_ok=True)
binary = args.binary.resolve()
driver = UiDriver(output / 'driver')
with tempfile.TemporaryDirectory(prefix='profile-', dir=output) as temporary:
profile = Path(temporary)
records = profile / 'games/arcade.shovey-player/records'
records.mkdir(parents=True)
(records / 'level-updates').write_text('off')
log_path = output / 'game.log'
with log_path.open('w') as log:
child = subprocess.Popen([str(binary)], cwd=binary.parent,
env=os.environ | driver.environment() |
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
'LANG': 'en_US.UTF-8', 'SDL_AUDIODRIVER': 'dummy'},
stdout=log, stderr=subprocess.STDOUT)
driver.attach(child, log_path)
try:
startup = driver.tree()
assert driver.last['frame'] <= 3, 'Preview must precede collection loading'
images = [node for node in startup if node['kind'] == 'image' and node['label'] == 'Shovey']
assert len(images) == 2, 'Startup must show the artwork and coloured logo together'
for node in images:
assert 'startup/shovey/' in node['detail']
with Image.open(node['detail']) as picture:
assert picture.mode in ('RGB', 'RGBA'), 'Startup art must retain full colour'
assert max(picture.size) <= 640, 'Startup must use a small preview'
(output / 'startup-tree.json').write_text(json.dumps(driver.last, indent=2) + '\n')
driver.wait(label='Play', role='button', timeout=60)
full = [node for node in driver.tree() if node['kind'] == 'image' and
'arcade/covers/shovey-' in node.get('detail', '')]
assert len(full) >= 2
assert any(max(Image.open(node['detail']).size) >= 1200 for node in full), \
'Ready cover must replace the preview with the original artwork'
windows = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).split()
assert len(windows) == 1
window = windows[0]
assert subprocess.check_output(['xdotool', 'getwindowpid', window], text=True).strip() == str(child.pid)
subprocess.run(['xdotool', 'windowmove', window, '0', '0'], check=True)
subprocess.run(['import', '-window', window, str(output / 'classic-ready.png')], check=True)
driver.key('right')
subprocess.run(['import', '-window', window, str(output / 'logo-fading.png')], check=True)
driver.wait(label='Editor', role='text')
driver.wait(label='Open', role='button')
driver.wait_idle(frames=5)
subprocess.run(['import', '-window', window, str(output / 'editor-ready.png')], check=True)
driver.key('left')
driver.wait(label='Classic', role='text')
driver.wait(label='Play', role='button')
assert child.poll() is None
finally:
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
print('Local title UI test: full-colour previews precede original covers; Classic/Editor transitions work')
+20 -1
View File
@@ -12,8 +12,16 @@ if (!site) throw new Error('Usage: node tests/web_site_test.mjs SITE_DIR');
const types = { '.html': 'text/html', '.js': 'text/javascript', '.wasm': 'application/wasm', '.json': 'application/json',
'.svg': 'image/svg+xml', '.png': 'image/png', '.jpg': 'image/jpeg', '.webmanifest': 'application/manifest+json' };
const server = createServer(async (request, response) => {
const path = normalize(decodeURIComponent(new URL(request.url, 'http://x').pathname)).replace(/^\/+/, '') || 'index.html';
const url = new URL(request.url, 'http://x');
const path = normalize(decodeURIComponent(url.pathname)).replace(/^\/+/, '') || 'index.html';
try {
// Model the previous runtime still cached under its unversioned URL.
// A new deployment must request its coherent runtime revision instead.
if (path === 'runtime.js' && !url.searchParams.has('v')) {
response.writeHead(200, { 'Content-Type': 'text/javascript', 'Cache-Control': 'public, max-age=14400' });
response.end('console.error("Stale cached Arcade runtime"); Module.onAbort();');
return;
}
const body = await readFile(join(site, path));
response.writeHead(200, { 'Content-Type': types[extname(path)] || 'application/octet-stream' });
response.end(body);
@@ -69,6 +77,17 @@ try {
if (!ready) await delay(250);
}
if (!ready && !failure) failure = 'the library never became ready';
if (ready) {
const resources = await command('Runtime.evaluate', {
expression: 'performance.getEntriesByType("resource").map(entry=>entry.name)', returnByValue: true });
const runtime = resources.result.value.map(name=>new URL(name)).filter(url=>
/\/(runtime\.(js|wasm|data)(\.gz)?|arcade\.json|apps\.zx(\.gz)?)$/.test(url.pathname));
const revisions = new Set(runtime.map(url=>url.searchParams.get('v')));
if (!runtime.some(url=>url.pathname.endsWith('/runtime.js')) ||
!runtime.some(url=>url.pathname.endsWith('/runtime.wasm')) ||
revisions.size !== 1 || !/^[a-f0-9]{64}$/.test([...revisions][0]))
failure = 'the runtime and collection files did not use one coherent cache revision';
}
// Let the library draw several frames before judging them.
await delay(3000);
const failed = console_lines.find(line => /frame failed|portable execution failed/.test(line));
+83 -82
View File
@@ -1,14 +1,6 @@
{
"format": 1,
"packages": [
{
"commit": "dc1cfe389905c63c0bb453727d06d72afc1fa0b0",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pa7d5e0ee3b284d04"},
"id": "p00b93f1ddcd2802f",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
"dependencies": {},
@@ -26,72 +18,39 @@
"ref": "master",
"url": "https://github.com/ziranlang/qrcode.git"
},
{
"commit": "d74348c2e288ac55740461f7e106cda365b4db4a",
"dependencies": {"apps": "pfb2b063c26a84c8b", "crypto": "pc23fbf455e97614d", "curl": "p1ca0e8d3c19dbe4c", "daochi_client": "p9972fcdd2d5ba999", "entity": "p6a3a2bd6315ab909", "game2d": "pf2f54c7603f6e861", "kryon": "p974af619ca377b85", "kss": "p1b13dda539ed2a39", "liboqs": "pecdb097af6ab16f7", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "practices": "p9079dde0fcc11248", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "p1d80baafaa5fa18a"},
"id": "p183b01bccc6424e7",
"name": "Inbe",
"ref": "master",
"url": "https://github.com/waozixyz/inbe.git"
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"dependencies": {"kryon": "p974af619ca377b85"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
"url": "https://github.com/kryonlabs/kss.git"
},
{
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"id": "p20eb23d3e6db3711",
"name": "Game2D",
"ref": "master",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "1f3e5e763dbee918ae8f8c44b84bb98f8d0fa2d6",
"commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea",
"dependencies": {},
"id": "p219661bf4be659ed",
"name": "sqlite",
"ref": "master",
"source": true,
"url": "https://github.com/sqlite/sqlite.git"
},
{
"commit": "be74b13fd9b991e63a96360e8f13d781cece964e",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pa7d5e0ee3b284d04", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "p2b0009b9bbaa09de",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "eb2b201a2da3bfc6fefd7ff2d8e476e3cb9e5bcb",
"dependencies": {},
"id": "p2f75403ea4cb61e4",
"id": "p1ca0e8d3c19dbe4c",
"name": "curl",
"ref": "master",
"source": true,
"url": "https://github.com/curl/curl.git"
},
{
"commit": "2f6f1f57d7de742ef7ebc01159c2315acf793d5b",
"dependencies": {"apps": "p00b93f1ddcd2802f", "crypto": "pc23fbf455e97614d", "curl": "p2f75403ea4cb61e4", "daochi_client": "p9972fcdd2d5ba999", "game2d": "p20eb23d3e6db3711", "kryon": "pa7d5e0ee3b284d04", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
"id": "p48228a6b7e2920d3",
"name": "Inbe",
"ref": "master",
"url": "https://github.com/waozixyz/inbe.git"
},
{
"commit": "e1f480f382d9443c4412133b55948374c77a5c21",
"commit": "5d1ee888094efc63d1fb25a58af93478b103d441",
"dependencies": {},
"id": "p4b0a50b49959e674",
"name": "liboqs",
"ref": "main",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
},
{
"commit": "d5c325f0c721544807fd03be2bf947036a6a25b2",
"dependencies": {"apps": "p00b93f1ddcd2802f", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793"},
"id": "p558b28f576b472dc",
"name": "Apfelwurm",
"id": "p1d80baafaa5fa18a",
"name": "sqlite",
"ref": "master",
"url": "https://github.com/waozixyz/wurm.git"
"source": true,
"url": "https://github.com/sqlite/sqlite.git"
},
{
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
@@ -102,9 +61,17 @@
"source": true,
"url": "https://github.com/raysan5/raylib.git"
},
{
"commit": "90cee1066a51e1f8961de06515f6e50bdaaf4490",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p974af619ca377b85", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "p6a3a2bd6315ab909",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "22d2ddbdc236796953c905a05a2cebf5ab1b4ff3",
"dependencies": {"liboqs": "p4b0a50b49959e674"},
"dependencies": {"liboqs": "pecdb097af6ab16f7"},
"id": "p7098ac9cd92f7e5f",
"name": "Oqs",
"ref": "master",
@@ -120,12 +87,21 @@
"url": "https://github.com/LoupVaillant/Monocypher.git"
},
{
"commit": "68435298b9585004cd3cce6ed6316a2a02e6e9bf",
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p2b0009b9bbaa09de", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793"},
"id": "p84d02bbf02a6c436",
"name": "Shovey",
"commit": "8b81994303400255ddb0ee2da49044dbaef4397f",
"dependencies": {},
"id": "p9079dde0fcc11248",
"name": "practices",
"ref": "master",
"url": "https://github.com/waozixyz/shovey.git"
"source": true,
"url": "https://github.com/waozixyz/practices.git"
},
{
"commit": "3fad22341997f7c58ed1b11b1e88217358e51af5",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p974af619ca377b85",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "25d9f649c43a8de44a5fea602d2835e33e6ca999",
@@ -135,25 +111,9 @@
"ref": "master",
"url": "https://github.com/ziranlang/daochi-client.git"
},
{
"commit": "357a71d1ee2c7c9526c2af18793ea8628c505034",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pa7d5e0ee3b284d04", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pa4da0de6c3c44e61",
"name": "Self",
"ref": "master",
"url": "https://github.com/waozixyz/self.git"
},
{
"commit": "bab522f4edf3dee69827fbd09fafb2639311e1c6",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "pa7d5e0ee3b284d04",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"dependencies": {"kryon": "p974af619ca377b85"},
"id": "pab5377a2950368a2",
"name": "plot",
"ref": "master",
@@ -174,14 +134,55 @@
"name": "mingcute",
"ref": "master",
"url": "https://github.com/kryonlabs/mingcute.git"
},
{
"commit": "b9ca6de322881b40139ba6d19a0744eda1128db0",
"dependencies": {"apps": "pfb2b063c26a84c8b", "entity": "p6a3a2bd6315ab909", "kryon": "p974af619ca377b85", "mingcute": "pe1027b9d16704793"},
"id": "pe8259811ea138316",
"name": "Apfelwurm",
"ref": "b9ca6de322881b40139ba6d19a0744eda1128db0",
"url": "https://github.com/waozixyz/wurm.git"
},
{
"commit": "4778aa5044bf119c30df54219fa89357080af27f",
"dependencies": {},
"id": "pecdb097af6ab16f7",
"name": "liboqs",
"ref": "main",
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
},
{
"commit": "cee04692f3461dcb098833472f071c434980debb",
"dependencies": {"kryon": "p974af619ca377b85"},
"id": "pf2f54c7603f6e861",
"name": "Game2D",
"ref": "master",
"url": "https://github.com/kryonlabs/game2d.git"
},
{
"commit": "2419a7c645d3e2cfe904fc98763e06ee57cabbde",
"dependencies": {"apps": "pfb2b063c26a84c8b", "entity": "p6a3a2bd6315ab909", "kryon": "p974af619ca377b85", "mingcute": "pe1027b9d16704793"},
"id": "pf9aaac00f44c39f6",
"name": "Shovey",
"ref": "2419a7c645d3e2cfe904fc98763e06ee57cabbde",
"url": "https://github.com/waozixyz/shovey.git"
},
{
"commit": "dc6b743b5299318fa74bd32854b0eff0046d24a2",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p974af619ca377b85"},
"id": "pfb2b063c26a84c8b",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
}
],
"root": {
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p2b0009b9bbaa09de", "inbe": "p48228a6b7e2920d3", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793", "shovey": "p84d02bbf02a6c436", "wurm": "p558b28f576b472dc"},
"dependencies": {"apps": "pfb2b063c26a84c8b", "entity": "p6a3a2bd6315ab909", "inbe": "p183b01bccc6424e7", "kryon": "p974af619ca377b85", "mingcute": "pe1027b9d16704793", "shovey": "pf9aaac00f44c39f6", "wurm": "pe8259811ea138316"},
"name": "Arcade"
},
"toolchain": {
"commit": "5efa24f818485cf265bdd5c066a4e2150175ac0e",
"commit": "2e2fea84d91ead3c5af4a105c7d716cfa8bb6a31",
"ref": "master",
"url": "https://github.com/ziranlang/ziran.git"
}
+2 -2
View File
@@ -39,7 +39,7 @@ ref = "master"
# Shovey's editions and editor are available as separate downloads.
[dependencies.shovey]
git = "https://github.com/waozixyz/shovey.git"
ref = "master"
ref = "2419a7c645d3e2cfe904fc98763e06ee57cabbde"
# Compatibility tooling runs Inner Breeze's host checks; releases check its publisher pins.
[dependencies.inbe]
@@ -56,4 +56,4 @@ ref = "master"
[dependencies.wurm]
git = "https://github.com/waozixyz/wurm.git"
ref = "master"
ref = "b9ca6de322881b40139ba6d19a0744eda1128db0"