Compare commits

...
Author SHA1 Message Date
waozi fc3eb2b65f Make Arcade producer bundles compatible with Breeze 2026-11-20 01:50:28 -03:00
waozi 3f1b939993 Take Apfelwurm 0.2.34 from its published release
Wurm v0.2.34 was released from 962baf55 on Kryon 6816ed78, whose Android
editions keep their reminder receivers; Arcade's catalog fetches that
release's portable export, which must come from the pinned commit.
2026-11-18 12:43:34 -03:00
waozi a699f0d41d Release Arcade catalog 0.7.126 on Ziran 0.6.0
Build the catalog on the released graph (Ziran 0.6.0 d17c7aa1, Kryon
1b290f19, Apps 7854da88) with Shovey 0.6.171, Apfelwurm 0.2.34 and Choano
as one-format ZX 28 games, so the current Inner Breeze can open them.
Trust the standalone Apps 7854 controller, name liboqs directly because
Inner Breeze's graph now carries two revisions, and read game bundle
indexes through build/zx-metadata in the collection test. Record the
raylib-free lane's newer pins and the Android seed catalog's ZX 28 reader
as open work.
2026-11-17 02:53:34 -03:00
waozi 712e99ed57 Build with Kryon b45cc524
Pin Kryon b45cc524, Apps 352901eb, Entity b30dd4a4 and Shovey 19b7937d, the set Breeze shares, and trust the controller built from them.

Known: make test still stops at check-games (the ledger records Shovey 0.6.169 and editor 0.2.149) and needs ZX 28 exports from wurm and choano.
2026-11-16 13:09:14 -03:00
waozi c797ea22c2 Build with Kryon cc731751 and take Entity's Profile artifact
Pin Kryon cc731751, Apps d48be1a9, Entity 81a4a900 and Shovey 371acbaf, and trust the controller built from them. build-entity.py asks Entity for its native-profile artifact instead of naming Kryon's old flat module folders.

Known: make test still stops at check-games (the ledger records Shovey 0.6.169 and editor 0.2.149) and needs ZX 28 exports from wurm and choano.
2026-11-16 07:20:16 -03:00
waozi 7417c15912 Read one-format ZX game exports and build on Kryon 245605c3
Ziran's one-format ZX has no bundle libraries, so add-ons carry their
game's code: collections no longer mark shared_code and apps.json no longer
accepts shared_code or library_entries. Game exports are ZX 28; the new
build/zx-metadata tool (scripts/zx_metadata.zi) verifies one with the Ziran
runtime without running it and reports its entry and assets, and the
artifact tests compile real ZX 28 fixtures.

The desktop, collection and Entity screens use Kryon's namespaced widgets.
Pin Ziran 0.5.0, Kryon 245605c3, Apps 1c84ea0b, Entity c1d88034 and Shovey
59a47447, and trust the controller built from them. The unused game
module-path helper is removed.

Known: the full make test needs ZX 28 exports from wurm and choano, and
the Android build still names kryon_android_raylib, which Kryon 245605c3
removed.
2026-11-16 05:27:55 -03:00
waozi 8af5a37b04 Check that Arcade opens the collection beside it
Arcade closed right after opening from Harmony's Apps: its build folder held
a binary from Nov 8 and a collection rebuilt on Nov 11 with a newer Ziran,
and the shared Apps host refused it ("unsupported ZIR version").

arcade --check opens that collection without a window. make, make test and
the install run it, so a binary is never left beside a collection it refuses.
2026-11-15 21:51:26 -03:00
waozi 35ae14131c Fix Arcade profile dismissal, icon and backup reminders 2026-11-08 11:58:09 -03:00
waozi 91819cf7b2 Sample each named game cover in website smoke test 2026-11-07 20:10:03 -03:00
waozi 148b6f7d84 Synchronize website smoke test with console install and launch flow 2026-11-07 19:39:21 -03:00
waozi 24fc03b7c8 Pin Choano AVIF with CSS theming 2026-11-07 18:36:31 -03:00
waozi 02912c2ac3 Release Arcade catalog 0.7.125 with the latest game releases 2026-11-07 20:45:00 +00:00
waozi 91f79bdda7 Release Arcade catalog 0.7.124 with the latest game releases 2026-11-07 20:09:49 +00:00
waozi 4192ea74c9 Build the website from the published Arcade's tagged source
The site serves the latest published arcade.zx but compiled its host from
master, so a master that already locks a newer Ziran (program format 62)
could not load the published 0.7.122 bundle (format 59): unsupported ZIR
version. Check out the release tag before reading the toolchain lock.
2026-11-07 16:37:36 -03:00
waozi 720f352f8e Release Arcade catalog 0.7.123 for host 43
Arcade and its games now build on Ziran 0e91eb43 (program format 62) for
Inner Breeze host API 43: Shovey 0.6.169, Apfelwurm 0.2.33, Choano 0.1.9
and Chess 1.2.2. Apps, Kryon and Entity move to the versions the new
host uses.
2026-11-07 16:03:46 -03:00
waozi 068f3312ff Release Arcade catalog 0.7.122 with the latest game releases 2026-11-04 04:27:45 +00:00
waozi cb84f07471 Release Arcade catalog 0.7.121 with the latest game releases 2026-11-04 03:06:09 +00:00
waozi 8d8d909913 Keep release discovery tests independent of build dependencies 2026-11-03 23:50:12 -03:00
waozi 83a75f938f Import Wurm's portable release when following game updates 2026-11-03 23:21:24 -03:00
waozi 178791301f Restore painted Arcade covers and refresh game packages 2026-11-03 18:03:29 -03:00
waozi 5268b9513b Export Shovey's games before following its release
Arcade imports only the games' own exports, which the follower never built,
so every Shovey release since the console redesign failed to import. The
pinned Shovey checkout now builds them with its locked compiler.
2026-11-03 17:06:48 -03:00
waozi 7b65b8a0ea Follow game releases with library art crops
library-art.py yields each copy's crop with its source; the release
follower unpacked three values and failed before writing the release.
A changed source or crop now rewrites the library copies.
2026-11-03 16:12:40 -03:00
waozi 9f900e4512 Keep the release ledger on the pinned Shovey version 2026-11-03 05:19:25 -03:00
waozi df2d05bef6 Release Arcade 0.7.119 console for catalog and native hosts 2026-11-03 05:02:06 -03:00
waozi 228bdcc821 Redesign Arcade as an artwork-led game console 2026-11-03 02:36:04 -03:00
waozi ef7d07d6ac Use small WebP thumbnails for Arcade library artwork 2026-11-02 14:01:17 -03:00
waozi 2e98b878a6 Release Arcade catalog 0.7.118 with the latest game releases 2026-11-02 04:43:13 +00:00
waozi 3007fa8ed2 Bound each separately loaded Arcade payload and use locked game packages 2026-11-02 01:28:27 -03:00
waozi 1063591d2f Keep qualified game UI imports in the Kryon namespace 2026-11-02 00:53:23 -03:00
waozi 6f6d13cbfa Accept the explicit node permission in the browser smoke test 2026-11-01 23:55:21 -03:00
waozi d5eb9ff080 Update shared sign-in and disambiguate the KSS build dependency 2026-11-01 23:40:30 -03:00
waozi 5a386646b9 Pin Entity sign-in and Android profile fixes 2026-11-01 23:08:01 -03:00
waozi b4cb5815c6 Adopt reviewed shared profile dependencies and lossless game packaging 2026-11-01 22:47:56 -03:00
waozi 22bbe66f7d Pass the KSS package to game bundles so Choano 0.1.5 and later build 2026-11-01 21:57:17 -03:00
waozi 8bef62f896 Offer the signed-in account to other Waozi apps on Android 2026-11-01 20:46:39 -03:00
waozi 02eb8248d8 Build liboqs with ML-KEM for device links 2026-11-01 20:03:27 -03:00
waozi 9bae15b7ce Build Arcade on Ziran 972dc244 so Breeze hosts reading ZX 26 open it
Toolchain b8d0ac17 wrote and read only ZX 27, which the Breeze host on
Ziran c8c6c96c refuses ("unsupported ZX version"). 972dc244 writes ZX 26
except for add-ons composing library modules (Shovey Editor) and reads both.
The rebuilt Apps controller differs only by that header: trust cc913d86.

The Android catalog check and tests accept both versions, and the
collection UI test answers consent before waiting for the library and
expects the declared titles shown since 755e0ae.
2026-10-31 12:23:56 -03:00
waozi 2975dd3f60 Keep release version validation independent of image build tools 2026-10-31 03:51:15 -03:00
waozi d44f1eee22 Load the signed Arcade library and previews with connection consent 2026-10-31 03:50:03 -03:00
waozi c2fd3a8921 Separate Arcade catalog and native host releases 2026-10-31 01:29:55 -03:00
waozi 51d002410a Prepare locked dependencies before publishing verified Android APKs 2026-10-31 00:19:28 -03:00
waozi 84225f873f Use the build dependency mode when verifying Android assets 2026-10-31 00:06:55 -03:00
waozi 50445a571a Release Arcade 0.7.116 as a thin Android launcher 2026-10-30 23:22:06 -03:00
waozi 41251f1d61 Use shared Android account key file filters 2026-10-30 22:01:16 -03:00
waozi a71021c7da Fix Android startup, offline game launch and launcher icon 2026-10-30 21:56:33 -03:00
waozi 30d347a393 Release Arcade 0.7.114 with approved Editor cover thumbnails 2026-10-30 20:49:29 -03:00
waozi ad2f5c252a Release Arcade 0.7.113 with correctly packaged Choano artwork 2026-10-30 19:58:35 -03:00
waozi e6693ad6c5 Preserve website readiness command line continuation 2026-10-30 19:14:30 -03:00
waozi 6dbad8d73f Include Choano in the collection release regression 2026-10-30 19:14:02 -03:00
waozi 755e0ae1d0 Show declared library titles with the shared Apps controller 2026-10-30 19:06:43 -03:00
waozi 244d3ef9a3 Add Choano to Arcade 2026-10-30 19:00:18 -03:00
waozi 80ac2c61a5 Restore Wurm launches in standalone Arcade 2026-10-30 02:19:04 -03:00
waozi d757bf455c Release Arcade 0.7.111 with the latest game releases 2026-10-30 03:54:37 +00:00
waozi 40d42a4d99 Release Arcade 0.7.110 with the latest game releases 2026-10-30 03:32:48 +00:00
waozi 7bb417c86c Verify separate game and editor catalog leaves 2026-10-29 22:59:33 -03:00
waozi d3f85d3425 Offer account-backed level sharing to Arcade editors 2026-10-29 22:24:11 -03:00
waozi 058ae8be0c Serve library thumbnails from the website 2026-10-29 19:57:01 -03:00
waozi e19fb2c761 Build Arcade's own Android APKs with the whole library offline
make android, android-fdroid and android-gplay pack the collection with every
game, its art and the Apps controller, and give the APK Arcade's icon. A
collection whose receipt says its games are packed opens without download
hooks. The Android workflow signs the three editions with Arcade's own key,
checks that only -gplay holds a Google library, and attaches them to the
node-arcade-VERSION release; Game updates and the node release start it.
2026-10-29 19:28:19 -03:00
waozi 2b4b9f9e37 Release Arcade 0.7.109 with the latest game releases 2026-10-29 21:33:43 +00:00
waozi c49c9b66ad Ship Arcade's Unreleased notes with the next followed release 2026-10-29 18:21:58 -03:00
waozi 004f813255 Ignore module imports when checking a game's text keys
Shovey imports shovey_theme, which shares the text key prefix.
2026-10-29 18:21:58 -03:00
waozi 53f6395939 Pin Shovey on its rewritten history
The old pin named a commit the history rewrite removed, so every
fetch failed. Pin the first rewritten commit whose tree matches the
public Shovey, so the release follower can move it to 0.6.162.
2026-10-29 18:21:58 -03:00
waozi 80518a9e93 Tell games on a desktop that the main input is a keyboard and mouse
The collection answers kryon.input.desktop: a native build from its
platform, and the bundle inside Breeze by asking Breeze, so games skip
their touch-controls question on a computer. arcade.controls mode follows.
2026-10-29 17:26:54 -03:00
waozi 6d2c43eb11 Leave Shovey Island out of Arcade
The owner keeps Shovey Island private, outside Git, so Shovey 0.6.160 no
longer declares it. Arcade's disabled "Coming Soon" Island tile and its
ledger entry asked for it anyway, and game updates stopped with
KeyError: 'shovey-island'.
2026-10-29 16:57:20 -03:00
waozi b75ca75b70 Build with the Ziran that locks Shovey's shared packages
Game updates could not follow Shovey 0.6.160: Shovey pins curl at the
commit Breeze takes as master, and Ziran 41244ad3 made two lock entries
with one id ("cannot update project lock"). Ziran a97e88b5 locks them
once.
2026-10-29 16:50:23 -03:00
waozi b1c8213e3e Take Play Billing from Kryon's Google Play edition file
Only the -gplay edition may name a Google library. The Play Billing
dependency and Kryon's PlayBilling source no longer sit inside an if in
build.gradle; the gplay edition applies Kryon's templates/android-gplay.gradle,
so the direct and F-Droid builds read no Google library. Kryon moves to
7217475d, which carries that file.
2026-10-29 16:28:12 -03:00
waozi e93839b45b Give Apps the host interface Arcade's players run
Apps 5b67236 checks games against AppPlatform.host_api, so the collection
players pass GAME_HOST_API. It moves with the game contract version into
src/game_contract.zi, shared by the standalone and collection players, and
check-games.py compares it with the standard and the ledger there.
2026-10-29 15:29:03 -03:00
waozi 904183956c Let Arcade's own players open host-41 games
Its game check still refused anything newer than host interface 12, so the
desktop players could not open the format-59 games of Arcade 0.7.108.
check-games.py now fails whenever GAME_HOST_API, the game standard and the
ledger name different host interfaces.
2026-10-29 15:24:50 -03:00
waozi d2a2799180 Open host-41 games in Arcade's own players
Apps cabc042 accepts games that declare host interface 41, so the desktop
and web players open the format-59 games of Arcade 0.7.108. Arcade pins
that reviewed Apps commit; the shared controller is unchanged.
2026-10-29 15:18:10 -03:00
waozi f5f1f7500d Run a game's Ziran asset preparation program
A catalog's prepare_assets may now name a .zi program as well as a .py
script. Arcade builds it with its own compiler and standard library, then
runs it from the game's checkout with the staged resources and generated
folders, as the Python step was run. Wurm's portable assets moved to Ziran.
2026-10-29 15:17:17 -03:00
waozi e5a952f221 Pin Shovey 1d3a2be and Apfelwurm 0.2.26 for Arcade 0.7.108
Shovey's campaign restyle and cave pieces match the live level campaign
on the node; Apfelwurm 0.2.26 gives the new skins plainer bodies. Both
declare host interface 41.
2026-10-29 14:14:32 -03:00
waozi c7be52fd7b Pin Shovey 576b084 with the 2.1.61 release wording
Only Shovey's changelog lines change: they name Inner Breeze 2.1.61 as the
release with the smaller app format.
2026-10-29 14:01:30 -03:00
waozi a0d7e69509 Raise the game contract to host interface 41
Games built in saved IR format 59 run only on hosts from 41, so the game
standard, Chess and the pinned Shovey 5b01cef and Apfelwurm d3f0a52
declare it. Released hosts keep their current games.
2026-10-29 13:47:12 -03:00
waozi 97f6465d27 Run Arcade 0.7.108 in Ziran's compact saved IR for host 41
The toolchain moves to Ziran 41244ad3 (saved IR format 59) and Apps to
ffebcc7, whose shared controller is e41f568f… Hosts read only their own
program format, so the collection and every game declare host interface
41; released Inner Breeze (host 40) keeps its current Arcade. Every game
gets a new version so the node accepts its new bytes: Shovey 0.6.160,
Editor 0.2.145, Island 0.4.8, Apfelwurm 0.2.25 and Chess 1.2.1.
2026-10-29 13:42:59 -03:00
waozi 4903caf607 Release Arcade 0.7.107 with the latest game releases 2026-10-29 14:40:07 +00:00
waozi 6cbb364c47 Release Arcade 0.7.106 with the latest game releases 2026-10-29 07:10:05 +00:00
waozi e140792243 Trust the reordered Apps controller 2026-10-29 04:01:29 -03:00
waozi 45bbb923ca Release Arcade 0.7.105 with the latest game releases 2026-10-29 04:09:23 +00:00
waozi e41df5dcc6 Trust the current Apps controller 2026-10-29 00:59:08 -03:00
waozi 67d63c9cb6 Keep Apps controller mismatch wording stable 2026-10-29 00:48:25 -03:00
waozi 55e654508d Report Apps controller digest mismatches 2026-10-29 00:48:04 -03:00
waozi 20edc6db9c Update Kryon for hosted overlays 2026-10-29 00:33:39 -03:00
waozi f8426f7c73 Update Kryon for hosted game bundles 2026-10-28 23:51:08 -03:00
waozi 09f2aa86c9 Advance the locked game toolchain 2026-10-28 23:22:40 -03:00
waozi e8594214a6 Exercise the current Apfelwurm launch and Back flow 2026-10-28 15:35:49 -03:00
waozi e3481ba30f Release Arcade 0.7.104 with the latest game releases 2026-10-28 17:49:51 +00:00
waozi 5841794413 Release Arcade 0.7.103 with the latest game releases 2026-10-28 16:32:15 +00:00
waozi 549872d581 Align game packages with the new Play Dew releases 2026-10-28 13:00:46 -03:00
waozi 89d356040d Advance Shovey Play release with shared Dew pricing 2026-10-28 12:39:25 -03:00
waozi 02601a6696 Update shared Profile with Play Dew savings 2026-10-28 12:34:48 -03:00
waozi 9216224da7 Include the shared 10 Dew option in hosted Google Play profiles 2026-10-28 11:58:25 -03:00
waozi 70b05d585e Release Arcade 0.7.101 with the latest game releases 2026-10-28 07:05:31 +00:00
waozi 2760ba162a Wait for Arcade's failure signal when the test frame races 2026-10-28 03:43:27 -03:00
waozi 3d5661f1a4 Keep Arcade recoverable after a failed installed game frame 2026-10-28 03:30:52 -03:00
waozi 10feef0941 Release Arcade 0.7.100 with the latest game releases 2026-10-27 22:24:38 +00:00
waozi 4e2119ac22 Pin Kryon that repaints separate changes apart 2026-10-27 18:53:09 -03:00
waozi 2e2bae31f3 Release Arcade 0.7.99 with the latest game releases 2026-10-27 21:48:39 +00:00
waozi 7ccefe55da Pin Kryon with cached canvas text and the last image looked up first 2026-10-27 18:30:37 -03:00
waozi a76516a5d3 Release Arcade 0.7.98 with Shovey 0.6.158
In Shovey's Google Play version, buy Dew in Profile through Google Play.
Pip explains wooden doors when Shovey walks up to one, rather than when
the level starts.
2026-10-27 18:08:04 -03:00
waozi 1b12719e11 Sell Dew through Google Play in Shovey's Google Play bundle
The Play bundle is now Kryon's Google Play edition (app.edition=gplay).
It compiles Kryon's PlayBilling class from the Kryon checkout, adds Play
Billing 9.1.0 with one Kotlin version, uses AndroidX and needs Android 6.
Entity's edition turns Monero funding off there, so the Profile's Top up
opens Entity's Dew page with Play's prices instead of dew.waozi.xyz;
Arcade no longer disables funding itself. The direct download keeps
Monero.
2026-10-27 18:06:50 -03:00
waozi 3a62cd55b6 Release Arcade 0.7.97 with the latest game releases 2026-10-27 21:05:53 +00:00
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
133 changed files with 8123 additions and 851 deletions

No files matched your search

+49
View File
@@ -0,0 +1,49 @@
name: Export locked games
description: Prepare game-owned exports, downloading Wurm's compiled release unchanged.
runs:
using: composite
steps:
- id: games
shell: bash
working-directory: waozixyz/arcade
run: |
python3 - <<'PY' >> "$GITHUB_OUTPUT"
import json
lock = json.load(open('ziran.lock'))
for name in ('shovey', 'wurm', 'choano'):
identifier = lock['root']['dependencies'][name]
print(name + '=' + next(p['commit'] for p in lock['packages'] if p['id'] == identifier))
PY
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
repository: waozixyz/shovey
ref: ${{ steps.games.outputs.shovey }}
path: waozixyz/shovey
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
repository: waozixyz/wurm
ref: ${{ steps.games.outputs.wurm }}
path: waozixyz/wurm
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
repository: waozixyz/choano
ref: ${{ steps.games.outputs.choano }}
path: waozixyz/choano
- shell: bash
working-directory: waozixyz/arcade
run: |
python3 - <<'PY'
from pathlib import Path
for name in ('shovey', 'choano'):
(Path('..') / name / 'ziran.local.toml').write_text('[overrides]\nziran = "../../ziranlang/ziran"\n')
Path('ziran.local.toml').write_text('[overrides]\nziran = "../../ziranlang/ziran"\nshovey = "../shovey"\nwurm = "../wurm"\nchoano = "../choano"\n')
PY
(cd ../shovey && make levels landscape && python3 scripts/player.py collection --web)
(cd ../choano && make portable)
- name: Download the pinned Wurm portable release
shell: bash
working-directory: waozixyz/arcade
env:
GH_TOKEN: ${{ github.token }}
WURM_COMMIT: ${{ steps.games.outputs.wurm }}
run: python3 scripts/fetch-wurm-export.py --source ../wurm --commit "$WURM_COMMIT"
+213
View File
@@ -0,0 +1,213 @@
name: Android
# 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: Native host release version; empty uses VERSION at the chosen ref
required: false
type: string
permissions:
contents: write
concurrency:
group: arcade-android-${{ github.ref }}
cancel-in-progress: false
jobs:
release:
runs-on: ubuntu-latest
timeout-minutes: 10
outputs:
version: ${{ steps.release.outputs.version }}
due: ${{ steps.release.outputs.due }}
toolchain: ${{ steps.release.outputs.toolchain }}
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:
GH_TOKEN: ${{ github.token }}
REQUESTED: ${{ inputs.version }}
run: |
set -eu
version=$(cat VERSION)
if [ -n "$REQUESTED" ] && [ "$REQUESTED" != "$version" ]; then
echo "::error::$GITHUB_REF is at Arcade $version, not $REQUESTED"
exit 1
fi
# 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
python3 - <<'PY' >> "$GITHUB_OUTPUT"
import json
lock = json.load(open('ziran.lock'))
shovey = lock['root']['dependencies']['shovey']
print('toolchain=' + lock['toolchain']['commit'])
print('shovey=' + next(p['commit'] for p in lock['packages'] if p['id'] == shovey))
PY
echo "version=$version" >> "$GITHUB_OUTPUT"
echo "due=$due" >> "$GITHUB_OUTPUT"
build:
needs: release
if: needs.release.outputs.due == 'true'
runs-on: ubuntu-24.04
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
edition: [direct, fdroid, gplay]
defaults:
run:
working-directory: waozixyz/arcade
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
path: waozixyz/arcade
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
repository: ziranlang/ziran
ref: ${{ needs.release.outputs.toolchain }}
path: ziranlang/ziran
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
repository: waozixyz/shovey
ref: ${{ needs.release.outputs.shovey }}
path: waozixyz/shovey
# Only the Google Play edition may name a Google library, in its build
# files as in its APK.
- name: Keep Google libraries out of the normal and F-Droid build files
if: matrix.edition != 'gplay'
uses: kryonlabs/kryon/.github/actions/google-free@7217475dfa7f462939e47e3f0bc918aef248b179
with:
source: waozixyz/arcade
- name: Install build dependencies
working-directory: .
run: |
sh ziranlang/ziran/scripts/ci_packages.sh build-essential cmake pkg-config python3-pil python3-numpy python3-cryptography
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'
- name: Install the Android SDK parts Kryon's Android host needs
working-directory: .
run: |
sdkmanager="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
yes | "$sdkmanager" --licenses > /dev/null
"$sdkmanager" --install 'ndk;28.2.13676358' 'build-tools;36.0.0' 'platforms;android-36' 'cmake;3.22.1' > /dev/null
- name: Build the locked toolchain and fetch packages
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 locked release.
printf '[overrides]\nshovey = "../shovey"\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
../../ziranlang/ziran/build/bin/ziran fetch
- name: Export games in their owning repositories
uses: ./waozixyz/arcade/.github/actions/game-exports
- name: Build the APK
env:
EDITION: ${{ matrix.edition }}
run: |
if [ "$EDITION" = direct ]; then make android; else make "android-$EDITION"; fi
- name: Keep Google libraries out of the normal and F-Droid APK
if: matrix.edition != 'gplay'
uses: kryonlabs/kryon/.github/actions/google-free@7217475dfa7f462939e47e3f0bc918aef248b179
with:
packages: waozixyz/arcade/build/android/arcade*-unsigned.apk
source: ''
# The check must still recognise Play Billing, or its passes on the
# other editions prove nothing.
- name: Find Play Billing in the Google Play APK
if: matrix.edition == 'gplay'
uses: kryonlabs/kryon/.github/actions/google-free@7217475dfa7f462939e47e3f0bc918aef248b179
with:
packages: waozixyz/arcade/build/android/arcade-gplay-unsigned.apk
source: ''
expect-google: 'true'
- name: Sign and check the APK
env:
KEYSTORE: ${{ secrets.ARCADE_ANDROID_KEYSTORE }}
PASSWORD: ${{ secrets.ARCADE_ANDROID_KEYSTORE_PASSWORD }}
VERSION: ${{ needs.release.outputs.version }}
EDITION: ${{ matrix.edition }}
run: |
set -eu
umask 077
suffix=$([ "$EDITION" = direct ] && echo '' || echo "-$EDITION")
printf '%s' "$KEYSTORE" | base64 -d > "$RUNNER_TEMP/arcade-release.p12"
printf '%s\n' "$PASSWORD" > "$RUNNER_TEMP/password"
python3 scripts/android-release.py sign "build/android/arcade$suffix-unsigned.apk" \
--edition "$EDITION" --version "$VERSION" \
--keystore "$RUNNER_TEMP/arcade-release.p12" --password-file "$RUNNER_TEMP/password" \
--output "build/downloads/arcade-$VERSION$suffix.apk"
rm -f "$RUNNER_TEMP/arcade-release.p12" "$RUNNER_TEMP/password"
- uses: actions/upload-artifact@v4
with:
name: arcade-android-${{ matrix.edition }}
path: waozixyz/arcade/build/downloads/*.apk
if-no-files-found: error
retention-days: 7
publish:
needs: [release, build]
runs-on: ubuntu-latest
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: Verify all editions and publish the native host release
env:
GH_TOKEN: ${{ github.token }}
VERSION: ${{ needs.release.outputs.version }}
run: |
set -eu
for edition in direct fdroid gplay; do
suffix=$([ "$edition" = direct ] && echo '' || echo "-$edition")
python3 scripts/android-release.py verify "build/downloads/arcade-$VERSION$suffix.apk" \
--edition "$edition" --version "$VERSION"
done
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
+16 -10
View File
@@ -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,
@@ -15,6 +15,7 @@ on:
permissions:
contents: write
actions: write
concurrency:
group: arcade-node-release
@@ -32,7 +33,10 @@ 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
python3 tests/wurm_export_test.py
- name: Find newer game releases
id: updates
env:
@@ -59,7 +63,7 @@ jobs:
- 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
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential python3-pil python3-numpy python3-cryptography
- name: Build the locked toolchain and pin game dependencies
id: pin
if: steps.updates.outputs.changed == 'true'
@@ -92,14 +96,16 @@ 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: Prepare game-owned exports
if: steps.updates.outputs.changed == 'true'
uses: ./waozixyz/arcade/.github/actions/game-exports
- name: Build and check the collection
if: steps.updates.outputs.changed == 'true'
run: |
make -C ../shovey levels landscape
make collection
python3 tests/collection_test.py
python3 tests/publisher_test.py
@@ -111,8 +117,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
+6 -2
View File
@@ -10,6 +10,7 @@ on:
permissions:
contents: write
actions: write
concurrency:
group: arcade-node-release
@@ -26,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:
@@ -61,11 +64,12 @@ jobs:
# Generate the game in its own checkout, never in the package cache.
printf '[overrides]\nshovey = "../shovey"\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
../../ziranlang/ziran/build/bin/ziran fetch
- name: Export games in their owning repositories
uses: ./waozixyz/arcade/.github/actions/game-exports
- name: Build and verify the node catalog
env:
EXPECTED_SHA256: ${{ inputs.sha256 }}
run: |
make -C ../shovey levels landscape
make collection
python3 tests/collection_test.py
python3 tests/publisher_test.py
@@ -92,7 +96,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
+30 -11
View File
@@ -3,7 +3,9 @@ name: Website
# https://arcade.waozi.xyz runs Arcade in the browser: the latest published
# arcade.zx, the same one Inner Breeze downloads, with Arcade's own host
# compiled to WebAssembly. Every push to master and every Arcade release,
# manual or automatic, rebuilds and publishes it.
# manual or automatic, rebuilds and publishes it. The host builds from the
# source and toolchain that release was tagged at: master may already lock a
# newer program format the published arcade.zx does not carry yet.
on:
push:
branches: [master]
@@ -34,6 +36,23 @@ jobs:
path: waozixyz/arcade
ref: master
fetch-depth: 0
- name: Check out the published Arcade's source
id: published
env:
GH_TOKEN: ${{ github.token }}
run: |
tag=$(gh release list --repo waozixyz/arcade --limit 50 --json tagName,isDraft \
-q '[.[] | select(.isDraft | not) | .tagName | select(startswith("node-arcade-"))][0]')
test -n "$tag"
git fetch --force origin "refs/tags/$tag:refs/tags/$tag"
# Keep the current smoke gate while building the release's exact host.
smoke_test=$(mktemp)
cp tests/web_site_test.mjs "$smoke_test"
git checkout --detach "refs/tags/$tag"
cp "$smoke_test" tests/web_site_test.mjs
rm "$smoke_test"
echo "tag=$tag" >> "$GITHUB_OUTPUT"
echo "version=${tag#node-arcade-}" >> "$GITHUB_OUTPUT"
- name: Read the locked toolchain
id: toolchain
run: |
@@ -48,7 +67,7 @@ jobs:
node-version: 22
- name: Install build dependencies
working-directory: .
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential cmake pkg-config
run: sh ziranlang/ziran/scripts/ci_packages.sh build-essential cmake pkg-config python3-pil
- uses: mymindstorm/setup-emsdk@v14
with:
version: '6.0.6'
@@ -60,26 +79,26 @@ jobs:
printf '[overrides]\nziran = "../../ziranlang/ziran"\n' > ziran.local.toml
../../ziranlang/ziran/build/bin/ziran fetch
- name: Download the published Arcade
id: published
env:
GH_TOKEN: ${{ github.token }}
run: |
tag=$(gh release list --repo waozixyz/arcade --limit 50 --json tagName,isDraft \
-q '[.[] | select(.isDraft | not) | .tagName | select(startswith("node-arcade-"))][0]')
test -n "$tag"
mkdir -p build/published
gh release download "$tag" --repo waozixyz/arcade --pattern arcade.zx --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"
# Its game archive holds the library art the site serves itself.
gh release download '${{ steps.published.outputs.tag }}' --repo waozixyz/arcade \
--pattern arcade.zx --pattern arcade.games.tar --dir build/published
- name: Build the browser edition
run: |
python3 tests/web_library_art_test.py
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
run: |
python3 scripts/wait-published-games.py --deadline-seconds 900 --poll-seconds 30 \
build/published/arcade.zx build/published/arcade.games.tar
- name: Open Arcade in a private browser
run: |
export CHROMIUM="$(command -v google-chrome || command -v chromium)"
+1
View File
@@ -1,5 +1,6 @@
/build/
/backup/
/work/
/ziran.local.toml
__pycache__/
*.pyc
+181
View File
@@ -1,5 +1,186 @@
# Arcade changelog
## [Unreleased]
- Open the full Arcade catalog in Breeze and keep Choano progress available in the hosted game.
- Build on Ziran 0.5.0 and Kryon b45cc524 with its namespaced widgets. Game
exports are read as one-format ZX 28 through `build/zx-metadata`, which
verifies a bundle without running it. Add-ons carry their game's code, so
collections no longer mark `shared_code` and `apps.json` no longer accepts
`shared_code` or `library_entries`. The unused game module-path helper is
removed, and the Profile bundle comes from Entity's own `native-profile`
artifact.
- `arcade --check` opens the collection beside the binary without a window.
`make`, `make test` and the install run it, so a binary is never left next
to a collection it refuses; Arcade had closed right after opening from
Harmony's Apps when its build folder held a binary and a collection from
two different toolchains.
- Close Profile directly from its X button while keeping Back navigation through account pages.
- Use a neutral profile icon instead of the Shovey portrait.
- Remember completed account backups when reopening Arcade or using the same desktop account in another app.
- Runs games built for the latest Inner Breeze.
## 0.7.120
- Library covers show their original painted artwork again.
- Landscape uses the same cover carousel as portrait, on a scenic background.
- Clicking or tapping a cover beside the centre selects it; the centre cover starts the game.
- Missing games download on their cover with a progress bar while you keep browsing.
- Updating Arcade no longer brings back an older saved library with the wrong artwork.
- Shovey opens its proper title with the daily chest, profile and swipeable covers.
## 0.7.119
- Browse an artwork-led console shelf in portrait or landscape, with painted profile and Dew controls.
- Download games from their launch screens and return Home with progress saved; editors and drafts stay inside their games.
- Improve account sign-in, password entry and Android chest reminders.
- Preserve installed games and saves across library, host and Breeze updates.
## 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.
## 0.7.112
- Every library cover shows its declared app title, including Apfelwurm Editor.
- Choano appears in Arcade and launches from its own game package.
- Apfelwurm and Apfelwurm Editor open correctly in standalone Arcade.
## 0.7.111
- Apfelwurm 0.2.27: Earn coins for every level you clear and spend them on new skins.
- Apfelwurm 0.2.27: Claim a daily reward from the chest on the title: 30 days of coins, two new skins and rare Dew on days 10 and 25.
- Apfelwurm 0.2.27: The title has painted Shop, Profile, Leaderboard and Settings icons, with your coins and Dew beside the Shop.
- Apfelwurm 0.2.27: The Shop has Skins, Coins and Dew tabs: buy coin packs with Dew and top up Dew without leaving it.
- Apfelwurm 0.2.27: Browse thirteen skins with slimmer bodies, closer segments, clean edges and matching leaderboard pictures.
- Apfelwurm 0.2.27: Open the level editor directly from the title. Settings previews both touch control styles, or shows the steering keys on a computer.
- Apfelwurm 0.2.27: The level editor has its own title screen. Start a **New level** in any landscape you have reached, or copy one **From a level**.
- Apfelwurm 0.2.27: Keep your levels in **My levels**, in collections you can name and reorder. They stay private to you.
- Apfelwurm 0.2.27: Share a collection with your friends or everyone, and find other players' collections in **Community**. Added collections become your own private copies.
- Apfelwurm 0.2.27: Campaign levels you changed before still play as you made them; **Campaign changes** lists them so you can reset each one.
- Apfelwurm 0.2.27: Open the editor as its own **Apfelwurm Editor** app in Arcade.
- Apfelwurm 0.2.27: Play local desktop rounds with two to four players, separate bottom entrances and four keyboard control sets.
- Apfelwurm 0.2.27: Name each local player and pick their skin; start local rounds from Settings. Each open entrance has rock posts beside it.
- Apfelwurm 0.2.27: Play every level in the same layout in portrait and landscape, shaped after the portrait, with roomier portrait boards.
- Apfelwurm 0.2.27: Your own portrait level now also shapes its landscape until you save a landscape of your own.
- Apfelwurm 0.2.27: On a computer, play starts without asking how to steer, also inside Breeze and Arcade, and the keyboard steers without an on-screen pad.
- Apfelwurm 0.2.27: Level 19 is roomier: every side passage is wide enough to turn and come back out.
## 0.7.110
- Arcade is available as an Android app that plays every game offline, in normal, F-Droid and Google Play editions.
- On arcade.waozi.xyz the game covers appear sooner, as smaller WebP pictures from the site itself.
- Editors can share level collections through Arcade's signed-in Entity account.
- Shovey 0.6.163: Keep named collections in the Editor, share them with friends or everyone, and add new private collections from Explore.
- Shovey 0.6.163: Mirror and laser names and the level heading display correctly in every language.
## 0.7.109
- On a computer, games start without asking how to move, also inside Breeze.
- Shovey 0.6.162: Coloured pits have new artwork.
- Shovey 0.6.162: On a computer, play starts without asking how to move.
## 0.7.108
- Every game runs in Inner Breeze 2.1.61's smaller app format.
- Shovey 0.6.160, Editor 0.2.145 and Island 0.4.8, and Apfelwurm 0.2.26 with newly painted skins that have calm, plain bodies.
## 0.7.107
- Apfelwurm 0.2.24: Keep the entrance area free of enemies: none start there or wander in, so nothing vanishes when you lose a life.
- Apfelwurm 0.2.24: Restart Profile and Leaderboard by themselves if they stop, or say why instead of showing an empty page.
## 0.7.106
- Apfelwurm 0.2.23: Move a little faster throughout the campaign, with a consistent pace across Meadow.
## 0.7.105
- Apfelwurm 0.2.22: Keep the leaderboard visible when you or a friend uses a special Wurm skin.
## 0.7.104
- Apfelwurm 0.2.12: Download the Google Play edition as a separate `-gplay.apk`. The standard and F-Droid APKs exclude Google libraries and keep Monero top-ups.
## 0.7.103
- Apfelwurm 0.2.11: Buy a small 10 Dew pack in the Google Play edition and see each larger pack’s savings per Dew.
## 0.7.102
- Update Apfelwurm and Shovey with a small 10 Dew pack and visible larger-pack savings in their Google Play editions.
## 0.7.101
- Apfelwurm 0.2.10: Keep signed-in progress and unfinished runs after closing or updating Apfelwurm inside Arcade and Breeze.
- Apfelwurm 0.2.10: Restore earned unlocks from older account saves without changing completed levels or the current run.
- Apfelwurm 0.2.10: Give Apfelwurm its own Android launcher icon.
## 0.7.100
- Apfelwurm 0.2.9: More portal rooms in the mountains: five more boards have a walled corner room whose doorway closes, so a ring is the only way in, and boards there that bring portals use their room. Seven of the last twenty boards now have a portal room.
## 0.7.99
- Shovey 0.6.158: In the Google Play version, buy Dew in Profile through Google Play.
- Shovey 0.6.158: Pip explains wooden doors when Shovey walks up to one, rather than when the level starts.
- Apfelwurm 0.2.8: After the meadow, a new idea arrives every few dozen levels and keeps coming back: squirrels that dash and sit from level 45, hedgehogs that curl into a spiky ball as you come close from 85, keys that open a gate from 101, frogs that hop two tiles from 125, switch stones that open and close a gate from 141, rolling stones from 165 and portal rooms, reached only through a ring, from 181.
- Apfelwurm 0.2.8: Each new idea takes every other board for ten levels. After that, the ideas you have met take turns, with no more than two plain boards in a row.
- Apfelwurm 0.2.8: A gate closes a doorway up to four tiles wide. Its key opens it for good and is worth 2 points; a switch stone flips it each time you arrive on it. Boards with a gate or a portal room score more.
- Apfelwurm 0.2.8: New pictures for the squirrel, hedgehog, frog, rolling stone, key, switch stone and gate.
## 0.7.98
- Shovey 0.6.158: In the Google Play version, buy Dew in Profile through Google Play.
- Shovey 0.6.158: Pip explains wooden doors when Shovey walks up to one, rather than when the level starts.
## 0.7.97
- Apfelwurm 0.2.6: Glowing portals arrive from level 61: first on a few boards, then more often, with two pairs late in the mountains. Steer into one ring to come out of its partner, keeping your direction. Each ring stands in open ground, so you can always go around it.
- Apfelwurm 0.2.6: See your best run on the Profile leaderboard: the furthest level you reached and your highest score, as separate Level and Score columns ranked against your friends.
- Apfelwurm 0.2.6: Sign in once for every waozi.xyz site: a profile signed in on Arcade, Dew or here is used by the others in the same browser.
- Apfelwurm 0.2.6: Buy Dew inside the Google Play version through Google Play, priced in your own currency. The direct download and F-Droid versions keep buying Dew with Monero.
- Apfelwurm 0.2.6: The privacy page explains Google Play purchases and how to delete your account.
## 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.
+67 -6
View File
@@ -7,6 +7,8 @@ KRYON_DIR = $(shell $(ZIRAN) pkg path kryon $(LOCK_FLAGS))
# The shared Apps controller is built from the locked Apps package. Arcade
# trusts only the reviewed digest committed in apps-controller.sha256.
ENTITY_DIR = $(shell $(ZIRAN) pkg path entity $(LOCK_FLAGS))
# Optional manifest of already exported game artifacts (never compiler inputs).
GAME_ARTIFACT_MANIFEST ?=
APPS_BUNDLE := build/apps-ui/apps.zx
APPS_SHA256 := $(shell cat apps-controller.sha256)
INBE_SOURCE ?= $(shell $(ZIRAN) pkg path inbe $(LOCK_FLAGS))
@@ -17,11 +19,11 @@ LIB_DIR ?= $(HOME)/.local/lib/arcade
DATA_DIR ?= $(if $(XDG_DATA_HOME),$(XDG_DATA_HOME),$(HOME)/.local/share)
.PHONY: all build/arcade build/shovey standalone-ui-test collection-ui-test scroll-ui-test navigation-ui-test games collection collection-test run test chess-engine-test chess-app-test ui-test inbe-ui-test compatibility-test install
all: collection build/entity.zx build/arcade build/shovey
all: collection build/entity.zx build/arcade build/shovey collection-check
games:
python3 scripts/check-games.py
python3 scripts/build-games.py --ziran '$(ZIRAN)' $(LOCK_FLAGS)
games: build/zx-metadata
python3 scripts/check-games.py --ziran '$(ZIRAN)' $(LOCK_FLAGS)
python3 scripts/build-games.py --ziran '$(ZIRAN)' $(LOCK_FLAGS) $(if $(GAME_ARTIFACT_MANIFEST),--artifact-manifest '$(GAME_ARTIFACT_MANIFEST)')
$(APPS_BUNDLE): ziran.lock apps-controller.sha256 scripts/build-apps.py Makefile
$(ZIRAN) version > /dev/null
@@ -33,9 +35,34 @@ collection: games $(APPS_BUNDLE)
python3 scripts/build-collection.py --ziran '$(ZIRAN)' $(LOCK_FLAGS) \
--apps-bundle '$(APPS_BUNDLE)' --apps-sha256 '$(APPS_SHA256)'
# Reads a game export's entry and assets for build-games.py; nothing runs.
build/zx-metadata: scripts/zx_metadata.zi ziran.lock build/ziran/libziran.a
rm -rf build/zx-metadata-c
$(ZIRAN) build $(PROJECT) --target=c --root scripts --entry zx_metadata:main \
-o build/zx-metadata-c scripts/zx_metadata.zi
$(CC) -std=c11 -O1 -Wno-main -I'$(ZIRAN_ROOT)/include' -Ibuild/zx-metadata-c \
build/zx-metadata-c/*.c build/ziran/libziran.a -lm -lpthread -o $@
.PHONY: game-artifacts-test
game-artifacts-test: build/zx-metadata
python3 tests/game_artifacts_test.py
python3 tests/wurm_export_test.py
collection-test:
python3 tests/collection_test.py
.PHONY: collection-notifications-test
collection-notifications-test:
python3 tests/game_host_compatibility_test.py
python3 tests/collection_notifications_test.py
# The desktop binary opens the collection beside it and refuses one that a
# newer toolchain built (owner, 2026-11-15: Arcade closed right after opening
# from Harmony's Apps). Build and check the pair together, with private data.
.PHONY: collection-check
collection-check: collection build/arcade
ARCADE_DATA='$(CURDIR)/build/collection-check' ./build/arcade --check
src/catalog.zi: games
build/entity.zx: ziran.lock $(wildcard $(ENTITY_DIR)/src/*.zi)
@@ -54,6 +81,15 @@ run: all
./build/arcade
test: all
python3 tests/catalog_versions_test.py
python3 tests/game_artifacts_test.py
python3 tests/wurm_export_test.py
python3 tests/game_host_compatibility_test.py
python3 tests/collection_notifications_test.py
python3 tests/game_resource_packing_test.py
python3 tests/game_translation_keys_test.py
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
@@ -61,9 +97,9 @@ test: all
python3 tests/publisher_test.py
python3 tests/apps_controller_test.py
python3 tests/startup_art_test.py
python3 tests/web_library_art_test.py
./build/arcade --list
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
sh tests/chess_app_test.sh '$(ZIRAN)'
python3 tests/sound_test.py
sh tests/collection_loading_test.sh
@@ -108,14 +144,17 @@ navigation-ui-test: all
--binary '$(CURDIR)/build/arcade' --binary '$(CURDIR)/build/shovey' --inbe-source '$(INBE_SOURCE)'
.PHONY: install-arcade
install-arcade: collection build/entity.zx build/arcade
install-arcade: collection build/entity.zx build/arcade collection-check
mkdir -p '$(BIN_DIR)' '$(LIB_DIR)' '$(DATA_DIR)/applications'
install -m 0755 build/arcade '$(LIB_DIR)/arcade.new'
mv -f '$(LIB_DIR)/arcade.new' '$(LIB_DIR)/arcade'
install -m 0644 build/entity.zx build/arcade.zx build/arcade.json '$(LIB_DIR)/'
install -m 0644 '$(APPS_BUNDLE)' '$(LIB_DIR)/apps.zx'
mkdir -p '$(LIB_DIR)/assets/hud'
install -m 0644 build/assets/hud/profile.webp build/assets/hud/dew.webp '$(LIB_DIR)/assets/hud/'
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
install -m 0644 packaging/xyz.waozi.arcade.desktop '$(DATA_DIR)/applications/'
ARCADE_DATA='$(CURDIR)/build/collection-check' '$(LIB_DIR)/arcade' --check
install: all install-arcade
mkdir -p '$(BIN_DIR)' '$(LIB_DIR)/games' '$(DATA_DIR)/applications'
@@ -127,12 +166,34 @@ install: all install-arcade
mv -f '$(LIB_DIR)/shovey.new' '$(LIB_DIR)/shovey'
install -m 0644 build/entity.zx build/arcade.zx build/arcade.json build/shovey.zx build/shovey.json '$(LIB_DIR)/'
install -m 0644 '$(APPS_BUNDLE)' '$(LIB_DIR)/apps.zx'
mkdir -p '$(LIB_DIR)/assets/hud'
install -m 0644 build/assets/hud/profile.webp build/assets/hud/dew.webp '$(LIB_DIR)/assets/hud/'
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
ln -sfn '$(LIB_DIR)/shovey' '$(BIN_DIR)/shovey'
mkdir -p '$(DATA_DIR)/icons/hicolor/256x256/apps'
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 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
android: collection
python3 scripts/build-android.py --product arcade --release
android-fdroid: collection
python3 scripts/build-android.py --product arcade --release --edition fdroid
android-gplay: collection
python3 scripts/build-android.py --product arcade --release --edition gplay
# 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 \
-u SESSION_MANAGER -u GDK_DISPLAY YUE_DESKTOP_RECOVERY=0 SDL_AUDIODRIVER=dummy \
timeout 240s xvfb-run -a -n 400 -s '-screen 0 1280x1000x24' python3 tests/android_offline_ui_test.py --binary '$(CURDIR)/build/arcade' --inbe-source '$(INBE_SOURCE)'
.PHONY: android-shovey android-shovey-release android-shovey-bundle
android-shovey: collection
python3 scripts/build-android.py
+111 -24
View File
@@ -1,9 +1,17 @@
# Arcade
Games and entertainment, alongside Werkzeug for practical tools and Inner
Breeze for personal growth. Arcade opens on a dark grid of large rounded
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.
Breeze for personal growth. Arcade opens on a console home from the shared Apps controller.
Landscape fills the screen with the selected game’s screenshot above one bottom
row of wide covers. Portrait centers a large tall cover, with neighbours peeking
in and the same game colouring the background. A glowing outline marks focus. There is no home title or cover caption.
Arrow keys, controller D-pad or left stick, swipes and the wheel select games;
Enter or controller A opens the selection. Click a cover to open
an installed game or open its artwork launch page first. Download consent,
progress and retry stay in that page, without a modal. Back keeps the transfer
running and returns to the same selected cover. Verified games open their own
title screen. A house-shaped Arcade control stays above hosted games and editors;
F1 or a controller’s View/Select button returns directly to the library after saving.
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
@@ -13,16 +21,21 @@ 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. 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
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 previews stay at 256 pixels. Real gameplay screenshots supply landscape heroes up to 1600 pixels and portrait covers up to 1080 pixels on the longest side, encoded as quality-80 WebP. The complete separate art bundle has a 2 MiB budget for the current games. Full-size originals stay in their game repositories. 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 43. 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.
Shovey Editor is an add-on to Shovey. Its install dialog lists Shovey when it
is needed and shows the total download size. Once Shovey is installed, only
Arcade lists games only. Each game opens on its own normal title screen.
Editors open from inside their games; installed editor add-ons and saved drafts
keep their existing identities and records. Shovey’s Classic editor remains an
add-on. Its named install dialog lists Shovey when needed and shows the total
download size. The Island editor stays private. Once Shovey is installed, only
the editor’s additions download. The editor reuses the original game’s art
and sounds, and both remain available offline.
and sounds, and both remain available offline. The top-right HUD uses the shared
painted Dew jewel and a neutral profile icon in one frame. Its two icons ship with the
host independently of the remote library, so they also work offline.
Chess’s retained implementation can choose a side and one of four computer
levels. A local game
@@ -46,19 +59,27 @@ 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. Profile’s Library 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`
cover's portrait art, landscape art 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.
presents the games directly, and a cover opens the game's normal title screen.
Editor add-ons remain declared for verified installation and save compatibility,
and open from inside their game. Shovey’s separate standalone collection uses
the same game identities and saves. The shared Apps console handles navigation
and painting with Kryon widgets. 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
@@ -123,13 +144,79 @@ make
Desktop builds need SDL2, Cairo, FreeType, Fontconfig and Pango development
packages, a C compiler, Python 3 and Ziran. `make install` installs the command
and desktop-menu entry for the current user; it does not publish a release.
Harmony registry delivery and Android builds are not implemented in this first
desktop version.
## Android
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,
build-tools 36.0.0, platform 36 and CMake 3.22.1, and Java 21.
```sh
make android
python3 scripts/android-release.py sign build/android/arcade-unsigned.apk --version "$(cat VERSION)"
make android-offline-ui-test
```
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 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
every declared app. Inbe remains a dependency for the existing shared interface
and signed publisher, rather than for the Chess implementation.
`apps.json`. Arcade is a catalog and downloader: games build and publish
in their own repositories. `scripts/build-games.py` imports their portable
exports byte for byte and generates catalog metadata; it never compiles game
source, prepares assets, or runs game payloads. Disabled entries remain catalog
metadata only, and private external editions (including Island) stay excluded.
Before a local integrated build, export in each owning repository:
- Shovey: `build-queue -- python3 scripts/player.py collection --web` exports
`build/player/games/{shovey,shovey-editor}.zx` and `-resources.json`.
- Wurm: `build-queue -- python3 tools/build_portable.py` exports
`build/games/{wurm,wurm-editor}.zx`, `-resources.json` and `-preview.png`.
- Choano: `build-queue -- make portable` exports `build/choano.zx`.
Shovey and Choano previews come unchanged from their declared game preview
paths. Every payload must embed its public app catalog at
`assets/NAME/catalog.json`; add-ons must also embed `requirements.json` naming
the exact imported dependency hashes. Import rejects identity, entry, resource
link and dependency mismatches and payloads over 64 MiB before replacing prior
staged games or catalogs. No compiler fallback exists.
Clean locked/downloaded packages may have no local exports. Supply
`--artifact-manifest PATH` to the importer (or `make
GAME_ARTIFACT_MANIFEST=PATH`) with already exported artifacts. The JSON shape
is `{"apps":{"APP_ID":{"bundle":"exports/game.zx",
"preview":"exports/preview.png","resources":"exports/game-resources.json"}}}`.
Paths are relative to the manifest or absolute; name exactly the enabled public
IDs, including editor add-ons. `resources` may be omitted only for apps with
no dependencies. Payloads and supplied sidecars are copied unchanged.
Automatic remote release artifact retrieval/export wiring is not currently
available here: obtain exports from the game owner or run its command above.
The existing published web catalog build does not invoke game builds.
Inbe remains a dependency for the existing shared interface and signed publisher.
## Saved games
@@ -192,8 +279,8 @@ in the person's private data directory.
## Shovey
[Shovey](https://github.com/waozixyz/shovey) has its own repository: Classic,
Island and Editor, their artwork, puzzles and tests live there. Arcade builds
[Shovey](https://github.com/waozixyz/shovey) has its own repository: Classic
and the Editor, their artwork, puzzles and tests live there. Arcade builds
Shovey from that package and offers it as a separate download. Opening Classic
or Editor goes straight to its own screen; Levels lets you replay any unlocked
puzzle. Shovey also runs as its own desktop app.
+1 -1
View File
@@ -1 +1 @@
0.7.93
0.7.120
+1 -1
View File
@@ -1 +1 @@
a81eb5b14d2066925d19c3fd922865af40c90673cf54fb11bd7f9bf89a29cb98
0dc9b6f9ae8a11731d51fa4e118f9a545cee0575d742517f209413fdfa93df95
+8
View File
@@ -1,5 +1,13 @@
# Chess changelog
## [1.2.2] - 2026-11-07
- Runs in the latest Inner Breeze and Arcade.
## [1.2.1] - 2026-10-29
- Runs in Inner Breeze 2.1.61's smaller app format.
## [1.2.0] - 2026-10-18
- Paste one PGN game or a FEN position into the study board.
+1 -1
View File
@@ -5,7 +5,7 @@
"kind": "game",
"contract_version": 1,
"module_api": 2,
"host_api": 12,
"host_api": 43,
"save_schema": 1,
"harnesses": ["arcade", "inbe"],
"entry": "chess:Main",
+31 -24
View File
@@ -1,49 +1,56 @@
{
"host_api": 12,
"oldest_host_api": 12,
"host_api": 43,
"oldest_host_api": 43,
"module_api": 2,
"node_apps": {
"chess": {
"id": "inbe.chess",
"title": "Chess",
"version": "1.2.0",
"sequence": 5,
"host_api": 12
"version": "1.2.2",
"sequence": 7,
"host_api": 43
},
"choano": {
"id": "xyz.waozi.choano",
"title": "Choano",
"version": "0.1.9",
"sequence": 4,
"host_api": 43
},
"shovey": {
"id": "arcade.shovey",
"title": "Shovey",
"version": "0.6.156",
"sequence": 164,
"host_api": 12
},
"shovey-island": {
"id": "arcade.shovey-island",
"title": "Shovey Island \u2014 Coming Soon",
"version": "0.4.7",
"sequence": 11,
"host_api": 12
"version": "0.6.171",
"sequence": 176,
"host_api": 43
},
"shovey-editor": {
"id": "arcade.shovey-editor",
"title": "Shovey Editor",
"version": "0.2.144",
"sequence": 146,
"host_api": 12
"version": "0.2.150",
"sequence": 152,
"host_api": 43
},
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.93",
"sequence": 172,
"host_api": 36
"version": "0.7.126",
"sequence": 205,
"host_api": 43
},
"wurm": {
"id": "xyz.waozi.wurm",
"title": "Apfelwurm",
"version": "0.2.2",
"sequence": 9,
"host_api": 12
"version": "0.2.34",
"sequence": 28,
"host_api": 43
},
"wurm-editor": {
"id": "xyz.waozi.wurm-editor",
"title": "Apfelwurm Editor",
"version": "0.1.2",
"sequence": 3,
"host_api": 43
}
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 422 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 429 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

+54 -11
View File
@@ -1,35 +1,78 @@
{
"choano-landscape": {
"source_sha256": "dfea1e328a0f386d0b5e323a59bbbc3cfa926f1dbdceaa09a9858a43b0949091",
"crop_top": 0
},
"choano-portrait": {
"source_sha256": "10be8a3d9251deeede9080c715a7a5dadc1b1641db16aa3a04b874a266302ea9",
"crop_top": 0
},
"choano-preview": {
"source_sha256": "dfea1e328a0f386d0b5e323a59bbbc3cfa926f1dbdceaa09a9858a43b0949091",
"crop_top": 0
},
"hud-dew": {
"source_sha256": "5a08721b436dcbe99ce69758d02dd56d84f7f3b9990856528990e0ce11a77443",
"crop_top": 0
},
"hud-profile": {
"source_sha256": "0c38b54870cd7a921e6a63126724c4877d81bc5edbdf61e4baefe860e82b2c39",
"crop_top": 0
},
"shovey-editor-landscape": {
"source_sha256": "7b1eae4209ede14807806a4cbce1e2bf7a14d342e75c89042958a524cf60d67e"
"source_sha256": "7b1eae4209ede14807806a4cbce1e2bf7a14d342e75c89042958a524cf60d67e",
"crop_top": 0
},
"shovey-editor-logo": {
"source_sha256": "5417341ed432c49d4ce1df45e5e6bf7e07e11a81face45cb93d7cc9fa976f7a5"
"source_sha256": "5417341ed432c49d4ce1df45e5e6bf7e07e11a81face45cb93d7cc9fa976f7a5",
"crop_top": 0
},
"shovey-editor-portrait": {
"source_sha256": "bf0bbeb15249f3d73c1b410e9737f7fd207310dcb5f28b7c3ce45401b77c8f9e"
"source_sha256": "bf0bbeb15249f3d73c1b410e9737f7fd207310dcb5f28b7c3ce45401b77c8f9e",
"crop_top": 0
},
"shovey-editor-preview": {
"source_sha256": "1846b823110fffe82a3dbb319960ce768eefc16699d507d48b8608151eaff430"
"source_sha256": "bcbf63563187f9dcdb6c7580f638e2fb2770b221240ee5699e54dc3c00be172c",
"crop_top": 0
},
"shovey-landscape": {
"source_sha256": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747"
"source_sha256": "40c01eb8300e4c5db52b2d75373e17cdaf7f68140c33c0a225613fc174660747",
"crop_top": 0
},
"shovey-logo": {
"source_sha256": "e47781aa3328f68077589f95d813e9c2e6fff10ebd62a9d003773bb2c2f7a092"
"source_sha256": "e47781aa3328f68077589f95d813e9c2e6fff10ebd62a9d003773bb2c2f7a092",
"crop_top": 0
},
"shovey-portrait": {
"source_sha256": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3"
"source_sha256": "ddcbf989eab5971157d8cdc73494ed03660bb4c7a7679543248f45be260777e3",
"crop_top": 0
},
"shovey-preview": {
"source_sha256": "b1f2e5662cb96f2f5062cb0e5a8cd8ede153173ebc32ad17e26b404f3baf5924"
"source_sha256": "96db251f36835c76cd03cd0104a6e1b5096e4c442d410960457edcd8e2377a38",
"crop_top": 0
},
"wurm-editor-landscape": {
"source_sha256": "b3616e68f1b391d1a4f9dd5d91538a63a889a7f977991e625831ec9caffa71c5",
"crop_top": 0
},
"wurm-editor-portrait": {
"source_sha256": "07ff2ff0142c262cdcba3643bbc4d7d3d71643b7f9f4e678a910fee2bfd3eba1",
"crop_top": 0
},
"wurm-editor-preview": {
"source_sha256": "b3616e68f1b391d1a4f9dd5d91538a63a889a7f977991e625831ec9caffa71c5",
"crop_top": 0
},
"wurm-landscape": {
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30"
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
"crop_top": 0
},
"wurm-portrait": {
"source_sha256": "e8962c969f554567d598eb0b54db5836f7f1ed7462619463040c6cc2887a5a47"
"source_sha256": "e8962c969f554567d598eb0b54db5836f7f1ed7462619463040c6cc2887a5a47",
"crop_top": 0
},
"wurm-preview": {
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30"
"source_sha256": "472773b7c106325e12777a81a29209496e22e0853782ca76955b6587824b1b30",
"crop_top": 0
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 559 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

+202
View File
@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+1
View File
@@ -0,0 +1 @@
Profile uses MingCute user_2 (Apache-2.0), recolored to the HUD text color. profile.webp is a lossless 128px rendering of profile.svg. Dew continues to come from the shared Apps assets.
+3
View File
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16 14C18.7614 14 21 16.2386 21 19V20C21 21.1046 20.1046 22 19 22H5C3.89543 22 3 21.1046 3 20V19C3 16.2386 5.23858 14 8 14H16ZM12 2C14.7614 2 17 4.23858 17 7C17 9.76142 14.7614 12 12 12C9.23858 12 7 9.76142 7 7C7 4.23858 9.23858 2 12 2Z" fill="#ffeec1"/>
</svg>

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

+72
View File
@@ -0,0 +1,72 @@
# Arcade catalog changelog
## 0.7.126
- Shovey 0.6.171: Runs in the latest Inner Breeze and Arcade.
- Apfelwurm 0.2.34: Replace campaign levels 1–50 with authored gardens that teach route planning, growth, portals, keys, switches and readable patrols in a paced progression.
- Choano, Shovey and Apfelwurm run as one-format ZX 28 on Ziran 0.6.0 in the current Inner Breeze.
## 0.7.125
- Shovey 0.6.169: Runs in the latest Inner Breeze and Arcade.
## 0.7.124
- Apfelwurm 0.2.33: Runs in the latest Inner Breeze and Arcade.
- Choano 0.1.9: Runs in the latest Inner Breeze and Arcade.
- Choano 0.1.9: Supply genuine gameplay screenshots and a self-identifying portable bundle for Arcade’s console library.
- Choano 0.1.9: Keep the Profile title bar clear of the camera and status bar on Android.
- Choano 0.1.9: Let the Android app reach the network, so online sign-in, backups and Friends work.
- Choano 0.1.9: Keep the account key out of Android system backups, which have no passphrase.
- Choano 0.1.9: Use Entity's reviewed account authorization and the shared game navigation modules.
- Choano 0.1.9: On Android, Continue as can use the account from another signed-in Waozi app, once you approve it there.
- Choano 0.1.9: Continue as no longer crashes the other app when it was closed.
## 0.7.123
- Arcade and its games run in the latest Inner Breeze: Shovey 0.6.169, Apfelwurm 0.2.33 and Choano 0.1.9.
## 0.7.122
- Shovey 0.6.168: Play the first 30 Island levels with working downloads and a working Play button.
- Shovey 0.6.168: Start Classic or Island levels of your own from the Editor.
- Shovey 0.6.168: Follow Shovey in his map circle, with more water along the landscape coast and a secret on the beach.
## 0.7.121
- Keep Apfelwurm and its editor available when the game library updates.
- Shovey 0.6.167: The level result, book, shop and item texts show again in every language.
- Shovey 0.6.167: Your account's progress arrives quietly and quickly; the map no longer says it is loading.
- Apfelwurm 0.2.32: Include Apfelwurm and its editor in Arcade's automatic game updates.
## 0.7.120
- Show the original painted covers for Shovey, Apfelwurm and Choano.
- Browse covers on a scenic background in portrait and landscape; a side cover selects, the centre cover plays.
- Download missing games on their cover with a progress bar while browsing.
- Shovey opens its proper title with the daily chest, profile and swipeable covers.
## 0.7.119
- Browse the new console shelf, open games from their artwork and return Home with progress saved.
- Keep editors and saved drafts inside their games.
## 0.7.118
- Apfelwurm 0.2.28: The editor title painting includes the Apfelwurm Editor logo in portrait and landscape.
- Choano 0.1.8: Keep the Fish HUD clear of the misleading Avoid indicator and introduce the sea with a little fish guide and speech bubbles.
- Choano 0.1.8: Wear a better-fitted ribbon or crown, with three optional Dew decorations: a pearl, a flower, and a wizard hat.
- Choano 0.1.8: Choose decorations by tapping their Shop cards, with clear locks and Dew purchase confirmation.
- Choano 0.1.8: Sign in through the shared Profile in native editions and restore Dew decorations with the same account.
- Choano 0.1.8: Meet a slimmer shark whose fins flash red on contact.
- Choano 0.1.8: Keep Shop and Settings navigation separate and preserve each icon’s original colors.
- Choano 0.1.8: Fit Profile and Downloads beside the title icons on narrow screens.
## 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.
+1
View File
@@ -0,0 +1 @@
0.7.126
+26 -7
View File
@@ -22,6 +22,18 @@ def ledger = new groovy.json.JsonSlurper().parse(file('../../apps/versions.json'
def appRelease = ledger.node_apps[standaloneShovey ? 'shovey' : 'arcade']
def appCodegen = envOrProp('KRYON_PROJECT_CODEGEN', 'app.codegen') ?: 'c99'
// Kryon's three editions: -Papp.edition=direct (the default), fdroid or gplay.
// Only the Google Play edition carries a Google library: Kryon's
// android-gplay.gradle adds Play Billing (kryon/play_billing), so Entity sells
// Dew through Google Play; it needs Android 6 and AndroidX
// (-Pandroid.useAndroidX=true). Native code sees GOOGLE_PLAY or FDROID.
def appEdition = (project.findProperty('app.edition') ?:
(project.findProperty('app.googlePlay') == 'true' ? 'gplay' : 'direct')).toString()
if (!(appEdition in ['direct', 'fdroid', 'gplay'])) {
throw new GradleException('app.edition must be direct, fdroid or gplay')
}
def googlePlay = appEdition == 'gplay'
def requestedMinSdk = Integer.parseInt((project.findProperty('app.minSdk') ?: '21').toString())
def verificationOutput = project.findProperty('app.outputDir')
if (verificationOutput != null) { buildDir = file(verificationOutput) }
@@ -32,11 +44,11 @@ android {
defaultConfig {
applicationId project.findProperty('app.id') ?: (standaloneShovey ? 'xyz.waozi.shovey' : 'xyz.waozi.arcade')
minSdk Integer.parseInt((project.findProperty('app.minSdk') ?: '21').toString())
minSdk googlePlay ? Math.max(requestedMinSdk, 23) : requestedMinSdk
targetSdk 36
versionCode Integer.parseInt((project.findProperty('app.versionCode') ?: appRelease.sequence).toString())
versionName project.findProperty('app.versionName') ?: appRelease.version
manifestPlaceholders = [appLabel: standaloneShovey ? 'Shovey' : 'Arcade', appIcon: standaloneShovey ? '@mipmap/ic_launcher' : '@android:drawable/sym_def_app_icon', zxPlayer: (appCodegen == 'zx').toString(),
manifestPlaceholders = [appLabel: standaloneShovey ? 'Shovey' : 'Arcade', appIcon: '@mipmap/ic_launcher', zxPlayer: (appCodegen == 'zx').toString(),
nativeLaunchMode: appCodegen == 'zx' ? 'singleTask' : 'standard']
ndk {
abiFilters += androidAbis
@@ -48,7 +60,7 @@ android {
'-DRAYLIB_DIR=' + raylibDir,
'-DAPP_CODEGEN=' + appCodegen,
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF'),
'-DGOOGLE_PLAY=' + (project.findProperty('app.googlePlay') == 'true' ? 'ON' : 'OFF')
'-DAPP_EDITION=' + appEdition
}
}
}
@@ -61,12 +73,12 @@ 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"
// Arcade's collection and receipt, staged by make android.
// The collection, its receipt and the launcher icon, staged by make android
// (scripts/build-android.py).
sourceSets.main.assets.srcDir "${rootProject.projectDir}/../build/${standaloneShovey ? 'android-shovey-assets' : 'android-assets'}"
if (standaloneShovey) {
sourceSets.main.res.srcDir "${rootProject.projectDir}/../build/android-shovey-res"
}
sourceSets.main.res.srcDir "${rootProject.projectDir}/../build/${standaloneShovey ? 'android-shovey-res' : 'android-res'}"
if (appCodegen == 'zx') {
sourceSets.main.assets.srcDir "${rootProject.projectDir}/../build/android/zx-assets"
@@ -81,9 +93,16 @@ android {
}
}
if (googlePlay) {
apply from: new File(kryonDir, 'templates/android-gplay.gradle')
}
// The shared profile is a host asset, never a child of a game collection.
tasks.register('prepareEntity', Exec) {
workingDir file('../..')
commandLine 'python3', 'scripts/build-entity.py'
}
tasks.named('preBuild').configure { dependsOn 'prepareEntity' }
// "Continue as @name" between waozi apps, in every edition.
apply from: new File(kryonDir, 'templates/android-account-handoff.gradle')
+5 -2
View File
@@ -26,8 +26,11 @@ set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
if(SHOVEY_STANDALONE)
list(APPEND APP_ZIRAN_DEFINES --define SHOVEY_STANDALONE)
endif()
if(GOOGLE_PLAY)
# The app's edition (build.gradle app.edition): Google Play or F-Droid.
if(APP_EDITION STREQUAL "gplay")
list(APPEND APP_ZIRAN_DEFINES --define GOOGLE_PLAY)
elseif(APP_EDITION STREQUAL "fdroid")
list(APPEND APP_ZIRAN_DEFINES --define FDROID)
endif()
if(NOT DEFINED APP_CODEGEN)
set(APP_CODEGEN c99)
@@ -92,7 +95,7 @@ if(NOT MONOCYPHER_DIR)
endif()
set(OQS_BUILD_ONLY_LIB ON CACHE BOOL "" FORCE)
set(OQS_USE_OPENSSL OFF CACHE BOOL "" FORCE)
set(OQS_MINIMAL_BUILD "SIG_ml_dsa_44" CACHE STRING "" FORCE)
set(OQS_MINIMAL_BUILD "SIG_ml_dsa_44;KEM_ml_kem_768" CACHE STRING "" FORCE)
set(OQS_DIST_BUILD OFF CACHE BOOL "" FORCE)
set(OQS_OPT_TARGET generic CACHE STRING "" FORCE)
foreach(feature ADX AES AVX AVX2 AVX512 AVX512BW AVX512DQ AVX512F BMI1 BMI2 FMA PCLMULQDQ POPCNT SSE SSE2 SSE3 VPCLMULQDQ)
@@ -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);
+8 -1
View File
@@ -1,3 +1,10 @@
{
"packages": ["shovey", "wurm"]
"packages": [
"shovey",
"wurm",
"choano"
],
"artwork": {
"wurm": "wurm_art"
}
}
+29
View File
@@ -0,0 +1,29 @@
-----BEGIN CERTIFICATE-----
MIIFBzCCAu+gAwIBAgIIV4HQ6go6XYwwDQYJKoZIhvcNAQEMBQAwMTELMAkGA1UE
BhMCUFkxEjAQBgNVBAoTCXdhb3ppLnh5ejEOMAwGA1UEAxMFV2FvemkwIBcNMjYx
MDI5MjIwNzU3WhgPMjA3NjEwMjgyMjA3NTdaMDExCzAJBgNVBAYTAlBZMRIwEAYD
VQQKEwl3YW96aS54eXoxDjAMBgNVBAMTBVdhb3ppMIICIjANBgkqhkiG9w0BAQEF
AAOCAg8AMIICCgKCAgEAxuar9BhVOeDtMIY1xUFfiEFZZlV+kiTDNWgW/3omykxd
tPz4Y28FgqkV2SX7eEqzMzrsjJ6Z8U2QD1TsY1cTrxjih1f8yhNP5poZAgD6DhHb
ra1DYHXMRJTCJlASUnoZj5xr4M7ha428xit4Fz0IR88TpN6NZsNNwCy5xQSj/cIX
fCTo9n/3itJIGpiKas2J4xancfVSXoLpGBaXf/Vaf/w0UfTxIgImam/U/mx366M+
Vv23XPLBa6csT1EjKTOTB6Oyj3fxDJ/HI7T0pm86eA7hvu+LrQ1v2q1I7DwUg5RG
HoAeFsNnsHSEluVdnuD+7ESnKTkoNlQe8cAiBXvlpcw6uDdpp/2oMktdrd4xt1tU
ozVqiPrvvF/G0Ki1MCS9PXJ6FERBQVjaklPYVa8c2tuXvTcX6VNCpcyFqgNo6AUk
nNkhOhPJ2R0OhQGloG5CcdkjHY1W60gudQKK9MMLjf2+or7ewl/nOkHKhPUKjBQO
UjTlRG6M+hOzZ/rI+LIJsxCZD4xAP6g2oyH0ROR8SXm3x7l+VZ7r9qW0i8cKxOvC
IlX/JQfUkAwcyK0HPQVUPutvtySiMSefZTczvvi+YmiDqr+cxW0T9388SxV+lKQz
Rz+6Tby6OyRDM6bJtXaqZTH+lSdmrAI/lbBx5+Yx8+xgHcfgGbpU2h+WOnqwtCEC
AwEAAaMhMB8wHQYDVR0OBBYEFPTOgtLO/ZKqfXFOQshN7JHi5yVyMA0GCSqGSIb3
DQEBDAUAA4ICAQCxiEH8bPrJlkin92zESDrwXqyfNc7VuoFrANxCD4Mu6/rGU+4V
UIVz3BPhDFZV281ztD0eSJef+P5UX/k4Y0pVIzw82iKAjaMiu8wFZghcFsaADQQn
YEqrU9158++2H2nsxSL2uSen8qPOea7IMll9SUtg+YqAkXqEToqIv60SDFZUpKnb
O3W/NYzVqNKYCk7/HcOYuNf5r76EGVYz6aPHP1CgEpnXNC8NotbH24ZNF3Zgy+UP
ypoNx1jffUK+wQbXkE+IadBhw7B1vPIzCZji1zz54sBxhqvTAKCWE10fMEllSu3v
HRB0x4feOs4tfuX38UdUrFHDxG7vrrNrCRDwnQ6k6FWUVpJRM9CV9jbUe0bcBQfP
SpqJfQMOXPVET799rC4lW4HMGIhfoTkPymYuWZAZx4pF3SYLHor7cQv05a3RuvjP
46xkz9ZA9HNU6P2+mgpRuuFSbxyxi5uyT9z5J/vrU45wq2UjwdNn8J/3o4ITcT9o
jP20JOHovIrprLi8Wzpb/0o1BagRuqlfVoCJrRNCpoZY98ynAM9swlgL+s5O9LVo
mTTtZdDoTyMN+IXxark7oHjUHhWgd/VThTXJu1rQ++vSh/GajYRSOKDjxayGHBp2
rjWy9esT5/VdzFlMfOZefeEjSol8tZdjNCCmWRFuOqF+zw7Lc4I5fXqK8g==
-----END CERTIFICATE-----
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

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>
+1
View File
@@ -0,0 +1 @@
198
+6
View File
@@ -0,0 +1,6 @@
{
"origin": "https://api.waozi.xyz",
"app_id": "inbe.arcade",
"key_id": "inbe-2026-10",
"public_key": "d9a549043c0ac91a5197d85053a815c831d342a1082143c2bd1ffd43e1e6f145"
}
+13
View File
@@ -0,0 +1,13 @@
# Arcade on the released graph — open work
- The raylib-free lane left uncommitted native work in this checkout: Ziran
515449986e40, Kryon 028d42cb157a, and changes to the Android, packaging,
app, main, sound and Windows sources, the game-updates workflow, the
README, `mk/` and the game-update commit script and test. It builds on
newer Ziran and Kryon than the graph the catalog now uses (Ziran 0.6.0
d17c7aa1, Kryon 1b290f19, Apps 7854da88). Move those pins onto that graph,
or onto a new Ziran release, before committing that work.
- `scripts/android_catalog.py` reads only the ZX 26 and 27 bundle layout, so
`tests/android_catalog_test.py` rejects the ZX 28 catalog. Read the seed
catalog's assets through the Ziran runtime, as `build/zx-metadata` reads
their index, before the next Android host release.
+145
View File
@@ -0,0 +1,145 @@
#!/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. Arcade downloads games on demand."""
import argparse
import hashlib
import json
import os
from pathlib import Path
import re
import shutil
import subprocess
import zipfile
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)))
return next(p for p in reversed(folders) if all((p / name).is_file() for name in ('aapt', 'apksigner', 'zipalign')))
def verify(apk, version, tools, edition='direct'):
assert re.fullmatch(r'\d+\.\d+\.\d+', version), 'A numeric release version is required'
changelog = (ROOT / 'CHANGELOG.md').read_text()
assert re.search(r'^## \[?' + re.escape(version) + r'\]?\s', changelog, re.M), 'Release version is absent from the changelog'
badging = subprocess.check_output([str(tools / 'aapt'), 'dump', 'badging', str(apk)], text=True)
package = re.search(r"^package: name='([^']+)' versionCode='(\d+)' versionName='([^']+)'", badging, re.M)
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|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'
assert ("'com.android.vending.BILLING'" in badging) == google_play, \
'Only the Google Play edition may ask for Play Billing'
certificate = subprocess.check_output(['openssl', 'x509', '-in', str(ROOT / 'packaging/android/certificate.pem'), '-outform', 'DER'])
expected = hashlib.sha256(certificate).hexdigest()
signature = subprocess.check_output([str(tools / 'apksigner'), 'verify', '--verbose', '--print-certs', str(apk)], text=True)
actual = re.findall(r'^(?:Signer #\d+|V[\d.]+ Signer:) certificate SHA-256 digest: ([0-9a-f]+)$', signature, re.M)
assert 'Number of signers: 1' in signature and set(actual) == {expected}, 'APK signer differs from the Arcade release certificate'
subprocess.run([str(tools / 'zipalign'), '-c', '-P', '16', '4', str(apk)], check=True, capture_output=True)
with zipfile.ZipFile(apk) as archive:
names = archive.namelist()
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', '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'
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=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)
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('action', choices=('sign', 'verify'))
parser.add_argument('apk', type=Path)
parser.add_argument('--version', required=True)
parser.add_argument('--edition', choices=('direct', 'fdroid', 'gplay'), default='direct')
parser.add_argument('--output', type=Path, help='Signed APK; build/android/arcade-VERSION[-EDITION].apk by default')
parser.add_argument('--keystore', type=Path, default=ROOT / 'backup/android-signing/arcade-release.p12')
parser.add_argument('--password-file', type=Path, default=ROOT / 'backup/android-signing/password')
parser.add_argument('--alias', default='arcade')
args = parser.parse_args()
tools = build_tools()
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 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()
output.parent.mkdir(parents=True, exist_ok=True)
aligned = output.with_name(output.stem + '.aligned-unsigned.apk')
temporary = output.with_name(output.stem + '.new.apk')
if subprocess.run([str(tools / 'zipalign'), '-c', '-P', '16', '4', str(apk)], capture_output=True).returncode == 0:
shutil.copyfile(apk, aligned)
else:
subprocess.run([str(tools / 'zipalign'), '-P', '16', '-f', '4', str(apk), str(aligned)], check=True)
try:
# Keep the aligned entries as they are, so a rebuild from source can
# take this signature unchanged.
subprocess.run([str(tools / 'apksigner'), 'sign', '--alignment-preserved',
'--ks', str(args.keystore.resolve(strict=True)), '--ks-key-alias', args.alias,
'--ks-pass', 'file:' + str(args.password_file.resolve(strict=True)),
'--out', str(temporary), str(aligned)], check=True)
finally:
aligned.unlink(missing_ok=True)
try:
result = verify(temporary, args.version, tools, args.edition)
except BaseException:
temporary.unlink(missing_ok=True)
raise
temporary.replace(output)
temporary.with_name(temporary.name + '.idsig').unlink(missing_ok=True)
result['apk'] = str(output)
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 thin catalog verified')
if __name__ == '__main__':
main()
+106
View File
@@ -0,0 +1,106 @@
"""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
from hud_assets import HUD_PATHS, hud_asset_hashes
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
@lru_cache(maxsize=1)
def hud_hashes():
flags = [] if (ROOT / 'ziran.local.toml').is_file() else ['--locked']
package = Path(subprocess.check_output(
[str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'apps', *flags],
cwd=ROOT, text=True).strip())
return hud_asset_hashes(package)
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())
# ZX 26 and 27 share this layout; 27 only marks composed library modules.
assert take(8) in (b'ZX\0\0\x1a\0\0\0', 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'}) | set(HUD_PATHS)
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)
assert {name: hashlib.sha256(assets[name]).hexdigest() for name in HUD_PATHS} == hud_hashes(), 'HUD icons differ from the pinned shared assets'
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
+102 -23
View File
@@ -1,28 +1,78 @@
#!/usr/bin/env python3
"""Package Arcade's existing native host with the standalone Shovey collection."""
"""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())
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--release', action='store_true', help='Build an unsigned release APK for the release signer')
parser.add_argument('--bundle', action='store_true', help='Build an unsigned release Android App Bundle for Google Play')
parser.add_argument('--application-id', help='Use an isolated package for device tests')
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(['make', 'build/entity.zx'], cwd=ROOT, check=True)
def ziran_bundle(*arguments):
# A local checkout overrides packages in ziran.local.toml, as make does.
locked = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
subprocess.run([str(ROOT / 'scripts/ziran.sh'), 'bundle', '--project', *locked, *arguments],
cwd=ROOT, check=True)
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)
for density, size in (('mdpi', 48), ('hdpi', 72), ('xhdpi', 96), ('xxhdpi', 144), ('xxxhdpi', 192)):
folder = resources / ('mipmap-' + density)
folder.mkdir(parents=True)
icon.resize((size, size), Image.Resampling.LANCZOS).save(folder / 'ic_launcher.png')
def stage_arcade():
"""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 / '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']:
raise ValueError('The staged Apps controller differs from the receipt')
assets = ROOT / 'build/android-assets'
if assets.exists():
shutil.rmtree(assets)
assets.mkdir(parents=True)
# 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 hud_assets import stage_hud_assets
stage_hud_assets(package('apps'), assets)
from android_catalog import verify_assets
metadata = verify_assets({p.relative_to(assets).as_posix(): p.read_bytes()
for p in assets.rglob('*') if p.is_file()}, 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/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."""
metadata = json.loads((ROOT / 'build/shovey.json').read_text())
payload = (ROOT / 'build/shovey.zx').read_bytes()
if hashlib.sha256(payload).hexdigest() != metadata['sha256']:
@@ -34,27 +84,48 @@ def main():
assets.mkdir(parents=True, exist_ok=True)
for suffix in ('zx', 'json'):
shutil.copyfile(ROOT / f'build/shovey.{suffix}', assets / f'arcade.{suffix}')
# 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')
# Density variants are mechanical packaging of the original generated logo.
icon = Image.open(package('shovey') / 'assets/branding/shovey-icon.png').convert('RGBA')
resources = ROOT / 'build/android-shovey-res'
for density, size in (('mdpi', 48), ('hdpi', 72), ('xhdpi', 96), ('xxhdpi', 144), ('xxxhdpi', 192)):
folder = resources / ('mipmap-' + density)
folder.mkdir(parents=True, exist_ok=True)
icon.resize((size, size), Image.Resampling.LANCZOS).save(folder / 'ic_launcher.png')
launcher_icon(package('shovey') / 'assets/branding/shovey-icon.png', ROOT / 'build/android-shovey-res')
return release
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--product', choices=('shovey', 'arcade'), default='shovey',
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')
parser.add_argument('--bundle', action='store_true',
help="Build the Google Play edition's unsigned release Android App Bundle")
parser.add_argument('--application-id', help='Use an isolated package for device tests')
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')
subprocess.run(['make', 'build/entity.zx'], cwd=ROOT, check=True)
release = stage_arcade() if arcade else stage_shovey()
sdk = Path(os.environ.get('ANDROID_SDK_ROOT') or os.environ.get('ANDROID_HOME') or Path.home() / 'Android/Sdk')
env = {key: value for key, value in os.environ.items() if key not in ('DISPLAY', 'WAYLAND_DISPLAY', 'XAUTHORITY', 'DBUS_SESSION_BUS_ADDRESS')}
env.update(ANDROID_HOME=str(sdk), ANDROID_SDK_ROOT=str(sdk),
LIBOQS_DIR=str(package('liboqs')), MONOCYPHER_DIR=str(package('monocypher')))
LIBOQS_DIR=str(package('liboqs')), MONOCYPHER_DIR=str(package('monocypher')),
KRYON_ANDROID_WEBP_DIR=str(package('libwebp')))
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'),
'-Papp.product=' + args.product, '-Papp.abis=' + args.abis,
'-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']),
'-Papp.versionName=' + release['version'], '-Papp.versionCode=' + str(release['sequence']),
'-Pandroid.aapt2FromMavenOverride=' + str(sdk / 'build-tools/36.0.0/aapt2'),
'bundleRelease' if args.bundle else 'assembleRelease' if args.release else 'assembleDebug']
# Kryon's Google Play edition adds Play Billing, so Dew is bought through Play.
edition = 'gplay' if args.bundle else args.edition
if edition == 'gplay':
command[-1:-1] = ['-Papp.edition=gplay', '-Pandroid.useAndroidX=true']
elif edition == 'fdroid':
command.insert(-1, '-Papp.edition=fdroid')
if args.application_id:
command.insert(-1, '-Papp.id=' + args.application_id)
if args.build_dir:
@@ -69,6 +140,14 @@ def main():
return
apk = app_output / ('outputs/apk/release/app-release-unsigned.apk' if args.release else
'outputs/apk/debug/app-debug.apk')
if arcade:
suffix = '' if edition == 'direct' else '-' + edition
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
'build/shovey-unsigned.apk' if args.release else 'build/shovey.apk')
shutil.copyfile(apk, output)
+4 -1
View File
@@ -47,8 +47,11 @@ def build(root, output):
controller_context(root, context)
package = Path(subprocess.check_output(
['ziran', 'pkg', 'path', 'apps', '--locked'], cwd=context, text=True).strip())
# Every consumer trusts the same package-owned build, including its
# compiler and module identities. Recompiling with host-specific raw
# search paths changes the bytes and breaks nested collection trust.
subprocess.run([sys.executable, str(package / 'scripts/build-ui.py'),
'--output', str(output.resolve())], cwd=root, check=True)
'--output', str(output.resolve())], cwd=context, check=True)
def main():
+120 -40
View File
@@ -10,26 +10,80 @@ import re
import shutil
import subprocess
import tarfile
import tempfile
from game_packages import declared_packages
from node_config import node_source
ROOT = Path(__file__).resolve().parents[1]
MAX_PAYLOAD_BYTES = 64 * 1024 * 1024
MAX_GAMES = 16
MAX_LIBRARY_ART_BYTES = 2 * 1024 * 1024
def payload_limit(size, label):
if size > MAX_PAYLOAD_BYTES:
raise ValueError(f"{label} exceeds the host's payload limit")
def catalog_bytes(catalog):
return (json.dumps(catalog, indent=2) + "\n").encode()
def child_paths(child):
return [child["bundle"], child["preview"], *(
value for key, value in child.get("cover", {}).items()
if key in ("portrait", "landscape", "logo"))]
def package_catalog(package, children):
return dict(schema=1, id=package["id"], title=package["title"],
harness="assets/apps/apps.zx", children=children)
def bundle(command, root, source, entry, assets, target, env):
"""Check the complete ZX (including code/index overhead) before promotion."""
work = root / "work"
subprocess.run(["git", "check-ignore", "-q", "work/"], cwd=root, check=True)
work.mkdir(exist_ok=True)
with tempfile.TemporaryDirectory(prefix="collection-bundle-", dir=work) as directory:
candidate = Path(directory) / target.name
subprocess.run([*command, "--root", str(root / "src"), "--entry", entry,
"--asset-dir", "assets=" + str(assets), "-o", str(candidate),
str(root / "src" / source)], cwd=root, env=env, check=True)
payload_limit(candidate.stat().st_size, target.name)
target.parent.mkdir(parents=True, exist_ok=True)
candidate.replace(target)
def digest(path):
return hashlib.sha256(path.read_bytes()).hexdigest()
def library_art(root, name, key, source):
"""Arcade's committed library thumbnails (scripts/library-art.py).
Never pack a copy of outdated art."""
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, crop_top=0):
"""Arcade's committed library thumbnail (scripts/library-art.py), as
(bytes, suffix): a bounded WebP image. 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()
if sources.get(copy, {}).get("crop_top", 0) != crop_top:
raise ValueError(f"{copy} crop changed; run scripts/library-art.py")
for suffix in (".webp",):
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):
@@ -37,17 +91,24 @@ def stage(root, controller, expected_controller_digest, output):
catalog and each game package with the IDs of its packed apps."""
if not re.fullmatch(r"[0-9a-f]{64}", expected_controller_digest):
raise ValueError("An exact trusted Apps controller SHA-256 is required")
payload_limit(controller.stat().st_size, "Apps controller")
controller_bytes = controller.read_bytes()
if hashlib.sha256(controller_bytes).hexdigest() != expected_controller_digest:
raise ValueError("Apps controller differs from the trusted SHA-256")
packages = declared_packages(root)
controller_digest = hashlib.sha256(controller_bytes).hexdigest()
if controller_digest != expected_controller_digest:
raise ValueError(f"Apps controller differs from the trusted SHA-256: {controller_digest} != {expected_controller_digest}")
payload_limit(len(controller_bytes), "Apps controller")
lock_flags = () if (root / "ziran.local.toml").is_file() else ("--locked",)
packages = declared_packages(root, lock_flags=lock_flags)
arcade = packages[0]
if not 1 <= sum(len(package["apps"]) for package in packages) <= MAX_GAMES:
raise ValueError("Arcade needs 1 to 16 games")
ledger = json.loads((root / "apps/versions.json").read_text())["node_apps"]
children, copies, identities = [], [], set()
shared_apps = Path(subprocess.check_output([str(root / 'scripts/ziran.sh'), 'pkg', 'path', 'apps', *lock_flags], cwd=root, text=True).strip())
for icon in ('profile', 'dew'):
contents, suffix = library_art(root, 'hud', icon, (shared_apps / 'assets/hud' / (icon + '.webp')).read_bytes())
copies.append((contents, Path('arcade/library') / ('hud-' + icon + suffix)))
collection_ids = {package["id"] for package in packages}
total = len(controller_bytes)
for package in packages:
package["children"] = []
for app in package["apps"]:
@@ -72,22 +133,21 @@ def stage(root, controller, expected_controller_digest, output):
preview = root / "build/games" / (name + "-preview.png")
# The game build embeds this exact legacy descriptor. Its verified
# name binds node/2's legacy handshake to the stable signed app ID.
payload_limit(bundle.stat().st_size, f"Game {name}")
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)
total += len(bundle_bytes) + len(preview_bytes)
payload_limit(len(bundle_bytes), f"Game {name}")
preview_bytes, preview_suffix = library_art(root, name, "preview",
(app["art_source"] / game["preview"]).read_bytes())
child = dict(
id=identifier, title=game["title"],
bundle=f"assets/arcade/games/{name}.zx", protocol="node/2",
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")
# A thin add-on links its required games' verified code as libraries.
if app.get('shared_code'):
child['shared_code'] = True
preview=f"assets/arcade/previews/{name}{preview_suffix}",
icon=f"assets/arcade/previews/{name}{preview_suffix}")
if app.get('shared_records'):
child['shared_records'] = app['shared_records']
if app.get('requires'):
@@ -105,22 +165,37 @@ def stage(root, controller, expected_controller_digest, output):
if key not in cover:
continue
relative = Path(cover[key])
if relative.is_absolute() or ".." in relative.parts or relative.suffix != ".png":
if relative.is_absolute() or ".." in relative.parts or relative.suffix not in {".png", ".jpg", ".avif"}:
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["art_source"] / relative).read_bytes(), app.get("cover_crops", {}).get(key, 0))
destination = Path("arcade/covers") / f"{name}-{key}{suffix}"
packed_cover[key] = "assets/" + destination.as_posix()
copies.append((contents, destination))
total += len(contents)
child["cover"] = packed_cover
children.append(child)
package["children"].append(identifier)
copies += [(bundle_bytes, Path("arcade/games") / (name + ".zx")),
(preview_bytes, Path("arcade/previews") / (name + ".png"))]
if total > MAX_PAYLOAD_BYTES:
raise ValueError("Arcade collection exceeds the host's payload limit")
(preview_bytes, Path("arcade/previews") / (name + preview_suffix))]
catalog = dict(schema=1, id=arcade["id"], title=arcade["title"],
harness="assets/apps/apps.zx", presentation={"mode": "covers"}, children=children)
sidebar = (root / "assets/arcade/sidebar.shape").read_bytes()
# The stage is a source for several independently loaded roots, not one
# root containing the whole library. Bound their input bytes separately;
# bundle() also checks the final compiled sizes, including ZX overhead.
payloads = {"assets/" + path.as_posix(): data for data, path in copies}
art_paths = {path for child in children for path in child_paths(child)[1:]}
payload_limit(sum(len(payloads[path]) for path in art_paths), "Library art")
payload_limit(len(catalog_bytes(catalog)) + len(sidebar), "Arcade catalog")
for package in packages[1:]:
if not (root / "src" / f"{package['name']}_collection.zi").is_file():
continue
leaves = [child for child in children if child["id"] in package["children"]]
if not leaves:
raise ValueError(f"{package['name']} declares no enabled apps")
paths = {path for child in leaves for path in child_paths(child)}
size = (len(controller_bytes) + len(catalog_bytes(package_catalog(package, leaves)))
+ sum(len(payloads[path]) for path in paths))
payload_limit(size, f"Standalone {package['name']}")
# This stable directory contains disposable build output only. Clear it
# after all inputs validate so removed registrations cannot linger.
if output.exists():
@@ -128,14 +203,14 @@ def stage(root, controller, expected_controller_digest, output):
assets = output / "assets"
(assets / "apps").mkdir(parents=True)
(assets / "apps/apps.zx").write_bytes(controller_bytes)
(assets / "apps/catalog.json").write_text(json.dumps(catalog, indent=2) + "\n")
(assets / "apps/catalog.json").write_bytes(catalog_bytes(catalog))
for contents, relative in copies:
destination = assets / relative
destination.parent.mkdir(parents=True, exist_ok=True)
destination.write_bytes(contents)
# Inbe draws Arcade's launcher icon from assets/arcade/sidebar.shape.
(assets / "arcade").mkdir(exist_ok=True)
(assets / "arcade/sidebar.shape").write_bytes((root / "assets/arcade/sidebar.shape").read_bytes())
(assets / "arcade/sidebar.shape").write_bytes(sidebar)
return catalog, packages[1:]
@@ -153,6 +228,7 @@ def stage_downloads(catalog, source, output, games, art):
data = (source / child["bundle"]).read_bytes()
if hashlib.sha256(data).hexdigest() != child["sha256"]:
raise ValueError("Game differs from the collection's declared digest")
payload_limit(len(data), f"Game {child['id']}")
payloads[child["sha256"]] = data
for directory in (output, games, art):
if directory.exists():
@@ -170,6 +246,10 @@ def stage_downloads(catalog, source, output, games, art):
destination = art / relative
destination.parent.mkdir(parents=True, exist_ok=True)
shutil.move(output / relative, destination)
for picture in (output / 'assets/arcade/library').glob('hud-*.webp'):
destination = art / picture.relative_to(output)
destination.parent.mkdir(parents=True, exist_ok=True)
shutil.move(picture, destination)
for digest, data in payloads.items():
(games / (digest + ".zx")).write_bytes(data)
@@ -177,6 +257,9 @@ def stage_downloads(catalog, source, output, games, art):
def add_art(output, games, art_bundle):
"""Publish the art bundle beside the games and name it in the catalog."""
data = art_bundle.read_bytes()
payload_limit(len(data), "Library art bundle")
if len(data) > MAX_LIBRARY_ART_BYTES:
raise ValueError("Library art bundle exceeds the 2 MiB art budget")
digest = hashlib.sha256(data).hexdigest()
(games / (digest + ".zx")).write_bytes(data)
path = output / "assets/apps/catalog.json"
@@ -204,14 +287,11 @@ 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 [])]
env = os.environ.copy()
def bundle(source, entry, assets, target):
subprocess.run([*command, "--root", str(ROOT / "src"), "--entry", entry,
"--asset-dir", "assets=" + str(assets), "-o", str(target),
str(ROOT / "src" / source)], cwd=ROOT, env=env, check=True)
# A game package with a standalone player (src/NAME_collection.zi) also
# gets its own collection of exactly the leaves Arcade packs, with their
@@ -229,18 +309,15 @@ def main():
assets = standalone / "assets"
(assets / "apps").mkdir(parents=True)
shutil.copyfile(output / "assets/apps/apps.zx", assets / "apps/apps.zx")
standalone_catalog = dict(schema=1, id=package["id"], title=package["title"],
harness="assets/apps/apps.zx", children=children)
(assets / "apps/catalog.json").write_text(json.dumps(standalone_catalog, indent=2) + "\n")
standalone_catalog = package_catalog(package, children)
(assets / "apps/catalog.json").write_bytes(catalog_bytes(standalone_catalog))
for child in children:
resources = [child[field] for field in ("bundle", "preview")]
resources += [value for field, value in child.get("cover", {}).items()
if field in ("portrait", "landscape", "logo")]
for relative in resources:
for relative in child_paths(child):
destination = standalone / relative
destination.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(output / relative, destination)
bundle(f"{name}_collection.zi", f"{name}_collection:Main", assets, ROOT / f"build/{name}.zx")
bundle(command, ROOT, f"{name}_collection.zi", f"{name}_collection:Main",
assets, ROOT / f"build/{name}.zx", env)
metadata = dict(id=package["id"], version=children[0]["version"],
sha256=digest(ROOT / f"build/{name}.zx"), apps_sha256=args.apps_sha256,
children=children, source_mode="project")
@@ -253,17 +330,20 @@ def main():
game_downloads = node_apps / "arcade.games"
art_assets = node_apps / "arcade-art"
stage_downloads(catalog, output, catalog_assets, game_downloads, art_assets)
bundle("art.zi", "art:Main", art_assets / "assets", node_apps / "arcade-art.zx")
bundle(command, ROOT, "art.zi", "art:Main", art_assets / "assets", node_apps / "arcade-art.zx", env)
art = add_art(catalog_assets, game_downloads, node_apps / "arcade-art.zx")
archive_downloads(game_downloads, node_apps / "arcade.games.tar")
bundle("collection.zi", "collection:Main", catalog_assets / "assets", node_apps / "arcade.zx")
# The node catalog is hosted by the consumer's trusted Apps controller.
# Compile its bootstrap without Kryon's standalone UI implementation.
bundle([*command, "--define", "KRYON_HOSTED_UI"], ROOT, "collection.zi", "collection:Main",
catalog_assets / "assets", node_apps / "arcade.zx", env)
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")}
+3 -1
View File
@@ -54,7 +54,7 @@ def main():
subprocess.run(['cmake', '-S', str(oqs_source), '-B', str(oqs),
'-DCMAKE_BUILD_TYPE=MinSizeRel', '-DBUILD_SHARED_LIBS=OFF',
'-DOQS_BUILD_ONLY_LIB=ON', '-DOQS_USE_OPENSSL=OFF', '-DOQS_DIST_BUILD=OFF',
'-DOQS_OPT_TARGET=generic', '-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44'], check=True)
'-DOQS_OPT_TARGET=generic', '-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44;KEM_ml_kem_768'], check=True)
subprocess.run(['cmake', '--build', str(oqs), '--target', 'oqs', '-j2'], check=True)
temporary = output.with_suffix('.new')
output.parent.mkdir(parents=True, exist_ok=True)
@@ -68,6 +68,8 @@ def main():
str(package('monocypher') / 'src/optional/monocypher-ed25519.c'), str(oqs / 'lib/liboqs.a'),
'-Wl,--gc-sections', *libraries, '-lX11', '-l:libcurl.so.4', '-lz', '-lm', '-lpthread', '-o', str(temporary)], check=True)
temporary.replace(output)
from hud_assets import stage_hud_assets
stage_hud_assets(package('apps'), output.parent)
if args.standalone_shovey:
from PIL import Image
source = Path(subprocess.check_output([ZIRAN, 'pkg', 'path', 'shovey', *lock], cwd=ROOT, text=True).strip())
+16 -20
View File
@@ -1,29 +1,25 @@
#!/usr/bin/env python3
"""Build Entity once for the outer native host; never pack it into a game."""
"""Build Entity once for the outer native host; never pack it into a game.
Entity owns its Profile bundle and the assets embedded in it: the locked
toolchain's artifact helper asks Entity's project tool for
entity:native-profile, as Shovey's player does.
"""
from pathlib import Path
import argparse
import importlib.util
import shutil
import subprocess
ROOT = Path(__file__).resolve().parents[1]
ZIRAN = str(ROOT / 'scripts/ziran.sh')
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--locked', action='store_true')
args = parser.parse_args()
flags = ['--locked'] if args.locked or not (ROOT / 'ziran.local.toml').exists() else []
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'))
subprocess.run([ZIRAN, 'bundle', '--root', str(entity),
'--module-path', str(entity / 'src'),
'--module-path', str(kryon / 'src/ui'),
'--module-path', 'kryon=' + str(kryon / 'src/ui'),
'--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'),
'--entry', 'entity:Main', '-o', str(ROOT / 'build/entity.zx'), str(entity / 'src/entity.zi')],
cwd=entity, check=True)
ZIRAN = ROOT / 'scripts/ziran.sh'
flags = [] if (ROOT / 'ziran.local.toml').exists() else ['--locked']
toolchain = Path(subprocess.check_output([str(ZIRAN), 'pkg', 'path', 'ziran', *flags],
cwd=ROOT, text=True).strip().splitlines()[-1])
spec = importlib.util.spec_from_file_location('ziran_artifacts', toolchain / 'scripts/ziran_artifacts.py')
artifacts = importlib.util.module_from_spec(spec)
spec.loader.exec_module(artifacts)
profile = artifacts.request('entity:native-profile', 'linux-x86_64-gnu', project=ROOT, ziran=ZIRAN)
shutil.copyfile(profile.output('entity.zx'), ROOT / 'build/entity.zx')
assets = ROOT / 'build/entity-assets'
assets.mkdir(parents=True, exist_ok=True)
+190 -144
View File
@@ -1,156 +1,199 @@
#!/usr/bin/env python3
"""Build the apps Arcade and its game packages declare, without copying source."""
"""Import game-owned portable exports unchanged; never build games in Arcade."""
import argparse
import hashlib
import json
import os
import re
import shutil
import subprocess
import tempfile
from pathlib import Path
from game_packages import declared_apps
from game_resources import dependency_order, share_resources
from game_packages import declared_apps, portable_artifacts
from game_resources import dependency_order
ROOT = Path(__file__).resolve().parents[1]
MAX_PAYLOAD_BYTES = 64 * 1024 * 1024
MAX_ASSET_BYTES = 16 * 1024 * 1024
METADATA_LIMIT = 1024 * 1024
# Built by `make build/zx-metadata` from scripts/zx_metadata.zi.
METADATA_TOOL = Path(__file__).resolve().parents[1] / 'build/zx-metadata'
def leave_out(rules_path, resources, release):
"""Removes what the game's bundle.json says its bundle leaves out (top-level
glob patterns of its assets), so the collection and the games a host opens
fit its memory budget; the manifest keeps only what remains."""
rules = json.loads(rules_path.read_text()) if rules_path.exists() else {}
patterns = rules.get("leave_out", []) + (rules.get("release_leave_out", []) if release else [])
for pattern in patterns:
for path in resources.glob(pattern):
if path.is_dir():
shutil.rmtree(path)
else:
path.unlink()
art_path = resources / "art.json"
if patterns and art_path.exists():
art = json.loads(art_path.read_text())
art["files"] = [item for item in art["files"] if (resources / item["path"]).is_file()]
art_path.write_text(json.dumps(art, indent=2) + "\n")
def digest(path):
result = hashlib.sha256()
with path.open('rb') as source:
for block in iter(lambda: source.read(1024 * 1024), b''):
result.update(block)
return result.hexdigest()
def build(ziran, lock_flags):
def package(name):
return Path(subprocess.check_output(
[ziran, "pkg", "path", name, *lock_flags], cwd=ROOT, text=True).strip())
def bundle_metadata(path, name):
"""Read a ZX 28 export's entry, asset index and bounded metadata.
kryon = package("kryon")
toolchain = package("ziran")
entity = package("entity")
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)
entries = []
apps = dependency_order(declared_apps(ROOT, ziran, lock_flags))
by_id = {app['descriptor']['id']: app for app in apps}
for app in apps:
source, manifest, descriptor = app["source"], app["manifest"], app["descriptor"]
if descriptor["kind"] != "game" or "arcade" not in descriptor["harnesses"]:
raise ValueError("Only games registered for Arcade belong in its catalog")
name = descriptor["name"]
if not name.isascii() or not name.replace("-", "").isalnum():
raise ValueError("Invalid game name")
staged = ROOT / "build/game-assets" / name
# Start empty: files a game no longer has must not reach its bundle.
shutil.rmtree(staged, ignore_errors=True)
resources = staged / "assets" / name
resources.mkdir(parents=True)
shutil.copytree(source / descriptor["assets"], resources, dirs_exist_ok=True)
shared = manifest.with_name("shared_assets.json")
for copy in json.loads(shared.read_text())["copies"] if shared.exists() else []:
asset_source, target = source / copy["from"], resources / copy["to"]
build/zx-metadata opens and verifies the bundle with the Ziran runtime;
none of its code runs.
"""
size = path.stat().st_size
if not 0 < size <= MAX_PAYLOAD_BYTES:
raise ValueError(f'{path}: exceeds the host payload limit')
if not METADATA_TOOL.is_file():
raise ValueError(f'{METADATA_TOOL} is missing; run make build/zx-metadata')
result = subprocess.run([str(METADATA_TOOL), str(path), name], capture_output=True, text=True)
if result.returncode:
raise ValueError(f'{path}: truncated or invalid bundle')
report = json.loads(result.stdout)
assets = report['assets']
if not 1 <= len(assets) <= 2048:
raise ValueError(f'{path}: invalid game asset count')
paths = set()
for asset, length in assets:
if length > MAX_ASSET_BYTES:
raise ValueError(f'{path}: asset exceeds the host asset limit')
if asset in paths or asset.startswith('/') or '..' in Path(asset).parts:
raise ValueError(f'{path}: invalid or duplicate bundle asset {asset}')
paths.add(asset)
metadata = {}
for key in ('catalog.json', 'requirements.json'):
length = next((size for asset, size in assets if asset == f'assets/{name}/{key}'), None)
if length is None:
continue
if length > METADATA_LIMIT or key not in report['metadata']:
raise ValueError(f'{path}: oversized metadata')
metadata[key] = json.loads(report['metadata'][key])
return report['entry'], metadata, paths
def validate_artifact(app, bundle, resources, imported):
descriptor = app['descriptor']
name, identifier = descriptor['name'], descriptor['id']
entry, metadata, paths = bundle_metadata(bundle, name)
if any(not path.startswith(f'assets/{name}/') or path == f'assets/{name}/' for path in paths):
raise ValueError(f'{identifier}: exported assets escape the game namespace; re-export in its game repository')
public = {key: value for key, value in descriptor.items()
if key not in ('build_defines', 'prepare_assets')}
if entry != descriptor['entry'] or metadata.get('catalog.json') != public:
raise ValueError(f'{identifier}: embedded catalog/entry mismatch or missing; '
're-export the portable bundle in its game repository with its app catalog')
requires = app['requires']
if (not isinstance(resources, dict) or set(resources) != {'dependencies', 'resources'}
or resources['dependencies'] != requires):
raise ValueError(f'{identifier}: exported dependency identities mismatch')
links = resources['resources']
if not isinstance(links, list) or len(links) > 16:
raise ValueError(f'{identifier}: invalid resource links')
targets = set()
for link in links:
if not isinstance(link, dict) or set(link) != {'dependency', 'path', 'source'}:
raise ValueError(f'{identifier}: invalid resource link')
dependency, target, original = link['dependency'], link['path'], link['source']
if not isinstance(dependency, str) or dependency not in requires or dependency not in imported:
raise ValueError(f'{identifier}: undeclared resource dependency')
base = imported[dependency]
for value in (target, original):
if not isinstance(value, str) or value.startswith('/') or '..' in Path(value).parts:
raise ValueError(f'{identifier}: unsafe resource link')
if (not target.startswith(f'assets/{name}/') or target in targets
or not original.startswith(f'assets/{base["name"]}/')
or target.endswith('/') != original.endswith('/')):
raise ValueError(f'{identifier}: invalid resource namespace')
targets.add(target)
if not any(p.startswith(original) if original.endswith('/') else p == original for p in base['paths']):
raise ValueError(f'{identifier}: missing dependency resource')
if any(p.startswith(target) if target.endswith('/') else p == target for p in paths):
raise ValueError(f'{identifier}: resource link shadows bundled data')
expected = resources | {'sha256': {dep: imported[dep]['sha256'] for dep in requires}}
if requires and metadata.get('requirements.json') != expected:
raise ValueError(f'{identifier}: embedded requirements/hash mismatch')
if not requires and metadata.get('requirements.json') not in (None, expected):
raise ValueError(f'{identifier}: unexpected embedded requirements')
return dict(name=name, paths=paths, sha256=digest(bundle))
def promote(replacements, scratch):
"""Rollback all prior outputs if promotion fails; validation precedes writes."""
completed = []
try:
for index, (candidate, target) in enumerate(replacements):
target.parent.mkdir(parents=True, exist_ok=True)
if asset_source.is_dir():
shutil.copytree(asset_source, target)
else:
shutil.copyfile(asset_source, target)
# Build flags are source metadata, not part of the signed node/2
# descriptor schema accepted by existing hosts.
(resources / 'catalog.json').write_text(json.dumps(
{key: value for key, value in descriptor.items() if key not in ('build_defines', 'prepare_assets')}, indent=2) + '\n')
defines = descriptor.get('build_defines', [])
if 'SHOVEY_RELEASE' in defines:
subprocess.run(["python3", str(source / 'scripts/release_assets.py'), str(resources)], check=True)
leave_out(manifest.with_name("bundle.json"), resources, 'SHOVEY_RELEASE' in defines)
locales = resources / "locales"
locales.mkdir(exist_ok=True)
translations = {}
for locale in sorted((source / descriptor["locales"]).glob("*.txt")):
blocks = []
values = {}
for block in locale.read_text().split("---\n"):
lines = block.splitlines()
heading = next((line for line in lines if line), "")
if heading.startswith("[" + descriptor["locale_prefix"]):
blocks.append(heading + "\n" + "\n".join(lines[lines.index(heading) + 1:]).rstrip() + "\n---\n")
values[heading[1:-1]] = "\n".join(lines[lines.index(heading) + 1:]).rstrip()
(locales / locale.name).write_text("".join(blocks))
translations[locale.stem] = values
# Text also lives in the game itself: released legacy hosts only know
# their own locale file and cannot provide newly added game strings.
generated = ROOT / 'build/game-generated' / name
generated.mkdir(parents=True, exist_ok=True)
if descriptor.get('prepare_assets'):
prepare = Path(descriptor['prepare_assets'])
if prepare.is_absolute() or '..' in prepare.parts or prepare.suffix != '.py':
raise ValueError('Invalid game asset preparation script')
subprocess.run(['python3', str(source / prepare), str(resources), str(generated)], check=True)
shared = share_resources(app, apps, resources, ROOT / 'build/game-assets')
metadata = ROOT / 'build/games' / (name + '-resources.json')
metadata.parent.mkdir(parents=True, exist_ok=True)
metadata.write_text(json.dumps(shared, indent=2) + '\n')
if shared['dependencies']:
# A base-art update must also invalidate cached editor images.
originals = {item['descriptor']['id']: item['descriptor']['name'] for item in apps}
required = shared | {'sha256': {identifier: hashlib.sha256(
(ROOT / 'build/games' / (originals[identifier] + '.zx')).read_bytes()).hexdigest()
for identifier in shared['dependencies']}}
(resources / 'requirements.json').write_text(json.dumps(required, sort_keys=True) + '\n')
code = 'GameLocaleText :: (language: string, key: string) -> string {\n'
for language, values in sorted(translations.items(), key=lambda item: item[0] == 'en'):
if language != 'en':
code += ' if language == ' + json.dumps(language) + ' {\n'
for key, value in values.items():
code += (' ' if language != 'en' else ' ') + 'if key == ' + json.dumps(key) + ' { return ' + json.dumps(value, ensure_ascii=False) + ' }\n'
if language != 'en':
code += ' }\n'
code += ' return ""\n}\n'
(generated / 'translations.zi').write_text(code)
bundle = ROOT / "build/games" / (name + ".zx")
bundle.parent.mkdir(parents=True, exist_ok=True)
subprocess.run([
ziran, "bundle", "--root", str((source / descriptor["source"]).parent),
# Game packages without a src folder (Shovey) keep sources beside their catalogs.
*(["--module-path", str(source / "src")] if (source / "src").is_dir() else []),
"--module-path", str(generated),
"--module-path", str(kryon / "src/ui"),
"--module-path", "kryon=" + str(kryon / "src/ui"),
"--module-path", "kryon=" + str(kryon / "src/backend"),
"--module-path", "std=" + str(toolchain / "std"),
"--module-path", str(toolchain / "std"),
"--module-path", "apps=" + str(package("apps") / "src"),
"--module-path", "mingcute=" + str(package("mingcute") / "src"),
"--module-path", "entity=" + str(entity / "src"),
"--module-path", "daochi_client=" + str(daochi_client),
"--module-path", "crypto=" + str(crypto / "src"),
*[flag for name in defines for flag in ('--define', name)],
*[flag for entry in app['library_entries'] for flag in ('--retain', entry)],
*[flag for dependency_id in app['requires'] if app['shared_code']
for flag in ('--library', str(ROOT / 'build/games' /
(by_id[dependency_id]['descriptor']['name'] + '.zx')))],
"--define", "KRYON_HOSTED_UI", "--asset-dir", "assets=" + str(staged / "assets"),
"--entry", descriptor["entry"], "-o", str(bundle),
str(source / descriptor["source"])], cwd=ROOT, check=True)
preview = ROOT / "build/games" / (name + "-preview.png")
shutil.copyfile(source / descriptor["preview"], preview)
entries.append(descriptor | {"enabled": app["enabled"], "package": app["package"]})
backup = scratch / f'previous-{index}'
existed = target.exists()
if existed:
os.replace(target, backup)
completed.append((target, backup, existed))
os.replace(candidate, target)
except BaseException:
for target, backup, existed in reversed(completed):
if target.is_dir():
shutil.rmtree(target)
elif target.exists():
target.unlink()
if existed:
os.replace(backup, target)
raise
def build(ziran, lock_flags, artifact_manifest=None):
apps = declared_apps(ROOT, ziran, lock_flags)
if not 1 <= len(apps) <= 16 or len({a['descriptor']['id'] for a in apps}) != len(apps):
raise ValueError('Arcade needs 1 to 16 distinct games')
if len({a['descriptor']['name'] for a in apps}) != len(apps):
raise ValueError('Duplicate game name')
apps = dependency_order(apps)
exports = None
if artifact_manifest is not None:
artifact_manifest = Path(artifact_manifest).resolve()
exports = json.loads(artifact_manifest.read_text())
if not isinstance(exports, dict) or set(exports) != {'apps'} or not isinstance(exports['apps'], dict):
raise ValueError('Artifact manifest must contain an apps mapping')
expected_ids = {a['descriptor']['id'] for a in apps if a['enabled']}
if set(exports['apps']) != expected_ids:
raise ValueError('Artifact manifest must name exactly the enabled public app IDs')
scratch_root = ROOT / 'work/console-redesign'
scratch_root.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(prefix='game-import-', dir=scratch_root) as directory:
scratch = Path(directory)
games = scratch / 'games'
games.mkdir()
entries, imported = [], {}
for app in apps:
descriptor = app['descriptor']
name = descriptor['name']
if not re.fullmatch(r'[a-z0-9][a-z0-9-]*', name):
raise ValueError('Invalid game name')
if descriptor['kind'] != 'game' or 'arcade' not in descriptor['harnesses']:
raise ValueError('Only games registered for Arcade belong in its catalog')
entries.append(descriptor | {'enabled': app['enabled'], 'package': app['package']})
if not app['enabled']:
continue
locations, instruction = portable_artifacts(app, artifact_manifest, exports)
for kind, source in locations.items():
if not source.is_file():
raise ValueError(f'{descriptor["id"]}: missing {kind} export: {source}. {instruction}')
limit = METADATA_LIMIT if kind == 'resources' else MAX_PAYLOAD_BYTES
if not 0 < source.stat().st_size <= limit:
raise ValueError(f'{source}: exceeds the host payload limit')
suffix = {'bundle': '.zx', 'preview': '-preview.png', 'resources': '-resources.json'}[kind]
target = games / (name + suffix)
shutil.copyfile(source, target)
if not 0 < target.stat().st_size <= limit:
raise ValueError(f'{source}: export changed or exceeds the host payload limit')
resource_file = games / (name + '-resources.json')
if not resource_file.exists():
if app['requires']:
raise ValueError(f'{name}: dependencies require exported resources metadata')
resource_file.write_text(json.dumps(dict(dependencies=[], resources=[]), indent=2) + '\n')
resources = json.loads(resource_file.read_text())
imported[descriptor['id']] = validate_artifact(app, games / (name + '.zx'), resources, imported)
text, catalog = catalog_outputs(entries)
(scratch / 'catalog.zi').write_text(text)
(scratch / 'catalog.json').write_text(catalog)
promote([(games, ROOT / 'build/games'), (scratch / 'catalog.zi', ROOT / 'src/catalog.zi'),
(scratch / 'catalog.json', ROOT / 'build/catalog.json')], scratch)
print(f'Imported {len(imported)} verified game-owned artifacts unchanged')
def catalog_outputs(entries):
if not entries or len(entries) > 16 or len({entry["id"] for entry in entries}) != len(entries):
raise ValueError("Arcade needs 1 to 16 distinct games")
text = ("// Generated from the apps.json of Arcade and its game packages.\n"
@@ -164,13 +207,16 @@ def build(ziran, lock_flags):
fields += ", .enabled = " + str(entry["enabled"]).lower()
text += f" if index == {index} {{ return Game.{{{fields}}} }}\n"
text += " return Game.{}\n}\n"
(ROOT / "src/catalog.zi").write_text(text)
(ROOT / "build/catalog.json").write_text(json.dumps({"games": entries}, indent=2) + "\n")
return text, json.dumps({"games": entries}, indent=2) + "\n"
if __name__ == "__main__":
if __name__ == '__main__':
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("--ziran", default="ziran")
parser.add_argument("--locked", action="store_true")
parser.add_argument('--ziran', default='ziran', help='package path resolver only')
parser.add_argument('--locked', action='store_true')
parser.add_argument('--artifact-manifest', type=Path, help='explicit already-exported app artifact paths')
args = parser.parse_args()
build(args.ziran, ["--locked"] if args.locked else [])
try:
build(args.ziran, ['--locked'] if args.locked else [], args.artifact_manifest)
except (ValueError, OSError) as error:
parser.exit(1, f'Game artifact import failed: {error}\n')
+208 -8
View File
@@ -6,18 +6,162 @@ 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.
The library's pictures come from the site too (stage_web_library_art), so
the covers never wait for the art bundle from api.waozi.xyz.
"""
import argparse
import gzip
import hashlib
import io
import json
import os
from pathlib import Path
import re
import shutil
import struct
import subprocess
import sys
import tarfile
ROOT = Path(__file__).resolve().parents[1]
ZIRAN = str(ROOT / 'scripts/ziran.sh')
ART_LIMIT = 64 * 1024 * 1024
# The committed library copies are at most this large (scripts/library-art.py).
PICTURE_LONGEST = 1600
COVER_QUALITY = 80
def bundle_assets(data):
"""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
def take(size):
nonlocal at
if at + size > len(data):
raise ValueError('truncated bundle')
value = data[at:at + size]
at += size
return value
def number():
return struct.unpack('<I', take(4))[0]
def text():
return take(number())
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()):
for _ in range(3):
text()
take(number())
assets = {}
for _ in range(number()):
path = text().decode()
if path in assets:
raise ValueError('duplicate bundle file')
assets[path] = take(number())
if at != len(data):
raise ValueError('trailing bundle bytes')
return assets
def published_art(folder, digest):
"""The art bundle a collection names, from the release's game archive
beside it or a local build's arcade.games folder."""
built = folder / 'arcade.games' / f'{digest}.zx'
if built.is_file():
return built.read_bytes()
archive = folder / 'arcade.games.tar'
if archive.is_file():
with tarfile.open(archive) as games:
member = next((entry for entry in games if entry.name == f'{digest}.zx'), None)
if member is not None and member.isfile() and member.size <= ART_LIMIT:
return games.extractfile(member).read()
raise ValueError('The collection\'s art bundle is not beside it')
def web_picture(data, exact):
"""(bytes, suffix) of the page's copy of one verified library picture: a
WebP, lossless when exact (pixel-art previews), unless the original is
smaller. Transparency is kept; nothing is larger than PICTURE_LONGEST."""
from PIL import Image
image = Image.open(io.BytesIO(data))
image.load()
original = '.' + image.format.lower().replace('jpeg', 'jpg')
alpha = 'A' in image.getbands() or 'transparency' in image.info
image = image.convert('RGBA' if alpha else 'RGB')
scale = min(1.0, PICTURE_LONGEST / max(image.size))
if scale < 1.0:
size = (max(1, round(image.width * scale)), max(1, round(image.height * scale)))
image = image.resize(size, Image.Resampling.LANCZOS)
output = io.BytesIO()
if exact:
image.save(output, 'WEBP', lossless=True, method=6)
else:
image.save(output, 'WEBP', quality=COVER_QUALITY, method=6)
if scale == 1.0 and len(data) <= output.tell():
return data, original
return output.getvalue(), '.webp'
def stage_web_library_art(bundle, output):
"""Serve the collection's separate library art from the site.
The art bundle must have the exact digest and size the collection's
signed catalog names. Its pictures go to output/library as small WebP
copies, named by content and listed in library.json under that digest;
the exact bundle goes beside them for browsers that cannot draw WebP.
Returns the listing, or None when the collection packs its own art.
"""
assets = bundle_assets(bundle.read_bytes())
catalog = json.loads(assets['assets/apps/catalog.json'])
art = catalog.get('art')
if art is None:
return None
digest, size = art.get('sha256', ''), art.get('bytes')
if not re.fullmatch(r'[0-9a-f]{64}', digest) or not isinstance(size, int):
raise ValueError('Invalid art in the collection catalog')
data = published_art(bundle.parent, digest)
if len(data) != size or hashlib.sha256(data).hexdigest() != digest:
raise ValueError('The art bundle differs from the collection catalog')
pictures = bundle_assets(data)
previews = {child[key] for child in catalog['children'] for key in ('preview', 'icon') if child.get(key)}
covers = {path for child in catalog['children'] for key, path in child.get('cover', {}).items()
if key in ('portrait', 'landscape', 'logo')}
copies = {}
hud = {path for path in pictures if path.startswith('assets/arcade/library/hud-') and path.endswith('.webp')}
for path in sorted(previews | covers | hud):
if path not in pictures:
raise ValueError(f'The art bundle lacks {path}')
copies[path] = web_picture(pictures[path], path in previews)
library = output / 'library'
if library.exists():
shutil.rmtree(library)
library.mkdir(parents=True)
(library / f'{digest}.zx').write_bytes(data)
listed = {}
for path, (contents, suffix) in copies.items():
name = hashlib.sha256(contents).hexdigest()
(library / (name + suffix)).write_bytes(contents)
listed[path] = dict(file=f'library/{name}{suffix}', sha256=name, bytes=len(contents))
manifest = dict(art=digest, bytes=size, pictures=listed)
(output / 'library.json').write_text(json.dumps(manifest, indent=2) + '\n')
return manifest
def package(name):
@@ -25,6 +169,36 @@ 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', 'library.json',
'assets/hud/profile.webp', 'assets/hud/dew.webp'):
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 +207,58 @@ 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:
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, 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:
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}')
if not args.shovey and stage_web_library_art(bundle, output) is None:
print('The collection packs its own library art')
from hud_assets import stage_hud_assets
stage_hud_assets(package('apps'), output)
version_assets(output, receipt)
print(f'{"Shovey" if args.shovey else "Arcade"} {args.version} for the browser in {output}')
if __name__ == '__main__':
+1 -1
View File
@@ -119,7 +119,7 @@ def main():
oqs = BUILD / 'oqs/lib/liboqs.a'
if not built(oqs, oqs_source):
cmake(oqs_source, BUILD / 'oqs', tools, '-DCMAKE_BUILD_TYPE=MinSizeRel', '-DOQS_BUILD_ONLY_LIB=ON',
'-DOQS_USE_OPENSSL=OFF', '-DOQS_DIST_BUILD=OFF', '-DOQS_OPT_TARGET=generic', '-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44')
'-DOQS_USE_OPENSSL=OFF', '-DOQS_DIST_BUILD=OFF', '-DOQS_OPT_TARGET=generic', '-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44;KEM_ml_kem_768')
subprocess.run(['cmake', '--build', str(BUILD / 'oqs'), '--target', 'oqs', '-j4'], check=True)
record(oqs, oqs_source)
+34 -6
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
"""Check game ownership, shared interface versions, translations and update metadata."""
import json
import argparse
from pathlib import Path
import re
from game_packages import declared_apps
@@ -8,13 +9,36 @@ from game_packages import declared_apps
ROOT = Path(__file__).resolve().parents[1]
def check():
def translation_keys(code, prefix):
# Package imports and integer fields read from server JSON are not labels.
# Strip only those argument occurrences: the same key used by the UI must
# still have a translation.
code = re.sub(r'^\s*#import\s+"[^"\n]*"', '', code, flags=re.M)
code = re.sub(r'\bShopInteger\s*\(\s*[^,\n]+,\s*"[^"\n]*"', '', code)
return set(re.findall(r'"(' + re.escape(prefix) + r'[a-z0-9_]+)"', code))
def compatible(game, standard):
for field in ('contract_version', 'module_api'):
assert game[field] == standard[field], f'{game["name"]}: incompatible {field}'
assert type(game['host_api']) is int and standard['oldest_host_api'] <= game['host_api'] <= standard['host_api'], \
f'{game["name"]}: incompatible host_api'
def check(ziran, lock_flags):
standard = json.loads((ROOT / 'standards/game-v1.json').read_text())
ledger = json.loads((ROOT / 'apps/versions.json').read_text())
for app in declared_apps(ROOT):
# Arcade's own players refuse games newer than GAME_HOST_API, so it moves
# with the standard and the ledger whenever the host interface does.
player = re.search(r'^GAME_HOST_API :: (\d+)$', (ROOT / 'src/game_contract.zi').read_text(), re.M)
assert player and int(player[1]) == standard['host_api'] == ledger['host_api'], \
'src/game_contract.zi GAME_HOST_API, standards/game-v1.json and apps/versions.json must name the same host interface'
oldest = re.search(r'^GAME_OLDEST_HOST_API :: (\d+)$', (ROOT / 'src/game_contract.zi').read_text(), re.M)
assert oldest and int(oldest[1]) == standard['oldest_host_api'] == ledger['oldest_host_api'], \
'The player, standard and ledger must agree on the oldest supported host interface'
for app in declared_apps(ROOT, ziran, lock_flags):
source, manifest, game = app['source'], app['manifest'], app['descriptor']
for field in ['contract_version', 'module_api', 'host_api']:
assert game[field] == standard[field], f'{game["name"]}: incompatible {field}'
compatible(game, standard)
component = ledger['node_apps'][game['name']]
assert game['id'] == component['id'] and game['host_api'] == component['host_api']
assert game['kind'] == 'game' and 'arcade' in game['harnesses']
@@ -27,7 +51,7 @@ def check():
assert component['sequence'] > 0
required = set()
for file in manifest.parent.glob('*.zi'):
required.update(re.findall(r'"(' + re.escape(game['locale_prefix']) + r'[a-z0-9_]+)"', file.read_text()))
required.update(translation_keys(file.read_text(), game['locale_prefix']))
locales = {}
for file in (source / game['locales']).glob('*.txt'):
text = file.read_text()
@@ -54,5 +78,9 @@ def check():
if __name__ == '__main__':
check()
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--ziran', default=str(ROOT / 'scripts/ziran.sh'))
parser.add_argument('--locked', action='store_true')
arguments = parser.parse_args()
check(arguments.ziran, ['--locked'] if arguments.locked else [])
print('Game contract, package sources, translated text and independent version ledger passed')
+61
View File
@@ -0,0 +1,61 @@
#!/usr/bin/env python3
"""Download Wurm's portable exports from its exact pinned release; compile nothing."""
import argparse
import json
from pathlib import Path
import re
import shutil
import subprocess
import tarfile
import tempfile
EXPORT_FILES = {name + suffix for name in ('wurm', 'wurm-editor')
for suffix in ('.zx', '-resources.json', '-catalog.json', '-preview.png')}
MAX_FILE_BYTES = 64 * 1024 * 1024
def unpack(archive, source):
build = source / 'build'
build.mkdir(parents=True, exist_ok=True)
with tarfile.open(archive, 'r:gz') as bundle:
members = bundle.getmembers()
if len(members) != len(EXPORT_FILES) or {m.name for m in members} != EXPORT_FILES:
raise ValueError('Wurm release must contain exactly its eight portable exports')
if any(not m.isfile() or not 0 < m.size <= MAX_FILE_BYTES for m in members):
raise ValueError('Wurm release contains an invalid portable export')
# Validate the complete member list before any output is replaced.
with tempfile.TemporaryDirectory(prefix='portable-export-', dir=build) as directory:
stage = Path(directory)
for member in members:
with bundle.extractfile(member) as incoming, (stage / member.name).open('wb') as output:
shutil.copyfileobj(incoming, output)
exports = build / 'games'
exports.mkdir(exist_ok=True)
for name in EXPORT_FILES:
(stage / name).replace(exports / name)
def fetch(source, commit):
version = json.loads((source / 'version.json').read_text())['version']
if not re.fullmatch(r'\d+\.\d+\.\d+', version) or not re.fullmatch(r'[0-9a-f]{40}', commit):
raise ValueError('Invalid Wurm release identity')
tag = 'v' + version
released = subprocess.check_output(['gh', 'api', f'repos/waozixyz/wurm/commits/{tag}',
'--jq', '.sha'], text=True).strip()
if released != commit:
raise ValueError('Wurm release does not match Arcade\'s pinned commit')
downloads = source / 'build/downloads'
downloads.mkdir(parents=True, exist_ok=True)
name = f'wurm-portable-{tag}.tar.gz'
subprocess.run(['gh', 'release', 'download', tag, '--repo', 'waozixyz/wurm',
'--pattern', name, '--dir', str(downloads), '--clobber'], check=True)
unpack(downloads / name, source)
print(f'Imported Wurm {version} portable release at {commit}')
if __name__ == '__main__':
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--source', type=Path, required=True)
parser.add_argument('--commit', required=True)
args = parser.parse_args()
fetch(args.source.resolve(), args.commit)
+14 -6
View File
@@ -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,15 +127,21 @@ 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')
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
text = text[:pending.start()] + text[current.start():]
current = re.search(r'^## (\d+)\.(\d+)\.(\d+)\s*$', text, re.M)
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():
@@ -144,8 +150,10 @@ def art():
library = importlib.util.module_from_spec(spec)
spec.loader.exec_module(library)
recorded = json.loads((library.LIBRARY / 'sources.json').read_text())
current = {f'{name}-{key}': hashlib.sha256(data).hexdigest() for name, key, data in library.art()}
if {copy: item['source_sha256'] for copy, item in recorded.items()} != current:
# A changed source or cover crop rewrites the library copies.
current = {f'{name}-{key}': (hashlib.sha256(data).hexdigest(), crop_top)
for name, key, data, crop_top in library.art()}
if {copy: (item['source_sha256'], item.get('crop_top', 0)) for copy, item in recorded.items()} != current:
library.main()
+64 -16
View File
@@ -9,7 +9,7 @@ import re
from pathlib import Path
import subprocess
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries', 'shared_records'}
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_records', 'external', 'standalone_bundle'}
COVER_KEYS = {'portrait', 'landscape', 'logo', 'caption', 'action'}
@@ -30,42 +30,53 @@ 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']:
if not set(app) <= APP_KEYS or not set(app.get('cover', {})) <= COVER_KEYS:
raise ValueError(f'{name}: unknown apps.json field')
if app.get('external', False):
# Independently published editions stay in their own game.
if app['external'] is not True or not str(relative_path(app.get('standalone_bundle', ''))).endswith('.zx'):
raise ValueError(f'{name}: invalid external game edition')
continue
manifest = source / relative_path(app['manifest'])
requires = app.get('requires', [])
if not isinstance(requires, list) or len(requires) > 8 or \
any(not isinstance(item, str) or not item for item in requires) or \
len(set(requires)) != len(requires):
raise ValueError(f'{name}: invalid app dependencies')
shared_code = app.get('shared_code', False)
if type(shared_code) is not bool or (shared_code and not requires):
raise ValueError(f'{name}: shared code needs declared dependencies')
shared_records = app.get('shared_records', [])
if not isinstance(shared_records, list) or len(shared_records) > 8 or any(
not isinstance(item, str) or not re.fullmatch(r'[A-Za-z0-9_.-]{1,63}', item) or
item in ('.', '..') for item in shared_records) or len(set(shared_records)) != len(shared_records):
raise ValueError(f'{name}: invalid shared records')
library_entries = app.get('library_entries', [])
if not isinstance(library_entries, list) or len(library_entries) > 64 or \
any(not isinstance(item, str) or len(item) > 253 or
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,
descriptor=json.loads(manifest.read_text()),
cover=app.get('cover'), requires=requires, shared_code=shared_code,
shared_records=shared_records,
library_entries=library_entries, enabled=app.get('enabled', True)))
app_art_source = art_source
descriptor = json.loads(manifest.read_text())
cover_crops = {}
cover = app.get('cover')
internal = descriptor['name'].endswith('-editor')
if cover:
cover = dict(cover)
if internal:
cover['action'] = 'internal'
apps.append(dict(package=name, source=source, art_source=app_art_source, manifest=manifest,
descriptor=descriptor,
cover=cover, cover_crops=cover_crops, internal=internal, requires=requires,
shared_records=shared_records, enabled=app.get('enabled', True)))
packages.append(dict(name=name, source=source, id=declaration['id'],
title=declaration['title'], apps=apps))
return packages
@@ -73,3 +84,40 @@ def declared_packages(root, ziran=None, lock_flags=()):
def declared_apps(root, ziran=None, lock_flags=()):
return [app for package in declared_packages(root, ziran, lock_flags) for app in package['apps']]
def portable_artifacts(app, manifest=None, exports=None):
"""Locate game-owned exports. Resolving paths never builds or runs a game.
An explicit manifest is useful with clean locked/downloaded packages whose
source cache deliberately has no build outputs. Paths are relative to it.
"""
descriptor, source = app['descriptor'], app['source']
name, package = descriptor['name'], app['package']
instruction = ('Supply --artifact-manifest with exports from the game owner; '
'Arcade never compiles games.')
if exports is not None:
record = exports['apps'][descriptor['id']]
if (not isinstance(record, dict) or not {'bundle', 'preview'} <= set(record)
or not set(record) <= {'bundle', 'preview', 'resources'}):
raise ValueError(f'{name}: artifact entry needs bundle, preview and optional resources paths')
locations = {}
for kind, value in record.items():
if not isinstance(value, str) or not value:
raise ValueError(f'{name}: invalid artifact path')
path = Path(value)
locations[kind] = path if path.is_absolute() else manifest.parent / path
return locations, instruction
folders = {'shovey': 'build/player/games', 'wurm': 'build/games', 'choano': 'build'}
commands = {'shovey': 'build-queue -- python3 scripts/player.py collection --web',
'wurm': 'build-queue -- python3 tools/build_portable.py',
'choano': 'build-queue -- make portable'}
if package not in folders:
raise ValueError(f'{name}: no game-owned artifact location. {instruction}')
folder = source / folders[package]
locations = dict(bundle=folder / (name + '.zx'),
preview=folder / (name + '-preview.png') if package == 'wurm'
else source / relative_path(descriptor['preview']))
if package in ('shovey', 'wurm'):
locations['resources'] = folder / (name + '-resources.json')
return locations, f'In {source}, run {commands[package]}. {instruction}'
+33
View File
@@ -1,5 +1,8 @@
"""Pack additions once; signed collection links bind shared game resources."""
import hashlib
import io
import json
from PIL import Image
from pathlib import Path
import shutil
@@ -83,3 +86,33 @@ def share_resources(app, apps, resources, staged):
if len(links) > 16:
raise ValueError('Too many shared resource links')
return dict(dependencies=requirements, resources=links)
def pack_opaque_pngs(resources):
"""Drop redundant alpha bytes without changing any decoded pixel.
Prepared copies receive the same encoding before dependency comparison.
Metadata-bearing images stay untouched so their color interpretation is
preserved; transparent images keep their alpha channel.
"""
changed = set()
for path in resources.rglob('*.png'):
with Image.open(path) as image:
if image.mode != 'RGBA' or image.info or image.getextrema()[3] != (255, 255):
continue
packed = io.BytesIO()
image.convert('RGB').save(packed, format='PNG', optimize=True)
if packed.tell() < path.stat().st_size:
path.write_bytes(packed.getbuffer())
changed.add(path)
# Art inventories describe the staged bytes, including lossless encoding.
for manifest in resources.rglob('art.json'):
inventory = json.loads(manifest.read_text())
updated = False
for item in inventory.get('files', []):
asset = manifest.parent / item['path']
if asset in changed and 'sha256' in item:
item['sha256'] = hashlib.sha256(asset.read_bytes()).hexdigest()
updated = True
if updated:
manifest.write_text(json.dumps(inventory, indent=2) + '\n')
+23
View File
@@ -0,0 +1,23 @@
"""Host HUD icons, independent of downloaded catalogs."""
import hashlib
from pathlib import Path
import shutil
HUD_PATHS = ('assets/hud/profile.webp', 'assets/hud/dew.webp')
def hud_source(apps, name):
if name == "assets/hud/profile.webp":
return Path(__file__).resolve().parents[1] / name
return Path(apps) / name
def hud_asset_hashes(apps):
return {name: hashlib.sha256(hud_source(apps, name).read_bytes()).hexdigest() for name in HUD_PATHS}
def stage_hud_assets(apps, output):
for name in HUD_PATHS:
target = Path(output) / name
target.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(hud_source(apps, name), target)
+63 -27
View File
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
"""Stage bounded thumbnails for every game's library covers and previews.
Library covers retain full colour and transparency at thumbnail resolution.
Library covers retain full colour and transparency at thumbnail resolution:
opaque art uses quality-80 WebP, while transparent art uses lossless WebP.
Games keep their own original title artwork. Arcade downloads this small art
bundle separately from its launcher and caches it by its content digest.
@@ -13,65 +14,100 @@ game's art changes until this script makes fresh copies.
import hashlib
import io
import json
import subprocess
from pathlib import Path
from PIL import Image
from PIL import Image, ImageOps
from game_packages import declared_packages
ROOT = Path(__file__).resolve().parents[1]
LIBRARY = ROOT / 'assets/arcade/library'
PREVIEW_LONGEST = 480
COVER_LONGEST = 640
LOGO_LONGEST = 512
# Previews stay at 256 px. Separately fetched painted covers are sized for
# full-screen landscape and focused portrait art, with a total 2 MiB budget.
PREVIEW_LONGEST = 256
LANDSCAPE_LONGEST = 1600
PORTRAIT_LONGEST = 1080
COVER_LONGEST = 256
ART_BUDGET = 2 * 1024 * 1024
LOGO_LONGEST = 256
def small_copy(data, key):
COVER_QUALITY = 80
SUFFIXES = ('.webp', '.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, crop_top=0):
"""(bytes, suffix) of the library's copy of one picture."""
image = Image.open(io.BytesIO(data))
image.load()
longest = PREVIEW_LONGEST if key == 'preview' else LOGO_LONGEST if key == 'logo' else COVER_LONGEST
if not 0 <= crop_top < image.height:
raise ValueError('Gameplay crop exceeds screenshot')
if crop_top:
image = image.crop((0, crop_top, image.width, image.height))
# Frame the original painted artwork for the shelf, never gameplay captures.
# Portrait paintings keep their title near the top; landscape art is centred.
if key in ('portrait', 'landscape'):
ratio = 2 / 3 if key == 'portrait' else 16 / 9
width = min(image.width, round(image.height * ratio))
height = min(image.height, round(image.width / ratio))
image = ImageOps.fit(image, (width, height), Image.Resampling.LANCZOS,
centering=(0.5, 0.0 if key == 'portrait' else 0.5))
longest = {'preview': PREVIEW_LONGEST, 'logo': LOGO_LONGEST, 'landscape': LANDSCAPE_LONGEST, 'portrait': PORTRAIT_LONGEST}.get(key, COVER_LONGEST)
scale = min(1.0, longest / max(image.size))
if scale == 1.0 and key != 'preview':
return data
alpha = 'A' in image.getbands() or 'transparency' in image.info
alpha = ('A' in image.getbands() or 'transparency' in image.info) and key not in ('landscape', 'portrait')
image = image.convert('RGBA' if alpha else 'RGB')
if scale < 1.0:
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()
image.save(output, 'PNG', optimize=True)
return output.getvalue()
# Lossless WebP preserves every resized alpha value and logo colour.
image.save(output, 'WEBP', quality=COVER_QUALITY, lossless=alpha, method=6, exact=True)
return output.getvalue(), '.webp'
def art(root=ROOT):
"""(copy name, key, source bytes) for every enabled game's library art."""
flags = [] if (root / 'ziran.local.toml').exists() else ['--locked']
apps = Path(subprocess.check_output([str(root / 'scripts/ziran.sh'), 'pkg', 'path', 'apps', *flags], cwd=root, text=True).strip())
for icon in ('profile', 'dew'):
yield 'hud', icon, (apps / 'assets/hud' / (icon + '.webp')).read_bytes(), 0
for package in declared_packages(root)[1:]:
for app in package['apps']:
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(), 0
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(), app.get('cover_crops', {}).get(key, 0)
def main():
LIBRARY.mkdir(parents=True, exist_ok=True)
sources = {}
for name, key, data in art():
written = set()
for name, key, data, crop_top in art():
copy = f'{name}-{key}'
(LIBRARY / f'{copy}.png').write_bytes(small_copy(data, key))
sources[copy] = {'source_sha256': hashlib.sha256(data).hexdigest()}
for stale in LIBRARY.glob('*.png'):
if stale.stem not in sources:
stale.unlink()
contents, suffix = small_copy(data, 'preview' if name.endswith('-editor') else key, crop_top)
(LIBRARY / (copy + suffix)).write_bytes(contents)
written.add(copy + suffix)
sources[copy] = {'source_sha256': hashlib.sha256(data).hexdigest(), 'crop_top': crop_top}
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)
print(f'{len(sources)} library images, {total / 1048576:.1f} MiB')
total = sum((LIBRARY / name).stat().st_size for name in written)
if total > ART_BUDGET:
raise ValueError(f'Library art exceeds {ART_BUDGET} bytes: {total}')
print(f'{len(sources)} library images, {total / 1048576:.1f} MiB (budget 2 MiB)')
if __name__ == '__main__':
+17
View File
@@ -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}
+238
View File
@@ -0,0 +1,238 @@
#!/usr/bin/env python3
"""Wait for the game packages a published Arcade catalog advertises.
The site still tests the real Inbe API before its browser gate. The publisher
can follow a GitHub release by several minutes, so readiness is conditional and
has a hard deadline; no package is extracted or executed.
"""
import argparse
import hashlib
import json
import re
import struct
import sys
import tarfile
import time
import urllib.error
import urllib.request
from pathlib import Path
API_ROOT = "https://api.waozi.xyz"
CATALOG_PATH = "assets/apps/catalog.json"
BUNDLE_LIMIT = 64 * 1024 * 1024
CATALOG_LIMIT = 1024 * 1024
READ_CHUNK = 1024 * 1024
PREFIX_BYTES = 16
REQUEST_TIMEOUT_SECONDS = 15
class Reader:
def __init__(self, path):
self.size = path.stat().st_size
if self.size > BUNDLE_LIMIT:
raise ValueError("published Arcade bundle is too large")
self.remaining = self.size
self.file = path.open("rb")
def __enter__(self):
return self
def __exit__(self, kind, value, traceback):
self.file.close()
def take(self, size):
if size < 0 or size > self.remaining:
raise ValueError("truncated bundle")
data = self.file.read(size)
if len(data) != size:
raise ValueError("truncated bundle")
self.remaining -= size
return data
def skip(self, size):
if size < 0 or size > self.remaining:
raise ValueError("truncated bundle")
self.file.seek(size, 1)
self.remaining -= size
def number(self):
return struct.unpack("<I", self.take(4))[0]
def text(self, limit=BUNDLE_LIMIT):
size = self.number()
if size > limit or size > self.remaining:
raise ValueError("oversized bundle field")
return self.take(size)
def finish(self):
if self.file.read(1):
raise ValueError("trailing bundle bytes")
self.file.close()
def catalog_from_bundle(path):
with Reader(path) as reader:
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()
for _ in range(reader.number()):
reader.text()
reader.text()
for _ in range(reader.number()):
for _ in range(7):
reader.text()
reader.take(8)
reader.text()
reader.take(4)
for _ in range(reader.number()):
for _ in range(3):
reader.text()
reader.skip(reader.number())
assets = reader.number()
catalog = None
seen = set()
for _ in range(assets):
name = reader.text().decode()
if name in seen:
raise ValueError("duplicate bundle file")
seen.add(name)
size = reader.number()
if name == CATALOG_PATH:
if catalog is not None or size > CATALOG_LIMIT:
raise ValueError("invalid collection catalog")
catalog = reader.take(size)
else:
reader.skip(size)
reader.finish()
if catalog is None:
raise ValueError("the collection lacks a catalog")
return json.loads(catalog)
def expected_games(catalog):
children = catalog.get("children")
if not isinstance(children, list):
raise ValueError("invalid collection catalog")
games = {}
for child in children:
digest, size = child.get("sha256", ""), child.get("bytes")
if not re.fullmatch(r"[0-9a-f]{64}", digest) or not isinstance(size, int) \
or not 0 < size <= BUNDLE_LIMIT:
raise ValueError("invalid game in the collection catalog")
games[digest] = size
return games
def archive_members(archive, games):
members = {}
with tarfile.open(archive, "r:") as content:
for entry in content:
digest = entry.name.removesuffix(".zx")
if digest not in games:
continue
if not entry.isfile() or digest in members or entry.size != games[digest]:
raise ValueError("the release game archive differs from the catalog")
source = content.extractfile(entry)
source_digest = hashlib.sha256()
prefix = bytearray()
read = 0
while chunk := source.read(min(READ_CHUNK, games[digest] - read)):
source_digest.update(chunk)
if len(prefix) < PREFIX_BYTES:
prefix.extend(chunk[:PREFIX_BYTES - len(prefix)])
read += len(chunk)
if read != games[digest] or source_digest.hexdigest() != digest:
raise ValueError("the release game archive differs from the catalog")
members[digest] = (source_digest.hexdigest(), bytes(prefix))
if set(members) != set(games):
raise ValueError("the release game archive lacks a catalog game")
return members
def package_ready(api_root, digest, size, prefix, timeout_seconds=REQUEST_TIMEOUT_SECONDS):
url = f"{api_root.rstrip('/')}/api/v2/packages/inbe.arcade/{digest}.zx"
request = urllib.request.Request(
url,
headers={"Range": f"bytes=0-{PREFIX_BYTES - 1}", "User-Agent": "arcade-site-readiness"},
)
try:
with urllib.request.urlopen(request, timeout=timeout_seconds) as response:
status = response.status
content_type = response.headers.get_content_type()
etag = response.headers.get("ETag")
content_range = response.headers.get("Content-Range")
content_length = response.headers.get("Content-Length")
body = response.read(PREFIX_BYTES)
except urllib.error.HTTPError as error:
error.close()
return False
except (TimeoutError, urllib.error.URLError):
return False
if etag != f'"{digest}"':
return False
expected_length = size if status == 200 else min(PREFIX_BYTES, size)
if content_length is not None:
try:
length = int(content_length)
except ValueError:
return False
if length != expected_length:
return False
if status == 206:
match = re.fullmatch(r"bytes 0-(\d+)/(\d+)", content_range or "")
if not match or int(match[1]) != min(PREFIX_BYTES, size) - 1 or int(match[2]) != size:
return False
elif status != 200:
return False
return content_type == "application/octet-stream" and body == prefix
def wait_for_published_games(api_root, archive, games, members, deadline_seconds,
poll_seconds=30, clock=time.monotonic, sleep=time.sleep):
deadline = clock() + deadline_seconds
pending = set(games)
while True:
for digest in list(pending):
remaining = deadline - clock()
if remaining <= 0:
raise TimeoutError(
f"published game packages still unavailable: {', '.join(sorted(pending))}"
)
ready = package_ready(
api_root, digest, games[digest], members[digest][1],
timeout_seconds=min(REQUEST_TIMEOUT_SECONDS, remaining),
)
if not ready:
continue
pending.remove(digest)
if not pending:
return
now = clock()
remaining = deadline - now
if remaining <= 0:
raise TimeoutError(f"published game packages still unavailable: {', '.join(pending)}")
sleep(min(poll_seconds, remaining))
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("--api-root", default=API_ROOT)
parser.add_argument("--deadline-seconds", type=int, default=900)
parser.add_argument("--poll-seconds", type=float, default=30)
parser.add_argument("bundle", type=Path)
parser.add_argument("archive", type=Path)
arguments = parser.parse_args()
catalog = catalog_from_bundle(arguments.bundle)
games = expected_games(catalog)
members = archive_members(arguments.archive, games)
wait_for_published_games(arguments.api_root, arguments.archive, games, members,
arguments.deadline_seconds, arguments.poll_seconds)
print(f"all {len(games)} catalog game packages are published and ready")
if __name__ == "__main__":
try:
main()
except (OSError, ValueError, TimeoutError, tarfile.TarError) as error:
raise SystemExit(str(error))
+60
View File
@@ -0,0 +1,60 @@
// Prints a game export's entry and asset index as JSON for
// scripts/build-games.py:
// zx-metadata BUNDLE NAME
// Opening verifies the whole bundle; none of its code runs. The texts of
// assets/NAME/catalog.json and assets/NAME/requirements.json are included.
#import "std/bundle_host"
#import "std/byte_text_linux"
#import "std/c_string"
#import "std/json_quote"
#import "std/stdio_linux"
#import "std/text_buffer"
#import "std/vec"
METADATA_LIMIT :: 1048576
AssetText :: (bundle: *void, index: u64) -> string {
return TextFromBytes(BytesFromPointer(BundleAssetBytes(bundle, index), BundleAssetLength(bundle, index)))
}
#program_export
main :: (argc: s32, argv: **u8) -> s32 {
if argc != 3 {
unused PrintError("usage: zx-metadata BUNDLE NAME\n")
return 2
}
bundle := OpenBundle(argv[1])
if bundle == null {
unused PrintError("zx-metadata: not a valid bundle\n")
return 1
}
defer { CloseBundle(bundle) }
name := TextFromCString(argv[2])
catalog: Vec(u8)
BuilderPrint(*catalog, "assets/%/catalog.json", name)
catalog_path := BuilderFinish(catalog)
requirements: Vec(u8)
BuilderPrint(*requirements, "assets/%/requirements.json", name)
requirements_path := BuilderFinish(requirements)
entry: Vec(u8)
BuilderPrint(*entry, "%:%", TextFromCString(BundleEntryModule(bundle)),
TextFromCString(BundleEntryFunction(bundle)))
output: Vec(u8)
BuilderPrint(*output, "{\"entry\":%,\"assets\":[", JsonQuote(BuilderFinish(entry)))
metadata: Vec(u8)
count := BundleAssets(bundle)
index: u64 = 0
while index < count {
path := TextFromCString(BundleAssetPath(bundle, index))
length := BundleAssetLength(bundle, index)
if index > 0 { BuilderPrint(*output, ",") }
BuilderPrint(*output, "[%,%]", JsonQuote(path), length)
if (path == catalog_path || path == requirements_path) && length <= cast(u64)METADATA_LIMIT {
if metadata.count > 0 { BuilderPrint(*metadata, ",") }
BuilderPrint(*metadata, "%:%", JsonQuote(path[name.count + 8:]), JsonQuote(AssetText(bundle, index)))
}
index += 1
}
BuilderPrint(*output, "],\"metadata\":{%}}\n", BuilderFinish(metadata))
return ifx WriteOutput(BuilderFinish(output)) then 0 else 1
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

+127 -15
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">
@@ -27,6 +30,8 @@
#loading .failed { display: none; color: #ffb4a8; text-align: center; padding: 0 24px; }
#loading.error .failed { display: block; }
#loading.error .track { display: none; }
#loading.error { opacity: 1; pointer-events: auto; }
#loading button { border: 0; border-radius: 12px; padding: 14px 24px; background: #ffd166; color: #111223; font: inherit; cursor: pointer; }
</style>
</head>
<body>
@@ -35,20 +40,30 @@
<!-- MingCute game_2 gamepad, Apache-2.0 -->
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M15 9v3M13.5 10.5h3M7 5c1 0 3 1 5 1s4-1 5-1c3 0 7 14 3 14-3 0-4.5-4-8-4s-5 4-8 4C0 19 4 5 7 5Zm3 5.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z"/></svg>
<div class="track"><div class="bar"></div></div>
<p class="failed">Arcade could not start. Reload the page to try again.</p>
<p class="failed">Arcade stopped while opening an app. Your saved games are kept.</p>
<button class="failed" id="retry" type="button">Return to library</button>
</div>
<script>
(function () {
var loading = document.getElementById('loading');
var bar = loading.querySelector('.bar');
function failed() { loading.classList.add('error'); }
// Arcade's Profile reports ready once the library is about to draw.
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.remove('done'); loading.classList.add('error'); }
document.getElementById('retry').addEventListener('click', function () { location.reload(); });
// Keep watching after startup: a later game failure also needs recovery.
function watch() {
if (window.Module && Module.profileReady) { loading.classList.add('done'); return; }
if (window.Module && Module.arcadeFailed) { failed(); return; }
if (window.Module && Module.profileReady) loading.classList.add('done');
requestAnimationFrame(watch);
}
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 +71,123 @@
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); });
}
function hex(buffer) {
return Array.prototype.map.call(new Uint8Array(buffer), function (byte) {
return (byte < 16 ? '0' : '') + byte.toString(16);
}).join('');
}
function file(name) {
return fetch(assetUrl(name)).then(function (response) {
if (!response.ok) throw new Error(response.status);
return response.arrayBuffer();
});
}
// The library's pictures come from this site, never api.waozi.xyz:
// small copies of the collection's signed art (library.json), each
// checked against its digest, or the exact art bundle for a browser
// that cannot draw WebP or check them. The host verifies that bundle.
function library() {
return fetch(assetUrl('library.json')).then(function (response) {
return response.ok ? response.json() : null;
}).then(function (listing) {
if (!listing) return null;
var paths = Object.keys(listing.pictures);
return Promise.all(paths.map(function (path) {
var picture = listing.pictures[path];
return file(picture.file).then(function (bytes) {
return crypto.subtle.digest('SHA-256', bytes).then(function (digest) {
if (hex(digest) !== picture.sha256) throw new Error(path);
return bytes;
});
});
})).then(function (copies) {
var webp = paths.findIndex(function (path) { return /\.webp$/.test(listing.pictures[path].file); });
var drawn = webp < 0 ? Promise.resolve() : createImageBitmap(new Blob([copies[webp]])).then(function (bitmap) { bitmap.close(); });
return drawn.then(function () { return { art: listing.art, paths: paths, copies: copies }; });
}).catch(function () {
return file('library/' + listing.art + '.zx').then(function (bundle) {
return { art: listing.art, bundle: bundle };
});
});
}).catch(function () { return null; });
}
function writeLibrary(pictures) {
if (pictures.bundle) {
FS.mkdirTree('/packages');
FS.writeFile('/packages/' + pictures.art + '.zx', new Uint8Array(pictures.bundle));
return;
}
pictures.paths.forEach(function (path, index) {
var name = '/library/' + pictures.art + '/' + path;
FS.mkdirTree(name.slice(0, name.lastIndexOf('/')));
FS.writeFile(name, new Uint8Array(pictures.copies[index]));
});
}
// 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'),
library(),
Promise.all(['profile.webp', 'dew.webp'].map(function (name) {
return file('assets/hud/' + name);
}))
]).then(function (loaded) {
Module.arcadeReceipt = loaded[0];
if (loaded[1]) {
Module.preRun = [function () { FS.writeFile('/apps.zx', new Uint8Array(loaded[1])); }];
Module.preRun = [function () {
if (loaded[1]) FS.writeFile('/apps.zx', new Uint8Array(loaded[1]));
if (loaded[3]) writeLibrary(loaded[3]);
FS.mkdirTree('/assets/hud');
['profile.webp', 'dew.webp'].forEach(function (name, index) {
FS.writeFile('/assets/hud/' + name, new Uint8Array(loaded[4][index]));
});
}];
// The runtime's file package, already here, is not fetched again.
if (loaded[2]) {
Module.getPreloadedPackage = function () { return loaded[2]; };
}
var script = document.createElement('script');
script.src = 'runtime.js';
script.onerror = failed;
document.body.appendChild(script);
watch();
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>
+2
View File
@@ -1,5 +1,6 @@
#import "android_device"
#import "android_jni"
Handoff :: #import "entity/account_handoff";
#import "android_picker"
#import "c_string"
@@ -23,6 +24,7 @@ JNI_OnLoad :: (vm: *JniVm, reserved: *void) -> s32 {
unused reserved
version := AndroidJniOnLoad(vm, "xyz/waozi/arcade/ArcadeActivity")
if version != JniVersion { return version }
Handoff.AccountHandoffJniOnLoad(vm)
env: *JniEnv
if vm.functions.GetEnv(vm, *env, JniVersion) != 0 || env == null { return -1 }
class_name: [64]u8
+2
View File
@@ -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 {
+5 -4
View File
@@ -9,13 +9,14 @@ Game :: struct {
enabled: bool
}
GameCount :: 5
GameCount :: 6
GameAt :: (index: s32) -> Game {
if index == 0 { return Game.{.id = "inbe.chess", .name = "chess", .title = "Chess", .bundle = "chess.zx", .preview = "chess-preview.png", .package = "self", .enabled = false} }
if index == 1 { return Game.{.id = "arcade.shovey", .name = "shovey", .title = "Shovey", .bundle = "shovey.zx", .preview = "shovey-preview.png", .package = "shovey", .enabled = true} }
if index == 2 { return Game.{.id = "arcade.shovey-island", .name = "shovey-island", .title = "Shovey Island", .bundle = "shovey-island.zx", .preview = "shovey-island-preview.png", .package = "shovey", .enabled = false} }
if index == 3 { return Game.{.id = "arcade.shovey-editor", .name = "shovey-editor", .title = "Shovey Editor", .bundle = "shovey-editor.zx", .preview = "shovey-editor-preview.png", .package = "shovey", .enabled = true} }
if index == 4 { return Game.{.id = "xyz.waozi.wurm", .name = "wurm", .title = "Apfelwurm", .bundle = "wurm.zx", .preview = "wurm-preview.png", .package = "wurm", .enabled = true} }
if index == 2 { return Game.{.id = "arcade.shovey-editor", .name = "shovey-editor", .title = "Shovey Editor", .bundle = "shovey-editor.zx", .preview = "shovey-editor-preview.png", .package = "shovey", .enabled = true} }
if index == 3 { return Game.{.id = "xyz.waozi.wurm", .name = "wurm", .title = "Apfelwurm", .bundle = "wurm.zx", .preview = "wurm-preview.png", .package = "wurm", .enabled = true} }
if index == 4 { return Game.{.id = "xyz.waozi.wurm-editor", .name = "wurm-editor", .title = "Apfelwurm Editor", .bundle = "wurm-editor.zx", .preview = "wurm-editor-preview.png", .package = "wurm", .enabled = true} }
if index == 5 { return Game.{.id = "xyz.waozi.choano", .name = "choano", .title = "Choano", .bundle = "choano.zx", .preview = "choano-preview.png", .package = "choano", .enabled = true} }
return Game.{}
}
+46 -2
View File
@@ -25,6 +25,13 @@ CollectionPackage :: struct {
collection_packages: *CollectionPackage;
collection_package_result: string;
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 }
@@ -61,6 +68,20 @@ CollectionPackageFor :: (entry: *AppEntry) -> *CollectionPackage {
package.bytes = ""
package.failed = true
}
if package.bytes == "" && collection_package_folder != "" {
held: Vec(u8)
BuilderPrint(*held, "%/%.zx", collection_package_folder, TextUntilNul(package.digest[:]))
path := BuilderFinish(held)
package.bytes = CollectionReadPackage(path)
AppFileFree(path)
if package.bytes != "" && CollectionPackageValid(package) {
package.failed = false
} else if package.bytes != "" {
AppFileFree(package.bytes)
package.bytes = ""
package.failed = true
}
}
package.next = collection_packages
collection_packages = package
return package
@@ -103,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)
@@ -119,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 {
+503 -68
View File
@@ -14,19 +14,23 @@
#import "kryon/geometry"
#import "kryon/drawing_props"
#import "kryon/control_props"
#import "kryon/box_widget"
#import "kryon/box_props"
#import "kryon/text_widget"
#import "kryon/text_props"
#import "kryon/button_widget"
#import "kryon/button_props"
Box :: #import "kryon/box";
Text :: #import "kryon/text";
Button :: #import "kryon/button";
#import "kryon/hosted_values"
#import "kryon/hosted_app"
#import "kryon/widget_host"
#import "kryon/app_files"
#import "kryon/app_protocol"
#import "kryon/app_context_host"
#import "kryon/notification_schedule_host"
#import "collection_notification_platform"
#if !#defined(PLATFORM_DESKTOP) && !#defined(ANDROID_BUILD) && !#defined(PLATFORM_WEB) {
CollectionHost :: #import "kryon/app_context";
}
#import "kryon/key_input"
#import "kryon/tree"
#import "kryon/tree_input"
#import "kryon/system_clipboard"
#import "apps/host"
#import "apps/tree"
@@ -38,19 +42,26 @@ Node :: #import "apps/node_types";
Codec :: #import "apps/node_codec";
#import "platform"
#import, file "collection_downloads.zi";
#import, file "game_contract.zi";
#import "sound"
#import "entity_host"
#import "entity/publications"
#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"
#if #defined(ANDROID_BUILD) {
#import "kryon/app_asset"
}
LoadingIndicator :: #import "kryon/loading_indicator";
#import, file "collection_loading.zi";
#import "shovey/shovey_theme"
ProfileIcon :: #import "mingcute/mingcute_regular_user_4";
DewIcon :: #import "mingcute/mingcute_filled_drop";
#import "apps/connection"
#import "apps/remote_catalog"
Labels :: #import "apps/words";
#import "profile_palette"
#import "apps/game_hud"
collection_dew_text: [32]u8;
using HostValueKind;
@@ -90,14 +101,43 @@ collection_leave_to_library: bool;
// covers and passed to the games as arcade.updates. -1 unread, 0 off, 1 on,
// 2 not answered yet.
collection_updates: s32 = -1;
collection_notification_node: *AppNode;
collection_notification_requested: bool;
CollectionTouchFirst :: () -> bool {
#if #defined(PLATFORM_DESKTOP) {
return false
}
return true
// Called by Apps only after its verified identity/frame checks. Native focus
// alone is insufficient: Profile, library and other games own no opened marker.
CollectionNotificationFocused :: (context: *void, node: *AppNode) -> bool {
return node != null && node == collection_notification_node && !node.collection &&
!entity_visible && AppTreeNode(*collection_host.tree, collection_host.tree.active) == node &&
CollectionNotificationsForeground()
}
CollectionRunFrame :: () -> bool {
runtime := AppHostActiveRuntime(*collection_host)
if runtime == null { return false }
collection_notification_node = runtime.node
defer { collection_notification_node = null }
return AppHostRun(*collection_host, APP_FRAME)
}
// Whether the device's main input is a keyboard and mouse. A native build
// knows its platform; the collection running as a bundle inside Breeze asks
// Breeze (Kryon's kryon.input.desktop), and passes the answer to its games.
CollectionInputDesktop :: () -> bool {
#if #defined(PLATFORM_DESKTOP) && !#defined(ANDROID_BUILD) && !#defined(PLATFORM_WEB) {
return true
} else {
#if #defined(ANDROID_BUILD) || #defined(PLATFORM_WEB) {
return false
} else {
return CollectionHost.AppSupports(COLLECTION_INPUT_DESKTOP)
}
}
}
COLLECTION_INPUT_DESKTOP :: "kryon.input.desktop"
CollectionTouchFirst :: () -> bool { return !CollectionInputDesktop() }
CollectionRecordsFor :: (id: string) -> *CollectionRecords {
saved := collection_records
while saved != null {
@@ -126,25 +166,89 @@ CollectionRecordsFor :: (id: string) -> *CollectionRecords {
return saved
}
CollectionDocuments :: (context: *void, node: *AppNode) -> *AppFiles {
unused context
if node == null || node.collection { return null }
saved := CollectionRecordsFor(TextUntilNul(node.identity.id[:]))
return ifx saved == null then null else *saved.files
}
CollectionAllows :: (context: *void, node: *AppNode, name: string) -> bool {
if name == KRYON_NOTIFICATION_SCHEDULE {
if node == null || node.collection { return false }
// Ask only when a game actually uses reminders in its native focused
// frame. Loading an older game or opening the library never prompts.
if CollectionNotificationFocused(context, node) && !collection_notification_requested {
collection_notification_requested = true
if !CollectionNotificationsAllowed() { CollectionNotificationsRequest() }
}
return CollectionNotificationsAllowed()
}
return name == "AppRecordHost" || name == "SaveAppRecordHost" ||
(node != null && !node.collection && (name == "DocumentReadHost" ||
name == "DocumentStorageReadyHost" || name == "DocumentFlushHost" ||
name == "DocumentStatusHost" || name == "DocumentWriteHost")) ||
name == "AppFriendHost" || name == "AppSharedHost" || name == "AppSharedItemHost" ||
name == "AppInvitationHost" || name == "RefreshAppSharedHost" || name == "SendAppSharedHost" ||
name == "SmoothFramesHost" || name == "AppLocaleHost" || name == "AppSoundHost" ||
name == "SmoothFramesHost" || name == "AppLocaleHost" || name == "AppSoundHost" || name == "AppNowHost" ||
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 == "leaderboard"
name == PUBLICATIONS_SERVICE || name == PUBLICATIONS_READ_SERVICE ||
name == ENTITY_RECORDS_SERVICE || name == ENTITY_DEW_SERVICE ||
name == "entity.profile" || name == "leaderboard" ||
(name == COLLECTION_INPUT_DESKTOP && CollectionInputDesktop())
}
// The old Choano document shares this game's record directory. Only the
// current linked account may read its original 64-hex key for migration.
CollectionChoanoLegacyRecord :: (node: *AppNode, record: string, owner: string) -> bool {
if node == null || node.collection || TextUntilNul(node.identity.id[:]) != "xyz.waozi.choano" ||
record.count != 81 || record[:14] != "choano.earned." || record[78:] != ".v1" ||
owner.count != 64 || record[14:78] != owner { return false }
for byte: owner {
if !((byte >= #char "a" && byte <= #char "f") ||
(byte >= #char "0" && byte <= #char "9")) { return false }
}
return true
}
CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
arguments: *HostValue, count: s32, result: *HostValue) -> s32 {
name := TextFromCString(function)
if name == "DocumentReadHost" && count == 1 &&
HostScalarValid(arguments[0], "string", cast(s32)HostString) {
record := CollectionRecordsFor(TextUntilNul(node.identity.id[:]))
if record == null || node.collection { return 0 }
AppFileFree(record.text)
record.text = AppFileRead(*record.files, AppArgumentText(arguments[0]))
result.* = AppHostText(record.text)
return 1
}
if name == "DocumentWriteHost" && count == 2 &&
HostScalarValid(arguments[0], "string", cast(s32)HostString) &&
HostScalarValid(arguments[1], "string", cast(s32)HostString) {
saved := CollectionDocuments(context, node)
if saved == null {
result.* = HostScalar("bool", 0)
return 1
}
saved_document := AppFileWrite(saved, AppArgumentText(arguments[0]), AppArgumentText(arguments[1]))
result.* = HostScalar("bool", ifx saved_document then 1 else 0)
return 1
}
if name == "DocumentStatusHost" && count == 0 {
saved := CollectionDocuments(context, node)
if saved == null { return 0 }
result.* = HostScalar("s32", cast(s64)saved.status)
return 1
}
if name == "AppRecordHost" && count == 1 &&
HostScalarValid(arguments[0], "string", cast(s32)HostString) {
record := AppArgumentText(arguments[0])
if record.count >= 64 && !CollectionChoanoLegacyRecord(node, record, RecordsOwnerNow()) { return 0 }
if !AppFileNameValid(record) { return 0 }
saved := CollectionRecordsFor(TextUntilNul(node.identity.id[:]))
if saved == null || !AppFileNameValid(record) || record.count >= 64 { return 0 }
if saved == null { return 0 }
AppFileFree(saved.text)
saved.text = AppFileRead(*saved.files, record)
if saved.files.status == -1 || saved.text.count >= 65536 { return 0 }
@@ -168,6 +272,12 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
result.* = HostScalar("bool", ifx asset.found && SoundPlay(asset.data) then 1 else 0)
return 1
}
// Seconds since 1970: Apfelwurm counts its daily rewards by them.
if name == "AppNowHost" && count == 0 {
result.* = HostValue.{.kind = cast(s32)HostReal, .type_name = HostTextData("float64"),
.real = cast(float64)UnixMilliseconds() / 1000.0}
return 1
}
if name == "SmoothFramesHost" && count == 1 {
result.* = HostScalar("bool", 1)
return 1
@@ -184,6 +294,12 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
return 1
}
// Public level collections, such as a game's live campaign.
if service == PUBLICATIONS_SERVICE {
// Publications sign as this device's native Entity account.
EntityPump()
result.* = AppHostText(PublicationsAnswer(request))
return 1
}
if service == PUBLICATIONS_READ_SERVICE {
result.* = AppHostText(PublicationsReadAnswer(request))
return 1
@@ -287,14 +403,47 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
return 0
}
// The website's small copies of a collection's separate library art, under
// its signed catalog's art digest. The page writes only copies whose digests
// match its library.json (scripts/build-web.py); "" on other hosts.
collection_thumbnails: string;
CollectionThumbnail :: (node: *AppNode, path: string) -> string {
if collection_thumbnails == "" || node == null || !node.collection ||
node.catalog.art_sha256[0] == 0 || !AppAssetPathValid(path) { return "" }
copy: Vec(u8)
BuilderPrint(*copy, "%/%/%", collection_thumbnails, TextUntilNul(node.catalog.art_sha256[:]), path)
thumbnail := BuilderFinish(copy)
file := OpenRead(thumbnail)
if file.valid { unused CloseFile(file); return thumbnail }
AppFileFree(thumbnail)
return ""
}
// The website names where its page writes the library's pictures: small
// copies, or the exact art bundle for a browser that cannot draw them.
CollectionWebLibrary :: (thumbnails: string, packages: string) {
collection_thumbnails = thumbnails
collection_package_folder = packages
}
CollectionAssetAllowed :: (path: string) -> bool {
return path == "" || (collection_widget_node != null && (AppHostAsset(collection_widget_node, path).found ||
AppHostAssetPending(collection_widget_node, path)))
if path == "" { return true }
if collection_widget_node == null { return false }
// Checked first: asking for the art itself starts its download.
thumbnail := CollectionThumbnail(collection_widget_node, path)
if thumbnail != "" { AppFileFree(thumbnail); return true }
return AppHostAsset(collection_widget_node, path).found || AppHostAssetPending(collection_widget_node, path)
}
CollectionAssetPath :: (path: string) -> string {
if path == "" { return "" }
if collection_widget_node == null { return "" }
thumbnail := CollectionThumbnail(collection_widget_node, path)
if thumbnail != "" {
if !VecPush(collection_frame_paths, thumbnail) { AppFileFree(thumbnail); return "" }
return thumbnail
}
asset := AppHostAsset(collection_widget_node, path)
if !asset.found { collection_pictures_missing = true; return "" }
relative := Join(TextUntilNul(collection_widget_node.entry.sha256[:]), path)
@@ -425,8 +574,10 @@ CollectionController :: (context: *void) -> HostedAsset {
return controller
}
// 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) -> bool {
data: string, locale: string, packed: bool) -> bool {
if collection_ready { return false }
leaderboard_installed = CollectionLeaderboardInstalled
collection_directory = data
@@ -434,14 +585,33 @@ 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,
.focused = CollectionNotificationFocused,
.documents = CollectionDocuments,
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
.effect = CollectionEffect,
.bundle = CollectionBundle, .download = CollectionDownload, .fetch = CollectionFetch,
.effect = CollectionEffect, .host_api = GAME_HOST_API,
// Covers show only the art; the download dialog names the size.
.controller = CollectionController, .presentation = AppPresentation.{.cover_grid = true, .hide_sizes = true}}
if !packed {
platform.bundle = CollectionBundle
platform.download = CollectionDownload
platform.fetch = CollectionFetch
}
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
}
@@ -469,6 +639,7 @@ CollectionOpenBytes :: (bytes: string, metadata: string, data: string) -> bool {
id: [128]u8
digest: [65]u8
harness: [65]u8
games: [16]u8
if !AppsReadText(metadata, 0, "id", id[:]) || TextUntilNul(id[:]) != "inbe.arcade" ||
!AppsReadText(metadata, 0, "sha256", digest[:]) ||
!AppsReadText(metadata, 0, "apps_sha256", harness[:]) {
@@ -477,7 +648,24 @@ CollectionOpenBytes :: (bytes: string, metadata: string, data: string) -> bool {
}
locale := EnvironmentText("LANG")
language := ifx locale.count >= 2 then locale[:2] else "en"
return CollectionOpen(bytes, TextUntilNul(digest[:]), TextUntilNul(harness[:]), data, language)
packed := AppsReadText(metadata, 0, "games", games[:]) && TextUntilNul(games[:]) == "packed"
selected := bytes
selected_digest := TextUntilNul(digest[:])
if !packed {
if !CollectionNodeOpen(metadata, data, bytes, selected_digest, TextUntilNul(harness[:]), language) { return false }
if collection_node_remote {
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
@@ -493,6 +681,13 @@ 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
@@ -509,8 +704,10 @@ CollectionOpenShoveyBytes :: (bytes: string, metadata: string, data: string) ->
locale := EnvironmentText("LANG")
language := ifx locale.count >= 2 then locale[:2] else "en"
platform := AppPlatform.{.allows = CollectionAllows, .call = CollectionCall,
.focused = CollectionNotificationFocused,
.documents = CollectionDocuments,
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
.effect = CollectionEffect}
.effect = CollectionEffect, .host_api = GAME_HOST_API}
collection_ready = AppHostStart(*collection_host, bytes, "arcade.local", "arcade.shovey-player",
"shovey", TextUntilNul(digest[:]), "local", platform, TextUntilNul(harness[:]), language)
return collection_ready
@@ -528,6 +725,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
@@ -537,6 +735,7 @@ CollectionClose :: () -> bool {
if !EntityClose() { return false }
if collection_ready && !AppHostStop(*collection_host) { return false }
collection_ready = false
CollectionNodeClose()
collection_loading = .{}
CollectionDownloadsClose()
CollectionCollect()
@@ -578,7 +777,8 @@ CollectionOpenGame :: (id: string) -> bool {
if root == null || !root.collection { Report("Arcade: no collection is open to start "); Report(id); Report("\n"); return false }
entry := AppCatalogAt(*root.catalog, AppCatalogFind(*root.catalog, id))
plan: AppInstallPlan
if entry != null && AppHostInstallPlan(*collection_host, root, entry, *plan) && plan.count > 0 {
if entry != null && (TextUntilNul(entry.cover.action[:]) == "title" ||
(AppHostInstallPlan(*collection_host, root, entry, *plan) && plan.count > 0)) {
unused CopyCString(id, collection_host.platform.presentation.download_id[:])
collection_host.platform.presentation.download_request += 1
return true
@@ -647,26 +847,26 @@ CollectionUpdatesSet :: (on: bool) -> bool {
// input until it is answered.
CollectionUpdatesQuestion :: (session: Session, viewport: Rectangle) {
question := "Download new levels when they come out?"
Box(session, BoxProps.{.key = cast(u64)49300, .bounds = viewport, .fill = Color.{0, 0, 0, 160}})
unused Button(session, ButtonProps.{.key = cast(u64)49301, .id = 49301, .label = question,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49300, .bounds = viewport, .fill = Color.{0, 0, 0, 160}})
unused Button.Draw(session, Button.Props.{.key = cast(u64)49301, .id = 49301, .label = question,
.bounds = viewport, .invisible = true})
width := ifx viewport.width - 24.0 < 480.0 then viewport.width - 24.0 else 480.0
height: float32 = 200.0
x := viewport.x + (viewport.width - width) / 2.0
y := viewport.y + (viewport.height - height) / 2.0
Box(session, BoxProps.{.key = cast(u64)49302, .bounds = Rectangle.{x, y, width, height},
unused Box.Draw(session, Box.Props.{.key = cast(u64)49302, .bounds = Rectangle.{x, y, width, height},
.fill = Color.{59, 64, 63, 255}, .border = Color.{93, 98, 97, 255}, .radius = 18.0})
Text(session, TextProps.{.key = cast(u64)49303, .text = question, .font = 20, .wrap = TextWrap.TextWrapAuto,
Text.Draw(session, Text.Props.{.key = cast(u64)49303, .text = question, .size = 20, .wrap = Text.Wrap.TextWrapAuto,
.bounds = Rectangle.{x + 16.0, y + 16.0, width - 32.0, 60.0}})
Text(session, TextProps.{.key = cast(u64)49304, .text = "You can change this anytime in a game's Help.", .font = 14,
.wrap = TextWrap.TextWrapAuto, .bounds = Rectangle.{x + 16.0, y + 80.0, width - 32.0, 44.0}})
Text.Draw(session, Text.Props.{.key = cast(u64)49304, .text = "You can change this anytime in a game's Help.", .size = 14,
.wrap = Text.Wrap.TextWrapAuto, .bounds = Rectangle.{x + 16.0, y + 80.0, width - 32.0, 44.0}})
button_width := (width - 48.0 - 12.0) / 2.0
if Button(session, ButtonProps.{.key = cast(u64)49305, .id = 49305, .label = "Not now",
if Button.Draw(session, Button.Props.{.key = cast(u64)49305, .id = 49305, .label = "Not now",
.bounds = Rectangle.{x + 24.0, y + 136.0, button_width, 44.0},
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
unused CollectionUpdatesSet(false)
}
if Button(session, ButtonProps.{.key = cast(u64)49306, .id = 49306, .label = "Download",
if Button.Draw(session, Button.Props.{.key = cast(u64)49306, .id = 49306, .label = "Download",
.bounds = Rectangle.{x + 36.0 + button_width, y + 136.0, button_width, 44.0},
.tone = ButtonTone.ButtonToneAccent}) != 0 {
unused CollectionUpdatesSet(true)
@@ -676,7 +876,13 @@ CollectionUpdatesQuestion :: (session: Session, viewport: Rectangle) {
CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32) -> bool {
collection_toolbar_visible = true
defer { CollectionToolbar(session, viewport) }
if entity_visible { return EntityFrame(session, viewport, key, modifiers) }
if CollectionNodeScreen(session, viewport) { collection_toolbar_visible = false; return true }
if entity_visible {
collection_toolbar_visible = false
return EntityFrame(session, viewport, key, modifiers,
Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "library_connection"),
ifx collection_node.files != null then *collection_node_notice else null)
}
runtime := AppHostActiveRuntime(*collection_host)
if runtime == null { Report("Arcade: no app is running\n"); return false }
opening := !runtime.node.collection && (!collection_loading.shown ||
@@ -692,12 +898,32 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
// The covers ask about new levels once; the question takes every key.
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
// Console guest Home and its opaque strip are composed by shared Apps,
// including in Inner Breeze; the ordinary non-console host bar stays here.
top: s32 = ifx !covered && !runtime.node.collection && !collection_host.platform.presentation.cover_grid && (entity_ready || nested) then 56 else 0
if runtime.node.collection && collection_node.files != null && !collection_host.platform.presentation.cover_grid { top = 88 }
// The guest paints only its bounds below this host-owned bar. Paint an
// opaque base before its controls and any translucent navigation surface.
if top > 0 {
unused Box.Draw(session, Box.Props.{.key = cast(u64)49190,
.bounds = Rectangle.{viewport.x, viewport.y, viewport.width, cast(float32)top},
.fill = ColorFromPacked(ifx entity_shovey then ShoveyHostPalette().background else AppCoversPalette().background)})
}
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}
runtime.app.scale = 1.0
runtime.app.font = 16
// Enter/Space routed to a focused host HUD action must not also activate
// the guest console's selected game. Kryon retains the HUD activation.
if key == 257 || key == 32 {
hud_index: s32
while hud_index < TreeCount(session) {
hud_node := TreeInputAt(session, hud_index)
if (hud_node.key == cast(u64)49200 || hud_node.key == cast(u64)49202 || hud_node.key == cast(u64)49210) && TreeFocusedAt(session, hud_index) { key = 0 }
hud_index += 1
}
}
runtime.app.key = key
runtime.app.modifiers = modifiers
// A focused text field in the game edits with what was typed this frame,
@@ -720,12 +946,16 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
}
WidgetHostBegin(session, CollectionAssetAllowed, CollectionAssetPath)
collection_pictures_missing = false
drawn := AppHostRun(*collection_host, APP_FRAME)
drawn_handle := collection_host.tree.active
drawn := CollectionRunFrame()
WidgetHostEnd()
if !drawn {
Report("collection frame failed\n")
return false
}
// Shared host navigation can retire this guest after its frame. Its node
// no longer belongs to this route; the next frame draws the new page.
if !AppHandleEqual(collection_host.tree.active, drawn_handle) { return true }
if collection_leave_to_library {
collection_leave_to_library = false
unused AppHostBack(*collection_host)
@@ -741,11 +971,11 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
if CollectionNeedsCover(*collection_loading, collection_host.tree.active.slot,
collection_host.tree.active.generation, pictures_ready) {
collection_toolbar_visible = false
Box(session, BoxProps.{.key = cast(u64)49400, .bounds = viewport,
.fill = ColorFromPacked(ifx entity_shovey then ShoveyPalette().background else AppCoversPalette().background)})
unused Button(session, ButtonProps.{.key = cast(u64)49401, .id = 49401,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49400, .bounds = viewport,
.fill = ColorFromPacked(ifx entity_shovey then ShoveyHostPalette().background else AppCoversPalette().background)})
unused Button.Draw(session, Button.Props.{.key = cast(u64)49401, .id = 49401,
.bounds = viewport, .invisible = true})
LoadingIndicator(session, LoadingIndicatorProps.{.key = cast(u64)49402,
LoadingIndicator.Draw(session, LoadingIndicator.Props.{.key = cast(u64)49402,
.bounds = viewport, .now = now, .scale = 1.5})
return true
}
@@ -753,7 +983,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
collection_loading = .{}
}
if asking {
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyHostPalette() else AppCoversPalette())
CollectionUpdatesQuestion(session, viewport)
unused WidgetPaletteRestore(session)
return true
@@ -763,41 +993,246 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
BuilderPrint(*title_bytes, "%", TextUntilNul(runtime.node.entry.title[:]))
title := BuilderFinish(title_bytes)
if !VecPush(collection_frame_paths, title) { AppFileFree(title); return false }
Box(session, BoxProps.{.key = cast(u64)6, .bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 56.0},
unused Box.Draw(session, Box.Props.{.key = cast(u64)6, .bounds = Rectangle.{viewport.x, viewport.y, viewport.width, 56.0},
.fill = Color.{128, 140, 136, 40}})
if Button(session, ButtonProps.{.key = cast(u64)7, .id = 7, .label = "Back",
.bounds = Rectangle.{viewport.x + 8.0, viewport.y + 6.0, 76.0, 44.0},
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
unused AppHostBack(*collection_host)
}
Text(session, TextProps.{.key = cast(u64)8,
.text = title, .font = 20,
.bounds = Rectangle.{viewport.x + 100.0, viewport.y + 12.0, viewport.width - 116.0, 36.0}})
Text.Draw(session, Text.Props.{.key = cast(u64)8,
.text = title, .size = 20,
.bounds = Rectangle.{viewport.x + 150.0, viewport.y + 12.0, viewport.width - 166.0, 36.0}})
}
return true
}
// The HUD is part of the native shell, so it also works before library consent.
CollectionHudPath :: (icon: string) -> string {
#if #defined(ANDROID_BUILD) {
relative := Join("assets/hud", icon)
defer { AppFileFree(relative) }
bytes := ReadAppAsset(relative)
defer { FreeAppAsset(bytes) }
if bytes != "" { unused AppFileWrite(*collection_resources, relative, bytes) }
path := Join(collection_resources.root, relative)
if !VecPush(collection_frame_paths, path) { AppFileFree(path); return "" }
return path
} else #if #defined(PLATFORM_WEB) {
return ifx icon == "profile.webp" then "/assets/hud/profile.webp" else "/assets/hud/dew.webp"
} else {
directory := ExecutableDirectory()
defer { AppFileFree(directory) }
relative := Join("assets/hud", icon)
defer { AppFileFree(relative) }
path := Join(directory, relative)
if !VecPush(collection_frame_paths, path) { AppFileFree(path); return "" }
return path
}
}
CollectionToolbar :: (session: Session, viewport: Rectangle) {
if !entity_ready || !collection_toolbar_visible { return }
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyHostPalette() else AppCoversPalette())
defer { unused WidgetPaletteRestore(session) }
// The account's Dew beside the Profile: a drop and the number, 0 until an
// account is connected; it opens the Profile too.
dew := EntityDewBalanceText(collection_dew_text[:])
dew_width := 52.0 + 10.0 * cast(float32)dew.count
if Button(session, ButtonProps.{.key = cast(u64)49201, .id = 49201, .label = dew,
.bounds = Rectangle.{viewport.x + viewport.width - 64.0 - dew_width, viewport.y + 6.0, dew_width, 44.0},
.icon_shape = DewIcon.Shape, .tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
unused EntityShow()
}
if Button(session, ButtonProps.{.key = cast(u64)49200, .id = 49200, .label = "Profile",
.bounds = Rectangle.{viewport.x + viewport.width - 56.0, viewport.y + 6.0, 44.0, 44.0},
.icon_shape = ProfileIcon.Shape, .icon_only = true,
.selected = entity_visible,
.tone = ButtonTone.ButtonToneNeutral, .emphasis = ButtonEmphasis.ButtonEmphasisSoft}) != 0 {
unused EntityShow()
}
width := 144.0 + 10.0 * cast(float32)dew.count
profile_path := CollectionHudPath("profile.webp")
dew_path := CollectionHudPath("dew.webp")
if AppGameHud(session, AppGameHudProps.{.key = cast(u64)49200,
.bounds = Rectangle.{viewport.x + viewport.width - width - 12.0, viewport.y + 12.0, width, 56.0},
.dew_text = dew, .profile_label = Labels.AppsLabel(TextUntilNul(collection_host.locale[:]), "profile"), .dew_label = "Dew",
.profile_image = profile_path, .dew_image = dew_path}) != 0 { unused EntityShow() }
}
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;
// The version of the catalog this build carries; "" when its receipt has none.
collection_seed_version: [32]u8;
CollectionVersionPart :: (text: string, at: *s64) -> s64 {
value: s64
while at.* < text.count && text[at.*] >= cast(u8)48 && text[at.*] <= cast(u8)57 {
value = value * 10 + cast(s64)(text[at.*] - cast(u8)48)
at.* += 1
}
if at.* < text.count && text[at.*] == cast(u8)46 { at.* += 1 }
return value
}
// A saved or fetched signed release replaces the catalog this build carries
// only when it is newer. An older or equal cached release never hides the
// build's own library, artwork or games.
CollectionNodeNewer :: () -> bool {
current := TextUntilNul(collection_seed_version[:])
if current == "" { return true }
candidate := TextUntilNul(collection_node.release.version[:])
left: s64
right: s64
for part: cast(s32)0..2 {
a := CollectionVersionPart(candidate, *left)
b := CollectionVersionPart(current, *right)
if a != b { return a > b }
}
return false
}
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 = GAME_OLDEST_HOST_API
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_seed_version[0] = 0
unused AppsReadText(metadata, 0, "version", collection_seed_version[:])
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 && CollectionNodeNewer()
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)
// A newer library applies on its own once the background fetch finishes.
if (collection_node_apply || collection_node_choice == APP_CONNECTION_ALLOWED) && collection_node.stage == 0 {
// The build's own newer catalog stays; the fetched release stays cached.
if collection_node.changed && !collection_node_remote && !CollectionNodeNewer() {
AppRemoteCatalogCollect(*collection_node)
}
// A newer signed release can reuse cached verified bytes without a
// download, so the catalog does not report it as changed.
if !collection_node.changed && !collection_node_remote && collection_node.ready &&
!collection_node.failed && CollectionNodeNewer() {
collection_node.changed = true
}
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 {
unused Box.Draw(session, Box.Props.{.key = cast(u64)49510, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
Text.Draw(session, Text.Props.{.key = cast(u64)49511, .text = Labels.AppsLabel(TextUntilNul(collection_node_locale[:]), "loading_library"),
.size = 20, .bounds = Rectangle.{viewport.x + 24.0, viewport.y + viewport.height / 2.0, viewport.width - 48.0, 64.0}})
if Button.Draw(session, Button.Props.{.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
}
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
}
+26
View File
@@ -0,0 +1,26 @@
// Native facts only. Portable games never request OS permission themselves.
// Persistent alarms currently have an Android provider; other hosts fail closed.
#if #defined(ANDROID_BUILD) {
#import "kryon/notification_android"
}
CollectionNotificationsAllowed :: () -> bool {
#if #defined(ANDROID_BUILD) {
return AndroidNotificationAllowedHost()
}
return false
}
CollectionNotificationsForeground :: () -> bool {
#if #defined(ANDROID_BUILD) {
return AndroidNotificationWindowFocusedHost()
}
return false
}
CollectionNotificationsRequest :: () {
#if #defined(ANDROID_BUILD) {
// Kryon's native permission flow remembers refusal across launches.
unused AndroidNotificationRequestHost()
}
}
+30 -21
View File
@@ -1,8 +1,13 @@
#import "std/c_string"
#import "std/byte_text_linux"
#import "std/timer_linux"
#import "kryon/Desktop"
#import "kryon/Widgets"
#import "kryon/desktop_runtime"
#import "kryon/Cairo"
#import "kryon/session"
#import "kryon/geometry"
#import "kryon/drawing_props"
#import "kryon/tree"
#import "kryon/tree_input"
#import "kryon/Frame"
#import "kryon/test_driver"
#import "kryon/ScrollDevice"
@@ -11,9 +16,11 @@
#import "collection_host"
#import "entity_host"
#import "entity/model"
#import "kryon/carousel"
Carousel :: #import "kryon/carousel";
#import "apps/appearance"
#import "kryon/widget_palette"
Box :: #import "kryon/box";
LoadingIndicator :: #import "kryon/loading_indicator";
sdl :: #system_library "SDL2";
SetTitle :: (window: *void, title: *u8) #foreign sdl "SDL_SetWindowTitle";
@@ -30,12 +37,12 @@ DrawStartup :: (session: Session, directory: string, standalone: bool = true) ->
defer { EntityFree(art); EntityFree(logo) }
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
if standalone {
unused CarouselArtwork(session, viewport, cast(u64)48000, art, logo, "Shovey")
unused Carousel.CarouselArtwork(session, viewport, cast(u64)48000, art, logo, "Shovey")
} else {
unused WidgetPaletteUse(session, AppCoversPalette())
Box(session, BoxProps.{.key = cast(u64)48000, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
Text(session, TextProps.{.key = cast(u64)48001, .text = "Arcade", .font = 32,
.bounds = Rectangle.{20.0, 20.0, viewport.width - 40.0, 44.0}})
unused Box.Draw(session, Box.Props.{.key = cast(u64)48000, .bounds = viewport, .fill = Color.{17, 18, 35, 255}})
LoadingIndicator.Draw(session, LoadingIndicator.Props.{.key = cast(u64)48001,
.bounds = viewport, .now = cast(float64)MonotonicMilliseconds() / 1000.0})
unused WidgetPaletteRestore(session)
}
if EndFrame(session) != FrameStatus.FrameOk { return false }
@@ -46,19 +53,10 @@ DrawStartup :: (session: Session, directory: string, standalone: bool = true) ->
Draw :: (session: Session) -> bool {
BeginDesktopFrame()
KeyboardModifiersSend(session, DesktopModifiers())
key := DesktopPressedKey()
for candidate: cast(s32)0..269 {
if TestDriverKeyPressed(candidate) { key = candidate; break }
}
key, modifiers := DesktopInputTake(session)
KeyboardModifiersSend(session, modifiers)
if key == 256 && CollectionBack() { key = 0 }
KeyboardSend(session, key)
// Text typed on the keyboard reaches the game's focused field.
codepoint := DesktopTypedCodepoint()
while codepoint != 0 {
unused TypedCodepointSend(session, codepoint)
codepoint = DesktopTypedCodepoint()
}
if key != 0 { KeyboardSend(session, key) }
viewport := DesktopViewport()
pointer := TestDriverPointer(session, PollPointer())
TreePointerUpdate(session, pointer)
@@ -69,7 +67,7 @@ Draw :: (session: Session) -> bool {
pointer.down, pointer.released, wheel,
cast(float64)MonotonicMilliseconds() / 1000.0)
if BeginFrame(session, cast(u64)1, viewport) != FrameStatus.FrameOk { return false }
collection := CollectionFrame(session, viewport, key, DesktopModifiers())
collection := CollectionFrame(session, viewport, key, modifiers)
if !collection {
TreeCancel(session)
Report("collection frame returned false\n")
@@ -114,10 +112,21 @@ main :: (argc: s32, argv: **u8) -> s32 {
}
return 0
}
// --check opens the collection beside this binary without a window, so a
// build or install proves the two match: a binary cannot read a
// collection that a newer toolchain built.
if argc == 2 && TextFromCString(argv[1]) == "--check" {
data := DataDirectory()
opened := data != "" && (ifx standalone then CollectionOpenShovey(ExecutableDirectory(), data) else CollectionOpenFiles(ExecutableDirectory(), data))
unused CollectionClose()
Report(product)
Report(ifx opened then ": the collection opens with this binary\n" else ": this binary cannot open the collection beside it\n")
return ifx opened then 0 else 1
}
first: s32 = -1
if argc != 1 {
if argc != 3 || TextFromCString(argv[1]) != "--app" {
Report(ifx standalone then "Usage: shovey [--list | --app GAME]\n" else "Usage: arcade [--list | --app GAME]\n")
Report(ifx standalone then "Usage: shovey [--list | --check | --app GAME]\n" else "Usage: arcade [--list | --check | --app GAME]\n")
return 1
}
for index: cast(s32)0..GameCount - 1 {
+28 -17
View File
@@ -9,19 +9,15 @@
#import "kryon/session"
#import "kryon/geometry"
#import "kryon/key_input"
#import "kryon/button_props"
#import "kryon/button_widget"
Button :: #import "kryon/button";
#import "platform"
#import "shovey/shovey_theme"
#import "profile_palette"
#import "kryon/widget_palette"
#import "apps/appearance"
#import "kryon/drawing_props"
#import "kryon/box_widget"
#import "kryon/box_props"
#import "kryon/text_widget"
#import "kryon/text_props"
#import "kryon/modal_props"
#import "kryon/modal_frame_widget"
Box :: #import "kryon/box";
Text :: #import "kryon/text";
Modal :: #import "kryon/modal";
#import "kryon/tree"
entity_bundle: string;
@@ -43,9 +39,6 @@ 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) }
@@ -87,19 +80,37 @@ EntityBack :: () -> bool {
return true
}
EntityFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32) -> bool {
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
EntityDismiss :: () -> bool {
if !EntityHostSave() { return false }
// Clear secure fields and cancel any pending device-link/import route as
// ordinary Back would, after preserving the profile edits.
for depth: cast(s32)0..15 { if !EntityHostBack() { break } }
entity_visible = false
return true
}
EntityFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers: s32,
connection_label: string = "", connection: *bool = null) -> bool {
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyHostPalette() else AppCoversPalette())
defer { unused WidgetPaletteRestore(session) }
Box(session, BoxProps.{.key = cast(u64)49010, .bounds = viewport,
unused Box.Draw(session, Box.Props.{.key = cast(u64)49010, .bounds = viewport,
.fill = StyleTokenColorOr("canvas", Color.{239, 246, 244, 255})})
width := viewport.width - 32.0
height := viewport.height - 32.0
if width > 560.0 { width = 560.0 }
if height > 720.0 { height = 720.0 }
modal := ModalFrame(session, ModalFrameProps.{.key = cast(u64)49000, .id = 49000,
modal := Modal.Draw(session, Modal.Props.{.key = cast(u64)49000, .id = 49000,
.title = "Profile", .width = cast(s32)width, .height = cast(s32)height, .scale = 1.0,
.has_left_action = connection != null, .left_label = connection_label,
.has_right_action = true, .right_label = "Back"})
if modal.dismissed || modal.right_clicked { unused EntityBack() }
if modal.left_clicked && connection != null && EntityDismiss() {
connection.* = true
}
// The frame's X/outside dismissal closes the whole profile. System Back
// still walks Entity's pages through EntityBack before leaving.
if modal.dismissed || modal.right_clicked {
unused EntityDismiss()
}
if !modal.opened { return true }
input := TextFieldInputFor(key, modifiers, TypedTextTake(session, entity_typed[:]))
ok := EntityHostFrame(session, modal.layout.content, key, modifiers, input, true)
+10
View File
@@ -0,0 +1,10 @@
// The game standard every Arcade game implements (standards/game-v1.json).
// GAME_HOST_API is the newest host interface Arcade's players run; a game
// that declares a newer one is refused. scripts/check-games.py fails while it
// differs from the standard and the ledger.
GAME_CONTRACT_VERSION :: 1
GAME_OLDEST_HOST_API :: 43
GAME_HOST_API :: 43
// The older direct loader has no verified reminder dispatch. Products use
// CollectionHost; do not advertise its API42 authority from the direct loader.
GAME_DIRECT_HOST_API :: 41
+2 -3
View File
@@ -1,6 +1,7 @@
// Runs the registered game bundles. The host owns files and input;
// each game owns its rules and screens. Chess also runs in Inbe.
#import "std/file"
#import, file "game_contract.zi";
#import "std/bundle_host"
#import "std/byte_text_linux"
#import "std/date_time_linux"
@@ -19,8 +20,6 @@
using HostValueKind;
GAME_CONTRACT_VERSION :: 1
GAME_HOST_API :: 12
GameHost :: struct {
app: HostedApp
@@ -246,7 +245,7 @@ GameAssetsValid :: () -> bool {
if !id.valid || manifest.data[id.start:id.end] != GameAt(host.index).id ||
!contract.valid || contract.value != GAME_CONTRACT_VERSION ||
!module_api.valid || module_api.value != MODULE_ABI ||
!host_api.valid || host_api.value < 1 || host_api.value > GAME_HOST_API ||
!host_api.valid || host_api.value < 1 || host_api.value > GAME_DIRECT_HOST_API ||
!save_schema.valid || save_schema.value < 1 { return false }
read: bool
write: bool
+13
View File
@@ -0,0 +1,13 @@
GameTheme :: #import "shovey/shovey_theme";
HostPalette :: #import "kryon/widget_palette";
// A separately pinned game owns its colours; the native host owns the
// widget types used to draw them.
ShoveyHostPalette :: () -> HostPalette.WidgetPalette {
game := GameTheme.ShoveyPalette()
return HostPalette.WidgetPalette.{
.background = game.background, .base = game.base, .text = game.text,
.selected = game.selected, .selected_text = game.selected_text,
.border = game.border, .danger = game.danger, .warning = game.warning,
.success = game.success, .material = game.material}
}
+1 -1
View File
@@ -1,4 +1,4 @@
// Classic, Island and Editor keep independent verified identities.
// Classic and the Editor keep independent verified identities.
#import "kryon/app_context"
#import "kryon/app_protocol"
+20 -4
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,17 +81,30 @@ 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 }
// The page writes the library's pictures from this site: small copies
// under /library, or else the exact art bundle under /packages.
CollectionWebLibrary("/library", "/packages")
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) }
WebSet(WebGetObject(WebGlobal, WebName("Module")), WebName("profileReady"), WebBool(true))
saved := PageNow()
ok := true
while ok && PollCanvas() {
scope := WebScope()
ok = ArcadeFrame(session)
// main returning does not notify Emscripten's onExit unless its
// runtime exits too. Tell the page explicitly, so a failed game can
// never leave an apparently live library with no input loop.
if !ok {
WebSet(WebGetObject(WebGlobal, WebName("Module")), WebName("arcadeFailed"), WebBool(true))
} else {
WebSet(WebGetObject(WebGlobal, WebName("Module")), WebName("profileReady"), WebBool(true))
}
// Saves reach the browser's storage about once a second.
if PageNow() - saved >= 1000.0 {
unused BundleStorageSync(false)
+3 -2
View File
@@ -2,7 +2,8 @@
"name": "kryon-node-app",
"contract_version": 1,
"module_api": 2,
"host_api": 12,
"host_api": 43,
"oldest_host_api": 43,
"identity": "Stable signed package ID; moving source must not rename installed games",
"frames": {
"matching": "Fields match by name",
@@ -11,7 +12,7 @@
"input": "Only the supervised game receives its frame and input"
},
"required_host_calls": ["ReadAppHost", "WriteAppHost", "ReadAppUiHost", "AppLocaleHost", "AppRecordHost", "SaveAppRecordHost"],
"optional_features": {"friends": "Explicitly unavailable without a connected account; never report an unsent action as sent"},
"optional_features": {"friends": "Explicitly unavailable without a connected account; never report an unsent action as sent", "notifications": "API42: kryon.notification.schedule uses the verified active game's identity, an explicit native permission grant and native selected-game focus; unsupported or denied returns false. Guests cannot request OS permission or address another game's reminders."},
"resources": {"root": "assets/<game>/", "locales": "assets/<game>/locales/<locale>.txt", "preview": "Required real game preview; no host files or texture handles"},
"records": {"scope": "Game and account", "name_bytes_less_than": 64, "value_bytes_less_than": 65536, "save_schema": "Versioned by the game; upgrades preserve older saves"},
"updates": {"signature": "Existing Ed25519 publisher", "identity": "Preserve package ID and publisher pins", "order": "Increasing version and sequence; immutable payload hashes", "gate": "Check the exact bundle in Arcade and an intended Inbe host, including its VM format, before node publication"}
+156
View File
@@ -0,0 +1,156 @@
"""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.update({name: (ROOT / 'build/android-assets' / name).read_bytes()
for name in android_catalog.HUD_PATHS})
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_modified_or_missing_startup_hud(self):
for name in android_catalog.HUD_PATHS:
with self.subTest(path=name), self.assertRaisesRegex(AssertionError, 'HUD icons differ'):
verify_assets(self.assets | {name: b'changed'})
without = dict(self.assets)
del without[name]
with self.assertRaisesRegex(AssertionError, 'Unexpected or missing'):
verify_assets(without)
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,
# in both bundle versions the toolchain writes (26 plain, 27 composed).
cases = [(version, path) for version in (26, 27)
for path in (b'assets/arcade/games/test.zx', b'assets/arcade/covers/test.png')]
for version, path in cases:
payload = b'ZX\0\0' + number(version) + 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(version=version, 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()
+44
View File
@@ -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()
Loaded 100 of 133 files, more files were not shown because too many files have changed in this diff. Show more